Browse Source

[fixed] Set the correct variables for natbel's lover story. Added the variable to the description. Sveta now properly communicates when the next event happens, as it should.

anjuna krokus 3 weeks ago
parent
commit
5ff25de665
2 changed files with 23 additions and 7 deletions
  1. 18 7
      locations/natbel_chat.qsrc
  2. 5 0
      locations/natbel_cp_1.qsrc

+ 18 - 7
locations/natbel_chat.qsrc

@@ -514,7 +514,7 @@ if $ARGS[0] = 'lover_chat':
 	elseif NatbelQW['FriendLover'] >= 7:
 		if money >= 25 and (week = 5 or week = 6) and (hour = 20 or hour = 21): act 'Ask Natasha to the disco': gt 'natbel_friend', 'disco_2'
 
-	elseif NatbelQW['FriendLover'] >= 8:
+	elseif NatbelQW['disco_invite'] = 3 and NatbelQW['shopping'] = 2:
 		act 'Natasha asks a question': gs 'natbel_chat', 'job_questions'
 	end
 end
@@ -666,6 +666,9 @@ if $ARGS[0] = 'job_question':
 				end
 				'"One second <<$pcs_nickname>>, I''l be back in a moment. Just need to go to the kitchen quickly. I left something on the stove..."'
 
+				natbelQW['StP_trip_daystart'] = daystart + 14 + (13 - week) mod 7		& ! Saturday 2 weeks from now
+				natbelQW['shopping'] = 3
+
 				if temp_runner = 1:
 					gs 'natbel_chat', 'job_questions_runner'
 				else
@@ -800,7 +803,16 @@ if $ARGS[0] = 'job_questions_runner':
 													'Natasha slowly regains her composure. "Oh yes <<$pcs_nickname>>! I''d love that! Thank you so much." She pauses then gives you a big hug then jumps up.'
 													'"One second <<$pcs_nickname>>, I''ll be back in a moment. Just need to go to the kitchen quickly. I left something on the stove and it should be cooked by now..."'
 													'Natasha returns still holding a wooden spoon and sits next to you so you continue.'
-													gs 'natbel_chat', 'job_questions_natbel_returns'
+													'Shall we go Saturday and we can have a look in some of the shops and maybe see if there''s anything we like? How about I pick you up outside between 12:00 and 2:00PM? Whilst we''re there I''ll tell you where I work and I''ll get you a ticket so you can watch the race."'
+													'Natasha''s smile widens. "Oh yes <<$pcs_nickname>>! That''ll be lovely. Umm... However, you need to give me a couple of weeks as I want to arrange a small surprise for you as a thank you for all your help."'
+													'"There''s really no need for anything special Natasha. I was just thinking about a day out and having a browse."'
+													'"Yes I know <<$pcs_nickname>> but I want to. I''ll need a couple of weeks if that''s okay?"'
+													'"Okay... So how about I pick you up outside between 12:00 and 2:00PM in two weeks? "'
+
+													killvar 'temp_city_work'
+													killvar 'temp_pav_work'
+													act 'Keep talking': gt 'natbel_chat', 'chat'
+													act 'Stop talking': gt 'natbelapt', 'natroom'
 												end
 											end
 
@@ -827,12 +839,13 @@ if $ARGS[0] = 'job_questions_runner':
 													'Natasha''s smile widens. "Oh yes <<$pcs_nickname>>! That''ll be lovely. Umm... However, you need to give me a couple of weeks as I want to arrange a small surprise for you as a thank you for all your help."'
 													'"There''s really no need for anything special Natasha. I was just thinking about a day out and having a browse."'
 													'"Yes I know <<$pcs_nickname>> but I want to. I''ll need a couple of weeks if that''s okay?"'
-												
+													'"Okay... So how about I pick you up outside between 12:00 and 2:00PM in two weeks? "'
+
 													act 'Slap':
 														*clr & cla
 														minut += 5
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha41.jpg"></center>'
-														'"Of course Natasha, no problem, a couple of weeks it is." You pause then continue. "Just make sure it doesn..."'
+														'"Of course Natasha, no problem, how about I pick you up outside between 12:00 and 2:00PM in two weeks." You pause then continue. "Just make sure it doesn..."'
 														'Natasha interrupts. "Yes <<$npc_nickname[''A29'']>>!" She says grinning and rolling her eyes.'
 														'"You cheeky mere! If you keep that up you''re asking for a butt slap!" You respond laughing.'
 														'Natasha laughs and stands up then slowly lifts her dress higher and higher exposing her butt and green panties.'
@@ -891,8 +904,6 @@ if $ARGS[0] = 'job_questions_natbel_returns':
 
 			killvar 'temp_city_work'
 			killvar 'temp_pav_work'
-			natbelQW['StP_trip_daystart'] = daystart + 14 + (13-week) mod 7		& ! Saturday 2 weeks from now
-			natbelQW['FriendLover'] = 9
 			act 'Keep talking': gt 'natbel_chat', 'chat'
 			act 'Stop talking': gt 'natbelapt', 'natroom'
 		end
@@ -985,7 +996,7 @@ if $ARGS[0] = 'friend_chat':
 	end
 
 
-	if  NatbelQW['shopping'] = 1 and (NatbelQW['evt_day'] + 14 <= daystart):
+	if NatbelQW['shopping'] = 1 and (NatbelQW['evt_day'] + 14 <= daystart):
 		if (week >= 6 and hour < 15) and money >= 2000: 
 			act 'Go on shopping spree (2:30)': gt 'natbel_friend', 'shopping_spree'
 		elseif (hour >= 15):

+ 5 - 0
locations/natbel_cp_1.qsrc

@@ -40,6 +40,11 @@ NatbelQW['disco_invite'] = 1: Disco invite available
 NatbelQW['disco_invite'] = 2: Invited her to Disco
 NatbelQW['disco_invite'] = 3: Going to disco with Nat
 
+NatbelQW['shopping'] = 1: Planned first shopping trip
+NatbelQW['shopping'] = 2: Completed first shopping trip
+NatbelQW['shopping'] = 3: Planned second shopping trip
+
+
 NatbelQW['chrispaid'] = 1: Sveta leaves Natasha to pay Christina (end quest).
 NatbelQW['chrispaid'] = 2: Sveta tells Natasha she''ll pay Christina.
 NatbelQW['chrispaid'] = 3: Sveta to repay Christina.