[changed] swimwear and nude swim standardisation for various lakes and rivers. Added checks for swimwear, inhib, exhib and other minor tweaks.

Nudelake, lake, gLakeNude, glake, gadriver

locations/Nudelake.qsrc

@@ -1,46 +1,102 @@
 # Nudelake
+
+$loc = 'Nudelake'
+$metka = ''
+$menu_loc = 'Nudelake'
+$menu_arg = ''
+menu_off = 0
 $location_type = 'secluded'
+
 '<center><b>nudist beach</b></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/lake/nudelake.jpg"></center>'
 'The nudist beach - clothing optional.'
 
-if $clothingworntype ! 'swimwear' and $clothingworntype ! 'nude':
-	if pcs_inhib > 50:
-		minut += 5
-		gs 'underwear', 'remove'
-		gs 'clothing', 'strip'
-		'You strip naked, enjoying the warm breeze on your bare skin.'
-	else
-		'You feel uncomfortable here in your clothes but you don''t have the confidence to go nude. Maybe you would be OK in swimwear?'
-		act 'Return': gt 'lake', 'start'
-	exit
+if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+	act'Get dressed':
+		cla
+		*clr
+		minut+=5
+		gs 'clothing', 'wear_last_worn'
+		gs 'underwear', 'wear'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/dress_nudebeach.jpg"></center>'
+		'You put your clothes back on.'
+		act'Continue':gt'Nudelake'
+	end
+end
+
+if temper >= 15 and month >= 5 and month <= 9:
+	if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
+		act'Change into your swimwear':
+			cla
+			*clr
+			minut+=5
+			if pcs_horny >= 90:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants1.jpg"></center>'
+				'You want to change into a swimsuit, but with no changing room here and your pussy oozing juices down your leg coupled with the thought that people will see, horrifies you. You abandon the idea.'
+				'"I should sort out my arousal first." You think to yourself.'
+
+				act'Continue':gt'Nudelake'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/swimsuit_nudebeach.jpg"></center>'
+				'You wrap a towel around yourself and you''re ready to change into your swimsuit.'
+
+				act'Choose outfit':gt'changingroom', 'view_swim_list'
+			end
+		end
 	end
-elseif $clothingworntype = 'swimwear':
-	if pcs_inhib > 50:
-		act'Strip naked':
-			cls
-			minut += 5
-			gs 'underwear', 'remove'
-			gs 'clothing', 'strip'
-			xgt 'Nudelake'
+end
+
+if temper >= 15 and month >= 5 and month <= 9:
+	if $clothingworntype ! 'nude':
+		act'Take off your clothes':
+			if pcs_inhib > 30:
+				cla
+				*clr
+				minut += 5
+				gs 'clothing', 'strip'
+				gs 'underwear', 'remove'
+				if pcs_horny >= 80 and exhibitionist_lvl > 1:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
+					'You strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
+				elseif pcs_inhib >= 60:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
+					'Not caring if anyone is looking at you, you slowly take off your clothes. You peel off each item like a stripper. Soon, you are completely naked.'
+				elseif pcs_inhib < 60:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
+					'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes. You''re naked now.'
+				end
+			else
+				cla
+				*clr
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/shyness.jpg"></center>'
+				'Even though no one is around, you don''t feel confident enough to actually take your clothes off. What if someone would see you nude?'
+			end
+			act'Continue':gt'Nudelake'
 		end
 	end
 end
 gs 'stat'
 
 if hour >= 6 and hour <= 20 and temper >= 15:
-	'Here you can <a href="exec:gt ''Nudelake'', ''zagarat''">sunbathe</a> and <a href="exec:gt ''Nudelake'', ''swim''">swim</a>'
-	'Also, you can play <a href="exec:gt ''Nudelake'', ''voleybol''">beach volleyball</a>'
+	if $clothingworntype = 'nude':
+		'Here you can <a href="exec:gt ''Nudelake'', ''zagarat''">sunbathe</a> and <a href="exec:gt ''Nudelake'', ''swim''">swim</a>'
+		act 'Go swimming': gt 'Nudelake', 'swim'
+		act 'Go sunbathe': gt 'Nudelake', 'zagarat'
+		'Also, you can play <a href="exec:gt ''Nudelake'', ''voleybol''">beach volleyball</a>'
+	end
 elseif hour >= 6 and hour <= 20:
 	'Its too cold for any nudist activities.'
 else
 	'The nudist beach is closed.'
 end
 
-act 'Return to the main beach':
-	if $clothingworntype = 'nude':gs 'clothing', 'wear_last_worn'
-	gs 'underwear', 'wear'
-	gt 'lake', 'start'
+if $clothingworntype = 'nude':
+	act 'Get dressed':
+		if $clothingworntype = 'nude':gs 'clothing', 'wear_last_worn'
+		gs 'underwear', 'wear'
+	end
+else
+	act 'Return to the main beach':gt 'lake', 'start'
 end
 
 if katday ! daystart and npc_rel['A219'] >= 1 and temper >= 15:
@@ -50,7 +106,7 @@ if katday ! daystart and npc_rel['A219'] >= 1 and temper >= 15:
 end
 
 if $ARGS[0] = 'voleybol':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cls
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/voleybol.jpg"></center>'
@@ -75,7 +131,7 @@ if $ARGS[0] = 'voleybol':
 end
 
 if $ARGS[0] = 'zagarat':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cls
 	minut += 30
 	if pcs_sweat < 35 : pcs_sweat += 5
@@ -104,7 +160,7 @@ if $ARGS[0] = 'zagarat':
 end
 
 if $ARGS[0] = 'swim':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cla
 	*clr
 	pcs_makeup = 1
@@ -120,7 +176,7 @@ if $ARGS[0] = 'swim':
 		if pcs_inhib < 50:inhib_exp += rand(1,3)
 	end
 	pcs_sweat = 10 + rand(0,4)
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/shared/lake/nudeswim.jpg"></center>'
 	'You go for a swim.'
 
@@ -128,7 +184,7 @@ if $ARGS[0] = 'swim':
 end
 
 if $ARGS[0] = 'smotr':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cls
 	minut += 30
 	gs 'stat'

locations/gLakeNude.qsrc

@@ -2,9 +2,14 @@
 
 
 $location_type = 'secluded'
-$loc = $curloc
+$loc = 'gLakeNude'
+$metka = ''
+$menu_loc = 'gLakeNude'
+$menu_arg = ''
+menu_off = 0
 cls
 gs'stat'
+
 '<center><H4>Secluded beach</H4></center>'
 if month>=3 and month<=5:
 	if hour>=6 and hour<=17:
@@ -13,7 +18,7 @@ if month>=3 and month<=5:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.spring.night.jpg"></center>'
 	end
 	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
-	''
+	*nl
 end
 if month>=6 and month<=8:
 	if hour>=6 and hour<=19:
@@ -22,7 +27,7 @@ if month>=6 and month<=8:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.night.jpg"></center>'
 	end
 	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
-	''
+	*nl
 end
 if month>=9 and month<=11:
 	if hour>=6 and hour<=18:
@@ -31,7 +36,7 @@ if month>=9 and month<=11:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.night.jpg"></center>'
 	end
 	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
-	''
+	*nl
 end
 if month=1 or month=2 or month=12:
 	if hour>=7 and hour<=16:
@@ -41,7 +46,7 @@ if month=1 or month=2 or month=12:
 	end
 	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
 	'<center>Ever since winter arrived, the lake in Pavlovsk has been frozen over. The lake is being used as a skating rink and lots of people go to skate there every day; if you have skates you could join them.</center>'
-	''
+	*nl
 end
 
 'This small natural beach is hidden away from the general public. To reach it you had to travel around the lake along a forest trail. On this secluded beach you can often find sunbathers and people skinny dipping, including people from other towns and even some from the city.'
@@ -60,7 +65,7 @@ if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 end
 
 if temper >= 15 and month >= 5 and month <= 9:
-	if $clothingworntype ! 'swimwear':
+	if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
 		act'Change into your swimwear':
 			cla
 			*clr
@@ -79,7 +84,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			end
 		end
 	end
-end	
+end
 
 if temper >= 15 and month >= 5 and month <= 9:
 	if $clothingworntype ! 'nude':
@@ -159,12 +164,12 @@ if temper >= 15 and month >= 5 and month <= 9:
 				end
 				if krem = 0:
 					pcs_tan = pcs_tan + 1
-					
+
 					'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun for an hour.'
 				elseif krem > 0:
 					krem = krem - 1
 					pcs_tan = pcs_tan + 3
-					
+
 					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun for an hour.'
 				end
 				act 'Continue':gt'gLakeNude'
@@ -217,7 +222,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				voyeurism += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event.jpg"></center>'
 				'From the corner of your eye you see several naked people. You think they look right at you. You blush and you freeze in terror, tears well up in the corner of your eyes. After a few moments you find yourself looking at your own feet.<br><dh>"Wha....What am I doing?! Why do I feel like watching... Am I a voyeur? Yes, I am! I`m a girl who likes to watch nude people!"</dh> you think.<br> But then you remember how you recently were watching others on the beach and think: <dh>"That was scary, cool, and hot. I need to keep at least one eye always watching."</dh>'
-				act'Watch the couple': 
+				act'Watch the couple':
 					gs'gLakeNudeEvent','gLakeNude_sex'
 				end
 			end
@@ -231,12 +236,12 @@ if temper >= 15 and month >= 5 and month <= 9:
 			else
 				cla
 				*clr
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/nudebeachself'+rand(1,3)+'.jpg"></center>' 
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/nudebeachself'+rand(1,3)+'.jpg"></center>'
 				'You want to watch for nudists, but suddenly notice that you start to feel weird.<br><dh>"Probably spying too much."</dh> you think and look straight ahead.'
 				act'Continue': gt'gLakeNude'
 			end
 		end
-	end	
+	end
 	if voyeurism >= 17 and voyeurism_start = 2:
 		if voyeurism_forest = 0:
 			act'Explore the forest': gt'gLakeNudeForest'

locations/gadriver.qsrc

@@ -465,7 +465,9 @@ if $ARGS[0] = 'gadbitch':
 			end
 		end
 	end
-	if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'nude': act 'Get changed':gt 'changingroom', 'view_swim_list'
+	if ARRSIZE('swimwear') > 0:
+		act 'Get changed':gt 'changingroom', 'view_swim_list'
+	end
 	if $clothingworntype = 'nude':
 		act 'Get dressed':
 			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
@@ -612,6 +614,9 @@ if $ARGS[0] = 'second_thoughts':
 	*nl
 	if ARRSIZE('swimwear') = 0:
 		'"Actually Mira, I can''t come in right now, as I didn''t bring a swimsuit" you replied you her. "I''m going to stay on the shore for a bit."'
+		*nl
+		'You should probably buy some swimwear if you intend of spending time at the beach'
+		*nl
 	else
 		'"Actually Mira, I''ve changed my mind, I don''t feel like swimming just now," you replied you her. "I''m going to stay on the shore for a bit."'
 	end

locations/glake.qsrc

@@ -1,10 +1,14 @@
 # gLake
+
 CLOSE ALL
-$metka = $ARGS[0]
-$loc = $CURLOC
+$loc = 'gLake'
+$metka = ''
+$menu_loc = 'glake'
+$menu_arg = ''
+menu_off = 0
 $location_type = 'public_outdoors'
-cls
 gs'stat'
+
 ! --- meynold event --- !. edit to month 5~10
 if $clothingworntype ! 'swimwear' and $clothingworntype ! 'nude' and temper >= 5 and sunWeather = 1 and month >= 5 and month <= 10 and hour < 20 and ((hour >= 10 and week >= 6) or (hour >= 14 and week < 6)) and mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart: gt 'mey_vika_events', 'beach_event1'
 
@@ -18,7 +22,7 @@ if month>=3 and month<=5:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.spring.night.jpg"></center>'
 	end
 	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
-	''
+	*nl
 end
 if month>=6 and month<=8:
 	if hour>=6 and hour<=19:
@@ -27,7 +31,7 @@ if month>=6 and month<=8:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.summer.night.jpg"></center>'
 	end
 	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
-	''
+	*nl
 end
 if month>=9 and month<=11:
 	if hour>=6 and hour<=18:
@@ -36,7 +40,7 @@ if month>=9 and month<=11:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.autumn.night.jpg"></center>'
 	end
 	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
-	''
+	*nl
 end
 if month=1 or month=2 or month=12:
 	if hour>=7 and hour<=16:
@@ -47,13 +51,19 @@ if month=1 or month=2 or month=12:
 	'<center>A small lake, located not far from Pavlovsk. You''re not sure whether Pavlovsk was built near the lake on purpose or not.</center>'
 	end
 	'<center>Ever since winter arrived, the lake in Pavlovsk has been frozen over. The lake is being used as a skating rink and lots of people go to skate there every day; if you have skates you could join them.</center>'
-	''
+	*nl
 	if pcs_icesktng>0: 'Your ice-skating skill is <<pcs_icesktng>>.'
 end
 
-act 'Use changing room':gt 'changingroom', 'view_swim_list'
+if ARRSIZE('swimwear') > 0:
+		act 'Use changing room':gt 'changingroom', 'view_swim_list'
+	else
+		*nl
+		'You should probably buy some swimwear if you intend of spending time at the beach'
+		*nl
+	end
 
-if $clothingworntype = 'nude': 
+if $clothingworntype = 'nude':
 
 	act'Put your clothes back on':
 		cla
@@ -134,7 +144,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		pcs_willpwr += 5
 		pcs_mood += 5
 		gs'stat'
-		
+
 		if $clothingworntype = 'swimwear' and pcs_hips<=90:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
 		elseif $clothingworntype = 'swimwear' and pcs_hips >= 90 and pcs_hips<=110:
@@ -154,7 +164,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 
 	end
 
-	if $clothingworntype ! 'nude' and pcs_inhib > 50:
+	if $clothingworntype ! 'nude' and (pcs_inhib >= 60 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
 		act'Strip naked':
 			cla
 			minut += 5
@@ -162,12 +172,12 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 			gs 'underwear', 'remove'
 			gs 'clothing', 'strip'
 			'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the lake or just lie down in the sand and do some sunbathing.'
-    
+
 			act'Continue':gt'glake'
 		end
 	end
 
-	
+
 	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 		act 'Go swim in the lake (1:00)':
 			cla
@@ -184,8 +194,8 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 			if $clothingworntype = 'nude':
 				'<center><img <<$set_imgh>> src="images/locations/shared/lake/nudeswim<<rand(0,9)>>.jpg"></center>'
 				inhib_exp += rand(1,3)
-			else 
-				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim.jpg"></center>' 
+			else
+				'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim.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 clean lake water.'
@@ -200,7 +210,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 					cla
 					*clr
 					pcs_willpwr -= 5
-					pcs_mood -= 5 
+					pcs_mood -= 5
 					inhib_exp += rand(1,3)
 					'<center><img <<$set_imgh>> src="images/beast/dogcaine.jpg"></center>'
 					'As you lie down on your towel to catch some rays of sun and hopefully work on your tan a little, a stray dog appears out of nowhere. It keeps sniffing between your legs, which makes you feel very uncomfortable since you''re not wearing anything. You spend most of the hour trying to chase the dog away, but it comes back every time you think you got rid of it. You don''t get much sunbathing done as a result.'
@@ -261,7 +271,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 									'You were here first! You''re outraged by the way he just plants himself down next to you and exclaim: "Erm, excuse me!? I was here first!"'
 									'The man is not impressed in the slightest, obviously having played this game before. He immediately challenges your claim: "Oh, excuse me princess! Is this your spot? Do you own it?"'
-										
+
 									act'Yes you do!':
 										cls
 										minut += 5
@@ -277,13 +287,13 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 
 									end
 								end
-		 
+
 								act'Ignore them':
 									cls
 									minut+=5
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-									'Those guys look intimidating. You don''t want any trouble and just pretend they''re not there, laying on the beach with your eyes closed. However, a few moments later you feel a strange tickling on your stomach. You open your eyes to see what''s causing it, and you see the fat man running a blade of grass over your stomach with a smug grin on his face. Looks like you can''t ignore them any longer.'									
+									'Those guys look intimidating. You don''t want any trouble and just pretend they''re not there, laying on the beach with your eyes closed. However, a few moments later you feel a strange tickling on your stomach. You open your eyes to see what''s causing it, and you see the fat man running a blade of grass over your stomach with a smug grin on his face. Looks like you can''t ignore them any longer.'
 
 									act'Keep ignoring them':
 										cls
@@ -315,7 +325,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 							!! gs 'npcgeneratec', 0, 'Guy', rand((i - 1),(i + 1))
 							!! gs 'boyStat', $npclastgenerated, 2
 							'While you are sunbathing, three guys sit down near you. While you notice them looking at you and talking about you, they don''t come over.'
-							
+
 							act 'Continue':gt'glake'
 							exit
 						elseif tipelakeboyrand <= 80:
@@ -327,7 +337,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 							gs'LakeBoyZ'
 							'While you are sunbathing, a guy sits down next to you. He''s kind of cute, actually.'
 							'He tries to chat you up: "Hey there beautiful, I''m <<$boydesc>>. What''s your name?"'
-			
+
 							act 'Get away from him':gt'glake'
 							dynamic $gL_boy_z
 							exit
@@ -344,7 +354,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 			end
 		end
 	end
-end	
+end
 
 act'Go to the secluded beach':minut += 10 & gt'gLakeNude'
 
@@ -414,18 +424,18 @@ $katok_start = {
 			icesktng_exp += 1
 			'While you''re trying some new things, you suddenly figure out how to do a certain move properly. It definitely improves your skating skills.'
 		end
-	elseif pcs_icesktng <= 50: 
+	elseif pcs_icesktng <= 50:
 		pcs_mood+=5
 		'At long last, you finally manage to skate for a full 100 meters without falling. It''s definitely going a lot better. Some of the other regulars who have seen you struggle before notice how much better you''re doing, and congratulate you on your progress.'
 		'You become a bit more daring as you continue to ride, almost never falling any more.'
-		if rand(1,3)=1: 
+		if rand(1,3)=1:
 			icesktng_exp += 2
 			'You fall down, just this once. One of the more experienced skaters notices, and helps you up. Once you''re up on your skates again, he explains what you did wrong. His explanation will go a long way in you not making the same mistake again, and you feel like you''re a better skater for it. You thank him as you skate off, trying to apply the trick he just taught you.'
 		end
 	elseif pcs_icesktng<=70:
 		pcs_mood+=10
 		'You''re getting better and better at ice skating. You basically never fall any more, and enjoy the flow of the wind on your face as you dare to go faster and faster.'
-		if rand(1,3)=1: 
+		if rand(1,3)=1:
 			icesktng_exp += 3
 			'As you ride you watch the more experienced skaters, trying to pick up new tricks. You try to copy some of the things they are doing, and notice that those moves are indeed more efficient than how you were doing it before.'
 		end
@@ -433,7 +443,7 @@ $katok_start = {
 		pcs_mood+=15
 		'You''ve pretty much mastered ice skating now, and won''t get any better without professional training. Occasionally you do some tricks while you skate around the rink, and others admire your skills as you fly past them.'
 	end
-	
+
 	if hour <= 17:
 		act'Skate some more':dynamic $katok_start
 		act'Leave the rink':gt'glake'
@@ -456,7 +466,7 @@ act'Return to Pavlovsk':
 		'You need to get dressed in regular clothing first.'
 		act'Return':gt'glake'
 	elseif $clothingworntype ! 'nude':
-		minut += 5 
+		minut += 5
 		gt'pavResidential'
 	else
 		cla

locations/lake.qsrc

@@ -1,11 +1,13 @@
 # lake
+
 if $ARGS[0] = 'start':
-	$metka = 'start'
 	$loc = 'lake'
-    $location_type = 'public_outdoors'
-	cla
-	clr
-	*clr
+	$metka = 'start'
+	$menu_loc = 'lake'
+	$menu_arg = 'start'
+	menu_off = 0
+	$location_type = 'public_outdoors'
+	*clr & cla
 	CLOSE ALL
 	if sound = 0:
 		if month >=11 and month <= 12 or month >=1 and month <=3:
@@ -34,14 +36,20 @@ if $ARGS[0] = 'start':
 		'At the lake stands <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
 	end
 
-	act 'Use changing room':gt 'changingroom', 'view_swim_list'
+	if ARRSIZE('swimwear') > 0: 
+		act 'Use changing room':gt 'changingroom', 'view_swim_list'
+	else
+		*nl
+		'You should probably buy some swimwear if you intend of spending time at the beach'
+		*nl
+	end
 
 	if npc_QW['A192'] = 3 and temper >= 15 and $clothingworntype = 'swimwear' and hour >= 6 and hour <= 20:'Waving her hand at you is <a href="exec:gt ''nastja'', ''pos14''">Anastasia</a>.'
 
 	if hour >= 6 and hour <= 20:
-		'Nearby are the <a href="exec:gt ''lake'', ''aquapark''">water attractions</a>.'
-		'You can <a href="exec:gt ''lake'', ''horse''">ride a horse</a>.'
-		'And a short walk from here there is even a <a href="exec:gt ''Nudelake''">nudist beach</a>.'
+		'Nearby are various '+iif($clothingworntype = 'swimwear','<a href="exec:gt ''lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
+		'You can go for a ride on a <a href="exec:gt ''lake'', ''horse''">horse</a> along the beach.'
+		'And a short walk from here there is even a '+iif(pcs_inhib >= 30 or (exhibitionist_lvl > 1 and pcs_horny > 60),'<a href="exec:gt ''Nudelake''">nudist beach</a>','nudist beach, but you are''t confident enough to go in that direction.')+''
 		if temper >= 15 and $clothingworntype = 'swimwear':
 			'Also you can sunbathe or swim.'
 
@@ -205,7 +213,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'aquapark':
-    $location_type = 'public_outdoors'
+	$location_type = 'public_outdoors'
 	minut += 5
 	cls
 	gs 'stat'
@@ -217,7 +225,7 @@ if $ARGS[0] = 'aquapark':
 end
 
 if $ARGS[0] = 'gidro':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cls
 	gs 'stat'
 	minut += 1
@@ -247,7 +255,7 @@ if $ARGS[0] = 'gidro':
 end
 
 if $ARGS[0] = 'banan':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cls
 	gs 'stat'
 	minut += 1
@@ -277,7 +285,7 @@ if $ARGS[0] = 'banan':
 end
 
 if $ARGS[0] = 'gorka':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cls
 	gs 'stat'
 	minut += 1
@@ -303,7 +311,7 @@ if $ARGS[0] = 'gorka':
 end
 
 if $ARGS[0] = 'horse':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cls
 	gs 'stat'
 	minut += 1
@@ -333,7 +341,7 @@ if $ARGS[0] = 'horse':
 end
 
 if $ARGS[0] = 'walklake1':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cla
 	*clr
 	gs 'stat'
@@ -672,7 +680,7 @@ if $ARGS[0] = 'walklake1':
 			end
 		end
 
-		
+
 !!		act '"Just between your legs?"':
 !!			cla
 !!			*clr
@@ -721,7 +729,7 @@ if $ARGS[0] = 'walklake1':
 end
 
 if $ARGS[0] = 'walklake2':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cla
 	*clr
 	gs 'stat'
@@ -995,7 +1003,7 @@ if $ARGS[0] = 'walklake2':
 								pcs_horny += 10
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk2/walk7.jpg"></center>'
 								'Sated the men lower you down, and begin to masturbate on your face, you open your mouth and wait patiently. They both finish, pouring a gulf of sperm in your mouth and on your face and chest.'
-								
+
 								if pcs_horny >= 100:
 									minut += 10
 									pcs_horny = 0
@@ -1016,7 +1024,7 @@ if $ARGS[0] = 'walklake2':
 end
 
 if $ARGS[0] = 'vlake1':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cla
 	*clr
 	gs 'stat'
@@ -1090,7 +1098,7 @@ if $ARGS[0] = 'vlake1cum':
 	sexvolume = 35
 	spafinloc = 11
 	gs 'cum_manage'
-	
+
 	:vlake1cumloop
 	gs 'npcgeneratec', 0, 'Stranger at the lake', rand(18,45)
 	gs 'boyStat', $npclastgenerated
@@ -1212,7 +1220,7 @@ gs 'cum_manage'
 end
 
 if $ARGS[0] = 'andrey1':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	cla
 	*clr
 	gs 'stat'
@@ -1546,7 +1554,7 @@ end
 if $ARGS[0] = 'horse1':
 	cla
 	*clr
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse1.jpg"></center>'
 	'Riding along the beach you notice the two men on quad bikes, they wave to you and offered to keep you company.'