cleaning code

locations/backwater.qsrc

@@ -7,43 +7,50 @@ $menu_loc = 'backwater'
 $menu_arg = ''
 menu_off = 0
 gs 'gadukino_event', 'sound'
-cls
-gs'stat'
 clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 
 if $ARGS[0] = '':
-	act 'Go back to the hut':
+	if huntersRape = 2:
+		clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/backwaterrelax.jpg"></center>'
+		*nl 'You sit down by the shore, resting.'
+		menu_off = 1
 		minut += 5
-		hunter_refuse = 0
+		huntersRape = 3
 		gs 'stat'
-		gt 'swamp_yard', 'start'
-	end
 
-	'<center><B>Backwater</B></center>'
+		act 'Further':gt 'hunters', 'start'
+	else
+		if $clothingworntype = 'nude' and igor_away = 'no' or (hunters_outside = 1 and hunters_available = 1) and rand(1,10) = 1: gt 'backwater','hunter' else gt 'backwater','alone'
+	end if
+end if
 
+if $ARGS[0] = 'alone':
+	'<center><B>Backwater</B></center>'
 	if month >= 4 and month <= 10:
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'backwater.jpg','backwater_night.jpg')+'"></center>'
 	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater_winter.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater_winter_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'backwater_winter.jpg','backwater_winter_night.jpg')+'"></center>'
 	end
 	*nl
-
 	'A small creek with relatively clean water. If the weather is warm you can clean yourself up. Also, if your clothes are dirty you can wash them here.'
 	*nl
+
 	if clothesAtLocation = 1:'Your clothes lie on the shore.'
 
+
+	act 'Go back to the hut':
+		minut += 5
+		hunter_refuse = 0
+		gt 'swamp_yard', 'start'
+	end
+
+
 	if $clothingworntype = 'nude':
 		act 'Wash self':
-			cla
-			*clr
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($pantyworntype = 'none','backwaterswim2.jpg','backwaterswim1.jpg')+'"></center>'
+			*nl 'You washed yourself in the creek.'
 			menu_off = 1
 			noShampoo = 1
 			dynamic $showerdin
@@ -54,22 +61,15 @@ if $ARGS[0] = '':
 			if willday_bath ! daystart: willday_bath = daystart & pcs_willpwr += 1
 			inhib_exp += rand(1,3)
 			if huntersRape = 1: huntersRape = 2
-
-			if $pantyworntype = 'none':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim2.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
-			end
-				*nl
-			'You washed yourself in the creek.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-			act 'Finish':gt 'backwater'
+			act 'Finish': gt 'backwater'
 		end
 	end
 	if cumloc[11] = 1 or cumloc[12] = 1:
 		act 'Clean the sperm from your face (0:10)':
-			cla
-			*clr
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
+			*nl 'You carefully wash off the sperm in the creek.'
 			menu_off = 1
 			pcs_makeup = 1
 			cumspclnt = 9
@@ -81,33 +81,28 @@ if $ARGS[0] = '':
 			if huntersRape = 1: huntersRape = 2
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
-			*nl
-			'You carefully wash off the sperm in the creek.'
-			act 'Finish':gt 'backwater'
+			act 'Finish': gt 'backwater'
 		end
 	end
 	if body_write > 0 or face_write > 0:
 		act 'Wash the writings off your body (0:10)':
-			cla
-			*clr
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash1.jpg"></center>'
+			*nl 'You wash off the indecent inscriptions on your body.'
 			menu_off = 1
 			body_write = 0
 			face_write = 0
 			minut += 10
 			gs'stat'
 
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash1.jpg"></center>'
-			*nl
-			'You wash off the indecent inscriptions on your body.'
-
-			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
+			act 'Finish': gt 'backwater'
 		end
 	end
 	if cumloc[6] = 1 or cumloc[7] = 1:
 		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/cumwash.jpg"></center>'
+			*nl 'You clean the cum stains off your clothes.'
 			menu_off = 1
 			cumspclnt = 6
 			gs 'cum_cleanup'
@@ -115,32 +110,21 @@ if $ARGS[0] = '':
 			if huntersRape = 1: huntersRape = 2
 			gs'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/cumwash.jpg"></center>'
-			*nl
-			'You clean the cum stains off your clothes.'
-
 			act 'Finish':gt 'backwater'
 		end
 	end
-
 	if spdirty > 0:
 		act 'Quick wash (0:15)':
-			cla
-			*clr
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facesp.jpg"></center>'
+			*nl 'You carefully wash your face, removing any impurities.'
 			menu_off = 1
 			cumspclnt = 4
 			gs 'cum_cleanup'
-			if pcs_sweat < 30:
-				pcs_sweat = 15 + rand(0,4)
-			else
-				pcs_sweat -= 10 + rand(0,4)
-			end
+			if pcs_sweat < 30: pcs_sweat = 15 + rand(0,4) else pcs_sweat -= 10 + rand(0,4)
 			minut += 15
 			if huntersRape = 1: huntersRape = 2
 			gs'stat'
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facesp.jpg"></center>'
-			*nl
-			'You carefully wash your face, removing any impurities.'
 			act 'Finish':gt 'backwater'
 		end
 	end
@@ -148,28 +132,22 @@ if $ARGS[0] = '':
 	if clothesAtLocation = 0:
 		if $clothingworntype ! 'nude' and temper >= 15:
 			act'Get undressed':
+				*clr & cla
 				menu_off = 1
 				if huntersKnowSlut > 0 or (hunters_outside = 0 and hunters_available = 0) or (hour < 7 or hour > 22) or (pcs_inhib >= 25 or exhibitionist_lvl > 1):
-					cla
-					*clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(PCloSkirt > 0,'backwaterundress_ski.jpg','backwaterundress.jpg')+'"></center>'
+					'You do not hesitate getting undressed, not caring if anyone is watching.'
 					minut+=5
 					gs 'underwear', 'remove'
 					if huntersRape = 1: huntersRape = 2
-
-					if PCloSkirt > 0:
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress_ski.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress.jpg"></center>'
-					end
 					gs 'clothing', 'strip', 'backwater'
-					'You do not hesitate getting undressed, not caring if anyone is watching.'
-					act'Back':gt'backwater'
+
+					act'Back': gt 'backwater'
 				else
-					cla
-					*clr
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
 					'You hesitate getting undressed, what if someone suddenly sees you?'
-					act'Back':gt'backwater'
+
+					act'Back': gt 'backwater'
 				end
 			end
 		else
@@ -178,86 +156,61 @@ if $ARGS[0] = '':
 	else
 		if $clothingworntype ! 'nude':
 			act 'Pick up your clothes':
-				cla
-				*clr
-				menu_off = 1
 				gs 'clothing', 'recover_lost_clothes', 'backwater'
-				'You pick up your clothes laying on the ground.'
-				gt $loc, $loc_arg
+				!! 'You pick up your clothes laying on the ground.'
+				gt 'backwater'
 			end
 		elseif forced_naked_day < daystart:
 			act 'Get dressed':
-				cla
-				*clr
-				menu_off = 1
 				gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 				gs 'underwear', 'wear'
-				'You pick up your clothes laying on the ground and get dressed.'
-				gt $loc, $loc_arg
+				!! 'You pick up your clothes laying on the ground and get dressed.'
+				gt 'backwater'
 			end
 		end
 	end
 
 end
 
-if $ARGS[0] = 'creekside_relax':
-
-end
-
-if $clothingworntype = 'nude' and igor_away = 'no' or (hunters_outside = 1 and hunters_available = 1) and rand(1,10) = 1:
-	cla
-	*clr
-	menu_off = 1
-	minut += 5
-	gs 'stat'
+if $ARGS[0] = 'hunter':
 	'<center><B>Backwater</B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hunter_looks.jpg"></center>'
 	'While cleaning yourself in the backwater, you suddenly get the feeling that you are not alone here. Turning around, you see one of the hunters. He''s just standing there watching you, his camouflage is almost indistinguishable compared to the bushes and trees.'
+	menu_off = 1
+	minut += 5
+	gs 'stat'
 
 	if clothesAtLocation = 1:
 		act'Get dressed':
-			cls
-			minut += 5
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
+			*nl 'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
 			gs 'underwear', 'wear'
 			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
+			minut += 5
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
-			'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
 			act'Further':gt 'backwater'
 		end
 	else
 		act'Hide':
-			cls
-			minut += 1
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude2.jpg"></center>'
 			'Covering your breasts and crotch you jump into the nearest bush. In your state of fear and confusion, you start scanning the area but you don''t see anyone there. You quickly run back towards the cabin.'
+			minut += 1
+
 			act'Go back to the hut':gt 'swamp_yard', 'start'
 		end
 	end
 	act'Stay naked':
-		cls
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude3.jpg"></center>'
+		'You decide that you have nothing to be afraid of, and continue on completely nude. The hunter looks at you for a minute or so, all of a sudden you hear a "Hmph", him turning around and going away.'
 		hunterslut += 1
 		hunterknowday = day
 		gs'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude3.jpg"></center>'
-		'You decide that you have nothing to be afraid of, and continue on completely nude. The hunter looks at you for a minute or so, all of a sudden you hear a "Hmph", him turning around and going away.'
+
 		act'Further':gt 'backwater'
 	end
-	exit
-end
-
-if huntersRape = 2:
-	cla
-	*clr
-	menu_off = 1
-	minut += 5
-	huntersRape = 3
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/backwaterrelax.jpg"></center>'
-	'You sit down by the shore, resting.'
-
-	act 'Further':gt 'hunters', 'start'
 end
 
 --- backwater ---------------------------------

locations/gadforest_event.qsrc

@@ -14,38 +14,36 @@ if $ARGS[0] = 'find_meadow':
 	act 'Ignore it and keep walking':gt 'gadforest', 'forest_edge'
 	act 'Follow the path to see where it goes':
 		*clr & cla
-		meadow = 1
-		minut += 10
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_thicket.jpg"></center>'
 		*nl
 		'You follow the path to see where it goes, but soon it becomes indistinguishable from the bushes and trees around you.'
+		meadow = 1
+		minut += 10
+		gs 'stat'
 
 		act 'Look around':
 			*clr & cla
-			minut += 10
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_trail.jpg"></center>'
 			*nl
 			'You''re about to return to the edge of the forest, but you spot a small break in the thicket, from the looks of it, it''s no more than an animal trail.'
+			minut += 10
+			gs 'stat'
 
 			act 'Head down the trail':
 				*clr & cla
-				minut += 10
-				gs 'stat'
-
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
 				*nl
 				'A few minutes later, you reach a majestic meadow filled with wildflowers. Judging by its undisturbed state no one else uses it or has been even been here in a long time.'
+				minut += 10
+				gs 'stat'
 
 				act 'Claim the meadow as your own':
 					*clr & cla
-					minut += 10
-					gs 'stat'
-
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
 					*nl
 					'You spend some time exploring the meadow and its surroundings. You''re positive no one visits this location. You proclaim the meadow to be your secret hideway all your own.'
+					minut += 10
+					gs 'stat'
 
 					act 'Continue':gt 'meadow', 'start'
 				end
@@ -206,7 +204,6 @@ if $ARGS[0] = 'mushroom_pickers2':
 	menu_off = 1
 	minut += 5
 	mushroom_pickersday = daystart
-	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers2.jpg"></center>'
 	*nl
@@ -215,13 +212,13 @@ if $ARGS[0] = 'mushroom_pickers2':
 		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here, if they did, it would be the talk of the whole village.'
 		pcs_horny += 5
 		inhib_exp += rand(1,3)
-		gs 'stat'
-
-		act 'Stay here':gt 'gadforest','forest_edge'
 	else
-		act 'Stay here':gt 'gadforest','forest_edge'
 		act 'Follow them':gt 'gadforest','forest_outskirts'
 	end
+	gs 'stat'
+
+	act 'Stay here':gt 'gadforest','forest_edge'
+
 end
 
 if $ARGS[0] = 'mushroom_pickers3':
@@ -229,34 +226,27 @@ if $ARGS[0] = 'mushroom_pickers3':
 	menu_off = 1
 	minut += 5
 	mushroom_pickersday = daystart
-	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers3.jpg"></center>'
 	*nl
 	'Wandering through the outskirts of the forest, you notice the mushroom pickers from the village had organized a camp.'
+
+
 	if $clothingworntype = 'nude':
 		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here, if they did, it would be the talk of the whole village.'
 		pcs_horny += 5
 		inhib_exp += rand(1,3)
-		gs 'stat'
-
-		act 'Leave them be':gt 'gadforest','forest_outskirts'
 	else
-		act 'Leave them be':gt 'gadforest','forest_outskirts'
 		act 'Say Hello':
 			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers3.jpg"></center>'
+			*nl
 			minut += 5
 			if pickersQW <= 3:pickersQW += 1
-			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers3.jpg"></center>'
-			*nl
 			if pickersQW < 3:
 				'You politely greet them as you are passing by. The men glance at you and respond the same.'
-				act 'Leave':gt $loc, $loc_arg
 			else
 				'You politely greet them as you are passing by. The men look at you and invite you to stop and chat for a bit.'
-				act 'Leave':gt $loc, $loc_arg
 				act 'Chat':
 					*clr & cla
 					minut += 10
@@ -265,10 +255,9 @@ if $ARGS[0] = 'mushroom_pickers3':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers3.jpg"></center>'
 					*nl
-					pickersrand = rand(0,1)
-					if pickersrand = 0:
+					if rand(0,1) = 0:
 						'They are very good at finding mushrooms and berries, one of them shows you his basket full of mushrooms and berries. You spend ten minutes talking about the forest and the best places to find mushrooms and berries, before getting up to continue on with your day.'
-					elseif pickersrand = 1:
+					else
 						'One of them asks, "How is your day going?"'
 						if boletus + boletus_cooked + bilberry < 5:
 							'"Not great today." you answer sadly, showing him your less than full basket.'
@@ -279,13 +268,19 @@ if $ARGS[0] = 'mushroom_pickers3':
 						else
 							'"Pretty well today." you answer happily, showing him your full basket.'
 							'You spend ten minutes talking about the forest and the best places to find mushrooms and berries, before getting up to continue on with your day.'
-						end
-					end
+						end if
+					end if
 					act 'Leave':gt 'gadforest','forest_outskirts'
 				end
-			end
+				gs 'stat'
+
+				act 'Leave':gt $loc, $loc_arg
+			end if
 		end
-	end
+	end if
+	gs 'stat'
+
+	act 'Leave them be':gt 'gadforest','forest_outskirts'
 end
 
 if $ARGS[0] = 'mushroom':
@@ -293,7 +288,6 @@ if $ARGS[0] = 'mushroom':
 	menu_off = 1
 	minut += 5
 	gs 'gadforest', 'bushcraft', 'forest_center'
-	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom0.'+rand(1,3)+'.jpg"></center>'
 	*nl
@@ -317,9 +311,10 @@ if $ARGS[0] = 'mushroom':
 		gs 'gadforest', 'picking_clothes_empty', 'forest_center'
 		*nl
 		'Unfortunately your basket is already full and you cannot carry any more mushrooms.'
-
-		act 'Continue':gt 'gadforest','forest_center'
 	end
+
+	gs 'stat'
+	act 'Continue':gt 'gadforest','forest_center'
 end
 
 if $ARGS[0] = 'bilberry':
@@ -327,7 +322,6 @@ if $ARGS[0] = 'bilberry':
 	menu_off = 1
 	minut += 5
 	gs 'gadforest', 'bushcraft', 'forest_center'
-	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/bilberry'+rand(3,5)+'.jpg"></center>'
 	*nl
@@ -351,9 +345,10 @@ if $ARGS[0] = 'bilberry':
 		gs 'gadforest', 'picking_clothes_empty', 'forest_center'
 		*nl
 		'Unfortunately your basket is already full and you cannot carry any more berries.'
-
-		act 'Continue':gt 'gadforest','forest_center'
 	end
+	gs 'stat'
+
+	act 'Continue':gt 'gadforest','forest_center'
 end
 
 if $ARGS[0] = 'basket':
@@ -361,10 +356,9 @@ if $ARGS[0] = 'basket':
 	menu_off = 1
 	minut += 5
 	gs 'gadforest', 'bushcraft', 'forest_center'
-	gs 'stat'
 
-	foresteventrand = rand(1,2)
-	if foresteventrand = 1:
+
+	if rand(1,2) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/basket_boletus.jpg"></center>'
 		*nl
 		'Wandering in the forest you find a basket full of mushrooms. Strange, someone must have left it here or lost it.'
@@ -374,7 +368,7 @@ if $ARGS[0] = 'basket':
 		else
 			'Unfortunately your basket is already full and you cannot carry any more mushrooms.'
 		end
-	elseif foresteventrand = 2:
+	else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/basket_bilberry.jpg"></center>'
 		*nl
 		'Wandering in the forest you find a basket full of berries. Strange, someone must have left it here or lost it.'
@@ -384,7 +378,9 @@ if $ARGS[0] = 'basket':
 		else
 			'Unfortunately your basket is already full and you cannot carry any more berries.'
 		end
-	end
+	end if
+	gs 'stat'
+
 	act 'Leave the basket alone':gt 'gadforest','forest_center'
 end
 
@@ -437,120 +433,120 @@ if $ARGS[0] = 'forest_hunters':
 
 	act 'Leave them alone':gt 'gadforest', $ReturnAdr
 
-    !%TODO: Move to hunter interactions
-    act 'Approach the hunters':
-        *clr & cla
-        if hunters_were_met = 0:
-            hunters_were_met = 1
-            gs 'stat'
-
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
-            *nl
-            'You decide to approach the strangers and chat. You never know, maybe they can show you some good places to find mushrooms and berries. After welcoming you, the whole company sat on the ground to rest and chat for a while.'
-            '"What''s your name'+iif(pcs_apprnc >= 60,', beautiful','')+'?" one of them asks.'
-            '"<<$pcs_nickname>>," you answer.'
-            *nl
-            if gadriver_gang = 0:
-                minut += 30
-                gs 'stat'
-
-                '"I''m Andrei," replies the older man, "And these are my friends, from the village, Igor and Sergei."'
-                '"By any chance is your last name <<$pcs_lastname>>?" he asked. You looked at him and nodded.'
-                '"Don''t be surprised <<$pcs_nickname>>, you look a lot like your mother when she was younger. I ... Hmmm... very good to know, I''m also from Gadukino." said Andrei.'
-                *nl
-                'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
-                '"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei.'
-                '"If you want, we show you our camp," he added after a short pause. "From there we have made a path back to the village. We can show it to you if you come with us. Or if you want, you can even stay with us for a bit."'
-                act 'Stay in the forest':gt 'gadforest', $ReturnAdr
-                act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
-            else
-                minut += 15
-                huntersRape = 1
-                gs 'stat'
-
-                '"What are you doing so far from the village?" asks the older man, looking at you closely, "It''s <<$pcs_nickname>> <<$pcs_lastname>>, the local whore.'
-                'You look at him with a mixture of surprise and shock.'
-                '"Don''t be surprised, I''m also from Gadukino, and you look just like your mother when she was younger, and apparently you are a whore like her too." he said.'
-                'You don''t even remember us. We remember you from that day by the river with Uncle Stepan.'
-                '"I''m Andrei, " he added further, "And these are my friends, also from the village, Igor and Sergei."'
-                *nl
-                if gadriver_gang > 2:'I''m not a whore. I told Uncle Stepan to go to hell! I didn''t want that to happen to me!'
-                '"Don''t run away, we won''t hurt you." said Sergei, seeing you jump to your feet.'
-                '"I think it''s about time I left" you reply.'
-                'You quickly move away from them and only slowing once you can no longer hear them talking.'
-                act 'Go back to the forest':gt 'gadforest', $ReturnAdr
-            end
-        else
-            '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
-            *nl
-            'You decide to approach the guys and chat.'
-
-            if hunter_sexual_comfort < 60 or hunter_collective_opinion < 60:
-                minut += 30
-                'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
-                '"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei. "You should pay us another visit some time, ok?"'
-                act 'Stay in the forest':gt 'gadforest', $ReturnAdr
-                act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
-            else
-                '"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
-                '"How about you come back with us to our hut, we were just about to head back there anyways."'
-
-                gs 'willpower', 'misc', 'resist', 'hard'
-                if will_cost <= pcs_willpwr:
-                    act 'Stay in the forest  (<<will_cost>> Willpower)':
-                        gs 'willpower', 'pay', 'resist'
-                        gs 'stat'
-                        gt 'gadforest', $ReturnAdr
-                    end
-                else
-                    act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-                end
-                act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
-            end
-        end
-    end
-    if $clothingworntype = 'nude':
-            act 'Keep walking':
-                *clr &cla
-                hunter_sexual_comfort += pcs_apprnc / 12
-
-                gs 'arousal', 'flash', 5
-                gs 'arousal', 'end'
-
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mitkanudeforest.jpg"></center>'
-                *nl
-                'You pretend not to notice the hunters and walk right past them, swaying your hips pointedly to maximize the effect. Looking around, you notice that the effect has exceeded your expectations. The men have been stopped in their tracks and are staring at you...'
-
-                act 'Continue':gt 'gadforest', $ReturnAdr
-            end
-            act 'Hide':
-                *clr & cla
-                minut += 5
-                gs 'stat'
-
-                '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/hiding_woods.jpg"></center>'
-                *nl
-                'They haven''t noticed you yet, so you quickly hide from sight in a nearby bush. You wait until you can no longer hear them talking to continue on your way.'
-
-                act 'Continue':gt 'gadforest', $ReturnAdr
-            end
-        if hunters_were_met = 1:
-            '"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
-            '"How about you come back with us to our hut, we were just about to head back there anyways."'
-
-            gs 'willpower', 'misc', 'resist', 'hard'
-            if will_cost <= pcs_willpwr:
-                act 'Stay in the forest  (<<will_cost>> Willpower)':
-                    gs 'willpower', 'pay', 'resist'
-                    gs 'stat'
-                    gt 'gadforest', $ReturnAdr
-                end
-            else
-                act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-            end
-            act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
-        end
-    end
+	!%TODO: Move to hunter interactions
+	act 'Approach the hunters':
+		*clr & cla
+		if hunters_were_met = 0:
+			hunters_were_met = 1
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
+			*nl
+			'You decide to approach the strangers and chat. You never know, maybe they can show you some good places to find mushrooms and berries. After welcoming you, the whole company sat on the ground to rest and chat for a while.'
+			'"What''s your name'+iif(pcs_apprnc >= 60,', beautiful','')+'?" one of them asks.'
+			'"<<$pcs_nickname>>," you answer.'
+			*nl
+			if gadriver_gang = 0:
+				minut += 30
+				gs 'stat'
+
+				'"I''m Andrei," replies the older man, "And these are my friends, from the village, Igor and Sergei."'
+				'"By any chance is your last name <<$pcs_lastname>>?" he asked. You looked at him and nodded.'
+				'"Don''t be surprised <<$pcs_nickname>>, you look a lot like your mother when she was younger. I ... Hmmm... very good to know, I''m also from Gadukino." said Andrei.'
+				*nl
+				'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
+				'"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei.'
+				'"If you want, we show you our camp," he added after a short pause. "From there we have made a path back to the village. We can show it to you if you come with us. Or if you want, you can even stay with us for a bit."'
+				act 'Stay in the forest':gt 'gadforest', $ReturnAdr
+				act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+			else
+				minut += 15
+				huntersRape = 1
+				gs 'stat'
+
+				'"What are you doing so far from the village?" asks the older man, looking at you closely, "It''s <<$pcs_nickname>> <<$pcs_lastname>>, the local whore.'
+				'You look at him with a mixture of surprise and shock.'
+				'"Don''t be surprised, I''m also from Gadukino, and you look just like your mother when she was younger, and apparently you are a whore like her too." he said.'
+				'You don''t even remember us. We remember you from that day by the river with Uncle Stepan.'
+				'"I''m Andrei, " he added further, "And these are my friends, also from the village, Igor and Sergei."'
+				*nl
+				if gadriver_gang > 2:'I''m not a whore. I told Uncle Stepan to go to hell! I didn''t want that to happen to me!'
+				'"Don''t run away, we won''t hurt you." said Sergei, seeing you jump to your feet.'
+				'"I think it''s about time I left" you reply.'
+				'You quickly move away from them and only slowing once you can no longer hear them talking.'
+				act 'Go back to the forest':gt 'gadforest', $ReturnAdr
+			end
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
+			*nl
+			'You decide to approach the guys and chat.'
+
+			if hunter_sexual_comfort < 60 or hunter_collective_opinion < 60:
+				minut += 30
+				'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
+				'"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei. "You should pay us another visit some time, ok?"'
+				act 'Stay in the forest':gt 'gadforest', $ReturnAdr
+				act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+			else
+				'"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
+				'"How about you come back with us to our hut, we were just about to head back there anyways."'
+
+				gs 'willpower', 'misc', 'resist', 'hard'
+				if will_cost <= pcs_willpwr:
+					act 'Stay in the forest  (<<will_cost>> Willpower)':
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						gt 'gadforest', $ReturnAdr
+					end
+				else
+					act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+				act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+			end
+		end
+	end
+	if $clothingworntype = 'nude':
+			act 'Keep walking':
+				*clr &cla
+				hunter_sexual_comfort += pcs_apprnc / 12
+
+				gs 'arousal', 'flash', 5
+				gs 'arousal', 'end'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mitkanudeforest.jpg"></center>'
+				*nl
+				'You pretend not to notice the hunters and walk right past them, swaying your hips pointedly to maximize the effect. Looking around, you notice that the effect has exceeded your expectations. The men have been stopped in their tracks and are staring at you...'
+
+				act 'Continue':gt 'gadforest', $ReturnAdr
+			end
+			act 'Hide':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/hiding_woods.jpg"></center>'
+				*nl
+				'They haven''t noticed you yet, so you quickly hide from sight in a nearby bush. You wait until you can no longer hear them talking to continue on your way.'
+
+				act 'Continue':gt 'gadforest', $ReturnAdr
+			end
+		if hunters_were_met = 1:
+			'"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
+			'"How about you come back with us to our hut, we were just about to head back there anyways."'
+
+			gs 'willpower', 'misc', 'resist', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Stay in the forest  (<<will_cost>> Willpower)':
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					gt 'gadforest', $ReturnAdr
+				end
+			else
+				act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+			act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
+		end
+	end
 end
 
 if $ARGS[0] = 'mitka_temporary_event':

locations/gadforestlost.qsrc

@@ -100,7 +100,7 @@ end
 ! $forest_args1 - location of forest where this is called from
 ! Example: gs 'gadforestlost', 'wander'
 if $ARGS[0] = 'wander':
-	if hour >= 6 and hour < 22:
+	if DayStage < 4:
 		act 'Wander trying to get your bearings (1:30)':
 			*clr & cla
 			menu_off = 1
@@ -326,7 +326,7 @@ end
 ! $forest_args1 - location of forest where this is called from
 ! Example: gs 'gadforestlost', 'picking'
 if $ARGS[0] = 'picking':
-	if hour >= 6 and hour < 22 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
+	if DayStage < 4 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
 		act 'Look for mushrooms and berries (0:30)':
 			*clr & cla
 			menu_off = 1
@@ -767,7 +767,7 @@ end
 if $ARGS[0] = 'gadforestlost_picture':
 	'<center><H4>Somewhere in the forest</H4></center>'
 	if month >= 4 and month <= 10:
-		if hour >= 6 and hour < 22:
+		if DayStage < 4:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost0.'+rand(1,6)+'.jpg"></center>'
 			*nl
 			'You are lost in the woods. You don''t recognize any of your surroundings and there aren''t any good landmarks to help pinpoint where you are.'
@@ -779,7 +779,7 @@ if $ARGS[0] = 'gadforestlost_picture':
 			'<font color="red">With nightfall, your chances of finding your way are practically nothing. You should stop and rest until daylight.</font>'
 		end
 	else
-		if hour >= 8 and hour < 20:
+		if DayStage < 4:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_winter0.'+rand(1,5)+'.jpg"></center>'
 			*nl
 			'You are lost in the woods. You don''t recognize any of your surroundings and there aren''t any good landmarks to help pinpoint where you are.'

locations/swamp.qsrc

@@ -17,17 +17,9 @@ if $ARGS[0] = 'start':
 
 	'<center><H4>Swamp</H4></center>'
 	if month >= 4 and month <= 10:
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swamp.jpg','swamp_night.jpg')+'"></center>'
 	else
-		if hour >= 8 and hour < 20:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_winter.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_winter_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swamp_winter.jpg','swamp_winter_night.jpg')+'"></center>'
 	end
 	*nl
 	'You are at the swamp on the far side of the woods from the village.'
@@ -39,7 +31,7 @@ if $ARGS[0] = 'start':
 		'You can see the small path to the clearing that contains the hunters cabin.'
 		act 'Go to the hunters cabin (0:15)':
 			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
-			if hour >= 6 and hour <= 22:
+			if DayStage < 4:
 				swamp_stuck = 0
 				gt 'swamp', 'stuck','swamp'
 			! nighttime chased by wolves - Sveta probably should not be roaming the forest at this time
@@ -145,7 +137,6 @@ if $ARGS[0] = 'stuck':
 				else
 					swamprand = rand(1,6)
 				end
-				gs 'stat'
 				'<center><H4>Swamp</H4></center>'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlosthelp.jpg"></center>'
 				*nl
@@ -155,13 +146,15 @@ if $ARGS[0] = 'stuck':
 					act 'Success!':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/handshelp.jpg"></center>'
-						*nl
-						'You hear men speaking and begin to shout louder. The voices come closer and finally, you feel strong hands grab you and drag you out to solid ground.'
+						*nl 'You hear men speaking and begin to shout louder. The voices come closer and finally, you feel strong hands grab you and drag you out to solid ground.'
+						gs 'stat'
+
 						act 'Relax':gt 'swamp_yard','start'
 					end
 				else
-					*nl
-					'You yell out into the void, but your only response is the howling of the wind and the chirp of some crickets.'
+					*nl 'You yell out into the void, but your only response is the howling of the wind and the chirp of some crickets.'
+					gs 'stat'
+
 					act 'Failure':gt 'swamp','stuck'
 				end
 			end
@@ -169,17 +162,9 @@ if $ARGS[0] = 'stuck':
 	else
 		'<center><H4>Swamp</H4></center>'
 		if month >= 4 and month <= 10:
-			if hour >= 6 and hour < 22:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_night.jpg"></center>'
-			end
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'gadforestlostswamp.jpg','gadforestlostswamp_night.jpg')+'"></center>'
 		else
-			if hour >= 8 and hour < 18:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_winter.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/gadforestlostswamp_winter_night.jpg"></center>'
-			end
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'gadforestlostswamp_winter.jpg','gadforestlostswamp_winter_night.jpg')+'"></center>'
 		end
 		*nl
 		if $ARGS[1] = 'forest_edge':

locations/swamp_woods.qsrc

@@ -2,58 +2,47 @@
 
 !TODO: Break into more arg blocks
 if $ARGS[0] = 'start':
-	*clr & cla
-
+	CLOSE ALL
 	$loc = 'swamp_woods'
 	$loc_arg = 'start'
 	$location_type = 'secluded'
-
 	$menu_loc = 'swamp_woods'
 	$menu_arg = 'start'
 	menu_off = 0
-
 	$forest_args1 = 'swamp_woods'
 
-	CLOSE ALL
-	gs 'gadukino_event', 'sound'
-	gs 'stat'
-
-	gs 'hunter_ambient', 'schedule'
-
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods.jpg"></center>'
 	'You are in the woods near the hut. You can see it not too far in the distance.'
 	'You can also venture deeper into woods to circle around the swamp, granted you do not get lost trying.'
-
+	gs 'gadukino_event', 'sound'
+	gs 'hunter_ambient', 'schedule'
+	gs 'stat'
 	!TODO: Make schedule more dynamic e.g. more factors
 	*nl
 
 	act 'Go back to the hut': minut += 10 & gt 'swamp_yard', 'start'
+
 	if firewood < 10:
 		'You can pick up some firewood around here to keep the fire going.'
 
 		act 'Collect firewood (0:15)':
 			cla & *clr
-			if $clothingworntype ! 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_normal.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/firewood_nude.jpg"></center>'
-			end
-
-			firewood += rand(2,6)
-			minut += 15
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','firewood_normal.jpg','firewood_nude.jpg')+'"></center>'
 			'You pick up some dry branches and twigs, putting them in a pile near the fire pit before coming back.'
-
+			firewood += rand(2,6)
 			if firewood < 15:
 				'You have <<firewood>> pieces of firewood, and should probably grab some more to keep the fire going.'
 			else
 				'You have <<firewood>> pieces of firewood, and should have enough firewood to get a fire going.'
-			end
+			end if
+			minut += 15
+			gs 'stat'
 
 			act 'Further': gt 'swamp_woods', 'start'
 		end
 	else
 		'You think about picking up some firewood before you remember you have plenty back at the yard.'
-	end
+	end if
 
 	act 'Try to circle around the swamp':
 		!no one likes to be trapped. Need to update gadfrestswamp with pcs_bushcraft method, but there should always be an option to try, no matter how low the skill.
@@ -76,11 +65,7 @@ if $ARGS[0] = 'start':
 
 				if nearby_woods_check = 1:
 					!Make it to the other side fine
-					if $clothingworntype ! 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_success.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_success_nude.jpg"></center>'
-					end
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_success.jpg','nearby_woods_success_nude.jpg')+'"></center>'
 					'You stick as close to the swamp as possible and follow the edge in one direction.'
 					'Even though you occassionally step into the swamp you manage to not get stuck'
 					'After some time walking and struggling not to get stuck you can see the hut on the opposite side'
@@ -88,210 +73,171 @@ if $ARGS[0] = 'start':
 					act 'Success!': bushcraft_exp += 5 & gt 'gadforest','forest_center'
 				elseif nearby_woods_check <= 3:
 					!End up stuck in the swamp
-					if $clothingworntype ! 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_stuck.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_stuck_nude.jpg"></center>'
-					end
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_stuck.jpg','nearby_woods_stuck_nude.jpg')+'"></center>'
 					'You stick as close to the swamp as possible and follow the edge in one direction.'
 					'Trusting the ground you keep going but at some point you sink right into the swamp without even realizing.'
-
 					*nl
 					'Seems like the forest can camouflage parts of the swamp, fooling careless hikers.'
+
 					act 'If only you knew': bushcraft_exp += 3 & gt 'swamp','stuck'
 				else
-					if $clothingworntype ! 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike_nude.jpg"></center>'
-					end
-
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','nearby_woods_hike.jpg','nearby_woods_hike_nude.jpg')+'"></center>'
 					!Circle back to where the pcs started
 					'You start going into the woods in a direction you think will take you around the swamp.'
 					'After a few hours walking you realize your surroundings are a bit familiar.'
 					'Then you look around you and can see the hut in the distance. Seems like you just walked around in circles and ended up where you started'
-
 					*nl
 					'You can see some broken branches and prints near ahead of you, marking the direction you initially started walking towards'
+
 					act 'That''s interesting...': bushcraft_exp += 2 & gt 'swamp_woods', 'start'
-				end
+				end if
 			end
 		else
-			minut += 30
-
+			minut += 90
 			!Make it back without effort
-			if $clothingworntype ! 'nude':
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/pathfinder.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/pathfinder_nude.jpg"></center>'
-			end
-
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','pathfinder.jpg','pathfinder_nude.jpg')+'"></center>'
 			'You have a rough idea of how the forest curves around the swamp from having seen part of the swamp''s edge from the hut yard'
 			'With that in mind, you go into the forest, aware of your surroundings to make sure you are not stepping too far from the edge of the swamp'
 			'After a couple hours you are on the other edge of the forest'
 
-			act 'Further': gt 'gadforest','forest_center'
+			act 'Further': gt 'swamp_woods', 'start'
 		end
 	end
 end
 
 if $ARGS[0] = 'shooting_practice':
-	cla & *clr
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
-	'You approach Andrei shooting some bottles with his pistol. You think maybe he can teach you a few tricks'
-
-	act 'Walk away': gt 'swamp_woods', 'start'
-	act 'Ask if you can shoot too':
-		if hunter_collective_opinion > 50 and rand(1,4) = 1:
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
-			'"Sure thing! But say, how about we spice it up a bit? If you can hit that bottle over there in one shot, I will do anything you want" says Andrei'
-			'"And what if I cannot?" you ask.'
-			'"Well, in that case you get to do anything I ask for. It is only fair, right?" he asks with a smirk.'
-			'"I guess it is" you respond, slightly blushing thinking about what Andrei could ask you to do.'
+	if $ARGS[1] = '':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
+		'You approach Andrei shooting some bottles with his pistol. You think maybe he can teach you a few tricks'
 
-			act 'Take the bet':
+		act 'Ask if you can shoot too':
+			if hunter_collective_opinion > 50 and rand(1,4) = 1:
 				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
+				'"Sure thing! But say, how about we spice it up a bit? If you can hit that bottle over there in one shot, I will do anything you want" says Andrei'
+				'"And what if I cannot?" you ask.'
+				'"Well, in that case you get to do anything I ask for. It is only fair, right?" he asks with a smirk.'
+				'"I guess it is" you respond, slightly blushing thinking about what Andrei could ask you to do.'
 
-				hunter_collective_opinion += 6
-				gs 'stat'
+				act 'Take the bet':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','shooting.jpg','shooting_nude.jpg')+'"></center>'
+					*nl 'You line up your sights and aim at the bottle. You inhale and hold your breath before...'
+					hunter_collective_opinion += 6
+					gs 'stat'
 
-				if $clothingworntype ! 'nude':
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_nude.jpg"></center>'
+					act 'Pull the trigger': gt 'hunter_interactions', 'shooting_bet'
 				end
-				'You line up your sights and aim at the bottle. You inhale and hold your breath before...'
-				act 'Pull the trigger': gt 'hunter_interactions', 'shooting_bet'
-			end
-			act 'Refuse':
-				cla
 
-				hunter_collective_opinion -= 2
-				gs 'stat'
+				act 'Refuse':
+					cla
+					'Not liking the odds of likely spending the day naked or worse, "Maybe some other time" you respond before walking away.'
+					hunter_collective_opinion -= 2
+					gs 'stat'
 
-				'Not liking the odds of likely spending the day naked or worse, "Maybe some other time" you respond before walking away.'
-				act 'Further': gt 'swamp_woods', 'start'
-			end
-		elseif hunter_collective_opinion > 35:
-			gt 'swamp_woods', 'shooting_practice', 'practice'
-		elseif hunter_sexual_comfort > 20:
-			gt 'swamp_woods', 'shooting_practice', 'andrei_request'
-		else
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
-			'You try to get Andrei''s attention but he kind of ignores you. When you keep on trying he waves his hand in a gesture for you to go away.'
-			act 'Further': gt 'swamp_woods', 'start'
+					act 'Further': gt 'swamp_woods', 'start'
+				end
+			elseif hunter_collective_opinion > 35:
+				gt 'swamp_woods', 'shooting_practice', 'practice'
+			else
+				if hunter_sexual_comfort > 20:
+					gt 'swamp_woods', 'shooting_practice', 'andrei_request'
+				else
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
+					'You try to get Andrei''s attention but he kind of ignores you. When you keep on trying he waves his hand in a gesture for you to go away.'
+					act 'Further': gt 'swamp_woods', 'start'
+				end if
+			end if
 		end
-	end
 
-	if $ARGS[1] = 'practice':
-		cla & *clr
+		act 'Walk away': gt 'swamp_woods', 'start'
+
+	elseif $ARGS[1] = 'practice':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','shooting.jpg','shooting_nude.jpg')+'"></center>'
+		*nl '"Alright I will show you a few tricks while you try" says Andrei. You spend about an hour practicing your shooting under Andrei''s guidance'
 		minut += 60
 		shoot_exp += 2
-
 		gs 'stat'
 
-		if $clothingworntype ! 'nude':
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_nude.jpg"></center>'
-		end
-		'"Alright I will show you a few tricks while you try" says Andrei. You spend about an hour practicing your shooting under Andrei''s guidance'
 		act 'Walk away': gt 'swamp_woods', 'start'
-	end
 
-	if $ARGS[1] = 'andrei_request':
-		cla & *clr
+	elseif $ARGS[1] = 'andrei_request':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
 		'"You see, these bullets don''t come free" says Andrei. "My time looking over your shoulder also doesn''t come free. You gotta pay me back somehow"'
 		'"What do you mean?" you ask, with a vague idea of where this is going.'
 
-		act 'Walk away': gt 'swamp_woods', 'start'
-
 		if $clothingworntype = 'nude':
 			'"Since you are all naked might as well let me fuck your little pussy right here." he says. "Then I will let you shoot a bit"'
 			!TODO: if pcs_inhib < x
 			act 'Let him fuck you': gt 'hunter_interactions', 'andrei_quick_fuck'
 		else
 			andrei_shooting_request = rand(1,4)
-
 			if andrei_shooting_request = 1:
 				'"I want you to show me your tits. Just lift your top and let me have a good look at em. You can shoot the rifle then."'
 				act 'Flash your tits':
 					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_tit_flash.jpg"></center>'
+					'You lift your top and expose your tits to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
+					'"Would appreciate a longer look but I will take it" responds Andrei'
 					hunter_sexual_comfort += 3
 					gs 'arousal', 'flashlite', 3
 					gs 'arousal', 'end'
-
 					gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_tit_flash.jpg"></center>'
-					'You lift your top and expose your tits to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
-					'"Would appreciate a longer look but I will take it" responds Andrei'
-
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
-
 			elseif andrei_shooting_request = 2:
 				'"I want you to show me your pussy. Go sit on that log and lift up your bottom. You can shoot the rifle then."'
 				act 'Flash your pussy':
 					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_pussy_flash.jpg"></center>'
+					'You lift your bottom and expose your pussy to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
+					'"Would appreciate a longer look but I will take it" responds Andrei'
 					hunter_sexual_comfort += 5
 					gs 'arousal', 'flashlite', 5
 					gs 'arousal', 'end'
-
 					gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_pussy_flash.jpg"></center>'
-					'You lift your bottom and expose your pussy to Andrei for a minute. You then cover up and ask "Enough payment for a lesson?"'
-					'"Would appreciate a longer look but I will take it" responds Andrei'
-
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
-
 			elseif andrei_shooting_request = 3:
 				'"I want you to take off all your clothes. Then hand them all to me. If you wanna shoot my rifle, you gotta be in your birthday suit."'
 				act 'Strip naked':
 					cla & *clr
+!!Image needed						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_strip.jpg"></center>'
+					'You slowly take off your clothes one by one until you are completely naked in front of Andrei.'
+					'You look on the ground and blush a bit as he stares at your exposed tits, ass and pussy. You cannot help but feel your pussy moisten.'
+					'"This naked look suits you better, do you know that?" says Andrei. He ogles your body for a few more minutes before handing you the rifle'
 					hunter_sexual_comfort += 7
-
 					gs 'clothing', 'strip', 'swamphouse'
 					gs 'underwear', 'remove'
-
 					gs 'arousal', 'flash', 10, 'exhibitionism'
 					gs 'arousal', 'end'
-
 					gs 'stat'
 
-!!Image needed						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_strip.jpg"></center>'
-					'You slowly take off your clothes one by one until you are completely naked in front of Andrei.'
-					'You look on the ground and blush a bit as he stares at your exposed tits, ass and pussy. You cannot help but feel your pussy moisten.'
-					'"This	naked look suits you better, do you know that?" says Andrei. He ogles your body for a few more minutes before handing you the rifle'
-
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
-
 			elseif andrei_shooting_request = 4:
 				'"Seeing a young pretty thing like you prancing around gives me a boner. I want you to suck my dick." demands Andrei.'
 				act 'Suck his dick':
 					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_bj.jpg"></center>'
+					'You kneel down obediently and start sucking his dick until you feel him cumming down your throat. You make sure to catch every drop.'
+					'"Now that''s a good girl. Good girls get to shoot the rifle." says Andrei with a chuckle'
 					hunter_sexual_comfort += 8
-
 					gs 'boyStat', 'A172'
 					gs 'arousal', 'bj', 15, 'sub', 'exhibitionism'
 					gs 'cum_call', 'mouth_swallow', 'A172', 1
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/shooting_bj.jpg"></center>'
-					'You kneel down obediently and start sucking his dick until you feel him cumming down your throat. You make sure to catch every drop.'
-					'"Now that''s a good girl. Good girls get to shoot the rifle." says Andrei with a chuckle'
-
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
-			end
-		end
+			end if
+		end if
+
+		act 'Walk away': gt 'swamp_woods', 'start'
 	end
 end
 

locations/swamp_yard.qsrc

@@ -10,40 +10,32 @@ if $ARGS[0] = 'start':
 	$location_type = 'secluded'
 	hunterscabin = 1
 
-   	util_rand = rand(1,2)
-
 	gs 'gadukino_event', 'sound'
 	gs 'hunter_ambient', 'schedule'
 	gs 'stat'
 
 	if lost_girl = 1:
-	    if daystart > forest_lostday + 1 and rand(forest_lostday - daystart, 30) >= 30 and hour >= 8 and hour < 20:
-	        gt 'gadforestlost','rescue','ranger','swamp_yard'
-	    end
-    end
+		if daystart > forest_lostday + 1 and rand(forest_lostday - daystart, 30) >= 30 and DayStage = 2:
+			gt 'gadforestlost','rescue','ranger','swamp_yard'
+		end
+	end
 
 	'<center><B>The yard in front of the hut</B></center>'
 	if month >= 5 and month <= 9:
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_yard.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_yard_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swamp_yard.jpg','swamp_yard_night.jpg')+'"></center>'
 	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_yard_winter.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_yard_winter_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swamp_yard_winter.jpg','swamp_yard_winter_night.jpg')+'"></center>'
 	end
 	*nl
+
+
 	'Behind the hut there is a <a href="exec: gt ''swampspring'' ">spring</a>, if you continue a little further down there is a small <a href="exec: gt ''backwater'' ">creek</a> with relatively clean water.'
 
 	if hunters_available = 1:
 		if hunters_were_met = 0:
-			if hunters_outside = 1:		
+			if hunters_outside = 1:
 				*nl
-				'You spot some unfamiliar <a href="exec: gt ''hunters'', ''start'' ">people</a> standing in front of the hut.'		
+				'You spot some unfamiliar <a href="exec: gt ''hunters'', ''start'' ">people</a> standing in front of the hut.'
 			end if
 		else
 			if hunters_outside = 1:
@@ -75,10 +67,10 @@ if $ARGS[0] = 'start':
 			end if
 		end if
 	end if
-	
-	
-	
-	
+
+
+
+
 	act '<b>Go to the swamp</b>': gt 'swamp_yard', 'swamp_escape'
 	gs 'bicycle', 'swamp_yard'
 	act 'Go into the house':gt 'swamphouse', 'start'
@@ -89,9 +81,9 @@ if $ARGS[0] = 'start':
 	act 'Explore the woods': minut += 10 & gt 'swamp_woods', 'start'
 
 
-	if hunters_outside = 1 and hunters_available = 1 and util_rand = 1:
-	    gs 'swamp_yard', 'daytime_flavor_events'
-    end
+	if hunters_outside = 1 and hunters_available = 1 and rand(1,2) = 1:
+		gs 'swamp_yard', 'daytime_flavor_events'
+	end
 end
 
 
@@ -107,25 +99,11 @@ if $ARGS[0] = 'campfire':
 	act 'Move away': gt 'swamp_yard', 'start'
 
 	if campfire = 1:
-		if hour >= 8 and hour < 20:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_day.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_night.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage = 2,'campfire_day.jpg','campfire_night.jpg')+'"></center>'
 		*nl
 		'A nice, warm campfire you can sit and relax by. You can use it to cook something or heat up some water to bathe.'
 		'You can also put it out with the bucket if there is enough water in it'
-	else
-		if hour >= 8 and hour < 20:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_out_day.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_out_night.jpg"></center>'
-		end
-		*nl
-		'You can use this firepit to light a fire, if you have some firewood available.'
-	end
 
-	if campfire = 1:
 		if hunters_breakfast = 1 or hunters_lunch = 1:
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters1.jpg"></center>'
@@ -138,16 +116,12 @@ if $ARGS[0] = 'campfire':
 
 			!TODO: Flesh out the learning content here
 			act 'Ask for some survival tips (0:10)':
+				cla
 				hunter_lessons += 1
-				*clr & cla
-
 				if hunter_collective_opinion > 25:
 					hunter_collective_opinion -= 1
 					bushcraft_exp += 1
-					gs 'stat'
-
 					minut += 10
-
 					*nl
 					'Hunters talk to you about some of their experiences when they first started out'
 				else
@@ -155,11 +129,13 @@ if $ARGS[0] = 'campfire':
 						!TODO: Prototype implementation for the creekside event, to be revamped
 						'Sergei tells you to go by the creek for the next lesson about how to scope the area for a hunt.'
 						hunter_lessons -= 8
+						gs 'stat'
+
 						act 'Further': gt 'hunter_favors', 'creekside_gangbang_request'
 					else
 						minut += 20
 						'The hunters do not even bother to answer you. You simply sit in awkward silence for twenty minutes before getting to to other business'
-					end
+					end if
 				end
 
 				act 'Further': gt 'swamp_yard', 'campfire'
@@ -186,7 +162,6 @@ if $ARGS[0] = 'campfire':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_put_out.jpg"></center>'
 				*nl
 				'You pour some water to extinguish the campfire'
-
 				campfire = 0
 				minut += 5
 				bucket -= 3
@@ -194,34 +169,26 @@ if $ARGS[0] = 'campfire':
 				act 'Further': gt 'swamp_yard', 'campfire'
 			end
 		end
-
-		if bucket > 0 and boletus > 0 and mushroom_soup = 0:
-			act 'Cook some mushroom soup (0:30)': gs 'hunter_favors', 'mushroom_soup'
-		end
-
-		if bucket > 0 and raw_meat > 0 and meat_stew = 0:
-			act 'Cook some meat stew (1:00)': gs 'hunter_favors', 'meat_stew'
+		if bucket > 0:
+			if boletus > 0 and mushroom_soup = 0: act 'Cook some mushroom soup (0:30)': gs 'hunter_favors', 'mushroom_soup'
+			if raw_meat > 0 and meat_stew = 0: act 'Cook some meat stew (1:00)': gs 'hunter_favors', 'meat_stew'
 		end
 
 		if bucket >= 5 and hotwater = 0:
 			act 'Heat up water (0:30)':
-				cla
-				*clr
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotwater.jpg"></center>'
 				minut += 30
 				bucket -= 5
 				hotwater = 1
-
 				water_heated += 1
-				gs 'stat'
-
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotwater.jpg"></center>'
 				*nl
-
 				if water_heated > 5 and (pcs_inhib < 85 or hunter_sexual_comfort > 25):
 					'"It is too tedious to keep heatiing up water", you think to yourself.'
 				else
 					'With the now heated water, you can bathe yourself in the tub.'
 				end
+				gs 'stat'
 
 				act 'Continue': gt 'swamp_yard', 'campfire'
 			end
@@ -252,31 +219,25 @@ if $ARGS[0] = 'campfire':
 					else
 						'You have finished the last of the soup, the pot is empty.'
 					end
-					gs 'stat'
 				end
 			end
 			if bilberry > 0:
 				act 'Eat berries':gt 'food','bilberry'
 			end
 		end
-
 		if alko > 8:
 			gt 'hunter_interactions', 'drunken_blackout'
 		end
 	else
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage = 2,'campfire_out_day.jpg','campfire_out_night.jpg')+'"></center>'
+		*nl
+		'You can use this firepit to light a fire, if you have some firewood available.'
 		!TODO: Tie fire lighting to bushcraft, make hunters do it on their schedule or with Sveta asking
 		if firewood >= 10 and campfire = 0:
 			act 'Light fire':
 				cla & *clr
-
-				if $clothingworntype ! 'nude':
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_light.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/campfire_light_nude.jpg"></center>'
-				end
-
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($clothingworntype ! 'nude','campfire_light.jpg','campfire_light_nude.jpg')+'"></center>'
 				'You use some chopped wood, dry branches and twigs to light a campfire in the firepit'
-
 				firewood -= 10
 				campfire = 1
 				minut += 15
@@ -293,44 +254,29 @@ end
 if $ARGS[0] = 'swamp_escape':
 	!add chance to swamped by illume
 	if hunters_available = 1 and hunters_outside = 1:
-
 		if hour >= 6 and hour < 21:
 			minut += 5
-			if rand(1,10)>9:
-				gt 'swamp', 'start'
-			else
-				gt 'swamp','stuck'
-			end
+			if rand(0,9)>8: gt 'swamp', 'start' else gt 'swamp','stuck'
 		else
-			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/handshelp.jpg"></center>' & !! instead igorhanter.jpg
 			'As you start moving into the swamp Igor calls after you.'
 
 			!TODO: Different line depending on opinion and slut
 			'"<<$pcs_nickname>>, where are you going? You will get stuck in there!'
+			gs 'stat'
 
 			act 'Turn back':gt 'swamp_yard','start'
 			act 'Ignore him and keep going':
 				minut += 5
 
 				!TODO: Add skill clothing and temp check here instead of praying to RNGesus
-				if rand(1,10)>9:
-                	gt 'swamp', 'start'
-                else
-                	gt 'swamp','stuck'
-                end
+				if rand(0,9)>8: gt 'swamp', 'start' else gt 'swamp','stuck'
 			end
 		end
 	else
 		minut += 5
-
 		!TODO: Here too, also see how to avoid duplicating. Maybe create a child event node?
-		if (hour >= 6 and hour < 21) or rand(1,10)>7:
-			gt 'swamp', 'start'
-		else
-			gt 'swamp','stuck'
-		end
+		if (hour >= 6 and hour < 21) or rand(0,9)>6: gt 'swamp', 'start' else gt 'swamp','stuck'
 	end
 end
 

locations/swamphouse.qsrc

@@ -45,9 +45,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	*nl
 	'Beside the stove, there''s a stack of old <a href="exec: gs ''swamphouse'', ''stackmagazines''">magazines</a>, most likely used for ignition.'
 	!TODO: fix this showing after dare, Sveta accepting Igors request or with hessian
-    if clothesAtLocation = 1:'Your clothes are laying on the shelf.'
-	
-	
+
+	if clothesAtLocation = 1:'Your clothes are laying on the shelf.'
+
 	if hunters_inside = 1 and hunters_were_met = 1:
 		if hunters_drink = 1:
 			*nl
@@ -61,19 +61,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 	end
 
-	if hunters_were_met = 0 and hunters_hunting = 1:
-		*nl
-		'The camp is quiet. There''s nobody here right now, where could they be.'
-	end
+	if hunters_were_met = 0 and hunters_hunting = 1:  *nl & 'The camp is quiet. There''s nobody here right now, where could they be.'
 
-	*nl
 
-	act 'Go outside':
-		minut += 1
-		hunter_refuse = 0
-		gs 'stat'
-		gt 'swamp_yard', 'start'
-	end
+	act 'Go outside': minut += 1 & hunter_refuse = 0 & gt 'swamp_yard', 'start'
+
 
 
 	!re-arrange it, there should be no logic error now by illume
@@ -141,6 +133,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gt 'selfplay', 'start'
 		end
 	end
+
 	if ($clothingworntype = 'nude' and swamp_clothes = 0 and clothesAtLocation = 0) or swamp_enema = 0:
 		act 'Look for some clothes':
 			cla
@@ -313,44 +306,44 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 	!hunters are invited to the table
 	if hunters_drink = 1 and hunters_inside = 1 and huntersKnowSlut = 0 and hunter_refuse = 0 and huntersdrinking ! daystart:
-		gs 'stat'
+		*clr & cla
 		minut += 1
 		temp_sh = rand(1,4)
 		huntersdrinking = daystart
 		gs 'stat'
 
 		if temp_sh = 1:
-			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
 			'"Oh look who''s showed up. <<$pcs_nickname>>, come, join us for a drink!" they invite you in.'
+
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 		end
 		if temp_sh = 2:
-			*clr & cla
 			huntersAndreiQw += 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
 			'Oh, <<$pcs_nickname>>, come join us for a drink!" said Andrei.'
+
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 		end
 		if temp_sh = 3:
-			*clr & cla
 			huntersSergeiQw += 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
 			'Oh, <<$pcs_nickname>>, come join us for a drink!" Sergei says noticing you entering.'
+
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 		end
 		if temp_sh = 4:
-			*clr & cla
 			huntersIgorQw += 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big173.jpg"></center>'
 			'You enter the hut and notice the plastered hunters.'
 			'Oh, <<$pcs_nickname>>, come join us for a drink!" Igor shouts ignoring the other conversation.'
+
 			act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 			act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 		end
@@ -360,6 +353,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstable.jpg"></center>'
 		'You went into the hut and notice that the hunters have prepared '+iif(hunters_breakfast = 1, 'breakfast', 'lunch')+'.'
 		'"Oh, <<$pcs_nickname>>, you''re just in time, come join us!"'
+
 		act 'Join them at the table': gs 'swamphouse', 'hunterstable'
 		act 'Politely decline': hunter_refuse = 1 & gt 'swamphouse', 'start'
 	end
@@ -486,7 +480,7 @@ if $ARGS[0] = 'bucket':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/vedro2.jpg"></center>'
 	*nl
-	if bucket > 0: 
+	if bucket > 0:
 	'There''s a bucket of water by the wall. There''s approximately <<bucket>> liters of water left.'
 		act 'Drink the water':
 			cla
@@ -555,7 +549,7 @@ if $ARGS[0] = 'tub':
 	if $clothingworntype = 'nude' and klismaday ! daystart and swamp_enema = 1 and hunters_inside = 0:
 		dynamic $enema
 	end
-		
+
 	if hotwater = 1 and ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 		act 'Bathe in the tub (0:30)':
 			cla
@@ -865,8 +859,8 @@ if $ARGS[0] = 'hunterstable':
 	*clr & cla
 	gs 'hunter_ambient', 'schedule'
 	if (hunters_available = 0 and hunters_breakfast = 0 and hunters_lunch = 0 and hunters_dinner = 0): gt 'swamphouse', 'hunterstable_end'
-	
-	
+
+
 	menu_off = 1
 	minut += 1
 	smokertemp = rand(1,3)

locations/swampspring.qsrc

@@ -8,25 +8,16 @@ menu_off = 0
 $location_type = 'secluded'
 
 gs 'gadukino_event', 'sound'
-gs 'stat'
 
 '<center><B>Spring</B></center>'
-
 if month >= 4 and month <= 10:
-	if hour >= 6 and hour < 22:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampspring.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampspring_night.jpg"></center>'
-	end
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swampspring.jpg','swampspring_night.jpg')+'"></center>'
 else
-	if hour >= 8 and hour < 18:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampspring_winter.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampspring_winter_night.jpg"></center>'
-	end
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'swampspring_winter.jpg','swampspring_winter_night.jpg')+'"></center>'
 end
 *nl
 'You''ve come across a natural spring with pure natural water.'
+gs 'stat'
 
 act 'Go back to the hut':minut += 5 & gt 'swamp_yard', 'start'
 
@@ -37,14 +28,11 @@ if pcs_hydra < 150:
 		pcs_breath = 0
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hands.jpg"></center>'
 		'You take a sip of the spring water.'
-		if pcs_hydra >= 100:
-			pcs_hydra += 25
-		else
-			pcs_hydra += 50
-		end
+		if pcs_hydra >= 100: pcs_hydra += 25 else pcs_hydra += 50
 		cumspclnt = 2
 		gs 'cum_cleanup'
 		gs 'stat'
+
 		act 'Finish':gt 'swampspring'
 	end
 end
@@ -52,11 +40,12 @@ end
 if bucket < 10:
 	act 'Collect water in a bucket':
 		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/vedro.jpg"></center>'
+		'You fill the bucket with water.'
 		minut += 10
 		bucket += 10
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/vedro.jpg"></center>'
-		'You fill the bucket with water.'
+
 		act 'Finish':gt 'swampspring'
 	end
 end