Browse Source

[fixed] various fixes for Nat friendship path from Hooded Silence

Kevin_Smarts 1 year ago
parent
commit
52a03a23a2
3 changed files with 61 additions and 30 deletions
  1. 9 7
      locations/gschool_jock_chats.qsrc
  2. 6 4
      locations/natbel_chat.qsrc
  3. 46 19
      locations/natbel_friend.qsrc

+ 9 - 7
locations/gschool_jock_chats.qsrc

@@ -396,8 +396,12 @@ if $ARGS[0] = 'christina':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
 	if NatbelQW['chrispaid'] = 2 and money >= 500:
 		act 'Pay off Natasha''s debt (500 <b>₽</b>)':
+			*clr & cla		
+			money -= 500
 			NatbelQW['chrispaid'] = 3
 			NatbelQW['evt_day'] = daystart
+			gs 'stat'
+			
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
 			'You see Christina chatting with Lina when you approach her. As Christina notices you, she glares at you before turning to Lina.'
 			'"Later, Lina," she says. Lina smiles at Christina and leaves.'
@@ -409,8 +413,8 @@ if $ARGS[0] = 'christina':
 			'"Something like that," you reply. "Anyways, don''t lend her any more money."'
 			'"Wasn''t planning to. It took her long enough to pay this one back!"'
 			'She counts out the money and a slight smile crosses her face. "Alright, we''re done here. You can leave now," she says.'
-			money -= 500
-			gs 'stat'
+			
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif christinaQW['subpath'] >= 2:
 		if christinaQW['subpath'] >= 3:
@@ -459,7 +463,7 @@ if $ARGS[0] = 'christina':
 		'Seeing you walking towards her, she tenses up and whispers "What do you need?"'
 		'"Nothing," you say cheerfully. "Just came over to say hi."'
 		'"Uh, hi. Well, I gotta go, class is starting." Grabbing her stuff, she flees from your sight. Chuckling to yourself, you do the same.'
-	else
+	elseif
 		if fame['pav_slut'] >= 200:
 			'"What does the biggest school slut want from me? Don''t you have a cock to suck somewhere?" Christina asks mockingly.'
 			'"Shut up Christina! I''m tired of your bullshit," you tiredly reply.'
@@ -480,9 +484,8 @@ if $ARGS[0] = 'christina':
 	! Natasha quest line:
 
 	if christinaQW['fight'] = 1 and NatbelQW['FriendLover'] = 2:
-		act 'Talk to Christina':
+			act 'Talk to Christina':
 			NatbelQW['chrispaid'] = 1
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/18.jpg"></center>'
 			'You see Christina chatting with Lina when you approach her. As Christina notices you, she glares at you and then turns to Lina.'
 			'"Later, Lina," she says. Lina smiles at Christina and leaves.'
 			'Christina turns back to you, "What do you want, <<$pcs_nickname>>?"'
@@ -494,10 +497,9 @@ if $ARGS[0] = 'christina':
 			'She nods in agreement and abruptly storms off.'
 			'With a grin you mutter to yourself, "Thank you, your highness."'
 		end
-	elseif christinaQW['blackmail'] = 2 and  NatbelQW['FriendLover'] = 2:
+	elseif christinaQW['blackmail'] = 2 and NatbelQW['FriendLover'] = 2:
 		act 'Talk to Christina':
 			NatbelQW['chrispaid'] = 1
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/18.jpg"></center>'
 			'You see Christina chatting with Lina when you approach her. As Christina notices you, she glares at you and then turns to Lina.'
 			'"Later, Lina," she says. Lina smiles at Christina and leaves.'
 			'Christina turns back to you, "What do you want, <<$pcs_nickname>>?"'

+ 6 - 4
locations/natbel_chat.qsrc

@@ -237,7 +237,7 @@ if $ARGS[0] = 'chat':
 			else
 				act 'Keep talking': gt 'natbel_chat', 'chat'
 				act 'Stop talking': gt 'natbelapt', 'natroom'
-				if NatbelQW['chrispaid'] = 1  and (NatbelQW['evt_day'] + 8) >= daystart:
+				if NatbelQW['chrispaid'] = 1  and (NatbelQW['evt_day'] + 1) <= daystart:
 					act 'Natasha repaid Christina''s debt':
 						*clr & cla
 						minut += 5
@@ -258,7 +258,7 @@ if $ARGS[0] = 'chat':
 						NatbelQW['chrispaid'] = 4
 						act 'Return to her room': gt 'natbelapt', 'natroom'
 					end
-				elseif NatbelQW['chrispaid'] = 3 and (NatbelQW['evt_day'] + 8) >= daystart:
+				elseif NatbelQW['chrispaid'] = 3 and (NatbelQW['evt_day'] + 1) <= daystart:
 					act 'You paid the debt to Christina':
 						*clr & cla
 						NatbelQW['chrispaid'] = 4
@@ -293,7 +293,9 @@ if $ARGS[0] = 'chat':
 
 			act 'Go for a walk': gt 'natbel_friend', 'go_for_walk'
 			act 'Go to the park': gt 'natbel_friend', 'go_to_park'
-			act 'Go to the cafe': gt 'natbel_friend', 'go_to_del_greco'
+			if hour => 8 and hour <= 19:
+				act 'Go to the cafe': gt 'natbel_friend', 'go_to_del_greco'
+			end
 			act 'Go hand out flyers at the park': gt 'natbel_friend', 'go_to_park_and_work'
 		end
 
@@ -304,7 +306,7 @@ if $ARGS[0] = 'chat':
 			act 'You spot some fashion magazines':
 				*clr & cla
 				minut += 15
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/Natasha6.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha6.jpg"></center>'
 				'You give Natasha a supportive hug and an encouraging smile. Wanting to change the subject, your eyes wander around her room and you notice some magazines on her desk. "Oh, what are these?" you ask as you walk over and take a closer look.'
 				'"Some fashion magazines I picked up," she says with a smile crossing her face. "Do you want to look through them with me?"'
 				'You agree, thinking it would be a good distraction from talking about debts and Christina.'

+ 46 - 19
locations/natbel_friend.qsrc

@@ -22,6 +22,20 @@ if $ARGS[0] = 'go_for_walk':
 
 		act 'Go to the cafe':
 			minut += 30
+			!! milkshake code
+			frost = 1
+			fat += 6
+			pcs_health += 5
+			pcs_mood += 20
+			pcs_energy += 8
+			if pcs_hydra >= 100:
+				pcs_hydra += 50
+			else
+				pcs_hydra += 100
+			end
+			cumspclnt = 2
+			gs 'cum_cleanup'
+			pcs_breath = 0
 			gs 'stat'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/cafe1.jpg"></center>'
@@ -122,6 +136,18 @@ if $ARGS[0] = 'go_to_del_greco':
 	menu_off = 1
 	minut += 30
 	money -= 240
+	frost = 1
+	fat += 2
+	pcs_health += 5
+	pcs_mood += 15
+	pcs_energy += 8
+	if pcs_hydra >= 100:
+		pcs_hydra += 30
+	else
+		pcs_hydra += 60
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/delparco1.jpg"></center>'
@@ -138,24 +164,23 @@ if $ARGS[0] = 'go_to_del_greco':
 		'Natasha looks sad and responds "There''s nothing I''d like more but I simply can''t afford it. Sometimes I kid myself but that''s when I''ve borrowed money and I need to stop doing that as it keeps getting on top of me." She takes a deep breath and continues, "It''s so frustrating as I love fashion and want to be a cool girl but if I''m honest it''s simply out of reach and it makes it pretty difficult to even have a friend let alone a boyfriend!'
 		'You sympathise and let her know that having a boyfriend isn''t the answer to everything as a boyfriend relationship comes with it''s own difficulties and challenges although with some benefits too. There is a brief silence as you both think inwardly reflect further on your own lives.'
 		'You nod and give her hand a friendly squeeze and smiling at her say "Well who knows what the future may hold." forty five minutes later you decide to...'
+	end
+	act 'Be flirty':
+		NatbelQW['romance'] += 1
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/Hands.jpg"></center>'
+		'You reach over and place your hand on hers and squeeze it gentle, leaving your hand holding hers. "I know; I just wanted to treat you, you mean a lot to me. Maybe we can do more stuff like this in the future if you like?"'
+		'Natasha smiles then after a moment, she looks around at the other people around, after which she gently pulls her hand away. You can tell it made her a little uncomfortable but she didn''t seem to mind it to much. "There''s nothing I''d like more but I simply can''t afford it. Sometimes I kid myself but that''s when I''ve borrowed money and I need to stop doing that as it keeps getting on top of me."'
+		*nl
+		'Natasha continues, "You know Sveta this has been great... A lovely walk with a real friend who speaks to me as a person rather than judging me." She lets out a big sigh, "Also some time when I can just switch off."'
+		'You are a little confused and look at her quizzically "Well I don''t judge but I like you, you are a good friend who is nice to me. That means a lot."'
+		'"You know Sveta it''s also nice that you made the choice to come here with me and took me out of the flat. Sometimes I have difficulty making even the smallest decision." Natasha smiles at you and squeezes your hand, "You know it''s nice that I can spend some time where I didn''t have to think or make decisions, just enjoy life."'
+		*nl
+		'You look at her and understand that her life if pretty much a constant struggle and can sympathise as although your family are not well off they are in a better position than Natasha and her mum. "You know what Natasha you can have some down time with me, I like being with you and caring for you. I don''t mind making decisions... You probably don''t want to know some of the stuff I''ve had to do to get ahead."'
+		'Natasha looks at you and goes to respond then thinks better of it and just gives you a lovely smile and squeezes your hand again.'
+		'"OK Natasha it''s been lovely but I guess it''s time to head back."'
 
-		act 'Be flirty':
-			NatbelQW['romance'] += 1
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/Hands.jpg"></center>'
-			'You reach over and place your hand on hers and squeeze it gentle, leaving your hand holding hers. "I know; I just wanted to treat you, you mean a lot to me. Maybe we can do more stuff like this in the future if you like?"'
-			'Natasha smiles then after a moment, she looks around at the other people around, after which she gently pulls her hand away. You can tell it made her a little uncomfortable but she didn''t seem to mind it to much. "There''s nothing I''d like more but I simply can''t afford it. Sometimes I kid myself but that''s when I''ve borrowed money and I need to stop doing that as it keeps getting on top of me."'
-			*nl
-			'Natasha continues, "You know Sveta this has been great... A lovely walk with a real friend who speaks to me as a person rather than judging me." She lets out a big sigh, "Also some time when I can just switch off."'
-			'You are a little confused and look at her quizzically "Well I don''t judge but I like you, you are a good friend who is nice to me. That means a lot."'
-			'"You know Sveta it''s also nice that you made the choice to come here with me and took me out of the flat. Sometimes I have difficulty making even the smallest decision." Natasha smiles at you and squeezes your hand, "You know it''s nice that I can spend some time where I didn''t have to think or make decisions, just enjoy life."'
-			*nl
-			'You look at her and understand that her life if pretty much a constant struggle and can sympathise as although your family are not well off they are in a better position than Natasha and her mum. "You now what Natasha you can have some down time with me, I like being with you and caring for you. I don''t mind making decisions... You probably don''t want to know some of the stuff I''ve had to do to get ahead."'
-			'Natasha looks at you and goes to respond then thinks better of it and just gives you a lovely smile and squeezes your hand again.'
-			'"OK Natasha it''s been lovely but I guess it''s time to head back."'
-
-			act 'Return to her room': gt 'natbelapt', 'natroom'
-		end
+		act 'Return to her room': gt 'natbelapt', 'natroom'
 	end
 end
 
@@ -214,6 +239,7 @@ if $ARGS[0] = 'shopping_spree':
 			act 'Head to A Cut Above':
 				*clr & cla
 				minut += 35
+				money -= 700
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha10a.jpg"></center>'
 				'You grab Natasha''s hand and head towards the commercial district and into A Cut Above.'
@@ -232,8 +258,9 @@ if $ARGS[0] = 'shopping_spree':
 					act 'Go to G&M':
 						*clr & cla
 						minut += 30
+						money -= 1300
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/Natasha11.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha11.jpg"></center>'
 						'The two of you make your way to G&M and start looking for clothes, with a focus on dresses.'
 						'You spend several minutes picking and choosing between various outfits until you have a small assortment of clothes that you can both agree on. Natasha steps into the dressing room to change, stepping out to show off each dress.'
 						'Natasha has difficulty choosing between three of the outfits and asks for you to make the final choice. You decide on a nice party dress. "Okay, <<$pcs_nickname>>," she says, smiling. "Then that''s the one. It''ll look much nicer than what I''ve currently got at home."'
@@ -444,7 +471,7 @@ if $ARGS[0] = 'disco_2_cont':
 	gs 'stat'
 
 	!!On arrival Sveta dances with Natasha. Please use the scene in 'zNat dance', enclosed.
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/natasha_sveta_dance.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/PLEASE SEE ABOVE NOTE.jpg"></center>'
 	'After arriving at the disco, you have a couple of dances together then head over to a table and chat.'
 	'Katja and Mefodiy approach the two of you and comment on Natasha''s new look and dress, leaving her beaming with happiness.'
 	*nl