Răsfoiți Sursa

[changed] merged `vladimirQW` and `vladimirday` into a single array `vladimirQW`. Migrated `telefon, start` to the event location `nastja, start`

anjuna krokus 1 lună în urmă
părinte
comite
0690db4fa3

+ 2 - 2
locations/city_mansion_entrance.qsrc

@@ -32,8 +32,8 @@ if $ARGS[0] = '':
 	end
 
 	if func('homes_properties', 'is_current_home'):
-		if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your mansion, and standing beside it, you notice Vladimir</a>.'
-		if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your mansion, and standing beside it, you notice Vladimir</a>.'
+		if vladimirQW['day'] = daystart and vladimirQW['stage'] = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''2''">There''s an Audi parked in front of your mansion, and standing beside it, you notice Vladimir</a>.'
+		if vladimirQW['day'] = daystart and vladimirQW['stage'] = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''3''">There''s an Audi parked in front of your mansion, and standing beside it, you notice Vladimir</a>.'
 
 		if hour = meethour[0]:
 			if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting at the entrance to your mansion.</b>'

+ 1 - 1
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 ''vladimirQW_loc''">There''s a strong looking man staring at you from the fences.</a>.'
+	if vladimirQW['stage'] = 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'
 	

+ 2 - 2
locations/dachi.qsrc

@@ -36,8 +36,8 @@ if func('homes_properties', 'has_access','village_cottage'):
 end
 
 if  func('homes_properties', 'is_current_home', 'village_cottage'):
-	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your cottage, and standing beside it, you notice Vladimir</a>.'
-	if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your cottage, and standing beside it, you notice Vladimir</a>.'
+	if vladimirQW['day'] = daystart and vladimirQW['stage'] = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''2''">There''s an Audi parked in front of your cottage, and standing beside it, you notice Vladimir</a>.'
+	if vladimirQW['day'] = daystart and vladimirQW['stage'] = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''3''">There''s an Audi parked in front of your cottage, and standing beside it, you notice Vladimir</a>.'
 
 	if hour = meethour[0]:
 		if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting at the entrance to your yard.</b>'

+ 7 - 7
locations/din_bad.qsrc

@@ -3,25 +3,25 @@
 $mobile_check = {
 	if menu_off = 0:
 		gs 'stat'
-		if vladimirday ! daystart and hour >= 15 and hour <= 17:
-			if vladimirQW = 20:
+		if vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17:
+			if vladimirQW['stage'] = 20:
 				'<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 ''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:
+				pl'<center><a href="exec:gt ''vladimirQW_loc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirQW[''day''] = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			elseif vladimirQW['stage'] = 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 ''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:
+				pl'<center><a href="exec:gt ''vladimirQW_loc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirQW[''day''] = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			elseif vladimirQW['stage'] = 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 ''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>'
+				pl'<center><a href="exec:gt ''vladimirQW_loc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirQW[''day''] = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 			end
 		end
 

+ 2 - 2
locations/gadukino.qsrc

@@ -94,8 +94,8 @@ if $ARGS[0] = '':
 		'Several small farms are scattered around the outskirts of the village, one of which belongs to <a href="exec:minut += 5 & gt ''gaddvor''">your grandparents</a>.'
 		act 'Go to your grandparent''s house': minut += 5 & gt 'gaddvor'
 		if $home['current'] = 'hunters_lodge' or $home['current'] = 'grandparents_house':
-			if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in the street, and standing beside it, you notice Vladimir</a>.'
-			if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in the street, and standing beside it, you notice Vladimir</a>.'
+			if vladimirQW['day'] = daystart and vladimirQW['stage'] = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''2''">There''s an Audi parked in the street, and standing beside it, you notice Vladimir</a>.'
+			if vladimirQW['day'] = daystart and vladimirQW['stage'] = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''3''">There''s an Audi parked in the street, and standing beside it, you notice Vladimir</a>.'
 
 			if hour = meethour[0]:
 				if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting in the street.</b>'

+ 27 - 6
locations/nastja.qsrc

@@ -2,6 +2,27 @@
 
 menu_off = 1
 
+if $ARGS[0] = 'start':
+	gs 'stat'
+	gs 'telefon','phone_call_receive'
+
+	if npc_QW['A192'] = 1 and week = 6 and pcs_apprnc > 80:
+		gt 'nastja', 'pos4'
+	elseif npc_QW['A192'] = 2 and week ! 6 and mc_inventory['tech_camera'] ! 0 and nastjaday ! daystart:
+		gt 'nastja', 'pos13'
+	elseif hour >= 8 and hour <= 20 and npc_QW['A192'] = 2 and week = 6 and pcs_apprnc > 80 and nastjaday ! daystart:
+		gt 'nastja', 'pos12'
+	elseif npc_QW['A192'] = 5 and week = 6 and nastjaday ! daystart:
+		gt 'nastja', 'pos22'
+	elseif npc_QW['A192'] = 6 and nastjaday ! daystart:
+		gt 'nastja', 'pos31'
+	else
+		$callerid = 'images/system/phone/icons/icon_nastja.png'
+		gs 'telefon','phone_call_reject'
+	end
+end
+
+
 if $ARGS[0] = 'pos1':
 	cla
 	*clr
@@ -23,7 +44,7 @@ if $ARGS[0] = 'pos1':
 			cla
 			*clr
 			npc_QW['A192'] = 1
-			gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'", "hour >= 8 and hour < 20", "", ""
+			gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", ""
 			minut += 60
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/anastasia/nastja.jpg"></center>'
@@ -61,7 +82,7 @@ if $ARGS[0] = 'pos5':
 	*clr
 	minut += 60
 	npc_QW['A192'] = 2
-	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'", "hour >= 8 and hour < 20", "", ""
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", ""
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/1party0.jpg"></center>'
 	'You arrive at a karaoke cafe called "Mast".'
@@ -315,7 +336,7 @@ if $ARGS[0] = 'pos12':
 	minut += 10
 	pcs_mood += 40
 	npc_QW['A192'] = 3
-	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'", "hour >= 8 and hour < 20", "", ""
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", ""
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/tel_talk.jpg"></center>'
 	'It rings two, three, four times before Anastasia picks up.'
@@ -466,7 +487,7 @@ if $ARGS[0] = 'pos21':
 	*clr
 	minut += 20
 	npc_QW['A192'] = 5
-	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'", "hour >= 8 and hour < 20", "", ""
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", ""
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/2bslp.jpg"></center>'
 	'After running and jumping around like that in everybody''s plain view, sitting down and lying back topless isn''t enough to make you feel shy and neither you nor Nastya have any qualms about spreading your arms and showing off your bodies to everyone as you sunbathe once again.'
@@ -485,7 +506,7 @@ if $ARGS[0] = 'pos22':
 	minut += 10
 	pcs_mood += 50
 	npc_QW['A192'] = 6
-	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'", "hour >= 8 and hour < 20", "", ""
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour < 20", "", ""
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/tel_talk.jpg"></center>'
@@ -665,7 +686,7 @@ if $ARGS[0] = 'pos31':
 	minut += 10
 	pcs_mood += 50
 	npc_QW['A192'] = 7
-	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'","hour >= 8 and hour <= 20","",""
+	gs 'telefon', 'AddContact', 'A192', 'icon_nastja', "gs 'nastja', 'start'", "hour >= 8 and hour <= 20", "", ""
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/tel_talk.jpg"></center>'

+ 2 - 2
locations/pav_market.qsrc

@@ -57,8 +57,8 @@ end
 
 
 if $home['current'] = 'pavlovsk_hotel':
-	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of the hotel, and standing beside it, you notice Vladimir</a>.'
-	if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of the hotel, and standing beside it, you notice Vladimir</a>.'
+	if vladimirQW['day'] = daystart and vladimirQW['stage'] = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''2''">There''s an Audi parked in front of the hotel, and standing beside it, you notice Vladimir</a>.'
+	if vladimirQW['day'] = daystart and vladimirQW['stage'] = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''3''">There''s an Audi parked in front of the hotel, and standing beside it, you notice Vladimir</a>.'
 
 	if hour = meethour[0]:
 		if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting in front of the hotel.</b>'

+ 2 - 2
locations/pushkin_sq.qsrc

@@ -73,8 +73,8 @@ if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on th
 act 'Wait':gs 'obj_din', 'wait'
 
 if $home['current'] = 'old_town_apartment':
-	if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir</a>.'
-	if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir</a>.'
+	if vladimirQW['day'] = daystart and vladimirQW['stage'] = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''2''">There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir</a>.'
+	if vladimirQW['day'] = daystart and vladimirQW['stage'] = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''3''">There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir</a>.'
 
 	if hour = meethour[0]:
 		if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting at the entrance to your apartment building.</b>'

+ 1 - 1
locations/restoran.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'start':
 	! mennolds ev
 	if hour = 21 and minut < 30 and mey_vika['mey_vika_qw'] = 36: gt 'mey_tamara_events', 'wait_qw'
 
-	if vladimirday = daystart and vladimirQW = 21 and hour = 20: gt 'qwmeet'
+	if vladimirQW['day'] = daystart and vladimirQW['stage'] = 21 and hour = 20: gt 'vladimirQW_meet'
 
 	act 'Leave the restaurant': minut += 5 & gt 'city_center'
 

+ 22 - 9
locations/saveupdater.qsrc

@@ -2809,20 +2809,33 @@ if temp_current_save_version < 00090300:
 	!! Introduction of lact_ev['poli_totaldonatemoney']
 	if lact_ev['poli_totaldonatemoney'] <= 0 and lact_ev['poli_totalmilkdonated'] >= 5: lact_ev['poli_totaldonatemoney'] = (lact_ev['poli_totalmilkdonated'] / 5) * 10
 
-
+	if vladimirday > 0 or vladimirQW > 0 and vladimirQW['stage'] = 0:
+		temp_var1 = vladimirQW
+		killvar 'vladimirQW'
+		vladimirQW['stage'] = temp_var1
+		if vladimirday > 0:		vladimirQW['day'] = vladimirday
+		killvar 'vladimirday'
+		killvar 'temp_var1'
+	end
 	!! 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
+		temp_pos = arrpos('$contact', 'A108')
+		if strpos($contactICode[temp_pos], 'telefon') > -1:
+			$contactICode[temp_pos] = replace($contactICode[temp_pos], "gs 'telefon', 'vladimir'", "gs 'vladimirQW_loc', 'telephone_call'")
+		end
+		if strpos($contactISche[temp_pos], 'vladimirday') > -1:
+			$contactICode[temp_pos] = replace($contactISche[temp_pos], "vladimirday", "vladimirQW['day']")
 		end
+		killvar 'temp_pos'
+	end
+	if arrpos('$contact', 'A192') > -1:
+		temp_pos = arrpos('$contact', 'A192')
+		if strpos($contactICode[temp_pos], 'telefon') > -1:
+			$contactICode[temp_pos] = replace($contactICode[temp_pos], "gs 'telefon', 'start'", "gs 'nastja', 'start'")
+		end
+		killvar 'temp_pos'
 	end
-
-
 end
-
-
 killvar 'temp_current_save_version'
 gs 'saveg'
 

+ 3 - 3
locations/street_event.qsrc

@@ -10,7 +10,7 @@
 		streetev_hijack=1
 		streetev_bf=90
 		shantpopala: 100% if shantpopala>0
-2. home-related events: check if player live here (workDolgDay, vladimirday, pcs_magik >= 1 and mainQW = 0, hour = meethour).
+2. home-related events: check if player live here (workDolgDay, vladimirQW['day'], pcs_magik >= 1 and mainQW = 0, hour = meethour).
 [street]: home_owned[1] > 0 for korr
 [down]:tanwork = 1 for house, func('uniutil', 'student', 'enrolled') for dorm
 [city_industrial]:none for now. use (train station) as position, if no home in city.
@@ -154,8 +154,8 @@ if $ARGS[1] = 'extras':
 	end
 
 	if streetev_home = 1:
-		if vladimirday = daystart and vladimirQW = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''2''">There''s an Audi parked <<$streetev_home>>, and standing beside it, you notice Vladimir</a>.'
-		if vladimirday = daystart and vladimirQW = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''qwmeet'',''3''">There''s an Audi parked <<$streetev_home>>, and standing beside it, you notice Vladimir</a>.'
+		if vladimirQW['day'] = daystart and vladimirQW['stage'] = 30 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''2''">There''s an Audi parked <<$streetev_home>>, and standing beside it, you notice Vladimir</a>.'
+		if vladimirQW['day'] = daystart and vladimirQW['stage'] = 40 and hour >= 16 and week = 6:'<a href="exec:gt ''vladimirQW_meet'',''3''">There''s an Audi parked <<$streetev_home>>, and standing beside it, you notice Vladimir</a>.'
 
 		if hour = meethour[0]:
 			if svidanie[0] = 1:'<b><a href="exec:lover_number = 0 & gt ''lover_meet'', ''start''"><<$loverdesc[0]>></a> is waiting <<$streetev_home>>.</b>'

+ 0 - 21
locations/telefon.qsrc

@@ -2080,27 +2080,6 @@ if $ARGS[0] = 'NPCCallsForDate':
 	killvar '$DateNickName'
 end
 
-if $ARGS[0] = 'start':
-	gs 'stat'
-	gs 'telefon','phone_call_receive'
-
-	if npc_QW['A192'] = 1 and week = 6 and pcs_apprnc > 80:
-		gt 'nastja', 'pos4'
-	elseif npc_QW['A192'] = 2 and week ! 6 and mc_inventory['tech_camera'] ! 0 and nastjaday ! daystart:
-		gt 'nastja', 'pos13'
-	elseif hour >= 8 and hour <= 20 and npc_QW['A192'] = 2 and week = 6 and pcs_apprnc > 80 and nastjaday ! daystart:
-		gt 'nastja', 'pos12'
-	elseif npc_QW['A192'] = 5 and week = 6 and nastjaday ! daystart:
-		gt 'nastja', 'pos22'
-	elseif npc_QW['A192'] = 6 and nastjaday ! daystart:
-		gt 'nastja', 'pos31'
-	else
-		$callerid = 'images/system/phone/icons/icon_nastja.png'
-		gs 'telefon','phone_call_reject'
-	end
-end
-
-
 
 --- telefon ---------------------------------
 

+ 24 - 24
locations/vladimirQW_loc.qsrc

@@ -39,14 +39,14 @@ if $ARGS[0] = 'qwvladdy':
 
 	act 'Sorry, I''m busy':
 		cla
-		vladimirQW = 1
+		vladimirQW['stage'] = 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 'vladimirQW_loc', 'qwnamedy'
 
 		act 'Leave anyway':
 			cla
-			vladimirQW = 2
+			vladimirQW['stage'] = 2
 			'You turn away from the man with a roll of your eyes and leave.'
 
 			act 'Leave':gt 'city_park', 'luna'
@@ -57,13 +57,13 @@ end &! --- qwladdy ---
 if $ARGS[0] = 'qwnamedy':
 	act '<<$pcs_nickname>>':
 		cla
-		vladimirQW = 10
+		vladimirQW['stage'] = 10
 		'"<<$pcs_nickname>>," you introduce yourself.'
 		'Vladimir smiled. "A beautiful name that suits you perfectly. Unfortunately I have to go, but I would like to see you again. If you leave me your phone number, I could call you tomorrow. I could take you out to dinner at a restaurant."'
 
 		act 'No (Go)':
 			cla
-			vladimirQW = 2
+			vladimirQW['stage'] = 2
 			'You decline and walk away, leaving the man standing.'
 
 			act 'Leave':gt 'city_park', 'luna'
@@ -71,9 +71,9 @@ if $ARGS[0] = 'qwnamedy':
 
 		act 'Give him your number':
 			cla
-			vladimirQW = 20
-			vladimirday = daystart
-			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirday ! daystart and hour >= 15 and hour <= 17", 1
+			vladimirQW['stage'] = 20
+			vladimirQW['day'] = daystart
+			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! 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.'
 
@@ -88,14 +88,14 @@ if $ARGS[0] = '2':
 
 	act 'Hello, of course I remember':
 		cla
-		vladimirQW = 21
+		vladimirQW['stage'] = 21
 		'"Hey, of course I remember. How could I forget?" You respond.'
 		'"The offer to take you to dinner at the restaurant is still on the table. Would you like to go?" Vladimir asks.'
 
 		act 'Oh, I have a lot to do today, I''m sorry.':
 			cla
-			vladimirQW = 20
-			vladimirday = daystart
+			vladimirQW['stage'] = 20
+			vladimirQW['day'] = daystart
 			'You explain that you simply can''t today, as busy as you are.'
 			'"Okay. Then I''ll call you tomorrow at 16:00." Vladimir promises.'
 
@@ -104,9 +104,9 @@ if $ARGS[0] = '2':
 
 		act 'I wouldn''t mind':
 			cla
-			vladimirQW = 21
-			vladimirday = daystart
-			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirday ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
+			vladimirQW['stage'] = 21
+			vladimirQW['day'] = daystart
+			gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! 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!"'
@@ -121,7 +121,7 @@ if $ARGS[0] = '3':
 
 	act 'Oh, I have a lot to do today, I''m sorry':
 		cla
-		vladimirday = daystart
+		vladimirQW['day'] = daystart
 		'You explain that you simply can''t today, as busy as you are.'
 		'"Okay. Then I''ll call you another time." Vladimir promises.'
 
@@ -130,9 +130,9 @@ if $ARGS[0] = '3':
 
 	act 'I''d like that':
 		cla
-		vladimirQW = 30
-		vladimirday = daystart
-		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirday ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
+		vladimirQW['stage'] = 30
+		vladimirQW['day'] = daystart
+		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! 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."'
 
@@ -146,7 +146,7 @@ if $ARGS[0] = '4':
 
 	act 'Oh, I have a lot to do today, I''m sorry':
 		cla
-		vladimirday = daystart
+		vladimirQW['day'] = daystart
 		'You explain that you simply can''t today, as busy as you are.'
 		'"Okay. Then I''ll call you another day." Vladimir promises.'
 
@@ -155,9 +155,9 @@ if $ARGS[0] = '4':
 
 	act 'I''d like that':
 		cla
-		vladimirQW = 40
-		vladimirday = daystart
-		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirday ! daystart and hour >= 15 and hour <= 17 and week = 6", 1
+		vladimirQW['stage'] = 40
+		vladimirQW['day'] = daystart
+		gs 'telefon', 'AddContact', 'A108', 'icon_na',"", "", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! 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."'
 
@@ -172,11 +172,11 @@ if $ARGS[0] = 'telephone_call':
 	gs 'stat'
 	gs 'telefon','phone_ring'
 
-	if vladimirQW = 20:
+	if vladimirQW['stage'] = 20:
 		gt 'vladimirQW_loc', '2'
-	elseif vladimirQW = 25 and week = 6:
+	elseif vladimirQW['stage'] = 25 and week = 6:
 		gt 'vladimirQW_loc', '3'
-	elseif vladimirQW = 35 and week = 6:
+	elseif vladimirQW['stage'] = 35 and week = 6:
 		gt 'vladimirQW_loc', '4'
 	end
 end

+ 6 - 6
locations/vladimirQW_meet.qsrc

@@ -2,8 +2,8 @@
 
 if $ARGS[0] = '':
 	minut += 5
-	vladimirQW = 25
-	vladimirday = daystart
+	vladimirQW['stage'] = 25
+	vladimirQW['day'] = daystart
 	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Vladimir</font></b></center>'
@@ -463,8 +463,8 @@ end &! --- qwpbereg ---
 !! finish of the second date
 if $ARGS[0] = 'qwbereg2':
 	minut += 15
-	vladimirday = daystart
-	vladimirQW = 35
+	vladimirQW['day'] = daystart
+	vladimirQW['stage'] = 35
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/vladimir/car.jpg"></center>'
 	'Once you''ve finished with Wladimir fuck how to berth drove Audi. Glory came out of it and invited you to get in the car.'
@@ -514,8 +514,8 @@ if $ARGS[0] = 'qwmeetdin':
 		minut += 60
 		pcs_energy = 100
 		pcs_hydra = 100
-		vladimirday = daystart
-		vladimirQW = 35
+		vladimirQW['day'] = daystart
+		vladimirQW['stage'] = 35
 		gs 'stat'
 		'The restaurant is the same one from your last meeting with Vladimir. He took you to a specially reserved table. You drank and ate with Vladimir, who spoke little mostly restrainting himself to complimenting you.'