add change into a swimwear, simplify re-dressing, and fix a few bugs in the code.

locations/katjaEv.qsrc

@@ -1,9 +1,10 @@
 # katjaEv
 
-
 $loc = 'katjaEv'
 $loc_arg = $ARGS[0]
-
+$menu_loc = 'katjaEv'
+$menu_arg = $ARGS[0]
+menu_off = 0
 
 if $ARGS[0] = '':
 	*clr & cla
@@ -839,45 +840,40 @@ if $ARGS[0] = 'kathan':
 										'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensuall eyes.'
 										'"Bitch!"'
 										'You varelly whisper your insult and take the gigling bimbo wannabe towards the secluded beach.'
-																		
-										act 'Swim':gs 'arousal', 'voyeur', '10' & if pcs_inhib < 20: inhib_exp += 1 & gs 'clothing', 'strip' & gs 'underwear', 'remove' & gt 'katjaEV','kathan5'
 
-										act 'Tan':gs 'arousal', 'voyeur', '10' & if pcs_inhib < 20: inhib_exp += 1 & gs 'clothing', 'strip' & gs 'underwear', 'remove' & gt 'katjaEV','kathan6'
-
-										act 'Walk':gs 'arousal', 'voyeur', '10' & if pcs_inhib < 20: inhib_exp += 1 & gs 'clothing', 'strip' & gs 'underwear', 'remove' & gt 'katjaEV','kathan7'
-									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!':
-											*clr & cla
-											gs 'willpower', 'pay', 'resist'
+										act 'Swim':
 											gs 'arousal', 'voyeur', '10'
-											gs 'stat'
-											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL1.jpg"></center>'
-											'Groaning in frustration, you get naked and put on your swimwear, as sweet... candid... Katja... get hers, and exaggeratedly sighs giving you sensuall eyes.'
-											'"Bitch!"'
-											'You varelly whisper your insult and take the gigling bimbo wannabe towards the secluded beach.'
-											act 'Swim': gt 'katjaEV','kathan5'
-
-											act 'Tan': gt 'katjaEV','kathan6'
+											if pcs_inhib < 20: inhib_exp += 1
+											gs 'clothing', 'strip'
+											gs 'underwear', 'remove'
+											gt 'katjaEV','kathan5'
+										end
 
-											act 'Walk': gt 'katjaEV','kathan7'
+										act 'Tan':
+											gs 'arousal', 'voyeur', '10'
+											if pcs_inhib < 20: inhib_exp += 1
+											gs 'clothing', 'strip'
+											gs 'underwear', 'remove'
+											gt 'katjaEV','kathan6'
+										end
 
+										act 'Walk':
+											gs 'arousal', 'voyeur', '10'
+											if pcs_inhib < 20: inhib_exp += 1
+											gs 'clothing', 'strip'
+											gs 'underwear', 'remove'
+											gt 'katjaEV','kathan7'
 										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 'katjaEV','kathanlakesw2'
 									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
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL3.jpg"></center>'
-									'You decide to put on your swimwear, so after making sure, that there aren''t voyeurs, Katja and you, change on your swimwear.'
-																		
-									act 'Swim':minut +=10 & gt 'katjaEV','kathan5'
-
-									act 'Tan':minut +=10 & gt 'katjaEV','kathan6'
-
-									act 'Walk':minut +=10 & gt 'katjaEV','kathan7'
-
+									gt 'katjaEV','kathanlakesw1'
 								end
 							end
 						elseif pcs_inhib > 20:
@@ -938,29 +934,23 @@ if $ARGS[0] = 'kathan':
 									'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensuall eyes.'
 									'"Bitch!"'
 									'You varelly whisper your insult and take the gigling bimbo wannabe towards the sauna.'
-																		
-									act 'Go to the sauna':gs 'arousal', 'voyeur', '10' & if pcs_inhib < 20: inhib_exp += 1 & gs 'clothing', 'strip' & gs 'underwear', 'remove' & gt 'katjaEv','kathan10'
+
+									act 'Go to the sauna':
+										gs 'arousal', 'voyeur', '10'
+										if pcs_inhib < 20: inhib_exp += 1
+										gs 'clothing', 'strip'
+										gs 'underwear', 'remove'
+										gt 'katjaEv','kathan10'
+									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!':
-										*clr & cla
-										gs 'willpower', 'pay', 'resist'
-										gs 'arousal', 'voyeur', '10'
-										gs 'stat'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL1.jpg"></center>'
-										'Groaning in frustration, you get naked and put on your swimwear, as sweet... candid... Katja... get hers, and exaggeratedly sighs giving you sensuall eyes.'
-										'"Bitch!"'
-										'You varelly whisper your insult and take the gigling bimbo wannabe towards the sauna .'
-											
-										act 'Go to the sauna':gt 'katjaEv','kathan10'
-									end
+									act 'Resist her!': gt 'katjaEV','kathansaunasw2'
 								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
-								minut +=10
-								gt 'katjaEV','kathan10'
+								gt 'katjaEV','kathansaunasw1'
 							end
 						end
 					elseif pcs_inhib > 20:
@@ -977,7 +967,7 @@ if $ARGS[0] = 'kathan':
 								if pcs_inhib < 20: inhib_exp += 1
 								gs 'stat'
 								gt 'katjaEv','kathan10'
-							end							
+							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
@@ -991,7 +981,7 @@ if $ARGS[0] = 'kathan':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWS1.jpg"></center>'
-			'Everyone knows, at least in your school, that being cool costs money and if you aren''t called Elžbieta "Bella" Artamonov or Dimka Nosov, your parents are going to frown at any "unnecessary" expenditure. Sigh. What would they know about being a teen in modern Russia?'		
+			'Everyone knows, at least in your school, that being cool costs money and if you aren''t called Elžbieta "Bella" Artamonov or Dimka Nosov, your parents are going to frown at any "unnecessary" expenditure. Sigh. What would they know about being a teen in modern Russia?'
 			'So, what is a high school student with no money going to do? You visit open-air markets, jumble sales and the occasional van with "second hand" merchandise in the back.'
 			'That is precisely what you and Katja have decided to do. Look for that elusive bargain that will propel your standing a little higher in the school''s totem. An always important enterprise that requires time, patience and the endless manhandling of the sympathetic sellers'' products.'
 
@@ -1024,7 +1014,75 @@ if $ARGS[0] = 'kathan':
 	end
 end
 
+if $ARGS[0] = 'kathanlakesw1':
+    *clr & cla
+	if $clothingworntype ! 'swimwear':
+		minut +=10
+		gs 'changingroom', 'view_swim_list'
+		act 'Hm... Is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEv','kathan'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL3.jpg"></center>'
+		'You decide to put on your swimwear, so after making sure, that there aren''t voyeurs, Katja and you, change on your swimwear.'
+
+		act 'Swim': gt 'katjaEV','kathan5'
+
+		act 'Tan': gt 'katjaEV','kathan6'
+
+		act 'Walk': gt 'katjaEV','kathan7'
+	end
+end
+
+
+if $ARGS[0] = 'kathanlakesw2':
+    *clr & cla
+	if $clothingworntype ! 'swimwear':
+		gs 'changingroom', 'view_swim_list'
+		act 'Hm... Is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEv','kathan'
+	else
+		gs 'willpower', 'pay', 'resist'
+		gs 'arousal', 'voyeur', '10'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL1.jpg"></center>'
+		'Groaning in frustration, you get naked and put on your swimwear, as sweet... candid... Katja... get hers, and exaggeratedly sighs giving you sensuall eyes.'
+		'"Bitch!"'
+		'You varelly whisper your insult and take the gigling bimbo wannabe towards the secluded beach.'
+
+		act 'Swim': gt 'katjaEV','kathan5'
+
+		act 'Tan': gt 'katjaEV','kathan6'
+
+		act 'Walk': gt 'katjaEV','kathan7'
+	end
+end
+
+if $ARGS[0] = 'kathansaunasw1':
+    *clr & cla
+	if $clothingworntype ! 'swimwear':
+		gs 'changingroom', 'view_swim_list'
+		act 'Hm... Is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEv','kathan'
+	else
+		minut += 10
+		gt 'katjaEv','kathan10'
+	end
+end
 
+if $ARGS[0] = 'kathansaunasw2':
+    *clr & cla
+	if $clothingworntype ! 'swimwear':
+		gs 'changingroom', 'view_swim_list'
+		act 'Hm... Is probably better if you find something else to do': npc_rel['A14'] -= 1 & gt 'katjaEv','kathan'
+	else
+		gs 'willpower', 'pay', 'resist'
+		gs 'arousal', 'voyeur', '10'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL1.jpg"></center>'
+		'Groaning in frustration, you get naked and put on your swimwear, as sweet... candid... Katja... get hers, and exaggeratedly sighs giving you sensuall eyes.'
+		'"Bitch!"'
+		'You varelly whisper your insult and take the gigling bimbo wannabe towards the sauna .'
+										
+		act 'Go to the sauna':gt 'katjaEv','kathan10'
+	end
+end
 
 if $ARGS[0] = 'kathan1':
 	*clr & cla
@@ -1086,7 +1144,7 @@ if $ARGS[0] = 'kathan1':
 						'You grab Katja''s hand, and with her help, you somehow stabilize and skate without killing yourself. After a fun half-hour, it is time to look for something else to do.'
 						gs 'stat'
 
-						 act 'Continue':gt 'katjaEv','kathan'					
+						 act 'Continue':gt 'katjaEv','kathan'
 					elseif dummy = 4:
 						'<center><table><td><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS1.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></td></table></center>'
 						'"Are you ok?"'
@@ -1156,7 +1214,7 @@ if $ARGS[0] = 'kathan1':
 						'"Sorry! I mean... Thanks! Uhh..."'
 						'Ivan just smiles and giving you both a nod, turns and silently skates towards the sunset, leaving you with a flustered Katja who gives you sideways glances. Ok, this is an awkward way to end this. It is time to look for something else to do.'
 
-						act 'Continue':KatjaHorny += 5 & gt 'katjaEv','kathan'					
+						act 'Continue':KatjaHorny += 5 & gt 'katjaEv','kathan'
 					else
 						'<center><table><td><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS2.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big169.jpg"></td></table></center>'
 						'"Yep, good question. This is by far your worst performance <<$pcs_nickname>>"'
@@ -1390,12 +1448,7 @@ if $ARGS[0] = 'kathan5':
 		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
 		'"Hm? Oh! True! Let''s go back."'
 
-		if $clothingworntype = 'nude':
-			act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
-
-		else
-			act 'Redress and return to her home':minut += 10 & gt 'pav_residential'
-		end
+		act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
 
 	elseif rand(1,20) = 1:
 		gt 'katjaEv','kathan8'
@@ -1411,18 +1464,11 @@ if $ARGS[0] = 'kathan5':
 		'"Ah! This is nice Katja!"'
 		'"Yes, it is. Sometimes you really just want to be alone with a good friend, without peeping toms, judgemental prudes or envious "friends watching you."'
 		'The time passes quickly as you both play, enjoying the water and the sun, and little by little you tire until the only you can do is relax, floating on your back. As you lie there rocking slowly over the water, you realize that half an hour of intense waterplay has passed and you are beginning to wrinkle. It is time to look for something else to do.'
-
-		act 'Redress and look for something else to do':
-			gs 'underwear', 'wear'
-			gs 'clothing', 'wear_last_worn'
-			minut += 10
-
-			gt 'katjaEv','kathan'
-		end
 	end
 
 	act 'Tan': gt 'katjaEv','kathan6'
 	act 'Walk': gt 'katjaEv','kathan7'
+	act 'Redress and look for something else to do': gs 'underwear', 'wear'& gs 'clothing', 'wear_last_worn' & minut += 10 & gt 'katjaEv','kathan'
 end
 ! tan
 
@@ -1436,12 +1482,7 @@ if $ARGS[0] = 'kathan6':
 		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
 		'"Hm? Oh! True! Let''s go back."'
 
-		if $clothingworntype = 'nude':
-			act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
-
-		else
-			act 'Redress and return to her home':minut += 10 & gt 'pav_residential'
-		end
+		act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
 
 	elseif rand(1,20) = 1:
 		gt 'katjaEv','kathan8'
@@ -1451,19 +1492,11 @@ if $ARGS[0] = 'kathan6':
 		'Katja takes out some sunscreen and you make sure that your skin is protected from the UV rays, smearing it all over your naked bodies. After this, you both lie down and relax, letting the warm sun tan your skin without the danger of leaving ugly bikini marks.'
 		'"Hey! <<$pcs_nickname>>! I think it is time."'
 		'You blink surprised, as the sun''s warmth has made you a little drowsy. Looking at the hour, you see that half an hour has passed and it is probably best to stop as you are in danger of recieving some painful sunburn. It is time to look for something else to do.'
-
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbath.jpg"></center>'
 		'Katja takes out some sunscreen and you make sure that your skin is protected from the UV rays, smearing it all over your bodies. After this, you both lie and relax, letting the warm sun tan your skin.'
 		'"Hey! <<$pcs_nickname>>! I think it is time."'
 		'You blink surprised, as the sun''s warmth has made you a little drowsy. Looking at the hour, you see that half an hour has passed and it is probably best to stop as you are in danger of recieving some painful sunburn. It is time to look for something else to do.'
-
-		if $clothingworntype = 'nude':
-			act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
-
-		else
-			act 'Redress and look for something else to do':minut += 10 & gt 'katjaEv','kathan'
-		end
 	end
 	if $clothingworntype = 'nude' and pcs_inhib < 20: inhib_exp += rand(1,2)
 	if $clothingworntype = 'nude' and KatjaSlut <= 20: KatjaSlut += 5
@@ -1477,6 +1510,7 @@ if $ARGS[0] = 'kathan6':
 
 	act 'Swim': gt 'katjaEv','kathan5'
 	act 'Walk': gt 'katjaEv','kathan7'
+	act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
 end
 
 ! walk
@@ -1489,19 +1523,7 @@ if $ARGS[0] = 'kathan7':
 		'"Hey <<$pcs_nickname>>, it is getting a little late. I must return home."'
 		'"Hm? Oh! True! Let''s go back."'
 
-		if $clothingworntype = 'nude':
-			act 'Redress and return to her home':
-				gs 'clothing', 'wear_last_worn'
-				gs 'underwear', 'wear'
-				minut += 10
-				gt 'pav_residential'
-			end
-		else
-			act 'Redress and return to her home':
-				minut += 10
-				gt 'pav_residential'
-			end
-		end
+		act 'Redress and return to her home': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
 
 	elseif rand(1,20) = 1:
 		gt 'katjaEv','kathan8'
@@ -1513,20 +1535,6 @@ if $ARGS[0] = 'kathan7':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL8.jpg"></center>'
 		'The secluded beach has, between other things a beautiful landscape. Strange in these industrialized areas, but a place where you can take a relaxing walk and enjoy your mutual company under a beautiful sky.'
 		'After some girl talk, singing to the birds and feeding the squirrels, you realize that half an hour has passed and it is time to look for something else to do.'
-
-		if $clothingworntype = 'nude':
-			act 'Redress and look for something else to do':
-				gs 'clothing', 'wear_last_worn'
-				gs 'underwear', 'wear'
-				minut += 10
-				gt 'katjaEv','kathan'
-			end
-		else
-			act 'Redress and look for something else to do':
-				minut += 10
-				gt 'katjaEv','kathan'
-			end
-		end
 	end
 
 	if $clothingworntype = 'nude' and pcs_inhib < 20: inhib_exp += rand(1,2)
@@ -1539,6 +1547,7 @@ if $ARGS[0] = 'kathan7':
 
 	act 'Swim': gt 'katjaEv','kathan5'
 	act 'Tan': gt 'katjaEv','kathan6'
+	act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
 end
 
 ! Ivan appeared
@@ -1572,11 +1581,7 @@ if $ARGS[0] = 'kathan8':
 			npc_rel['A14'] += 1
 			gs 'stat'
 
-			if $clothingworntype = 'nude':
-				act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
-			else
-				act 'Redress and look for something else to do':minut += 10 & gt 'katjaEv','kathan'
-			end
+			act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
 
 			act 'Swim': gt 'katjaEv','kathan5'
 			act 'Tan': gt 'katjaEv','kathan6'
@@ -1661,13 +1666,7 @@ if $ARGS[0] = 'kathan9':
 				'"Ok girls, this has been fun, but I must return to my training."'
 				'Ivan gives you both a little kiss on the cheek and then walks towards the lake, letting the two of you appreciate the jock''s nice butt... Sigh...'
 
-				if $clothingworntype = 'nude':
-					act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 20 & gt 'katjaEv','kathan'
-
-				else
-
-					act 'Redress and look for something else to do':minut += 20 & gt 'katjaEv','kathan'
-				end
+				act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 20 & gt 'katjaEv','kathan'
 
 				act 'Swim':minut += 10 & gt 'katjaEv','kathan5'
 
@@ -1685,11 +1684,7 @@ if $ARGS[0] = 'kathan9':
 				'"Ok girls, this has been fun, but I must return to my training."'
 				'Ivan gives you both a little kiss on the cheek and then walks towards the lake, letting the two of you appreciate the jock''s nice butt. Sigh... maybe you can stop him from leaving. Katja''s longing gaze is a clear indicator that she isn''t against passing more "time" with the jock.'
 
-				if $clothingworntype = 'nude':
-					act 'Redress and look for something else to do':KatjaHorny += 5 & gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 20 & gt 'katjaEv','kathan'
-				else
-					act 'Redress and look for something else to do':KatjaHorny += 5 & minut += 20 & gt 'katjaEv','kathan'
-				end
+				act 'Redress and look for something else to do':KatjaHorny += 5 & gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 20 & gt 'katjaEv','kathan'
 
 				act 'Swim':KatjaHorny += 5 & minut += 10 & gt 'katjaEv','kathan5'
 
@@ -1829,11 +1824,7 @@ if $ARGS[0] = 'kathan9':
 															'"Oh my! I''m sore <<$pcs_nickname>>! I need a rest."'
 															'You get up and embrace the ginger before deciding to redress, as Katja seems pretty wasted and it is best to take her home.'
 
-															if $clothingworntype = 'nude':
-																act 'Redress and take Katja to her home':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
-															else
-																act 'Redress and take Katja to her home':minut += 10 & gt 'pav_residential'
-															end
+															act 'Redress and take Katja to her home':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'pav_residential'
 														end
 													end
 												end
@@ -1930,12 +1921,7 @@ if $ARGS[0] = 'kathan9':
 													'"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.'
 
-													if $clothingworntype = 'nude':
-														act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
-
-													else
-														act 'Redress and look for something else to do':gt 'katjaEv','kathan'
-													end
+													act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
 												end
 											end
 										end
@@ -1951,12 +1937,7 @@ if $ARGS[0] = 'kathan9':
 				'"Ehm... Girls, I must return to my training."'
 				'You blink. Ivan''s words take you by surprise and before you or Katja can say something, he quickly returns to the lake. Time to look for something else to do.'
 
-				if $clothingworntype = 'nude':
-					act 'Redress and look for something else to do': npc_rel['A14'] += 1 & npc_rel['A3'] += 1 & gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
-
-				else
-					act 'Redress and look for something else to do':npc_rel['A14'] += 1 & npc_rel['A3'] += 1 & gt 'katjaEv','kathan'
-				end
+				act 'Redress and look for something else to do': npc_rel['A14'] += 1 & npc_rel['A3'] += 1 & gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
 
 				act 'Swim': npc_rel['A14'] += 1 & npc_rel['A3'] += 1 & gt 'katjaEv','kathan5'
 
@@ -1970,6 +1951,7 @@ if $ARGS[0] = 'kathan9':
 	act 'Swim': gt 'katjaEv','kathan5'
 	act 'Tan': gt 'katjaEv','kathan6'
 	act 'Walk': gt 'katjaEv','kathan7'
+	act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
 end
 
 
@@ -1990,7 +1972,7 @@ if $ARGS[0] = 'kathan10':
 	gs 'stat'
 
 	if $clothingworntype = 'nude':
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS8.jpg"></center>'				
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS8.jpg"></center>'
 
 		if KatjaSlut >= 20:
 			'After undressing in the lockers, and waiting for your turn, Katja and you enter the sauna. You sit completely naked, neither you or Katja being ashamed to show your beautiful bodies and letting the hot and humid air smooth your precious skins.'
@@ -2101,7 +2083,7 @@ if $ARGS[0] = 'kathan10':
 				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 & gt 'katjaEv','kathan'
+		act 'Shower, redress and go':minut += 10 & gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & gt 'katjaEv','kathan'
 	end
 end
 
@@ -2125,9 +2107,9 @@ if $ARGS[0] = 'kathan11':
 		'"Yuhu! Katja! One for pavlovsk''s alpha bitches!"'
 		'You scream with all your might to throw away the cold, the redhead joining your exuberance and dipping with you several more times in the frozen lake.'
 		'"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.'								
+		'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 & gt 'katjaEv','kathan'
+	act 'Shower, redress and go':minut += 10 & gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & gt 'katjaEv','kathan'
 end
 
 if $ARGS[0] = 'kathan12':
@@ -2405,7 +2387,7 @@ if $ARGS[0] = 'kathan14':
 							act 'Look for something else to do':npc_rel['A16'] -= 1 & grupvalue[1] += 5 & grupvalue[3] -= 5 & mood += 10 & gt 'katjaEv','kathan'
 							act 'Invite Natasha to hang around with you':npc_rel['A16'] -= 1 & grupvalue[1] += 5 & grupvalue[3] -= 5 & mood += 10 & gt 'katjaEv','kathan15'
 						end
-					end						
+					end
 				else
 					'<center><table><td><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td></table></center>'
 					'You aren''t a ninja, and the most flagrant clue to that is the puzzled expression on Natasha''s face as she turns towards you and slaps your extended hands as you try to expose her butt.'
@@ -2473,7 +2455,7 @@ if $ARGS[0] = 'kathan14':
 						else
 							act 'Take Natasha to Katja''s room (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
-	
+
 						if hour >= 20:
 							act 'It''s too late, acompany Katja to her home':mood -= 10 & minut += 5 & gt 'pav_residential'
 						else
@@ -2717,7 +2699,7 @@ if $ARGS[0] = 'kathan18':
 		gs 'stat'
 
 		if random_event <= pcs_agil:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT5.jpg"></center>'		
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT5.jpg"></center>'
 			'You give Katja a conspiratory smile. She has a moment of doubt, but then a devilish smile creeps on her face. Yep. Never forget that she is Viktoriya''s sister! So, walking innocently, you creep towards the "innocent" couple and approach for the kill."'
 			'"Vanya! Vicky! What a surprise to meet you two here! Katja and I were thinking about what to do, but now that we are reunited, we can... Mph!"'
 			'Vicky''s hand covers your mouth as the couple''s annoyed gaze falls over you.'
@@ -2887,7 +2869,7 @@ if $ARGS[0] = 'kathan20':
 		'I was going to give you a flower, but then I realized that you''re far more beautiful than any flower I could pick.'
 	elseif random_event = 16:
 		'If I had a star for every moment you crossed my mind, I would have an entire galaxy.'
-	elseif random_event = 17:	
+	elseif random_event = 17:
 		'You can leave me breathless all you want, but please don''t leave me alone.'
 	elseif random_event = 18:
 		'A day without you crawls so slow that it feels like a year. A day with you, on the other hand, runs so fast that it feels like a minute.'
@@ -2948,7 +2930,7 @@ if $ARGS[0] = 'kathan21':
 		'What? Are you ignoring me? Fortunately, I want your mouth for other things.'
 	elseif random_event = 16:
 		'Your mouth says NO! Sniff...but my cock say YES!'
-	elseif random_event = 17:	
+	elseif random_event = 17:
 		'Deep inside, you are all the same. Cock hungry whores, so let''s skip the foreplay.'
 	elseif random_event = 18:
 		'Come to my bed. I promise that you will never leave it.'
@@ -3086,7 +3068,7 @@ if $ARGS[0] = 'kathan23':
 				act 'Look for something else to do':npc_rel['A14'] += 5 & mood += 10 & gt 'katjaEv','kathan'
 			end
 		else
-			'<center><img <<$set_imgh>> src="images/pc/glare.jpg"></center>'	
+			'<center><img <<$set_imgh>> src="images/pc/glare.jpg"></center>'
 			'Grabbing Katja''s hand, you try to look for a distraction, but, sadly, there isn''t one and Svyatoslav takes advantage of that, running towards your position and standing in your way.'
 			'"Hey! Katja! Nice to meet you!"'
 			'Fuck! That is the silent word that crosses between the redhead and you as the jock gets between the two of you and begins to talk to the less than interested Katja, somewhat ignoring your presence.'
@@ -3471,6 +3453,7 @@ if $ARGS[0] = 'katnatsex1':
 	npc_sex['A14'] += 1
 	npc_rel['A16'] += 5
 	npc_sex['A16'] += 1
+	
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS6.jpg"></center>'
@@ -3480,6 +3463,8 @@ if $ARGS[0] = 'katnatsex1':
 	'You grab Katja''s hand and exit the shop, followed by a meekly Natasha. The journey back seems to take an eternity as the two girls eye one another silently, but finally, you enter Katjas''s room, quickly undress and jump onto the bed.'
 	'"So girls, how do we begin?"'
 	'The girls strip slower than you, and you can see Katja ogling a blushing (but not embarrassed) Natasha. They then jumps on the bed and looks at you expectantly.'
+	gs 'clothing', 'strip'
+	gs 'underwear', 'remove'
 
 	act 'Katja':
 		menu_off = 1
@@ -3507,7 +3492,7 @@ if $ARGS[0] = 'katnatsex1':
 			'One of your fingers penetrates Natasha''s hot, wet pussy a little too roughly, but it sends the correct message, and the nerd finally shuts up and ends the struggling. Now she is at your tender mercies, and Katja kneels beside you to devour the now silent girl, but that doesn''t last long, as you two pussy-hungry vixens begin to lick, bite and fingerfuck the trashing girl, whose screams of pleasure are only contained by your deep kisses, making her raise her thighs little by little until, finally, she cums.'
 
 			act 'The girls seem too tired to continue.': gt 'katjaEv','katnatsex2'
-				
+
 			gs 'willpower', 'cuni', 'force', 'hard'
 			if will_cost <= pcs_willpwr:
 				act 'Force the girls to eat you':
@@ -3750,7 +3735,7 @@ if $ARGS[0] = 'katnatsex2':
 	'"Hm?! What? <<$pcs_nickname>>? Huff! I''m wasted! That was nice... Hm? Where is Natasha?"'
 	'Kissing her, you explain to the redhead that Natasha has just left and then you snuggle against Katja, enjoying her company until you think it''s time to redress.'
 
-	act 'Redress and leave': gt 'pav_residential'
+	act 'Redress and leave': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 20 & gt 'pav_residential'
 end
 
 if $ARGS[0] = 'katnatsex3':
@@ -3768,7 +3753,7 @@ if $ARGS[0] = 'katnatsex3':
 	'You turn surprised towards the redhead... Shit! Before you can retort, a horny and frustrated Natasha gets up and begins to redress, giving you a nice glance of her body, but before she leaves, Katja grabs her hand and kisses the nerd''s mouth. After a few moments, she releases Natasha, who remains by the bedside a moment, before quickly exiting the room.'
 	'Katja is silent for a while, caressing your belly before sighing and redressing. She doesn''t say anything, but you doubt she is happy.'
 
-	act 'Redress and leave': gt 'pav_residential'
+	act 'Redress and leave': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 20 & gt 'pav_residential'
 end