Merge remote-tracking branch 'Anya/master'

isample_mod/isample.qproj

@@ -8,8 +8,8 @@
       <Location name="mod_isample"/>
     </Folder>
     <Folder name="locations">
-      <Location name="mod_isample_pavResidential"/>
-      <Location name="mod_isample_street"/>
+      <Location name="mod_isample_pav_residential"/>
+      <Location name="mod_isample_city_residential"/>
     </Folder>
   </Structure>
 </QGen-project>

isample_mod/locations/mod_isample.qsrc

@@ -30,17 +30,17 @@ if $curloc = 'bedrPar':
 end
 
 !entry point 4: access in-mod location
-if $curloc = 'pavResidential':
+if $curloc = 'pav_residential':
 	act '[mod]Chase the rabbit':
-		gt 'mod_isample_pavResidential'
+		gt 'mod_isample_pav_residential'
 	end
 end
 
-if $curloc = 'street':
+if $curloc = 'city_residential':
 	act '[mod]Jump into rabit hole':
 		*clr & cla
 		'[mod]Suddenly, everything blank out'
-		gs 'mod_isample_street'
+		gs 'mod_isample_city_residential'
 	end
 end
 --- mod_isample ---------------------------------

isample_mod/locations/mod_isample_street.qsrc → isample_mod/locations/mod_isample_city_residential.qsrc

@@ -1,7 +1,7 @@
-# mod_isample_street
+# mod_isample_city_residential
 !mod event. remember to add a act to exit
 '[mod-isample]'
 'You try to jump into rabbit hole, sadly, this is only a sample mod, so you can not even find a hole to jump.'
-act 'Back to street': gt 'street'
---- mod_isample_street ---------------------------------
+act 'Back to street': gt 'city_residential'
+--- mod_isample_city_residential ---------------------------------
 

isample_mod/locations/mod_isample_pavResidential.qsrc → isample_mod/locations/mod_isample_pav_residential.qsrc

@@ -1,7 +1,7 @@
-# mod_isample_pavResidential
+# mod_isample_pav_residential
 !mod event. remember to add a act to exit
 '[mod-isample]'
 'You try to chase the rabbit in town, sadly, this is only a sample mod, so there are no rabbit in sight.'
-act 'Back to town': gt 'pavResidential'
---- mod_isample_pavResidential ---------------------------------
+act 'Back to town': gt 'pav_residential'
+--- mod_isample_pav_residential ---------------------------------
 

isample_mod/locations/mod_isample_setup.qsrc

@@ -19,8 +19,8 @@ $mod_info[3] = 'This is a sample for new mod system, please fill your own mod in
 $mod_info[4] = 'Options'
 !4=mod options/settings link name.
 
-
-if curloc = 'mod_<<$mod_info[0]>>_setup':
+! be aware, the following condition is case sensitive, you can use lcase() or ucase() to shft them before check. 
+if $curloc = 'mod_<<$mod_info[0]>>_setup':
 	usehtml = 1
 	!this will be only showed if you exec mod file. This location should be only called by gs, so this line will not trigger on normal mod playing
 	'<center><h1><font color=red>ACCESS DENIED</font></h1></center>'

locations/LariskaSex.qsrc

@@ -93,18 +93,59 @@ if $ARGS[0] = 'dildo1':
 		vibratorOUT = 1
 		'You spread your legs and take the vibrator out of your pussy, letting out a slight moan as you do so. You feel somewhat empty now.'
 	end
-	if pcs_vag = 0:
-		'She pushes the dildo inside, and you feel something inside of you rip. You know it was your hymen, you are no longer a virgin.'
-	end
-	'You gasp as she works the dildo in, then try to focus back on your own end as you work the tip deeper inside her honeypot. Before long the both of you are fucking each other with the dildos, the sounds of moans and gasps filling the air. Lariska doesn''t seem to have any issues taking a dildo this big, so you begin to pump it in and out, faster and deeper each time.'
-	$orgasm_txt = 'As the waves of your impending orgasm builds, you gasp out "More! Harder!" Lariska, taking the hint, starts slamming the dildo deeper into your muff. The wave breaks over you, forcing your head back and your body to buck, held only in one place by Lariska''s light frame on top of you. Feeling your orgasm beneath her overwhelms her, and soon you are both hanging on to each other, jerking around, but trying not to stop pleasing the other.'
-	$orgasm_or = 'custom'
-	pcs_horny += 15
 	gs 'arousal', 'cuni', 10, 'lesbian'
 	gs 'arousal', 'cuni_give', -10, 'lesbian'
 	gs 'stat'
-	'As the roaring in your ears slowly subsides, Lariska pushes herself around and starts kissing you passionately, eager to show how happy you just made her.'
-	act 'Cuddle': gt 'LariskaSex', 'undressed2'
+	if pcs_vag = 0:
+		if LariskaQW['tellvirg'] = 0:
+			'I''m a virgin, you tell her softly.'
+			LariskaQW['tellvirg'] = 1
+		else
+			'I''m still a virgin, you say softly.'
+		end
+
+		act 'Let her pop your cherry':
+			*clr & cla
+			menu_off = 1
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/lariska/sex/home/dildo_1.mp4"></video></center>'
+			'You gasp as she works the dildo in, feeling something break inside you. You know you aren''t a virgin anymore. Trying to push the pain aside, you focus on your own end as you work the tip deeper inside her honeypot. Before long the both of you are fucking each other with the dildos, the sounds of moans and gasps filling the air. Lariska doesn''t seem to have any issues taking a dildo this big, so you begin to pump it in and out, faster and deeper each time.'
+
+			$orgasm_txt = 'As the waves of your impending orgasm builds, you gasp out "More! Harder!" Lariska, taking the hint, starts slamming the dildo deeper into your muff. The wave breaks over you, forcing your head back and your body to buck, held only in one place by Lariska''s light frame on top of you. Feeling your orgasm beneath her overwhelms her own senses and soon you are both hanging on to each other, bodies jerking around while trying not to stop pleasing the other.'
+			$orgasm_or = 'custom'
+			pcs_horny += 15
+			gs 'arousal', 'vaginal_dildo', 10, 'lesbian'
+			gs 'arousal', 'vaginal_dildo_give', -10, 'lesbian'
+			gs 'stat'
+			'As the roaring in your ears slowly subsides, Lariska pushes herself around and starts kissing you passionately, eager to show how happy you just made her.'
+			act 'Cuddle': gt 'LariskaSex', 'undressed2'
+		end
+		act 'Stay a virgin':
+			*clr & cla
+			menu_off = 1
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/lariska/sex/home/dildo_1.mp4"></video></center>'
+			'She smiles sweetly and says "Don''t worry, I won''t take that from you." Instead of sliding it in, she rubs the tip around your labia while licking your clit gently. You work the tip deeper inside her honeypot trying hard to concentrate with the heavenly feeling she is producing between your legs. The sounds of moans and gasps fill the air as you grind against each other, lost in your passions. Lariska doesn''t seem to have any issues taking a dildo this big, so you begin to pump it in and out, faster and deeper each time.'
+
+			$orgasm_txt = 'As the waves of your impending orgasm builds, you gasp out "More!" Lariska, taking the hint, starts licking your clit faster. The wave breaks over you, forcing your head back and your body to buck, held only in one place by Lariska''s light frame on top of you. Feeling your orgasm beneath her overwhelms her own senses and soon you are both hanging on to each other, bodies jerking around while trying not to stop pleasing the other.'
+			$orgasm_or = 'custom'
+			pcs_horny += 15
+			gs 'arousal', 'vaginal_vibe', 10, 'lesbian'
+			gs 'arousal', 'vaginal_dildo_give', -10, 'lesbian'
+			gs 'stat'
+			'As the roaring in your ears slowly subsides, Lariska pushes herself around and starts kissing you passionately, eager to show how happy you just made her.'
+			act 'Cuddle': gt 'LariskaSex', 'undressed2'
+		end
+	else
+		'You gasp as she works the dildo in, then try to focus back on your own end as you work the tip deeper inside her honeypot. Before long the both of you are fucking each other with the dildos, the sounds of moans and gasps filling the air. Lariska doesn''t seem to have any issues taking a dildo this big, so you begin to pump it in and out, faster and deeper each time.'
+
+		$orgasm_txt = 'As the waves of your impending orgasm builds, you gasp out "More! Harder!" Lariska, taking the hint, starts slamming the dildo deeper into your muff. The wave breaks over you, forcing your head back and your body to buck, held only in one place by Lariska''s light frame on top of you. Feeling your orgasm beneath her overwhelms her own senses and soon you are both hanging on to each other, bodies jerking around while trying not to stop pleasing the other.'
+		$orgasm_or = 'custom'
+		pcs_horny += 15
+		gs 'arousal', 'vaginal_dildo', 10, 'lesbian'
+		gs 'arousal', 'vaginal_dildo_give', -10, 'lesbian'
+		gs 'stat'
+		'As the roaring in your ears slowly subsides, Lariska pushes herself around and starts kissing you passionately, eager to show how happy you just made her.'
+		act 'Cuddle': gt 'LariskaSex', 'undressed2'
+	end
 end
 
 !!!!!! You wear the strap-on !!!!!!!!!
@@ -266,9 +307,22 @@ if $ARGS[0] = 'bj_1':
 	pcs_horny += 5
 	gs 'arousal', 'bj', -5, 'lesbian', 'sub'
 	gs 'stat'
-	act 'Missionary': gt 'LariskaSex', 'miss_1'
-	act 'Cowgirl': gt 'LariskaSex', 'cow_1'
-	act 'Doggy': gt 'LariskaSex', 'dog_1'
+	if pcs_vag = 0:
+		act 'Get your cherry popped':
+			temp = rand (1, 3)
+			if temp = 1:
+				act 'Missionary': gt 'LariskaSex', 'miss_1'
+			elseif temp = 2:
+				act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+			else
+				act 'Doggy': gt 'LariskaSex', 'dog_1'
+			end
+		end
+	else
+		act 'Missionary': gt 'LariskaSex', 'miss_1'
+		act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+		act 'Doggy': gt 'LariskaSex', 'dog_1'
+	end
 	act 'Anal Missionary': gt 'LariskaSex', 'anal_miss_1'
 	act 'Anal Cowgirl': gt 'LariskaSex', 'anal_cow_1'
 	act 'Anal Doggy': gt 'LariskaSex', 'anal_dog_1'
@@ -299,9 +353,22 @@ if $ARGS[0] = 'miss_1':
 	$orgasm_txt = 'As Lariska pounds away, the rush of pleasure shooting through your body sets off an orgasm, and the room quickly fills with the sounds of you screaming her name.'
 	gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub'
 	gs 'stat'
-	act 'Missionary': gt 'LariskaSex', 'miss_1'
-	act 'Cowgirl': gt 'LariskaSex', 'cow_1'
-	act 'Doggy': gt 'LariskaSex', 'dog_1'
+	if pcs_vag = 0:
+		act 'Get your cherry popped':
+			temp = rand (1, 3)
+			if temp = 1:
+				act 'Missionary': gt 'LariskaSex', 'miss_1'
+			elseif temp = 2:
+				act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+			else
+				act 'Doggy': gt 'LariskaSex', 'dog_1'
+			end
+		end
+	else
+		act 'Missionary': gt 'LariskaSex', 'miss_1'
+		act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+		act 'Doggy': gt 'LariskaSex', 'dog_1'
+	end
 	act 'Anal Missionary': gt 'LariskaSex', 'anal_miss_1'
 	act 'Anal Cowgirl': gt 'LariskaSex', 'anal_cow_1'
 	act 'Anal Doggy': gt 'LariskaSex', 'anal_dog_1'
@@ -332,9 +399,22 @@ if $ARGS[0] = 'cow_1':
 	$orgasm_txt = 'The multiple sensations start to overwhelm you, causing an orgasm to sweep through you like lightning. Throwing your head back, you ride the waves as they wash through you.'
 	gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub'
 	gs 'stat'
-	act 'Missionary': gt 'LariskaSex', 'miss_1'
-	act 'Cowgirl': gt 'LariskaSex', 'cow_1'
-	act 'Doggy': gt 'LariskaSex', 'dog_1'
+	if pcs_vag = 0:
+		act 'Get your cherry popped':
+			temp = rand (1, 3)
+			if temp = 1:
+				act 'Missionary': gt 'LariskaSex', 'miss_1'
+			elseif temp = 2:
+				act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+			else
+				act 'Doggy': gt 'LariskaSex', 'dog_1'
+			end
+		end
+	else
+		act 'Missionary': gt 'LariskaSex', 'miss_1'
+		act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+		act 'Doggy': gt 'LariskaSex', 'dog_1'
+	end
 	act 'Anal Missionary': gt 'LariskaSex', 'anal_miss_1'
 	act 'Anal Cowgirl': gt 'LariskaSex', 'anal_cow_1'
 	act 'Anal Doggy': gt 'LariskaSex', 'anal_dog_1'
@@ -365,9 +445,22 @@ if $ARGS[0] = 'dog_1':
 	$orgasm_txt = 'The pleasure builds into a crescendo, threatening to overwhelm your senses as an orgasm rips through you.'
 	gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'sub'
 	gs 'stat'
-	act 'Missionary': gt 'LariskaSex', 'miss_1'
-	act 'Cowgirl': gt 'LariskaSex', 'cow_1'
-	act 'Doggy': gt 'LariskaSex', 'dog_1'
+	if pcs_vag = 0:
+		act 'Get your cherry popped':
+			temp = rand (1, 3)
+			if temp = 1:
+				act 'Missionary': gt 'LariskaSex', 'miss_1'
+			elseif temp = 2:
+				act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+			else
+				act 'Doggy': gt 'LariskaSex', 'dog_1'
+			end
+		end
+	else
+		act 'Missionary': gt 'LariskaSex', 'miss_1'
+		act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+		act 'Doggy': gt 'LariskaSex', 'dog_1'
+	end
 	act 'Anal Missionary': gt 'LariskaSex', 'anal_miss_1'
 	act 'Anal Cowgirl': gt 'LariskaSex', 'anal_cow_1'
 	act 'Anal Doggy': gt 'LariskaSex', 'anal_dog_1'
@@ -401,9 +494,22 @@ if $ARGS[0] = 'anal_miss_1':
 	$orgasm_txt = 'The sensation of having your ass pounded by Lariska overwhelms you, sending waves of pleasure screaming through your body.'
 	gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub'
 	gs 'stat'
-	act 'Missionary': gt 'LariskaSex', 'miss_1'
-	act 'Cowgirl': gt 'LariskaSex', 'cow_1'
-	act 'Doggy': gt 'LariskaSex', 'dog_1'
+	if pcs_vag = 0:
+		act 'Get your cherry popped':
+			temp = rand (1, 3)
+			if temp = 1:
+				act 'Missionary': gt 'LariskaSex', 'miss_1'
+			elseif temp = 2:
+				act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+			else
+				act 'Doggy': gt 'LariskaSex', 'dog_1'
+			end
+		end
+	else
+		act 'Missionary': gt 'LariskaSex', 'miss_1'
+		act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+		act 'Doggy': gt 'LariskaSex', 'dog_1'
+	end
 	act 'Anal Missionary': gt 'LariskaSex', 'anal_miss_1'
 	act 'Anal Cowgirl': gt 'LariskaSex', 'anal_cow_1'
 	act 'Anal Doggy': gt 'LariskaSex', 'anal_dog_1'
@@ -436,9 +542,22 @@ if $ARGS[0] = 'anal_cow_1':
 	$orgasm_txt = 'The sensation of having your ass pounded by Lariska overwhelms you, sending waves of pleasure screaming through your body.'
 	gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub'
 	gs 'stat'
-	act 'Missionary': gt 'LariskaSex', 'miss_1'
-	act 'Cowgirl': gt 'LariskaSex', 'cow_1'
-	act 'Doggy': gt 'LariskaSex', 'dog_1'
+	if pcs_vag = 0:
+		act 'Get your cherry popped':
+			temp = rand (1, 3)
+			if temp = 1:
+				act 'Missionary': gt 'LariskaSex', 'miss_1'
+			elseif temp = 2:
+				act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+			else
+				act 'Doggy': gt 'LariskaSex', 'dog_1'
+			end
+		end
+	else
+		act 'Missionary': gt 'LariskaSex', 'miss_1'
+		act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+		act 'Doggy': gt 'LariskaSex', 'dog_1'
+	end
 	act 'Anal Missionary': gt 'LariskaSex', 'anal_miss_1'
 	act 'Anal Cowgirl': gt 'LariskaSex', 'anal_cow_1'
 	act 'Anal Doggy': gt 'LariskaSex', 'anal_dog_1'
@@ -473,16 +592,29 @@ if $ARGS[0] = 'anal_dog_1':
 	$orgasm_txt = 'The sensation of having your ass pounded by Lariska overwhelms you, sending waves of pleasure screaming through your body.'
 	gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub'
 	gs 'stat'
-	act 'Missionary': gt 'LariskaSex', 'miss_1'
-	act 'Cowgirl': gt 'LariskaSex', 'cow_1'
-	act 'Doggy': gt 'LariskaSex', 'dog_1'
+	if pcs_vag = 0:
+		act 'Get your cherry popped':
+			temp = rand (1, 3)
+			if temp = 1:
+				act 'Missionary': gt 'LariskaSex', 'miss_1'
+			elseif temp = 2:
+				act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+			else
+				act 'Doggy': gt 'LariskaSex', 'dog_1'
+			end
+		end
+	else
+		act 'Missionary': gt 'LariskaSex', 'miss_1'
+		act 'Cowgirl': gt 'LariskaSex', 'cow_1'
+		act 'Doggy': gt 'LariskaSex', 'dog_1'
+	end
 	act 'Anal Missionary': gt 'LariskaSex', 'anal_miss_1'
 	act 'Anal Cowgirl': gt 'LariskaSex', 'anal_cow_1'
 	act 'Anal Doggy': gt 'LariskaSex', 'anal_dog_1'
 	act 'Put the strap-on away': gt 'LariskaSex', 'undressed2'
 end
 
-
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 if $ARGS[0] = 'boyfriend_sex':
 	menu_off = 1

locations/Nudelake.qsrc

@@ -193,7 +193,7 @@ if $ARGS[0] = 'swim':
 	end
 	pcs_sweat = 10 + rand(0,4)
 
-	'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_nude.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_nude_<<rand(0,10)>>.jpg"></center>'
 	'You go for a swim.'
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 

locations/bass.qsrc

@@ -136,9 +136,9 @@ if $ARGS[0] = 'a':
 		pcs_sweat = 10 + rand(0,4)
 		if pcs_inhib < 50:inhib_exp += rand(1,2)
 		if func('body_din','pregnancyVisibility') = 0:
-			'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_bikini_<<rand(1,8)>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_<<rand(1,8)>>.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'
 		end
 		'You take a swim in the pool, which invigorates you, making you feel refreshed.'
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'

locations/carF.qsrc

@@ -338,7 +338,7 @@ end
 
 if $ARGS[0] = 'city':
 	cla
-	if home_owned[15] = 1 and cardrive ! 8: act 'Go home':gs 'carF', 'nearby', 8
+	if home_owned[15] = 1 and cardrive ! 8: act 'Go home to St. Petersburg''s residential area':gs 'carF', 'nearby', 8
 	if cardrive ! 3:act 'Go to St. Petersburg''s Industrial Region':gs 'carF', 'nearby', 3
 	if cardrive ! 1:act 'Go to St. Petersburg''s residential area':gs 'carF', 'nearby', 1
 	if cardrive ! 2:act 'Go to St. Petersburg city center':gs 'carF', 'nearby', 2

locations/city_lake.qsrc

@@ -106,7 +106,7 @@ if $ARGS[0] = 'start':
 				pcs_sweat = 10 + rand(0,4)
 				if pcs_inhib < 40:inhib_exp += rand(1,2)
 
-				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_swimsuit.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
 				'You swim in the lake for an hour. The water refreshes and invigorates you.'
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 

locations/city_mansion_residence_3.qsrc

@@ -63,18 +63,18 @@ if $ARGS[0] = 'ypool':
 		*clr & cla
 		if func('body_din','pregnancyVisibility') = 0:
 			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_nude_<<rand(1,10)>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_nude_<<rand(1,10)>>.jpg"></center>'
 				inhib_exp += rand(2,4)
 			else
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_bikini_<<rand(1,8)>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_<<rand(1,8)>>.jpg"></center>'
 				if pcs_inhib < 50: inhib_exp += rand(2,4)
 			end
 		else
 			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_nude_<<rand(1,2)>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_nude_<<rand(1,2)>>.jpg"></center>'
 				inhib_exp += rand(2,4)
 			else
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'
 				if pcs_inhib < 50: inhib_exp += rand(2,4)
 			end
 		end

locations/etoexhib.qsrc

@@ -545,7 +545,7 @@ if $ARGS[0] = 'pos16':
 			gs 'exercise', 'tier1', 1, 'stren_exp'
 			pcs_sweat = 10 + rand(0,4)
 
-			'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_swimsuit.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
 			'You swim in the lake, the water refreshes and invigorates you.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
@@ -566,7 +566,7 @@ if $ARGS[0] = 'pos16':
 			gs 'arousal', 'foreplay', 60, 'exhibition'
 			gs 'arousal', 'end'
 
-			'<center><img <<$set_imgh>> src="images/locations/suburban/lakenude.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_nude_<<rand(0,10)>>.jpg"></center>'
 			'You swim in the lake completely naked, the water refreshes and invigorates you.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 

locations/pav_lake.qsrc

@@ -219,7 +219,7 @@ if month >= 5 and month <= 9:
 	end
 end
 
-if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
+if temper >= 15 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 	act 'Take a walk along the beach':
 		*clr & cla
 		menu_off = 1
@@ -227,16 +227,18 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		pcs_mood += 5
 		gs'stat'
 
-		if (PCloswimwear = 1) and pcs_hips<=90:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
-		elseif (PCloswimwear = 1) and pcs_hips >= 90 and pcs_hips<=110:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
-		elseif (PCloswimwear = 1) and pcs_hips>=110:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,1.jpg"></center>'
-			if pcs_inhib < 50:inhib_exp += rand(1,2)
-		elseif $clothingworntype = 'nude':
+		if $clothingworntype = 'nude':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/walknude.jpg"></center>'
 			inhib_exp += rand(1,3)
+		elseif PCloswimwear = 1:
+			if pcs_hips >= 110:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,1.jpg"></center>'
+			elseif bmi_calc > 24:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
+			end
+			if pcs_inhib < 50:inhib_exp += rand(1,2)
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk0,'+rand(0,2)+'.jpg"></center>'
 		end
@@ -258,10 +260,10 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 			if pcs_stren < 30: stren_exp += 1
 			fat -= 1
 			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_nude.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_nude_<<rand(0,10)>>.jpg"></center>'
 				inhib_exp += rand(1,2)
 			else
-				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_swimsuit.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
 				if pcs_inhib < 50: inhib_exp += rand(1,2)
 			end
 			'You swim and play in the lake, feeling refreshed and invigorated by the water.'

locations/pav_lake_nude.qsrc

@@ -168,10 +168,10 @@ if temper >= 15 and month >= 5 and month <= 9:
 			if pcs_stren < 30: stren_exp += 1
 			fat -= 1
 			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_nude.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_nude_<<rand(0,10)>>.jpg"></center>'
 				if pcs_inhib < 60:inhib_exp += rand(1,2)
 			else
-				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_swimsuit.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
 				if pcs_inhib < 40:inhib_exp += rand(1,2)
 			end
 			'You play around and have fun in the lake, enjoying the feeling of the warm water on your naked body. The water refreshes and invigorates you.'

locations/uni_dorm.qsrc

@@ -162,9 +162,15 @@ if $ARGS[0] = 'eighth_floor':
 								'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. When she see''s you she frowns. "I told you last time, I don''t have time for games and I am tired of yours. Now get lost, I''m busy." She closes the door in your face.'
 								act 'Leave':gt 'uni_dorm', 'elevator'
 							else
-								'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. "Well if it isn''t my new favorite white slave bitch. I am kinda busy at the moment, I am punishing one of my other slaves."'
-								*nl
-								'She starts to close the door before you can even say anything, then she stops and smiles at you, like she just had a good idea. "Or you could come in and watch." She stands aside to let you come in, holding the door open. As you glance in the room, you see a naked college boy kneeling next to the couch. When he notices you he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she is going to do to him, considering the strapon she is wearing. Is that something you want to watch? It could be interesting and you might learn something from her as well. On the other hand do you want to humiliate him more than he already is?'
+								if kendra_male_slave = 0:
+									'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. "Well if it isn''t my new favorite white slave bitch. I am kinda busy at the moment, I am punishing one of my other slaves."'
+									*nl
+									'She starts to close the door before you can even say anything, then she stops and smiles at you, like she just had a good idea. "Or you could come in and watch." She stands aside to let you come in, holding the door open. As you glance in the room, you see a naked college boy kneeling next to the couch. When he notices you he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she is going to do to him, considering the strapon she is wearing. Is that something you want to watch? It could be interesting and you might learn something from her as well. On the other hand do you want to humiliate him more than he already is?'
+								else
+									'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. "Well if it isn''t my new favorite white slave bitch. I punishing one of the boys again, want to come in a watch again?"'
+									*nl
+									'She stands aside to let you come in, holding the door open. As you glance in the room, you see the same college boy as last time, kneeling naked next to the couch, just like last time. When he notices you he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she is going to do to him after watching last time. Is that something you want to watch again? Is this something you might want to learn to do to others as well? There is a couple of boys you know it might be fun to do it to.'
+								end
 								gs 'arousal', 'erotic_nudity', 3
 								gs 'stat'
 								act 'Enter': gt 'kendra', 'kendra_male_slave'
@@ -172,8 +178,13 @@ if $ARGS[0] = 'eighth_floor':
 									*clr & cla
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
-									'You shake your head no. "No thanks you look busy and I don''t want to disturb you."'
-									'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you of that in time. Maybe next time then." Then she closes the door, as she does. You see her stroking her strapon as she heads for the young man. Once the door is closed you turn and leave yourself.'
+									if kendra_male_slave = 0:
+										'You shake your head no. "No thanks you look busy and I don''t want to disturb you."'
+										'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you of that in time. Maybe next time then." Then she closes the door, as she does. You see her stroking her strapon as she heads for the young man. Once the door is closed you turn and leave yourself.'
+									else
+										'You shake your head no. "No thanks, while last time was certainly entertaining, I didn''t come to see that again."'
+										'She laughs loudly and roughly grabs your chin in her hand. "Your lose, I might have let you take a turn with him, or maybe not." Then she closes the door, as she does. You see her stroking her strapon as she heads for the young man. Once the door is closed you turn and leave yourself.'
+									end
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'uni_dorm', 'elevator'