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/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