1
0
Переглянути джерело

[changed] rewrite gadukino forest, balance village time and money, new conversations and consequences with grandparents

sovietmercader 4 роки тому
батько
коміт
0d54aad1c6

+ 1 - 1
locations/MagEncounterFairy.qsrc

@@ -249,7 +249,7 @@ if $ARGS[0] = 'fairychattopic':
 				spellKnown['teleport'] = 1
 				tpKnown['GadForest'] = 1
 				cla
-				act 'You step out of the circle...':gt 'gadforest', '1'
+				act 'You step out of the circle...':gt 'gadforest', 'forest_edge'
 			end
 		else
 			!take the user to random location

+ 206 - 232
locations/bicycle.qsrc

@@ -1,264 +1,238 @@
 # bicycle
-$location_type = 'event_outdoors'
-if $ARGS[0] = 'sarai':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	$menu_loc = 'bicycle'
-	$menu_arg = 'sarai'
-	menu_off = 0
-	cla
-	*clr
-	minut += 1
-	gs 'gadukino_event', 'sound'
-	gs 'stat'
-	!gs'time'
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
-	if sunWeather = 0:
-		'You notice an old bike. You would love to take a ride with it but you decide not to while it''s raining.'
-	else
-		'You notice an old bike. It looks like it''s still in a good condition, you can probably ride it without any trouble.'
-	end
-
-	if hour >= 6 and hour <= 20 and sunWeather = 1 and month >= 4 and month <= 10:
-		if findvelday ! daystart:
-			act 'Ride the bike (1:00)':
+! BikeLoc - tells us where bicycle is currently located
+!----------------------------------------------
+! BikeLoc = 1 'gadsarai' ''
+! BikeLoc = 2 'gadforest' 'forest_edge'
+! BikeLoc = 3 'swamp_yard' 'start'
+!----------------------------------------------
+
+! this gs handles biking for Sveta in the various locations of gadukino
+! will only display bicycle actions if the BikeLoc is correct for the location passed in
+! $ARGS[0] - location where this is called from
+! Example: gs 'bicycle', 'gadsarai'
+if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLoc = 2) or ($ARGS[0] = 'swamp_yard' and BikeLoc = 3):
+	act 'Ride your bicycle':
+		*clr & cla
+		menu_off = 1
+		
+		if $clothingworntype = 'nude':
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
+		end
+		*nl
+		'You see your old bike. It looks like it''s still in a good condition, you can probably ride it without any trouble.'
+		
+		if BikeLoc = 1:
+			act 'Leave your bike alone':gt 'gadsarai'
+		elseif BikeLoc = 2:
+			act 'Leave your bike alone':gt 'gadforest','forest_edge'
+		elseif BikeLoc = 3:
+			act 'Leave your bike alone':gt 'swamp_yard','start'
+		end
+		if BikeLoc = 1 and hour >= 6 and hour < 20 and sunWeather = 1 and month >= 4 and month <= 10 and gadbikeday ! daystart:
+			act 'Bike around the village (1:00)':
 				*clr & cla
 				menu_off = 1
-				findvelday = daystart
 				minut += 60
-				run_exp += RAND(0,2)
+				run_exp += rand(0,2)
 				stren_exp += rand(0,2)
-				fat -= 5
-				pcs_mood += 5
-				gs 'sweat', 'add', 2
-				findvelrand = RAND(0,100)
+				fat -= 2
+				pcs_mood += 10
+				pcs_sweat += 2
+				gadbikeday = daystart
+				
 				if $clothingworntype = 'nude':
-					pcs_horny += 20
-					pcs_mood += 10
+					pcs_horny += 15
+					pcs_mood += 15
+					if pcs_inhib < 50: pcs_inhib += rand(0,2)
+					gs 'exhibitionism', 3
 					gs 'stat'
+					
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_nude.jpg"></center>'
+					*nl
 					'You ride nude, avoiding crowded places, exulting from this newfound courage. It''s hard to say what excites you more, fear or desire to be noticed.'
-					act 'Finish the trip':gt $loc, $metka
-					exit
-				end
-				if PCloSkirt > 0 and findvelrand > 70:
-					if $pantyworntype ! 'none':
-						pcs_mood+=5
-						gs'stat'
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_1.jpg"></center>'
-						'During your ride you lift your skirt several times, showing a glimpse of your panties to the passers-by.'
-
-						gs 'arousal', 'flashlite', 5, 'exhibitionism'
-						gs 'stat'
-
+				elseif PCloSkirt > 0:
+					bikerand = rand(0,10)
+					if bikerand >= 8:
+						if $pantyworntype ! 'none':
+							pcs_horny += 5
+							pcs_mood += 5
+							if pcs_inhib < 20: pcs_inhib += rand(0,2)
+							gs 'exhibitionism', 1
+							gs'stat'
+							
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_1.jpg"></center>'
+							*nl
+							'During your ride you lift your skirt several times, showing a glimpse of your panties to a few lucky villagers passing-by.'
+						else
+							pcs_horny += 10
+							pcs_mood += 10
+							if pcs_inhib < 30: pcs_inhib += rand(0,2)
+							gs 'exhibitionism', 2
+							gs'stat'
+							
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_2.jpg"></center>'
+							*nl
+							'During your ride you lift your skirt several times, showing your bare ass to a few lucky villagers passing-by.'
+						end
 					else
-						pcs_mood += 10
-						gs'stat'
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_2.jpg"></center>'
-						'During your ride you lift your skirt several times, showing your bare ass to the passers-by.'
-
-						gs 'arousal', 'flashlite', 10, 'exhibitionism'
-						minut -= 5
+						pcs_mood += 5
 						gs 'stat'
-					end
-					act 'Finish the ride':gt $loc, $metka
-
-					gs 'arousal', 'end'
-					gs 'stat'
-
-					exit
-				end
-				if PCloSkirt > 0 and findvelrand <= 70:
-					pcs_mood += 5
-					gs'stat'
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
-					'You take out the old bike for a ride. You ride by the endless fields enjoying the freedom you''re experiencing.'
-					act 'Finish the ride':gt $loc, $metka
-					exit
-				end
-				if PCloSkirt = 0:
+						
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
+						*nl
+						'You enjoy the breath of fresh air from riding your bike by the seemingly endless fields of the village.'
+					end					
+				elseif PCloSkirt = 0:
 					pcs_mood += 5
-					gs'stat'
+					gs 'stat'
+					
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
+					*nl
 					'You ride your bike, enjoying the surrounding country-side.'
-					act 'Finish the trip':gt $loc, $metka
-					exit
 				end
+				act 'Finish your ride':gt 'gadsarai'
 			end
 		end
-	end
-	if goforest > 0 and sunWeather = 1 and month >= 4 and month <= 10:
-		act 'Bike to the forest (0:25)':
-			*clr & cla
-			menu_off = 1
-			minut += 25
-			pcs_mood += 5
-			findvel = 2
-			gs'stat'
-
-			gs 'bicycle', 'clothes_findvel'
-			'You jump onto the bike and ride to the forest.'
-			gs 'bicycle', 'ridego', 'gadforest','1'
-		end
-	end
-	if goswamp = 1 and sunWeather = 1 and month >= 4 and month <= 10:
-		act 'Bike to the swamp (1:15)':
-			*clr & cla
-			menu_off = 1
-			minut += 75
-			run_exp += RAND(0,1)
-			stren_exp += rand(0,1)
-			fat -= 1
-			pcs_mood += 5
-			gs 'sweat', 'add', 1
-			findvel = 3
-			gs'stat'
-			!gs'time'
-
-			gs 'bicycle', 'clothes_findvel'
-			'You get on the bike and ride it to the swamp.'
-
-			gs 'bicycle', 'ridego', 'swamp_yard', 'start'
+		
+		if BikeLoc ! 1:
+			if BikeLoc = 2:
+				$bikeaction = 'Bike to your grandparents barn (0:12)'
+			elseif BikeLoc = 3:
+				$bikeaction = 'Bike to your grandparents barn (0:44)'
+			end
+			act '<<$bikeaction>>':
+				*clr & cla
+				menu_off = 1
+				if BikeLoc = 2:
+					minut += 12
+					run_exp += rand(0,1)
+					stren_exp += rand(0,1)
+					fat -= 1
+					pcs_mood += 5
+					pcs_sweat += 1
+					if swamp_clothes = 1:
+						'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents house.'
+						gs 'clothing', 'strip', 'gadforest'
+						gs 'clothing', 'swamp_clothes', 0
+					end
+				elseif BikeLoc = 3:
+					minut += 44
+					run_exp += rand(0,3)
+					stren_exp += rand(0,3)
+					fat -= 3
+					pcs_mood += 15
+					pcs_sweat += 3
+					if swamp_clothes = 1:
+						'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents house.'
+						gs 'clothing', 'strip', 'gadforest'
+						gs 'clothing', 'swamp_clothes', 0
+					end
+				end
+				BikeLoc = 1
+				gs'stat'
+
+				gs 'bicycle', 'clothes'
+				*nl
+				'You jump onto your bike and ride to your grandparent barn.'
+				
+				act 'Finish your ride':gt 'gadsarai'
+			end
 		end
-	end
-	act 'Put the bike away': gt'gadsarai'
-end
-
-if $ARGS[0] = 'forest':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	$menu_loc = 'bicycle'
-	$menu_arg = 'forest'
-	menu_off = 0
-	cla
-	*clr
-	minut += 1
-	gs 'gadukino_event', 'sound'
-	gs 'stat'
-	!gs'time'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
-
-	act 'Bike to the village (0:25)':
-		menu_off = 1
-		gs 'clothing', 'swamp_clothes', 0
-		if $clothingworntype ! 'nude' or pcs_inhib > 50:
-			*clr & cla
-			pcs_mood += 10
-			findvel = 1
-			minut += 25
-			inhib_exp += 4
-			gs 'bicycle', 'clothes_findvel'
-			'You ride your bike out of the forest and return to the village.'
-			gs 'bicycle', 'ridego', 'gaddvor'
-			gs'stat'
-		else
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
-			'You take off your clothes and jump on your bike and ride through the forest. You would never be able to do this in the village.'
-			act 'Further':gt'gadforest','1'
+		
+		if BikeLoc ! 2 and pcs_bushcraft > 0:
+			if BikeLoc = 1:
+				$bikeaction = 'Bike to the forest edge (0:12)'
+			elseif BikeLoc = 3:
+				$bikeaction = 'Bike to the forest edge (0:32)'
+			end
+			act '<<$bikeaction>>':
+				*clr & cla
+				menu_off = 1
+				if BikeLoc = 1:
+					minut += 12
+					run_exp += rand(0,1)
+					stren_exp += rand(0,1)
+					fat -= 1
+					pcs_mood += 5
+					pcs_sweat += 1
+				elseif BikeLoc = 3:
+					minut += 32
+					run_exp += rand(0,2)
+					stren_exp += rand(0,2)
+					fat -= 2
+					pcs_mood += 0
+					pcs_sweat += 2
+				end
+				BikeLoc = 2
+				gs'stat'
+
+				gs 'bicycle', 'clothes'
+				*nl
+				'You jump onto your bike and ride to the edge of the forest.'
+				
+				act 'Finish your ride':gt 'gadforest','forest_edge'
+			end
 		end
-	end
-	if goswamp = 1:
-		act 'Bike to the swamp (0:50)':
-			*clr & cla
-			menu_off = 1
-			minut += 50
-			pcs_mood += 5
-			findvel = 3
-			gs'stat'
-			!gs'time'
+		
+		if BikeLoc ! 3 and hunterscabin = 1 and huntersKnow = 1:
+			if BikeLoc = 1:
+				$bikeaction = 'Bike to the hunters cabin (0:44)'
+			elseif BikeLoc = 2:
+				$bikeaction = 'Bike to the hunters cabin (0:32)'
+			end
+			act '<<$bikeaction>>':
+				*clr & cla
+				menu_off = 1
+				if BikeLoc = 1:
+					minut += 44
+					run_exp += rand(0,3)
+					stren_exp += rand(0,3)
+					fat -= 3
+					pcs_mood += 15
+					pcs_sweat += 3
+				elseif BikeLoc = 2:
+					minut += 32
+					run_exp += rand(0,2)
+					stren_exp += rand(0,2)
+					fat -= 2
+					pcs_mood += 10
+					pcs_sweat += 2
+				end
+				BikeLoc = 3
+				gs'stat'
 
-			gs 'bicycle', 'clothes_findvel'
-			'You ride your bike to the edge of the swamp.'
+				gs 'bicycle', 'clothes'
+				*nl
+				'You jump onto your bike and ride to the hunters cabin.'
 
-			gs 'bicycle', 'ridego', 'swamp_yard', 'start'
+				act 'Finish your ride':gt 'swamp_yard','start'
+			end
 		end
 	end
-	act 'Put the bike aside': gt'gadforest','1'
 end
 
-if $ARGS[0] = 'swamp':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	$menu_loc = 'bicycle'
-	$menu_arg = 'swamp'
-	menu_off = 0
-	cla
-	*clr
-	minut += 1
-	gs 'gadukino_event', 'sound'
-	gs 'stat'
-	!gs'time'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
-
-	act 'Bike to the village (1:15)':
-		menu_off = 1
-		gs 'clothing', 'swamp_clothes', 0
-		if $clothingworntype ! 'nude' or pcs_inhib > 50:
-			*clr & cla
-			minut += 75
-			run_exp += RAND(0,1)
-			stren_exp += rand(0,1)
-			fat -= 1
-			gs 'sweat', 'add', 1
-			pcs_mood += 10
-			findvel = 1
-			hunters_here = 0
-			inhib_exp += 4
-			!gs'time'
-			gs 'bicycle', 'clothes_findvel'
-			'You ride your bike out of the swamp and return to the village.'
-			gs 'bicycle', 'ridego', 'gaddvor'
-			gs'stat'
+! this gs handles images for biking for Sveta in the various locations of gadukino
+! Example: gs 'bicycle', 'clothes'
+if $ARGS[0] = 'clothes':
+	!need images for biking during snow/rain/winter/nighttime: currently only have summer daytime images
+	!if sunWeather = 0 and (month < 4 or month > 10): snowing
+	!else sunWeather = 0 and month >= 4 and month <= 10: raining
+	!elseif month < 4 or month > 10 and hour < 6 or hour >= 22: winter nighttime
+	!elseif month < 4 or month > 10: winter daytme
+	!elseif hour < 6 or hour >= 22: summer nighttime
+	!else summer daytime
+		if $clothingworntype = 'nude':
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_nude.jpg"></center>'
+		elseif PCloSkirt > 0:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
 		else
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel_nude.jpg"></center>'
-			'You take off your clothes and jump on your bike and ride through the swamp. You would never be able to do this in the village.'
-			act 'Further':gt 'swamp_yard', 'start'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
 		end
-	end
-	act 'Bike to the forest (0:50)':
-		*clr & cla
-		menu_off = 1
-		minut += 50
-		pcs_mood += 5
-		hunters_here = 0
-		findvel = 2
-		!gs'time'
-		gs 'bicycle', 'clothes_findvel'
-		'You jump onto your bike and ride to the forest.'
-		gs 'bicycle', 'ridego', 'gadforest','1'
-		gs'stat'
-	end
-	act 'Put the bike aside': gt 'swamp_yard', 'start'
-end
-
-if $ARGS[0] = 'clothes_findvel':
-	if $clothingworntype = 'nude':
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_nude.jpg"></center>'
-	elseif PCloSkirt > 0:
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
-	end
+	!end
 end
 
-if $ARGS[0] = 'ridego':
-	menu_off = 1
-	!make this args, add a warning, and allow 30% alive by illume
-	$metka = $ARGS[2]
-	$loc = $ARGS[1]
-	if hour >= 6 and hour < 22:
-		act 'Further':gt $loc, $metka
-	else
-		'<B><font color=red>It''s too dark outside to go for a ride.</font></B>'
-		act 'Put the bike away': gt $loc, $metka
-	end
-end
-
-
 --- bicycle ---------------------------------
 

+ 12 - 31
locations/gadbana.qsrc

@@ -46,11 +46,8 @@ if mira_guest = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart:
-				gadbana_stripping = daystart
-				inhib_exp += 2
-				grandmaQW['nudity_trouble'] += 1
-			end
+			inhib_exp += rand(0,2)
+			grandmaQW['nudity_trouble'] += rand(0,2)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
@@ -64,11 +61,8 @@ if mira_guest = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart:
-				gadbana_stripping = daystart
-				inhib_exp += 1
-				grandmaQW['nudity_trouble'] += rand(0,1)
-			end
+			inhib_exp += rand(0,1)
+			grandmaQW['nudity_trouble'] += rand(0,1)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
@@ -268,11 +262,8 @@ else
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart:
-				gadbana_stripping = daystart
-				inhib_exp += 2
-				grandmaQW['nudity_trouble'] += 1
-			end
+			inhib_exp += rand(0,2)
+			grandmaQW['nudity_trouble'] += rand(0,2)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
@@ -285,11 +276,8 @@ else
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart:
-				gadbana_stripping = daystart
-				inhib_exp += 1
-				grandmaQW['nudity_trouble'] += rand(0,1)
-			end
+			inhib_exp += rand(0,1)
+			grandmaQW['nudity_trouble'] += rand(0,1)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 			gs 'arousal', 'flashlite', 10, 'exhibitionism'
@@ -357,11 +345,8 @@ else
 						*clr & cla
 						menu_off = 1
 						minut += 1
-						if gadbana_stripping ! daystart:
-							gadbana_stripping = daystart
-							inhib_exp += 2
-							grandmaQW['nudity_trouble'] += 1
-						end
+						inhib_exp += rand(0,2)
+						grandmaQW['nudity_trouble'] += rand(0,2)
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone but Mira saw you go outside naked, there''s a thrill in potentially getting caught.'
 						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 						gs 'arousal', 'flash', 10, 'exhibitionism'
@@ -374,11 +359,8 @@ else
 						*clr & cla
 						menu_off = 1
 						minut += 1
-						if gadbana_stripping ! daystart:
-							gadbana_stripping = daystart
-							inhib_exp += 1
-							grandmaQW['nudity_trouble'] += rand(0,1)
-						end
+						inhib_exp += rand(0,1)
+						grandmaQW['nudity_trouble'] += rand(0,1)
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone but Mira saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
 						gs 'arousal', 'flashlite', 10, 'exhibitionism'
@@ -390,7 +372,6 @@ else
 			end
 		end
 	end
-	!125ed
 end
 
 

+ 794 - 516
locations/gadforest.qsrc

@@ -1,381 +1,377 @@
 # gadforest
 
-!MiraLoc tells us where Mira is Located
-!----------------------------------------------
-!MiraLoc = 0 (Mira at home)
-!MiraLoc = 1 (Mira at river)
-!MiraLoc = 2 (Mira at meadow)
-!MiraLoc = 3 (Mira at forest)
-!MiraLoc = 4 (Mira at field)
-!MiraLoc = 5 (Mira with gop)
-!---------------------------------------------
-
-if $ARGS[0] = '1':
+if $ARGS[0] = 'forest_edge':
 	*clr & cla
-	! figure out if Sveta came from Mira code or not. events play out differently whether with Mira or not
-	PC_arrive = iif($loc ! 'miroslava', 1 , 0)
 
-	! edge of forest
+	! force Mira to stay here if Sveta brought Mira here by choice - temporarily overrides Miras schedule to not annoy the player
+	Mira_Stay = iif($loc ! 'Miroslava', 1 , 0)
+
+	clothesAtLocation = FUNC('lost_clothes_here','forest_edge')
+
 	$loc = 'gadforest'
-	$metka = '1'
+	$metka = 'forest_edge'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforest'
-	$menu_arg = '1'
+	$menu_arg = 'forest_edge'
 	menu_off = 0
 
-	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
-	gs 'gadukino_event', 'sound'
-	gs'stat'
-
-	*clr & cla
+	$forest_args1 = 'forest_edge'
 
-	! Add to knowledge of forest
-	if goforest < 20:goforest += rand(0,1)
-	! chance to get lost
-	lost = 1
-	lostrand = rand(1,20)
-	! Determine where Sveta got lost in the forest
-	foresteventrand = rand(1,20)
-	new_boletus = 0
-	new_bilberry = 0
+	CLOSE ALL
+	gs 'gadukino_event', 'sound'
+	gs 'stat'
 
 	'<center><H4>Edge of the Forest</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest1.jpg"></center>'
+			*nl
 			'You are at the edge of the forest. Mushrooms and berries grow here and you can often find other people picking them.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_night1.jpg"></center>'
+			*nl
 			'You are at the edge of the forest. Night in the woods is scary and uncomfortable.'
 		end
 	else
-		if hour >= 8 and hour < 18:
+		if hour >= 8 and hour < 20:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter1.jpg"></center>'
-			'You are at the edge of the forest. The forest in winter is very beautiful.'
+			*nl
+			'You are at the edge of the forest. The forest during wintertime is very beautiful.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter_night1.jpg"></center>'
+			*nl
 			'You are at the edge of the forest. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
 
-	if forestpicnic = 1:'On the edge of the forest you see people. Apparently they are having a family <a href="exec:gt ''gadforest_event'',''picnic''">picnic</a>.'
-	if MiraLoc = 3:'Nearby is <a href="exec: gt ''miroslava'' ">Mira</a>.'
-	if clothesAtLocation = 1:'Your clothes are nearby on the ground.'
-	if findvel = 2:'Leaning up against a tree is your old <a href="exec:gt ''bicycle'',''forest''">bike</a>.'
-	if goforest < 10:'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
-
-	! Sveta arrive without Mira events
-	if PC_arrive = 1:
-		if temper >= 15 and sunWeather = 1 and hour>=6 and hour<=20 and miratalkforest = 1:gt 'gadforest_event', 'nude_event'
-		if foresteventrand < 3 and month >= 6 and month <= 9 and mushroom_pickersday ! daystart:mushroom_pickers = 1 & gt'gadforest_event', 'mushroom_pickers1'
-		if foresteventrand = 3 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1 and week > 5 and forestpicnic = 0: forestpicnic = 1 & gt 'gadforest_event', 'picnic'
-		if foresteventrand = 4 and month >= 6 and month <= 9: gt 'gadforest_event', 'mushroom_pickers2'
-		if foresteventrand = 5 and hour >= 8 and hour <= 15 and month >= 4 and month <= 10 and gadboyday ! daystart and week <= 5: gt 'gadforest_event', 'gopforest_mitka'
-		if foresteventrand = 6 and hour >= 8 and hour <= 18 and month >= 4 and month <= 10 and gadboyday ! daystart and week <= 5: gt 'gadforest_event', 'gopforest_kolyamba'
-		if foresteventrand = 7 and hour >= 8 and hour <= 18 and month >= 4 and month <= 10 and gadboyday ! daystart and week <= 5: gt 'gadforest_event', 'gopforest_vasyan'
-		if foresteventrand = 8 and hour >= 8 and hour <= 15 and month >= 4 and month <= 10 and gadboyday ! daystart and week > 5: gt 'gadforest_event', 'gopforest_2boys'
-		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'
+	gs 'gadforest','bushcraft','forest_edge'
+	*nl
+	if pcs_bushcraft < 10:
+		'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
+	else
+		'You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.'
+	end
+
+	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
+	if forestpicnic = 1:
+		if hour < 10 or hour > 14:
+			forestpicnic = 0
+		else
+			*nl
+			'On the edge of the forest you see people. Apparently they are having a family <a href="exec:gt ''gadforest_event'',''picnic''">picnic</a>.'
+		end
+	end
+	if hour < 8 or hour > 16 and mushroom_pickers ! 0:
+		mushroom_pickers = 0
+		*nl
+		'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+	else
+		*nl
+		if mushroom_pickers = 0:
+			'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+		elseif mushroom_pickers = 1:
+			'You can see other people picking mushrooms and berries here at the forests edge.'
+		elseif mushroom_pickers = 2:
+			'You can hear people picking mushrooms and berries deeper in the forest.'
+		end
 	end
+	if MiraLoc = 3:'<a href="exec: gt ''Miroslava'' ">Mira</a> is here with you.'
+
+	foresteventrand = rand(1,20)
+	! Events with Mira
+	if MiraLoc = 3:
+		if hour >= 11 and Mira_Stay = 0:
+			*clr & cla
+
+			gs 'miroslava','miraclothes'
+			*nl
+			'"<<$pcs_nickname>>, I''m going to head home now, but we can hang out again more later." Mira said to you as she began to walk out of the forest.'
+
+			! Allow the player to override Mira schedule to get events done with her, also so Mira cannot appear and disappear before the player can interact with her
+			act 'Convince her to stay with you':
+				Mira_Stay = 1
+				gt 'gadforest', 'forest_edge'
+			end
+			! Allow the player to let Mira continue on her schedule if they want to get events done on their own
+			act 'Say goodbye':
+				MiraLoc = 0
+				gt 'gadforest', 'forest_edge'
+			end
+		end
+		if mirapickingtalk = 0 and miratalkday ! daystart: gt 'gadforest_event', 'mira_picking_talk'
+		if miranudetalk = 0 and miratalkday ! daystart: gt 'gadforest_event', 'mira_nude_talk'
+		! stripping requires there to be no picnic going on, to have clothes on, for there to be no clothes already abandoned at the forest_edge, between april and october and already talked to Mira about being naked in the forest
+		if forestpicnic = 0 and $clothingworntype ! 'nude' and clothesAtLocation = 0 and month >= 4 and month <= 10 and hour >= 8 and hour <= 20 and miranudetalk = 1 and miratalkday ! daystart: gt 'gadforest_event', 'mira_nude_event'
+	! Events without Mira
+	else
+		if metmira = 1 and MiraLoc ! 3 and hour >= 8 and hour <= 10:
+			mirarand = rand(1,10)
+			if mirarand >= 6:
+				*clr & cla
+
+				gs 'Miroslava','miraclothes'
+				*nl
+				'As you walk through the forest, you hear a familiar voice call out to you, "Hey <<$pcs_nickname>>, wait up!" You turn around and see Mira excitedly bounding up behind you.'
+				'"Want to join me on my walk?" she asks. "I love walking through the forest in the morning."'
+
+				act 'Say hi':
+					MiraLoc = 3
+					gt 'gadforest', 'forest_edge'
+				end
+			end
+		end
+		if foresteventrand <= 2 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 1 & gt 'gadforest_event', 'mushroom_pickers1'
+		if foresteventrand <= 4 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers2'
+		if foresteventrand = 5 and month >= 6 and month <= 9 and hour >= 10 and hour <= 14 and temper >= 10 and sunWeather = 1 and week > 5 and forestpicnic = 0: forestpicnic = 1 & gt 'gadforest_event', 'picnic'
+	end
+	! Events with or without Mira
+	if foresteventrand <= 8 and hour >= 8 and hour <= 20 and month >= 4 and month <= 10 and gadboyday ! daystart:
+		if mitkaday ! daystart:
+			gt 'gadforest_event', 'mitka_temporary_event'
+		!	gt 'mitka_forest_1', 'mitka'
+		!elseif kolyambaday ! daystart:
+		!	gt 'mitka_forest_1', 'kolyamba'
+		!elseif vasyanday ! daystart:
+		!	gt 'mitka_forest_1', 'vasyan'
+		end
+	end
+	!if foresteventrand = 9 and hour >= 8 and hour <= 20 and month >= 4 and month <= 10 and gadboyday ! daystart:
+	!	if mitkaday ! daystart and kolyambaday ! daystart:
+	!		gt 'mitka_forest_2', '1'
+	!	elseif mitkaday ! daystart and vasyanday ! daystart:
+	!		gt 'mitka_forest_2', '2'
+	!	elseif kolyambaday ! daystart and vasyanday ! daystart:
+	!		gt 'mitka_forest_2', '3'
+	!	elseif mitkaday ! daystart:
+	!		gt 'mitka_forest_1', 'mitka'
+	!	elseif kolyambaday ! daystart:
+	!		gt 'mitka_forest_1', 'kolyamba'
+	!	elseif vasyanday ! daystart:
+	!		gt 'mitka_forest_1', 'vasyan'
+	!	end
+	!end
+	!if forest_eventrand = 10 and hour >= 8 and hour <= 20 and month >= 4 and month <= 10 and gadboyday ! daystart:
+	!	if mitkaday ! daystart and kolyambaday ! daystart and vasyanday ! daystart:
+	!		gt 'mitka_forest_3'
+	!	elseif mitkaday ! daystart and kolyambaday ! daystart:
+	!		gt 'mitka_forest_2', '1'
+	!	elseif mitkaday ! daystart and vasyanday ! daystart:
+	!		gt 'mitka_forest_2', '2'
+	!	elseif kolyambaday ! daystart and vasyanday ! daystart:
+	!		gt 'mitka_forest_2', '3'
+	!	elseif mitkaday ! daystart:
+	!		gt 'mitka_forest_1', 'mitka'
+	!	elseif kolyambaday ! daystart:
+	!		gt 'mitka_forest_1', 'kolyamba'
+	!	elseif vasyanday ! daystart:
+	!		gt 'mitka_forest_1', 'vasyan'
+	!	end
+	!end
 
 	act 'Leave the woods':
+		! Allow Mira to continue on her schedule as normal if the player was keeping her here for events
+		if MiraLoc = 3:
+			Mira_Stay = 0
+			MiraLoc = 0
+		end
+		! Naked event when leaving forest
 		if $clothingworntype = 'nude':
 			*clr & cla
-			inhib_exp += rand(0,2)
+			menu_off = 1
+
 			if hour >= 6 and hour < 22:
-				if rand(0,100) > 50:
+				if rand(0,10) > 5:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_nude.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_back.jpg"></center>'
 				end
 			else
-				if rand(0,100) > 50:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_nude.jpg"></center>'
+				if rand(0,10) > 5:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_nude_night.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_back_night.jpg"></center>'
 				end
 			end
-			if clothesAtLocation = 0:
-				inhib_exp += rand(0,2)
-				'You seem to have misplaced your clothes! You have little choice but to sneak out the woods, hiding your naked body in shadow and moving toward your grandparents house. You wonder where you might have left your clothes.'
+			*nl
+			! clothes ripped apart in the woods or swamp
+			if gadforest_clothestorn = 1:
+				gadforest_clothestorn = 0
+				'Your clothes were torn to shreds in the woods, leaving you with no choice but to head back home naked.'
+				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
+			! clothes are here
 			elseif clothesAtLocation = 1:
-				'You decide to stash your belongings and sneak out the woods completely naked, purely for the thrill of it, hiding your naked body in shadow and moving toward your grandparents house, avoiding any well lit areas.'
+				'You decide to leave your clothes behind and sneak home naked, purely for the thrill of it.'
+				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
+			! no clothes here
+			elseif clothesAtLocation = 0:
+				'You seem to have misplaced your clothes, leaving you with no choice but to head back home naked. You wonder where you might have left your clothes.'
+				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
 			end
-			act 'Run back home naked':
-				minut += 30
-				gt'gadforest', 'caught'
+			! Allow schoolgirl player to leave naked but go straight back home
+			! Non-schoolgirls will just find a random sweatshirt to put on - it is the same everytime but walking around naked in the village is not implemented yet
+			act 'Go back to Gadukino naked':
+				*clr & cla
+				inhib_exp += rand(1,3)
+				gs 'exhibitionism', 3
+				gs 'stat'
+
+				if StoryLine = 1 and grandaQW['block'] = 0:
+					if hour >= 10 and hour < 16 and month >= 4 and month <= 10:
+						forestcaughtrand = rand(4,10)
+					elseif hour >= 6 and hour < 20 and month >= 4 and month <= 10:
+						forestcaughtrand = rand(2,8)
+					else
+						forestcaughtrand = rand(0,6)
+					end
+					if forestcaughtrand >= 9:
+						grandmaQW['nudity_trouble'] += rand(7,10)
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_woman.jpg"></center>'
+						*nl
+						'You''ve been spotted walking home naked by all the women of the village. They scold you as you walk by. Your grandparents are definitely going to find out about this.'
+					elseif forestcaughtrand >= 7:
+						grandmaQW['nudity_trouble'] += rand(4,6)
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_woman'+rand(1,5)+'.jpg"></center>'
+						*nl
+						'You''ve been spotted walking home naked by a woman from the village. You hope she doesn''t tell your grandmother.'
+					elseif forestcaughtrand >= 5:
+						grandmaQW['nudity_trouble'] += rand(1,3)
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_man'+rand(1,5)+'.jpg"></center>'
+						*nl
+						'You''ve been spotted walking home naked by a man from the village. You hope he doesn''t tell your grandfather.'
+					else
+						grandmaQW['nudity_trouble'] += rand(0,1)
+
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
+						*nl
+						'No one saw you outside naked, but there''s a thrill in almost getting caught.'
+					end
+
+					act 'Continue home to your grandparents':
+						minut += 30
+						gs 'stat'
+
+						gt'gaddvor'
+					end
+				else
+					average[520] = 1
+					averageS[520] = 0
+					averageH[520] = 100
+					averageB[520] = pcs_hips
+					gs 'clothing', 'wear', 'average', 520
+
+					if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+					if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+					*nl
+					'You begin to panic a little. You have no where to go and no one to help you can you are stuck naked in the woods.'
+					'As you look around frantically, you spot a sweatshirt someone must have lost. You quickly put it on, thinking about how lucky you are.'
+
+					act 'Leave':
+						minut += 15
+						gs 'stat'
+
+						gt 'gadroad'
+					end
+				end
 			end
-		elseif $clothingworntype = 'cheap' and clothingwornnumber = 414:
+			! last chance for player to choose to get dressed
 			if clothesAtLocation = 1:
-				'You should pickup your clothes and get dressed before you leave'
+				act 'Get dressed instead':
+					*clr & cla
+					minut += 5
+					gs 'clothing', 'swamp_clothes', 0
+					gs 'underwear', 'wear'
+					gs 'clothing', 'recover_lost_clothes', 'forest_edge', 1
+					gs 'stat'
+
+					if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+					if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+					*nl
+					'You decide to change back into your clothes rather than try to get home through the village naked.'
+
+					act 'Leave':
+						minut += 15
+						gs 'stat'
+
+						gt 'gadroad'
+					end
+				end
 			end
+		! hessian sack from hunters is not allowed to leave the woods it is only supposed to be a temporary item
+		elseif swamp_clothes = 1:
+			*nl
+			'You cannot leave the woods wearing your current clothing. You should pickup your clothes and get dressed before you leave or just risk leaving naked.'
 		else
-			minut += 30
+			minut += 15
 			gs 'stat'
+
 			gt 'gadroad'
 		end
 	end
 
-	gs 'treeCircEntry', 'GadForest'
-
-	! can only be naked if successfully complete Mira gadforest_event, nude_event
-	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:
-				cla
-				*clr
-				menu_off = 1
-				if pcs_inhib < 50:inhib_exp += rand(1,3)
-				minut += 5
-				if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-				if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
-				gs 'underwear', 'remove'
-				gs 'clothing', 'strip', 'gadforest'
-				gs 'exhibitionism', 3
-				gs 'stat'
-
-				'You don''t hesitate and quickly get undressed, your clothes are left laying in a pile.'
-
-				act'Continue':gt'gadforest','1'
-			else
-				cla
-				*clr
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
-				'You see a number of people nearby and decide not to undress right now.'
-
-				act'Continue':gt'gadforest','1'
-			end
-		end
+	! Sveta cannot travel further into the forest if Mira is here at the forest with Sveta
+	if MiraLoc ! 3:
+		act 'Go further into the forest': minut += 15 & gt 'gadforest','forest_outskirts'
 	end
 
-	if clothesAtLocation = 1 and $clothingworntype = 'nude':
-		act 'Get dressed':
-			cla
-			*clr
-			menu_off = 1
-			minut += 5
-			gs 'clothing', 'swamp_clothes', 0
-			gs 'underwear', 'wear'
-			gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
-			gs 'stat'
-			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-			if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
-			'You change back into your clothes.'
-			act 'Back': gt 'gadforest','1'
-		end
-	end
+	gs 'bicycle', 'gadforest'
 
-	! if Sveta left the forest without retrieving her clothes
-	if clothesAtLocation = 1 and $clothingworntype ! 'nude':
-		if $clothingworntype = 'cheap' and clothingwornnumber = 414:
-			act 'Pick up your abandoned clothing':
-				cla
-				menu_off = 1
-				minut += 2
-				gs 'clothing', 'swamp_clothes', 0
-				gs 'underwear', 'wear'
-				gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
-				gs 'stat'
-				*nl
-				'You pick up your abandoned clothing and change out of the hessian sack the hunters gave you.'
-				act 'Back': gt 'gadforest','1'
-			end
-		else
-			act 'Pick up your abandoned clothing':
-				cla
-				menu_off = 1
-				minut += 5
-				gs 'clothing', 'swamp_clothes', 0
-				gs 'underwear', 'wear'
-				gs 'clothing', 'recover_lost_clothes', 'gadforest'
-				gs 'stat'
-				*nl
-				'You pick up your abandoned clothing.'
-				act 'Back': gt 'gadforest','1'
-			end
-		end
+	! Sveta can go to the Meadow if she has discovered it and bring Mira too if she is allowed
+	if (meadow > 0 and MiraLoc ! 3):
+		act 'Go to the meadow': minut += 20 & gt 'meadow'
+	elseif ((meadow = 3 or (meadow = 6 and npc_QW['A60'] >= 3)) and MiraLoc = 3):
+		act 'Go to the meadow with Mira': minut += 20 & MiraLoc = 2 & gt 'meadow'
 	end
 
-	if hour >= 6 and hour <= 20 and sunWeather = 1:
-		act 'Go for a walk in the woods':
-			cla
-			*clr
-			menu_off = 1
-			minut += 60
-			pcs_mood += 20
-			if $clothingworntype = 'nude':
-				pcs_health += healthmax/5 & pcs_horny += 5
-				inhib_exp += rand(1,5)
-			end
-			gs 'stat'
-
-			if month >= 4 and month <= 10:
-				if MiraLoc ! 3:
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
-					if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude0.'+rand(1,4)+'.jpg"></center>'
-					'You are walking through the woods, enjoying the sounds of the forest and the fresh air.'
-				else
-					if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest'+rand(1,3)+'.jpg"></center>'
-					if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest_nude'+rand(1,3)+'.jpg"></center>'
-					'You walk with Mira through the woods, enjoying the sounds of the forest and the fresh air.'
-				end
+	! Can travel directly to the hunters cabin if Sveta has been there before, knows the hunters, and Mira is not here at the forest with Sveta
+	if hunterscabin = 1 and huntersKnow = 1 and MiraLoc ! 3:
+		act 'Go to the hunters cabin':
+			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
+			if hour >= 6 and hour <= 22:
+				gt 'swamp', 'stuck'
+			! nighttime chased by wolves - Sveta probably should not be roaming the forest at this time
 			else
-				if MiraLoc ! 3:
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforestwinter0.'+rand(1,2)+'.jpg"></center>'
-					'You walk through the snowy woods, enjoying the sounds of the forest and the fresh air.'
-				else
-					'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforestwinter.jpg"></center>'
-					'You walk with Mira through the snowy woods, enjoying the sounds of the forest and the fresh air.'
-				end
+				gt 'gadforestlost','wolves','forest_edge'
 			end
-
-			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:
-		act 'Look for mushrooms and berries':
-			cla
-			*clr
-			menu_off = 1
-			minut += 30
-			temp_gf = rand(1,2)
-			edge_forestday = daystart
-			if goforest < 20:goforest += rand(0,1)
-			gs 'stat'
-
-			! no mushroom pickers or mushroom pickers moved deeper into the forest
-			if mushroom_pickers = 0 or mushroom_pickers = 2:
-				cla
-				new_boletus += rand(0,1)
-				new_bilberry += 1
-				boletus += new_boletus
-				bilberry += new_bilberry
-				pcs_mood += 5
-				gs 'stat'
+	! tree circle teleportation for magic users - only found at the edge of the forest
+	gs 'treeCircEntry', 'GadForest'
 
-				gs 'gadforest', 'clothes1'
-				if new_boletus = 0 and new_bilberry > 0:'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
-				if new_boletus > 0 and new_bilberry > 0:'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
-			end
-			! mushroom pickers are at the edge of the forest
-			if mushroom_pickers = 1 and temp_gf = 1:
-				cla
-				new_bilberry += rand(0,1)
-				bilberry += new_bilberry
-				gs 'stat'
+	! the generic actions for the different parts of the forest are so similar that they are all stored in their own gosubs so the code is not duplicated
+	gs 'gadforest', 'stripping'
 
-				if new_bilberry > 0: gs 'gadforest', 'clothes1'
-				if new_bilberry = 0: gs 'gadforest', 'clothes2'
-				if new_bilberry > 0:'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
-				if new_bilberry = 0:'After searching for mushrooms and berries for half an hour you found nothing.'
-			end
-			if mushroom_pickers = 1 and temp_gf = 2:
-				cla
-				pcs_mood -= 5
-				gs 'stat'
+	gs 'gadforest', 'dressing'
 
-				gs 'gadforest', 'clothes2'
-				'After searching for mushrooms and berries for half an hour you found nothing.'
-			end
-			act 'Continue':gt 'gadforest','1'
-		end
- 	end
+	gs 'gadforest', 'walking'
 
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and MiraLoc ! 3:
-		act 'Go further into the forest':
-			if goforest >= lostrand:minut += 30 & gt 'gadforest','2'
-			if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
-	 	end
-	end
-
-	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $metka
-
-	if goswamp = 1 and MiraLoc ! 3:
-		! day time chance to get stuck in swamp. ps. use bike to get there 100% of the time by illume
-		if hour >= 6 and hour < 20:
-			act 'Go to the swamp':
-				minut += 75
-				if goforest >= lostrand:
-					gt 'swamp'
-				else
-					gt 'gadforestswamp','1'
-				end
-			end
-		! night time chased by wolves
-		else
-			act 'Go to the swamp':gt 'gadforest_event', 'swamp_road'
-		end
-	end
-	gs 'stat'
+	gs 'gadforest', 'picking'
 end
 
-if $ARGS[0] = 'caught':
+if $ARGS[0] = 'forest_outskirts':
 	*clr & cla
-	menu_off = 1
-	caught_rand = rand(0, 100)
-	if caught_rand > 90:
-		inhib_exp += rand(0,3)
-		grandmaQW['nudity_trouble'] += rand(7,10)
-		gs 'arousal', 'flash', 10, 'exhibitionism'
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_woman.jpg"></center>'
-		'You''ve been spotted walking home naked by all the women of the village. They are all sitting there scolding you. Your grandparents are definitely going to find out about this.'
-	elseif caught_rand > 70:
-		inhib_exp += rand(0,4)
-		grandmaQW['nudity_trouble'] += rand(1,3)
-		gs 'arousal', 'flash', 10, 'exhibitionism'
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_woman'+rand(1,5)+'.jpg"></center>'
-		'You''ve been spotted walking home naked by a woman from the village. You want to hope she doesn''t tell your grandparents.'
-	elseif caught_rand > 50:
-		inhib_exp += rand(0,3)
-		grandmaQW['nudity_trouble'] += rand(1,3)
-		gs 'arousal', 'flash', 10, 'exhibitionism'
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_man'+rand(1,5)+'.jpg"></center>'
-		'You''ve been spotted walking home naked by a man from the village. You want to hope he doesn''t tell your grandparents.'
-	else
-		grandmaQW['nudity_trouble'] += rand(0,1)
-		gs 'arousal', 'flash', 10, 'exhibitionism'
-		gs 'arousal', 'end'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
-		'Luckily no one saw you outside naked, but there''s a thrill in almost getting caught.'
-	end
-	act 'Continue': gt'gaddvor'
-end
 
-if $ARGS[0] = '2':
-	*clr & cla
-	! slightly inside forest
+	clothesAtLocation = FUNC('lost_clothes_here','forest_outskirts')
+
 	$loc = 'gadforest'
-	$metka = '2'
+	$metka = 'forest_outskirts'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforest'
-	$menu_arg = '2'
+	$menu_arg = 'forest_outskirts'
 	menu_off = 0
 
+	$forest_args1 = 'forest_outskirts'
+
+	CLOSE ALL
 	gs 'gadukino_event', 'sound'
-	gs'stat'
-
-	! Add to knowledge of forest
-	if goforest < 40:goforest += rand(0,1)
-	! Determine where Sveta got lost in the forest
-	lost = 2
-	! chance to get lost
-	lostrand = rand(1,60)
-	foresteventrand = rand(1,10)
-	new_boletus = 0
-	new_bilberry = 0
-
-	'<center><H4>Forest</H4></center>'
+	gs 'stat'
+
+	'<center><H4>Forest Outskirts</H4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest2.jpg"></center>'
@@ -385,7 +381,7 @@ if $ARGS[0] = '2':
 			'You are in the forest. Night in the woods is scary and uncomfortable.'
 		end
 	else
-		if hour >= 8 and hour < 18:
+		if hour >= 8 and hour < 20:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter2.jpg"></center>'
 			'You are in the forest. The forest in the winter is very beautiful, the fresh air makes you happy.'
 		else
@@ -393,97 +389,67 @@ if $ARGS[0] = '2':
 			'You are in the forest. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
-	if goforest < 20:'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
 
-	if foresteventrand = 1 and month >= 6 and month <= 9 and mushroom_pickersday ! daystart:mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers1'
-	if foresteventrand = 2 and hour > 8 and hour < 20 and foresteventday ! daystart:gt 'gadforest_event', 'forest_hunters'
-	if foresteventrand > 7 and month >= 6 and month <= 9 and foresteventday ! daystart:mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers3'
+	gs 'gadforest','bushcraft','forest_outskirts'
+	*nl
+	if pcs_bushcraft < 20:
+		'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
+	else
+		'You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.'
+	end
+	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
+	if hour < 8 or hour > 16:
+		mushroom_pickers = 0
+		*nl
+		'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+	else
+		*nl
+		if mushroom_pickers = 0:
+			'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+		elseif mushroom_pickers = 1:
+			'You can hear other people picking mushrooms and berries at the forests edge.'
+		elseif mushroom_pickers = 2:
+			'You can see people picking mushrooms and berries here on the outskirts of the forest.'
+		end
+	end
 
+	foresteventrand = rand(1,20)
+	if foresteventrand <= 2 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart:mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers1'
+	if foresteventrand <= 4 and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforest_event', 'mushroom_pickers3'
+	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforest_event', 'forest_hunters', 'forest_outskirts'
 
-	act 'To the edge of the forest':
-		lostrand = rand(1,30)
-		if goforest >= lostrand:minut += 30 & gt 'gadforest','1'
-		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
-	end
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and forestday ! daystart:
-		act 'Look for mushrooms and berries':
-			cla
-			*clr
-			menu_off = 1
-			minut += 30
-			temp_gf = rand(1,2)
-			forestday = daystart
-			if goforest < 40:goforest += rand(0,1)
-			gs 'stat'
+	act 'Head back out of the forest': minut += 15 & gt 'gadforest', 'forest_edge'
 
-			! mushroom_pickers either not seen today or still at the edge of the forest
-			if mushroom_pickers < 2:
-				cla
-				new_boletus += 1
-				new_bilberry += rand(1,2)
-				boletus += new_boletus
-				bilberry += new_bilberry
-				pcs_mood += 5
-				gs 'stat'
+	act 'Go further into the forest': minut += 15 & gt 'gadforest','forest_center'
 
-				gs 'gadforest', 'clothes1'
-				'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
-			end
-			if mushroom_pickers = 2 and temp_gf = 1:
-				cla
-				new_boletus += rand(0,1)
-				new_bilberry += 1
-				boletus += new_boletus
-				bilberry += new_bilberry
-				gs 'stat'
+	! the generic actions for the different parts of the forest are so similar that they are all stored in their own gosubs so the code is not duplicated
+	gs 'gadforest', 'stripping'
 
-				if new_boletus > 0 or new_bilberry > 0: gs 'gadforest', 'clothes1'
-				if new_boletus = 0 and new_bilberry > 0:'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
-				if new_boletus > 0 and new_bilberry > 0:'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
-			end
-			if mushroom_pickers = 2 and temp_gf = 2:
-				cla
-				pcs_mood -= 5
-				gs 'stat'
+	gs 'gadforest', 'dressing'
 
-				gs 'gadforest', 'clothes2'
-				'After searching for mushrooms and berries for half an hour you found nothing.'
-			end
-			act 'Continue':gt 'gadforest','2'
-		end
-	end
+	gs 'gadforest', 'walking'
 
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
-		act 'Go further into the forest':
-			if goforest >= lostrand:minut += 30 & gt 'gadforest','3'
-			if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
-	 	end
-	end
+	gs 'gadforest', 'picking'
 end
 
-if $ARGS[0] = '3':
+if $ARGS[0] = 'forest_center':
 	*clr & cla
-	! deep inside forest
+
+	clothesAtLocation = FUNC('lost_clothes_here','forest_center')
+
 	$loc = 'gadforest'
-	$metka = '3'
+	$metka = 'forest_center'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforest'
-	$menu_arg = '3'
+	$menu_arg = 'forest_center'
 	menu_off = 0
 
+	$forest_args1 = 'forest_center'
+
+	CLOSE ALL
 	gs 'gadukino_event', 'sound'
-	gs'stat'
-
-	! Add to knowledge of forest
-	if goforest < 60:goforest += rand(0,1)
-	lost = 3
-	! Determine where Sveta got lost in the forest
-	lostrand = rand(1,100)
-	! chance to get lost
-	foresteventrand = rand(1,10)
-	new_boletus = 0
-	new_bilberry = 0
+	gs 'stat'
 
 	'<center><H4>Deep Forest</H4></center>'
 	if month >= 4 and month <= 10:
@@ -495,7 +461,7 @@ if $ARGS[0] = '3':
 			'You are deep in the forest. Night in the woods is scary and uncomfortable.'
 		end
 	else
-		if hour >= 8 and hour < 18:
+		if hour >= 8 and hour < 20:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter3.jpg"></center>'
 			'You are deep in the forest. The forest in the winter is very beautiful, the fresh air makes you happy.'
 		else
@@ -503,184 +469,496 @@ if $ARGS[0] = '3':
 			'You are deep in the forest. Night in the forest during wintertime is very scary and uncomfortable.'
 		end
 	end
-	if goforest < 30:'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
 
-	if foresteventrand = 1 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'basket'
-	if foresteventrand = 2 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'bilberry'
-	if foresteventrand = 3 and foresteventday ! daystart: gt 'gadforest_event', 'mushroom'
-	if foresteventrand = 4 and hour > 8 and hour < 20 and foresteventday ! daystart:gt 'gadforest_event', 'forest_hunters'
-
-	act 'Go back to the forest':
-		lostrand = rand(1,60)
-		if goforest >= lostrand:minut += 30 & gt 'gadforest','2'
-		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
+	gs 'gadforest','bushcraft','forest_center'
+	*nl
+	if pcs_bushcraft < 30:
+		'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
+	else
+		'You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.'
+	end
+	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
+	if hour < 8 or hour > 16:
+		mushroom_pickers = 0
+		*nl
+		'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+	else
+		*nl
+		if mushroom_pickers = 0:
+			'You don''t see or hear any other people picking mushrooms or berries in the forest right now.'
+		elseif mushroom_pickers = 1:
+			'You can hear people picking mushrooms and berries at the forests edge.'
+		elseif mushroom_pickers = 2:
+			'You can hear people picking mushrooms and berries at the outskirts of the forest.'
+		end
 	end
 
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and thicketday ! daystart:
+	foresteventrand = rand(1,20)
+	if foresteventrand <= 2 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'basket'
+	if foresteventrand <= 3 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'bilberry'
+	if foresteventrand <= 4 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'mushroom'
+	if foresteventrand = 5 and month >= 4 and month <= 10 and ((hour >= 6 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforest_event', 'forest_hunters', 'forest_center'
 
-	act 'Look for mushrooms and berries':
-			*clr & cla
-			menu_off = 1
-			minut += 30
-			thicketday = daystart
-			if goforest < 60:goforest += rand(0,1)
-			new_boletus += rand(1,2)
-			new_bilberry += rand(1,2)
-			boletus += new_boletus
-			bilberry += new_bilberry
-			pcs_mood += 5
-			gs 'stat'
-			gs 'gadforest', 'clothes1'
-			'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+	act 'Head back out of the forest': minut += 15 & gt 'gadforest', 'forest_outskirts'
 
-			act 'Continue':gt 'gadforest','3'
-		end
-	end
+	act 'Go further into the swamp': minut += 15 & gt 'swamp', 'start'
 
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9:
+	! the generic actions for the different parts of the forest are so similar that they are all stored in their own gosubs so the code is not duplicated
+	gs 'gadforest', 'stripping'
 
-		act 'Go further into the forest':
-			if goforest >= lostrand:minut += 30 & gt 'gadforest','4'
-			if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
-	 	end
-	end
-end
+	gs 'gadforest', 'dressing'
 
-if $ARGS[0] = '4':
-	*clr & cla
-	! forest near swamp
-	$loc = 'gadforest'
-	$metka = '4'
-	$location_type = 'secluded'
+	gs 'gadforest', 'walking'
 
-	$menu_loc = 'gadforest'
-	$menu_arg = '4'
-	menu_off = 0
+	gs 'gadforest', 'picking'
+end
 
-	gs 'gadukino_event', 'sound'
-	gs'stat'
-
-	! Add to knowledge of forest
-	if goforest < 80:goforest += rand(0,1)
-	lost = 4
-	! Determine where Sveta got lost in the forest
-	lostrand = rand(1,120)
-	! chance to get lost
-	foresteventrand = rand(1,10)
-	dirty = 0
-	new_boletus = 0
-	new_bilberry = 0
-
-	'<center><H4>Forest near the Swamp</H4></center>'
-	if month >= 4 and month <= 10:
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest4.jpg"></center>'
-			'You are in the forest near the swamp. The fresh air and singing birds light up your soul with joy.'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_night4.jpg"></center>'
-			'Forest. Night in the woods is scary and uncomfortable.'
+
+! this gs handles the bushcraft increases, clothing degradation, and getting lost in the forest
+! $ARGS[1] - location of forest where this is called from
+! Example: gs 'gadforest', 'bushcraft', 'forest_edge'
+if $ARGS[0] = 'bushcraft':
+	! bushcraft_rand - the max amount of bushcraft exp that can be gained from an action in an area of the forest
+	! bushcraft_limit - the max amount bushcraft can be naturally raised to by visiting an area of the forest
+	! bushcraft_lost - bushcraft needed to no longer get lost when visiting an area of the forest
+	! torncloth_high_bushcraft - chance of tearing clothes with high bushcraft when visiting an area of the forest
+	! torncloth_low_bushcraft - chance of tearing clothes with low bushcraft when visiting an area of the forest
+	! Make sure Sveta always has at least 1 pcs_bushcraft
+	if pcs_bushcraft = 0:pcs_bushcraft = 1
+	if $ARGS[1] = 'forest_edge':
+		bushcraft_rand = 1
+		bushcraft_limit = 10
+		! Sveta cannot get lost at the forest_edge part of the forest anymore
+		bushcraft_lost = 1
+		torncloth_high_bushcraft = 10
+		torncloth_low_bushcraft = 9
+	elseif $ARGS[1] = 'forest_outskirts':
+		bushcraft_rand = 2
+		bushcraft_limit = 20
+		bushcraft_lost = 20
+		torncloth_high_bushcraft = 9
+		torncloth_low_bushcraft = 7
+	elseif $ARGS[1] = 'forest_center':
+		bushcraft_rand = 3
+		bushcraft_limit = 30
+		bushcraft_lost = 30
+		torncloth_high_bushcraft = 8
+		torncloth_low_bushcraft = 5
+	elseif $ARGS[1] = 'swamp_woods':
+		bushcraft_rand = 4
+		bushcraft_limit = 40
+		! Sveta cannot get lost at the swamp_woods part of the forest either
+		bushcraft_lost = 1
+		torncloth_high_bushcraft = 7
+		torncloth_low_bushcraft = 3
+	end
+	! most annoying part of the old forest code was how difficult it was to do anything without getting lost and having your clothes destroyed quickly
+	! the new pcs_bushcraft stat will now help Sveta keep her clothes intact longer and it is much less grindy than the old goforest variable for navigating the forest
+	! also if Sveta meets the hunters they can help her raise this stat as well but it will go up naturally too from just visiting the forest every day
+	! if Sveta raises bushcraft with the hunters then she will get to a point where she no longer get lost in the forest since there is no cap on bushcraft when learning from them
+	ripclothesrand = rand(1,10)
+	if pcs_bushcraft < bushcraft_limit:
+		! use the higher chance of ripping clothes when Sveta has lower bushcraft
+		if ripclothesrand >= torncloth_low_bushcraft: gs 'gadforest', 'torncloth'
+
+		! bushcraft exp gained is random to keep it from increasing too fast
+		if rand(0,1) = 0:
+			bushcraft_exp += rand(0,bushcraft_rand)
 		end
 	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter4.jpg"></center>'
-			'You are in the forest near the swamp. The forest in the winter is very beautiful, the fresh air makes you happy.'
+		! use the lower chance of ripping clothes when Sveta has higher bushcraft
+		if ripclothesrand >= torncloth_high_bushcraft: gs 'gadforest', 'torncloth'
+	end
+
+	! decide if Sveta is now lost as Sveta raises her bushcraft her chances of getting lost decreases
+	if pcs_bushcraft < bushcraft_lost:
+		lostrand = rand(1,bushcraft_lost)
+		if pcs_bushcraft < lostrand: lost_girl = 1 & forest_lostday = daystart & gt 'gadforestlost', $ARGS[1]
+	end
+end
+
+! this gs handles the actual degradation and removal of clothes from Sveta in the forest
+! this should only be called from inside of gs 'gadforest', 'bushcraft'
+if $ARGS[0] = 'torncloth':
+	if $clothingworntype ! 'nude':
+		if (PCloThinness = 1 or PCloSkirt > 0) and PCloQuality < 5:
+			!skirts, not fit, and not high-class enough by illume
+			'Oops, your clothes get snagged and tear slightly.'
+			dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 1'
+			!add remove clothes if worn out
+			if dyneval('RESULT = <<$clothingworntype>>H[<<clothingwornnumber>>]') <= 0:
+				'Your ripped clothes were barely holding together, but now they have finally fell apart. You are naked now.'
+				gadforest_clothestorn = 1
+				gs 'clothing', 'strip', 'gadforest'
+				gs 'stat'
+			end
+		end
+	end
+end
+
+! this gs handles stripping for Sveta in the various locations of the forest
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforest', 'stripping'
+if $ARGS[0] = 'stripping':
+	! stripping requires there to be no picnic going on, to have clothes on, for there to be no clothes already abandoned at the current location, between april and october and lowered inhibitions or higher exhibitionism
+	if $clothingworntype ! 'nude' and clothesAtLocation = 0 and month >= 4 and month <= 10 and hour >= 6 and hour < 22 and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
+		! Mira only goes to the forest edge
+		if MiraLoc = 3 and $forest_args1 = 'forest_edge':
+			! stripping with Mira requires completing talking to her about it already and doing their nude event in the forest already
+			if miranudetalk = 2:
+				act 'Strip Naked with Mira':
+					*clr & cla
+					menu_off = 1
+					minut += 5
+					if pcs_inhib < 50:inhib_exp += rand(1,3)
+					gs 'underwear', 'remove'
+					if swamp_clothes = 0:
+						gs 'clothing', 'strip', $forest_args1
+					elseif swamp_clothes = 1:
+						gs 'clothing', 'strip', 'gadforest'
+						gs 'clothing', 'swamp_clothes', 0
+					end
+					gs 'exhibitionism', 3
+					gs 'stat'
+
+					'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest6.jpg"></center>'
+
+					'You and Mira quickly get undressed, leaving your clothes in a neat pile on the ground.'
+
+					act 'Continue': gt 'gadforest', $forest_args1
+				end
+			end
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforest_winter_night4.jpg"></center>'
-			'You are in the forest near the swamp. Night in the forest during wintertime is very scary and uncomfortable.'
+			! picnic blocks being naked at the forest edge but not other parts of the forest
+			if (forestpicnic = 0 and $forest_args1 = 'forest_edge') or $forest_args1 ! 'forest_edge':
+				act 'Strip Naked':
+					*clr & cla
+					menu_off = 1
+					minut += 5
+					if pcs_inhib < 50:inhib_exp += rand(1,3)
+					gs 'underwear', 'remove'
+					if swamp_clothes = 0:
+						gs 'clothing', 'strip', $forest_args1
+					elseif swamp_clothes = 1:
+						gs 'clothing', 'strip', 'gadforest'
+						gs 'clothing', 'swamp_clothes', 0
+					end
+					gs 'stat'
+
+					if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+					if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+
+					'You quickly get undressed, leaving your clothes in a neat pile on the ground.'
+
+					if $forest_args1 = 'swamp_woods':
+						act 'Continue': gt 'swamp_woods', 'start'
+					else
+						act 'Continue': gt 'gadforest', $forest_args1
+					end
+				end
+			end
 		end
 	end
-	if goforest < 60:'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
+end
 
-	if foresteventrand < 2 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'bilberry'
-	if foresteventrand > 7 and month >= 6 and month <= 9 and foresteventday ! daystart: gt 'gadforest_event', 'mushroom'
-	if foresteventrand = 5 and hour > 8 and hour < 20 and foresteventday ! daystart:gt 'gadforest_event', 'forest_hunters'
+! this gs handles dressing for Sveta in the various locations of the forest
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforest', 'dressing'
+if $ARGS[0] = 'dressing':
+	! code for different variations of getting dressed or dealing with clothes left in the forest
+	if clothesAtLocation = 1:
+		if $clothingworntype = 'nude':
+			act 'Get dressed':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				gs 'clothing', 'swamp_clothes', 0
+				gs 'underwear', 'wear'
+				gs 'clothing', 'recover_lost_clothes', $forest_args1, 1
+				gs 'stat'
+
+				if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+				if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+				*nl
+				'You change back into your clothes.'
 
-	act 'Go back to the deep woods':
-		lostrand = rand(1,100)
-		if goforest >= lostrand:minut += 30 & gt 'gadforest','3'
-		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
+				if $forest_args1 = 'swamp_woods':
+					act 'Continue': gt 'swamp_woods', 'start'
+				else
+					act 'Continue': gt 'gadforest', $forest_args1
+				end
+			end
+		elseif $clothingworntype ! 'nude':
+			! hessian sack from hunters is not allowed to leave the woods it is only supposed to be a temporary item
+			if $clothingworntype = 'cheap' and clothingwornnumber = 414:
+				act 'Wear your abandoned clothing':
+					*clr & cla
+					menu_off = 1
+					minut += 5
+					gs 'clothing', 'swamp_clothes', 0
+					gs 'underwear', 'wear'
+					gs 'clothing', 'recover_lost_clothes', $forest_args1, 1
+					gs 'stat'
+
+					if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+					if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+					*nl
+					'You wear your abandoned clothing and get rid of the hessian sack the hunters gave you.'
+
+					if $forest_args1 = 'swamp_woods':
+						act 'Continue': gt 'swamp_woods', 'start'
+					else
+						act 'Continue': gt 'gadforest', $forest_args1
+					end
+				end
+			else
+				act 'Pick up your abandoned clothing':
+					cla
+					menu_off = 1
+					minut += 5
+					gs 'clothing', 'swamp_clothes', 0
+					gs 'underwear', 'wear'
+					gs 'clothing', 'recover_lost_clothes', $forest_args1
+					gs 'stat'
+
+					*nl
+					'You pick up your abandoned clothing.'
+
+					if $forest_args1 = 'swamp_woods':
+						act 'Continue': gt 'swamp_woods', 'start'
+					else
+						act 'Continue': gt 'gadforest', $forest_args1
+					end
+				end
+			end
+		end
 	end
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and swampforest ! daystart:
-		act 'Look for mushrooms and berries':
-			cla
-			*clr
-			menu_off = 1
-			minut += 30
-			swampforest = daystart
-			if goforest < 80:goforest += rand(0,1)
-			new_boletus += rand(1,2)
-			new_bilberry += rand(2,3)
-			boletus += new_boletus
-			bilberry += new_bilberry
-			pcs_mood += 5
-			gs 'stat'
+end
+
+! this gs handles walking for Sveta in the various locations of the forest
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforest', 'walking'
+if $ARGS[0] = 'walking':
+	if hour >= 6 and hour <= 22:
+		! Mira only goes to the forest edge
+		if MiraLoc = 3 and $forest_args1 = 'forest_edge':
+			act 'Go for a walk in the woods with Mira (1:00)':
+				*clr & cla
+				menu_off = 1
+				minut += 60
+				pcs_mood += 20
+				pcs_health += healthmax/5
+				gs 'gadforest', 'bushcraft', $forest_args1
+				if $clothingworntype = 'nude':
+					if pcs_inhib < 50:inhib_exp += rand(1,5)
+					gs 'exhibitionism', 3
+				end
+				gs 'stat'
 
-			gs 'gadforest', 'clothes1'
-			'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+				if month >= 4 and month <= 10:
+					! 10% chance of finding meadow (needed to advance Miras quest)
+					if rand(0,9) = 0 and meadow = 0 and $forest_args1 = 'forest_edge':
+						gt 'gadforest_event', 'find_meadow'
+					else
+						if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest'+rand(1,3)+'.jpg"></center>'
+						if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest_nude'+rand(1,3)+'.jpg"></center>'
+						*nl
+						'You spend an hour walking with Mira through the woods, chatting and enjoying the sounds of the forest and the fresh air.'
+					end
+				else
+					'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforestwinter.jpg"></center>'
+					*nl
+					'You spend an hour walking with Mira through the snowy woods, chatting and enjoying the sounds of the forest and the fresh air.'
+				end
+
+				act 'Continue':gt 'gadforest', $forest_args1
+			end
+		else
+			act 'Go for a walk in the woods (1:00)':
+				*clr & cla
+				menu_off = 1
+				minut += 60
+				pcs_mood += 20
+				pcs_health += healthmax/5
+				gs 'gadforest', 'bushcraft', $forest_args1
+				if $clothingworntype = 'nude' and pcs_inhib < 50:inhib_exp += rand(1,5)
+				gs 'stat'
 
-			act 'Continue':gt 'gadforest','4'
+				! 10% chance of finding meadow (needed to advance Miras quest)
+				if rand(0,9) = 0 and meadow = 0 and $forest_args1 = 'forest_edge':
+					gt 'gadforest_event', 'find_meadow'
+				else
+					if month >= 4 and month <= 10:
+						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
+						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
+						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
+						if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude0.'+rand(1,4)+'.jpg"></center>'
+						*nl
+						'You spend an hour walking through the woods, enjoying the sounds of the forest and the fresh air.'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforestwinter0.'+rand(1,6)+'.jpg"></center>'
+						*nl
+						'You spend an hour walking through the snowy woods, enjoying the sounds of the forest and the fresh air.'
+					end
+
+					if $forest_args1 = 'swamp_woods':
+						act 'Continue': gt 'swamp_woods', 'start'
+					else
+						act 'Continue': gt 'gadforest', $forest_args1
+					end
+				end
+			end
 		end
 	end
+end
 
-	act 'Go further into the swamp':
-		if goforest >= lostrand and goswamp = 1:minut += 30 & gt 'swamp'
-		if goforest >= lostrand and goswamp = 0:minut += 30 & gt 'gadforestswamp','1'
-		if goforest < lostrand:gt 'gadforest', 'gadforestloststart'
+! this gs handles mushroom and berry picking for Sveta in the various locations of the forest
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforest', 'picking'
+if $ARGS[0] = 'picking':
+	if StoryLine = 1 or (StoryLine = 0 and mirapickingtalk = 1):
+		if hour >= 6 and hour <= 22 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
+			if ($forest_args1 = 'forest_edge' and edge_pickingday ! daystart) or ($forest_args1 = 'forest_outskirts' and outskirts_pickingday ! daystart) or ($forest_args1 = 'forest_center' and center_pickingday ! daystart) or ($forest_args1 = 'swamp_woods' and swamp_pickingday ! daystart):
+				act 'Look for mushrooms and berries'+iif(MiraLoc = 3 and $forest_args1 = 'forest_edge', ' with Mira (0:30)',' (0:30)'):
+					*clr & cla
+					menu_off = 1
+
+					if $forest_args1 = 'forest_edge':
+						edge_pickingday = daystart
+						mushroom_pickers_check = 1
+						max_boletus = 1
+						max_bilberry = 1
+					elseif $forest_args1 = 'forest_outskirts':
+						outskirts_pickingday = daystart
+						mushroom_pickers_check = 2
+						max_boletus = 2
+						max_bilberry = 2
+					elseif $forest_args1 = 'forest_center':
+						center_pickingday = daystart
+						mushroom_pickers_check = 3
+						max_boletus = 3
+						max_bilberry = 3
+					elseif $forest_args1 = 'swamp_woods':
+						swamp_pickingday = daystart
+						mushroom_pickers_check = 4
+						max_boletus = 4
+						max_bilberry = 4
+					end
+
+					minut += 30
+					new_boletus = 0
+					new_bilberry = 0
+					gs 'gadforest', 'bushcraft', $forest_args1
+					if $clothingworntype = 'nude':
+						if pcs_inhib < 50:inhib_exp += rand(1,5)
+						if MiraLoc = 3 and $forest_args1 = 'forest_edge': gs 'exhibitionism', 3
+					end
+					gs 'stat'
+
+					! mushroom_pickers are not at the location of the forest Sveta is in
+					if mushroom_pickers ! mushroom_pickers_check:
+						new_boletus += max_boletus
+						new_bilberry += max_bilberry
+						boletus += new_boletus
+						bilberry += new_bilberry
+						pcs_mood += 10
+						gs 'stat'
+
+						gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+						*nl
+						'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+					! mushroom pickers are at the location of the forest Sveta is in
+					elseif mushroom_pickers = mushroom_pickers_check:
+						new_boletus += rand(0,max_boletus)
+						new_bilberry += rand(0,max_bilberry)
+						boletus += new_boletus
+						bilberry += new_bilberry
+						gs 'stat'
+
+						if new_boletus > 0 and new_bilberry > 0:
+							pcs_mood += 10
+							gs 'stat'
+
+							gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+							*nl
+							'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+						elseif new_boletus = 0 and new_bilberry > 0:
+							pcs_mood += 5
+							gs 'stat'
+
+							gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+							*nl
+							'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
+						elseif new_boletus > 0 and new_bilberry = 0:
+							pcs_mood += 5
+							gs 'stat'
+
+							gs 'gadforest', 'picking_clothes', $forest_args1, 'mushroom'
+							*nl
+							'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms'
+						elseif new_boletus = 0 and new_bilberry = 0:
+							pcs_mood -= 5
+							gs 'stat'
+
+							gs 'gadforest', 'picking_clothes_empty', $forest_args1
+							*nl
+							'After searching for mushrooms and berries for half an hour you found nothing.'
+						end
+					end
+
+					if $forest_args1 = 'swamp_woods':
+						act 'Continue': gt 'swamp_woods', 'start'
+					else
+						act 'Continue': gt 'gadforest', $forest_args1
+					end
+				end
+			end
+		end
 	end
 end
 
-!dynamics to ARGS by illume
-if $ARGS[0] = 'clothes1':
-	if MiraLoc ! 3:
-		if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
-		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,3)+'.jpg"></center>'
-
-	else
-		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom'+rand(1,2)+'.jpg"></center>'
-		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude'+rand(1,2)+'.jpg"></center>'
+! this gs handles images for mushroom and berry picking for Sveta in the various locations of the forest when she finds at least 1 kg of berries or mushrooms
+! $ARGS[1] - location of forest where this is called from
+! $ARGS[2] - whether you want images for mushrooms or berries
+! Example: gs 'gadforest', 'picking_clothes', 'forest_edge', 'mushroom'
+if $ARGS[0] = 'picking_clothes':
+	if $ARGS[2] = 'mushroom':
+		if MiraLoc = 3 and $ARGS[1] = 'forest_edge':
+			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom'+rand(1,2)+'.jpg"></center>'
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude'+rand(1,2)+'.jpg"></center>'
+		else
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,3)+'.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
+			if $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
+			if $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
+		end
+	elseif $ARGS[2] = 'berry':
+		if MiraLoc = 3 and $ARGS[1] = 'forest_edge':
+			if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom'+rand(1,2)+'.jpg"></center>'
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude'+rand(1,2)+'.jpg"></center>'
+		else
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,3)+'.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_'+rand(3,6)+'.jpg"></center>'
+			if $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_2.jpg"></center>'
+			if $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_1.jpg"></center>'
+		end
 	end
 end
 
-if $ARGS[0] = 'clothes2':
-	if MiraLoc ! 3:
+! this gs handles images for mushroom and berry picking for Sveta in the various locations of the forest when she finds 0 kg of berries or mushrooms
+! $ARGS[1] - location of forest where this is called from
+! Example: gs 'gadforest', 'picking_clothes_empty', 'forest_edge'
+if $ARGS[0] = 'picking_clothes_empty':
+	if MiraLoc = 3 and $ARGS[1] = 'forest_edge':
+		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom3.jpg"></center>'
+		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude3.jpg"></center>'
+	else
 		if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest2.jpg"></center>'
 		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest3.jpg"></center>'
 		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga1.'+rand(1,2)+'.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude1.'+rand(1,4)+'.jpg"></center>'
-	else
-		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom3.jpg"></center>'
-		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude3.jpg"></center>'
 	end
 end
 
-if $ARGS[0] = 'gadforestloststart':
-	cla
-	*clr
-	menu_off = 1
-	gs 'stat'
-
-	'<center><H4>Somewhere in the woods</H4></center>'
-	if month >= 5 and month <= 9:
-		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadfear1.jpg"></center>'
-		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadfear2.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadfear3.jpg"></center>'
-	end
-	'You suddenly realize in horror that you are not familiar with the area you are in... you are lost!.'
-
-	act 'Look for a way out':
-		if lost = 1: gt 'gadforestlost','1'
-		if lost = 2: gt 'gadforestlost','2'
-		if lost = 3: gt 'gadforestlost','3'
-		if lost = 4: gt 'gadforestlost','4'
-	end
-
-	! add for rescue in forest by illume
-	forest_lost = 1
-	if StoryLine = 1: forest_lostday = daystart + rand(1,3)
-end
-
 --- gadforest ---------------------------------
 

Різницю між файлами не показано, бо вона завелика
+ 266 - 2198
locations/gadforest_event.qsrc


+ 713 - 288
locations/gadforestlost.qsrc

@@ -1,387 +1,812 @@
 # gadforestlost
 
-!make this trigger after 2 days in swamp house, minus a countdown per hour
-if $ARGS[0] = 'forestrescue':
-	cls
+! this file holds all the current code and events for player when lost
+! it is structured like the normal gadforest file with similar actions and arguments but with unique events
+if $ARGS[0] = 'forest_outskirts':
+	*clr & cla
+
 	$loc = 'gadforestlost'
-	$metka = 'forestrescue'
+	$metka = 'forest_outskirts'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforestlost'
-	$menu_arg = 'forestrescue'
+	$menu_arg = 'forest_outskirts'
 	menu_off = 0
 
-	gs 'gadukino_event', 'sound'
-	gs'stat'
+	$forest_args1 = 'forest_outskirts'
 
-	minut += 150
-	lost_girl = 0
-	forest_lostday = 0
-	hunters_here = 0
-	gs 'clothing', 'swamp_clothes', 0
+	CLOSE ALL
+	gs 'gadukino_event', 'sound'
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'
+	gs 'gadforestlost', 'gadforestlost_picture'
 
-	'Suddenly you spot a man dressed as a forest ranger.'
-	'He walks up to you and says, "And here is our lost girl. Your grandfather and grandmother are very worried about you. They asked me to help find you. Follow me, I will take you home."'
+	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
+	foresteventrand = rand(1,40)
+	if foresteventrand <= (2+(bonfire*2)) and daystart > forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', 'forest_outskirts'
+	if foresteventrand <= (4+(bonfire*2)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', 'forest_outskirts'
+	if foresteventrand <= (6+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
+	if foresteventrand <= (8-(bonfire*2)) and (hour < 6 or hour > 22) and foresteventday ! daystart: gt 'gadforestlost', 'wolves', 'forest_outskirts'
 
-	!rescued during rest 
-	!is this possible? isn''t $loc = 'gadforestlost' ??? (julzor)
-	if $loc = 'gadforestrelax':
-		!have fire
-		if bonfire = 1:
-			'When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others.'
-		else
-			'Staying in one place is a good idea when you are lost.'
-		end
-	end
-
-	'You get ready quickly and follow the forest ranger out of the woods.'
-
-	if $clothingworntype ! 'nude' or swamp_clothes = 0:
-		'You can''t wait to get back to your grandparents house and have a bath and a nice hot meal.'
+	gs 'gadforestlost', 'wander'
 
-		act 'To your grandparents house':gt 'gadhouse', 'start'
-	elseif $clothingworntype = 'nude' or swamp_clothes = 1:
-		'The ranger looks you up and down and you feel like he is about to ask you something but he decides against it.'
-		'You remember you left your clothes by the edge of the woods and ask the ranger to take you there instead.'
+	act 'Relax here for a bit': gt 'gadforestlost', 'relax'
 
-		act 'To the edge of the woods':gt'gadforest', '1'
-	end
+	gs 'gadforestlost', 'picking'
 end
 
-if $ARGS[0] = '1':
+if $ARGS[0] = 'forest_center':
 	*clr & cla
-	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 7: gt 'gadforestlost', 'forestrescue'
+
 	$loc = 'gadforestlost'
-	$metka = '1'
+	$metka = 'forest_center'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforestlost'
-	$menu_arg = '1'
+	$menu_arg = 'forest_center'
 	menu_off = 0
 
-	gs 'gadukino_event', 'sound'
-	gs'stat'
+	$forest_args1 = 'forest_center'
 
-	riprand = rand(1,10)
-	rescuerand = rand(1,10)
-	wolfrand = rand(1,10)
-	huntrand = rand(1,10)
+	CLOSE ALL
+	gs 'gadukino_event', 'sound'
+	gs 'stat'
 
+	gs 'gadforestlost', 'gadforestlost_picture'
 
-	gs 'gadforestlost', 'gadforestlost'
+	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
+	foresteventrand = rand(1,40)
+	if foresteventrand <= (1+(bonfire*1)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', 'forest_center'
+	if foresteventrand <= (3+(bonfire*1)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
+	if foresteventrand <= (8-(bonfire*1)) and (hour < 6 or hour > 22) and foresteventday ! daystart: gt 'gadforestlost', 'wolves', 'forest_center'
 
-	if wolfrand = 1 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
+	gs 'gadforestlost', 'wander'
 
-	act 'Look for a way out':
-		cla
-		*clr
-		menu_off = 1
-		minut += 60
-		pcs_mood -= 5
-		goforest += rand(0,1)
-		lostrand = rand(1,40)
-		gs 'stat'
+	act 'Relax here for a bit': gt 'gadforestlost', 'relax'
 
-		gs 'gadforestlost', 'lostclothes'
-		if goforest > lostrand:
-			act 'Look for a way out':gs 'gadforestlost', 'gadforestlostfinish1'
-		else
-			act 'Look for a way out':gt 'gadforestlost','1'
-		end
-		act 'Take a break':gt 'gadforestrelax'
-	end
-	if rand(1,10)> 8: gs 'gadforest', 'torncloth'
-	gs 'gadforestlost', 'searchfood'
+	gs 'gadforestlost', 'picking'
 end
 
-if $ARGS[0] = '2':
-	*clr & cla
-	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 8: gt 'gadforestlost', 'forestrescue'
-	$loc = 'gadforestlost'
-	$metka = '2'
-	$location_type = 'secluded'
-
-	$menu_loc = 'gadforestlost'
-	$menu_arg = '2'
-	menu_off = 0
-
-	gs 'gadukino_event', 'sound'
-	gs'stat'
-	wolfrand = rand(1,10)
-	huntrand = rand(1,10)
-	gs'stat'
-
-	gs 'gadforestlost', 'gadforestlost'
-
-	if wolfrand <= 2 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
-	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
+! this gs handles the bushcraft increases, clothing degradation, while lost in the forest
+! $ARGS[1] - location of forest where this is called from
+! Example: gs 'gadforestlost', 'bushcraft', 'forest_outskirts'
+if $ARGS[0] = 'bushcraft':
+	! Make sure Sveta always has at least 1 pcs_bushcraft
+	if pcs_bushcraft = 0:pcs_bushcraft = 1
+	if $ARGS[1] = 'forest_outskirts':
+		bushcraft_rand = 2
+		bushcraft_lost = 30
+		torncloth_high_bushcraft = 9
+		torncloth_low_bushcraft = 7
+	elseif $ARGS[1] = 'forest_center':
+		bushcraft_rand = 3
+		bushcraft_lost = 50
+		torncloth_high_bushcraft = 8
+		torncloth_low_bushcraft = 5
+	end
+	! No limit on earning bushcraft while lost but still random
+	bushcraft_exp += rand(0,bushcraft_rand)
 
-	act 'Look for the road':
-		*clr & cla
-		menu_off = 1
-		minut += 60
-		pcs_mood -= 5
-		goforest += rand(0,1)
-		lostrand = rand(1,120)
-		gs 'stat'
+	ripclothesrand = rand(1,10)
+	if pcs_bushcraft < bushcraft_limit:
+		if ripclothesrand >= torncloth_low_bushcraft: gs 'gadforest', 'torncloth'
+	else
+		if ripclothesrand >= torncloth_high_bushcraft: gs 'gadforest', 'torncloth'
+	end
+	gs 'stat'
+end
 
-		gs 'gadforestlost', 'lostclothes'
-		if goforest > lostrand:
-			act 'Look for a way out':gs 'gadforestlost', 'gadforestlostfinish2'
-		else
-			act 'Look for a way out':gt 'gadforestlost','2'
+! this gs handles Sveta trying to find her way in the forest when lost
+! $forest_args1 - location of forest where this is called from
+! Example: gs 'gadforestlost', 'wander'
+if $ARGS[0] = 'wander':
+	if hour >= 6 and hour < 22:
+		act 'Wander trying to get your bearings (0:30)':
+			*clr & cla
+			menu_off = 1
+			minut += 30
+			gs 'stat'
+
+			gs 'gadforestlost', 'bushcraft', $forest_args1
+
+			'<center><H4>Somewhere in the forest</H4></center>'
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_nude0.'+rand(1,4)+'.jpg"></center>'
+			if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch0.'+rand(1,4)+'.jpg"></center>'
+			if $clothingworntype ! 'nude' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_ski0.'+rand(1,4)+'.jpg"></center>'
+			*nl
+
+			if pcs_bushcraft < bushcraft_lost:
+				lostrand = rand(1,bushcraft_lost)
+				if pcs_bushcraft > lostrand:
+					gt 'gadforestlost','finish', $forest_args1
+				else
+					'After half an hour wandering around, you feel like all you''ve accomplished is walking in circles.'
+					act 'Continue':gt 'gadforestlost', $forest_args1
+				end
+			end
 		end
-		act 'Take a break':gt 'gadforestrelax'
 	end
-	if rand(1,10)> 7: gs 'gadforest', 'torncloth'
-	gs 'gadforestlost', 'searchfood'
 end
 
-if $ARGS[0] = '3':
+! $forest_args1 - location of forest where this is called from
+! Example: gt 'gadforestlost', 'relax'
+if $ARGS[0] = 'relax':
 	*clr & cla
-	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 9: gt 'gadforestlost', 'forestrescue'
+
 	$loc = 'gadforestlost'
-	$metka = '3'
+	$metka = 'relax'
 	$location_type = 'secluded'
 
 	$menu_loc = 'gadforestlost'
-	$menu_arg = '3'
+	$menu_arg = 'relax'
 	menu_off = 0
 
+	CLOSE ALL
 	gs 'gadukino_event', 'sound'
-	gs'stat'
-
-	wolfrand = rand(1,10)
-	huntrand = rand(1,10)
-	gs'stat'
-
-	gs 'gadforestlost', 'gadforestlost'
-	if wolfrand <= 3 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
-	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
-
-	act 'Look for the road':
-		*clr & cla
-		menu_off = 1
-		minut += 60
-		pcs_mood -= 5
-		goforest += rand(0,1)
-		lostrand = rand(1,180)
-		gs 'stat'
+	gs 'stat'
 
-		gs 'gadforestlost', 'lostclothes'
-		if goforest > lostrand:
-			act 'Look for a way out':gs 'gadforestlost', 'gadforestlostfinish3'
-		else
-			act 'Look for a way out':gt 'gadforestlost','3'
-		end
-		act 'Take a break':gt 'gadforestrelax'
+	if $forest_args1 = 'forest_outskirts':
+		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
+		foresteventrand = rand(1,40)
+		if foresteventrand <= (2+(bonfire*2)) and daystart > forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', $forest_args1
+		if foresteventrand <= (4+(bonfire*2)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
+		if foresteventrand <= (6+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+	elseif $forest_args1 = 'forest_center':
+		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
+		foresteventrand = rand(1,40)
+		if foresteventrand <= (1+(bonfire*1)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
+		if foresteventrand <= (3+(bonfire*1)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
 	end
-	if rand(1,10)> 6: gs 'gadforest', 'torncloth'
-	gs 'gadforestlost', 'searchfood'
-end
 
-if $ARGS[0] = '4':
-	*clr & cla
-	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 9: gt 'gadforestlost', 'forestrescue'
-	$loc = 'gadforestlost'
-	$metka = '4'
-	$location_type = 'secluded'
+	'<center><H4>Somewhere in the forest</H4></center>'
+	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+ rand(1,3) +'.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt = 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax1.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt = 0 and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax2.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt > 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski1.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt > 0 and $pantyworntype ! 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski2.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt > 0 and $pantyworntype = 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski3.jpg"></center>'
+	*nl
+	'You decide this is as good of place as any to stop and take a break.'
 
-	$menu_loc = 'gadforestlost'
-	$menu_arg = '4'
-	menu_off = 0
+	act 'Explore the forest': gt 'gadforestlost', $forest_args1
 
-	gs 'gadukino_event', 'sound'
-	gs'stat'
+	if bonfire = 0:
+		act 'Build a fire (0:15)':
+			*clr & cla
+			menu_off = 1
+			minut += 15
+			bonfire = 1
+			gs 'stat'
 
-	*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfire1.jpg"></center>'
+			*nl
+			'After a few minutes, you are able to get a nice sized fire started.'
 
-	wolfrand = rand(1,10)
-	huntrand = rand(1,10)
-	gs'stat'
+			act 'Continue':gt 'gadforestlost', 'relax'
+		end
+		act 'Sit and relax (0:30)':
+			*clr & cla
+			menu_off = 1
+			minut += 30
+			pcs_sleep += 5
+			pcs_health += 10
+			pcs_mood += 10
+			gs 'stat'
+
+			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+rand(1,2)+'.jpg"></center>'
+			if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax3.jpg"></center>'
+			if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski4.jpg"></center>'
+			if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski5.jpg"></center>'
+			*nl
+			'You spend half an hour relaxing, trying to pretend this is just like any other walk in the woods you''ve done.'
+
+			act 'Continue':gt 'gadforestlost', 'relax'
+		end
+		if pcs_sleep < 40:
+			act 'Nap on the ground (2:00)':
+				*clr & cla
+				menu_off = 1
+				minut += 120
+				pcs_sleep += 20
+				pcs_health += 5
+				pcs_mood += 10
+				gs'stat'
+
+				if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepnude1.'+rand(1,2)+'.jpg"></center>'
+				if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleep.jpg"></center>'
+				if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski.jpg"></center>'
+				if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski1.jpg"></center>'
+				*nl
+				'You are able to make youself fall asleep for about 2 hours, but that is it. If you want to get a full nights sleep you will have to find a way out of the forest.'
+				'Even though you had to sleep on the ground, you do wake up feeling a bit more hopeful and rested.'
+
+				act 'Continue':gt 'gadforestlost', 'relax'
+			end
+		end
+	elseif bonfire = 1:
+		if pcs_sleep < 95:
+			act 'Warm up by the fire (0:30)':
+				*clr & cla
+				menu_off = 1
+				minut += 30
+				pcs_sleep += 5
+				pcs_health += 10
+				pcs_mood += 10
+				frost = 0
+				gs 'stat'
 
-	gs 'gadforestlost', 'gadforestlost'
+				if hour >= 6 and hour < 21:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfire2.jpg"></center>'
+				else
+				   '<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfire3.jpg"></center>'
+				end
+				*nl
+				'You spend half an hour huddled by the flames until you no longer feel cold anymore.'
 
-	if wolfrand <= 4 and (hour = 23 or hour >= 0 and hour < 6):gt 'gadforest_event', 'lost'
-	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
+				act 'Continue':gt 'gadforestlost', 'relax'
+			end
+		end
+		if pcs_sleep < 40:
+			act 'Nap by the fire (2:00)':
+				*clr & cla
+				menu_off = 1
+				minut += 120
+				pcs_sleep += 20
+				pcs_health += 10
+				pcs_mood += 20
+				frost = 0
+				gs 'stat'
 
-	act 'Look for the road':
-		*clr & cla
-		menu_off = 1
-		minut += 60
-		pcs_mood -= 5
-		goforest += rand(0,1)
-		lostrand = rand(1,300)
-		temp = rand(1,10)
-		gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_bonfiresleep.jpg"></center>'
+				*nl
+				'You are able to make youself fall asleep for about 2 hours, but that is it. If you want to get a full nights sleep you will have to find a way out of the forest.'
+				'Even though you had to sleep on the ground, you do wake up feeling a bit more hopeful and rested.'
 
-		gs 'gadforestlost', 'lostclothes'
-		act 'Continue looking for the road':
-			if goforest >= lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
-			if goforest < lostrand and temp > 7:gt 'gadforestswamp','1'
-			if goforest < lostrand and temp <= 7:gt 'gadforestlost','4'
+				act 'Continue':gt 'gadforestlost', 'relax'
+			end
+		end
+		if boletus > 0:
+			act 'Cook some mushrooms in the fire (0:15)':
+				*clr & cla
+				menu_off = 1
+				minut += 15
+				boletus_cooked += 1
+				boletus -= 1
+				frost = 0
+				gs'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/boletushot.jpg"></center>'
+				*nl
+				'You spend 15 minutes grilling some mushrooms in the fire.'
+
+				act 'Continue':gt 'gadforestlost', 'relax'
+			end
 		end
-		act 'Take a break':gt 'gadforestrelax'
 	end
-	if rand(1,10)> 7: gs 'gadforest', 'torncloth'
-	gs 'gadforestlost', 'searchfood'
-end
-
-if $ARGS[0] = 'gadforestlost':
-	'<center><H4>Forest</H4></center>'
-	if month >= 4 and month <= 10:
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost0.'+rand(1,6)+'.jpg"></center>'
-			'You get lost in the woods. All around, you see unfamiliar places, you are too stressed to appreciate the beauty of nature right now.'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_night0.'+rand(1,4)+'.jpg"></center>'
-			'You get lost in the woods. The situation becomes even worse, because it''s now night time.'
+	if boletus_cooked > 0:
+		act 'Eat cooked mushrooms (0:15)':
+			*clr & cla
+			menu_off = 1
+			minut += 15
+			boletus_cooked -= 1
+			pcs_health += 10
+			pcs_mood += 10
+			fat += 1
+			pcs_energy += 20
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/boletuscook.jpg"></center>'
+			*nl
+			'You eat some cooked mushrooms. They are pretty tasty considering your circumstances.'
+
+			act 'Continue':gt 'gadforestlost', 'relax'
 		end
-	else
-		if hour >= 8 and hour < 18:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_winter0.'+rand(1,5)+'.jpg"></center>'
-			'You get lost in the winter woods. All around, you see unfamiliar places, you are too stressed to appreciate the beauty of nature right now.'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_winter_night0.'+rand(1,4)+'.jpg"></center>'
-			'You get lost in the winter woods. The situation becomes even worse, because it''s now night time.'
+	end
+	if bilberry > 0:
+		act 'Eat berries (0:15)':
+			*clr & cla
+			menu_off = 1
+			minut += 15
+			bilberry -= 1
+			pcs_health += 10
+			pcs_mood += 10
+			fat += 1
+			pcs_energy += 10
+			pcs_hydra += 10
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/bilberry.jpg"></center>'
+			*nl
+			'You eat some berries. These would be great to eat even if you weren''t lost.'
+
+			act 'Continue':gt 'gadforestlost', 'relax'
 		end
 	end
 end
 
-if $ARGS[0] = 'lostclothes':
-	if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch0.'+rand(1,4)+'.jpg"></center>'
-	if $clothingworntype ! 'nude' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_ski0.'+rand(1,4)+'.jpg"></center>'
-	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_nude0.'+rand(1,4)+'.jpg"></center>'
-	'After wandering through the woods for an hour you decide to....'
-end
+! this gs handles mushroom and berry picking for Sveta in the various locations of the forest when she is lost
+! $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:
+		act 'Look for mushrooms and berries (0:30)':
+			*clr & cla
+			menu_off = 1
 
-if $ARGS[0] = 'gadforestlostfinish':
-	'<center><H4>Somewhere in the woods</H4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadjoy.jpg"></center>'
-	'You look over and realize that you finally see lights shining from distant houses, glad to get out of this alive you rush forward.'
+			if $forest_args1 = 'forest_outskirts':
+				outskirts_pickingday = daystart
+				mushroom_pickers_check = 2
+				max_boletus = 2
+				max_bilberry = 2
+			elseif $forest_args1 = 'forest_center':
+				center_pickingday = daystart
+				mushroom_pickers_check = 3
+				max_boletus = 3
+				max_bilberry = 3
+			end
 
-	!clear lost flags by illume
-	lost_girl = 0
-	forest_lostday = 0
-	hunters_here = 0
-	menu_off = 1
-	gs 'clothing', 'swamp_clothes', 0
-	gs 'stat'
-	if $clothingworntype = 'nude':
-		act 'Leave the woods':
-			menu_off = 1
-			minut += 25
-			'You find your way out of the woods, hiding your naked body in shadows.'
-			'You make your way back towards the edge of the forest where you left your clothes.'
-			cla
-			act 'Continue':gt'gadforest', '1'
+			minut += 30
+			new_boletus = 0
+			new_bilberry = 0
+			gs 'gadforestlost', 'bushcraft', $forest_args1
+			if $clothingworntype = 'nude' and pcs_inhib < 50:inhib_exp += rand(1,5)
+			gs 'stat'
+
+			if mushroom_pickers ! mushroom_pickers_check:
+				new_boletus += max_boletus
+				new_bilberry += max_bilberry
+				boletus += new_boletus
+				bilberry += new_bilberry
+				pcs_mood += 10
+				gs 'stat'
+
+				gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+				*nl
+				'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+			elseif mushroom_pickers = mushroom_pickers_check
+				new_boletus += rand(0,max_boletus)
+				new_bilberry += rand(0,max_bilberry)
+				boletus += new_boletus
+				bilberry += new_bilberry
+				gs 'stat'
+
+				if new_boletus > 0 and new_bilberry > 0:
+					pcs_mood += 10
+					gs 'stat'
+
+					gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+					*nl
+					'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+				elseif new_boletus = 0 and new_bilberry > 0:
+					pcs_mood += 5
+					gs 'stat'
+
+					gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+					*nl
+					'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
+				elseif new_boletus > 0 and new_bilberry = 0:
+					pcs_mood += 5
+					gs 'stat'
+
+					gs 'gadforest', 'picking_clothes', $forest_args1, 'mushroom'
+					*nl
+					'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms'
+				elseif new_boletus = 0 and new_bilberry = 0:
+					pcs_mood -= 5
+					gs 'stat'
+
+					gs 'gadforest', 'picking_clothes_empty', $forest_args1
+					*nl
+					'After searching for mushrooms and berries for half an hour you found nothing.'
+				end
+			end
+			act 'Continue':gt 'gadforestlost', $forest_args1
 		end
-		!disable further actions from being added
-		temp=0
 	end
 end
 
-if $ARGS[0] = 'gadforestlostfinish1':
+! $ARGS[1] - location of forest where this is called from
+if $ARGS[0] = 'finish':
 	*clr & cla
 	menu_off = 1
-	temp = RAND(1,3)
-	lost = 0
+	bonfire = 0
 	pcs_mood += 20
+	bushcraft_exp += rand(1,5)
+	gs 'clothing', 'swamp_clothes', 0
 	gs 'stat'
 
-	gs 'gadforestlost', 'gadforestlostfinish'
+	'<center><H4>Somewhere in the forest</H4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadjoy.jpg"></center>'
+	*nl
+	'After half an hour wandering around, you finally see some familiar sights.'
 
-	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
-	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
-	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
+	if $clothingworntype = 'nude':
+		if $ARGS[1] = 'forest_outskirts':
+			act 'Continue':
+				if meadow > 0:
+					foresteventrand = rand(1,3)
+				else
+					foresteventrand = rand(1,2)
+				end
+				if foresteventrand = 1: minut += 15 & gt 'gadforest','forest_edge'
+				if foresteventrand = 2: gt 'gadforest','forest_outskirts'
+				if foresteventrand = 3: minut += 35 & gt 'meadow', 'start'
+			end
+		elseif $ARGS[1] = 'forest_center':
+			act 'Continue':
+				if hunterscabin = 1 and meadow > 0:
+					foresteventrand = rand(1,5)
+				elseif meadow > 0:
+					foresteventrand = rand(1,4)
+				else
+					foresteventrand = rand(1,3)
+				end
+				if foresteventrand = 1: minut += 30 & gt 'gadforest','forest_edge'
+				if foresteventrand = 2: minut += 15 & gt 'gadforest','forest_outskirts'
+				if foresteventrand = 3: gt 'gadforest','forest_center'
+				if foresteventrand = 4: minut += 50 & gt 'meadow', 'start'
+				if foresteventrand = 5: minut += 30 & gt 'swamp_yard', 'start'
+			end
+		end
+	else
+		if $ARGS[1] = 'forest_outskirts':
+			act 'Continue':
+				if meadow > 0:
+					foresteventrand = rand(1,6)
+				else
+					foresteventrand = rand(1,5)
+				end
+				if foresteventrand = 1: minut += 15 & gt 'gadforest','forest_edge'
+				if foresteventrand = 2: gt 'gadforest','forest_outskirts'
+				if foresteventrand = 3: minut += 40 & gt 'gadfield','field'
+				if foresteventrand = 4: minut += 30 & gt 'gadroad'
+				if foresteventrand = 5: minut += 40 & gt 'gadriver','start'
+				if foresteventrand = 6: minut += 35 & gt 'meadow', 'start'
+			end
+		elseif $ARGS[1] = 'forest_center':
+			act 'Continue':
+				if hunterscabin = 1 and meadow > 0:
+					foresteventrand = rand(1,8)
+				elseif meadow > 0:
+					foresteventrand = rand(1,7)
+				else
+					foresteventrand = rand(1,6)
+				end
+				if foresteventrand = 1: minut += 30 & gt 'gadforest','forest_edge'
+				if foresteventrand = 2: minut += 15 & gt 'gadforest','forest_outskirts'
+				if foresteventrand = 3: gt 'gadforest','forest_center'
+				if foresteventrand = 4: minut += 55 & gt 'gadfield','field'
+				if foresteventrand = 5: minut += 45 & gt 'gadroad'
+				if foresteventrand = 6: minut += 55 & gt 'gadriver','start'
+				if foresteventrand = 7: minut += 50 & gt 'meadow', 'start'
+				if foresteventrand = 8: minut += 30 & gt 'swamp_yard', 'start'
+			end
+		end
+	end
 end
 
-if $ARGS[0] = 'gadforestlostfinish2':
+! $ARGS[1] - who is rescuing player
+! $ARGS[2] - location of forest where this is called from
+if $ARGS[0] = 'rescue':
 	*clr & cla
 	menu_off = 1
-	temp = RAND(1,5)
-	lost = 0
+	bonfire = 0
 	pcs_mood += 20
+	bushcraft_exp += rand(1,5)
+	if StoryLine = 0: lost_girl = 0
+	if swamp_clothes = 1:
+		'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear'+iif(StoryLine=1,' at your grandparents house.','.')
+		gs 'clothing', 'strip', 'gadforest'
+		gs 'clothing', 'swamp_clothes', 0
+	end
 	gs 'stat'
 
-	gs 'gadforestlost', 'gadforestlostfinish'
-
-	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
-	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
-	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
-	if temp = 4:act 'Leave the woods':minut += 15 & gt'gadriver','start'
-	if temp = 5:act 'Leave the woods':minut += 15 & gt'meadow'
+	if $ARGS[1] = 'pickers':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers2.jpg"></center>'
+		*nl
+		'Suddenly you hear the sounds of people approaching. A group of pickers from the village appear out of the bushes.'
+		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
+		if StoryLine = 1 and grandmaQW['block'] = 0:
+			'They walk up to you and say, "Your grandparents are very worried about you. They asked us to keep an eye out for you. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','to their house."','to the edge of the forest."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 45 & gt 'gadhouse', 'start'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 60 & gt 'gadhouse', 'start'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				end
+			end
+		else
+			'They walk up to you and say, "We heard there may have been a missing girl in the forest. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','out of the forest."','to the edge of the forest."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 30 & gt 'gadroad'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 45 & gt 'gadroad'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				end
+			end
+		end
+	elseif $ARGS[1] = 'hunters':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
+		*nl
+		'Suddenly you hear the sounds of people approaching. '+iif(huntersKnow=1,'The hunters from the swamp ','A group of hunters ')+'appear out of the bushes.'
+		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
+		if StoryLine = 1 and grandmaQW['block'] = 0:
+			'They walk up to you and say, "Your grandparents are very worried about you. They asked us to keep an eye out for you. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','to the edge of the forest."','to the swamp with us."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 45 & gt 'swamp_yard', 'start'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'swamp_yard', 'start'
+				end
+			end
+		else
+			'They walk up to you and say, "We heard there may have been a missing girl in the forest. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','to the edge of the forest."','to the swamp with us."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 45 & gt 'swamp_yard', 'start'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'swamp_yard', 'start'
+				end
+			end
+		end
+	elseif $ARGS[1] = 'ranger':
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'
+		*nl
+		'Suddenly you hear the sound of a person approaching. A man you vaguely recognize from the village appears out of the bushes.'
+		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
+		if StoryLine = 1 and grandmaQW['block'] = 0:
+			'He walks up to you and says, "Your grandparents are very worried about you. They asked me to keep an eye out for you. Follow me, I will lead you back '+iif($clothingworntype ! 'nude','to their house."','to the edge of the forest."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 45 & gt 'gadhouse', 'start'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 60 & gt 'gadhouse', 'start'
+				elseif $ARGS[2] = 'swamp_yard':
+					act 'Continue': minut += 90 & gt 'gadhouse', 'start'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'swamp_yard':
+					act 'Continue': minut += 60 & gt 'gadforest', 'forest_edge'
+				end
+			end
+		else
+			'He walks up to you and says, "I heard there may have been a missing girl in the forest. Follow me, I will lead you back '+iif($clothingworntype ! 'nude','out of the forest."','to the edge of the forest."')
+			if $clothingworntype ! 'nude':
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 30 & gt 'gadroad'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 45 & gt 'gadroad'
+				elseif $ARGS[2] = 'swamp_yard':
+					act 'Continue': minut += 75 & gt 'gadroad'
+				end
+			else
+				if $ARGS[2] = 'forest_outskirts':
+					act 'Continue': minut += 15 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'forest_center':
+					act 'Continue': minut += 30 & gt 'gadforest', 'forest_edge'
+				elseif $ARGS[2] = 'swamp_yard':
+					act 'Continue': minut += 60 & gt 'gadforest', 'forest_edge'
+				end
+			end
+		end
+	end
 end
 
-if $ARGS[0] = 'gadforestlostfinish3':
+! $ARGS[1] - location of forest where this is called from
+if $ARGS[0] = 'wolves':
 	*clr & cla
 	menu_off = 1
-	temp = RAND(1,7)
-	lost = 0
-	pcs_mood += 20
-	gs 'stat'
-
-	gs 'gadforestlost', 'gadforestlostfinish'
 
-	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
-	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
-	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
-	if temp = 4:act 'Leave the woods':minut += 15 & gt'gadriver','start'
-	if temp = 5:act 'Leave the woods':minut += 15 & gt'meadow'
-	if temp = 6:act 'Leave the woods':minut += 15 & nroad = 15 & gt'road'
-	if temp = 7:act 'Leave the woods':minut += 15 & nroad = 10 & gt'road'
-end
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/howl.jpg"></center>'
+	*nl
+	'Suddenly your hear a terrifying howl nearby.'
 
-if $ARGS[0] = 'gadforestlostfinish4':
-	*clr & cla
-	menu_off = 1
-	temp = RAND(1,9)
-	lost = 0
-	pcs_mood += 20
-	gs 'stat'
+	act 'Run away':
+		*clr & cla
+		gs 'exercise', 'tier4', 1, 'run_exp'
+		gs 'stat'
 
-	gs 'gadforestlost', 'gadforestlostfinish'
-
-	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
-	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
-	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
-	if temp = 4:act 'Leave the woods':minut += 15 & gt'gadriver','start'
-	if temp = 5:act 'Leave the woods':minut += 15 & gt'meadow'
-	if temp = 6:act 'Leave the woods':minut += 15 & nroad = 15 & gt'road'
-	if temp = 7:act 'Leave the woods':minut += 15 & nroad = 10 & gt'road'
-	if temp = 8:act 'Leave the woods':minut += 15 & nroad = 10 & gt'road'
-	if temp = 9 and goswamp = 0:act 'Leave the woods':minut += 15 & gt 'gadforestswamp','1'
-	if temp = 9 and goswamp = 1:act 'Leave the woods':minut += 15 & gt 'swamp'
-end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run.jpg"></center>'
+		*nl
+		'Instincts take over and you begin running without a second thought.'
 
-if $ARGS[0] = 'searchfood':
-	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10:
-		act 'Look for mushrooms and berries':
-			*clr & cla
-			menu_off = 1
-			minut += 30
-			new_boletus += rand(1,2)
-			new_bilberry += rand(1,2)
-			if new_boletus + new_bilberry > 0:
-				boletus += new_boletus
-				bilberry += new_bilberry
-				pcs_mood += 5
+		if $ARGS[1] = 'forest_edge':
+			if pcs_bushcraft < 70 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
+				foresteventrand = rand(1,7)
+			else
+				foresteventrand = rand(1,6)
+			end
+			if foresteventrand <= 3:
+				bushcraft_exp += rand(1,3)
 				gs 'stat'
-
-				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.'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, but unfortunately are still in the forest.'
+			elseif foresteventrand <= 6:
+				bushcraft_exp += rand(1,5)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, and also are no longer in the forest.'
+			elseif foresteventrand <= 7:
+				bushcraft_exp += rand(1,2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			end
+			act 'Continue':
+				if foresteventrand <= 3: gt 'gadforest','forest_edge'
+				if foresteventrand <= 4: gt 'gadfield','field'
+				if foresteventrand <= 5: gt 'gadroad'
+				if foresteventrand <= 6: gt 'gadriver','start'
+				if foresteventrand <= 7:over = 11 & gt 'gameover'
+			end
+		elseif $ARGS[1] = 'forest_outskirts':
+			if pcs_bushcraft < 70 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
+				foresteventrand = rand(1,10)
 			else
-				pcs_mood -= 5
+				foresteventrand = rand(1,9)
+			end
+			if foresteventrand <= 5:
+				bushcraft_exp += rand(1,3)
 				gs 'stat'
-
-				gs 'gadforest', 'clothes2'
-				'After half an hour of wandering through the woods in search of mushrooms or berries, you found nothing.'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
+			elseif foresteventrand <= 9:
+				bushcraft_exp += rand(1,5)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, and also are no longer lost as you recognize your surroundings.'
+			elseif foresteventrand <= 10:
+				bushcraft_exp += rand(1,2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			end
+			act 'Continue':
+				if foresteventrand <= 3: gt 'gadforestlost', 'forest_outskirts'
+				if foresteventrand <= 5: gt 'gadforest','forest_edge'
+				if foresteventrand <= 6: gt 'gadforest','forest_outskirts'
+				if foresteventrand <= 7: gt 'gadfield','field'
+				if foresteventrand <= 8: gt 'gadroad'
+				if foresteventrand <= 9: gt 'gadriver','start'
+				if foresteventrand <= 10:over = 11 & gt 'gameover'
 			end
+		elseif $ARGS[1] = 'forest_center':
+			if pcs_bushcraft < 70 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
+				foresteventrand = rand(1,13)
+			else
+				foresteventrand = rand(1,2)
+			end
+			if foresteventrand <= 6:
+				bushcraft_exp += rand(1,3)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
+			elseif foresteventrand <= 12:
+				bushcraft_exp += rand(1,5)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, and also are no longer lost as you recognize your surroundings.'
+			elseif foresteventrand <= 13:
+				bushcraft_exp += rand(1,2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			end
+			act 'Continue':
+				if foresteventrand <= 2: gt 'gadforestlost', 'forest_outskirts'
+				if foresteventrand <= 6: gt 'gadforestlost', 'forest_center'
+				if foresteventrand <= 7: gt 'gadforest','forest_edge'
+				if foresteventrand <= 8: gt 'gadforest','forest_outskirts'
+				if foresteventrand <= 9: gt 'gadforest','forest_center'
+				if foresteventrand <= 10: gt 'gadfield','field'
+				if foresteventrand <= 11: gt 'gadroad'
+				if foresteventrand <= 12: gt 'gadriver','start'
+				if foresteventrand <= 13:over = 11 & gt 'gameover'
+			end
+		elseif $ARGS[1] = 'swamp':
+			if pcs_bushcraft < 70 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
+				foresteventrand = rand(1,14)
+			else
+				foresteventrand = rand(1,13)
+			end
+			if foresteventrand <= 8:
+				bushcraft_exp += rand(1,3)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
+			elseif foresteventrand <= 13:
+				bushcraft_exp += rand(1,5)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
+				*nl
+				'You are successful in escaping the wolves, and also are no longer in the forest.'
+			elseif foresteventrand <= 14:
+				bushcraft_exp += rand(1,2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			end
+			act 'Continue':
+				if foresteventrand <= 4: gt 'gadforest','forest_edge'
+				if foresteventrand <= 6: gt 'gadforest','forest_outskirts'
+				if foresteventrand <= 8: gt 'gadforest','forest_center'
+				if foresteventrand <= 9: gt 'gadfield','field'
+				if foresteventrand <= 10: gt 'gadroad'
+				if foresteventrand <= 11: gt 'gadriver','start'
+				if foresteventrand <= 12: gt 'swamp_yard','start'
+				if foresteventrand <= 13: gt 'swamp_woods','start'
+				if foresteventrand <= 14:over = 11 & gt 'gameover'
+			end
+		end
+	end
+end
 
-			act 'Continue':gt $loc, $metka
+! this gs handles images for generic forest locations while lost
+! Example: gs 'gadforestlost', 'gadforestlost_picture'
+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:
+			'<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.'
+			'You would normally consider the woods a relaxing and scenic place, but are too stressed to appreciate the beauty of nature right now.'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_night0.'+rand(1,4)+'.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.'
+			'With nightfall, your chances of finding your way are practically nothing. You should stop and rest until daylight.'
+		end
+	else
+		if hour >= 8 and hour < 20:
+			'<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.'
+			'You would normally consider the woods a relaxing and scenic place, but are too stressed to appreciate the beauty of nature right now.'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_winter_night0.'+rand(1,4)+'.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.'
+			'With nightfall, your chances of finding your way are practically nothing. You should stop and rest until daylight.'
 		end
 	end
 end

+ 333 - 145
locations/gadhouse.qsrc

@@ -1,7 +1,7 @@
 # gadhouse
 
 !! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - START
-!! 
+!!
 !! Quest Variables - Grandma
 !! -------------------------
 !! grandmaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
@@ -38,16 +38,20 @@
 !! grandmaQW['last_day_talked']					The most recent day Sveta chatted with Grandma.
 !! grandmaQW['last_hour_talked']				The most recent hour Sveta chatted with Grandma. Checked against hour, allows for several chats through the day.
 !! grandmaQW['last_month_paid']					The most recent month Grandma paid Sveta for her help (i.e. was it the current month?)
-!! grandmaQW['nudity_trouble']					Semi-abstract representation of how annoyed Grandma is by Svetas exhibitionism. At 10 she reprimands Sveta (no effect).
+!! grandmaQW['nudity_trouble']					Semi-abstract representation of how annoyed Grandma is by Svetas exhibitionism. grandmaQW['nudity_trouble'] is subtracted from grandmaQW['help_amount'] and then reset to 0
+!! grandmaQW['nudity_trouble_limit']			Limit based on fame/reputation before Grandma reprimands Sveta about her behavior
+!! grandmaQW['nudity_trouble_base']				Base based on how many times Sveta has been reprimanded by Grandma about her behavior. Starts at 10. Goes up by 1 each time grandmaQW['nudity_trouble'] hits grandmaQW['nudity_trouble_limit']
+!! grandmaQW['block']							0/1 - has Sveta been caught sinning so much Grandma kicks her out
 !! grandmaQW['talked_about_gadukino']			0/1 - has Sveta asked Grandma about Gadukino? Makes the "Ask about Gadukino" option a one-time thing.
 !! grandmaQW['disappointment']					0/1 - marks if you failed a chore and Grandma is disappointed in you. Causes a lecture and -1 to help_amount
+!! grandmaQW['first_visit']						0/1 - triggers first converstion and gift from Grandma. Only get free money from Grandma once. Monthly payments are now only based on grandmaQW['help_amount']
+!!
+!! ------------------------------------------------------------------------
 !!
-!! ------------------------------------------------------------------------ 
-!! 
 !! Quest Variables - Grandpa
 !! -------------------------
 !! grandpaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
-!! 
+!!
 !! grandpaQW['chore_bale_hay']					0/1 - is the "bale hay in the field" quest active?
 !! grandpaQW['chore_bathe_horse']				0/1 - is the "bathe the horse in the river" quest active?
 !! grandpaQW['chore_bathe_horse_prog']			0/1/2 - progress of "bathe the horse in the river" quest
@@ -61,14 +65,14 @@
 !! grandpaQW['chore_herd_cattle_experience']	Has Sveta ever done the "herd cows in the field" quest before? (Practically useless, barely changes a couple of action descriptions.)
 !! grandpaQW['chore_lead_cow_to_field']			0/1 - is the "just take the cow to the field and drop it off there" quest active?
 !! grandpaQW['chore_lead_horse_to_field']		0/1 - is the "take the horse to the field" quest active?
-!! 
+!!
 !! grandpaQW['chore_gather_mushrooms']			0/1 - is the "gather mushrooms" quest active?
 !! grandpaQW['chore_gather_berries']			0/1 - is the "gather berries" quest active?
 !! grandpaQW['chore_gather_both']				0/1 - is the "gather mushrooms and berries" quest active?
 !! grandpaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandpa want?
 !! grandpaQW['chore_berry_quantity']			How many kg of berries does Grandpa want?
-!! 
-!! 
+!!
+!!
 !! Other Variables - Grandpa
 !! -------------------------
 !! grandpaQW['last_day_helped']					The most recent day Sveta asked Grandpa if she could help him with anything.
@@ -80,66 +84,209 @@
 !! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - END
 
 if $ARGS[0] = 'start':
+	*clr & cla
 	CLOSE ALL
 	$location_type = 'indoors'
 	$metka = 'start'
 	$loc = 'gadhouse'
 	$menu_loc = 'gadhouse'
 	$menu_arg = ''
-	menu_off = 0
+	menu_off = 1
 	$locclass = 'singleroom'
 	curr_home = 2
 	display_bb = 1
-	*clr & cla
 	frost = 0
-	mira_temp = rand(1,5)
+	mira_temp = rand(1,10)
 
-	if grandmaQW['last_month_paid'] ! month and hour >= 6 and hour < 22:
-		grandmaQW['last_month_paid'] = month
-		if grandmaQW['help_amount'] > 0: money += grandmaQW['help_amount'] * 50
-		money += 2000
-		minut += 10
+	gs 'gadhouse', 'nudity_trouble_limit'
 
+	!! Grandma sends Sveta back to Pavlovsk for school to start
+	if gadstay = 1 and (kanikuli = 4 or kanikuli = 5) and month = 8 and day >= 27 and hour >= 6 and hour < 20:
+		*clr & cla
+		minut += 5
+		money += 75
 		gs 'stat'
 
+		'<center><b><font color="maroon">Your grandmother</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
-		if gadstay = 0:
-			'Upon entering the house, you let out a screech as you catch sight of your grandmother, throwing yourself at her, wrapping your arms around her neck. She embraces you tightly. She starts by saying "Dear <<$pcs_nickname>>, you''re only skin and bones, but don''t worry, a few months here and you''ll be looking your usual self again ."'
-			'"But look at you, you sure have grown up. A young woman." she says proudly. She continues "Grandpa and I keep getting older and older and need some help around the house. What do you say youngling? You will not have to do much. Here''s the deal, you lend us a helping hand on the farm as much as possible, and we will pay you for each chore you do. It will be a great life lesson, you will learn about hard work. What do you say?"'
-			'"Of course I''ll help out, Grandma." you answer.'
-			'"I''m glad to hear that <<$pcs_nickname>>, here is little something upfront so you know we are serious," Grandma says and hands over <<2000 + grandmaQW[''help_amount''] * 50>>  rubels.'
-			'"Thanks Babushka!" you kiss her on the cheek before you head on out.'
-		else
-			'When you got out of bed, your grandmother called you over to her.'
-			'"I imagine you''ve spent all your allowance on sweets so lets see what we can do to give you some more pocket money, hmmmm?" she says as she opens her purse.'
-			if grandmaQW['help_amount'] > 0:
-				'"You were quite helpful over the last few weeks, so here''s <<2000 + grandmaQW[''help_amount''] * 50>> rubles." She starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
-			else
-				'"We really could have used your help last month," she says mournfully as she counts out some bills. "Maybe this month you''ll do more to help us?" She looks at you sternly as she hands you 2000 rubles.'
-			end
+		*nl
+		'"<<$pcs_firstname>>, your mother called, school is starting soon, and you have to head back to Pavlovsk to get ready."'
+		'"As much as we loved having you around and getting to see you more, this is it for now."'
+		'"You are always welcome to come and visit on weekends or breaks from school."'
+		'"And if you want to, you can always stay with us again next summer."'
+
+		if grandmaQW['help_amount'] > 0:
+			money += grandmaQW['help_amount']*25
 			gs 'stat'
+
+			'Before leaving your grandma hugs you and gives you <<grandmaQW[''help_amount'']*25>> rubles for your help with chores.'
+			grandmaQW['help_amount'] = 0
+		else
+			'Before leaving your grandma gives you a big hug goodbye.'
 		end
+
+		'As you turn to leave, she stops you, "One last thing, here are some rubles for the train ticket to get you back to Pavlovsk."'
+
+		act 'Leave': gadstay = 0 & gt 'gaddvor'
+	!! Returning home after being lost; no penalty for not doing chores or disappointing either grandparent
+	elseif lost_girl = 1 and hour >= 6 and hour < 20:
+		*clr & cla
+		lost_girl = 0
+		grandmaQW['disappointment'] = 0
+		grandpaQW['disappointment'] = 0
+		grandmaQW['last_day_helped'] = daystart
+		grandpaQW['last_day_helped'] = daystart
+		minut += 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/babushka.jpg"></center>'
+		*nl
+		'"<<$pcs_firstname>>, your grandfather and I were so worried when you didn''t come back home from the forest."'
+		'"We are so glad you are back safe and sound. Go have a hot meal and shower and relax."'
+		'"Also, don''t worry about any chores today or tomorrow, just focus on recovering."'
+
+		act 'Continue':gt 'gadhouse', 'main'
+	!!Grandma kicks Sveta out for being a whore
+	elseif grandmaQW['nudity_trouble_limit'] = 50 and hour >= 6 and hour < 20:
+		*clr & cla
 		grandmaQW['help_amount'] = 0
-		act 'Continue': gt 'gadhouse', 'start'
+		grandmaQW['block'] = 1
+		minut += 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+		*nl
+		'Your grandmother looks at you coldly from across the room. She is speaking softly but somehow that is more unnerving than normal, "I''ve been more than fair to you, <<$pcs_firstname>>, and given you more chances than maybe even your mother."'
+		'"If you won''t at least try to act like a decent lady around here, you are no longer welcome. Take your things and leave. Come back when you''ve learned at least some basic decency."'
+
+		act 'Leave': gadstay = 0 & gt 'gadukino'
+	!! Grandma scolding for being spotted nude around the village
+	elseif grandmaQW['nudity_trouble'] = grandmaQW['nudity_trouble_limit'] and hour >= 6 and hour < 20:
+		*clr & cla
+		if grandmaQW['nudity_trouble'] > grandmaQW['help_amount']:
+			grandmaQW['help_amount'] = 0
+		else
+			grandmaQW['help_amount'] = grandmaQW['help_amount'] - grandmaQW['nudity_trouble']
+		end
+		grandmaQW['nudity_trouble'] = 0
+		grandmaQW['nudity_trouble_base'] += 1
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/babushka.jpg"></center>'
+		*nl
+		'Suddenly your grandmother approaches you with disappointed look on her face. "I had higher expectations of you young lady! You should be ashamed of yourself running around outdoors without clothes. You have embarrassed me and your grandfather! Our friends have seen you around naked as have your grandfather and I, so don''t even try to hide it."'
+		'"This will be reflected in your allowance for your chores as well so don''t act all surprised at the beginning of the month either."'
+		'"Unlike you, we have to live in this village, and get along with the people in it. If you keep this up, I''ll be cutting your time here short and sending you back to your mother, and she can deal with your sinful behaviour. We better not hear anymore about this!" She then walks off before you can even respond.'
+
+		act 'Continue': gt 'gadhouse', 'main'
+	!!Grandpa is disappointed in you for failing to do a chore you promised
+	elseif grandpaQW['disappointment'] = 1 and hour >= 6 and hour < 20:
+		*clr & cla
+		grandpaQW['disappointment'] = 0
+		grandmaQW['help_amount'] -= 1
+		minut += 5
+		pcs_mood -= 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
+		*nl
+		'Your grandfather scowls at you as you walk by.'
+		'<br>"<<$pcs_firstname>>. I am disappointed in you," he says flatly.'
+		'"What? Why?" you ask, taken aback a bit by his demeanor.'
+		'"Yesterday I asked you to help me, and you agreed. And here we are, today, and I find that you did not."'
+		'"Oh n-no, Grandpa," you stutter, "I forgot all about it! I''m sorry!"'
+		'"Quiet, child. I wasn''t done speaking. You promised to help and did not, which means you lied."'
+		'<br>You stare at him, crestfallen.'
+		'<br>"And I don''t want your apologies. A <<$pcs_lastname>> keeps their word, or their word is worth nothing."'
+		'Your eyes tear up a bit as your grandfather berates you. "Yes, sir," you mumble quietly.'
+		'"I would rather you tell me flat-out if you do not want to help, <<$pcs_firstname>>. At least that makes you honest, even if lazy."'
+		'"Grandpa, I honestly just forg-" you begin, but he cuts you off.'
+		'"Hush, child. I don''t care for excuses. Now go on, some of us have work to do."'
+		'<br>You silently turn and walk away, feeling guilty.'
 
-	elseif mira_temp = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or miragopQW >= 10 or mirasex > 1):
+		act 'Continue':gt 'gadhouse', 'main'
+	!!Grandma is disappointed in you for failing to do a chore you promised
+	elseif grandmaQW['disappointment'] = 1 and hour >= 6 and hour < 20:
+		*clr & cla
+		grandmaQW['disappointment'] = 0
+		grandmaQW['help_amount'] -= 1
+		minut += 5
+		pcs_mood -= 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+		*nl
+		'Grandma frowns at you as you walk by. "<<$pcs_nickname>>, you said you would help me yesterday, and you did not."'
+		'You cringe a little as you remember what you told her you would do. "I''m sorry Grandma, I forgot all about it..."'
+		'"I am an old woman, child. It is difficult for me to do many of the things I once could. But I can still do them if I know I have to."'
+		'You look at the ground, feeling guilty, as she continues: "But it is even harder for me if I expected help and did not receive it."'
+		'"Sorry, Grandma," you mumble again.'
+		'She softens a little, finally. "It''s okay child," she says. "But it makes it harder for me to give you your allowance for sweets if you cannot follow through on your promises."'
+		'"Yes, ma''am," you nod.'
+		'"All right child," she says, patting your shoulder softly. "Go on now, I am sure you have things to do."'
+
+		act 'Continue':gt 'gadhouse', 'main'
+	elseif grandmaQW['first_visit'] = 0 and hour >= 6 and hour < 20:
+		*clr & cla
+		grandmaQW['first_visit'] = 1
+		money += 3000
+		minut += 5
+		pcs_mood += 10
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
+		*nl
+		'Upon entering the house, you let out a screech as you catch sight of your grandmother, throwing yourself at her, wrapping your arms around her neck. She embraces you tightly. She starts by saying "Dear <<$pcs_nickname>>, you''re only skin and bones, but don''t worry, a few months here and you''ll be looking your usual self again ."'
+		'"But look at you, you sure have grown up. A young woman." she says proudly. She continues "Grandpa and I keep getting older and older and need some help around the house. What do you say youngling? You will not have to do much. Here''s the deal, you lend us a helping hand on the farm as much as possible, and we will pay you for each chore you do. It will be a great life lesson, you will learn about hard work. What do you say?"'
+		'"Of course I''ll help out, Grandma." you answer.'
+		'"I''m glad to hear that <<$pcs_nickname>>, here is little something anyways just for visiting," Grandma says and gives you 3000 rubles.'
+		'"Thanks Babushka!" you kiss her on the cheek before you head on out.'
+
+		if (kanikuli = 4 or kanikuli = 5) and ((month = 6 or month = 7) or (month = 8 and day <= 25)):
+			'"Will you be staying with us during the summer or will you be traveling back and forth with your parents?" she asks.'
+
+			act 'Stay with your grandaparents':gadstay = 1 & gt 'gadhouse', 'main'
+			act 'Stay in Pavlovsk':gadstay = 0 & gt 'gadhouse', 'main'
+		else
+			act 'Continue':gt 'gadhouse', 'main'
+		end
+	elseif grandmaQW['last_month_paid'] ! month and hour >= 6 and hour < 20:
+		*clr & cla
+		grandmaQW['last_month_paid'] = month
+		if grandmaQW['help_amount'] > 0: money += (grandmaQW['help_amount'] * 25)
+		minut += 5
+		pcs_mood += 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
+		*nl
+		'Your grandmother calls you over to her, "I imagine you''ve spent all your allowance so lets see what we can do to give you some more pocket money, hmmmm?" she says as she opens her purse.'
+		if grandmaQW['help_amount'] > 0:
+			'"You were quite helpful over the last few weeks, so here''s <<grandmaQW[''help_amount''] * 25>> rubles." She starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
+			grandmaQW['help_amount'] = 0
+		else
+			'"We really could have used your help last month," she says mournfully as she counts out some bills. "Maybe this month you''ll do more to help us?" She looks at you sternly as she puts her purse away.'
+		end
+
+		act 'Continue': gt 'gadhouse', 'main'
+	elseif mira_temp = 1 and MiraLoc = 0 and hour >= 8 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1):
 		*clr & cla
 		mira_guestday = daystart
 		minut += 5
 		mira_guest = 1
+		MiraLoc = 6
 		gs 'stat'
 
 		gs 'miroslava', 'miraclothes'
+		*nl
 		'You notice Mira coming towards your grandparents home.'
 		'You step out on the porch and greet Mira. She replies "Hi <<$pcs_nickname>>, I was really bored being all alone at home. Do you want to do something?"'
 
-		act 'Continue':gt 'gadhouse', 'start'
-
+		act 'Continue':gt 'gadhouse', 'main'
 	else
 		gt 'gadhouse', 'main'
 	end
 end
-	!125e
+
 if $ARGS[0] = 'main':
 	$metkaM = 'main'
 	$locM = 'gadhouse'
@@ -151,11 +298,10 @@ if $ARGS[0] = 'main':
 	gs 'stat'
 	'<center><H4>Your Grandparents'' Cottage</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
+	*nl
 	'A fairly simple cottage in the village of Gadukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gad = 1 & gt ''bed'', ''start''">bed</a> where you can rest. The bed is more comfortable than it looks.'
 	'There is an old <a href="exec:gt ''TV'',''gad''">television</a> in the living room. It''s positioned next to a body length <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
 	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight>> kg<br>Your body mass index (BMI) is <<bmi_calc>>.<br><<$bmi_desc>></center>''">scales</a>.'
-	*nl
-	'You can access your <a href="exec:gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	if hour < 8:
 		temp = rand(0,9)
@@ -182,7 +328,6 @@ if $ARGS[0] = 'main':
 		if temp = 1:'In a box filled with scraps of cloth, <a href="exec: gt ''gadhouse'',''villagecat''">Boniface</a> is curled up sleeping peacefully.'
 	end
 
-
 	if hour >= 6 and hour < 8:
 		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is puttering around in the kitchen, making breakfast.'
 		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> is sitting at the kitchen table, drinking a black cup of coffee.'
@@ -224,16 +369,11 @@ if $ARGS[0] = 'main':
 	gs 'zz_family', 'father_sheduler'
 	if $father['location'] = $curloc and home_owned[2] = 1:
 		'Your parents room.'
-		gs 'gadukino_event', 'go_home'
+		gs 'gadhouse', 'go_home'
 	end
 	}
-	if week = 6 and hour > 12 and family_trip_month ! month: indorf = 1
-
-	if indorf = 1:
-		'Your parents are relaxing inside.'
 
-		if staygad ! daystart and home_owned[2] = 1: gs 'gadukino_event', 'go_home'
-	end
+	gs 'gadhouse', 'family_trip'
 
 	if $clothingworntype ! 'nude':
 		act 'Go outside':minut += 1 & gt 'gaddvor'
@@ -243,7 +383,7 @@ if $ARGS[0] = 'main':
 			menu_off = 1
 			minut += 1
 			inhib_exp += rand(0,2)
-			grandmaQW['nudity_trouble'] += rand(1,3)
+			grandmaQW['nudity_trouble'] += rand(0,2)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the house like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
@@ -256,8 +396,8 @@ if $ARGS[0] = 'main':
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			inhib_exp += rand(0,2)
-			grandmaQW['nudity_trouble'] += rand(1,3)
+			inhib_exp += rand(0,1)
+			grandmaQW['nudity_trouble'] += rand(0,1)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flashlite', 10, 'exhibitionism'
 			gs 'arousal', 'end'
@@ -275,7 +415,7 @@ if $ARGS[0] = 'main':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
 			'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
-			
+
 			act 'Continue':gt 'gadhouse', 'start'
 		end
 	end
@@ -289,7 +429,7 @@ if $ARGS[0] = 'main':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
 			'You pick up your grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
-			
+
 			act 'Hang the laundry':
 				*clr & cla
 				minut += 10
@@ -298,10 +438,10 @@ if $ARGS[0] = 'main':
 				'Once you are done with the washing, you walk over to the clothesline where you carefully hang the clothes to dry.'
 
 				act 'Continue':gt'gaddvor'
-			end    
+			end
 		end
 	end
-	
+
 	if (hour >= 6 and hour < 10) or (hour >= 12 and hour < 20): act 'Talk to Grandma':gt 'gadhouse','grandma'
 	if (hour >= 6 and hour < 13) or (hour >= 15 and hour < 20): act 'Talk to Grandpa':gt 'gadhouse','grandpa'
 	act 'Prepare a full meal (0:30)':gs 'food', 'm_meal'
@@ -367,30 +507,6 @@ if $ARGS[0] = 'main':
 end
 
 if $ARGS[0] = 'grandma':
-	!!Grandma is disappointed in you for failing to do a chore you promised
-	if grandmaQW['disappointment'] = 1:
-		*clr & cla
-		menu_off = 1
-		minut += 5
-		gs 'stat'
-		grandmaQW['disappointment'] = 0
-		grandmaQW['help_amount'] -= 1
-		pcs_mood -= 5
-		
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
-		'Grandma frowns at you as you approach her. "<<$pcs_nickname>>, you said you would help me yesterday, and you did not."'
-		'You cringe a little as you remember what you told her you would do. "I''m sorry Grandma, I forgot all about it..."'
-		'"I am an old woman, child. It is difficult for me to do many of the things I once could. But I can still do them if I know I have to."'
-		'You look at the ground, feeling guilty, as she continues: "But it is even harder for me if I expected help and did not receive it."'
-		'"Sorry, Grandma," you mumble again.'
-		'She softens a little, finally. "It''s okay child," she says. "But it makes it harder for me to give you your allowance for sweets if you cannot follow through on your promises."'
-		'"Yes, ma''am," you nod.'
-		'"All right child," she says, patting your shoulder softly. "Go on now, I am sure you have things to do."'
-		
-		act 'Continue':gt 'gadhouse', 'start'
-		exit
-	end
-	
 	*clr & cla
 	menu_off = 1
 	minut += 2
@@ -428,7 +544,7 @@ if $ARGS[0] = 'grandma':
 						*clr & cla
 						minut += 15
 						gs'stat'
-						
+
 						grandmaQW['chore_can_mushrooms'] = 0
 						grandmaQW['help_amount'] += 2
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
@@ -471,7 +587,7 @@ if $ARGS[0] = 'grandma':
 				end
 			end
 		end
-		
+
 		if grandmaQW['chore_can_veggies'] = 1:
 			act 'Help Grandma can veggies (3:00)':
 				*clr & cla
@@ -505,7 +621,7 @@ if $ARGS[0] = 'grandma':
 			end
 		end
 
-		
+
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
 
 	!! ask for chore from Grandma
@@ -520,16 +636,16 @@ if $ARGS[0] = 'grandma':
 				minut += 2
 				grandmaQW['chore_clean_floor'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'"Grandma, the floors are all clean!" you say proudly.'
 				'"Thank you child," your grandmother says, "You have saved my hands and knees a great deal of aching."'
 				'You give her a warm smile and continue on with your day.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_wash_clothes'] = 2:
 			act 'Tell her you washed the clothes':
 				*clr & cla
@@ -542,11 +658,11 @@ if $ARGS[0] = 'grandma':
 				'"Grandma, I finished washing Grandpa''s dirty clothes," you tell her.'
 				'"Thank you <<$pcs_nickname>>. I have no idea how that man gets so dirty!"'
 				'You and your grandmother share a laugh, and you give her a hug before moving on.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_milk_cow'] = 2:
 			act 'Tell her you milked the cow':
 				*clr & cla
@@ -560,11 +676,11 @@ if $ARGS[0] = 'grandma':
 				'"Thank you <<$pcs_nickname>>. She''s such a sweet thing, isn''t she?" your grandmother asks fondly.'
 				'"Um, yes, she is very nice for a cow," you say, smiling. "She''s the nicest cow I know."'
 				'Grandma nods sagely at that, and you grin and continue on with your day.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_groceries'] = 2:
 			act 'Give her the groceries':
 				*clr & cla
@@ -581,11 +697,11 @@ if $ARGS[0] = 'grandma':
 				'You lug the bags into the kitchen and heft them up on the table, before coming back to Grandma.'
 				'"Anything else you need, Grandma?" you ask.'
 				'"No, that is all, <<$pcs_nickname>>," she says, and gives you a gentle pat on the back.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_feed_chickens'] = 2:
 			act 'Tell her you fed the chickens':
 				*clr & cla
@@ -599,11 +715,11 @@ if $ARGS[0] = 'grandma':
 				'"Good, thank you, <<$pcs_nickname>>," she says. "A fat chicken is a happy chicken, and happy chickens lay the best eggs."'
 				'She nods to herself as if she had said something very wise.'
 				'"Um, well, I''m happy to help, Grandma," you say, and give her a quick hug.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_work_in_garden'] = 2:
 			act 'Tell her you worked in the garden':
 				*clr & cla
@@ -630,11 +746,11 @@ if $ARGS[0] = 'grandma':
 				'You grin to yourself, thinking of how <<$npc_nickname[''A29'']>> must have been at your age.'
 				'"Anyway," she continues, "thank you for doing that for me, <<$pcs_nickname>>. My old bones complain when I do it."'
 				'She gives you a peck on the cheek and sends you on your way.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_water_garden'] = 2:
 			act 'Tell her you watered the garden':
 				*clr & cla
@@ -648,11 +764,11 @@ if $ARGS[0] = 'grandma':
 				'"Thank you, <<$pcs_nickname>>," she says. "A healthy plant is always thirsty. You should have some water too, if you want to be a healthy girl."'
 				'"Maybe I will. Is there anything else you need?"'
 				'"No, sweet child. That is enough for today," she says, and gives you a gentle pat on the arm.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_collect_strawberries'] = 2:
 			act 'Give her the strawberries you picked':
 				*clr & cla
@@ -668,11 +784,11 @@ if $ARGS[0] = 'grandma':
 				'You smile and say, "They taste pretty good too!"'
 				'Your grandmother gives you a rueful look and says, "I don''t remember asking you to eat the strawberries, child."'
 				'She cannot hold the charade, though, and breaks into a smile. "I never could resist eating a few fresh off the plant either."'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_collect_fruit'] = 2:
 			act 'Give her the fruit you collected':
 				*clr & cla
@@ -686,11 +802,11 @@ if $ARGS[0] = 'grandma':
 				'"I gathered all the fruits I could reach," you say.'
 				'"Thank you, <<$pcs_nickname>>," she says. "I cannot reach or bend like I used to, so you have done me a great favor."'
 				'You smile and hug your grandmother, and go on about your day.'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_harvest_garden'] = 2:
 			act 'Give her the vegetables from the garden':
 				*clr & cla
@@ -708,11 +824,11 @@ if $ARGS[0] = 'grandma':
 				'"Oh don''t worry yourself, little <<$pcs_nickname>>," she says, cupping your cheek with her hand. "Forgive an old woman of her wistful ways. We are lucky to have such a kind granddaughter to help us bring in the harvest."'
 				'You place your youthful hand over her wizened old one and smile at her. "I am happy to help, Grandma. Is there anything else you need?"'
 				'"No, child, you have done more than your fair share today. Soon we will have to preserve these vegetables to keep them from spoiling, but for now you can rest."'
-				
+
 				act 'Continue': gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_gather_mushrooms'] = 2 and boletus >= grandmaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 20:
 			act 'Give Grandma the mushrooms she asked for':
 				*clr & cla
@@ -731,11 +847,11 @@ if $ARGS[0] = 'grandma':
 				'"I can get more, if you want me to."'
 				'"No need for that, little one," she clucks. "You''ve done enough for one day."'
 				'You give her a quick hug in response, and carry on.'
-				
+
 				act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'grandma'
 			end
 		end
-		
+
 		if grandmaQW['chore_gather_berries'] = 2 and bilberry >= grandmaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
 			act 'Give Grandma the berries she asked for':
 				*clr & cla
@@ -810,7 +926,7 @@ if $ARGS[0] = 'grandma':
 				act 'Continue':gt 'gadhouse', 'grandma'
 			end
 		end
-		!125e
+
 		if hour >= grandmaQW['last_hour_talked'] + 3:
 			act 'Chat with your grandmother (0:10)':
 				*clr & cla
@@ -897,35 +1013,6 @@ if $ARGS[0] = 'grandma':
 end
 
 if $ARGS[0]='grandpa':
-
-	!!Grandpa is disappointed in you for failing to do a chore you promised
-	if grandpaQW['disappointment'] = 1:
-		*clr & cla
-		menu_off = 1
-		minut += 5
-		gs 'stat'
-		grandpaQW['disappointment'] = 0
-		grandmaQW['help_amount'] -= 1
-		pcs_mood -= 5
-		
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
-		'Your grandfather scowls at you as you approach him.'
-		'<br>"<<$pcs_firstname>>. I am disappointed in you," he says flatly.'
-		'"What? Why?" you ask, taken aback a bit by his demeanor.'
-		'"Yesterday I asked you to help me, and you agreed. And here we are, today, and I find that you did not."'
-		'"Oh n-no, Grandpa," you stutter, "I forgot all about it! I''m sorry!"'
-		'"Quiet, child. I wasn''t done speaking. You promised to help and did not, which means you lied."'
-		'<br>You stare at him, crestfallen.'
-		'<br>"And I don''t want your apologies. A <<$pcs_lastname>> keeps their word, or their word is worth nothing."'
-		'Your eyes tear up a bit as your grandfather berates you. "Yes, sir," you mumble quietly.'
-		'"I would rather you tell me flat-out if you do not want to help, <<$pcs_firstname>>. At least that makes you honest, even if lazy."'
-		'"Grandpa, I honestly just forg-" you begin, but he cuts you off.'
-		'"Hush, child. I don''t care for excuses. Now go on, some of us have work to do."'
-		'<br>You silently turn and walk away, feeling guilty.'
-		
-		act 'Continue':gt 'gadhouse', 'start'
-		exit
-	end
 	*clr & cla
 	menu_off = 1
 	minut += 2
@@ -941,7 +1028,7 @@ if $ARGS[0]='grandpa':
 		act 'Maybe you should get dressed before talking to him':gt 'gadhouse', 'start'
 	else
 		act 'Leave him alone':gt 'gadhouse', 'start'
-		
+
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 
 		if grandpaQW['chore_gather_mushrooms'] = 1:
@@ -964,7 +1051,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_fetch_firewood'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"I''ve brought in some firewood, Grandpa," you say to your grandfather.'
 				'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "Just set down it over there."'
@@ -982,7 +1069,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_feed_horse'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"I fed the horse, Grandpa."'
 				'"Thank you <<$pcs_nickname>>," he says. "It is very important to make sure a horse is well fed. They are hard workers and deserve their meals."'
@@ -1001,7 +1088,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_feed_cow'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'You tell your grandfather, "I fed Dawn her hay, Grandpa."'
 				'"Very good, <<$pcs_nickname>>," he says. "I presume she acted like we were starving her to death?"'
@@ -1019,7 +1106,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_clean_yard'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"I finished cleaning the yard, Grandpa," you say as you stretch your sore arms.'
 				'"Very good," he says. "It is more work than it seems, isn''t it?"'
@@ -1037,7 +1124,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_brush_horse'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"I brushed the horse, Grandpa," you tell your grandfather.'
 				'"You scrubbed him down with the curry brush?" he asks.'
@@ -1063,7 +1150,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_feed_boar'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'You walk up to your grandfather and tell him, "I fed the pig, Grandpa."'
 				'"Thank you <<$pcs_nickname>>," he says.'
@@ -1081,7 +1168,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_lead_horse_to_field'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"Hey Grandpa, I took Desperado out to the field."'
 				'"Good, good," he says. "Horses need freedom to run."'
@@ -1099,7 +1186,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_lead_cow_to_field'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"Hi Grandpa!" you say. "I took Dawn out to the field."'
 				'"Were the others there?" he asks.'
@@ -1121,7 +1208,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_bathe_horse'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'You walk up to your grandfather and tell him, "I gave Desperado a bath in the river, Grandpa."'
 				'"Thank you <<$pcs_nickname>>," he says. "Grooming him is all well and good, but sometimes it''s not enough."'
@@ -1152,7 +1239,7 @@ if $ARGS[0]='grandpa':
 				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
 			end
 		end
-		
+
 		if grandpaQW['chore_gather_berries'] = 2 and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
 			act 'Give him the berries he asked for':
 				*clr & cla
@@ -1195,7 +1282,7 @@ if $ARGS[0]='grandpa':
 				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
 			end
 		end
-		
+
 		if grandpaQW['chore_bale_hay'] = 2:
 			act 'Tell him you helped the townspeople bale hay':
 				*clr & cla
@@ -1203,7 +1290,7 @@ if $ARGS[0]='grandpa':
 				minut += 5
 				grandpaQW['chore_bale_hay'] = 0
 				gs 'stat'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'"I spent all day helping with the hay, Grandpa," you tell him, stretching your sore muscles.'
 				'He smiles proudly at you and says, "Yes, I was there too, <<$pcs_nickname>>. I saw you working hard."'
@@ -1311,6 +1398,107 @@ if $ARGS[0]='villagecat':
 	end
 end
 
+if $ARGS[0] = 'nudity_trouble_limit':
+	if grandmaQW['nudity_trouble_base'] = 0 or grandmaQW['nudity_trouble_limit'] = 0:
+		grandmaQW['nudity_trouble_base'] = 10
+		grandmaQW['nudity_trouble_limit'] = grandmaQW['nudity_trouble_base']
+	else
+		grandmaQW['nudity_trouble_limit'] = grandmaQW['nudity_trouble_base']
+	end
+
+	if SchoolBlock = 1: grandmaQW['nudity_trouble_limit'] += 5
+	if momKnowsKolka = 1: grandmaQW['nudity_trouble_limit'] += 10
+	if momKnowsVladimir = 1: grandmaQW['nudity_trouble_limit'] += 10
+	if momslut < 2:
+		if motherKnowWhore > 0: grandmaQW['nudity_trouble_limit'] += 3
+		if motherKnowSpravka > 0: grandmaQW['nudity_trouble_limit'] += 2
+	end
+	if brotherSex < 6:
+		if brotherknowslut > 1: grandmaQW['nudity_trouble_limit'] += 3
+		if brotherknowslut > 0: grandmaQW['nudity_trouble_limit'] += 2
+	end
+	if sisterQW['roma3block'] = 1:
+		if sisterknowslut > 1 and sisboypartyQW > 1: grandmaQW['nudity_trouble_limit'] += 3
+		if sisterknowslut > 0: grandmaQW['nudity_trouble_limit'] += 2
+	end
+	if gadriver_gang = 2:
+		grandmaQW['nudity_trouble_limit'] += 5
+	else
+		if npc_QW['A63'] >= 11: grandmaQW['nudity_trouble_limit'] += 3
+		if npc_QW['A60'] >= 15: grandmaQW['nudity_trouble_limit'] += 2
+	end
+end
+
+if $ARGS[0] = 'family_trip':
+	! family comes to visit first weekend of each month from Saturday at 1200 to Sunday at 2100
+	if week = 6 and hour > 12 and family_trip_month ! month: indorf = 1
+
+	if indorf = 1:
+		'Your parents are relaxing inside.'
+
+		if gadstay_day ! daystart and home_owned[2] = 1:
+			if week = 7:
+				if hour = 20:
+					family_trip_month = month
+					if (kanikuli = 4 or kanikuli = 5) and ((month = 6 or month = 7) or (month = 8 and day <= 25)):
+						*clr & cla
+						menu_off = 1
+						'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+						*nl
+						'<<$npc_nickname[''A29'']>> asks you "Well, <<$pcs_nickname>>, are you coming home with us or are you going to stay in the village with your grandparents?"'
+
+						act 'Stay with your grandaparents':gadstay_day = daystart & gadstay = 1 & indorf = 0 & gt 'gadhouse', 'main'
+						act 'Go home to Pavlovsk': gt 'gadhouse', 'to_pavlovsk'
+					else
+						act 'Go home to Pavlovsk': gt 'gadhouse', 'to_pavlovsk'
+					end
+				elseif hour > 20:
+					family_trip_month = month
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'to_pavlovsk':
+	menu_off = 1
+	*clr & cla
+	gadstay = 0
+	indorf = 0
+	minut += rand(15,25)
+	gs 'stat'
+
+	'<center><b><font color="maroon">Your grandmother</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
+	*nl
+	if grandmaQW['help_amount'] > 0:
+		money += grandmaQW['help_amount']*25
+		gs 'stat'
+
+		'Before leaving your grandma hugs you and gives you <<grandmaQW[''help_amount'']*25>> rubles for your help with chores.'
+		grandmaQW['help_amount'] = 0
+	else
+		'Before leaving your grandma gives you a big hug goodbye.'
+	end
+
+	'You get into the Lada with the rest of your family and before you know it, you''ve arrived back in Pavlovsk.'
+
+	act 'Go to your room': gt 'bedrPar'
+end
+
+if $ARGS[0] = 'to_gadukino':
+	menu_off = 1
+	*clr & cla
+	indorf = 1
+	minut += rand(15,25)
+	gs 'stat'
+
+	'You get into the Lada with the rest of your family and before you know it, you''ve arrived in Gadukino.'
+
+	act 'Go to your grandparents house': gt 'gadhouse', 'start'
+end
+
 if $ARGS[0] = 'intro':
 	cla & *clr
 	$metka = ''

+ 47 - 47
locations/gadprostitutes.qsrc

@@ -12,19 +12,19 @@ if $ARGS[0] = 'start':
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 	gs'stat'
-	
+
 	*clr & cla
-	
+
 	'<center><h4>Main Road near Gadukino</h4></center>'
 	if month >= 11 or month <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/highway/roadwinter.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/highway/road.jpg"></center>'
 	end
-	
+
 	if MiraLoc ! 8 and npc_QW['A60'] > 15 and hour >= 16 and hour <= 19: MiraLoc = 8
 	if MiraLoc ! 8 and npc_QW['A60'] > 15: 'You look around for Mira but don''t see her here. She must be doing something else right now.'
-	!if gadriver_gang = 2:
+	!if gadriver_gang = 2 and (mirapimp = 0 or mirapimp = 2):
 	!	if PCloStyle <> 4:
 	!		'You are not wearing the right clothes to prostitute yourself.'
 	!	elseif pcs_sleep <= 0:
@@ -35,13 +35,13 @@ if $ARGS[0] = 'start':
 		! event to remove Sveta from being miras pimp if she becomes the boys slut, the village whore
 		if MiraLoc = 8 and mirapimp = 1 and (npc_QW['A63'] >= 10 or gadriver_gang = 2):
 			*clr & cla
-			
-			mirapimp = 0
+
+			mirapimp = 2
 			minut += 5
 			gs 'stat'
-			
+
 			gs 'miroslava', 'miraclothes'
-			
+
 			'Mira spots you and confidently walks up to you. You''re not sure what has gotten into her but from the look on her face you probably won''t like it.'
 			'As soon as you are face to face with Mira she winds up and smacks you across the face as hard as she can. You are stunned a bit by and stagger to the ground. You feel warm tears begin to run down your face.'
 			'Mira commands you, "Stand up bitch!"'
@@ -53,7 +53,7 @@ if $ARGS[0] = 'start':
 			end
 			'After Mira is done with her preaching, you try to think of something witty to say or raise your hand to slap her back, but you just can''t bring yourself to do it.'
 			'Mira sees the defeated look in your eyes and knows that she has won. She pulls you into an embrace and whispers, "It''s alright <<$pcs_nickname>>. We can just be friends again. And if you want to, maybe you can come work with me instead?"'
-			
+
 			act 'Continue':gt 'gadprostitutes','start'
 		else
 			act 'Walk back to the highway': nroad = 10 & gt 'road'
@@ -65,15 +65,15 @@ if $ARGS[0] = 'start':
 					if will_cost <= pcs_willpwr:
 						act 'Make Mira your prostitute (<<will_cost>> Willpower)':
 							*clr & cla
-							
+
 							mirapimp = 1
 							minut += 5
 							gs 'willpower', 'misc', 'force', 'hard'
 							gs 'willpower', 'pay', 'force'
 							gs 'stat'
-							
+
 							gs 'miroslava', 'miraclothes'
-							
+
 							'You call her over to you. Mira, hurries over and looks at you with downcast eyes.  "Hi, <<$pcs_nickname>>.  You having a good night?"'
 							'You look at her angrily. "A better question, my lovely whore, is ''Are you having a good night''?  I want 500 <b>₽</b> per customer you have each night."  You tell her earnestly.'
 							'Mira looks up in shock and with a hurt look on her face.  "What are you talking about?  Do you think I am a hooker?"'
@@ -81,7 +81,7 @@ if $ARGS[0] = 'start':
 							'Mira nods and she wipes away tears.'
 							'You reach down and help her back to her feet.  You brush her off and help her fix her makeup.  "Good, now get that cute ass back out on that road and earn us some money."'
 							'You give Mira a little slap on the ass and smile as you watch Mira start a new chapter of her life as your prostitute.'
-							
+
 							act 'Finish':gt'gadprostitutes','start'
 						end
 					else
@@ -91,12 +91,12 @@ if $ARGS[0] = 'start':
 				! events to prostitute just Mira
 				act 'Watch Mira prostitute herself': gt 'gadprostitutes', 'just_mira'
 				! can do prostitution with Mira if Sveta is the village whore - this can be achieved by doing Mitka''s questline
-				!if gadriver_gang = 2 and mirapimp = 0 and PCloStyle = 4 and pcs_sleep > 0:
+				!if gadriver_gang = 2 and (mirapimp = 0 or mirapimp = 2) and PCloStyle = 4 and pcs_sleep > 0:
 					! act 'Prostitute yourself with Mira':gt 'gadprostitutes', 'with_mira'
 				!end
 			end
 			! can do prostitution without Mira if Sveta is the village whore - this can be achieved by doing Mitka''s questline
-			!if gadriver_gang = 2 and PCloStyle = 4 and pcs_sleep > 0:
+			!if gadriver_gang = 2 and (mirapimp = 0 or mirapimp = 2) and PCloStyle = 4 and pcs_sleep > 0:
 			!	act 'Prostitute yourself':gt 'gadprostitutes', 'without_mira'
 			!end
 		end
@@ -109,61 +109,61 @@ end
 ! Prostitution events for just Mira - SM
 if $ARGS[0] = 'just_mira':
 	gs 'miroslava', 'miraclothes'
-	
-	if hour >= 16 and hour <= 23:		
+
+	if hour >= 16 and hour <= 23:
 		act 'Leave Mira to her work': gt 'gadprostitutes', 'start'
 		act 'Wait for Mira to attract a customer':
 			*clr & cla
 			minut += 30
 			gs 'stat'
-			
+
 			temp_gadpro = rand(1,10)
 			if temp_gadpro > 5:
 				miraprost += 1
-				if npc_QW['A60'] < 20: npc_QW['A60'] += 1 
-				
+				if npc_QW['A60'] < 20: npc_QW['A60'] += 1
+
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/miraprost.jpg"></center>'
-				
+
 				'It isn''t long before a customer pulls up in a nice vehicle. Mira approaches the vehicle and starts talking to the driver.'
 				'You can''t hear what she is saying but after only a few minutes the door opens and Mira steps into the vehicle. It pulls away, but doesn''t go far. You see it pull off the main road and head down a dirt road. Smiling and wanting to see the action, you run into the woods trying to head off the vehicle.'
-				
+
 				act 'Watch Mira and the customer':
-					
+
 					temp_gadpro = rand(0,1)
 					if temp_gadpro = 0:
 						*clr & cla
 						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 						gs 'stat'
-						
+
 						'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1.mp4"></video></center>'
-						
+
 						'You walk up and look into the car. You see Mira giving one hell of a blowjob to her customer. Her head is bobbing up and down on his cock.'
-						
+
 						act 'Hide':
 							*clr & cla
 							gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 							gs 'stat'
-							
+
 							'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_1.mp4"></video></center>'
-							
+
 							'You duck for cover as the guy suddenly gets out of the car and opens the passenger door, grabs Mira''s head and starts forcing his cock deep into her throat.'
-							
+
 							act 'Keep watching':
 								*clr & cla
 								gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 								gs 'stat'
-								
+
 								'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_2.mp4"></video></center>'
 								'Eventually, the guy grunts and cums all over Mira''s face and into her mouth. The nicely dressed man pulls Mira out of the car, hands her a few bills and then drives off.'
 								'Mira walks back towards the road counting the money he gave her as she absentmindedly licks the cum as it drips down her face. She smiles at you and shows you the money as you join her.'
 								gs 'stat'
-								
+
 								act 'Finish':
 									*clr & cla
-									if mirapimp = 1: money += 500
+									if mirapimp = 1: money += 200
 									gs 'arousal', 'end'
 									gs 'stat'
-									
+
 									gt 'gadprostitutes', 'just_mira'
 								end
 							end
@@ -172,35 +172,35 @@ if $ARGS[0] = 'just_mira':
 						*clr & cla
 						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 						gs 'stat'
-						
+
 						'<center><video autoplay loop src="images/characters/village/mira/miraprost2.mp4"></video></center>'
 						'You walk up and look into the van. You see Mira showing her customer her tits and rubbing her pussy. You see a hungry gleam in the guy''s eyes, which Mira returns right back.'
-						
+
 						act 'Keep watching':
 							*clr & cla
 							gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 							gs 'stat'
-							
+
 							'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
-							
+
 							'Mira and the guy jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the guy is hitting or entering her cervix.'
-							
+
 							act 'Hide':
 								*clr & cla
 								gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 								gs 'stat'
-								
+
 								'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_2.mp4"></video></center>'
-								
+
 								'You have to duck behind some bushes as they move outside the van. The guy continues to pound into Mira''s pussy until he cums...and cums...and cums. '
 								'After the wild sex, Mira and the guy sit in the van and talk for a bit. He gives her a nice wad of cash and she starts walking back towards the road. She smiles at you and shows you the money as you join her.'
-								
+
 								act 'Finish':
 									*clr & cla
-									if mirapimp = 1: money += 500
+									if mirapimp = 1: money += 200
 									gs 'arousal', 'end'
 									gs 'stat'
-									
+
 									gt 'gadprostitutes', 'just_mira'
 								end
 							end
@@ -209,9 +209,9 @@ if $ARGS[0] = 'just_mira':
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
-				
+
 				'Mira walks along the road showing off her body to passing car and trucks, but no one stops to pick her up.'
-				
+
 				act 'Continue' :gt 'gadprostitutes', 'just_mira'
 			end
 		end
@@ -226,7 +226,7 @@ end
 !	if pcs_sleep <= 0: 'You are too tired to prostitute yourself.'
 !	if pcs_sleep > 0:
 !		act 'Try to attract a customer with Mira':
-!	
+!
 !		end
 !	end
 !	act 'Stop looking for customers with Mira': gt 'gadprostitutes', 'start'
@@ -237,7 +237,7 @@ end
 !	if pcs_sleep <= 0: 'You are too tired to prostitute yourself.'
 !	if pcs_sleep > 0:
 !		act 'Try to attract a customer':
-!			
+!
 !		end
 !	end
 !

+ 34 - 32
locations/gadriver.qsrc

@@ -204,9 +204,9 @@ if $ARGS[0] = 'gadbitch':
 			gt 'gadriver', 'start'
 		end
 	end
-	
+
 	if ARRSIZE('swimwear') > 0: act 'Get changed':gt 'changingroom', 'view_swim_list'
-	
+
 	if $clothingworntype = 'nude':
 		act 'Get dressed':
 			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
@@ -217,7 +217,7 @@ if $ARGS[0] = 'gadbitch':
 				act 'Continue': gt 'gadriver', 'gadbitch'
 		end
 	end
-	
+
 	if temper >= 15 and month >= 5 and month <= 9:
 		temp_gr = rand(0,9)
 		if $clothingworntype ! 'nude' and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
@@ -501,14 +501,14 @@ if $ARGS[0] = 'gadbitch':
 		if grandpaQW['chore_bathe_horse_prog'] = 1:
 			act 'Look at Desperado':
 				*clr & cla
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/horse_river.jpg"></center>'
 				'You see Desperado happily walking around in the river.'
-				
+
 				if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 					act 'Wash Desperado':
 						*clr & cla
-						
+
 						cumspclnt = 4
 						gs 'cum_cleanup'
 						minut += 30
@@ -518,7 +518,7 @@ if $ARGS[0] = 'gadbitch':
 						hndiwrk_exp += rand(1,3)
 						grandpaQW['chore_bathe_horse_prog'] = 2
 						gs 'stat'
-						
+
 						if $clothingworntype = 'nude':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_nude.jpg"></center>'
 						elseif $clothingworntype = 'swimwear':
@@ -527,7 +527,7 @@ if $ARGS[0] = 'gadbitch':
 						'You jump in the river and swim over to Desperado. You take your time, washing his beautiful chestnut coat.'
 						'After half an hour, you are satisfied with your work and Desperado is ready to be taken back home.'
 						if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-						
+
 						act 'Get out of the water':
 							minut += 5
 							gt'gadriver', 'gadbitch'
@@ -536,7 +536,7 @@ if $ARGS[0] = 'gadbitch':
 					if Mira_Loc = 1 and npc_rel['A60'] > 0:
 						act 'Wash Desperado with Mira':
 							*clr & cla
-							
+
 							cumspclnt = 4
 							gs 'cum_cleanup'
 							minut += 30
@@ -547,7 +547,7 @@ if $ARGS[0] = 'gadbitch':
 							hndiwrk_exp += rand(1,3)
 							grandpaQW['chore_bathe_horse_prog'] = 2
 							gs 'stat'
-							
+
 							if $clothingworntype = 'nude':
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/wash_horse_mira_nude.jpg"></center>'
 							elseif $clothingworntype = 'swimwear':
@@ -557,14 +557,14 @@ if $ARGS[0] = 'gadbitch':
 							'Both of you swim over to Desperado and begin to splash water on him. You chat with Mira and sometimes splash her instead.'
 							'After half an hour, you think Desperado looks cleaner than before and is ready to be taken back home.'
 							if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-							
+
 							act 'Get out of the water':
 								minut += 5
 								gt'gadriver', 'gadbitch'
 							end
 						end
 					end
-					
+
 				else
 					'You cannot wear regular clothes to wash Desperado.'
 					act 'Return': gt'gadriver', 'gadbitch'
@@ -587,7 +587,7 @@ if $ARGS[0] = 'gadbitch':
 					grandpaQW['chore_bathe_horse'] = 2
 					grandpaQW['chore_bathe_horse_prog'] = 0
 					gs 'stat'
-					
+
 					gt'gadsarai'
 				end
 			end
@@ -1225,28 +1225,30 @@ if $ARGS[0] = 'fishing':
 
 				act 'Leave':gt $loc, $metka
 			end
-			act 'Bring a fish to Boniface':
-				cla
-				*clr
-				minut += 5
-				fish -= 1
-				pcs_mood += rand(15,40)
-				gs 'stat'
+			if StoryLine = 1 and grandmaQW['block'] = 0:
+				act 'Bring a fish to Boniface':
+					cla
+					*clr
+					minut += 5
+					fish -= 1
+					pcs_mood += rand(15,40)
+					gs 'stat'
 
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat2.jpg"></center>'
-				'As soon as you enter the house, Boniface immediately jumps down to the floor and twines around your feet. The furry beast starts yowling very loudly and pawing at your legs. He has obviously detected the smell of fresh fish. You treat Boniface to a small fish and within a few minutes all that remains is a pile of fish bones.'
-				if fish >0: fish = 0 & 'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat2.jpg"></center>'
+					'As soon as you enter the house, Boniface immediately jumps down to the floor and twines around your feet. The furry beast starts yowling very loudly and pawing at your legs. He has obviously detected the smell of fresh fish. You treat Boniface to a small fish and within a few minutes all that remains is a pile of fish bones.'
+					if fish >0: fish = 0 & 'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
 
-				act 'Finish': gt 'gadhouse', 'start'
-			end
-			act 'Give the fish to your grandmother':
-				cla
-				*clr
-				minut += 5
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/givefish.jpg"></center>'
-				'You try to give the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
+					act 'Finish': gt 'gadhouse', 'start'
+				end
+				act 'Give the fish to your grandmother':
+					cla
+					*clr
+					minut += 5
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/givefish.jpg"></center>'
+					'You try to give the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
 
-				act 'Finish': gt 'gadhouse', 'start'
+					act 'Finish': gt 'gadhouse', 'start'
+				end
 			end
 		else
 			act 'Leave':gt $loc, $metka

+ 11 - 11
locations/gadroad.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = '':
 		! if Sveta did not bring Mira with her and Mira has met the boys already then there is a 50% chance she will show up too
 		if MiraLoc ! 5 and npc_QW['A60'] >= 1:
 			mirarand = rand(1,10)
-			if mirarand >= 6: 
+			if mirarand >= 6:
 				MiraLoc = 5
 				'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partywithMira''">trailer</a> hidden in the woods.'
 			else
@@ -55,9 +55,9 @@ if $ARGS[0] = '':
 		end
 	end
 
-	act 'Go back to Gadukino':minut += 20 & gt'gadukino'
-	act 'Go into the woods':minut += 30 & gt'gadforest','1'
-	if meadow > 0: act 'Go to the meadow':minut += 20 & gt 'meadow'
+	act 'Go back to Gadukino':minut += 10 & gt'gadukino'
+	act 'Walk down to the river':minut += 10 & gt 'gadriver', 'start'
+	act 'Go into the woods':minut += 15 & gt'gadforest','forest_edge'
 	act 'Go to the fields':minut += 10 & gt'gadfield','field'
 	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour >= 6 and hour < 22 and gadrunday ! daystart:
 		act 'Go for a run (1:00)':
@@ -75,11 +75,11 @@ if $ARGS[0] = '':
 			elseif month=9 or month=10 or month=4 or month=5:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg3.jpg"></center>'
 			else
-				if musle >= salo: 
+				if musle >= salo:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg1.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg2.jpg"></center>'
-				end    
+				end
 			end
 			'You run for an hour enjoying the scenery.'
 
@@ -98,10 +98,10 @@ if $ARGS[0] = 'drinking_invite':
 	$menu_loc = 'gadroad'
 	$menu_arg = 'drinking_invite'
 	menu_off = 1
-	
+
 	minut += 5
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drunk.jpg"></center>'
 	'You quickly catch up to the boys who have already started drinking.'
 	!School girl Sveta
@@ -128,7 +128,7 @@ if $ARGS[0] = 'drinking_invite':
 		end
 	end
 	'Mitka asks, "Are you ready to go?"'
-	
+
 	! if Sveta came here to kick off Miras quest then she cannot leave otherwise Sveta is free to decline the offer
 	if npc_QW['A60'] > 0 or (MiraLoc ! 5 and npc_QW['A60'] = 0):
 		gs 'willpower', 'drink', 'resist'
@@ -137,7 +137,7 @@ if $ARGS[0] = 'drinking_invite':
 				gs 'willpower', 'drink', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				
+
 				gt 'gadroad'
 			end
 		else
@@ -152,7 +152,7 @@ if $ARGS[0] = 'drinking_invite':
 		'Just as the words leave Mitka''s mouth, Mira comes bounding around the corner.'
 		'"Hey guys, thanks for the invite! <<$pcs_nickname>> is here too, awesome! Let''s go!"'
 	end
-	
+
 	! Mira is here and both her and Sveta are the town whores
 	! mitkabuh_group has the drinking events for group sex for 2 girls and 3 boys
 	if MiraLoc = 5 and npc_QW['A60'] >= 16 and gadriver_gang = 2:

+ 13 - 20
locations/gadsarai.qsrc

@@ -8,7 +8,6 @@ if $ARGS[0] = '':
 	menu_off = 0
 	$location_type = 'secluded'
 
-
 	'<center><h4>Old Barn</h4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
@@ -41,13 +40,13 @@ if $ARGS[0] = '':
 		'On your left is a <a href="exec: gt ''gadsarai'',''horse'' ">horse</a> stable.'
 	end
 	'There''s a <a href="exec: gt ''gadsarai'',''boar'' ">boar</a> living in a separate stable.'
-	if findvel = 1:'You see an old <a href="exec:gt ''bicycle'',''sarai''">bike</a> in the corner.'
 
+	gs 'bicycle', 'gadsarai'
 	clr
 	gs 'stat'
 
 	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
-	
+
 	if grandpaQW['chore_fetch_firewood'] = 1:
 		act 'Gather firewood for Grandpa (0:10)':
 			*clr & cla
@@ -65,32 +64,32 @@ if $ARGS[0] = '':
 			act 'Continue':gt 'gadsarai'
 		end
 	end
-	
+
 	act 'Poke around in the barn':
 		if npc_qw['A221'] > 0 and grigory_barn ! daystart and hour > 8 and hour < 12: gt 'grigory', 'barn'
 		*clr & cla
 		minut += 15
 		gs 'stat'
-		if vcard = 0 and vcard_trash = 0:
+		if BikeLoc = 0:
 			*clr & cla
-			if rand(0,5) >= 4:
+			if rand(0,8) >= 7:
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
-				'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards, still in its original cellophone wrapper.'
-				vcard = 1
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
+				'In the far corner of the barn you manage to find an old bicycle. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
+				BikeLoc = 1
 				observ_exp += 3
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
 				'In the barn you find many mouldy magazines, rusty tools and equipment, toys and many dusty, yellowed books. The entire barn reeks of mould and decay.'
 			end
 			act 'Leave and get some fresh air':gt 'gadsarai'
-		elseif findvel = 0:
+		elseif vcard = 0 and vcard_trash = 0:
 			*clr & cla
-			if rand(0,8) >= 7:
+			if rand(0,5) >= 4:
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
-				'In the far corner of the barn you manage to find an old bicycle. It''s in surprisingly good condition. You pull it out of the barn and clean it up.'
-				findvel = 1
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
+				'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards, still in its original cellophone wrapper.'
+				vcard = 1
 				observ_exp += 3
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
@@ -165,12 +164,6 @@ if $ARGS[0] = '':
 !!	if findneck = 1:
 !!		act 'You hear a scrapping noice above you.':gt 'serpent'
 !!	end
-
-!!	if sunWeather = 1:
-!!		if findvel = 1 and velday ! daystart:
-!!			'You decide to spend awhile riding the <a href="exec: gt ''events'', ''cycling''">bicycle</a> around.'
-!!		end
-!!	end
 end
 
 if $ARGS[0] = 'boar':

+ 53 - 105
locations/gadukino.qsrc

@@ -77,9 +77,9 @@ if $ARGS[0] = '':
 				! Sveta is the boys slut and Mira is not and they have already had sex together
 				if npc_QW['A63'] >= 11 and mirasex = 1 and npc_QW['A60'] < 11 and miraday ! daystart: gt 'meadow','mira_lesb_talk4'
 			end
-		end		
+		end
 		gs 'stat'
-		
+
 		'<center><h2>Gadukino</h2></center>'
 		if month >= 4 and month <= 10:
 			if hour >= 6 and hour < 22:
@@ -94,18 +94,22 @@ if $ARGS[0] = '':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/street_winter_night.jpg"></center>'
 			end
 		end
-		'A small village with many rickety wooden houses and even more ruins of houses. This village has seen better times.'
+		*nl
+		'A small village with many old wooden houses and even more in various states of disrepair. It has certainly seen better times.'
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
-		if StoryLine = 1:
+		if StoryLine = 1 and grandmaQW['block'] = 0:
 			'Several small farms are scattered around the outskirts of the village, one of which belongs to <a href="exec:minut += 5 & gt ''gaddvor''">your grandparents</a>.'
 			act 'Go to your grandparent''s house': minut += 5 & gt 'gaddvor'
 		end
-		if npc_rel['A60'] > 0 and metmira = 1: 'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''MiroslavaHome'', ''start''">Mira''s house</a>.'
+		if npc_rel['A60'] > 0 and metmira = 1:
+			'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''miroslavahome'', ''start''">Mira''s house</a>.'
+			act 'Go to Mira''s house': minut += 5 & gt 'miroslavahome', 'start'
+		end
 		*nl
 
 		if month >= 6 and month <= 9:
 			if hour >= 9 and hour <= 11:
-				'An old farm truck is parked halfway off one of the roads nearby. The farmer who drives it will buy <a href="exec: gt ''gadukino'',''collection_point''">mushrooms and berries</a> from the locals to sell back in the city. He usually hangs around town until about noon.'
+				'An old farm truck is parked halfway off one of the roads nearby. The farmer who drives it will buy <a href="exec: gt ''gadukino'',''collection_point''">mushrooms and berries</a> from the locals to sell back in the city. He usually hangs around town until from nine until noon.'
 			else
 				'This time of year, a truck usually comes by in the mornings between 9AM and noon to purchase mushrooms and berries from the locals.'
 			end
@@ -129,14 +133,10 @@ if $ARGS[0] = '':
 				minut += 15
 				menu_off = 1
 				gs 'stat'
-				
+
 				temp = rand(1,100)
-				
-				! 10% chance of finding meadow (needed to advance Miras quest)
-				if temp > 90 and meadow = 0:
-					gt 'gadukino', 'find_meadow'
 				! 50% chance of mira events if you already found the meadow and are still friends with mira
-				elseif temp > 50 and Mira_no = 0 and MiraLoc = 0:
+				if temp >= 50 and Mira_no = 0 and MiraLoc = 0:
 					gt 'gadukino', 'mira_events'
 				! 50% chance of other random 1 picture flavour events
 				else
@@ -145,8 +145,7 @@ if $ARGS[0] = '':
 			end
 		end
 
-		act 'Walk down to the river':minut += 20 & gt 'gadriver', 'start'
-		act 'Walk to the old forest road':minut += 20 & gt 'gadroad'
+		act 'Walk to the forest road':minut += 10 & gt 'gadroad'
 		!!Succubus active hunting, can only hunt successfully once a day, but can try until success
 		if (hour <= 7 or hour >= 21) and succubusQW = 5 and suchuntday ! daystart:
 			act 'Go Hunting (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
@@ -242,59 +241,6 @@ if $ARGS[0] = 'succubus_hunt':
 	end
 end
 
-if $ARGS[0] = 'find_meadow':
-	$menu_loc = 'gadukino'
-	$menu_arg = 'find_meadow'
-	menu_off = 0
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/trail_meadow.jpg"></center>'
-	'As you walk through the village, you notice a small path that leads between some houses. The path leads away from the village and into a dense thicket...'
-
-	act 'Ignore it and keep walking':gt 'gadukino'
-	act 'Follow the path to see where it goes':
-		*clr & cla
-		meadow = 1
-		minut += 10
-		menu_off = 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_thicket.jpg"></center>'
-		'You follow the path to see where it goes, but about ten minutes later the path becomes indistinguishable from the bushes and trees around you.'
-
-		act 'Look around for the path':
-			*clr & cla
-			minut += 10
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_trail.jpg"></center>'
-			'You''re about to return to the village, but you spot a small break in the thicket, from the looks of it it''s an animal trail.'
-
-			act 'Follow the trail':
-				*clr & cla
-				minut += 10
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_fruit_<<rand(0,1)>>.jpg"></center>'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_nearby_ruins.jpg"></center>'
-				'You carefully walk down the trail through the thicket until you emerge into a small grove of fruit trees standing next the ruins of a long-abandoned house.'
-
-				act 'Take an apple and keep walking':
-					*clr & cla
-					minut += 10
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_path.jpg"></center>'
-					' A few minutes later, snacking on an apple, you stumble upon the remains of an overgrown dirt road running through the middle of a majestic meadow filled with wildflowers. Judging by its undisturbed state no one else uses it.'
-
-					act 'Claim the meadow as your own':
-						*clr & cla
-						minut += 20
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
-						'You spend another twenty minutes exploring the meadow and its surroundings. You''re positive no one visits this location. You loudly proclaim the meadow to be your domain and you are its ruler. Eventually, you decide to head back to the village. To your surpise, your discover a quick shortcut that leads from the meadow back to the forest road.'
-						act 'Return to the forest road': minut += 5 & gt 'gadroad'
-					end
-				end
-			end
-		end
-	end
-end
-
 if $ARGS[0] = 'mira_events':
 	! never met mira before
 	if npc_rel['A60'] = 0 and npc_QW['A60'] = 0:
@@ -326,7 +272,7 @@ if $ARGS[0] = 'mira_events':
 		if npc_QW['A60'] = 15 and temper >= 10 and sunWeather = 1 and miraprost = 0:
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/miraqw7.jpg"></center>'
 			'Walking through the village, you notice Mira, digging in her vegetable garden. She stands with her ass high in the air, and to your amazement, she isn''t wearing panties. You get a good look at her pussy lips...'
-			
+
 			act 'Walk away': gt 'gadukino'
 			gs 'willpower', 'prostitution', 'force'
 			if will_cost <= pcs_willpwr:
@@ -339,21 +285,21 @@ if $ARGS[0] = 'mira_events':
 
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira0,<<rand(0,5)>>.jpg"></center>'
 					'You quietly sneak up to her, but she notices your approach and turns around, her hands pull her skirt back into place, blushing. You stare at her for a few seconds silently, and then ask, "Why don''t you have any panties on?" Mira, her eyes darting about, shifting her weight from foot to foot, explaining hesitantly, "Well what happened is, well it''s very hot and I thought it would feel better without panties." You interrupt her with an upraised hand as you get an idea for your second wish... You remind her she still owes you two wishes and you''re ready to collect your second wish. You tell Mira to sit down and she reluctantly agrees. When she is finally sitting, you order her to show you her pussy. Mira grumbles and glares at you, but eventually sighs and slowly lifts up her skirt, giving you a good look at her crotch.'
-					
+
 					act 'Watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2.jpg"></center>'
 						'You enjoy the view, then snap your fingers as an amazing idea comes to mind for your second wish. Mira says she thought her second wish was over, but you wouldn''t make it that easy. You ask if she is thinking about backing out of granting your wishes, but Mira says no, she will go through with them. You smile and tell her to follow you.'
-						
+
 						act 'Lead her to the road':
 							*clr & cla
 							minut += 45
 							gs 'arousal', 'voyeur', 2, 'exhibitionism', 'lesbian', 'dom'
 							gs 'stat'
-							
+
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
 							'You lead her out to the main road. You tell Mira, that she is to pose as a prostitute and attempt to get a customer or two. This is your second wish. You want Mira to become a prostitute and fulfill the desires of anyone who asks for her services. Mira looks shocked but nods that she will do it, Mira looks around the area and seeing no one else watching begins to pose by the roadside for passing cars...'
-							
+
 
 							act 'Wait for a car...':
 								*clr & cla
@@ -425,10 +371,10 @@ if $ARGS[0] = 'mira_events':
 												act 'Walk back to the village together':
 													*clr & cla
 													minut += 10
-													miraloc = 0 
+													miraloc = 0
 													gs 'arousal', 'end'
 													gs 'stat'
-													
+
 													gt 'gadukino'
 												end
 											end
@@ -442,7 +388,7 @@ if $ARGS[0] = 'mira_events':
 			else
 				act 'Approach Mira (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			
+
 		! mira slut events
 		elseif npc_QW['A60'] >= 11 and temper >= 10 and sunWeather = 1 and miraday ! daystart:
 			miraday = daystart
@@ -451,12 +397,12 @@ if $ARGS[0] = 'mira_events':
 				gs 'miroslava', 'miraclothes'
 				*nl
 				'You meet Mira, who is heading to the river to get some water, seeing you she decides to stop and chat with you for a few minutes.'
-				
+
 				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'exhib', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'You''re feeling naughty (<<will_cost>> Willpower)':
-						*clr & cla						
+						*clr & cla
 						if mirasextimes < 50:
 							temp = rand(0,3)
 							if temp = 0:
@@ -470,7 +416,7 @@ if $ARGS[0] = 'mira_events':
 							elseif temp = 2:
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp2.jpg"></center>'
 								*nl
-								'You ask Mira to show you her pussy. She smiles casually, sits down on the fence and, looking at you with a gleam in her eyes and a mischievous smile, she pulls aside panties showing off her wet pussy...'	
+								'You ask Mira to show you her pussy. She smiles casually, sits down on the fence and, looking at you with a gleam in her eyes and a mischievous smile, she pulls aside panties showing off her wet pussy...'
 							elseif temp = 3:
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasp5.jpg"></center>'
 								*nl
@@ -510,10 +456,10 @@ if $ARGS[0] = 'mira_events':
 				else
 					act 'You''re feeling naughty (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				
+
 			else
 				*clr & cla
-				
+
 				temp = rand(0,7)
 				if temp = 0:
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad5.jpg"></center>'
@@ -539,7 +485,7 @@ if $ARGS[0] = 'mira_events':
 				elseif temp = 7:
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasexgad11.jpg"></center>'
 					'Walking through the village, you meet Mira. You notice she is not wearing panties and the white thread of a tampon is sticking out of her pussy...'
-				end		
+				end
 				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -556,7 +502,7 @@ if $ARGS[0] = 'mira_events':
 				'Walking through the village, you happen to notice Mira fucking Mitka. Mitka slowly grinds his cock deep into Mira''s pussy. You see Mira shudder under him as she climaxed. She moaned and raked his back with her fingernails as she squirted and continued to cum. Mitka increased his pace and started to roughly hammer his cock into her dripping pussy. With his left hand he reached for Mira''s right tit and started to squeeze it without mercy. Mira just squeals and laughs.'
 				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'stat'
-				
+
 				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
@@ -565,7 +511,7 @@ if $ARGS[0] = 'mira_events':
 						'<center><img <<$set_imgh>> src="images/characters/village/mira/sex/mirasexgad3.jpg"></center>'
 						if rand(0,1) = 0:
 							'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. Within a few minutes you see Mitka begin to pick up the pace and he started to drive his cock faster and faster into Mira''s pussy until he grunts like a pig and dumps a huge load of cum into Mira''s pussy which is again squirting. After a few minutes of them just laying together holding each other and gasping for breath, they slowly begin to kiss and laugh as they freshen up. You smile and rub your own dripping snatch before moving away.'
-						else	
+						else
 							'They are so absorbed in fucking each other senseless that they ignoring everything else, so you decide to quietly continue to watch. You see Mitka pull his cock out of Mira''s dripping pussy and he drives it deep into her ass, barebacked. Mira let''s out a short scream of protest as Mitka continues to drive his cock into her asshole until his pubes rub up against her ass. Mira writhes under his brutal onslaught. After only a few minutes, Mitka starts to slap her ass leaving bright red marks. Mitka begins to shudder from his thrusts into her ass. Finally, Mitka leans back with his dick still embedded balls deep in Mira''s asshole and lets out a bestial growl as he begins to cum...'
 						end
 						gs 'willpower', 'voyeur', 'self'
@@ -573,13 +519,13 @@ if $ARGS[0] = 'mira_events':
 						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Finish your walk': gt 'gadukino'
 					end
 				else
 					act 'Continue watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				
+
 			! mira first wish not done
 			elseif npc_QW['A60'] >= 4:
 				*clr & cla
@@ -587,7 +533,7 @@ if $ARGS[0] = 'mira_events':
 				'Walking through the village, you happen to notice Mira, sucking Mitka''s cock in the backyard. She wraps her lips around it, almost completely taking the dick into her mouth. Sometimes she glances to the side...'
 				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'stat'
-				
+
 				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
@@ -604,13 +550,13 @@ if $ARGS[0] = 'mira_events':
 						gs 'arousal', 'voyeur_sex', 5, 'exhibitionism'
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Finish your walk': gt 'gadukino'
 					end
 				else
 					act 'Continue watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				
+
 			end
 		! quest not far along enough yet so just talking to mira or already watched mira have sex today
 		else
@@ -635,7 +581,7 @@ if $ARGS[0] = 'mira_events':
 					gs 'miroslava','miraclothes'
 				end
 				'You meet Mira, who is heading to the river to get some water, seeing you she decides to stop and chat with you for a few minutes.'
-				
+
 				act 'Finish your walk': gt 'gadukino'
 			end
 		end
@@ -695,47 +641,49 @@ end
 if $ARGS[0] = 'collection_point':
 	*clr & cla
 	menu_off = 1
-	minut += 5
+	minut += 1
 	gs 'stat'
+
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
+	*nl
 	'Parked halfway off the road is an old, unmarked truck. The back doors are open and inside is a farmer looking to buy any mushrooms or berries the locals find while out in the nearby woods.'
 	'Some find it odd that they''re operating out of a truck, but you imagine it''s cheaper to maintain than a shop and it lets them get around to other villages like this one to buy their mushrooms and berries, too.'
 	'There is a small sign hanging off of one of the back doors, which says:'
-	'"Buying: mushrooms 150<b>₽</b>/kg, berries 75<b>₽</b>/kg"'
+	'"Buying: mushrooms 25<b>₽</b>/kg, berries 25<b>₽</b>/kg"'
 
-	act 'Go back to the village center':gt 'gadukino'
+	act 'Go back to the village center':minut += 1 & gt 'gadukino'
 	if boletus > 0 and bilberry > 0:
-		act 'Sell your mushrooms and berries':
+		act 'Sell all your mushrooms and berries':
 			*clr & cla
-			minut += 30
-			money += boletus*150+bilberry*75
-			
+			minut += 10
+			money += boletus*25+bilberry*25
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to sell your mushrooms and berries for <<boletus*150+bilberry*75>> <b>₽</b>.'
+			'You decide to sell your mushrooms and berries for <<boletus*25+bilberry*25>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Continue':boletus = 0 &  bilberry = 0 & gt 'gadukino','collection_point'
 		end
 	end
 	if boletus > 0:
-		act 'Sell your mushrooms':
+		act 'Sell all your mushrooms':
 			*clr & cla
-			minut += 30
-			money += boletus*150
+			minut += 10
+			money += boletus*25
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to sell your mushrooms for <<boletus*150>> <b>₽</b>.'
+			'You decide to sell your mushrooms for <<boletus*25>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Continue':boletus = 0 & gt 'gadukino','collection_point'
 		end
 	end
 	if bilberry > 0:
-		act 'Sell your berries':
+		act 'Sell all your berries':
 			*clr & cla
-			minut += 30
-			money += bilberry*75
+			minut += 10
+			money += bilberry*25
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to sell your berries for <<bilberry*75>> <b>₽</b>.'
+			'You decide to sell your berries for <<bilberry*25>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Continue':bilberry = 0 & gt 'gadukino','collection_point'

+ 21 - 79
locations/gadukino_event.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'mira_apologise':
 		'"So what now?," you asked, looking at her.'
 		'"Well, if you want, I can make it up to you?" she answered a bit embarrassed.'
 		'While you pondered what to answer, Mira stares at you, biting her lip impatiently.'
-		
+
 		act 'Agree':
 			*clr & cla
 			minut += 5
@@ -227,7 +227,7 @@ if $ARGS[0] = 'gadriver_gang':
 				'The men continue lining up, one after another. Some of the men are so impatient they shoved two cocks at you at once. You sucked each one of them off, embracing their penis with your <<$liptalk>> lips, deepthroating them all.'
 				gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 				gs 'stat'
-				
+
 				act 'Make the first trio cum':
 					*clr & cla
 					minut += 5
@@ -239,7 +239,7 @@ if $ARGS[0] = 'gadriver_gang':
 					'It doesn''t take long before the first men finish, cumming in your mouth, and on your face and chest. You continue sucking more men off, however...'
 					gs 'arousal', 'bj', 5, 'sub', 'gangbang', 'deepthroat'
 					gs 'stat'
-					
+
 					act 'Get penetrated':
 						*clr & cla
 						gs 'npcgeneratec', 0, 'some country man', rand(19,45)
@@ -688,10 +688,10 @@ if $ARGS[0] = 'gadukino_mitka':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -718,10 +718,10 @@ if $ARGS[0] = 'gadukino_kolyamba':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -748,10 +748,10 @@ if $ARGS[0] = 'gadukino_vasyan':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -800,10 +800,10 @@ if $ARGS[0] = 'gadukino_2boys':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You tell them to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -831,10 +831,10 @@ if $ARGS[0] = 'mira_mitka':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You take Mira by the hand and tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -861,10 +861,10 @@ if $ARGS[0] = 'mira_kolyamba':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You take Mira by the hand and tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -890,10 +890,10 @@ if $ARGS[0] = 'mira_vasyan':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You take Mira by the hand and tell him to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -942,10 +942,10 @@ if $ARGS[0] = 'mira_2boys':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You take Mira by the hand and tell them to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -980,10 +980,10 @@ if $ARGS[0] = 'mira_3boys':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			*nl
 			'You take Mira by the hand and tell them to go away, while quickly walking away in the other direction.'
-			
+
 			act 'Walk away': gt 'gadukino'
 		end
 	else
@@ -992,60 +992,6 @@ if $ARGS[0] = 'mira_3boys':
 	act 'Go with them': gt 'mitkasex', 'forest3'
 end
 
-if $ARGS[0] = 'go_home':
-	menu_off = 1
-	if week = 7:
-		if hour = 20 or hour = 21:
-			family_trip_month = month
-			if month >= 6 or month <= 8:
-				*clr & cla
-				'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-				'<<$npc_nickname[''A29'']>> asks you "Well, <<$pcs_nickname>>, are you coming home with us or are you going to stay in the village with your grandparents?"'
-				act 'Stay':
-					staygad = daystart
-					gadstay = 1 & !Flag to monthly pay scene
-					indorf = 0
-					gt 'gadhouse', 'start'
-				end
-				act 'Go home': gs 'gadukino_event','go_home_ender'
-			else
-				gs 'gadukino_event','go_home_ender'
-			end
-		elseif hour > 21:
-			family_trip_month = month
-		end
-	end
-end
-
-
-if $ARGS[0] = 'go_home_ender':
-	menu_off = 1
-	*clr & cla
-	minut += rand(15,25)
-	if grandmaQW['help_amount'] > 0:
-		'<center><b><font color="maroon">Your grandmother</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
-		'Before leaving grandma gives you <<grandmaQW[''help_amount'']*50>> rubles.'
-		money += grandmaQW['help_amount'] * 50
-		grandmaQW['help_amount'] = 0
-	end
-	gadstay = 0
-	gs 'stat'
-	'You get into the Lada with the rest of your family and before you know it, you''ve arrived back in Pavlovosk.'
-	act 'Go to your room': gt 'bedrPar'
-end
-
-if $ARGS[0] = 'to_gadukino':
-	menu_off = 1
-	*clr & cla
-	!family_trip_month = 1
-	minut += rand(15,25)
-	gs 'stat'
-	'You get into the Lada with the rest of your family and before you know, you''ve arrived in Gadukino. Your grandparents have lived here for forty years.'
-	act 'Go into the house': gt 'gadhouse', 'start'
-end
-
 !from 1.2.5, [zz_func]
 if $ARGS[0] = 'sound':
 	if sound = 0:
@@ -1059,9 +1005,5 @@ if $ARGS[0] = 'sound':
 	end
 end
 
-if $ARGS[0] = 'cleanup':
-	!remove dynamics set in village, use this while leaving by illume
-end
-
 --- gadukino_event ---------------------------------
 

+ 26 - 26
locations/grandmahelp.qsrc

@@ -12,13 +12,13 @@ frost = 0
 if $ARGS[0] = 'start':
 	if month <= 4 or month >= 10:
 		grandmaQW['chore_type'] = rand(0,6)
-	elseif month = 5 or month = 6:
+	elseif month = 5:
 		grandmaQW['chore_type'] = rand(0,9)
-	else
-		grandmaQW['chore_type'] = rand(0,13)
+	elseif month >= 6 and month <= 9:
+		grandmaQW['chore_type'] = rand(0,14)
 	end
 
-	if grandmaQW['chore_type'] = 0: 
+	if grandmaQW['chore_type'] = 0:
 		gt 'grandmahelp', 'cleanfloor'
 	elseif grandmaQW['chore_type'] = 1:
 		gt 'grandmahelp', 'washclothes'
@@ -66,14 +66,14 @@ if $ARGS[0] = 'cleanfloor':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
 		'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
-		
+
 		act 'Continue':gt 'gadhouse', 'start'
 	end
 end
 
 if $ARGS[0] = 'washclothes':
 	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes?"'
-	
+
 	grandmaQW['chore_wash_clothes'] = 1
 	act 'Tell her you will wash them in a little bit':gt 'gadhouse', 'grandma'
 	act 'Agree and start washing (1:00)':
@@ -85,7 +85,7 @@ if $ARGS[0] = 'washclothes':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
 		'You pick up grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
-		
+
 		act 'Hang the Laundry':
 		    *clr & cla
 		    minut += 10
@@ -94,7 +94,7 @@ if $ARGS[0] = 'washclothes':
 		    'Once you are done with the washing, you walk over to the clothesline where you carefully hang the clothes to dry.'
 
 		    act 'Continue':gt'gaddvor'
-		end    
+		end
 	end
 end
 
@@ -112,12 +112,12 @@ if $ARGS[0] = 'milkcows':
 		'You walk over to the barn where the cows are kept.'
 
 		act 'Continue':gt'gadsarai','cow'
-	end	
+	end
 end
 
 if $ARGS[0] = 'groceries':
 	'"Oh yes, <<$pcs_nickname>>. I was going to go down to the store today to buy some groceries, but my knees are aching. Do you think you could go down there and get them for me? I have a list of what we need and the grocer will come by later to collect the money."'
-	
+
 	grandmaQW['chore_groceries'] = 1
 	act 'Tell her you will go to the store later':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the store (0:15)':
@@ -133,7 +133,7 @@ end
 
 if $ARGS[0] = 'can_mushrooms':
 	'"I need to get some of these mushrooms canned, <<$pcs_nickname>>, so we can store them. Can you please help me prepare them?"'
-	
+
 	grandmaQW['chore_can_mushrooms'] = 1
 	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree to help her right now (2:00)':
@@ -168,7 +168,7 @@ end
 
 if $ARGS[0] = 'can_berries':
 	'"It is time to can these berries, <<$pcs_nickname>>. Can you please help me? My fingers aren''t as spry as they used to be."'
-	
+
 	grandmaQW['chore_can_berries'] = 1
 	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree to help her right now (2:00)':
@@ -204,7 +204,7 @@ end
 
 if $ARGS[0] = 'can_veggies':
 	'"We have had good luck with the garden this year, <<$pcs_nickname>>. But now we need to can these vegetables before they spoil. Can you help me please?"'
-	
+
 	grandmaQW['chore_can_veggies'] = 1
 	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree to help her right now (3:00)':
@@ -241,7 +241,7 @@ end
 
 if $ARGS[0] = 'feedchickens':
 	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
-	
+
 	grandmaQW['chore_feed_chickens'] = 1
 	act 'Tell her you will do it in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the yard (0:10)':
@@ -293,7 +293,7 @@ end
 if $ARGS[0] = 'harvest':
 	if month = 7:
 		'"<<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
-		
+
 		grandmaQW['chore_collect_strawberries'] = 1
 		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the strawberry plot (0:10)':
@@ -341,7 +341,7 @@ end
 
 if $ARGS[0] = 'pickforest_mushrooms':
 	grandmaQW['chore_gather_mushrooms'] = 1
-	grandmaQW['chore_mushroom_quantity'] = rand(3,5)
+	grandmaQW['chore_mushroom_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, it''s mushroom season. Would you mind going into the forest to pick some for us?"'
 	'"How much do we need, Grandma?", you ask.'
 	'"Oh, I would say you should be able to find at least <<grandmaQW[''chore_mushroom_quantity'']>> kilos," Grandma replies.'
@@ -356,17 +356,17 @@ if $ARGS[0] = 'pickforest_mushrooms':
 		end
 		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
-	end	
+		act 'Continue': gt 'gadforest', 'forest_edge'
+	end
 end
 
 if $ARGS[0] = 'pickforest_berries':
 	grandmaQW['chore_gather_berries'] = 1
-	grandmaQW['chore_berry_quantity'] = rand(3,5)
+	grandmaQW['chore_berry_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, the wild berries are ripe for picking. We should gather them now while we can."'
 	'"How much do you want, Grandma?" you ask.'
 	'"<<grandmaQW[''chore_berry_quantity'']>> kilos will be a good start," Grandma replies.'
-	
+
 	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
@@ -377,18 +377,18 @@ if $ARGS[0] = 'pickforest_berries':
 		end
 		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
-	end		
+		act 'Continue': gt 'gadforest', 'forest_edge'
+	end
 end
 
 if $ARGS[0] = 'pickforest_both':
 	grandmaQW['chore_gather_both'] = 1
 	grandmaQW['chore_mushroom_quantity'] = rand(1,2)
-	grandmaQW['chore_berry_quantity'] = rand(2,3)
+	grandmaQW['chore_berry_quantity'] = rand(1,2)
 	'"This is the time of year that the forest provides us its gifts, <<$pcs_nickname>>. Can you go and harvest some mushrooms and berries for us?"'
 	'"How much of each should I get?" you ask.'
 	'"If you could, try to find <<grandmaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandmaQW[''chore_berry_quantity'']>> kilos of berries," Grandma replies. "It is important to stock up while we can."'
-	
+
 	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
@@ -399,8 +399,8 @@ if $ARGS[0] = 'pickforest_both':
 		end
 		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
-	end	
+		act 'Continue': gt 'gadforest', 'forest_edge'
+	end
 end
 
 

+ 10 - 13
locations/grandpahelp.qsrc

@@ -7,15 +7,12 @@ menu_off = 1
 gs'stat'
 
 if $ARGS[0] = 'start':
-
 	if month <= 4 or month >= 10:
 		grandpaQW['chore_type'] = rand(0,5)
 	elseif month = 5:
 		grandpaQW['chore_type'] = rand(3,8)
-	elseif month = 6 or month = 9:
-		grandpaQW['chore_type'] = rand(3,12)
-	else
-		grandpaQW['chore_type'] = rand(3,13)
+	elseif month >= 6 and month <= 9:
+		grandpaQW['chore_type'] = rand(3,14)
 	end
 
 	if grandpaQW['chore_type'] = 0:
@@ -240,7 +237,7 @@ if $ARGS[0] = 'grazehorse':
 end
 
 if $ARGS[0] = 'grazecows':
-	if grandpaQW['chore_herd_cattle_experience'] = 0: 
+	if grandpaQW['chore_herd_cattle_experience'] = 0:
 		'"<<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat and lead the herd to the field. I''ll meet you there."'
 	else
 		'"<<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
@@ -286,11 +283,11 @@ end
 
 if $ARGS[0] = 'pickforest_mushrooms':
 	grandpaQW['chore_gather_mushrooms'] = 1
-	grandpaQW['chore_mushroom_quantity'] = rand(2,3)
+	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
 	'"How much should I pick, grandpa?", you ask.'
 	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos will be enough," grandfather replies. "Be careful so you don''t get lost."'
-	
+
 	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
@@ -301,13 +298,13 @@ if $ARGS[0] = 'pickforest_mushrooms':
 		end
 		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
+		act 'Continue': gt 'gadforest', 'forest_edge'
 	end
 end
 
 if $ARGS[0] = 'pickforest_berries':
 	grandpaQW['chore_gather_berries'] = 1
-	grandpaQW['chore_berry_quantity'] = rand(3,5)
+	grandpaQW['chore_berry_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
 	'"How much should I pick, grandpa?" you ask.'
 	'"<<grandpaQW[''chore_berry_quantity'']>> kilos will be enough," grandfather replies. "Just be careful so you don''t get lost."'
@@ -322,14 +319,14 @@ if $ARGS[0] = 'pickforest_berries':
 		end
 		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
+		act 'Continue': gt 'gadforest', 'forest_edge'
 	end
 end
 
 if $ARGS[0] = 'pickforest_both':
 	grandpaQW['chore_gather_both'] = 1
 	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
-	grandpaQW['chore_berry_quantity'] = rand(2,3)
+	grandpaQW['chore_berry_quantity'] = rand(1,2)
 	'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and I have a craving for some fresh berries."'
 	'"How much should I pick, grandpa?"'
 	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kilos of berries will be enough," grandfather replies. "Just don''t get lost."'
@@ -344,7 +341,7 @@ if $ARGS[0] = 'pickforest_both':
 		end
 		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
 		minut += 60
-		act 'Continue': gt 'gadforest', '1'
+		act 'Continue': gt 'gadforest', 'forest_edge'
 	end
 end
 

+ 12 - 10
locations/grigory.qsrc

@@ -1045,16 +1045,18 @@ if $ARGS[0] = 'romantic_event':
 		act 'Lets go':
 			'"Where were you thinking?" You ask.'
 			'"I can walk you back to your Grandparent''s home, or you could come back to mine," He looks you in the eye, a hopeful look on his face.'
-
-			act 'Grandparents Home':
-				'"I should probably get back to my Grandparent''s place," You say.'
-				'You see a rueful smile cross Grigory''s face, "Ok," Standing, he gives you a little hug, your feet dangling off the ground, before he lowers you to stand on your own two feet again.'
-				'Slipping his arm around you, you lean against him as the two of you make the walk back to your Grandparent''s home.'
-				'Once there, the two of you say your goodbyes, him leaning down to kiss your lips lightly. He slowly straightens, his eyes on yours, "Until next time Kiska."'
-				'You''re unable to hide a little smile, "Until next time Grigory."'
-				'Turning on his heel, he starts to wander back towards the town''s center.'
-
-				act 'Continue':gt 'gadhouse', 'start'
+			
+			if StoryLine = 1 and grandmaQW['block'] = 0:
+				act 'Grandparents Home':
+					'"I should probably get back to my Grandparent''s place," You say.'
+					'You see a rueful smile cross Grigory''s face, "Ok," Standing, he gives you a little hug, your feet dangling off the ground, before he lowers you to stand on your own two feet again.'
+					'Slipping his arm around you, you lean against him as the two of you make the walk back to your Grandparent''s home.'
+					'Once there, the two of you say your goodbyes, him leaning down to kiss your lips lightly. He slowly straightens, his eyes on yours, "Until next time Kiska."'
+					'You''re unable to hide a little smile, "Until next time Grigory."'
+					'Turning on his heel, he starts to wander back towards the town''s center.'
+
+					act 'Continue':gt 'gadhouse', 'start'
+				end
 			end
 
 			act 'Grigory''s Home':

+ 2 - 2
locations/hunters.qsrc

@@ -716,7 +716,7 @@ if $ARGS[0] = 'start':
 		! for a break between the sex, is taken away -1 every hour
 		gs 'underwear', 'remove'
 		if forest_gopsex = 1:
-			gs 'clothing', 'strip', 'gadforest'
+			gs 'clothing', 'strip', 'forest_edge'
 		elseif slutgosex = 1 or forest_huntersex = 1 :
 			gs 'clothing', 'strip', 'backwater'
 		else
@@ -2550,7 +2550,7 @@ if $ARGS[0]='hunterslutEND':
 
 		if slutgosex = 1:act 'Go to the river':slutgosex = 0 & gt 'backwater'
 		if forest_huntersex = 1:act 'Go to the hut':forest_huntersex = 0 & minut += 60 & gt 'swamp_yard', 'start'
-		if forest_gopsex = 1:act 'Go to forest':forest_gopsex = 0 & gt 'gadforest','1'
+		if forest_gopsex = 1:act 'Go to forest':forest_gopsex = 0 & gt 'gadforest','forest_edge'
 	end
 end
 

+ 50 - 42
locations/meadow.qsrc

@@ -29,8 +29,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
 	*nl
 	'A quiet and deserted open field of grass and wildflowers in the forest, well hidden from civilization.'
-
-	!125s
+	'There are <a href="exec:gt ''meadow'', ''ruins''">ruins</a> of a long-abandoned house as well as some <a href="exec: gt ''meadow'', ''fruit_trees''">fruit trees</a> hinting at the areas original purpose.'
+	
 	!events trigger before everything
 	if (meadow = 3 or meadow = 6) and MiraLoc = 0 and npc_QW['A60'] = 2 and temper >= 12 and sunWeather = 1:gt 'meadow','mira_mitka'
 	if (meadow = 3 or meadow = 6) and Mira_no = 0 and MiraLoc = 0 and npc_QW['A60'] = 33 and temper >= 12 and sunWeather = 1:gt 'meadow','mira_gang'
@@ -38,7 +38,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if npc_QW['A63'] > 13 and mirasex = 1 and npc_QW['A60'] > 11 and rand(1,5) = 1 and miraday ! daystart:gt 'meadow','mira_lesb_talk3'
 	if npc_QW['A63'] > 13 and mirasex = 1 and npc_QW['A60'] > 11:gt 'meadow','mira_lesb_talk2'
 	if mirasex = 2 and rand(1,5) > 3 and miraday ! daystart and npc_rel['A60'] >= 15:gt 'meadow','mira_lesb'
-	!125e
 
 	if MiraLoc = 2:
 		act 'Talk to Mira': gt 'meadow', 'Mira'
@@ -70,44 +69,74 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 
 	if MiraLoc = 2:
-		!act 'Go to the forest': minut += 20 & MiraLoc = 3 & gt 'gadforest', 'forest_edge'
-		act 'Leave':minut += 20 & MiraLoc = 0 & gt 'gadroad'
+		act 'Go back to the forest': minut += 20 & MiraLoc = 3 & gt 'gadforest', 'forest_edge'
 	else
-		!act 'Go to the forest': minut += 20 & gt 'gadforest', 'forest_edge'
-		act 'Leave':minut += 20 & gt 'gadroad'
+		act 'Go back to the forest': minut += 20 & gt 'gadforest', 'forest_edge'
 	end
 
 	if sunWeather = 1:
-		if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):
-			if $clothingworntype ! 'exercise' and pcs_inhib < 35 and Miraloc ! 2:
+		if pcs_stam >= 15 or (pcs_stam >= 10 and bookYog + obruch > 0):
+			if $clothingworntype ! 'exercise':
 				*nl
-				'You could do some exercises here if you were wearing <a href="exec: gt ''meadow'', ''workout''">exercise clothes</a>.'
-				act 'Exercise': gt 'meadow', 'workout'
+				'Your meadow is a perfect place to workout if you were wearing exercise clothes'
 			elseif pcs_inhib >= 35 and Miraloc ! 2 and temper >= 10:
 				*nl
-				'Your meadow is a perfect place to do some <a href="exec: gt ''meadow'', ''workout''">exercises</a>. There is no one around, so you could probably <a href="exec: gs ''clothing'', ''strip'', ''meadow''& gs ''underwear'', ''remove'' & gt ''meadow'', ''workout'', ''nude''">exercise nude</a>.'
+				'Your meadow is a perfect place to exercise. There is no one around, so you could probably exercise nude if you wanted.'
 				act 'Exercise': gt 'meadow', 'workout'
-				act 'Exercise nude':
-					gs 'clothing', 'strip', 'meadow'
-					gs 'underwear', 'remove'
-					gt 'meadow', 'workout', 'nude'
-				end
+				act 'Exercise nude':gt 'meadow', 'workout', 'nude'
 			elseif Miraloc = 2:
 				*nl
-				'It''s a nice day to exercise, but you don''t feel comfortable working out with an audience.'
+				'Your meadow is a perfect place to exercise. Mira is here but she wouldn''t mind if you exercised for a little bit.'
+				act 'Exercise': gt 'meadow', 'workout'
 			else
 				*nl
-				'Your meadow is a perfect place to do some <a href="exec: gt ''meadow'', ''workout''">exercises</a>.'
+				'Your meadow is a perfect place to exercise.'
 				act 'Exercise': gt 'meadow', 'workout'
 			end
 		else
-			'Your meadow is a perfect place to do some exercises, but you don''t have the energy right now.'
+			'Your meadow is a perfect place to exercise, but you don''t have the energy right now.'
 		end
 	else
-		'It''s currently raining. You could do some exercises here if the weather improves..'
+		'You can exercise in your meadow once the weather improves.'
 	end
 end
 
+if $ARGS[0] = 'workout':
+	*clr & cla
+	if $ARGS[1] = 'nude':
+		menu_off = 1
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.2.jpg"></center>'
+		*nl
+		if exhibitionist_lvl < 3:
+			'Your cheeks redden with embarrassment as you strip off your clothes. You giggle nervously at the thought of getting caught naked in the meadow.'
+		else
+			'You strip off your clothes. The thought of getting caught naked in the meadow excites you.'
+		end
+		clothesAtLocation = FUNC('lost_clothes_here','meadow')
+		gs 'clothing', 'strip', 'meadow'
+		gs 'underwear', 'remove'
+		gs 'exhibitionism', 3
+		gs 'stat'
+		act 'Continue': gt 'exercise', 'workout'
+	else
+		gt 'exercise', 'workout'
+	end
+end
+
+if $ARGS[0] = 'fruit_trees':
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_fruit_<<rand(0,1)>>.jpg"></center>'
+	*nl
+	'These fruit trees are flourishing in the undisturbed beauty of the meadow. Unfortunately all the fruit is out of your reach.'
+	act 'Continue': gt 'meadow', 'start'
+end
+
+if $ARGS[0] = 'ruins':
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_nearby_ruins.jpg"></center>'
+	*nl
+	'The ruins of this old house look intriguing. You wonder how long it has been here.'
+	act 'Continue': gt 'meadow', 'start'
+end
+
 if $ARGS[0] = 'Mira':
 	minut += 2
 	menu_off = 1
@@ -1119,26 +1148,5 @@ if $ARGS[0] = 'mirameadow':
 	end
 end
 
-if $ARGS[0] = 'workout':
-	*clr & cla
-	if $ARGS[1] = 'nude':
-		menu_off = 1
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.2.jpg"></center>'
-		*nl
-		if exhibitionist_lvl < 3:
-			'Your cheeks feel hot with embarrassment as you strip off your clothes. You giggle nervously at the thought of getting caught in the nude, the thought terrifies you but it also excites you.'
-		else
-			'You strip off your clothes. The thought of getting caught in the nude excites you.'
-		end
-		clothesAtLocation = FUNC('lost_clothes_here','meadow')
-		gs 'clothing', 'strip', $sportloc
-		gs 'exhibitionism', 3
-		gs 'stat'
-		act 'Continue': gt 'exercise', 'workout'
-	else
-		gt 'exercise', 'workout'
-	end
-end
-
 --- meadow ---------------------------------
 

+ 5 - 5
locations/mirasex.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'foreplay':
 		gs 'arousal', 'foreplay', 5, 'lesbian'
 		gs 'stat'
 		if npc_rel['A60'] < 30:
-			act 'Leave':MiraLoc ! 2 & minut += 20 & gt'gaddvor'
+			act 'Leave':MiraLoc = 0 & minut += 10 & gt 'gadukino'
 		else
 			act 'Lick Mira':gt 'mirasex','lickmira_start'
 		end
@@ -78,7 +78,7 @@ if $ARGS[0] = 'horny_talk':
 	if npc_rel['A60'] < 15:
 		'"Get the fuck off me you slut." Mira says, pulling away. She doesn''t sound convincing but you will have to improve you relationship is you want to take things further.'
 		'She walks home alone singing a song. You watch her for a moment before heading back to the village as well.'
-		act 'Leave':MiraLoc ! 2 & minut += 10 & gt'gaddvor'
+		act 'Leave':MiraLoc = 0 & minut += 10 & gt 'gadukino'
 	else
 		'Mira moans in enjoyment then starts to pull at your panties.'
 		'You help her pull them down and she step out of them.'
@@ -341,7 +341,7 @@ if $ARGS[0] = 'end':
 	gs 'stat'
 	MiraLoc ! 2
 	minut += 20
-	gt'gaddvor'
+	gt'gadukino'
 end
 
 !!-------------------------------------------------single act events---------------------------------------------------
@@ -384,7 +384,7 @@ if $ARGS[0] = 'miralick_stand1':
 		gs 'arousal', 'cuni', 10, 'lesbian'
 		minut -= 5
 		gs 'stat'
-		act 'Leave':MiraLoc ! 2 & minut += 20 & gt'gaddvor'
+		act 'Leave':MiraLoc = 0 & minut += 20 & gt 'gadukino'
 	end
 	killvar '$textstand'
 	killvar '$textlick'
@@ -432,7 +432,7 @@ if $ARGS[0] = 'lickmira_mis1':
 		else
 			'After Mira orgasms,you get out from between her legs and wipe her juices off your face. You clean yourself up and smile at Mira before heading back to the village with her.'
 		end
-		act 'Leave':MiraLoc ! 2 & minut += 20 & gt'gaddvor'
+		act 'Leave':MiraLoc = 0 & minut += 10 & gt 'gadukino'
 	end
 	*nl
 	killvar '$textmis'

+ 9 - 42
locations/miroslava.qsrc

@@ -429,40 +429,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 
-		if miratalkforest = 0 and npc_rel['A60'] >= 5:
-			act 'Ask about the forest':
-				menu_off = 1
-				*clr & cla
-				minut += 15
-				npc_rel['A60'] += 1
-				miratalkforest = 1
-				goforest += 1
-				gs 'stat'
-				gs 'miroslava', 'miraclothes'
-				'"Mira, can you tell me about the forest near the village?" You ask you.'
-				'"No, <<$pcs_nickname>>, I''m afraid to go there" said Mira, shaking her head.'
-				'"Why?" You said, wanting to continue the conversation.'
-				'"Oh, they say it is easy to get lost in those woods, in case you didn''t know, " she said. - "They say that there are wolf packs roaming those woods too."'
-				'"Who says?", you asked incredulously. "Real wolves?"'
-				'"Locals say this" said Mira. "They have all sorts of scary ghost stories to tell."'
-				'"Oh, they are pulling your leg." with a laugh said you. "I bet they don''t want us to go into the forest because that they don''t want to share in the picking of the mushrooms and berries. They will get more, plain and simple."'
-				'"No, no, <<$pcs_nickname>>," Mira said in a serious tone. "They told me that last summer the wolves attacked a girl from a neighboring village. She was mauled to death. She had gone into the forest looking for mushrooms too, but she never come out of the forest. In the morning they found the remains of her corpse and lots of blood. They found many wolf tracks in the blood."'
-				'"That is terrible" you shivered. "If you have simular tells, keep them to yourself. I don''t like horror stories."'
-				'"What?" Mira giggled, turning to whisper in your ear. "I also overheard a few days ago a conversation between two of the village elders. They said that if you walk naked in the woods, your health and mood improves. Something to do with the air being so fresh. Or something like that."'
-				'Mira thought for a moment, and then continued.'
-				'"I don''t know about health part, but there is definitely more to my mood and a little itch begins," Mira expressively glances between her legs.'
-				'"Wait," you interrupted her. "I thought you said that you''re afraid to walk in the woods alone."'
-				'"Oh, I did go once," she said blushing. "Just to check on the truth if what the elders said."'
-				'"Okay, okay, no more excuses," you chuckled, looking at a confused Mira. "Let''s just go together?."'
-				'"I don''t know <<$pcs_nickname>>," Mira said. "If it''s warm and the weather is nice, you can count on me to go with you."'
-				'"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 'Continue':gt $loc, $metka
-			end
-		end
-
-		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and MiraLoc ! 3 and miratalkforest > 0 and npc_rel['A60'] >= 5:
+		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and MiraLoc ! 3 and mirapickingtalk > 0 and npc_rel['A60'] >= 5:
 			act 'Offer to go to the forest':
 				menu_off = 1
 				*clr & cla
@@ -480,7 +447,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						gs 'miroslava', 'miraclothes'
 						'You offer her to go to the forest to look for mushrooms and berries and she willingly agrees.'
 
-						act 'Go into the woods':minut += 45 & gt'gadforest','1'
+						act 'Go into the woods':minut += 45 & gt'gadforest', 'forest_edge'
 					else
 						minut += 5
 						MiraLoc = 0
@@ -501,24 +468,24 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		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:
+		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and MiraLoc = 3 and miranudetalk > 1 and npc_rel['A60'] >= 5 and $clothingworntype ! 'nude' and forestpicnic = 0:
 			if pcs_inhib >= 25 or exhibitionist_lvl > 1:
 				act 'Offer to walk naked':
 					menu_off = 1
 					*clr & cla
 					minut+=5
 					gs 'underwear', 'remove'
-					gs 'clothing', 'strip', 'gadforest'
+					gs 'clothing', 'strip', 'forest_edge'
 					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'Continue':gt'gadforest','1'
+					act'Continue':gt'gadforest', 'forest_edge'
 				end
 			end
 		end
 
-		if npc_rel['A60'] >= 15 and MiraLoc ! 3 and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
+		if npc_rel['A60'] >= 15 and MiraLoc ! 3 and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1) and StoryLine = 1 and grandmaQW['block'] = 0:
 			if mira_guest = 0:
 				act 'Invite to your grandparent''s':
 					menu_off = 1
@@ -597,8 +564,8 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 
-		if npc_rel['A60'] >= 15 and Mira_no = 0 and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
-			if mira_guest = 0 and mira_temp >= 1 and mira_temp <= 2 and mira_go_blok = 0 and MiraLoc ! 3:
+		if npc_rel['A60'] >= 15 and Mira_no = 0 and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1):
+			if mira_guest = 0 and mira_temp >= 1 and mira_temp <= 2 and mira_go_blok = 0 and MiraLoc ! 3 and StoryLine = 1 and grandmaQW['block'] = 0:
 				menu_off = 1
 				*clr & cla
 				minut += 1
@@ -1178,7 +1145,7 @@ if $ARGS[0] = 'Leave':
 	if MiraLoc = 0:
 		gt 'MiroslavaHome','start'
 	elseif MiraLoc = 3:
-		gt 'gadforest', '1'
+		gt 'gadforest', 'forest_edge'
 	elseif MiraLoc = 6:
 		gt 'gadhouse', 'start'
 	elseif MiraLoc = 7:

+ 1 - 1
locations/miroslavahome.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'mirabrother':
 														'After a couple of minutes you feel his warm sticky cum hit the back of your throat and begin to swallow it all down. Mira''s brother stands still for a minute, his eyes closed in bliss. Finally, he takes his cock out of your mouth and zips up his pants. You put your helmets back on, get on the motorcycle once again, and he drives you back to the village...'
 
 														act 'Ask him to take you back to Mira''s house': gt 'MiroslavaHome', 'start'
-														act 'Ask him to drop you off at your grandparents house': gt 'gaddvor'
+														if StoryLine = 1  and grandaQW['block'] = 0:act 'Ask him to drop you off at your grandparents house': gt 'gaddvor'
 													end
 												end
 											end

+ 178 - 58
locations/swamp.qsrc

@@ -1,76 +1,196 @@
 # swamp
 
-$loc = 'swamp'
-$metka = ''
-$location_type = 'secluded'
+if $ARGS[0] = 'start':
+	*clr & cla
 
-$menu_loc = 'swamp'
-$menu_arg = ''
-menu_off = 0
+	$loc = 'swamp'
+	$metka = 'start'
+	$location_type = 'secluded'
 
-new_boletus = 0
-new_bilberry = 0
-goswamp = 1
+	$menu_loc = 'swamp'
+	$menu_arg = 'start'
+	menu_off = 0
 
-gs 'gadukino_event', 'sound'
-gs 'stat'
+	CLOSE ALL
+	gs 'gadukino_event', 'sound'
+	gs 'stat'
 
-*clr & cla
-
-'<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>'
+	'<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
 	else
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swamp_night.jpg"></center>'
+		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
 	end
-else
-	if hour >= 8 and hour < 18:
-		'<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>'
+	*nl
+	'You are at the swamp on the far side of the woods from the village.'
+	'It can be dangerous to hike in this area, unless physically fit or have a good knowledge of the forest.'
+
+	act 'Head back out of the swamp': minut += 15 & gt 'gadforest', 'forest_center'
+
+	if hunterscabin = 1:
+		'You can see the small path to the clearing that contains the hunters cabin.'
+		act 'Go to the hunters cabin':
+			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
+			if hour >= 6 and hour <= 22:
+				swamp_stuck = 0
+				gt 'swamp', 'stuck','swamp'
+			! nighttime chased by wolves - Sveta probably should not be roaming the forest at this time
+			else
+				gt 'gadforestlost','wolves','swamp'
+			end
+		end
 	end
-end
-*nl
-'You are in the swamp area of the forest.'
-'It is considered dangerous to hike in this area, unless physically fit, and should always be avoided at night.'
-*nl
-'You can find a lot of mushrooms and berries here.'
-*nl
-'There''s a small visible path to a clearing that leads to the hut, used by the hunters.'
-*nl
-act 'Go to the hut': gt 'swamp_yard', 'start'
-
-if hour >= 6 and hour <= 21 and month >= 6 and month <= 9:
-	act 'Walk into the forest':minut += 30 & gt 'gadforest','4'
-end
-if hour >= 6 and hour < 21:
-	act 'Return to the edge of the forest':hunters_here = 0 & minut += 150 & gt 'gadforest','1'
-else
-	act 'Return to the edge of the forest':hunters_here = 0 & gt 'gadforest_event', 'forest_road'
+
 end
 
-if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and swamp_day ! daystart:
-	act 'Look for mushrooms and berries (0:30)':
-		cla
-		*clr
-		minut += 30
-		temp = RAND(1,2)
-		swamp_day = daystart
-		if goforest < 20:goforest += rand(0,1)
-		new_boletus += rand(4,5)
-		boletus += new_boletus
-		new_bilberry += rand(4,5)
-		bilberry += new_bilberry
-		pcs_mood += 5
+if $ARGS[0] = 'stuck':
+	! if player is skilled at forest or very agile or strong then don''t get stuck in swamp at all
+	if pcs_bushcraft < 70 and pcs_agil < 70 and pcs_stren < 70:
+		*clr & cla
+
+		$loc = 'swamp'
+		$metka = 'stuck'
+		$location_type = 'secluded'
+
+		$menu_loc = 'swamp'
+		$menu_arg = 'stuck'
+		menu_off = 0
+
+		CLOSE ALL
+		gs 'gadukino_event', 'sound'
 		gs 'stat'
 
-		gs 'gadforest', 'clothes1'
+		'<center><H4>Swamp</H4></center>'
+		if $clothingworntype ! 'nude' and PCloSkirt = 0:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
+		elseif $clothingworntype ! 'nude' and PCloSkirt > 0:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
+		elseif $clothingworntype = 'nude':
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
+		end
+		*nl
+		'As you walk through the swamp, you feel yourself begin to sink into the mud of the swamp with each step.'
+		'You know you''re so close to your destination, but you''re not sure you can make it.'
+
+		act 'Struggle':
+			*clr & cla
+			swamp_stuck += 1
+			minut += 15
+			gs 'sweat', 'add', 15
+			gs 'stat'
+			if swamp_stuck mod 3 = 0:
+				swamp_check = pcs_stren + pcs_agil + pcs_bushcraft
+				swamprand = rand(0,225)
+			elseif swamp_stuck mod 2 = 0:
+				swamp_check = pcs_stren + pcs_agil
+				swamprand = rand(0,150)
+			else
+				swamp_check = pcs_stren
+				swamprand = rand(0,75)
+			end
+			if swamp_stuck = 10 and Enable_nogameover = 0:
+				over = 10
+				gt 'gameover'
+			else
+				if swamp_check > swamprand:
+					'<center><H4>Swamp</H4></center>'
+					if $clothingworntype ! 'nude' and PCloSkirt = 0:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
+					elseif $clothingworntype ! 'nude' and PCloSkirt > 0:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski.jpg"></center>'
+					elseif $clothingworntype = 'nude':
+						swamprand = rand(0,3)
+						if swamprand = 0:
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0..jpg"></center>'
+						else
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+swamprand+'.jpg"></center>'
+						end
+					end
+					*nl
+					'Your efforts are not in vain as you begin to feel the muds hold loosen. With another burst of strength you free yourself and breathe a sigh of relief.'
 
-		'You spend half an hour wandering through the woods in search of mushrooms and berries and manage to find <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+					act 'Success!':gt 'swamp_yard','start'
+				else
+					'<center><H4>Swamp</H4></center>'
+					if $clothingworntype ! 'nude' and PCloSkirt = 0:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
+					elseif $clothingworntype ! 'nude' and PCloSkirt > 0:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
+					elseif $clothingworntype = 'nude':
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
+					end
+					*nl
+					'Your efforts are for nothing, the muds hold feels as tight as ever. In fact you feel yourself sinking even deeper.'
 
-		act 'Continue': gt'swamp'
+					act 'Failure':gt 'swamp','stuck'
+				end
+			end
+		end
+		if month >= 4 and month <= 10:
+			act 'Scream for help':
+				*clr & cla
+				minut += 15
+				if ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)):
+					swamprand = rand(1,4)
+				elseif (hour >= 7 and hour < 23):
+					swamprand = rand(1,5)
+				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
+				'You don''t think you''re strong enough to break free of the mud and decide your best chance is to simply yell for help. Hopefully you''re close enough to the hunters cabin that they''ll hear you.'
+
+				if swamprand = 1:
+					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.'
+						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.'
+					act 'Failure':gt 'swamp','stuck'
+				end
+			end
+		end
+	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
+		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
+		end
+		*nl
+		if $ARGS[1] = 'forest_edge':
+			minut += 60
+			'After an hour walking through the forest you finally see the hunters cabin ahead.'
+		elseif $ARGS[1] = 'swamp':
+			minut += 15
+			'After a few mintues walking through the swamp you finally see the hunters cabin ahead.'
+		end
+		gs 'stat'
+		act 'Continue':gt 'swamp_yard', 'start'
 	end
 end
 

+ 19 - 23
locations/swamp_woods.qsrc

@@ -2,19 +2,24 @@
 
 !TODO: Break into more arg blocks
 if $ARGS[0] = 'start':
+	*clr & cla
+
 	$loc = 'swamp_woods'
-	$metka = ''
+	$metka = 'start'
+	$location_type = 'secluded'
+
 	$menu_loc = 'swamp_woods'
-	$menu_arg = ''
+	$menu_arg = 'start'
 	menu_off = 0
-	$location_type = 'secluded'
 
+	$forest_args1 = 'swamp_woods'
+
+	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 	gs 'stat'
 
 	gs 'hunter_ambient', 'schedule'
 
-	cla & *clr
 	'<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.'
@@ -80,7 +85,7 @@ if $ARGS[0] = 'start':
 					'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'
 
-					act 'Success!': pcs_bushcraft += 5 & gt 'gadforest','4'
+					act 'Success!': pcs_bushcraft += 5 & gt 'gadforest','forest_center'
 				elseif nearby_woods_check <= 3:
 					!End up stuck in the swamp
 					if $clothingworntype ! 'nude':
@@ -93,7 +98,7 @@ if $ARGS[0] = 'start':
 
 					*nl
 					'Seems like the forest can camouflage parts of the swamp, fooling careless hikers.'
-					act 'If only you knew': pcs_bushcraft += 3 & gt 'gadforestswamp','2'
+					act 'If only you knew': pcs_bushcraft += 3 & gt 'swamp','stuck'
 				else
 					if $clothingworntype ! 'nude':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike.jpg"></center>'
@@ -101,23 +106,14 @@ if $ARGS[0] = 'start':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/nearby_woods_hike_nude.jpg"></center>'
 					end
 
-					if nearby_woods_check <= 5:
-						!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...': pcs_bushcraft += 2 & gt 'swamp_woods', 'start'
-					else
-						!Get lost in the woods
-						'You start going into the woods in a direction you think will take you around the swamp.'
-						'After a few hours walking you realize you have no idea where you are going.'
-						'You look back to see if you can get back to the hut but nothing around seems familiar'
+					!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'
 
-						act 'This can''t be good': gt 'gadforestlost','1'
-					end
+					*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...': pcs_bushcraft += 2 & gt 'swamp_woods', 'start'
 				end
 			end
 		else
@@ -134,7 +130,7 @@ if $ARGS[0] = 'start':
 			'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','4'
+			act 'Further': gt 'gadforest','forest_center'
 		end
 	end
 end

+ 10 - 33
locations/swamp_yard.qsrc

@@ -15,9 +15,8 @@ if $ARGS[0] = 'start':
 	!the chance of encountering hunters
 	!the chance of hitting GG, if she`s a slut
 	huntslutsexrand = rand(1,3)
-	! to remember were cowards or not
-	!if lost_girl = 0:lost_girl += rand(40,60)
-	if StoryLine = 1 and lost_girl = 0 and forest_lostday > 0: lost_girl=daystart+2
+	!if lost make this trigger after 2 days in swamp house
+	if lost_girl = 1 and daystart > forest_lostday+2 and hour >= 8 and hour < 20: gt 'gadforestlost','rescue','ranger','swamp_yard'
 	dirty = 0
 	temp_sy = rand(1,10)
 
@@ -56,10 +55,7 @@ if $ARGS[0] = 'start':
 	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 findvel = 3:
-		*nl
-		'On the side of the hut is an old <a href="exec:gt ''bicycle'',''swamp''">bike</a>.'
-	end
+	gs 'bicycle', 'swamp_yard'
 	if hunters_available = 1 and hunters_outside = 1 and huntersknow = 0:
 		*nl
 		'You spot some unfamiliar <a href="exec: gt ''hunters'', ''start'' ">people</a> standing in front of the hut.'
@@ -91,9 +87,9 @@ if $ARGS[0] = 'start':
 			if hour >= 6 and hour < 23:
 				minut += 5
 				if rand(1,10)>9:
-					gt 'swamp'
+					gt 'swamp', 'start'
 				else
-					gt 'gadforestswamp','2'
+					gt 'swamp','stuck'
 				end
 			else
 				*clr & cla
@@ -105,21 +101,21 @@ if $ARGS[0] = 'start':
 				act 'Disregard his advice':
 					minut += 5
 					if rand(1,10)>8:
-						gt 'swamp'
+						gt 'swamp', 'start'
 					else
-						gt 'gadforestswamp','2'
+						gt 'swamp','stuck'
 					end
 				end
 			end
 		else
 			minut += 5
 			if (hour >= 6 and hour < 23) or rand(1,10)>7:
-				gt 'swamp'
+				gt 'swamp', 'start'
 			else
-				gt 'gadforestswamp','2'
+				gt 'swamp','stuck'
 			end
 		end
-		gt 'gadforestswamp','2'
+		gt 'swamp','stuck'
 	end
 
 	act 'Go into the house':gt 'swamphouse', 'start'
@@ -1037,25 +1033,6 @@ if $ARGS[0] = 'start':
 			act 'Further':gt 'swamp_yard', 'start'
 		end
 	end
-
-	!Forester looking for the missing GG
-	!if lost_girl < 10:
-	!make this trigger after 2 days in swamp house, minus a countdown per hour
-	if StoryLine = 1 and lost_girl > 0 and daystart > lost_girl:
-		*clr & cla
-		minut += 150
-		lost_girl = 0
-		forest_lostday = 0
-		hunters_here = 0
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'
-		'You walked across the yard when noticing a man resembling a park ranger.'
-		'"There you are," he said wearily. "Your grandparents been sick and worried searching for you all over the forest. They''ve asked me to help them out. Come with me, I''ll take you home."'
-		'"Oh, this is so embarrassing..." How could I forget about my poor grandparents."'
-		'You quickly pack your stuff, letting the park ranger take you home...'
-		act 'Further':gt 'gadhouse', 'start'
-	end
 end
 
 if $ARGS[0] = 'campfire':

+ 1 - 1
locations/treeCircle.qsrc

@@ -26,7 +26,7 @@ $treeCircArg['PavlovskPark'] = ''
 !Gadukino Forest Location
 $treeCircName['GadForest'] = 'Gadukino Forest'
 $treeCircLoc['GadForest'] = 'gadforest'
-$treeCircArg['GadForest'] = '1'
+$treeCircArg['GadForest'] = 'forest_edge'
 !Pushkin Park Location
 $treeCircName['PushkinPark'] = 'Pushkin Park'
 $treeCircLoc['PushkinPark'] = 'lug'

Деякі файли не було показано, через те що забагато файлів було змінено