Merge remote-tracking branch 'Awesome/master'

locations/anush_bedroom.qsrc

@@ -1,5 +1,5 @@
 # anush_bedroom
-!2022/04/10
+!2024/03/25
 
 !!anushkaQW['first_visit'] = first visit to her apartment
 !!anushkaQW['lunch'] = lunch hookup at school
@@ -354,6 +354,7 @@ if $ARGS[0] = 'night_stand':
 				*clr & cla
 				minut += 30
 				gs 'drugs', 'joint', 1
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/get_high.jpg"></center>'
 				'You take the joint from her and take a hit off it as you sit on the bed next to her. The two of you discuss various topics as you hand the joint back and forth, taking turns taking hits. Before too long, the joint is gone, and you feel pretty high.'
 				act 'Chill out': AnushkaLoc = 2 & gt 'anushkachat', 'chat'
@@ -938,8 +939,8 @@ if $ARGS[0] = 'nush_guitar_teach':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 	'You sit down on the bed next to Anushka and look at her. "Can you teach me how to play the guitar?"'
 	if anushkaQW['knows_guitar'] = 1:
-		'She smiles back at you. "Have you been practising?"'
-		'You nod. "Of course. I''ve been practising what you showed me last time."'
+		'She smiles back at you. "Have you been practicing?"'
+		'You nod. "Of course. I''ve been practicing what you showed me last time."'
 		'She smiles. "Okay then, how good do you feel you are now?"'
 		if instrmusic_lvl < 20:
 			'You look down from her gaze while blushing. "Pretty bad. I don''t really have any clue what I''m doing."'

locations/anushapt.qsrc

@@ -1,5 +1,5 @@
 # anushapt
-!2021/05/02
+!2024/03/25
 !AnushkaLoc tells us where Anvushka is located
 !----------------------------------------------
 !AnushkaLoc = 0 (Anushka not home)
@@ -759,12 +759,13 @@ if $ARGS[0] = 'livingroom':
 	gs 'stat'
 	'<center><b><font color = maroon>Living room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/living.jpg"></center>'
-	if livingev = 1 and ((week < 6 and hour >= 20 and hour < 23) or (week >= 6 and (hour >= 8 and hour < 16) or (hour >= 18 and hour < 23))):
+	if livingev = 1 and anushkaQW['dad_mom_livingroom'] = 0 and ((week < 6 and hour >= 20 and hour < 23) or (week >= 6 and (hour >= 8 and hour < 16) or (hour >= 18 and hour < 23))):
 		livingev_day = daystart
 		'As you start to walk into the living room, you overhear some muffled voices that are getting louder and louder as they go on... You notice that the door is ajar and sneak towards it to see if you can make out what is being said.'
 		act 'Leave':gt 'anushapt','hallway'
 		act 'Listen in':
 			cla & *nl
+			anushkaQW['dad_mom_livingroom'] = 1
 			valedlisten = daystart
 			'You see Valeria standing in front of the TV, yelling at Eduard. "I want to see that little bitch punished! And for real this time!!!"'
 			'Eduard sighs, clearly annoyed by Valeria being in the way. "What''s wrong now Valeria? I just want to relax and watch the TV..."'
@@ -1081,11 +1082,12 @@ if $ARGS[0] = 'kitchen':
 	gs 'kit_din'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/kitchen.jpg"></center>'
-	if kitchenev = 1 and ((week < 6 and hour >= 20 and hour < 23) or (week >= 6 and (hour >= 8 and hour < 16) or (hour >= 18 and hour < 23))):
+	if kitchenev = 1 and anushkaQW['dad_mom_kitchen'] = 0 and ((week < 6 and hour >= 20 and hour < 23) or (week >= 6 and (hour >= 8 and hour < 16) or (hour >= 18 and hour < 23))):
 		'As you start to enter the kitchen, you overhear some muffled voices that are getting louder and louder as they go on... You notice that the door is ajar and sneak towards it to see if you can make out what is being said.'
 		act 'Leave':gt 'anushapt','hallway'
 		act 'Listen':
 			*clr & cla
+			anushkaQW['dad_mom_kitchen'] = 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/edval_kitchen.jpg"></center>'
 			'Anushka''s mother Valeria is standing with her hands in the air, talking loudly to Eduard. "What is wrong with your daughter? She always has an attitude towards me!"'
 			'Eduard tries his best to keep his calm. "Well if you were a better mother, then maybe she wouldn''t have turned out like this!"'

locations/pav_parkev.qsrc

@@ -1379,7 +1379,8 @@ if $ARGS[0] = 'male_gopnik_beer':
 										end									
 									else
 										'Despite your struggles, none of the other guys seem to care, as they let you slowly stumble away on your own.'
-									act 'Leave':gt 'pav_park', 'deeper_park'
+										act 'Leave':gt 'pav_park', 'deeper_park'
+									end
 								end
 							else
 								act 'I''m fine (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1636,7 +1637,7 @@ if $ARGS[0] = 'gopnik_beer':
 											gs 'stat'
 											'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad2.jpg"></center>'
-											'You pull away from him and stagger away. Niko watches you for a few seconds, before shrugging and saying, "Alright... I guess you''re fine. Travel safely my princess." He then turns around and joins Valentin, as he heads toward further down the park.'
+											'You pull away from him and stagger away. Niko watches you for a few seconds, before shrugging and saying, "Alright... I guess you''re fine. Travel safely, my princess." He then turns around and joins Valentin, as he heads toward further down the park.'
 											act 'Leave':gt 'pav_park', 'deeper_park'
 										end
 									else
@@ -1648,7 +1649,7 @@ if $ARGS[0] = 'gopnik_beer':
 										gs 'stat'
 										'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'
-										'Knowing that Niko is right, you nod, before he lifts you up, and carries you through the park, while chatting a bit, but sadly, you are too drunk to focus on what he is saying, as the world seems to spin around you. Feeling so wasted, you spend the next few minute trying not to fall over, as Niko expertly carries you out of the park, toward an apartment complex.'										
+										'Knowing that Niko is right, you nod, before he lifts you up, and carries you through the Park, while chatting a bit, but sadly, you are too drunk to focus on what he is saying, as the world seems to spin around you. Feeling so wasted, you spend the next few minute trying not to fall over, as Niko expertly carries you out of the park, toward an apartment complex.'										
 										act 'See where Niko takes you': gt 'NikoEv', 'niko_park_exploit'
 									end
 								elseif hotcat >= 7:
@@ -1719,7 +1720,7 @@ if $ARGS[0] = 'niko_beer':
 	*nl
 	'Lavrenti asks. "Damn Niko, can I borrow her for a bit?"'
 	'Niko: "Depends on how much you''re willing to pay. <<pcs_nickname>> doesn''t come cheap."'
-	if grupTipe is 4:
+	if grupTipe = 4:
 		'Lena smirks. "Is she your little piggy bank Niko? I never took you for a cuck."'
 		'Niko feigns ignorance, as he responds, "Of course not, I would never actually offer up my girl to anyone. I take good care of my girls."'
 		'Vitek shakes his head. "Girls? As if any of them are lining up for you."'
@@ -1729,8 +1730,8 @@ if $ARGS[0] = 'niko_beer':
 			*clr & cla
 			'<center><b><h4><font color=#FF006C><<"Yalena [Lena] Kotov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big20.jpg"></center>'
-			'Niko replies with an exaggerated tone, "Oh, you wound me. The reason I don''t have the ladies lined up is because I''m a one girl guy." He then gently brushes your cheek.'
-			'Lera retorts, "And that''s why you are always hitting on Lena? Come one Niko, no one believes your shit."'
+			'Niko replies with an exaggerated tone, "Oh, you wound me. The reason I don''t have the ladies lined up is because I''m a one-girl guy." He then gently brushes your cheek.'
+			'Lera retorts, "And that''s why you are always hitting on Lena? Come on Niko, no one believes your shit."'
 			'Vitek grunts, obviously not alright with Niko flirting with Lena. "Be careful sticking your nose where it doesn''t belong, Niko. You are not someone I would trust with my sister."'
 			'Lena rolls her eyes, before responding, "Mind your own business Vitek."'
 			*nl		
@@ -1766,7 +1767,7 @@ if $ARGS[0] = 'niko_beer':
 						'Feeling so enamored by his comment, you give Niko a wide smile, as you reply, "I feel the same way Niko, my mighty knight."'
 						'You can hear one of the boys mocking your comment. "Aww, my mighty knight..." You turn to see Vasily mocking you, before you roll your eyes, and return your focus to Niko.'
 						*nl
-						'Niko gently rubs on your back, as you both sit comfortably pressed up against each other on the bench, until you both finish your beers. Niko then releases you, and says, "It''s been a blast as always <<pcs_nickname>>, now I should get going."'
+						'Niko gently rubs on your back, as you both sit comfortably pressed up against each other on the Bench, until you both finish your beers. Niko then releases you, and says, "It''s been a blast as always <<pcs_nickname>>, now I should get going."'
 						'You nod your head, before responding, "Alright, but be sure to travel home safely. You took a big hit."'
 						'Niko chuckles, "Don''t worry about me. I''m invincible." He then turns around, and walks away.'
 						act 'Continue': gt 'pav_park', 'deeper_park'
@@ -1835,7 +1836,7 @@ if $ARGS[0] = 'niko_beer':
 				act 'Just wait':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
-					'Niko chuckles, before replying, "I''ve always been good teacher Lena, if you only gave me a chance then you would find out." He gives her a wolfish grin, as she looks back at him with a smirk.'
+					'Niko chuckles, before replying, "I''ve always been a good teacher Lena, if you only gave me a chance then you would find out." He gives her a wolfish grin, as she looks back at him with a smirk.'
 					'"Is that so..." You then see Vitek suddenly shove Niko back, before saying in a commanding tone, "Back the fuck off my sister Niko! You have your own slut, you''re not tricking my sister into doing shit like that."'
 					*nl
 					'Obviously not taking the situation seriously, Niko says, "Well all girls can be trained, you just need the right teacher..."'
@@ -1847,10 +1848,10 @@ if $ARGS[0] = 'niko_beer':
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big24.jpg"></center>'
 						'After Vitek sits down, all attention of the crowd switches back to you, as cum leaks down your face. You see the gopniks all jeering at you while Pauline continues recording you.'
 						'Vasily examines your face carefully while saying, "Look at this fine piece of art. Is this your masterpiece Niko?" He then chuckles, as Niko grunts in pain.'
-						if grupTipe is 1:
+						if grupTipe = 1:
 							'Dan then laughs, before saying "She is definitely a good cock sucker, I see now why she is so popular. I bet she sucks Dimka''s cock for her popularity."'
 							'Carefully walking around your front, to get every angel, Pauline continues recording you, as she says, "Well I''ll make sure that she''s even more famous. Say hello to your audience <<pcs_nickname>>! I''m sure Dimka and Igor would love to see you again." The last bit she adds in disgust, like she finds the mere thought of it disgusting. "I bet you even suck Marcus big black cock."'	
-						if grupTipe is 2:
+						elseif grupTipe = 2:
 							'Dan then laughs, before saying "She is definitely a good cock sucker, I wonder if the other jock girls work out their tongue like her."'
 							'Carefully walking around your front, to get every angel, Pauline continues recording you, as she says, "I bet they do, and I''ll make sure that <<pcs_nickname>> here, becomes a famous jock. Say hello to your audience <<pcs_nickname>>! I''m sure Ivan and Fedor would love to see you again. Maybe you can suck their dicks at the game. Would make for a great half time show."'
 						else