Browse Source

[fixed/changed] vladimir was bugging out and money offered on subsequent visits is reduced. Reported by Skylah

anjuna krokus 3 weeks ago
parent
commit
7b5d2fcbdc
2 changed files with 28 additions and 11 deletions
  1. 19 8
      locations/vladimirQW_loc.qsrc
  2. 9 3
      locations/vladimirQW_meet.qsrc

+ 19 - 8
locations/vladimirQW_loc.qsrc

@@ -1,5 +1,6 @@
 # vladimirQW_loc
 $location_type = 'event_outdoors'
+
 if $ARGS[0] = '':
 	minut += 5
 	menu_off = 1
@@ -89,7 +90,6 @@ if $ARGS[0] = '2':
 
 	act 'Hello, of course I remember':
 		cla
-		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.'
 
@@ -97,10 +97,13 @@ if $ARGS[0] = '2':
 			cla
 			vladimirQW['stage'] = 20
 			vladimirQW['day'] = daystart
+			gs 'telefon', 'SetCallSchedule', 'A108', "", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6"
+
+			!! Don''t think there is any event on sunday??
 			'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.'
 
-			act 'Hang up':gt $loc, $loc_arg
+			act 'Hang up': gt $loc, $loc_arg
 		end
 
 		act 'I wouldn''t mind':
@@ -108,10 +111,12 @@ if $ARGS[0] = '2':
 			vladimirQW['stage'] = 21
 			vladimirQW['day'] = daystart
 			gs 'telefon', 'SetCallSchedule', 'A108', "", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6"
+
 			'"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!"'
-			act 'Hang up':gt $loc, $loc_arg
+
+			act 'Hang up': gt $loc, $loc_arg
 		end
 	end
 end
@@ -123,10 +128,12 @@ if $ARGS[0] = '3':
 	act 'Oh, I have a lot to do today, I''m sorry':
 		cla
 		vladimirQW['day'] = daystart
+		gs 'telefon', 'SetCallSchedule', 'A108', "", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6"
+
 		'You explain that you simply can''t today, as busy as you are.'
 		'"Okay. Then I''ll call you another time." Vladimir promises.'
 
-		act 'Hang up':gt $loc, $loc_arg
+		act 'Hang up': gt $loc, $loc_arg
 	end
 
 	act 'I''d like that':
@@ -137,7 +144,7 @@ if $ARGS[0] = '3':
 		'"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."'
 
-		act 'Hang up':gt $loc, $loc_arg
+		act 'Hang up': gt $loc, $loc_arg
 	end
 end
 
@@ -148,6 +155,8 @@ if $ARGS[0] = '4':
 	act 'Oh, I have a lot to do today, I''m sorry':
 		cla
 		vladimirQW['day'] = daystart
+		gs 'telefon', 'SetCallSchedule', 'A108', "", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6"
+
 		'You explain that you simply can''t today, as busy as you are.'
 		'"Okay. Then I''ll call you another day." Vladimir promises.'
 
@@ -173,11 +182,13 @@ if $ARGS[0] = 'telephone_call':
 	gs 'stat'
 	gs 'telefon','phone_ring'
 
-	if vladimirQW['stage'] = 20:
+	if vladimirQW['stage'] = 20 or vladimirQW['stage'] = 21:
 		gt 'vladimirQW_loc', '2'
-	elseif vladimirQW['stage'] = 25 and week = 6:
+	elseif vladimirQW['stage'] = 25 or vladimirQW['stage'] = 30:
 		gt 'vladimirQW_loc', '3'
-	elseif vladimirQW['stage'] = 35 and week = 6:
+	elseif vladimirQW['stage'] = 35 or vladimirQW['stage'] = 40:
+		gt 'vladimirQW_loc', '4'
+	else
 		gt 'vladimirQW_loc', '4'
 	end
 end

+ 9 - 3
locations/vladimirQW_meet.qsrc

@@ -534,10 +534,16 @@ if $ARGS[0] = 'qwmeetdin':
 					InYouHome = 1
 					harakBoy = 0
 					finance = 2
-					money += 5000
-					'You walked with Vladimir into the bedroom. Vladimir sceptically cast his gaze about your humble abode and took out his wallet. "I hope you will not mind if I give you some money?" He handed you five thousand. You took the money you were offered.'
+					if vladimirQW['money_given'] = 0:
+						temp_money += 5000
+					else
+						temp_money += 2000
+					end
+					money += temp_money
+					vladimirQW['money_given'] += temp_money
+					'You walked with Vladimir into the bedroom. Vladimir sceptically cast his gaze about your humble abode and took out his wallet. "I hope you will not mind if I give you some money?" He handed you' + iif(temp_money = 5000, 'five', 'two') + ' thousand. You took the money you were offered.'
 
-					act 'Continue':gt 'BDsex', 'start'
+					act 'Continue': gt 'BDsex', 'start'
 				end
 			elseif husband > 0 and VladimirKnowAboutHusband = 0:
 				act 'I am married':