Merge remote-tracking branch '3xpurt/master'

locations/Miroslava.qsrc

@@ -1,8 +1,8 @@
 # Miroslava
 
 if $ARGS[0] = 'Start' or $ARGS[0] = '':
-	$metka = $ARGS[0]
-	$loc = $curloc
+	$metka = 'Start'
+	$loc = 'Miroslava'
 	gs 'boyStat', 'A60'
 	girlage = age
 	temp = RAND(0,20)
@@ -63,9 +63,9 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/graze_cow_mira.jpg"></center>'
 			'You chat with Mira for an hour. You feel like your relationship with her has improved.'
 
-			if hour < 13:act 'Further':gt'gadfield','cow'
-			if hour >= 13 or hour < 16:act 'Further':gt'gadfield','cow2'
-			if hour >= 16:act 'Further':gt'gadfield','cow3'
+			if hour < 13:act 'Continue':gt'gadfield','cow'
+			if hour >= 13 or hour < 16:act 'Continue':gt'gadfield','cow2'
+			if hour >= 16:act 'Continue':gt'gadfield','cow3'
 		end
 
 		if hour < 13 or hour >= 16:
@@ -82,8 +82,8 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/graze_cow_run_mira.jpg"></center>'
 				'You spend the next hour running around the field with Mira.'
 
-				if hour < 14:act 'Further':gt'gadfield','cow'
-				if hour >= 16:act 'Further':gt'gadfield','cow3'
+				if hour < 14:act 'Continue':gt'gadfield','cow'
+				if hour >= 16:act 'Continue':gt'gadfield','cow3'
 			end
 			if temper >= 15 and sunWeather = 1:
 				act 'Tan by the field':
@@ -96,8 +96,8 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/graze_cow_sun_mira.jpg"></center>'
 					'You lie down next to Mira and tan together in the sun.'
 
-					if hour < 14:act 'Further':gt'gadfield','cow'
-					if hour >= 16:act 'Further':gt'gadfield','cow3'
+					if hour < 14:act 'Continue':gt'gadfield','cow'
+					if hour >= 16:act 'Continue':gt'gadfield','cow3'
 				end
 			end
 		end
@@ -116,7 +116,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river_mira.jpg"></center>'
 				'You wade in the river, splashing around with Mira is lot of fun.'
 
-				act 'Further':gt'gadfield','cow2'
+				act 'Continue':gt'gadfield','cow2'
 			end
 
 			act 'Tan by the river':
@@ -129,7 +129,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/graze_cow_sun_mira2.jpg"></center>'
 				'You lie down next to Mira and tan together in the sun.'
 
-				act 'Further':gt'gadfield','cow2'
+				act 'Continue':gt'gadfield','cow2'
 			end
 		end
 
@@ -238,7 +238,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/girls_go.jpg"></center>'
 						'You offer go with Mira to to the meadow and she readily agrees. On the way you tell each other different stories, some true but mostly tall tales.'
 
-						act 'Further':gt 'meadow'
+						act 'Continue':gt 'meadow'
 					else
 						minut += 5
 						gs 'stat'
@@ -273,7 +273,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				gs 'Miroslava', 'miraclothes'
 				'You ask Mira if she has already met everyone in the village. When she says no, you offer to introduce her to some of the local guys and she readily agrees, asking you to wait a couple of minutes while she changes and freshens up. When she comes out, you go drinking with the group of boys near your house...'
 
-				act 'Further':mira_guest = 0 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh'
+				act 'Continue':mira_guest = 0 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh'
 			end
 		end
 
@@ -296,9 +296,9 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						'You suggest drinking with the village boys and Mira readily agrees, then asks you to wait a couple of minutes while she changes. When she comes out, you go to to drink with the group of boys near your house....'
 					end
 					if npc_QW['A60'] > 15 and npc_QW['A63'] > 15 and gadriver_gang < 3 :
-						act 'Further':mira_guest = 0 & MiraLoc = 5 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh_group'
+						act 'Continue':mira_guest = 0 & MiraLoc = 5 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh_group'
 					else
-						act 'Further':mira_guest = 0 & MiraLoc = 5 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh'
+						act 'Continue':mira_guest = 0 & MiraLoc = 5 & minut += 15 & temp = 0 & npc_drunk['A60'] = 0 & gt 'mitkabuh'
 					end
 				else
 					minut += 5
@@ -422,7 +422,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				'"But, I just willing only go to the forest edge. I refuse to go deep into the forest," Mira quickly added.'
 				'"Okay, okay, we''ll only walk along the edge of the forest," - you agree.'
 
-				act 'Further':gt $loc, $metka
+				act 'Continue':gt $loc, $metka
 			end
 		end
 
@@ -465,16 +465,18 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 		end
 
 		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and MiraLoc = 3 and miratalkforest > 1 and npc_rel['A60'] >= 5 and $clothingworntype ! 'nude' and forestpicnic = 0:
-			act 'Offer to walk naked':
-				*clr & cla
-				minut+=5
-				gs 'underwear', 'remove'
-				gs 'clothing', 'strip', 'gadforest'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest6.jpg"></center>'
-				'You offered Mira to take a walk through the woods naked and she immediately agreed.'
+			if pcs_inhib >= 25 or exhibitionist_lvl > 1:
+				act 'Offer to walk naked':
+					*clr & cla
+					minut+=5
+					gs 'underwear', 'remove'
+					gs 'clothing', 'strip', 'gadforest'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest6.jpg"></center>'
+					'You offered Mira to take a walk through the woods naked and she immediately agreed.'
 
-				act'Further':gt'gadforest','1'
+					act'Continue':gt'gadforest','1'
+				end
 			end
 		end
 
@@ -501,7 +503,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/dressbch.jpg"></center>'
 							'You changed into your regular clothes and went home with Mira.'
 
-							act 'Further': minut += 15 & gt'Gadhouse'
+							act 'Continue': minut += 15 & gt'Gadhouse'
 						end
 					end
 				end
@@ -517,7 +519,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_tv'+rand(1,12)+'.jpg"></center>'
 					'You and Mira watch TV for an hour.'
 
-					act'Further':gt'Gadhouse'
+					act'Continue':gt'Gadhouse'
 				end
 			end
 
@@ -583,7 +585,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/dressbch.jpg"></center>'
 						'You change into your clothes and go home with Mira.'
 
-						act 'Further': gt'Gadhouse'
+						act 'Continue': gt'Gadhouse'
 					end
 				end
 
@@ -595,7 +597,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Further': gt 'Miroslava', 'Start'
+					act 'Continue': gt 'Miroslava', 'Start'
 				end
 			end
 			if mira_guest = 1 and mira_temp >= 3 and mira_temp <= 4:
@@ -615,7 +617,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_tv'+rand(1,12)+'.jpg"></center>'
 					'You watch TV with Mira for an hour.'
 
-					act'Further':gt'Gadhouse'
+					act'Continue':gt'Gadhouse'
 				end
 
 				act'Refuse':
@@ -625,7 +627,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Further': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
 			end
 			if MiraLoc ! 2 and mira_temp = 5 and (meadow = 3 or meadow = 6) and mira_go_blok = 0 and MiraLoc ! 3 and hour < 19 and sunWeather = 1:
@@ -650,7 +652,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/girls_go.jpg"></center>'
 					'You go to Mira through the dense undergrowth to the hidden meadow. Along the way she merrily tells stories from her past city life.'
 
-					act 'Further': gt 'Meadow'
+					act 'Continue': gt 'Meadow'
 				end
 
 				act'Refuse':
@@ -661,7 +663,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Further': gt 'Miroslava', 'Start'
+					act 'Continue': gt 'Miroslava', 'Start'
 				end
 			end
 
@@ -692,7 +694,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Further': gt 'Miroslava', 'Start'
+					act 'Continue': gt 'Miroslava', 'Start'
 				end
 			end
 
@@ -715,7 +717,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira.jpg"></center>'
 					'"Not right now Mira," you say. "I''m not in the mood to talk right now."'
 
-					act 'Further': gt 'Miroslava', 'Start'
+					act 'Continue': gt 'Miroslava', 'Start'
 				end
 			end
 			if MiraLoc ! 1 and mira_temp >= 6 and mira_temp <= 7 and sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and mira_go_blok = 0 and MiraLoc ! 3 and hour < 18:
@@ -740,7 +742,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/girls_go.jpg"></center>'
 					'You decided to go with Mira to the village beach and all the way she goes, merrily chattering and telling stories.'
 
-					act 'Further': gt'Gadriver', 'Gadbitch'
+					act 'Continue': gt'Gadriver', 'Gadbitch'
 				end
 
 				act'Refuse':
@@ -751,7 +753,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'You tell Mira that you don''t feel like going to the river right now.'
 
-					act 'Further': gt 'Miroslava', 'Start'
+					act 'Continue': gt 'Miroslava', 'Start'
 				end
 			end
 		end

locations/gadforest.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = '1':
 		if foresteventrand = 9 and hour >= 8 and hour <= 15 and month >= 4 and month <= 10 and gadboyday ! daystart and week > 5: gt 'gadforest_event', 'gopforest_3boys'
 	end
 
-	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest > 1 and MiraLoc ! 3 and (inhib > 50 or exhibitionist_lvl > 1):
+	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest > 1 and MiraLoc ! 3 and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
 		act'Strip naked':
 			if forestpicnic = 0:
 				inhib_exp += rand(1,3)
@@ -167,7 +167,7 @@ if $ARGS[0] = '1':
 				end
 			end
 
-			act 'Further':gt 'gadforest','1'
+			act 'Continue':gt 'gadforest','1'
 		end
 	end
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and edge_forestday ! daystart:
@@ -212,7 +212,7 @@ if $ARGS[0] = '1':
 				gs 'gadforest', 'clothes2'
 				'You are wandering through the woods in search of mushrooms or berries for half an hour, but found nothing.'
 			end
-			act 'Further':gt 'gadforest','1'
+			act 'Continue':gt 'gadforest','1'
 		end
  	end
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and MiraLoc ! 3:
@@ -247,7 +247,7 @@ if $ARGS[0] = '1':
 				'You sneak out the woods, hiding your naked body in shadow and moving toward grandparents house.'
 				'You Successfully reach home without witness.'
 				cla
-				act 'Further':gt'Gadhouse'
+				act 'Continue':gt'Gadhouse'
 			else
 				'<B>You should dress before leave</B>'
 			end
@@ -348,7 +348,7 @@ if $ARGS[0] = '2':
 				gs 'gadforest', 'clothes2'
 				'You are wandering through the woods in search of mushrooms or berries for half an hour, but found nothing.'
 			end
-			act 'Further':gt 'gadforest','2'
+			act 'Continue':gt 'gadforest','2'
 		end
 	end
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
@@ -423,7 +423,7 @@ if $ARGS[0] = '3':
 			gs 'gadforest', 'clothes1'
 			'Within half an hour of wandering through the woods in search of mushrooms or berries, you found <<new_boletus>> kg mushrooms and <<new_bilberry>> kg of berries.'
 
-			act 'Further':gt 'gadforest','3'
+			act 'Continue':gt 'gadforest','3'
 		end
 	end
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
@@ -500,7 +500,7 @@ if $ARGS[0] = '4':
 			gs 'gadforest', 'clothes1'
 			'Within half an hour of wandering through the woods in search of mushrooms or berries, you found <<new_boletus>> kg mushrooms and <<new_bilberry>> kg of berries.'
 
-			act 'Further':gt 'gadforest','4'
+			act 'Continue':gt 'gadforest','4'
 		end
 	end
 	act 'Go further into the forest':
@@ -552,7 +552,7 @@ if $ARGS[0] = 'gadforestloststart':
 	end
 	'You suddenly realize in horror that you are not familiar with the area you are in... you get lost.'
 
-	act 'Further':
+	act 'Continue':
 		if lost = 1: gt 'gadforestlost','1'
 		if lost = 2: gt 'gadforestlost','2'
 		if lost = 3: gt 'gadforestlost','3'

locations/gadriver.qsrc

@@ -1,8 +1,11 @@
 # gadriver
 
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$metka = 'start'
+	$loc = 'gadriver'
+	menu_off = 0
+	$menu_loc = 'gadriver'
+	$menu_arg = 'start'
 	$location_type = 'public_outdoors'
 
 	gs 'stat'
@@ -139,10 +142,11 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'Gadbitch':
-	PC_arrive = iif($metka ! $ARGS[0], 1 , 0)
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	PC_arrive = iif($metka ! 'Gadbitch', 1 , 0)
 	$location_type = 'public_outdoors'
+	$metka = 'Gadbitch'
+	$loc = 'gadriver'
+	menu_off = 1
 	gs 'stat'
 
 	'<center><H4>Village Beach</H4></center>'
@@ -184,7 +188,7 @@ if $ARGS[0] = 'Gadbitch':
 
 	if temper >= 15 and month >= 5 and month <= 9:
 		temp_gr = RAND(0,9)
-		if $clothingworntype ! 'nude' and (pcs_inhib > 50 or exhibitionist_lvl > 1):
+		if $clothingworntype ! 'nude' and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
 			act 'Strip naked':
 				cla
 				minut += 5
@@ -364,7 +368,7 @@ if $ARGS[0] = 'Gadbitch':
 						end
 						'You are sunbathing by the river when Mira comes along. You smile, she undresses and lays her towel next to yours.'
 
-						act 'Further': gt'Gadriver', 'Gadbitch'
+						act 'Continue': gt'Gadriver', 'Gadbitch'
 					elseif $clothingworntype = 'nude':
 						*clr & cla
 						minut += 60
@@ -493,7 +497,7 @@ if $ARGS[0] = 'Gadbitch':
 			end
 		end
 	end
-	if $clothingworntype ! 'nude': act 'Get changed':gt 'changingroom', 'view_swim_list'
+	if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'nude': act 'Get changed':gt 'changingroom', 'view_swim_list'
 	if $clothingworntype = 'nude':
 		act 'Get dressed':
 			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
@@ -532,42 +536,54 @@ if $ARGS[0] = 'Gadbitch':
 		else
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_go_home.jpg"></center>'
 		end
+		*nl
 		'"<<$pcs_nickname>>, I have to go home, " Mira said to you and began to gather her stuff.'
 
-		act 'Further': gt'Gadriver', 'Gadbitch'
-	elseif Mira_no = 0 and MiraLoc ! 1 and rand(1,10) < 3 and hour > 8 and hour < 20 and sunWeather = 1 and temper >= 15 and PC_arrive = 1:
+		act 'Continue': gt'Gadriver', 'Gadbitch'
+	elseif Mira_no = 0 and MiraLoc = 1 and hour > 8 and hour < 20 and sunWeather = 1 and temper >= 15 and PC_arrive = 1:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_in_river.jpg"></center>'
+		*nl
 		'Arriving at the beach, you see Mira laying down, sunbathing on a towel.'
 		MiraLoc = 1
 		minut += 5
 		mira_go_blok = 1
 		gs 'stat'
 
-		act 'Further':
-			if rand(0,3) = 0 and Miraswimday ! daystart:
+		act 'Continue':
+			if Miraswimday ! daystart:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirariver.jpg"></center>'
+				*nl
 				'"<<$pcs_nickname>>, Why are you moping about on the shore, get in the water and swim with me?" - Mira called out to you as she waded into the river.'
 				minut += 1
 				Miraswimday = daystart
 				gs 'stat'
-
-				act'Agree':
-					cla
-					if exhibitionist_lvl > 1:
+				act 'Agree and get changed':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch1.jpg"></center>'
+					*nl
+					'"Wait Mira, I have to change out of my clothes!" you cry in response, although she could hardly hear you as she is already splashing around in the river.'
+					'You start to take off your clothes.'
+					if ARRSIZE('swimwear') > 0:
+						act 'Change into swimwear':
+							gs 'Gadriver','get_changed','start'
+						end
+					end
+					if pcs_inhib >= 25 or exhibitionist_lvl > 1:
 						act 'Strip naked':
 							cla
 							minut += 5
 							gs 'underwear', 'remove'
 							gs 'clothing', 'strip', 'VillageRiver'
 							inhib_exp += rand(1,3)
-							'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 river or just lie down in the sand and do some sunbathing.'
+							'Without hesitation, you take off all your clothes and neatly fold them before putting them down in a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
 
 							act 'Swim':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
-								'You wade into the river, you have fun with Mira spraying each other with water.'
+								*nl
+								'You wade into the river, and have fun with Mira spraying each other with water.'
 								temp_gr = RAND(0,15)
 								cumspclnt = 4 & gs 'cum_cleanup'
 								minut += 30
@@ -580,41 +596,9 @@ if $ARGS[0] = 'Gadbitch':
 							end
 						end
 					end
-					act 'Get changed':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch.jpg"></center>'
-						'"Wait Mira, I have to change into my swimsuit!" you cry in response, although she could hardly hear you as she is already splashing around in the river.'
-						'You take off your clothes, put on a swimsuit and run into the water after Mira.'
-						$metka = 'Gadbitch'
-
-						act 'Swim':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
-							'You wade into the river, you have fun with Mira spraying each other with water.'
-							temp_gr = RAND(0,15)
-							cumspclnt = 4 & gs 'cum_cleanup'
-							minut += 30
-							if pcs_inhib < 50:inhib_exp += rand(1,2)
-							gs 'exercise', 'tier1', 1, 'stren_exp'
-							pcs_sweat = 10 + rand(0,4)
-							gs'stat'
-
-
-							act 'Get out of the water':gt'Gadriver', 'Gadbitch'
-						end
-						gs 'Gadriver','Get changed','start' &! this call has to be last
-					end
-				end
-				act'Refuse':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirariver.jpg"></center>'
-					'"No, Mira I don''t feel like swimming just now," you replied you her. "I''m going to stay on the shore for a bit."'
-					minut += 1
-					npc_rel['A60'] -= 1
-					gs 'stat'
-
-					act 'Further': gt'Gadriver', 'Gadbitch'
+					act'Second thoughts': gt 'gadriver', 'second_thoughts'
 				end
+				act'Refuse': gt 'gadriver', 'second_thoughts'
 			else
 				gt'Gadriver', 'Gadbitch'
 			end
@@ -622,13 +606,60 @@ if $ARGS[0] = 'Gadbitch':
 	end
 end
 
+if $ARGS[0] = 'get_changed':
+	menu_off = 1
+	$metka = 'get_changed'
+	if $ARGS[1] = 'start':
+		gt 'changingroom', 'view_swim_list'
+	else
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch.jpg"></center>'
+		*nl
+		'You put on our swimwear and neatly fold your clothes before putting them down in a pile, now you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
+		if $clothingworntype = 'swimwear':
+			act 'Swim':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
+				*nl
+				'You wade into the river, and have fun with Mira spraying each other with water.'
+				temp_gr = RAND(0,15)
+				cumspclnt = 4 & gs 'cum_cleanup'
+				minut += 30
+				if pcs_inhib < 50:inhib_exp += rand(1,2)
+				gs 'exercise', 'tier1', 1, 'stren_exp'
+				pcs_sweat = 10 + rand(0,4)
+				gs'stat'
+
+				act 'Get out of the water':gt'Gadriver', 'Gadbitch'
+			end
+		else
+			act'Second thoughts': gt 'gadriver', 'second_thoughts'
+		end
+	end
+end
+
+if $ARGS[0] = 'second_thoughts':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirariver.jpg"></center>'
+	*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."'
+	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
+	minut += 1
+	npc_rel['A60'] -= 1
+	gs 'stat'
+
+	act 'Continue': gt'Gadriver', 'Gadbitch'
+end
 
 if $ARGS[0] = 'Mira':
 	*clr & cla
+	menu_off = 1
 	minut += 2
 	gs 'stat'
 
-
 	if sun = 1:
 		if npc_QW['A60'] < 12:
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mirabeach.jpg"></center>'
@@ -690,6 +721,7 @@ end
 
 if $ARGS[0] = 'mirapunish':
 	*clr & cla
+	menu_off = 1
 	minut += 10
 	pcs_horny += RAND(25,75)
 	gs 'stat'
@@ -703,6 +735,7 @@ end
 
 if $ARGS[0] = 'GuysRiver':
 	*clr & cla
+	menu_off = 1
 	minut += 5
 	pcs_horny += 10
 	gs 'stat'
@@ -892,6 +925,7 @@ end
 
 if $ARGS[0] = 'fishers':
 	*clr & cla
+	menu_off = 1
 	minut += 2
 	gs 'stat'
 
@@ -961,6 +995,7 @@ end
 if $ARGS[0] = 'fishing':
 	cla
 	*clr
+	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/river/gadriver.jpg"></center>'
 	'The stream quietly flows over the rocks, pleasantly tickling your ears. You gaze at the village that''s completely peaceful, there is a sense of serenity about it today.'
 	'You caught <<fish>> fish.'
@@ -1143,14 +1178,5 @@ if $ARGS[0] = 'fishing':
 		end
 	end
 end
-if $ARGS[0] = 'Get changed':
-	$metka = 'Get changed'
-	if $ARGS[1] = 'start':
-		gs 'saveposition'
-		gt 'changingroom', 'view_swim_list'
-	else
-		gt 'restoreposition'
-	end
-end
 --- gadriver ---------------------------------