Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

glife.qproj

@@ -387,7 +387,6 @@
 		<Location name="bdsm_dressing"/>
 		<Location name="bdsm_landing"/>
 		<Location name="bdsm_dining"/>
-		<Location name="bdsm_library"/>
 		<Location name="bdsm_ballroom"/>
 		<Location name="bdsm_garden"/>
 		<Location name="bdsm_conservatory"/>
@@ -396,7 +395,6 @@
 		<Location name="bdsm_bedwest"/>
 		<Location name="bdsm_bedeast"/>
 		<Location name="bdsm_gameroom"/>
-		<Location name="bdsm_livingroom"/>
 		<Location name="bdsm_bathrooms"/>
 	</Folder>
 	<Folder name="Trade Representative">

locations/Cheatmenu_din.qsrc

@@ -861,8 +861,8 @@ $cheatmenu['looks'] = {
 	'You have <<$titsize>> breasts'
 	if tits => 0 and tits < 11:'<a href="exec: bodyVars[''bust_silicone''] += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(silicone)</a>'
 	if bodyVars['bust_silicone'] => 1:'<a href="exec: bodyVars[''bust_silicone''] -= 5 & dynamic $cheatmenu[''looks'']">Shrink breasts(silicone)</a>'
-	if tits => 0 and tits < 11:'<a href="exec: pcs_mass[''bust''] += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(natural)</a>'
-	if pcs_mass['bust'] => 1: '<a href="exec: pcs_mass[''bust''] -= 5 & titreduc = 1 & dynamic $cheatmenu[''looks'']">Shrink breasts(natural)</a>'
+	if tits => 0 and tits < 11:'<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_bust'', 5">Enlarge breasts(natural)</a>'
+	if pcs_mass['bust'] => 1: '<a href="exec: titreduc = 1 & gs ''Cheatmenu_din'', ''change_pcs_mass_bust'', -5">Shrink breasts(natural)</a>'
 	*nl
 	if pcs_butt <= 4:
 		$pcs_butt[1] = 'flat'
@@ -977,9 +977,27 @@ $cheatmenu['looks'] = {
 
 if $ARGS[0] = 'change_pcs_mass_body':
 	gs 'body', 'Set_mass_distribution_using_body', pcs_mass['body'] + ARGS[1]
+	pcs_mass['body_message'] = pcs_mass['body']
 	dynamic $cheatmenu['looks']
 end
 
+if $ARGS[0] = 'change_pcs_mass_bust':
+	pcs_mass['bust'] += ARGS[1]
+	pcs_mass['bust_gen'] += ARGS[1]
+	if pcs_mass['bust'] < 2: pcs_mass['bust'] = 2
+	if pcs_mass['bust_gen'] < 2: pcs_mass['bust_gen'] = 2
+	pcs_mass['bust_message'] = pcs_mass['bust']
+	dynamic $cheatmenu['looks']
+end
+
+if $ARGS[0] = 'change_pcs_mass_butt':
+	pcs_mass['butt'] += ARGS[1]
+	pcs_mass['butt_gen'] += ARGS[1]
+	if pcs_mass['butt'] < 2: pcs_mass['butt'] = 2
+	if pcs_mass['butt_gen'] < 2: pcs_mass['butt_gen'] = 2
+	pcs_mass['butt_message'] = pcs_mass['butt']
+	dynamic $cheatmenu['looks']
+end
 
 if $ARGS[0] = 'vagenlarge':
 	if pcs_vag = 0:

locations/FedorEv.qsrc

@@ -17,15 +17,15 @@ if $ARGS[0] = '' or $ARGS[0] = 'Start':
 		gt 'FedorEv', 'Strela Chat'
 	elseif FedorvsDimka = 2:
 		gt 'FedorEv4', 'Dimka Aftermath'
-	elseif GorSlut = 1 and fedorkoztalk = 0 and FedorLove = 0:
+	elseif fedorKozlovQW >= 10 and fame['pav_slut'] >= 150 and fame['pav_slut'] < 250 and fedorkoztalk = 0 and FedorLove = 0:
 		gt 'FedorEv', 'Gorslut'
-	elseif fedorKozlovQW >= 10 and GorSlut > 1 and FedorLove = 0:
+	elseif fedorKozlovQW >= 10 and fame['pav_slut'] >= 250 and FedorLove = 0:
 		gt 'FedorEv', 'Gorslut 2'
 	elseif fedorKozlovQW = 10 and FedorLuv < -5:
 		gt 'FedorEv2', 'Fedor Breakup'
 	elseif fedorKozlovQW >= 10 and dimaFilm = 1 and FedorvsDimka = 1:
 		gt 'FedorMisc', 'Fedor Vs Dimka'	
-	elseif fedorKozlovQW >= 20 and GorSlut < 2:
+	elseif fedorKozlovQW >= 20 and fame['pav_slut'] < 250:
 		if rand(0,1) = 0:
 			gt 'FedorEv', 'Fedor Date 2'
 		else
@@ -43,7 +43,7 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 	gs 'stat'
 	'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
-	'When you approach Fedor, Vitek sees you walking Fedor''s way and follows you right away. He shoves Fedor roughly: "What do you think you''re doing, punk? <<$pcs_firstname>> is <b>mine!</b>" Fedor turns his face to Vitek and calmly says, "I''m not doing anything. <<$pcs_firstname>> is with me now, so you should just leave us alone." Vitek theatrically moves his hand to his ear, and says, in a threatening voice: "What did you just say!?" to which Fedor calmly replies: "You heard me." You can tell that Vitek is seething with rage now, the knuckles on his clenched fists turning white. Fedor moves his face even closer to Vitek''s and repeats, also clenching his fists: "You heard me. Get away from <<$pcs_firstname>>, Vitek."'
+	'You approach Fedor, and wrap you arms around him, as he does the same, embracing you firmly, when Vitek quickly approaches Fedor from behind, before violently shoving Fedor back, and saying in a menacing tone, "What do you think you''re doing, punk? <<$pcs_firstname>> is <b>mine!</b>" Fedor turns his face to Vitek, and firmly states, "<<$pcs_firstname>> is with me now, so why don''t you hit the road?" Vitek theatrically moves his hand to his ear, and says, in a threatening tone, "What did you just say!?" To which Fedor boldly replies, "You heard me." You can tell that Vitek is seething with rage now, as his face turns red, and the knuckles on his clenched fists, turn a deathly white. Fedor moves his face even closer to Vitek''s, and repeats, also clenching his fists: "You heard me. Get away from <<$pcs_firstname>>, Vitek."'
 
 	act 'Tell Vitek you want to be with Fedor':
 		*clr & cla
@@ -52,7 +52,7 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 		gs 'stat'
 		'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
-		'You tell Vitek that you don''t want to be with him any more. You can tell he''s very angry, and has to restrain himself from hitting you in the face. Ultimately he exclaims "Fuck you, bitch!" and leaves, kicking over several garbage cans on the way. You fear that this might not be the last thing you''ve heard of him.'
+		'Not wanting to see Fedor hurt, you tell Vitek the truth, "Vitek please calm down, I know we had some fun together, but I''m with Fedor now." Vitek grimaces, obviously furious with both of you, but fortunately, has enough composure to restrain himself from hitting you in the face. He ultimately, calms himself, before looking you in the eyes, and shouting, "You''re going to pay for this, you fucking cheating, bitch!" Vitek begins walking away, but not before kicking over several garbage cans on the way. you can''t help but shutter at the feeling that this might not be the last you''ve heard of him.'
 
 		act 'Continue':gt $curloc
 	end
@@ -62,9 +62,9 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/Strela/fvsv.jpg"></center>'
-		'Vitek suddenly hits Fedor on the chin with a quick jab, which sends Fedor flying backwards landing on his back on the pavement. Vitek immediately gets on top of him, grabbing him by the collar with his left hand while he keeps punching Fedor in the face with his right hand. Fedor tries to ball up and kick Vitek, but doesn''t manage and Vitek gives him a hard kick in the ribs when he gets back up, which makes Fedor double over grasping his stomach. When Fedor tries to get up, Vitek kicks him against the head which makes Fedor fall over again. Then you see Vasily and Dan coming around the corner, they run towards Vitek when they notice he''s fighting. "Vitek, what''s going on?" Vasily asks. Vitek kicks the now prone Fedor once more in his sides. "This fucker is trying to steal my girl!" he exclaims, pointing at Fedor. For a moment' 
+		'Vitek suddenly hits Fedor on the chin with a quick jab, which sends Fedor flying backwards; landing backward on the pavement. Vitek immediately climbs on top of him, grabbing him by the collar, with his left hand, while punching Fedor in the face with his right one. Fedor tries to ball up and kick Vitek, but doesn''t manage to phase him, as Vitek gives him a hard kick in the ribs when he gets back up, which makes Fedor fall over grasping his stomach. As Fedor tries to get up, Vitek kicks him in his head, which causes Fedor fall over again. As Fedor hits the ground, you see Vasily and Dan coming around the corner, they run towards Vitek when they notice that he''s fighting. "Vitek, what''s going on?" Vasily asks. Vitek kicks the now prone Fedor, once more in his sides. "This fucker is trying to steal my girl!" He exclaims, pointing at Fedor.' 
 		*nl
-		'you''re scared he''s going to beat you up too, but he doesn''t. Dan moves over to Fedor''s barely conscious body and asks: "Hasn''t anyone told you that it''s rude to steal someone''s girl, Fedor? What do you have to say for yourself?" Fedor looks up, barely realizing what''s going on any more. His face is all busted up, but he''s not willing to let it go: "<<$pcs_firstname>> is my girl..." he moans. Vasily laughs like a jackal, while Vitek is furious once more: "You little shit! I''m going to..." Dan interrupts him: "Relax, Vitek. Look at his face. I think he realizes his mistake. Or do you want to make things even worse for yourself?" That last question was directed at Fedor.'
+		'Feeling terrified that Vitek might hurt you too, in his blind rage, you remain silent. Dan moves over to Fedor''s, as Fedor struggles to remain conscious, and asks: "Hasn''t anyone told you that it''s rude to steal someone''s girl, Fedor? What do you have to say for yourself?" Fedor looks up, barely realizing what''s going on any more. His face is all busted up, but he''s not willing to let it go: "<<$pcs_firstname>> is my girl..." He groans. Vasily begins laughing like a jackal, while Vitek furiously shouts at Fedor once more: "You little shit! I''m going to..." Dan interrupts him: "Relax, Vitek. Look at his face. I think he realizes his mistake. Or do you want to make things even worse for yourself?" That last question was directed at Fedor.'
 		'<center><b><font color="maroon"><<"Vasily [Shulga] Shulgin">></font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big11.jpg"></center>'
 
@@ -75,7 +75,7 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 			gs 'stat'
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
-			'Fedor slowly rises to his feet, and softly mutters: "Fucking Gopniks..." Vasily hears him though, and immediately slams his fist into Fedor''s face. Fedor tries to keep standing, but immediately gets hit by Dan as well. No longer able to support his weight, he falls to his hands and knees. Vasily jokes: "Look at him... already assuming the position!" making the other Gopniks laugh. Vitek kicks him in the stomach again, and Fedor lies flat on the ground. Vitek looks at Dan and asks: "Can you believe I have to put up with this shit?"' 
+			'Fedor slowly rises to his feet, and softly mutters: "Fucking Gopniks..." Vasily hears him clearly, immediately slamming his fist into Fedor''s face, but Fedor refuses to fall until he is immediately hit by Dan in his stomach. No longer able to support his weight, he falls to his hands and knees. Vasily jokes: "Look at him... already assuming the position!" Making the other Gopniks laugh. Vitek kicks him in the stomach again, knocking Fedor onto his back, laying flat on the ground. Realizing he won, Vitek looks to Dan and asks: "Can you believe the shit I have to put up with?"' 
 
 			act 'Hear what Dan has to say':
 				*clr & cla
@@ -83,7 +83,7 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 				gs 'stat'			
 				'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/Strela/fedor.jpg"></center>'				
-				'Dan replies: "We could ask Vadim Bely to take care of him. He''ll know how to punish Fedor in a way that he''ll never forget." Vitek nods: "Good plan. Set it up, will you?" He then turns to Fedor "We''re settling this tomorrow, kid. You better be here after school, it''ll be ten times worse for you if you don''t." He then waves for his friends to follow him "Come on guys. Let''s go have some beers in the park, I need to relax. <<$pcs_nickname>>, if you want to join us, you know where we''ll be." Vitek and Dan leave Fedor on the ground and head for the schoolyard exit, but Vasily walks over to Fedor and kicks him in the ribs one more time, still laughing that signature jackal laugh of his. He then joins his friends, and moments later they''re gone.'
+				'Dan replies: "We could ask Vadim Bely to take care of him. He''ll know how to punish Fedor in a way that he''ll never forget." Vitek nods: "Good plan. Set it up, will you?" He then turns to Fedor "We''re settling this tomorrow, kid. You better be here after school, it''ll be ten times worse for you if you don''t." He then waves for his friends to follow him "Come on guys. Let''s go have some beers in the park, I need to relax. <<$pcs_nickname>>, if you want to join us, you know where we''ll be." Vitek and Dan leave Fedor on the ground then head for the schoolyard exit, but as they pass Fedor, Vasily quickly kicks him in the ribs one more time, still laughing that signature jackal laugh of his. He then joins his friends, and moments later, they''re gone.'
 
 				act 'Leave the school courtyard':gt 'pav_residential'
 			end

locations/FedorEv2.qsrc

@@ -575,11 +575,11 @@ if $ARGS[0] = 'Wash Up':
 	menu_off = 1
 	pcs_mood += 25
 	if pcs_health < 100: pcs_health = 100
-	sweat = 7 + rand(0,4)
+	gs 'sweat', 'add', 7 + rand(0,4)
 	hapri = 1
 	mop = 1
 	cumspclnt = 1
-	gs 'cum_cleanup'	
+	gs 'cum_cleanup'
 	frost = 0
 	FedorLuv = 100
 	gs 'boyStat', 'A5'

locations/bdsm_ballroom.qsrc

@@ -11,8 +11,8 @@ if $ARGS[0] = 'ballroom':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/ballroom.jpg"></center>'
 	'Ballroom'
-	act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
-	act 'Go to the atrium': gt 'bdsm_ballroom', 'atrium'
+	act 'Go to the Foyer': gt 'bdsm_hallway', 'foyer'
+	act 'Go to the Atrium': gt 'bdsm_ballroom', 'atrium'
 end
 
 

locations/bdsm_basement.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/basement.jpg"></center>'
 		'Basement, for torture and whatnot'
 
-		act 'Go upstairs to the east wing hallway': killvar 'bdsm_basement_rand' & gt 'bdsm_hallway', 'east'
+		act 'Go upstairs': killvar 'bdsm_basement_rand' & gt 'bdsm_hallway', 'foyer'
 	end
 end
 

locations/bdsm_bathrooms.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'bath':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bath1.jpg"></center>'
 	'A luxrious bathroom, designed to indulge and relax.'
 	gs 'din_van', 'private'
-	act 'Return to east wing landing':gt'bdsm_landing', 'east'
+	act 'Return to landing':gt'bdsm_landing'
 end
 
 if $ARGS[0] = 'ensuite':

locations/bdsm_bedeast.qsrc

@@ -1,18 +1,22 @@
 # bdsm_bedeast
 
-if $ARGS[0] = 'guestB':
+if $ARGS[0] = 'start':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'bdsm_bedeast'
-	$loc_arg = 'guestB'
+	$loc_arg = 'start'
 	$menu_loc = 'bdsm_bedeast'
-	$menu_arg = 'guestB'
+	$menu_arg = 'start'
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedb.jpg"></center>'
-	'Guest bedroom B'
-	act 'Go to the east wing landing': gt 'bdsm_landing', 'east'
+	'Guest bedroom 2'
+	act 'Go to the landing': gt 'bdsm_landing'
+	gs 'bdsm_bedeast', 'events'
+end
+
+if $ARGS[0] = 'events':
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -23,7 +27,7 @@ if $ARGS[0] = 'guestB':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 	
-		act 'Return':gt 'bdsm_bedeast', 'guestB'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -34,7 +38,7 @@ if $ARGS[0] = 'guestB':
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestB'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -45,7 +49,7 @@ if $ARGS[0] = 'guestB':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestB'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 		if bdsmclub['role'] = 'sub':
 			act 'Join them':
 				*clr & cla
@@ -61,26 +65,10 @@ if $ARGS[0] = 'guestB':
 				gs 'arousal', 'end'
 				gs 'stat'
 		
-				act 'Return':gt 'bdsm_bedeast', 'guestB'
+				act 'Return':gt 'bdsm_bedeast', 'start'
 			end
 		end
-	end
-end
-
-if $ARGS[0] = 'guestC':
-    $location_type = 'private'
-	$locclass = 'bedr'
-	$loc = 'bdsm_bedeast'
-	$loc_arg = 'guestC'
-	$menu_loc = 'bdsm_bedeast'
-	$menu_arg = 'guestC'
-	menu_off = 0
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedc.jpg"></center>'
-	'Guest bedroom C'
-	act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
-	if rand (0,100) < 3:
+	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
 		gs 'stat'
@@ -90,7 +78,7 @@ if $ARGS[0] = 'guestC':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestC'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 		if bdsmclub['role'] = 'sub':
 			act 'Join them':
 				*clr & cla
@@ -105,7 +93,7 @@ if $ARGS[0] = 'guestC':
 				gs 'arousal', 'end'
 				gs 'stat'
 		
-				act 'Return':gt 'bdsm_bedeast', 'guestC'
+				act 'Return':gt 'bdsm_bedeast', 'start'
 			end
 		end
 	elseif rand (0,100) < 3:
@@ -119,7 +107,7 @@ if $ARGS[0] = 'guestC':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestC'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -131,24 +119,8 @@ if $ARGS[0] = 'guestC':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestC'
-	end
-end
-
-if $ARGS[0] = 'guestD':
-    $location_type = 'private'
-	$locclass = 'bedr'
-	$loc = 'bdsm_bedeast'
-	$loc_arg = 'guestD'
-	$menu_loc = 'bdsm_bedeast'
-	$menu_arg = 'guestD'
-	menu_off = 0
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedd.jpg"></center>'
-	'Guest bedroom D'
-	act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
-	if rand (0,100) < 3:
+		act 'Return':gt 'bdsm_bedeast', 'start'
+	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
 		gs 'stat'
@@ -158,7 +130,7 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -169,7 +141,7 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 		if bdsmclub['role'] = 'sub':
 			act 'Watch':
 				*clr & cla
@@ -191,7 +163,7 @@ if $ARGS[0] = 'guestD':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Return':gt 'bdsm_bedeast', 'guestD'
+					act 'Return':gt 'bdsm_bedeast', 'start'
 				end
 			end
 		end
@@ -206,7 +178,7 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -218,7 +190,7 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'bdsm_bedeast', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'start'
 	end
 end
 

locations/bdsm_bedwest.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'master':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/masterbed.jpg"></center>'
 	'Master bedroom'
-	act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
+	act 'Go to the landing':gt 'bdsm_landing'
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -77,8 +77,8 @@ if $ARGS[0] = 'guest':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/beda.jpg"></center>'
-	'Guest bedroom A'
-	act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
+	'Guest bedroom'
+	act 'Go to the landing':gt 'bdsm_landing'
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla

locations/bdsm_conservatory.qsrc

@@ -11,8 +11,8 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/conservatory.jpg"></center>'
 'This huge glass fronted room is kept very warm and houses a number of rare and exotic plants.'
 'It is one of the few places where you can just relax and enjoy the opulence of the mansion.'
-act 'Go to the garden': gt 'bdsm_garden', 'garden'
-act 'Go to east wing hall': gt 'bdsm_hallway', 'east'
+act 'Go to the Garden': gt 'bdsm_garden', 'garden'
+act 'Go to the Foyer': gt 'bdsm_hallway', 'foyer'
 
 --- bdsm_conservatory ---------------------------------
 

locations/bdsm_dining.qsrc

@@ -9,8 +9,7 @@ menu_off = 0
 cls
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/diningroom.jpg"></center>'
-act 'Go to foyer': gt 'bdsm_hallway', 'foyer'
-act 'Go to the east wing hallway':gt 'bdsm_hallway', 'east'
+act 'Go to the Foyer': gt 'bdsm_hallway', 'foyer'
 
 if rand (0,100) < 3:
 	menu_off = 1

locations/bdsm_dressing.qsrc

@@ -22,15 +22,15 @@ gs 'stat'
 'Submissives must wear either maid or submissive sex shop clothing or be naked.'
 'Dominants must wear clothing of minimum "expensive" quality.'
 if ($clothingworntype = 'gm_maid' or PCloStyle2 = 1) or CloStyle3 = 2 or $clothingworntype = 'nude':
-	act 'Enter the club''s east wing hall (submissive role)':
+	act 'Enter the club''s foyer (submissive role)':
 		bdsmclub['role'] = 'sub'
-		gt 'bdsm_hallway', 'east'
+		gt 'bdsm_hallway', 'foyer'
 	end
 end
 if PCloQuality >= 5 and bdsmclub['payday'] + 30 > daystart and bdsmclub['domtraining'] = 2:
-	act 'Enter the club''s east wing hall (dominant role)':
+	act 'Enter the club''s foyer (dominant role)':
 		bdsmclub['role'] = 'dom'
-		gt 'bdsm_hallway', 'east'
+		gt 'bdsm_hallway', 'foyer'
 	end
 end
 
@@ -39,7 +39,8 @@ if bdsmclub['payday'] + 30 <= daystart:
 	'You do not have a paid subscription so you cannot enter the club as a dominant, you can go direct to the office and pay from here.'
 	act 'Go to office and pay subscription': gt 'bdsm_mansion', 'office'
 end
-act 'Return to the foyer': gt 'bdsm_hallway', 'foyer'
+
+act 'Go to the Foyer (no role set)': gt 'bdsm_hallway', 'foyer'
 act 'Leave the club':gt 'city_suburbs', 'start'
 
 --- bdsm_dressing ---------------------------------

locations/bdsm_gameroom.qsrc

@@ -8,7 +8,7 @@ $menu_arg = ''
 menu_off = 0
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/games.jpg"></center>'
 'Games room'
-act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
+act 'Go to the landing':gt 'bdsm_landing'
 
 if rand (0,100) < 3:
 	menu_off = 1

locations/bdsm_hallway.qsrc

@@ -1,6 +1,8 @@
 # bdsm_hallway
 
 CLOSE ALL
+
+
 if $ARGS[0] = 'foyer':
     $location_type = 'private'
 	$loc = 'bdsm_hallway'
@@ -13,67 +15,24 @@ if $ARGS[0] = 'foyer':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/foyer.jpg"></center>'
 	'You stand in the grand foyer, your eye is draw towards and up the dual staircases. To your left is the Dinning room, to your right the dressing room.'
 	'Discreetly to the sides of the staircases are two rest rooms.'
-	act 'Leave the club':
-		if $clothingworntype ! 'nude':
-			gt 'city_suburbs', 'start'
-		else
-			msg'<b><font color = red>You need to get dressed.</font></b>'
-			gt'bdsm_hallway','foyer'
-		end
-	end
 
 	if bdsmclub['role'] = '':
+		*nl
+		'You have not chosen a role in the dressing room so you cannot enter the rest of the club.'
 		act 'Go to Dressing room': gt 'bdsm_dressing'
 	else
 		act 'Go to Dressing room': gt 'bdsm_dressing'
-		act 'Go upstairs to the west wing landing':gt 'bdsm_landing', 'west'
-		act 'Go upstairs to the east wing landing':gt 'bdsm_landing', 'east'
+		act 'Go to Reception':gt 'bdsm_mansion', 'reception'
+		act 'Go upstairs':gt 'bdsm_landing'
+		act 'Go down to the basement':gt 'bdsm_basement', 'start'
+		act 'Go to the Rest room': gt 'bdsm_bathrooms', 'restroom'
 		act 'Go to the Dining room':gt 'bdsm_dining'
-		act 'Go to the west wing hallway':gt 'bdsm_hallway', 'west'
-		act 'Go to the east wing hallway':gt 'bdsm_hallway', 'east'
-		act 'Go to the rest room': gt 'bdsm_bathrooms', 'restroom'
+		act 'Go to the Ball room':gt 'bdsm_ballroom', 'ballroom'
+		act 'Go to the Conservatory': gt 'bdsm_conservatory'
+		act 'Go to the Kitchen':gt 'bdsm_kitchen', 'kitchen'
 	end
-end
-
-if $ARGS[0] = 'west':
-    $location_type = 'private'
-	$loc = 'bdsm_hallway'
-	$loc_arg = 'west'
-	$menu_loc = 'bdsm_hallway'
-	$menu_arg = 'west'
-	menu_off = 0
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/hall.jpg"></center>'
-	'You are standing in the west wing hallway, the reception and office are located here. If you need to speak to management, you need to go to the reception.'
-	'The dressing room is to your right and at the end of the hallway is the ball room leading to the atrium.'
-	act 'Go to the foyer':gt 'bdsm_hallway', 'foyer'
-	act 'Go to reception':gt 'bdsm_mansion', 'reception'
-	act 'Go to the libary':gt 'bdsm_library'
-	act 'Go to the Ball room':gt 'bdsm_ballroom', 'ballroom'
-end
-
-if $ARGS[0] = 'east':
-    $location_type = 'private'
-	$loc = 'bdsm_hallway'
-	$loc_arg = 'east'
-	$menu_loc = 'bdsm_hallway'
-	$menu_arg = 'east'
-	menu_off = 0
-	killvar '$locclass'
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/hall.jpg"></center>'
-	'You are standing in the east wing hallway, you can feel the warm air from the conservatory to your right and the dinning room is to your left.'
-	'Further down the hallway are the kitchen, pantry and laundry room. At the end of the hall is are stairs leading up to the guest bedrooms and down to the basement.'
-	act 'Go to the foyer':gt 'bdsm_hallway', 'foyer'
-	act 'Go to the conservatory': gt 'bdsm_conservatory'
-	act 'Go to the dining room':gt 'bdsm_dining'
-	act 'Go to the kitchen':gt 'bdsm_kitchen', 'kitchen'
-	act 'Go to the laundry':gt 'bdsm_kitchen', 'laundry'
-	act 'Go upstairs to the west wing landing':gt 'bdsm_landing', 'west'
-	act 'Go down to the basement':gt 'bdsm_basement', 'start'
 
+!! Random scenes
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -85,7 +44,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return': gt 'bdsm_hallway', 'east'
+		act 'Return': gt 'bdsm_hallway', 'foyer'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -104,7 +63,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return': gt 'bdsm_hallway', 'east'
+		act 'Return': gt 'bdsm_hallway', 'foyer'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -126,7 +85,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return': gt 'bdsm_hallway', 'east'
+		act 'Return': gt 'bdsm_hallway', 'foyer'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -137,7 +96,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return': gt 'bdsm_hallway', 'east'
+		act 'Return': gt 'bdsm_hallway', 'foyer'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -158,7 +117,7 @@ if $ARGS[0] = 'east':
 			gs 'arousal', 'end'
 			gs 'stat'
 		
-			act 'Return': gt 'bdsm_hallway', 'east'
+			act 'Return': gt 'bdsm_hallway', 'foyer'
 		end
 	end
 end

locations/bdsm_kitchen.qsrc

@@ -10,8 +10,9 @@ if $ARGS[0] = 'kitchen':
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/kitchen.jpg"></center>'
-	act 'Go to the east hall': gt 'bdsm_hallway', 'east'
-	act 'look in the pantry': gt 'bdsm_kitchen', 'pantry'
+	act 'Go to the Foyer': gt 'bdsm_hallway', 'foyer'
+	act 'Go to the laundry room': gt 'bdsm_kitchen', 'laundry'
+	act 'Look in the pantry': gt 'bdsm_kitchen', 'pantry'
 end
 
 if $ARGS[0] = 'laundry':
@@ -23,7 +24,7 @@ if $ARGS[0] = 'laundry':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/laundry.jpg"></center>'
 	'The laundry'
-	act 'Go to the east hall': gt 'bdsm_hallway', 'east'
+	act 'Return to the Kitchen': gt 'bdsm_kitchen', 'kitchen'
 end
 
 if $ARGS[0] = 'pantry':

locations/bdsm_landing.qsrc

@@ -2,54 +2,34 @@
 $location_type = 'private'
 killvar '$locclass'
 
-if $ARGS[0] = 'west':
-	*clr & cla
-	$loc = 'bdsm_landing'
-	$loc_arg = 'west'
-	$menu_loc = 'bdsm_landing'
-	$menu_arg = 'west'
-	menu_off = 0
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/wlanding.jpg"></center>'
-	act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
-	act 'Go downstairs to the foyer':gt 'bdsm_hallway', 'foyer'
-	act 'Visit the master bedroom':gt 'bdsm_bedwest', 'master'
-	act 'Visit guest bedroom A':gt 'bdsm_bedwest', 'guest'
-	act 'Visit the games room':gt 'bdsm_gameroom'
+*clr & cla
+$loc = 'bdsm_landing'
+$loc_arg = 'west'
+$menu_loc = 'bdsm_landing'
+$menu_arg = 'west'
+menu_off = 0
+gs 'stat'
+'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/wlanding.jpg"></center>'
 
-	if rand (0,100) < 3:
-		menu_off = 1
-		*clr & cla
-		gs 'stat'
-		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_sex_b1.mp4"></video></center>'
-		'A maid is being helped with the vacuum cleaning by a man in casual clothing, you think about reporting him, but he''s a bit busy right now.'
-		
-		gs 'arousal', 'voyeur_sex', 5
-		gs 'arousal', 'end'
-		gs 'stat'
-		
-		act 'Return': gt 'bdsm_landing', 'west'
-	end
-end
+act 'Go downstairs to the foyer':gt 'bdsm_hallway', 'foyer'
+act 'Visit the master bedroom':gt 'bdsm_bedwest', 'master'
+act 'Visit guest bedroom':gt 'bdsm_bedwest', 'guest'
+act 'Visit guest bedroom 2':gt 'bdsm_bedeast', 'start'
+act 'Go to the bathroom': gt 'bdsm_bathrooms', 'bath'
+act 'Visit the games room':gt 'bdsm_gameroom'
 
-if $ARGS[0] = 'east':
+if rand (0,100) < 3:
+	menu_off = 1
 	*clr & cla
-	killvar '$locclass'
-	$loc = 'bdsm_landing'
-	$loc_arg = 'east'
-	$menu_loc = 'bdsm_landing'
-	$menu_arg = 'east'
-	menu_off = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/elanding.jpg"></center>'
-	act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
-	act 'Go downstairs to the foyer':gt 'bdsm_hallway', 'foyer'
-	act 'Go downstairs to the west wing hallway':gt 'bdsm_hallway', 'west'
-	act 'Visit guest bedroom B':gt 'bdsm_bedeast', 'guestB'
-	act 'Visit guest bedroom C':gt 'bdsm_bedeast', 'guestC'
-	act 'Visit guest bedroom D':gt 'bdsm_bedeast', 'guestD'
-	act 'Go to the bathroom': gt 'bdsm_bathrooms', 'bath'
-	act 'Go to the living room': gt 'bdsm_livingroom'
+	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_sex_b1.mp4"></video></center>'
+	'A maid is being helped with the vacuum cleaning by a man in casual clothing, you think about reporting him, but he''s a bit busy right now.'
+	
+	gs 'arousal', 'voyeur_sex', 5
+	gs 'arousal', 'end'
+	gs 'stat'
+	
+	act 'Return': gt 'bdsm_landing', 'west'
 end
 
 --- bdsm_landing ---------------------------------

locations/bdsm_library.qsrc

@@ -1,27 +0,0 @@
-# bdsm_library
-
-$location_type = 'private'
-$loc = 'bdsm_library'
-$loc_arg = ''
-$menu_loc = 'bdsm_library'
-$menu_arg = ''
-menu_off = 0
-*clr & cla
-gs 'stat'
-'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/library.jpg"></center>'
-'Library, full of books.'
-
-if hour = 18:
-	menu_off = 1
-	pcs_horny += 10
-	*clr & cla
-	gs 'stat'
-	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/librand.mp4"></video></center>'
-	'It looks like the librarian has put one of the books back in the wrong place, she really does seem to like the being punished.'
-	act 'Leave her to it': gt 'bdsm_hallway', 'west'
-end
-
-act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
-
---- bdsm_library ---------------------------------
-

locations/bdsm_livingroom.qsrc

@@ -1,17 +0,0 @@
-# bdsm_livingroom
-
-$location_type = 'private'
-$locclass = 'livingr'
-$loc = 'bdsm_livingroom'
-$loc_arg = ''
-$menu_loc = 'bdsm_livingroom'
-$menu_arg = ''
-menu_off = 0
-*clr & cla
-gs 'stat'
-'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/living.jpg"></center>'
-'Living room'
-act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
-
---- bdsm_livingroom ---------------------------------
-

locations/bdsm_mansion.qsrc

@@ -188,7 +188,7 @@ if $ARGS[0] = 'reception':
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
 		'You go to the reception, Mistress Elektra is sitting at her desk looking a little bored.'
 	end
-	act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
+	act 'Go to the Foyer': gt 'bdsm_hallway', 'foyer'
 	act 'Go to the garage': gt 'bdsm_garden', 'garage'
 end
 

locations/bordel.qsrc

@@ -64,7 +64,7 @@ if $ARGS[0] = 'brothel':
 		else
 			act 'Go to the reception room and wait for customers':
 
-				if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or pcs_makeup < 2 or pcs_leghair > 3 or pcs_pubes > 3 or sweat > 25 or pcs_hairbsh < 1:
+				if cumloc[6] = 1 or cumloc[7] = 1 or cumloc[11] = 1 or pcs_makeup < 2 or pcs_leghair > 3 or pcs_pubes > 3 or pcs_sweat > 25 or pcs_hairbsh < 1:
 					cla
 					'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
 

locations/city_redlight.qsrc

@@ -31,9 +31,9 @@ if $ARGS[0] = 'start':
 	else
 		'The strip club is closed for the day and will reopen at 18:00.'
 	end
-	if pornstudio = 1 and hour >= 10 and hour < 22:
+	if pornstudio > 0 and hour >= 10 and hour < 22:
 		'The <a href="exec:gt ''pornstudio'', ''start''">porn studio</a> is housed within one of the few warehouses that hasn''t been abandoned.'
-	elseif pornstudio = 1 and (hour < 10 or hour >= 22):
+	elseif pornstudio > 0 and (hour < 10 or hour >= 22):
 		'The porn studio is closed and will reopen at 10:00.'
 	end
 	if hour < 3 or hour >= 11: 

locations/gadhouse.qsrc

@@ -1081,7 +1081,7 @@ if $ARGS[0] = 'grandma':
 				elseif temp = 7:
 					'"One day, my mother, rest her soul, sent us four siblings out to the forest for berry gathering", your grandma begins. "We took our berry collectors and headed out. We reached the forest entrance quickly and decided that it would be best to split up to complete the task faster. Since we were familiar with the area, we all dispersed to our cherished spots and began gathering berries."'
 					'"My favourite spot was a plot surrounded by dense bushes, and in the middle of the plot, there was a huge stump. It was a great spot, and as I approached, I noticed a vast number of ripe strawberries. I rejoiced over the thought that I would gather more than my brothers, slowly gathering the berries and putting them in my berry collector. Then, suddenly, I hear some rustling behind the bushes. I turn towards the sound, but I''m met with silence. I didn''t notice anyone, but I still couldn''t get rid of the eerie feeling."'
-					'"I shook off the eerie feeling and returned to gathering strawberries again. All of a sudden, I get this strange feeling... I look up, and I see a person squatting on the stump. He''s completely still and just stares at me. I got terrified and ran away, screaming and crying towards my brothers. They tried to stop and calm me down, but I kept running. My brothers started running after me, trying to keep up. I could hear my oldest brother shouting to run towards the kolkhoz. You saw Sveta a long time ago. Your grandma explains that we had central collective farms called kolkhoz."'
+					'"I shook off the eerie feeling and returned to gathering strawberries again. All of a sudden, I get this strange feeling... I look up, and I see a person squatting on the stump. He''s completely still and just stares at me. I got terrified and ran away, screaming and crying towards my brothers. They tried to stop and calm me down, but I kept running. My brothers started running after me, trying to keep up. I could hear my oldest brother shouting to run towards the kolkhoz. You see <<$pcs_firstname>>, a long time ago we had central collective farms called kolkhoz."'
 					'"We were lucky that the farms were close to the forest and didn''t have to run through the woods for long. I kept looking back to see if this person was following us, but there was no sign of him. We knew we were safe when we saw the brigade''s farmers. My brothers and I ran to the foreman and explained what had happened. He immediately grabbed the phone and called someone. The other farmers reassured us that we were safe now. After we had calmed down, we got sent home. Our mother met us at home. She fed us and comforted me."'
 					'"The following day, we were informed that some people found dismantled railroad rails not far from the train station Ratomka. Apparently, it was done by the man I encountered in the forest. I didn''t know it then, but before the war, our area was prone to sabotage by infiltrators. Staying hidden was easy, as the territory is covered by forest, stretching to the border."'
 					'"Ever since that day, the fear I experienced never disappeared, as I''ve felt it throughout my life. I''ll carry on this fear for the remaining days of my life..."'

locations/katja_lake.qsrc

@@ -6,7 +6,13 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	$loc = 'katja_lake'
 	$loc_arg = 'start'
-	menu_off = 1
+	$region = 'pav'
+	$menu_loc = 'katja_lake'
+	$menu_arg = 'start'
+	$locclass = 'beach'
+	menu_off = 0
+	$location_type = 'public_outdoors'
+	gs 'stat'
 	if month >11 or month <3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.winter.jpg"></center>'
 		'One good thing about living in Pavlovsk is the access to rivers and lakes. Now that it is winter, this landscape has beautifully transformed, thanks to the ice and snow, into a place where people rush to do things like ice skating, playing hockey and (for the brave) swimming.'
@@ -26,200 +32,271 @@ if $ARGS[0] = 'start':
 		'Katja and you are no less, and go to a secluded beach to do those things... and looking absolutely fabulous doing it.'
 	end
 
-	act 'Lake activities!':
-		*clr & cla
-		minut += 5
-		gs 'stat'
-		if hour >= 20:
-			'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
-			'"Hm? Oh! True! Let''s go back."'
-			'You grab Katja''s hand and accompany her home.'
-			act 'Accompany Katja to her home':minut += 5 & gt 'pav_residential'
-		elseif month >11 or month <3:
-			gt 'katja_lake', 'winter_activities'
-		else
-			if sunWeather = 0 or temper < 20:
-				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'As you suggest to pass some time at the beach, Katja frowns.'
-				'"<<$pcs_nickname>>, I don''t think so, the weather is pretty bad."'
-				'It is evident that this isn''t a good idea. You better to look for something else to do.'
-				act 'Continue': gt 'katjaEV','kathan'
-			else
-				if sound = 0 and month >= 3 and month < 6:
-					PLAY 'sound/lakeshore1.mp3', 30
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.spring.jpg"></center>'
-				elseif sound = 0 and month >= 6 and month < 9:
-					PLAY 'sound/lakeshore1.mp3', 30
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.jpg"></center>'
-				elseif sound = 0 and month >= 9 and month < 12:
-					PLAY 'sound/lakeshore1.mp3', 30
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.jpg"></center>'
-				end
-				'You decide to spend some time at the secluded beach, but as you approach, a question surges into your mind. Go there naked? Katja is pretty body-conscientious, so... maybe going full nudist isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
-				if func('changingroom','count_swim_item') > 0:
-					act 'Put on your swimwear':
-						*clr & cla
-						if katjaQW['slut'] >= 20 and katjaQW['horny'] >= 20:
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL1.jpg"></center>'
-							'As you prepare to change, a long, somewhat husky sigh reaches your ears. It''s come from Katja. She is in her underwear with her eyes closed, the wind playing with her red mane. She is looking sexy as hell.'
-							'"You know <<$pcs_nickname>>, the sun feels nice and there aren''t people around here. So what do you think?"'
-							'It is difficult to link the supposedly timid girl called Ekaterina Meynold with this sensual woman that is trying to tempt you with all her heart (and succeeding) to undress.'
-							'"Think <<$pcs_nickname>>. The water dripping over our naked skin, the wind in our hair and the two of us, all... alone."'
-							'Ok, she is manipulating you. Can you resist the ginger temptress before you?'
-							act 'Of course not!':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL2.jpg"></center>'
-								'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensual eyes.'
-								'"Bitch!"'
-								'You varelly whisper your insult and take the gigling bimbo wannabe towards the secluded beach.'
-								if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
-									act 'Swim':
-										gs 'arousal', 'voyeur', 10
-										if pcs_inhib < 20: inhib_exp += 1
-										gs 'clothing', 'strip_all'
-										gt 'katja_lake', 'swim'
-									end
-								end
-								act 'Tan':
-									gs 'arousal', 'voyeur', 10
-									if pcs_inhib < 20: inhib_exp += 1
-									gs 'clothing', 'strip_all'
-									gt 'katja_lake','tan'
-								end
-								act 'Walk':
-									gs 'arousal', 'voyeur', 10
-									if pcs_inhib < 20: inhib_exp += 1
-									gs 'clothing', 'strip_all'
-									gt 'katja_lake','walk'
-								end
-							end
-							gs 'willpower', 'exhib', 'resist', 'hard' & !! This does not take into consideration inhibition/exhibitionism because Sveta chose to put on the swimwear and Katja is forcing her to undress.
-							if will_cost <= pcs_willpwr:
-								act 'Resist her!': gt 'katja_lake', 'beach_in_swimwear2'
-							else
-								act 'Resist her! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end
-						else
-							gt 'katja_lake', 'beach_in_swimwear1'
-						end
-					end
-				end
-				if pcs_inhib > 20:
-					act 'Go in the nude!':
-						gs 'clothing', 'strip_all' 
-						gt 'katja_lake','beach_nude'
-					end
-				elseif pcs_inhib < 20:
-					gs 'willpower', 'exhib', 'self', 'easy'
-					if will_cost <= pcs_willpwr:
-						act 'Go in the nude!':
-							*clr & cla
-							gs 'willpower', 'pay', 'selft'
-							gs 'clothing', 'strip_all'
-							if pcs_inhib < 20: inhib_exp += 1
-							gs 'stat'
-							gt 'katja_lake','beach_nude'
-						end
-					else
-						act 'Go in the nude! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end
-				end
-				act 'Hm... Is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEV','kathan'
-			end
-		end
-	end
+	act 'Lake activities!': gt 'katja_lake', 'lake_activities'
+	act 'Sauna time!': gt 'katja_lake', 'sauna_time'
+end
 
-	act 'Sauna time!':
-		*clr & cla
-		if sauna_daystart = daystart:
+if $ARGS[0] = 'lake_activities':
+	*clr & cla
+	minut += 5
+	gs 'stat'
+	if hour >= 20:
+		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
+		'"Hm? Oh! True! Let''s go back."'
+		'You grab Katja''s hand and accompany her home.'
+		act 'Accompany Katja to her home':minut += 5 & gt 'pav_residential'
+	elseif month >11 or month <3:
+		gt 'katja_lake', 'winter_activities'
+	else
+		if sunWeather = 0 or temper < 20:
 			'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-			'As you suggest to pass some time in the public sauna, Katja frowns.'
-			'"<<$pcs_nickname>>, spending too much time in there isn''t going to do any good, it is best to leave it for another day."'
+			'As you suggest to pass some time at the beach, Katja frowns.'
+			'"<<$pcs_nickname>>, I don''t think so, the weather is pretty bad."'
 			'It is evident that this isn''t a good idea. You better to look for something else to do.'
 			act 'Continue': gt 'katjaEV','kathan'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/sauna.jpg"></center>'
-			'You decide to pass some time in the public sauna, but as you approach, a question surges into your mind. Go naked? Katja is pretty body-conscientious, so maybe going butt-naked isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
+			if sound = 0 and month >= 3 and month < 6:
+				PLAY 'sound/lakeshore1.mp3', 30
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.spring.jpg"></center>'
+			elseif sound = 0 and month >= 6 and month < 9:
+				PLAY 'sound/lakeshore1.mp3', 30
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.jpg"></center>'
+			elseif sound = 0 and month >= 9 and month < 12:
+				PLAY 'sound/lakeshore1.mp3', 30
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.jpg"></center>'
+			end
+			'You decide to spend some time at the secluded beach, but as you approach, a question surges into your mind. Go there naked? Katja is pretty body-conscientious, so... maybe going full nudist isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
 			if func('changingroom','count_swim_item') > 0:
 				act 'Put on your swimwear':
 					*clr & cla
 					if katjaQW['slut'] >= 20 and katjaQW['horny'] >= 20:
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS6.jpg"></center>'
-						'As you prepare to put on your swimwear at the lockers, Katja lies against a wall and observes you undressing. The redhead has stopped midway, and stands there in (sexy) underwear, with eyes full of mischief.'
-						'"Hm. Is something wrong Katja?"'
-						'The ginger just smiles and begins to caress and play with her red mane without breaking eye contact.'
-						'"I... was thinking <<$pcs_nickname>>. Maybe it is better if we go naked, I mean, the hot steam will make us sweat and... my bikini will feel uncomfortable. What do you think? All that sweat all over my skin. It gives you ideas, doesn''t it?"'
-						'Oh fuck! Is she tempting you?'
-						act 'You can''t resist her!':
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL1.jpg"></center>'
+						'As you prepare to change, a long, somewhat husky sigh reaches your ears. It''s come from Katja. She is in her underwear with her eyes closed, the wind playing with her red mane. She is looking sexy as hell.'
+						'"You know <<$pcs_nickname>>, the sun feels nice and there aren''t people around here. So what do you think?"'
+						'It is difficult to link the supposedly timid girl called Ekaterina Meynold with this sensual woman that is trying to tempt you with all her heart (and succeeding) to undress.'
+						'"Think <<$pcs_nickname>>. The water dripping over our naked skin, the wind in our hair and the two of us, all... alone."'
+						'Ok, she is manipulating you. Can you resist the ginger temptress before you?'
+						act 'Of course not!':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL2.jpg"></center>'
 							'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensual eyes.'
 							'"Bitch!"'
-							'You whisper your insult and take the giggling bimbo wannabe towards the sauna.'
-							act 'Go to the sauna':
+							'You verily whisper your insult and take the giggling bimbo wannabe towards the secluded beach.'
+							if PCloSwimwear = 0 and $clothingworntype ! 'none':
+								$lastwornclothingtype['swim'] = $clothingworntype
+								lastwornclothingnumber['swim'] = clothingwornnumber
+								$lastwornpantytype['swim'] = $pantyworntype
+								lastwornpantynumber['swim'] = pantywornnumber
+								$lastwornbratype['swim'] = $braworntype
+								lastwornbranumber['swim'] = brawornnumber
+							end
+							gs 'clothing', 'strip_all'
+							if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+								act 'Swim':
+									gs 'arousal', 'voyeur', 10
+									if pcs_inhib < 20: inhib_exp += 1
+									gt 'katja_lake', 'swim'
+								end
+							end
+							act 'Tan':
+								gs 'arousal', 'voyeur', 10
+								if pcs_inhib < 20: inhib_exp += 1
+								gt 'katja_lake','tan'
+							end
+							act 'Walk':
 								gs 'arousal', 'voyeur', 10
 								if pcs_inhib < 20: inhib_exp += 1
-								gs 'clothing', 'strip_all'
-								gt 'katja_lake','saune_time'
+								gt 'katja_lake','walk'
 							end
 						end
-						gs 'willpower', 'exhib', 'resist', 'hard' & !!This does not take into consideration inhibition/exhibitionism because Sveta chose to put on the swimwear and Katja is forcing her to undress.
+						gs 'willpower', 'exhib', 'resist', 'hard' & !! This does not take into consideration inhibition/exhibitionism because Sveta chose to put on the swimwear and Katja is forcing her to undress.
 						if will_cost <= pcs_willpwr:
-							act 'Resist her!': gt 'katja_lake','sauna_in_swimmwear2'
+							act 'Resist her!': gt 'katja_lake', 'beach_in_swimwear2'
 						else
 							act 'Resist her! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 					else
-						gt 'katja_lake','sauna_in_swimmwear1'
-					end
-					if pcs_inhib > 20:
-						act 'Go in the nude!':gs 'clothing', 'strip_all' & gt 'katja_lake','saune_time'
-					end
-					if pcs_inhib < 20:
-						gs 'willpower', 'exhib', 'self', 'easy'
-						if will_cost <= pcs_willpwr:
-							act 'Go in the nude!':
-								*clr & cla
-								gs 'willpower', 'pay', 'selft'
-								gs 'clothing', 'strip_all'
-								if pcs_inhib < 20: inhib_exp += 1
-								gs 'stat'
-								gt 'katja_lake','saune_time'
-							end
-						else
-							act 'Go in the nude! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-						end
+						gt 'katja_lake', 'beach_in_swimwear1'
 					end
 				end
 			end
 			if pcs_inhib > 20:
-				act 'Go in the nude!':	gs 'clothing', 'strip_all' & gt 'katja_lake','saune_time'
+				act 'Go in the nude!':
+					if PCloSwimwear = 0 and $clothingworntype ! 'none':
+						$lastwornclothingtype['swim'] = $clothingworntype
+						lastwornclothingnumber['swim'] = clothingwornnumber
+						$lastwornpantytype['swim'] = $pantyworntype
+						lastwornpantynumber['swim'] = pantywornnumber
+						$lastwornbratype['swim'] = $braworntype
+						lastwornbranumber['swim'] = brawornnumber
+					end
+					gs 'clothing', 'strip_all'
+					gt 'katja_lake','beach_nude'
+				end
 			elseif pcs_inhib < 20:
 				gs 'willpower', 'exhib', 'self', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Go in the nude!':
 						*clr & cla
 						gs 'willpower', 'pay', 'selft'
+						if PCloSwimwear = 0 and $clothingworntype ! 'none':
+							$lastwornclothingtype['swim'] = $clothingworntype
+							lastwornclothingnumber['swim'] = clothingwornnumber
+							$lastwornpantytype['swim'] = $pantyworntype
+							lastwornpantynumber['swim'] = pantywornnumber
+							$lastwornbratype['swim'] = $braworntype
+							lastwornbranumber['swim'] = brawornnumber
+						end
 						gs 'clothing', 'strip_all'
 						if pcs_inhib < 20: inhib_exp += 1
 						gs 'stat'
-						gt 'katja_lake','saune_time'
+						gt 'katja_lake','beach_nude'
 					end
 				else
 					act 'Go in the nude! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			act 'Hm... it is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEv','kathan'
+			act 'Hm... Is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEV','kathan'
 		end
 	end
 end
 
+if $ARGS[0] = 'sauna_time':
+	*clr & cla
+	if sauna_daystart = daystart:
+		'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+		'As you suggest to pass some time in the public sauna, Katja frowns.'
+		'"<<$pcs_nickname>>, spending too much time in there isn''t going to do any good, it is best to leave it for another day."'
+		'It is evident that this isn''t a good idea. You better to look for something else to do.'
+		act 'Continue': gt 'katjaEV','kathan'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/sauna.jpg"></center>'
+		'You decide to pass some time in the public sauna, but as you approach, a question surges into your mind. Go naked? Katja is pretty body-conscientious, so maybe going butt-naked isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
+		if func('changingroom','count_swim_item') > 0:
+			act 'Put on your swimwear':
+				*clr & cla
+				if katjaQW['slut'] >= 20 and katjaQW['horny'] >= 20:
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS6.jpg"></center>'
+					'As you prepare to put on your swimwear at the lockers, Katja lies against a wall and observes you undressing. The redhead has stopped midway, and stands there in (sexy) underwear, with eyes full of mischief.'
+					'"Hm. Is something wrong Katja?"'
+					'The ginger just smiles and begins to caress and play with her red mane without breaking eye contact.'
+					'"I... was thinking <<$pcs_nickname>>. Maybe it is better if we go naked, I mean, the hot steam will make us sweat and... my bikini will feel uncomfortable. What do you think? All that sweat all over my skin. It gives you ideas, doesn''t it?"'
+					'Oh fuck! Is she tempting you?'
+					act 'You can''t resist her!':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL2.jpg"></center>'
+						'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensual eyes.'
+						'"Bitch!"'
+						'You whisper your insult and take the giggling bimbo wannabe towards the sauna.'
+						act 'Go to the sauna':
+							gs 'arousal', 'voyeur', 10
+							if pcs_inhib < 20: inhib_exp += 1
+							if PCloSwimwear = 0 and $clothingworntype ! 'none':
+								$lastwornclothingtype['swim'] = $clothingworntype
+								lastwornclothingnumber['swim'] = clothingwornnumber
+								$lastwornpantytype['swim'] = $pantyworntype
+								lastwornpantynumber['swim'] = pantywornnumber
+								$lastwornbratype['swim'] = $braworntype
+								lastwornbranumber['swim'] = brawornnumber
+							end
+							gs 'clothing', 'strip_all'
+							gt 'katja_lake','saune_time'
+						end
+					end
+					gs 'willpower', 'exhib', 'resist', 'hard' & !!This does not take into consideration inhibition/exhibitionism because Sveta chose to put on the swimwear and Katja is forcing her to undress.
+					if will_cost <= pcs_willpwr:
+						act 'Resist her!': gt 'katja_lake','sauna_in_swimmwear2'
+					else
+						act 'Resist her! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				else
+					gt 'katja_lake','sauna_in_swimmwear1'
+				end
+				if pcs_inhib > 20:
+					act 'Go in the nude!':
+						if PCloSwimwear = 0 and $clothingworntype ! 'none':
+							$lastwornclothingtype['swim'] = $clothingworntype
+							lastwornclothingnumber['swim'] = clothingwornnumber
+							$lastwornpantytype['swim'] = $pantyworntype
+							lastwornpantynumber['swim'] = pantywornnumber
+							$lastwornbratype['swim'] = $braworntype
+							lastwornbranumber['swim'] = brawornnumber
+						end
+						gs 'clothing', 'strip_all'
+						gt 'katja_lake','saune_time'
+					end
+				end
+				if pcs_inhib < 20:
+					gs 'willpower', 'exhib', 'self', 'easy'
+					if will_cost <= pcs_willpwr:
+						act 'Go in the nude!':
+							*clr & cla
+							gs 'willpower', 'pay', 'selft'
+							if PCloSwimwear = 0 and $clothingworntype ! 'none':
+								$lastwornclothingtype['swim'] = $clothingworntype
+								lastwornclothingnumber['swim'] = clothingwornnumber
+								$lastwornpantytype['swim'] = $pantyworntype
+								lastwornpantynumber['swim'] = pantywornnumber
+								$lastwornbratype['swim'] = $braworntype
+								lastwornbranumber['swim'] = brawornnumber
+							end
+							gs 'clothing', 'strip_all'
+							if pcs_inhib < 20: inhib_exp += 1
+							gs 'stat'
+							gt 'katja_lake','saune_time'
+						end
+					else
+						act 'Go in the nude! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				end
+			end
+		end
+		if pcs_inhib > 20:
+			act 'Go in the nude!':
+				if PCloSwimwear = 0 and $clothingworntype ! 'none':
+					$lastwornclothingtype['swim'] = $clothingworntype
+					lastwornclothingnumber['swim'] = clothingwornnumber
+					$lastwornpantytype['swim'] = $pantyworntype
+					lastwornpantynumber['swim'] = pantywornnumber
+					$lastwornbratype['swim'] = $braworntype
+					lastwornbranumber['swim'] = brawornnumber
+				end
+				gs 'clothing', 'strip_all'
+				gt 'katja_lake','saune_time'
+			end
+		elseif pcs_inhib < 20:
+			gs 'willpower', 'exhib', 'self', 'easy'
+			if will_cost <= pcs_willpwr:
+				act 'Go in the nude!':
+					*clr & cla
+					gs 'willpower', 'pay', 'selft'
+					if PCloSwimwear = 0 and $clothingworntype ! 'none':
+						$lastwornclothingtype['swim'] = $clothingworntype
+						lastwornclothingnumber['swim'] = clothingwornnumber
+						$lastwornpantytype['swim'] = $pantyworntype
+						lastwornpantynumber['swim'] = pantywornnumber
+						$lastwornbratype['swim'] = $braworntype
+						lastwornbranumber['swim'] = brawornnumber
+					end
+					gs 'clothing', 'strip_all'
+					if pcs_inhib < 20: inhib_exp += 1
+					gs 'stat'
+					gt 'katja_lake','saune_time'
+				end
+			else
+				act 'Go in the nude! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		end
+		act 'Hm... it is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEv','kathan'
+	end
+end
+
 if $ARGS[0] = 'beach_in_swimwear1':
 	*clr & cla
-	if PCloswimwear = 0:
+	if PCloSwimwear = 0 and $clothingworntype ! 'none':
 		minut +=10
 		$loc = 'katja_lake'
 		$loc_arg = 'beach_in_swimwear1'
@@ -632,6 +709,14 @@ if $ARGS[0] = 'beach_nude':
 	end
 	if pcs_inhib < 20: inhib_exp += 1
 	if katjaQW['slut'] <= 20: katjaQW['slut'] += 5
+	if PCloSwimwear = 0 and $clothingworntype ! 'none':
+		$lastwornclothingtype['swim'] = $clothingworntype
+		lastwornclothingnumber['swim'] = clothingwornnumber
+		$lastwornpantytype['swim'] = $pantyworntype
+		lastwornpantynumber['swim'] = pantywornnumber
+		$lastwornbratype['swim'] = $braworntype
+		lastwornbranumber['swim'] = brawornnumber
+	end
 	gs 'clothing', 'strip_all'
 	minut += 10
 	gs 'stat'
@@ -667,7 +752,13 @@ if $ARGS[0] = 'swim':
 		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
 		'"Hm? Oh! True! Let''s go back."'
 
-		act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
+		act 'Redress and return to her home':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'pav_residential'
+		end
 
 	elseif rand(1,20) = 1:
 		gt 'katja_lake','ivan_appeared'
@@ -687,7 +778,13 @@ if $ARGS[0] = 'swim':
 
 	act 'Tan': gt 'katja_lake','tan'
 	act 'Walk': gt 'katja_lake','walk'
-	act 'Redress and look for something else to do': gs 'underwear', 'wear'& gs 'clothing', 'wear_last_worn' & minut += 10 & gt 'katjaEv','kathan'
+	act 'Redress and look for something else to do':
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+		minut += 10
+		gt 'katjaEv','kathan'
+	end
 end
 ! tan
 
@@ -701,7 +798,13 @@ if $ARGS[0] = 'tan':
 		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
 		'"Hm? Oh! True! Let''s go back."'
 
-		act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
+		act 'Redress and return to her home':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'pav_residential'
+		end
 
 	elseif rand(1,20) = 1:
 		gt 'katja_lake','ivan_appeared'
@@ -731,7 +834,13 @@ if $ARGS[0] = 'tan':
 		act 'Swim': gt 'katja_lake','swim'
 	end
 	act 'Walk': gt 'katja_lake','walk'
-	act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+	act 'Redress and look for something else to do':
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+		minut += 10
+		gt 'katjaEv','kathan'
+	end
 end
 
 ! walk
@@ -744,7 +853,13 @@ if $ARGS[0] = 'walk':
 		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
 		'"Hm? Oh! True! Let''s go back."'
 
-		act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
+		act 'Redress and return to her home':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'pav_residential'
+		end
 
 	elseif rand(1,20) = 1:
 		gt 'katja_lake','ivan_appeared'
@@ -770,7 +885,13 @@ if $ARGS[0] = 'walk':
 		act 'Swim': gt 'katja_lake','swim'
 	end
 	act 'Tan': gt 'katja_lake','tan'
-	act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+	act 'Redress and look for something else to do':
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+		minut += 10
+		gt 'katjaEv','kathan'
+	end
 end
 
 ! Ivan appeared
@@ -804,7 +925,13 @@ if $ARGS[0] = 'ivan_appeared':
 			npc_rel['A14'] += 1
 			gs 'stat'
 
-			act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+			act 'Redress and look for something else to do':
+				gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+				gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+				gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+				minut += 10
+				gt 'katjaEv','kathan'
+			end
 
 			if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
 				act 'Swim': gt 'katja_lake','swim'
@@ -907,7 +1034,13 @@ if $ARGS[0] = 'ivan_interaction':
 		end
 		act 'Tan':gt 'katja_lake','tan'
 		act 'Walk':gt 'katja_lake','walk'
-		act 'Redress and look for something else to do':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+		act 'Redress and look for something else to do':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'katjaEv','kathan'
+		end
 
 		if IvanShowerQW = 11 and fame['pav_slut'] <250 and katjaQW['horny'] >60 and katjaQW['anal_quest'] >= 2 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] = 0:
 			act '"Hey Ivan! You know, we are REALLY bored!"':
@@ -1037,7 +1170,13 @@ if $ARGS[0] = 'ivan_interaction':
 										'You get up and embrace the ginger before deciding to redress, as Katja seems pretty wasted and it is best to take her home.'
 									end
 
-									act 'Redress and take Katja to her home':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
+									act 'Redress and take Katja to her home':
+										gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+										gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+										gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+										minut += 10
+										gt 'pav_residential'
+									end
 								end
 							end
 						end
@@ -1136,7 +1275,13 @@ if $ARGS[0] = 'ivan_interaction':
 									'"Shit <<$pcs_nickname>>! We truly are a pair of sluts!"'
 									'You lie by her side and give the redhead another cum-soaked kiss, before getting up and deciding to redress. That was fun, but it is time to look for something else to do.'
 
-									act 'Redress and look for something else to do':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+									act 'Redress and look for something else to do':
+										gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+										gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+										gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+										minut += 10
+										gt 'katjaEv','kathan'
+									end
 								end
 							end
 						end
@@ -1196,7 +1341,13 @@ if $ARGS[0] = 'saune_time':
 				end
 			end
 
-			act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & minut += 10 & gt 'katjaEv','kathan'
+			act 'Shower, redress and go':
+				gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+				gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+				gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+				minut += 10 & minut += 10
+				gt 'katjaEv','kathan'
+			end
 
 		elseif katjaQW['slut'] >= 20:
 			'After undressing in the lockers, and waiting for your turn, Katja and you enter the sauna. You sit completely naked, neither you nor Katja being ashamed to show your beautiful bodies and letting the hot and humid air smooth your precious skins.'
@@ -1219,7 +1370,13 @@ if $ARGS[0] = 'saune_time':
 					act 'Ice dipping! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & minut += 10 & gt 'katjaEv','kathan'
+			act 'Shower, redress and go':
+				gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+				gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+				gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+				minut += 10 & minut += 10
+				gt 'katjaEv','kathan'
+			end
 
 		else
 			'You both change in the lockers, but before Katja can put on her bikini, you grab it.'
@@ -1248,7 +1405,14 @@ if $ARGS[0] = 'saune_time':
 				end
 			end
 
-			act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & katjaQW['slut'] +=5 & minut += 10 & gt 'katjaEv','kathan'
+			act 'Shower, redress and go':
+				gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+				gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+				gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+				katjaQW['slut'] +=5
+				minut += 10
+				gt 'katjaEv','kathan'
+			end
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS7.jpg"></center>'
@@ -1271,7 +1435,13 @@ if $ARGS[0] = 'saune_time':
 				act 'Ice dipping! (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'Shower, redress and go':minut += 10 & gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & gt 'katjaEv','kathan'
+		act 'Shower, redress and go':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10`
+			gt 'katjaEv','kathan'
+		end
 	end
 end
 
@@ -1286,8 +1456,9 @@ if $ARGS[0] = 'ice_dipping':
 
 	if $clothingworntype = 'nude':
 		inhib_exp += rand(1,2)
-		gs 'clothing', 'wear_last_worn'
-		gs 'underwear', 'wear'
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS13.jpg"></center>'
 		'Grabbing Katja''s hand, you run naked out of the sauna and jump into the lake''s icy waters, the sudden cold shock toning your bodies.'
 		'"Yuhu! Katja! One for pavlovsk''s alpha bitches!"'
@@ -1302,7 +1473,13 @@ if $ARGS[0] = 'ice_dipping':
 		'"Fuck fukity fuck <<$pcs_nickname>>! Two for the Pavlovsk''s alpha bitches!"'
 		'Finally, trembling but happy, you both exit the water and proceed to do some warm-ups. It has been fun, but it is time to look for something else to do.'
 	end
-	act 'Shower, redress and go':minut += 10 & gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & gt 'katjaEv','kathan'
+	act 'Shower, redress and go':
+		gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+		gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+		gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+		minut += 10
+		gt 'katjaEv','kathan'
+	end
 end
 
 if $ARGS[0] = 'sauna_sex1':
@@ -1458,7 +1635,13 @@ if $ARGS[0] = 'sauna_sex2':
 			end
 		end
 
-		act 'Shower, redress and go':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
+		act 'Shower, redress and go':
+			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
+			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
+			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			minut += 10
+			gt 'katjaEv','kathan'
+		end
 	end
 end
 

locations/mother.qsrc

@@ -288,8 +288,9 @@ if $ARGS[0] = '':
 		end
       
 		!!Tell mother that you were raped and skip mother being angry at you for being sexualy active event
-		if motherKnowRaped = 0 and (rape > 0 or hidden_rape > 0):
+		if rape_count > motherKnowRaped:
 			act 'Tell her about your rape':
+				motherKnowRaped = rape_count
 				gt 'mother_chats', 'rape_talk'
 			end
 		end
@@ -1959,6 +1960,7 @@ if $ARGS[0] = 'dildo_find':
 	killvar 'mom_found_dildo_variable'
 	!! Effectively blocks this from happening again... can be changed if a 'repeat' version of this scene is ever written
 	motherQW['seen_dildos'] = 1
+	motherKnowDildo = 1
 	gs 'stat'
 	!! TEMPORARY PICTURE
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
@@ -1973,7 +1975,7 @@ if $ARGS[0] = 'dildo_find':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'You look at her with a firm look. "I bought it with my own money."'
 		'She looks at you in confusion. "Why would you ever want to spend your money on something like this?"'
-		if mom_dildo = 1:
+		if selfmomtoyplay = 1:
 			'"I don''t know, I saw that you had one and wanted to have one of my own..." you try to explain.'
 			'Your <<$npc_nickname[''A29'']>> walks up to you and starts brushing your hair. "You''re aware this is for adults only, right? It''s not something that you should be owning. You''re still too young for this..."'
 		else

locations/mother_chats.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'rape_talk':
 	*clr & cla
 	minut += 5
+	if motherKnowSpravka = 0: motherKnowSpravka = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/hug_sad1.jpg"></center>'
 	'"<<$npc_nickname[''A29'']>>..." you say to get her attention. However, before she can respond or even turn to look at you, the emotions and trauma take over. "I''ve been raped!" You barely manage to say it before the flood gates open and you''re sobbing in front of her.'
@@ -100,7 +101,6 @@ if $ARGS[0] = 'rape_talk':
 							pcs_hydra += 60
 						end
 						pcs_willpwr += 5
-						motherKnowSpravka = 1
 						minut += 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'

locations/pav_aptcourtev.qsrc

@@ -1630,7 +1630,7 @@ if $ARGS[0] = 'two_boys':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nanal1.jpg"></center>'
 					'You sit down on the cushion. "Guys, can''t I just suck you off? I''m still a virgin."'
-					'They both scoff at that. "Bullshit!" one of thr+em staes and you give him a serious look and nod.' 
+					'They both scoff at that. "Bullshit!" one of them staes and you give him a serious look and nod.' 
 					'They pause for a second and the other one says "Well good thing you go more holes then. Lay down on your side." He grins as you do it before adding "Don''t worry, we won''t pop your cherry."'
 					*nl
 					'One of them walks over, pushes you over so you''re laying on your side, and sticks his dick back in your mouth, making you unable to see what the other one is doing, but you feel him moving in behind you. A moment later, you feel slick fingers lubing up your asshole before you feel the head of his cock against it.'

locations/pav_disco_sex.qsrc

@@ -779,7 +779,7 @@ if $ARGS[0] = 'blowjob':
 	bmBJ[Tboynum] += 1
 	gdk['bj'] = 1
 	gs 'stat'
-	'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/bj1.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/public/outdoor/bj1.mp4"></video></center>'
 	if gdk['fuck'] = 2:
 		'You squat down before <<$npc_firstname[$boy]>> and get back to work on his cock.'
 	end
@@ -798,7 +798,7 @@ if $ARGS[0] = 'blowjob':
 				gs'cum_call','mouth',$boy,1
 				$gdk['cum'] = 'mouth'
 				cla & *clr
-				'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/cum_mouth.mp4"></video></center>'
+				'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,3.mp4"></video></center>'
 				'You continue working his cock for several minutes until <<$npc_firstname[$boy]>> grunts, and a thick salty liquid pours into your mouth without warning.'
 				act 'Cough':
 					cla & *clr
@@ -818,11 +818,11 @@ if $ARGS[0] = 'blowjob':
 				gs'cum_call','face',$boy,1
 				$gdk['cum'] = 'facial'
 				cla & *clr
-				'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/cum_facial.mp4"></video></center>'
+				'<center><video autoplay loop src="images/shared/sex/public/outdoor/cum_facial1.mp4"></video></center>'
 				'You continue working his cock for several minutes until <<$npc_firstname[$boy]>> pushes you off him and begins rapidly jerking himself above your face. You close your eyes, and cum splatters across your face moments later.'
 				act 'Smile':
 					cla & *clr
-					'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/facial_after.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/public/outdoor/facial_after1.mp4"></video></center>'
 					'"Well, that was fun." You smile at <<$npc_firstname[$boy]>> as he tucks his cock inside his pants.'
 					if gdk['fuck'] = 1:
 						'"Yeah, you''ve got a great pussy."'
@@ -834,7 +834,7 @@ if $ARGS[0] = 'blowjob':
 				
 				act'Clean him with your mouth':
 					cla & *clr
-					'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/cum_clean.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/public/outdoor/bj2.mp4"></video></center>'
 					'"Here, let me get that for you," you say, leaning forward and running your mouth up and down his cock, making sure he''s well and truly sucked dry before standing up again.'
 					act 'Continue':gt'pav_disco_sex','disco_sex_end'
 				end
@@ -880,7 +880,7 @@ end
 if $ARGS[0] = 'virgin_fuck':
 	gdk['virgin'] = 1
 	gs'arousal','vaginal', rand(3,7), 'no_orgasm_msg'
-	'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/fuck.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_fuck1.mp4"></video></center>'
 	'<<$npc_firstname[$boy]>> thrusts into your pussy, and you gasp in pain as his cock pierces your hymen. You''re not sure exactly what you expected sex to feel like, but you did hope it would feel better than this.'
 	act 'This hurts!':
 		cla & *nl
@@ -977,7 +977,7 @@ if $ARGS[0] = 'fuck_pre1':
 	
 	act 'Bend over':
 		cla & *clr
-		'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/insert.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_insert1.mp4"></video></center>'
 		gs'pav_disco_sex','insert'
 		if npc_condom_conscious[$boy] > 0: gdk['condom'] = 1
 		act 'Get fucked':gt'pav_disco_sex','fuck1'
@@ -1001,7 +1001,7 @@ if $ARGS[0] = 'fuck_pre1':
 					act 'Insist (<<will_cost>> Willpower)':
 						cla & *clr
 						gdk['condom'] = 1
-						'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/insert.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_insert1.mp4"></video></center>'
 						'"Come on! Please!"'
 						'He grumbles, but you hear him putting on a condom anyways, and you breathe a sigh of relief.'
 						gs'pav_disco_sex','insert'
@@ -1018,7 +1018,7 @@ if $ARGS[0] = 'fuck_pre1':
 					'"Just don''t cum inside me, okay?"'
 					act 'Bend over':
 						cla & *clr
-						'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/insert.mp4"></video></center>'
+						'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_insert1.mp4"></video></center>'
 						gs'pav_disco_sex','insert'
 						act 'Get fucked':gt'pav_disco_sex','fuck1'
 					end
@@ -1028,7 +1028,7 @@ if $ARGS[0] = 'fuck_pre1':
 				act 'Bend over':
 					cla & *clr
 					gdk['condom'] = 1
-					'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/insert.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_insert1.mp4"></video></center>'
 					gs'pav_disco_sex','insert'
 					gdk['condom'] = 1
 					act 'Get fucked':gt'pav_disco_sex','fuck1'
@@ -1075,7 +1075,7 @@ if $ARGS[0] = 'fuck_pre2':
 	if stat['think_virgin'] = 0:
 		act'Let him fuck you':
 			cla & *clr
-			'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/insert.mp4"></video></center>'
+			'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_insert1.mp4"></video></center>'
 			'"I''ve got a better idea," you grin.'
 			gs'pav_disco_sex','insert'
 			act 'Get fucked':gt'pav_disco_sex','fuck1'
@@ -1088,7 +1088,7 @@ if $ARGS[0] = 'fuck_pre2':
 				'"No," <<$npc_firstname[$boy]>> grins back.'
 				act'Oh well':
 					cla & *clr
-					'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/insert.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_insert1.mp4"></video></center>'
 					'"Well that''s a shame," you say. And then you shrug. "Oh well."'
 					gs'pav_disco_sex','insert'
 					act'Fuck him':gt'pav_disco_sex','fuck1'
@@ -1109,7 +1109,7 @@ if $ARGS[0] = 'fuck_pre2':
 				gdk['condom'] = 1
 				act'Bend over':
 					cla & *clr
-					'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/insert.mp4"></video></center>'
+					'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_insert1.mp4"></video></center>'
 					gs'pav_disco_sex','insert'
 					act'Fuck him':gt'pav_disco_sex','fuck1'
 				end
@@ -1123,7 +1123,7 @@ if $ARGS[0] = 'fuck1':
 	gdk['orgasm'] = orgasm
 	if pcs_vag = 0:gt'pav_disco_sex','virgin_fuck'
 	gs'arousal','vaginal', rand(3,7), 'no_orgasm_msg'
-	'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/fuck.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_fuck1.mp4"></video></center>'
 	if mesec > 0:
 		'<<$npc_firstname[$boy]>> slips inside you easily, your pussy already slick from your period, and quickly builds up to a steady pace, pummeling your pussy. The rhythmic fucking pounds your insides just the right way, and you soon find yourself moaning in pleasure.'
 	else
@@ -1191,7 +1191,7 @@ end
 if $ARGS[0] = 'disco_cum_facial':
 	cla & *clr
 	$gdk['cum'] = 'facial'
-	'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/cum_facial.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/public/outdoor/cum_facial1.mp4"></video></center>'
 	if gdk['cum'] = 1:
 		if gdk['condom'] = 1:
 			'You quickly jump off his cock and squat down in front of him. <<$npc_firstname[$boy]>> takes the hint and rips off the condom, jerking himself off over your face. Within seconds, cum erupts from the tip of his cock, spattering across your forehead and running down your cheeks. Seconds after that, it seems <<$npc_firstname[$boy]>> is out of juice and pulls back to admire his handiwork.'
@@ -1213,7 +1213,7 @@ if $ARGS[0] = 'disco_cum_facial':
 	
 	act 'Smile':
 		cla & *clr
-		'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/facial_after.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/public/outdoor/facial_after1.mp4"></video></center>'
 		'"Well, that was fun." You smile at <<$npc_firstname[$boy]>> as he tucks his cock inside his pants.'
 		if gdk['fuck'] = 1:
 			'"Yeah, you''ve got a great pussy."'
@@ -1225,7 +1225,7 @@ if $ARGS[0] = 'disco_cum_facial':
 	
 	act 'Clean him with your mouth':
 		cla & *clr
-		'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/cum_clean.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/public/outdoor/bj2.mp4"></video></center>'
 		'"Here, let me get that for you," you say, leaning forward and running your mouth up and down his cock, making sure he''s well and truly sucked dry before standing up again.'
 		act 'Continue':gt'pav_disco_sex','disco_sex_end'
 	end
@@ -1294,7 +1294,7 @@ end
 if $ARGS[0] = 'disco_mouth_react2':
 	act 'A little warning?':
 		cla & *clr
-		'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/facial_after.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/public/outdoor/facial_after1.mp4"></video></center>'
 		'"A little warning next time?" you smile at him. "It''s hard to swallow on command."'
 		'"Well, you seemed to have managed just fine," he grins.'
 		*nl
@@ -1303,7 +1303,7 @@ if $ARGS[0] = 'disco_mouth_react2':
 	
 	act 'Lick your lips':
 		cla & *clr
-		'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/facial_after.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/public/outdoor/facial_after1.mp4"></video></center>'
 		'"You taste good," you smile, licking your lips and standing back up.'
 		*nl
 		gs'pav_disco_sex','disco_sex_end'
@@ -1311,7 +1311,7 @@ if $ARGS[0] = 'disco_mouth_react2':
 	
 	act 'Clean him off':
 		cla & *clr
-		'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/cum_clean.mp4"></video></center>'
+		'<center><video autoplay loop src="images/shared/sex/public/outdoor/bj2.mp4"></video></center>'
 		'"Here, let me get that for you," you say, leaning forward and running your mouth up and down his cock, making sure he''s well and truly sucked dry before standing up again.'
 		*nl
 		gs'pav_disco_sex','disco_sex_end'
@@ -1321,7 +1321,7 @@ end
 if $ARGS[0] = 'disco_cum_mouth':
 	cla & *clr
 	$gdk['cum'] = 'mouth'
-	'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/cum_mouth.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,3.mp4"></video></center>'
 	if gdk['cum'] ! 3:
 		if gdk['condom'] = 1:
 			'You quickly jump off his cock and squat in front of him, pulling off the condom and replacing your pussy with your mouth. You bob your head up and down precisely twice before thick salty cum spurts out onto your tongue. Then, using your hand, you draw out every last drop before pulling back.'
@@ -1354,7 +1354,7 @@ end
 
 if $ARGS[0] = 'disco_condom1':
 	$gdk['cum'] = 'condom'
-	'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/fuck.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_fuck1.mp4"></video></center>'
 	if gdk['orgasm'] < orgasm:
 		'You gasp in surprise when <<$npc_firstname[$boy]>> pulls you tight against him, shoving his entire length inside you to the base. Seconds later, you hear him groan and feel him cumming inside the condom. The sensation sends you over the edge, and your body goes taut, leaving you on tiptoes while the orgasm rolls through your body.'
 		*nl
@@ -1370,7 +1370,7 @@ end
 
 if $ARGS[0] = 'disco_condom2':
 	$gdk['cum'] = 'condom'
-	'<center><video autoplay loop src="images/locations/pavlovsk/community/disco/sex/fuck.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/public/outdoor/stand_fuck1.mp4"></video></center>'
 	if gdk['orgasm'] < orgasm:
 		'You don''t say a word, instead throwing your hips back onto <<$npc_firstname[$boy]>>''s cock as hard as you can. Seconds later, you hear him groan and feel him cum inside the condom. The sensation sends you over the edge, and your body goes taut, leaving you on tiptoes while the orgasm rolls through your body.'
 		*nl

locations/pornstudio.qsrc

@@ -1230,7 +1230,7 @@ if $ARGS[0] = '1':
 
 								act 'I understand':
 									*clr & cla
-									pornstudio = 3
+									pornstudio = 1
 									'<center><img <<$set_imgh>> src="images/locations/city/redlight/studio_porn/pierre_2.jpg"></center>'
 									'"Good girl. Now leave and stop wasting my time."'
                                     gt 'pornstudio', 'start'

locations/pushkin_ballet_class.qsrc

@@ -549,20 +549,20 @@ if $ARGS[0] = 'music_theory':
 		'Sofia spends the rest of the lesson discussing the history of ballet. You noticed a few of your classmates looking sleepy by the end of the class.'
 
 	elseif ballet_day = 3 :
-		sweat += 20
+		gs 'sweat', 'add', 20
 		'Today, you''re given a sharp shock. Sofia claps her hands to get everyone''s attention. "Today, we will test what you''ve learned. I''m going to be playing some pieces. On the first beat, you will do a demi plié down."'
 		'"On the second beat, you will do a demi plié up. Repeat until the sixth beat and do a grand plié. The seventh rise from the demi, and the eighth beat finish the demi. Understand? Good."'
 		'Sofia wastes no time. She starts the piece and calls out, "1 2 3, 2 2 3, 3 2 3, 4 2 3, 5 2 3 and grand plié! 6 2 3, and finish." Sofia runs an eye critically over the class. "You can do better than that and again."'
 		'You continue the lesson. Sofia keeps you all on your toes by changing the tempo, causing some girls to stumble and earning themselves criticism. By the end of the lesson, you''re glad it''s over.'
 	
 	elseif ballet_day = 4 :
-		sweat += 20
+		gs 'sweat', 'add', 20
 		'"Positions!" Sofia calls out before you can relax as you enter the class. "You''ve been practising the routine for the assessment. I will review the score cues," she says as she sits at the piano and starts playing the Entrance of the Swans.'
 		'You all stand there wondering if you should dance, but after a few moments, Sofia stops. "Did you listen to the music to find your cues? Let''s try that again, on the count of three, one, two, three." Then, you start the whole routine that Biserka has been drilling into you.'
 		'The difference is Sofia is creating audible cues with the notes being played to guide you through the whole performance, and you see a marked improvement from all the dancers with the additional guidance.'
 
 	elseif ballet_day = 5 :
-		sweat += 30
+		gs 'sweat', 'add', 20
 		'It''s your final lesson today before your assessment tomorrow. So you all crowd into the dance hall and start to put on your shoes in preparation for your lesson.'
 		'Sofia and Biserka walk into the class together, and Sofia moves towards the piano. "Class, this is your final lesson. After that, we will do a rehearsal, and I will give you feedback on your performances."'
 		'"Take your positions." The class scrambles to get ready. "Remember everything that Sofia and I have gone over in the last week. I want you to listen to the music cues, I want you to follow the steps I''ve taught you and, most of all, I want you to prove to me that you''re ready for tomorrow."'

locations/saveupdater.qsrc

@@ -2616,6 +2616,10 @@ if temp_current_save_version < 00090202:
 	killvar'BDSMrole'
 	killvar'BDSMpayDay'
 
+	if motherQW['seen_dildos'] > 0 and motherKnowDildo = 0: motherKnowDildo = 1
+	if motherQW['seen_dildos'] = 0 and motherKnowDildo > 0: motherQW['seen_dildos'] = 1
+	if motherKnowRaped > 0: motherKnowSpravka = 1
+
 end
 
 

locations/sex_ev_after.qsrc

@@ -1711,7 +1711,7 @@ end
 if $ARGS[0] = 'post_sex_pee3':
 	act'Relieve yourself':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/shared/sex/after/toilet_after.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/toilet_naked.jpg"></center>'
 		if sex_ev['desperate_pee'] = 0:
 			if cum_loc['vagina'] > 0:
 				'You sit down on the toilet and let out a sigh as you unclench your muscles. Warmth trickles out from your snatch and you feel it flush some of the cum from inside as well. You sit there patiently until you and your bladder feel nice and empty.'

locations/sex_ev_events.qsrc

@@ -189,7 +189,7 @@ if $ARGS[0] = 'sex_film_force_stop':
 			cla & *clr
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/1.jpg"></center>'
 			'"Seriously, knock it off!" you snap, practically slapping the phone out of his hand as you grab it. You stop the recording and immediately hit the gallery button to delete the video. "Asshole..." you mutter as you toss the phone far away from the bed as well, all without removing <<$npc_firstname[$boy]>> from inside you.'
 			act'"Way to kill the mood"':
 				cla & *clr
@@ -201,7 +201,7 @@ if $ARGS[0] = 'sex_film_force_stop':
 			
 			act'Keep going':
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/shared/sex/vag/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/4.jpg"></center>'
 				'"Finally," you sigh in relief. "Don''t do that again. Now get back to fucking me already."'
 				gs'sex_ev_sex', 'fuck_continue'
 			end

locations/sex_ev_reactions.qsrc

@@ -504,7 +504,7 @@ if $ARGS[0] = 'pullout_thanks':
 			if $sex_ev['position'] = 'miss':
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			elseif $sex_ev['position'] = 'doggy':
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_doggy1.jpg"></center>'
+				'<center><video autoplay loop src="images/shared/sex/cum/pullout_doggy1.mp4"></video></center>'
 			else
 				'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/3.jpg"></center>'
 			end
@@ -527,7 +527,7 @@ if $ARGS[0] = 'pullout_close':
 			if $sex_ev['position'] = 'miss':
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			elseif $sex_ev['position'] = 'doggy':
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_doggy1.jpg"></center>'
+				'<center><video autoplay loop src="images/shared/sex/cum/pullout_doggy1.mp4"></video></center>'
 			else
 				'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/3.jpg"></center>'
 			end
@@ -550,7 +550,7 @@ if $ARGS[0] = 'why_not_inside':
 			if $sex_ev['position'] = 'miss':
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			elseif $sex_ev['position'] = 'doggy':
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_doggy1.jpg"></center>'
+				'<center><video autoplay loop src="images/shared/sex/cum/pullout_doggy1.mp4"></video></center>'
 			else
 				'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/3.jpg"></center>'
 			end
@@ -1785,7 +1785,7 @@ if $ARGS[0] = 'cum_already':
 				if $sex_ev['position'] = 'miss':
 					'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 				elseif $sex_ev['position'] = 'doggy':
-					'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_doggy1.jpg"></center>'
+					'<center><video autoplay loop src="images/shared/sex/cum/pullout_doggy1.mp4"></video></center>'
 				elseif $sex_ev['position'] = 'cowgirl':
 					'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/smile1.jpg"></center>'
 				end
@@ -1821,7 +1821,7 @@ if $ARGS[0] = 'quickshot_tease1':
 					if $sex_ev['position'] = 'miss':
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 					elseif $sex_ev['position'] = 'doggy':
-						'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_doggy1.jpg"></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/pullout_doggy1.mp4"></video></center>'
 					elseif $sex_ev['position'] = 'cowgirl':
 						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/smile1.jpg"></center>'
 					end
@@ -1848,9 +1848,9 @@ if $ARGS[0] = 'quickshot_tease1':
 					end
 				elseif $sex_ev['last_cum'] = 'pullout':
 					if $sex_ev['position'] = 'miss':
-						'<center><img <<$set_imgh>> src="images/shared/sex/cum/bellycum2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 					elseif $sex_ev['position'] = 'doggy':
-						'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_doggy1.jpg"></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/pullout_doggy1.mp4"></video></center>'
 					elseif $sex_ev['position'] = 'cowgirl':
 						'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk3.jpg"></center>'
 					end

locations/sex_ev_reactions_creampie.qsrc

@@ -3238,6 +3238,8 @@ if $ARGS[0] = 'creampie_freakout':
 				end
 			end
 		end
+	else
+		gs'sex_ev_sex', 'sex_end'
 	end
 end
 

locations/sex_ev_talk.qsrc

@@ -709,7 +709,7 @@ if $ARGS[0] = 'creampie_permission1':
 					if $sex_ev['position'] = 'miss':
 						'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/4.jpg"></center>'
 					elseif $sex_ev['position'] = 'doggy':
-						'<center><img <<$set_imgh>> src="images/shared/sex/cum/pullout_doggy1.jpg"></center>'
+						'<center><video autoplay loop src="images/shared/sex/cum/pullout_doggy1.mp4"></video></center>'
 					else
 						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/smile1.jpg"></center>'
 					end

locations/stripclub.qsrc

@@ -370,12 +370,12 @@ if $ARGS[0] = 'forman':
 	'There are some girls on the stage dancing to the music. You notice a sign offering private dances, costing 1000 <b>₽</b> per dance.'
 
 	act 'Leave': minut += 5 & gt 'stripclub', 'start'
-	if hour < 2:
+	if hour < 2 or hour >= 18:
 		act 'Watch a striptease':gt 'stripclub', 'stol'
 		if money >= 1000: act 'Order a private dance (1,000 <b>₽</b>)':gt 'stripclub', 'privat'
 		!! if money >= 1000 and AlbinaQW['stripper'] = 1 and (day = 5 or day = 6): act 'Order a private dance from Albina (1,000 <b>₽</b>)':gt 'stripclub', 'albina_dance'
 	end
-	!!if hour < 2 and minut < 30: act 'Get a drink at the bar': gt 'stripclub', 'bar'
+	!!if (hour < 2 and minut < 30) or hour >= 18: act 'Get a drink at the bar': gt 'stripclub', 'bar'
 end
 
 if $ARGS[0] = 'privat':
@@ -529,8 +529,8 @@ if $ARGS[0] = 'forwoman':
 		end
 	end
 
-	if hour < 2: act 'Watch a striptease': gt 'stripclub', 'stolW'
-	!!if hour < 2 and minut < 30: act 'Get a drink at the bar': gt 'stripclub', 'bar'
+	if hour < 2 or hour >= 18: act 'Watch a striptease': gt 'stripclub', 'stolW'
+	!!if (hour < 2 and minut < 30) or hour >= 18: act 'Get a drink at the bar': gt 'stripclub', 'bar'
 	if pcs_dancero > 0 and stripwork = 0 and pcs_inhib >= 50:
 		act 'Ask the manager about working as a stripper': gt 'stripclub', 'manager_stripper'
 	elseif stripwork = 0 and pcs_inhib < 50:
@@ -550,7 +550,7 @@ if $ARGS[0] = 'stolW':
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripw.jpg"></center>'
 	'There are some athletic guys performing on the stage. The women are all excited, squealing and shoving money down their pants.'
 
-	if hour < 2:
+	if hour < 2 or hour >= 18:
 		act 'Watch a striptease':
 			*clr & cla
 			minut += 15
@@ -637,7 +637,7 @@ if $ARGS[0] = 'albina_confront':
 				'You nod and Albina pushes you into the chair before music starts playing and she starts her show. She seductively dances while slowly peeling her clothes off, all while giving you a teasing smile.'
 				'Once down to her thong, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging off her thong.'
 				'The song then ends and a naked Albina smiles before sitting in your lap.'
-				if hour < 2:
+				if hour < 2 or hour >= 18:
 					'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too, but I need to get back to work."'
 					'You nod and she gets dressed again before she walks you back out onto the floor.'
 					act 'Return to the floor': gt 'stripclub', 'forman'
@@ -666,7 +666,7 @@ if $ARGS[0] = 'albina_confront':
 				'You nod and Albina pushes you into the chair before music starts playing and she starts her show. She seductively dances while slowly peeling her clothes off, all while giving you a teasing smile.'
 				'Once down to her thong, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging off her thong.'
 				'The song ends and a naked Albina smiles before sitting in your lap.'
-				if hour < 2:
+				if hour < 2 or hour >= 18:
 					'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too, but I need to get back to work."'
 					'You nod and she gets dressed again before she walks you back out onto the floor.'
 					gt 'stripclub', 'forman'
@@ -689,7 +689,7 @@ if $ARGS[0] = 'albina_confront':
 
 		act 'No thanks':
 			'"No thanks," you reply. "I need to get going."'
-			if hour < 2:
+			if hour < 2 or hour >= 18:
 				'She just shrugs. "Your loss. I need to get back to work."'
 				'She walks you back out onto the floor, leaving you behind in the room.'
 				gt 'stripclub', 'forman'

locations/train_events.qsrc

@@ -302,7 +302,7 @@ if $ARGS[0] = 'breastfeed':
 				end
 				:breastfeedthebaby
 				if temp_var = 2:
-					gs 'train_incidental', 'breastfeedthebaby'
+					gs 'train_events', 'breastfeedthebaby'
 				elseif temp_var <= 1:
 					if pcs_inhib >= 40:
 						act 'Prove it to him':
@@ -314,7 +314,7 @@ if $ARGS[0] = 'breastfeed':
 								'You grab onto your top to pull out your breast.'
 							end
 							'You give your breast some squeezes until milk drops start to develop on your nipple. The man watches you surprised and nods positively.'
-							gs 'train_incidental', 'breastfeedthebaby'
+							gs 'train_events', 'breastfeedthebaby'
 						end
 					end
 					act 'Convince him that you can do it':
@@ -326,7 +326,7 @@ if $ARGS[0] = 'breastfeed':
 							'You smile and nod. "I can assure you I have breast milk."'
 						end
 						'The man gives you a concerned expression but then nods. "Well, it couldn''t hurt to let you try."'
-						gs 'train_incidental', 'breastfeedthebaby'
+						gs 'train_events', 'breastfeedthebaby'
 					end
 				end
 			end

locations/tryndin.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'stairwell_chat':
 		!this is going to go with model even if Sveta is a modelling pornstar in university
 		if hotcat >= 6 and model['status'] = 1:
 			act 'Tell him you are a Model': gt 'tryndin', 'model'
-		elseif film >= 1 and pornstudio = 1:
+		elseif film >= 1 and pornstudio > 0:
 			act 'Tell him you are a Pornstar': gt 'tryndin', 'pornstar'
 		elseif university['student'] = 1:
 			act 'Tell him you go to the University': gt 'tryndin', 'uni_student'