[changed] Renamed `qwloc` and `qwmeet` to `vladimirQW_loc` and `vladimirQW_meet`. Moved `telefon, vladimir` to `vladimirQW_loc, telephone_call`

locations/city_park.qsrc

@@ -266,7 +266,7 @@ if $ARGS[0] = 'luna':
 	*nl
 	'Opening hours are 9:00 to 21:00'
 
-	if vladimirQW = 0 and hour >= 9 and hour <= 20 and week > 5 and pcs_apprnc > 40:'<a href="exec:gt ''qwloc''">There''s a strong looking man staring at you from the fences.</a>.'
+	if vladimirQW = 0 and hour >= 9 and hour <= 20 and week > 5 and pcs_apprnc > 40:'<a href="exec:gt ''vladimirQW_loc''">There''s a strong looking man staring at you from the fences.</a>.'
 
 	act 'Go back to the park':gt 'city_park', 'start'
 	

locations/din_bad.qsrc

@@ -9,19 +9,19 @@ $mobile_check = {
 				$caller = 'Vladimir'
 				$callerid = 'images/characters/city/vladimir/001.jpg'
 				gs 'telefon','phone_ring'
-				pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+				pl'<center><a href="exec:gt ''vladimirQW_loc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 			elseif vladimirQW = 25 and week = 6:
 				'<b><font color="red">Your phone is ringing</font></b>'
 				$caller = 'Vladimir'
 				$callerid = 'images/characters/city/vladimir/001.jpg'
 				gs 'telefon','phone_ring'
-				pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+				pl'<center><a href="exec:gt ''vladimirQW_loc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 			elseif vladimirQW = 35 and week = 6:
 				'<b><font color="red">Your phone is ringing</font></b>'
 				$caller = 'Vladimir'
 				$callerid = 'images/characters/city/vladimir/001.jpg'
 				gs 'telefon','phone_ring'
-				pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+				pl'<center><a href="exec:gt ''vladimirQW_loc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 			end
 		end
 

locations/saveupdater.qsrc

@@ -2810,6 +2810,16 @@ if temp_current_save_version < 00090300:
 	if lact_ev['poli_totaldonatemoney'] <= 0 and lact_ev['poli_totalmilkdonated'] >= 5: lact_ev['poli_totaldonatemoney'] = (lact_ev['poli_totalmilkdonated'] / 5) * 10
 
 
+	!! Telephone call migration to their correct event locations
+	if arrpos('$contact', 'A108') > -1:
+		if vladimirQW = 20:
+			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirday ! daystart and hour >= 15 and hour <= 17", 1
+		elseif vladimirQW = 25 or vladimirQW = 35 or vladimirQW = 40:
+			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirday ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
+		end
+	end
+
+
 end
 
 

locations/qwloc.qsrc → locations/vladimirQW_loc.qsrc

@@ -1,4 +1,4 @@
-# qwloc
+# vladimirQW_loc
 $location_type = 'event_outdoors'
 if $ARGS[0] = '':
 	minut += 5
@@ -12,19 +12,19 @@ if $ARGS[0] = '':
 		act 'Approach the man':
 			cla
 			'You approach the man and he leaves the fence to walk towards you.'
-			xgt 'qwloc', 'qwvladdy'
+			xgt 'vladimirQW_loc', 'qwvladdy'
 		end
 
 		act 'Smile':
 			cla
 			'You smile at the man and he leaves the fence to walk towards you.'
-			xgt 'qwloc', 'qwvladdy'
+			xgt 'vladimirQW_loc', 'qwvladdy'
 		end
 
 		act 'Ignore':
 			cla
 			'You decide to ignore the man and start walking away but hearing his footsteps behind you, you turn back around.'
-			xgt 'qwloc', 'qwvladdy'
+			xgt 'vladimirQW_loc', 'qwvladdy'
 		end
 	else
 		'The man returns your gaze for a moment before turning away.'
@@ -35,14 +35,14 @@ end &! ---  ---
 
 if $ARGS[0] = 'qwvladdy':
 	'The man smiles at you. "My name is Vladimir. I couldn''t help but admire your beauty. Would you allow me the honor of your name?"'
-	gs 'qwloc', 'qwnamedy'
+	gs 'vladimirQW_loc', 'qwnamedy'
 
 	act 'Sorry, I''m busy':
 		cla
 		vladimirQW = 1
 		'"Sorry, I''m busy," you excuse yourself.'
 		'Vladimir shakes his head to that. "Well, what are you busy with? I will not bite. I would just like to know the name of a beautiful, young lady."'
-		gs 'qwloc', 'qwnamedy'
+		gs 'vladimirQW_loc', 'qwnamedy'
 
 		act 'Leave anyway':
 			cla
@@ -73,7 +73,7 @@ if $ARGS[0] = 'qwnamedy':
 			cla
 			vladimirQW = 20
 			vladimirday = daystart
-			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'telefon', 'vladimir'", "vladimirday ! daystart and hour >= 15 and hour <= 17", 1
+			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirday ! daystart and hour >= 15 and hour <= 17", 1
 			gs 'stat'
 			'You tell Vladmimir your phone number and he writes it down in a small notebook with a leather cover.'
 
@@ -106,7 +106,7 @@ if $ARGS[0] = '2':
 			cla
 			vladimirQW = 21
 			vladimirday = daystart
-			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'telefon', 'vladimir'", "vladimirday ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
+			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirday ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
 			'"I would like that," you tell him.'
 			'"Wonderful!" says Vladimir. "Then I''ll meet you at the restaurant at 20:00."'
 			'"I''ll see you then!"'
@@ -132,7 +132,7 @@ if $ARGS[0] = '3':
 		cla
 		vladimirQW = 30
 		vladimirday = daystart
-		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'telefon', 'vladimir'", "vladimirday ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
+		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirday ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
 		'"I''d like that." you tell him.'
 		'You can hear that Vladimir''s pleased over the phone. "Wonderful, my driver will come to pick you up."'
 
@@ -157,7 +157,7 @@ if $ARGS[0] = '4':
 		cla
 		vladimirQW = 40
 		vladimirday = daystart
-		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'telefon', 'vladimir'", "vladimirday ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
+		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirday ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
 		'"I''d like that." you tell him.'
 		'You can hear that Vladimir''s pleased over the phone. "Wonderful, my driver will come to pick you up."'
 
@@ -166,5 +166,20 @@ if $ARGS[0] = '4':
 end
 
 
---- qwloc ---------------------------------
+
+if $ARGS[0] = 'telephone_call':
+	cla & clr
+	gs 'stat'
+	gs 'telefon','phone_ring'
+
+	if vladimirQW = 20:
+		gt 'vladimirQW_loc', '2'
+	elseif vladimirQW = 25 and week = 6:
+		gt 'vladimirQW_loc', '3'
+	elseif vladimirQW = 35 and week = 6:
+		gt 'vladimirQW_loc', '4'
+	end
+end
+
+--- vladimirQW_loc ---------------------------------
 

locations/qwmeet.qsrc → locations/vladimirQW_meet.qsrc

@@ -1,4 +1,4 @@
-# qwmeet
+# vladimirQW_meet
 
 if $ARGS[0] = '':
 	minut += 5
@@ -80,13 +80,13 @@ if $ARGS[0] = '':
 								act 'Give a kiss on the cheek':
 									cla
 									'You moved towards Vladimir and gave his cheek a brief, chaste, kiss.'
-									gt 'qwmeet', 'qwmeetdy'
+									gt 'vladimirQW_meet', 'qwmeetdy'
 								end
 
 								act 'Kiss on the lips':
 									cla
 									'You kissed Vladimir on the mouth, his strong, firm, lips pressing hard against your pliant mouth.'
-									gt 'qwmeet', 'qwmeetdy'
+									gt 'vladimirQW_meet', 'qwmeetdy'
 								end
 							end
 						end
@@ -128,7 +128,7 @@ if $ARGS[0] = '2':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/glory/002.jpg"></center>'
 		'You took a seat next to the driver''s. Glory came to the door and slammed it shut before walking over to his seat and sitting behind the wheel. Glory again sped through the city, paying little heed to traffic lights, signs and other cars.'
-		gt 'qwmeet','qwslavady'
+		gt 'vladimirQW_meet','qwslavady'
 	end
 	act 'Sit on the back seat':
 		*clr & cla
@@ -136,7 +136,7 @@ if $ARGS[0] = '2':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/glory/002.jpg"></center>'
 		'You defiantly took a backseat and Glory mutely shut the door behind you before he walked over to his seat and sat behind the wheel. Glory again sped through the city, paying little heed to traffic lights, signs and other cars.'
-		gt 'qwmeet','qwslavady'
+		gt 'vladimirQW_meet','qwslavady'
 	end
 end &! --- 2 ---
 !! continuation of the second date
@@ -155,7 +155,7 @@ if $ARGS[0] = 'qwslavady':
 		'<center><b><font color="maroon">Vladimir</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/city/vladimir/001.jpg"></center>'
 		'You moved towards Vladimir and gave his cheek a brief, chaste, kiss.'
-		gt 'qwmeet','qwmeetkatdy'
+		gt 'vladimirQW_meet','qwmeetkatdy'
 	end
 
 	act 'Kiss on the lips':
@@ -163,7 +163,7 @@ if $ARGS[0] = 'qwslavady':
 		'<center><b><font color="maroon">Vladimir</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/city/vladimir/001.jpg"></center>'
 		'You kissed Vladimir on the mouth, his strong, firm, lips pressing hard against your pliant mouth.'
-		gt 'qwmeet','qwmeetkatdy'
+		gt 'vladimirQW_meet','qwmeetkatdy'
 	end
 end &! --- qwslavady ---
 
@@ -236,7 +236,7 @@ if $ARGS[0] = 'qwmeetkatdy':
 									gs 'stat'
 									'You asked whether she knows Glory, she smiled, "I do not know much despite all my time around the Banzai. He replaced the last driver rather suddenly. He''s a brazen, crazy type but a really great driver. He''s kind of a master racer."'
 
-									act 'Carry a tray out onto deck':gt 'qwmeet','qwpaluba'
+									act 'Carry a tray out onto deck':gt 'vladimirQW_meet','qwpaluba'
 								end
 							end
 						end
@@ -271,7 +271,7 @@ if $ARGS[0] = 'qwpaluba':
 		'Once you have chatted boat lined with Isolde about trifles. She called you my address in the city center and invited to come to anything like it.'
 		'The boat finally slowed to a stop alongside the riverbank to allow you to disembark.'
 
-		act 'Disembark':gt 'qwmeet','qwbereg'
+		act 'Disembark':gt 'vladimirQW_meet','qwbereg'
 	end
 
 	act 'Approach Glory':
@@ -290,7 +290,7 @@ if $ARGS[0] = 'qwpaluba':
 			'Glory smiled. "You just haven''t felt it yet. You''d love the feeling of real speed. I hang out in the evenings in the city industrial region near the bar, "Flight", come visit.'
 			'The boat finally dropped in speed and came to a halt against the river''s shore.'
 
-			act 'Disembark':gt 'qwmeet','qwbereg'
+			act 'Disembark':gt 'vladimirQW_meet','qwbereg'
 		end
 
 		act 'Yes':
@@ -300,7 +300,7 @@ if $ARGS[0] = 'qwpaluba':
 			'Glory smiled. "In the evenings, I hang out in the city industrial region. I go to the bar, "Flight", visit and I''ll show you what real speed is."'
 			'The boat finally dropped in speed and came to a halt against the river''s shore.'
 
-			act 'Disembark':gt 'qwmeet','qwbereg'
+			act 'Disembark':gt 'vladimirQW_meet','qwbereg'
 		end
 	end
 
@@ -314,7 +314,7 @@ if $ARGS[0] = 'qwpaluba':
 		'Vitaliy grabbed at you so that you didn''t fall to the deck. After the boat levelled off from the turn he helped you back onto the couch, his hands sliding over your body and stopping against your ass. He sighed as he let go of your body to pour more vodka'
 		'The boat finally slowed to a stop alongside the riverbank to allow you to disembark.'
 
-		act 'Disembark':gt 'qwmeet','qwbereg'
+		act 'Disembark':gt 'vladimirQW_meet','qwbereg'
 	end
 end &! --- qwpaluba ---
 
@@ -386,7 +386,7 @@ if $ARGS[0] = 'qwbereg':
 							gs 'dinsex', 'sexcum'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Continue': gt 'qwmeet','qwbereg2'
+							act 'Continue': gt 'vladimirQW_meet','qwbereg2'
 						end
 					end
 				end
@@ -408,7 +408,7 @@ if $ARGS[0] = 'qwbereg':
 						gs 'arousal', 'hj', 5, 'sub'
 						gs 'stat'
 
-						act 'Continue':gt 'qwmeet','qwbereg2'
+						act 'Continue':gt 'vladimirQW_meet','qwbereg2'
 					end
 
 					act 'To take by mouth':
@@ -431,7 +431,7 @@ if $ARGS[0] = 'qwbereg':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act '...':gt 'qwmeet','qwbereg2'
+							act '...':gt 'vladimirQW_meet','qwbereg2'
 						end
 					end
 
@@ -453,7 +453,7 @@ if $ARGS[0] = 'qwbereg':
 							gs 'stat'
 						end
 
-						act '...':gt 'qwmeet','qwbereg2'
+						act '...':gt 'vladimirQW_meet','qwbereg2'
 					end
 				end
 			end
@@ -492,7 +492,7 @@ if $ARGS[0] = '3':
 		if slavaQW > 0:slavaQW += 1 & 'While you drove through the city, you happily chatted with Slava.'
 		if slavaQW = 0:slavaQW = 1 & 'While you drove through the city, Glory told you that he spends much of his spare time in the bar called Flying in the city industrial region of the city.'
 
-		gt 'qwmeet','qwmeetdin'
+		gt 'vladimirQW_meet','qwmeetdin'
 	end
 
 	act 'Sit on the back seat':
@@ -501,7 +501,7 @@ if $ARGS[0] = '3':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/glory/002.jpg"></center>'
 		'You defiantly took a backseat and Glory mutely shut the door behind you before he walked over to his seat and sat behind the wheel. Glory again sped through the city, paying little heed to traffic lights, signs and other cars.'
-		gt 'qwmeet','qwmeetdin'
+		gt 'vladimirQW_meet','qwmeetdin'
 	end
 end &! --- 3 ---
 
@@ -572,4 +572,4 @@ if $ARGS[0] = 'qwmeetdin':
 end &! --- qwmeetdin ---
 
 
---- qwmeet ---------------------------------
+--- vladimirQW_meet ---------------------------------