Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/cikl.qsrc

@@ -1301,6 +1301,7 @@ killvar 'kanikuli'
 killvar 'pcs_ate'
 killvar 'pcs_drank'
 
+!! THIS IS THE OLD SYSTEM. Only keeping this in while it''s still in use as reference for the old variables, otherwise THESE VALUES ARE NOT THE CORRECT ONES FOR NEW VARIABLES
 !!sisboyparty
 !!-1 - don''t go to the party
 !!0 - don''t know about parties
@@ -1311,7 +1312,7 @@ killvar 'pcs_drank'
 if storyline = 1:
 !!Party refresh if you didn''t see sis
 	if week = 1 and sisboyparty ! 2:
-		if sisterQW['party'] = -1: sisterQW['party'] = 1
+		if sisterQW['party'] = -1: sisterQW['party'] = 0
 
 		if sisboypartyQW >= 2 and sisboyparty > 0:
 			sisboyparty_day = daystart + rand(3,5)
@@ -1619,7 +1620,7 @@ elseif grandmaQW['chore_gather_both'] = 1 or grandmaQW['chore_gather_both'] = 2:
 	grandmaQW['disappointment'] = 1
 end
 
-!!disappointing grandpa
+!! disappointing grandpa
 if grandpaQW['chore_fetch_firewood'] = 1 or grandpaQW['chore_fetch_firewood'] = 2:
 	grandpaQW['chore_fetch_firewood'] = 0
 	grandpaQW['disappointment'] = 1
@@ -1668,6 +1669,12 @@ elseif grandpaQW['chore_bale_hay'] = 1 or grandpaQW['chore_bale_hay'] = 2:
 	grandpaQW['chore_bale_hay'] = 0
 	grandpaQW['disappointment'] = 1
 end
+
+!! grandparents use root cellar
+if boletus_stored > 0: boletus_stored -= rand(0,1)
+if bilberry_stored > 0: bilberry_stored -= rand(0,1)
+if boletus_stored < 0: boletus_stored = 0
+if bilberry_stored < 0: bilberry_stored = 0
 !! end of new grandparent chore stuff, for 0.8.0
 
 if catout ! 0: catout = 0

locations/gaddvor.qsrc

@@ -31,11 +31,8 @@ if $ARGS[0]='':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/dvor_winter_night.jpg"></center>'
 		end
 	end
-	if StoryLine = 1:
-		'A fenced yard behind your grandparents'' house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where you can take a bath. On the back porch are a few chairs to sit in.'
-	else
-		'A fenced yard behind the house. The yard is surrounded by a small barn packed with junk and a separate building that is used as a banya where people take a bath. On the back porch are a few chairs to sit in.'
-	end
+	*nl
+	'A fenced yard behind your grandparents'' house. The yard contains a small barn, garden, root cellar, and banya where you can bathe.'
 
 	if $clothingworntype = 'nude':
 		*nl
@@ -72,16 +69,16 @@ if $ARGS[0]='':
 				end
 				gs'stat'
 
-				act 'Continue':gt'gaddvor'
+				act 'Finish':gt'gaddvor'
+				act 'Return back to your grandfather': minut += 1 & gt 'gadhouse', 'grandpa'
 			end
 		end
-		if StoryLine = 1:
-			act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
-			act 'Enter the banya':minut += 1 & gt 'gadbana'
-		end
+		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
+		act 'Enter the banya':minut += 1 & gt 'gadbana'
 		act 'Go to the barn':minut += 1 & gt 'gadsarai'
+		act 'Go to the root cellar': minut += 1 & gt 'gaddvor', 'root_cellar'
 		act 'Go to the garden':minut += 1 & gt'gadgarden','garden'
-
+		if grandmaQW['chore_feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):act 'Look at your grandparents'' chickens':gt 'gaddvor','chickens'
 		mira_temp = rand(1,5)
 		if mira_temp = 3 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 1 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
 			*clr & cla
@@ -117,6 +114,96 @@ if $ARGS[0]='':
 
 end
 
+if $ARGS[0] = 'root_cellar':
+	*clr & cla
+	'<center><h4>Root Cellar</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/root_cellar.jpg"></center>'
+	*nl
+	if boletus_stored + bilberry_stored >= 20:
+		'Your grandparents'' root cellar is full.'
+	elseif boletus_stored + bilberry_stored > 0:
+		'Your grandparents'' root cellar is partially full.'
+	else
+		'Your grandparents'' root cellar is empty.'
+	end
+	'Even though your grandparents allow you to store extra mushrooms and berries you pick in here, they reserve the right to use them too, so you aren''t surprised if any go missing day to day.'
+	if boletus_stored > 0: 'You currently are storing <b><<boletus_stored>></b> kg of raw mushrooms.'
+	if bilberry_stored > 0: 'You currently are storing <b><<bilberry_stored>></b> kg of raw berries.'
+	*nl
+	if boletus + boletus_cooked + bilberry >= 5:
+		'Your basket is full and you cannot carry more.'
+	elseif boletus + boletus_cooked + bilberry > 0:
+		'Your basket is partially full.'
+	else
+		'Your basket is empty.'
+	end
+	if boletus > 0: 'You currently are carrying <b><<boletus>></b> kg of raw mushrooms.'
+	if boletus_cooked > 0: 'You currently are carrying <b><<boletus_cooked>></b> kg of cooked mushrooms.'
+	if bilberry > 0: 'You currently are carrying <b><<bilberry>></b> kg of raw berries.'
+
+	act 'Go back to the yard': minut += 1 & gt 'gaddvor'
+	if (boletus_stored + bilberry_stored < 20) and (boletus > 0 or bilberry > 0):
+		act 'Store as many raw mushrooms and berries that will fit (Max 20 kgs):':
+			:store_bb_loop
+			if boletus > 0:
+				boletus_stored += 1
+				boletus -= 1
+				if boletus_stored + bilberry_stored < 20: jump 'store_bb_loop'
+			end
+			if bilberry > 0:
+				bilberry_stored += 1
+				bilberry -= 1
+				if boletus_stored + bilberry_stored < 20: jump 'store_bb_loop'
+			end
+			gt 'gaddvor', 'root_cellar'
+		end
+		if boletus > 0:
+			act 'Store 1 kg of raw mushrooms':
+				boletus_stored += 1
+				boletus -= 1
+				gt 'gaddvor', 'root_cellar'
+			end
+		end
+		if bilberry > 0:
+			act 'Store 1 kg of raw berries':
+				bilberry_stored += 1
+				bilberry -= 1
+				gt 'gaddvor', 'root_cellar'
+			end
+		end
+	end
+	if (boletus_stored > 0 or bilberry_stored > 0) and (boletus + boletus_cooked + bilberry < 5):
+		act 'Retrieve as many raw mushrooms and berries as you can carry (Max 5 kgs)':
+			:retrieve_bb_loop
+			if boletus_stored > 0:
+				boletus += 1
+				boletus_stored -= 1
+				if boletus + boletus_cooked + bilberry < 5: jump 'retrieve_bb_loop'
+			end
+			if bilberry_stored > 0:
+				bilberry += 1
+				bilberry_stored -= 1
+				if boletus + boletus_cooked + bilberry < 5: jump 'retrieve_bb_loop'
+			end
+			gt 'gaddvor', 'root_cellar'
+		end
+		if (boletus_stored > 0 and grandmaQW['chore_can_mushrooms'] ! 1) or (boletus_stored > 5 and grandmaQW['chore_can_mushrooms'] = 1):
+			act 'Retrieve 1 kg of raw mushrooms':
+				boletus += 1
+				boletus_stored -= 1
+				gt 'gaddvor', 'root_cellar'
+			end
+		end
+		if (bilberry_stored > 0 and grandmaQW['chore_can_berries'] ! 1) or (bilberry_stored > 5 and grandmaQW['chore_can_berries'] = 1):
+			act 'Retrieve 1 kg of raw berries':
+				bilberry += 1
+				bilberry_stored -= 1
+				gt 'gaddvor', 'root_cellar'
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'chickens':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens1.jpg"></center>'
@@ -136,6 +223,7 @@ if $ARGS[0] = 'chickens':
 			gs 'stat'
 
 			act 'Finish':gt'gaddvor'
+			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 		end
 	end
 	act 'Leave': gt'gaddvor'

locations/gadfield.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'field':
 	if hour >= 6 and hour <= 20 and grandpaQW['chore_herd_cattle'] = 1:'You see the <a href="exec: gt ''gadfield'',''cow''">herd of cows</a> out in the middle of the field.'
 	if hour >= 7 and hour <= 20 and grandpaQW['chore_bale_hay'] = 1:'You see a crowd of people working on the field.'
 
-	act 'Head back to the road':minut += 10 & gt'gadroad'
+	act 'Head back to the road (0:10)':minut += 10 & gt'gadroad'
 	
 	if hour >= 7 and hour <= 13 and grandpaQW['chore_bale_hay'] = 1:
 		act 'Spend the day helping to bale hay (6:00)':
@@ -72,6 +72,7 @@ if $ARGS[0] = 'field':
 			gs 'stat'
 
 			act 'Continue':gt'gadfield','field'
+			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gadhouse', 'grandpa'
 		end
 	end
 
@@ -105,7 +106,7 @@ if $ARGS[0] = 'horse':
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'To your grandparent''s barn':gt'gadsarai'
+			act 'Continue':gt'gadfield','horse'
 		end
 	end
 end
@@ -139,7 +140,7 @@ if $ARGS[0] = 'cow':
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'To your grandparent''s barn':gt'gadsarai'
+			act 'Continue':gt'gadfield','cow'
 		end
 	end
 	if grandpaQW['chore_herd_cattle'] = 1:
@@ -185,7 +186,7 @@ if $ARGS[0] = 'cow':
 			end
 
 			if mira = 0:
-				act 'Take a run on the field (1:00)':
+				act 'Go for a run in the field (1:00)':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_run.jpg"></center>'
@@ -306,7 +307,7 @@ if $ARGS[0] = 'cow':
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'Herd the cows to the river':gt'gadfield','cow2'
+			act 'Herd the cows nearer to the river (0:15)': minut += 15 & gt'gadfield','cow2'
 		end
 	end
 end
@@ -456,7 +457,7 @@ if $ARGS[0] = 'cow2':
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
-			act 'Herd the cows to the forest':gt'gadfield','cow3'
+			act 'Herd the cows nearer to the forest (0:30)': minut += 15 & gt'gadfield','cow3'
 		end
 	end
 end
@@ -506,7 +507,7 @@ if $ARGS[0] = 'cow3':
 				act 'Continue':gt'gadfield','cow3'
 			end
 			if mira = 0:
-				act 'Take a run on the field (1:00)':
+				act 'Go for a run in the field (1:00)':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_run.jpg"></center>'

locations/gadforest.qsrc

@@ -169,7 +169,7 @@ if $ARGS[0] = 'forest_edge':
 	!	end
 	!end
 
-	act 'Leave the woods':
+	act 'Leave the woods (0:15)':
 		! Allow Mira to continue on her schedule as normal if the player was keeping her here for events
 		if MiraLoc = 3:
 			Mira_Stay = 0
@@ -250,7 +250,7 @@ if $ARGS[0] = 'forest_edge':
 						'No one saw you outside naked, but there''s a thrill in almost getting caught.'
 					end
 
-					act 'Continue home to your grandparents':
+					act 'Continue home to your grandparents (0:30)':
 						minut += 30
 						gs 'stat'
 
@@ -269,7 +269,7 @@ if $ARGS[0] = 'forest_edge':
 					'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':
+					act 'Leave (0:15)':
 						minut += 15
 						gs 'stat'
 
@@ -292,7 +292,7 @@ if $ARGS[0] = 'forest_edge':
 					*nl
 					'You decide to change back into your clothes rather than try to get home through the village naked.'
 
-					act 'Leave':
+					act 'Leave (0:15)':
 						minut += 15
 						gs 'stat'
 
@@ -314,21 +314,21 @@ if $ARGS[0] = 'forest_edge':
 
 	! 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'
+		act 'Go further into the forest (0:15)': minut += 15 & gt 'gadforest','forest_outskirts'
 	end
 
 	gs 'bicycle', 'gadforest'
 
 	! 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'
+		act 'Go to the meadow (0:20)': 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
 
 	! 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':
+		act 'Go to the hunters cabin(1:00)':
 			! 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'
@@ -418,9 +418,9 @@ if $ARGS[0] = 'forest_outskirts':
 	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 'Head back out of the forest': minut += 15 & gt 'gadforest', 'forest_edge'
+	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_edge'
 
-	act 'Go further into the forest': minut += 15 & gt 'gadforest','forest_center'
+	act 'Go further into the forest (0:15)': minut += 15 & gt 'gadforest','forest_center'
 
 	! 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'
@@ -499,9 +499,9 @@ if $ARGS[0] = 'forest_center':
 	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 'Head back out of the forest': minut += 15 & gt 'gadforest', 'forest_outskirts'
+	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_outskirts'
 
-	act 'Go further into the swamp': minut += 15 & gt 'swamp', 'start'
+	act 'Go further into the swamp (0:15)': minut += 15 & gt 'swamp', 'start'
 
 	! 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'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'stripping':
 		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':
+				act 'Strip Naked with Mira (0:05)':
 					*clr & cla
 					menu_off = 1
 					minut += 5
@@ -631,7 +631,7 @@ if $ARGS[0] = 'stripping':
 		else
 			! 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':
+				act 'Strip Naked (0:05)':
 					*clr & cla
 					menu_off = 1
 					minut += 5
@@ -668,7 +668,7 @@ 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':
+			act 'Get dressed (0:05)':
 				*clr & cla
 				menu_off = 1
 				minut += 5
@@ -691,7 +691,7 @@ if $ARGS[0] = 'dressing':
 		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':
+				act 'Wear your abandoned clothing (0:05)':
 					*clr & cla
 					menu_off = 1
 					minut += 5
@@ -712,7 +712,7 @@ if $ARGS[0] = 'dressing':
 					end
 				end
 			else
-				act 'Pick up your abandoned clothing':
+				act 'Pick up your abandoned clothing (0:05)':
 					cla
 					menu_off = 1
 					minut += 5

locations/gadgarden.qsrc

@@ -52,6 +52,7 @@ if $ARGS[0] = 'garden':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/work_garden'+rand(1,5)+'.jpg"></center>'
 			'You spend some time doing some gardening.'
 			act 'Finish':gt'gadgarden','garden'
+			act 'Return back to your grandmother': minut += 2 & gt 'gadhouse', 'grandma'
 		end
 	end
 	!job Granny
@@ -71,6 +72,7 @@ if $ARGS[0] = 'garden':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/water_garden.jpg"></center>'
 			'You spend an hour watering the garden.'
 			act 'Finish':gt'gadgarden','garden'
+			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 		end
 	end
 	!job Granny
@@ -90,6 +92,7 @@ if $ARGS[0] = 'garden':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/harvest_garden'+rand(1,5)+'.jpg"></center>'
 			'You spend a few hours harvesting vegetables in the garden.'
 			act 'Finish':gt'gadgarden','garden'
+			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 		end
 	end
 end
@@ -162,6 +165,7 @@ if $ARGS[0] = 'strawberry':
 			'You wander through the plot for several hours, collecting ripe strawberries and placing them in the basket.'
 
 			act 'Finish':gt'gadgarden','strawberry'
+			act 'Return back to your grandmother': minut += 3 & gt 'gadhouse', 'grandma'
 		end
 	end
 end
@@ -227,6 +231,7 @@ if $ARGS[0] = 'fruit_garden':
 			'You walk around the orchard and pick the ripe fruit hanging from the trees.'
 
 			act 'Finish':gt 'gadgarden','fruit_garden'
+			act 'Return back to your grandmother': minut += 3 & gt 'gadhouse', 'grandma'
 		end
 	end
 end

locations/gadhouse.qsrc

@@ -356,23 +356,12 @@ if $ARGS[0] = 'main':
 		'Your grandparents are asleep. They sleep in separate beds, which is quite strange since they''re still madly in love with each other.'
 	end
 
-
 	if mira_guest = 1: MiraLoc = 6 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
 	gs 'stat'
 	gs 'themes', 'indoors'
 	gs 'kit_din'
 
-	!125s
-	!{
-	!New family system, skip for now.
-	gs 'zz_family', 'father_sheduler'
-	if $father['location'] = $curloc and home_owned[2] = 1:
-		'Your parents room.'
-		gs 'gadhouse', 'go_home'
-	end
-	}
-
 	gs 'gadhouse', 'family_trip'
 
 	if $clothingworntype ! 'nude':
@@ -417,6 +406,7 @@ if $ARGS[0] = 'main':
 			'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'
+			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 		end
 	end
 
@@ -438,6 +428,7 @@ 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'
+				act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 			end
 		end
 	end
@@ -529,7 +520,7 @@ if $ARGS[0] = 'grandma':
 				minut += 45
 				gs'stat'
 
-				grandmaQW['chore_mushrooms_given'] -= 6
+				boletus_stored -= 5
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_mushrooms.jpg"></center>'
 				'You tell Grandma you are ready to help her can mushrooms now.'
 				'She smiles and gives you a basket of mushrooms. You spend a while cleaning them, washing them, and cutting them up, in preparation for canning.'
@@ -562,7 +553,7 @@ if $ARGS[0] = 'grandma':
 				minut += 45
 				gs'stat'
 
-				grandmaQW['chore_berries_given'] -= 5
+				bilberry_stored -= 5
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_berries.jpg"></center>'
 				'Grandma gives you a basket of berries and you spend a while cleaning them, removing stems, and picking out any shriveled or bad ones.'
 				act 'Continue':
@@ -834,14 +825,14 @@ if $ARGS[0] = 'grandma':
 				*clr & cla
 				grandmaQW['help_amount'] += 3
 				boletus -= grandmaQW['chore_mushroom_quantity']
-				grandmaQW['chore_mushrooms_given'] += grandmaQW['chore_mushroom_quantity']
+				boletus_stored += grandmaQW['chore_mushroom_quantity']
 				minut += 5
 				grandmaQW['chore_gather_mushrooms'] = 0
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You bring the basket of mushrooms to your grandmother and say, "Grandma, here are the mushrooms you wanted!"'
-				'She smiles and takes them from you. "Thank you my sweet girl."'
+				'She smiles and takes them from you. "Thank you my sweet girl. They will have to go down in the root cellar until we are ready to can them."'
 				'"Do you think that will be enough?"'
 				'She laughs. "Oh, with your grandfather around, it is never enough!"'
 				'"I can get more, if you want me to."'
@@ -857,7 +848,7 @@ if $ARGS[0] = 'grandma':
 				*clr & cla
 				grandmaQW['help_amount'] += 3
 				bilberry -= grandmaQW['chore_berry_quantity']
-				grandmaQW['chore_berries_given'] += grandmaQW['chore_berry_quantity']
+				bilberry_stored += grandmaQW['chore_berry_quantity']
 				minut += 5
 				grandmaQW['chore_gather_berries'] = 0
 				gs 'stat'
@@ -865,7 +856,7 @@ if $ARGS[0] = 'grandma':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You walk over to Grandma and set the heavy basket of berries on the ground next to her.'
 				'"Grandma, I got all the berries!"'
-				'"Oh, thank you, <<$pcs_nickname>>," Grandma replied. "Those look perfect. Be a dear and set them in the kitchen, please?"'
+				'"Oh, thank you, <<$pcs_nickname>>," Grandma replied. "Those look perfect.  They will have to go down in the root cellar until we are ready to can them."'
 				'You heft the basket up and carry it in the kitchen. Walking back over to Grandma, you ask, "Do you think that will be enough for the winter?"'
 				'"Oh no dear," your Grandma says, "the winter is long and cold and you must gather as much as you can, while you can."'
 				'Seeing the dismayed look on your face, she adds, "But that is enough for today! I know it is harder work than it seems. You can rest now, child."'
@@ -881,8 +872,8 @@ if $ARGS[0] = 'grandma':
 				grandmaQW['help_amount'] += 3
 				boletus -= grandmaQW['chore_mushroom_quantity']
 				bilberry -= grandmaQW['chore_berry_quantity']
-				grandmaQW['chore_mushrooms_given'] += grandmaQW['chore_mushroom_quantity']
-				grandmaQW['chore_berries_given'] += grandmaQW['chore_berry_quantity']
+				boletus_stored += grandmaQW['chore_mushroom_quantity']
+				bilberry_stored += grandmaQW['chore_berry_quantity']
 				minut += 5
 				grandmaQW['chore_gather_both'] = 0
 				gs 'stat'
@@ -890,7 +881,7 @@ if $ARGS[0] = 'grandma':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You bring your basket, heavy with mushrooms and berries from the forest, over to your grandmother.'
 				'"Grandma, here are the mushrooms and berries, just like you asked!"'
-				'"Oh, thank you very much, <<$pcs_nickname>>," your Grandma replied.'
+				'"Oh, thank you very much, <<$pcs_nickname>>, they will have to go down in the root cellar until we are ready to can them," your Grandma replied.'
 				'"Do I need to go out on another run, or do you think that''s enough?"'
 				'"Well, little one," your Grandma says, "There is a difference between enough, and enough for today."'
 				'"Oh..." you say, unsure of what to make of her response.'
@@ -1224,6 +1215,7 @@ if $ARGS[0]='grandpa':
 				*clr & cla
 				grandmaQW['help_amount'] += 3
 				boletus -= grandpaQW['chore_mushroom_quantity']
+				boletus_stored += grandpaQW['chore_mushroom_quantity']
 				minut += 5
 				grandpaQW['chore_gather_mushrooms'] = 0
 				gs 'stat'
@@ -1233,7 +1225,7 @@ if $ARGS[0]='grandpa':
 				'"Grandpa, here are the mushrooms!"'
 				'"Thank you <<$pcs_nickname>>, you''ve made an old man very happy," your grandfather replies with a smile. "The mushrooms are in a part of the forest that is difficult to reach."'
 				'"I can still go and gather more mushrooms, if you want?"'
-				'"There''s no need <<$pcs_nickname>>," said your grandfather. "But if I need some help, I''ll be sure to let you know."'
+				'"There''s no need <<$pcs_nickname>>," said your grandfather. "But if I need some help, I''ll be sure to let you know. They will have to go down in the root cellar until your grandmother is ready to can them."'
 				'You kiss your grandfather on the cheek and get on with your day.'
 
 				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
@@ -1245,6 +1237,7 @@ if $ARGS[0]='grandpa':
 				*clr & cla
 				grandmaQW['help_amount'] += 3
 				bilberry -= grandpaQW['chore_berry_quantity']
+				bilberry_stored += grandpaQW['chore_berry_quantity']
 				minut += 5
 				grandpaQW['chore_gather_berries'] = 0
 				gs 'stat'
@@ -1254,7 +1247,7 @@ if $ARGS[0]='grandpa':
 				'"Grandpa, here are the berries!"'
 				'"Oh, thank you, nicely done," Grandpa replied. "It''s hard for your grandmother to gather the berries, and she needs them so she can make jam for the winter."'
 				'"If you need some more berries I''ll be glad to go out and gather more."'
-				'"There''s no need <<$pcs_nickname>>," your grandfather said. "But if your grandma needs some more berries, I''ll let you know."'
+				'"There''s no need <<$pcs_nickname>>," your grandfather said. "But if your grandma needs some more berries, I''ll let you know. They will have to go down in the root cellar until your grandmother is ready to can them."'
 				'You kiss your grandfather on the cheek, you go on with your business.'
 
 				act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
@@ -1267,6 +1260,8 @@ if $ARGS[0]='grandpa':
 				grandmaQW['help_amount'] += 3
 				boletus -= grandpaQW['chore_mushroom_quantity']
 				bilberry -= grandpaQW['chore_berry_quantity']
+				boletus_stored += grandpaQW['chore_mushroom_quantity']
+				bilberry_stored += grandpaQW['chore_berry_quantity']
 				minut += 5
 				grandpaQW['chore_gather_both'] = 0
 				gs 'stat'
@@ -1276,7 +1271,7 @@ if $ARGS[0]='grandpa':
 				'"Grandpa, here are the mushrooms and berries!"'
 				'"Oh, thank you <<$pcs_nickname>>," your grandfather replied.'
 				'"If you want, I can go out for another run."'
-				'"You don''t need to do that, <<$pcs_nickname>>," your grandfather said. "But I''ll be sure to let you know if something comes up."'
+				'"You don''t need to do that, <<$pcs_nickname>>," your grandfather said. "But I''ll be sure to let you know if something comes up. They will have to go down in the root cellar until your grandmother is ready to can them."'
 				'You give him a smooch on the cheek and go on with your day.'
 
 				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'

locations/gadmarket.qsrc

@@ -57,7 +57,8 @@ if grandmaQW['chore_groceries'] = 1:
 		'You take your basket of goods up to the teller and explain that you are getting these things for your grandmother.'
 		'"Of course! Go ahead and take these on home to her. Tell her I will be by this evening to pick up her payment. I know it''s hard for her to get out any more..."'
 		
-		act 'Thank him and take the groceries back to the house (0:15)':minut += 15 & gt 'gadhouse','start'
+		act 'Thank him and leave': minut += 5 & gt 'gadukino'
+		act 'Thank him and take the groceries back to your grandmother (0:10)':minut += 10 & gt 'gadhouse','grandma'
 	end
 end
 

locations/gadriver.qsrc

@@ -136,11 +136,11 @@ if $ARGS[0] = 'start':
 				act 'Finish': gt'gadukino'
 			end
 		else
-			act 'Go to Gadukino':minut += 20 & MiraLoc ! 1 & gt 'gadukino'
+			act 'Go to the road (0:10)':minut += 20 & MiraLoc ! 1 & gt 'gadroad'
 			act 'Go to the beach':gt 'gadriver', 'gadbitch'
 		end
 	else
-		act 'Go to Gadukino':minut += 20 & MiraLoc ! 1 & gt 'gadukino'
+		act 'Go to the road (0:10)':minut += 20 & MiraLoc ! 1 & gt 'gadugadroadkino'
 		act 'Go to the beach':gt 'gadriver', 'gadbitch'
 	end
 end
@@ -190,7 +190,7 @@ if $ARGS[0] = 'gadbitch':
 
 	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and rand(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''gadriver'', ''GuysRiver'' ">Bob Colby</a> is resting on the riverbank.'
 
-	act 'Go back to the river':
+	act 'Go back to the river (0:05)':
 		cla
 		if $clothingworntype = 'swimwear':
 			cla
@@ -572,7 +572,7 @@ if $ARGS[0] = 'gadbitch':
 			end
 		end
 		if grandpaQW['chore_bathe_horse_prog'] = 2:
-			act 'Lead Desperado back home':
+			act 'Lead Desperado back home (0:30)':
 				if $clothingworntype = 'swimwear':
 					cla
 					'You need to dress in regular clothes first.'
@@ -588,7 +588,7 @@ if $ARGS[0] = 'gadbitch':
 					grandpaQW['chore_bathe_horse_prog'] = 0
 					gs 'stat'
 
-					gt'gadsarai'
+					gt'gadsarai','horse'
 				end
 			end
 		end

locations/gadroad.qsrc

@@ -55,10 +55,10 @@ if $ARGS[0] = '':
 		end
 	end
 
-	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'
+	act 'Go back to Gadukino (0:10)':minut += 10 & gt'gadukino'
+	act 'Walk down to the river (0:10)':minut += 10 & gt 'gadriver', 'start'
+	act 'Go into the woods (0:15)':minut += 15 & gt'gadforest','forest_edge'
+	act 'Go to the fields (0:10)':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)':
 			*clr & cla

locations/gadsarai.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = '':
 	menu_off = 0
 	$location_type = 'secluded'
 
-	'<center><h4>Old Barn</h4></center>'
+	'<center><h4>Grandparents'' Barn</h4></center>'
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/sarai.jpg"></center>'
@@ -22,24 +22,10 @@ if $ARGS[0] = '':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/sarai_winter_night.jpg"></center>'
 		end
 	end
-	'An old junk filled barn that could hold some useful items.'
-
-	if month > 4 and month < 10:
-		if hour > 9 and hour < 20:
-			'On your right is a cattle barn.'
-		else
-			'On your right is a <a href="exec: gt ''gadsarai'',''cow'' ">cattle</a> barn.'
-		end
-		if hour > 9 and hour < 20 and week < 6 or grandpaQW['chore_bathe_horse'] = 2:
-			'On your left is a horse stable.'
-		else
-			'On your left is a <a href="exec: gt ''gadsarai'',''horse'' ">horse</a> stable.'
-		end
-	else
-		'On your right is a <a href="exec: gt ''gadsarai'',''cow'' ">cattle</a> barn.'
-		'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.'
+	'Your grandparents old barn that could hold some useful items if you spend some time searching.'
+	'The right side of the barn is piled high with various boxes, barrels, and chests of items.'
+	'You can store some extra mushrooms and berries here if you don''t want to carry them around all the time.'
+	'The left side of the barn has the stalls for your grandparents horse, cow, and boar.'
 
 	gs 'bicycle', 'gadsarai'
 	clr
@@ -58,138 +44,163 @@ if $ARGS[0] = '':
 			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry.'
 			grandpaQW['chore_fetch_firewood'] = 2
 			minut += 10
-			grandmaQW['help_amount'] += 1
 			gs'stat'
 
-			act 'Continue':gt 'gadsarai'
+			act 'Finish':gt 'gadsarai'
+			act 'Return back to your grandfather': minut += 2 & gt 'gadhouse', 'grandpa'
 		end
 	end
+	if (month < 4 or month > 10) or (hour < 9 or hour > 20) or (grandpaQW['chore_feed_horse'] = 1 or grandpaQW['chore_brush_horse'] = 1 or grandpaQW['chore_lead_horse_to_field'] = 1 or grandpaQW['chore_bathe_horse'] = 1):
+		act 'Enter the horses stall': gt 'gadsarai', 'horse'
+	end
+	if (month < 4 or month > 10) or (hour < 9 or hour > 20) or (grandpaQW['chore_feed_cow'] = 1 or grandmaQW['chore_milk_cow'] or grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1):
+		act 'Enter the cows stall': gt 'gadsarai', 'cow'
+	end
+	act 'Enter the boars stall': gt 'gadsarai', 'horse'
+	act 'Search around in the barn (0:15)': gt 'gadsarai', 'search'
+	if vcard > 0: act 'View your vintage porn cards': $card_loc = 'gadsarai' & card_deck = 0 & gt 'card'
+	if card > 0: act 'View your new porn cards': $card_loc = 'gadsarai' & card_deck = 1 & gt 'card'
+	if pcs_horny >= 50:	act 'Masturbate':gt 'selfplay', 'start'
+!!	Serpent is not ready yet, so remarking out til then.
+!!	if findneck = 1: act 'You hear a scraping noice above you.':gt 'serpent'
+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'
+if $ARGS[0] = 'search':
+	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 BikeLoc = 0 and rand(0,10) >= 6:
 		*clr & cla
-		minut += 15
+		BikeLoc = 1
+		observ_exp += 3
 		gs 'stat'
-		if BikeLoc = 0:
-			*clr & cla
-			if rand(0,8) >= 7:
-				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.'
-				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 vcard = 0 and vcard_trash = 0:
-			*clr & cla
-			if rand(0,5) >= 4:
-				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
-				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 findbag = 0 and bag = 0:
-			*clr & cla
-			if rand(0,10) > 9:
-				findbag = 1
-				observ_exp += 3
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/purses/cheap/5.jpg"></center>'
-				'In a far corner of the barn you find a hessian sack filled with mostly junk, but at the bottom you find a good quality messenger bag.'
-				cheap_purses[5] = 1
-				$currentpursetype = 'cheap'
-				currentpursenumber = 5
-				'You can use this cool looking bag as a handbag.'
-			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':
-				if findbag = 1: bag = 1
-				gt 'gadsarai'
-			end
-		elseif findbraclet = 0:
-			*clr & cla
-			if rand(0,15) >= 14:
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bracelet.jpg"></center>'
-				'While looking through the barn you spot a glint of metal under a pile of wood. Upon closer inspection you see a bracelet made of silver and crafted into the likeness of a snake. Strange, but cool that you would find something this valuable in the barn.'
-				findbraclet = 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 findbraclet > 0 and findneck = 0:
-			*clr & cla
-			if rand(0,20) >= 19:
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
-				if altQS = 1:
-					'While looking through the barn your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The feeling of power is coming from within the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
-				else
-					'While looking through the barn your foot goes through a rotten floorboard and gets stuck. As you work your foot free, you glimpse something underneath the floor - a box or something. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The exotic look of the box gives you gooseflesh and you find yourself holding your breath as you prepare to open the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You let your breath out slowly as you tilt the necklace from side to side, watching the light sparkle as it is reflected by the facets on the deep red rubies. You cannot begin to guess what this necklace must be worth.'
-				end
-				findneck = 1
-				observ_exp += 3
-			else
-				*clr & cla
-				gs 'stat'
-				'<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'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findbike.jpg"></center>'
+		*nl
+		'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.'
+	elseif findbag = 0 and bag = 0 and rand(0,10) >= 7:
+		*clr & cla
+		findbag = 1
+		if findbag = 1: bag = 1
+		observ_exp += 3
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/pc/purses/cheap/5.jpg"></center>'
+		*nl
+		'In a far corner of the barn you find a hessian sack filled with mostly junk, but at the bottom you find a good quality messenger bag.'
+		'You can use this cool looking bag as a handbag.'
+		cheap_purses[5] = 1
+		$currentpursetype = 'cheap'
+		currentpursenumber = 5
+	elseif vcard = 0 and vcard_trash = 0 and rand(0,10) >= 8:
+		*clr & cla
+		vcard = 1
+		observ_exp += 3
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vcards.jpg"></center>'
+		*nl
+		'"Hmm, what''s this?" You''ve found an unopened deck of vintage adult playing cards, still in its original cellophone wrapper.'
+	elseif findbraclet = 0 and rand(0,10) >= 9:
+		*clr & cla
+		findbraclet = 1
+		observ_exp += 3
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bracelet.jpg"></center>'
+		*nl
+		'While looking through the barn you spot a glint of metal under a pile of wood. Upon closer inspection you see a bracelet made of silver and crafted into the likeness of a snake. Strange, but cool that you would find something this valuable in the barn.'
+	elseif findbraclet > 0 and findneck = 0 and rand(0,10) >= 10:
+		*clr & cla
+		findneck = 1
+		observ_exp += 3
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
+		*nl
+		if altQS = 1:
+			'While looking through the barn your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The feeling of power is coming from within the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
 		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.'
-			act 'Leave and get some fresh air':gt 'gadsarai'
+			'While looking through the barn your foot goes through a rotten floorboard and gets stuck. As you work your foot free, you glimpse something underneath the floor - a box or something. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The exotic look of the box gives you gooseflesh and you find yourself holding your breath as you prepare to open the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You let your breath out slowly as you tilt the necklace from side to side, watching the light sparkle as it is reflected by the facets on the deep red rubies. You cannot begin to guess what this necklace must be worth.'
 		end
+	else
+		observ_exp += rand(0,1)
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/junk_barn.jpg"></center>'
+		*nl
+		'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
-
-	if vcard > 0: act 'View your vintage porn cards': $card_loc = 'gadsarai' & card_deck = 0 & gt 'card'
-	if card > 0: act 'View your new porn cards': $card_loc = 'gadsarai' & card_deck = 1 & gt 'card'
-
-	if pcs_horny >= 50:	act 'Masturbate':gt 'selfplay', 'start'
-
-!! Serpent is not ready yet, so remarking out til then.
-!!	if findneck = 1:
-!!		act 'You hear a scrapping noice above you.':gt 'serpent'
-!!	end
+	act 'Finish':gt 'gadsarai'
 end
 
-if $ARGS[0] = 'boar':
+if $ARGS[0] = 'horse':
 	*clr & cla
 	minut += 1
 	gs 'stat'
 
-	'<center><H4>The barn</H4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
-	'One of your grandparents'' dearest possessions: the boar, Nickle.'
+	'<center><h4>Grandparents'' Barn</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
+	'Grandfather''s trusted workhorse, Desperado.'
 
-	act 'Leave':minut += 5 & gt 'gadsarai'
+	act 'Leave':minut += 1 & gt 'gadsarai'
 
-	if grandpaQW['chore_feed_boar'] = 1:
-		act 'Feed the hog':
-			cla
-			*clr
+	if grandpaQW['chore_feed_horse'] = 1:
+		act 'Feed the horse (0:30)':
+			*clr & cla
 			minut += 30
-			grandpaQW['chore_feed_boar'] = 2
-			hndiwrk_exp += rand(0,3)
+			grandpaQW['chore_feed_horse'] = 2
+			hndiwrk_exp += rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_boar.jpg"></center>'
-			'You grab the feed bag and fill Nickle''s trough. You stand there and watch for a few minutes as he eats like a... well, like a pig.'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_horse.jpg"></center>'
+			'You grab a sack of grain and fill Desperado''s feed bucket. You hang the bucket from his stall and gently pat his nose as he begins to eat.'
+			'You watch him eat for a little while before moving on.'
 
-			act 'Finish':gt 'gadsarai','boar'
+			act 'Finish':gt 'gadsarai','horse'
+			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
+		end
+	end
+	if grandpaQW['chore_lead_horse_to_field'] = 1:
+		act 'Lead the horse to the field (1:00)':
+			*clr & cla
+			minut += 60
+			grandpaQW['chore_lead_horse_to_field'] = 2
+			hndiwrk_exp += rand(1,3)
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
+			'You take Desperado by the bridle and lead him to the field. There, you let him free in the paddock area, and watch him run about for a bit before moving on.'
+
+			act 'Continue':gt'gadfield','field'
+			act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gadhouse', 'grandpa'
+		end
+	end
+	if grandpaQW['chore_bathe_horse'] = 1:
+		act 'Lead the horse to the river (0:30)':
+			*clr & cla
+			minut += 30
+			grandpaQW['chore_bathe_horse_prog'] = 1
+			hndiwrk_exp += rand(1,3)
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
+			'You take Desperado by the bridle and lead him to the river.'
+
+			act 'Continue':gt'gadriver', 'gadbitch'
+		end
+	end
+	if grandpaQW['chore_bathe_horse'] = 2:
+		act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
+	end
+	if grandpaQW['chore_brush_horse'] = 1:
+		act 'Groom the horse (1:00)':
+			*clr & cla
+			minut += 60
+			grandpaQW['chore_brush_horse'] = 2
+			hndiwrk_exp += rand(1,3)
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/comb_horse.jpg"></center>'
+			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. You are satisfied with the result - he is looking as clean and healthy as ever.'
+
+			act 'Finish':gt 'gadsarai','horse'
+			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
 		end
 	end
 end
@@ -199,48 +210,48 @@ if $ARGS[0] = 'cow':
 	minut += 1
 	gs 'stat'
 
-	'<center><H4>The barn</H4></center>'
+	'<center><h4>Grandparents'' Barn</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
-	'Grandma''s favorite animal, the cow Dawn.'
+	*nl
+	'Grandma''s favorite animal, the cow, Dawn.'
 
-	act 'Leave':minut += 5 & gt 'gadsarai'
+	act 'Leave':minut += 1 & gt 'gadsarai'
 
 	if grandmaQW['chore_milk_cow'] = 1:
-		act 'Milk the cow':
-			cla
-			*clr
+		act 'Milk the cow (0:30)':
+			*clr & cla
 			minut += 30
 			grandmaQW['chore_milk_cow'] = 2
-			hndiwrk_exp += rand(0,3)
+			hndiwrk_exp += rand(1,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/milk_cow.jpg"></center>'
 			'You start milking Dawn, improving for each time you do it.'
 
-			act 'Continue':gt 'gadsarai','cow'
+			act 'Finish':gt 'gadsarai','cow'
+			act 'Return back to your grandmother': minut += 3 & gt 'gadhouse', 'grandma'
 		end
 	end
 	if grandpaQW['chore_feed_cow'] = 1:
-		act 'Feed the cow':
-			cla
-			*clr
+		act 'Feed the cow (0:30)':
+			*clr & cla
 			minut += 30
 			grandpaQW['chore_feed_cow'] = 2
-			hndiwrk_exp += rand(0,3)
+			hndiwrk_exp += rand(1,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_cow.jpg"></center>'
 			'Dawn is obviously excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump a sizable amount of hay in her trough and watch as she digs in.'
 
-			act 'Continue':gt 'gadsarai','cow'
+			act 'Finish':gt 'gadsarai','cow'
+			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
 		end
 	end
 	if grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1:
-		act 'Lead the cow to the field':
-			cla
-			*clr
+		act 'Lead the cow to the field (1:00)':
+			*clr & cla
 			minut += 60
-			hndiwrk_exp += rand(0,3)
+			hndiwrk_exp += rand(1,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
@@ -251,84 +262,37 @@ if $ARGS[0] = 'cow':
 			if grandpaQW['chore_herd_cattle'] = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
 
 			act 'Continue':gt'gadfield','cow'
+			if grandpaQW['chore_lead_cow_to_field'] = 2: act 'Return back to your grandfather (0:30)': minut += 30 & gt 'gadhouse', 'grandpa'
 		end
 	end
-
 end
 
-if $ARGS[0] = 'horse':
+if $ARGS[0] = 'boar':
 	*clr & cla
 	minut += 1
 	gs 'stat'
 
-	'<center><H4>The barn</H4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
-	'Grandfather''s trusted assistant, the horse Desperado.'
-
-
-	if grandpaQW['chore_feed_horse'] = 1:
-		act 'Feed the horse':
-			cla
-			*clr
-			minut += 30
-			grandpaQW['chore_feed_horse'] = 2
-			hndiwrk_exp += rand(0,3)
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_horse.jpg"></center>'
-			'You grab a sack of grain and fill Desperado''s feed bucket. You hang the bucket from his stall and gently pat his nose as he begins to eat.'
-			'You watch him eat for a little while before moving on.'
-
-			act 'Continue':gt 'gadsarai','horse'
-		end
-	end
-	if grandpaQW['chore_lead_horse_to_field'] = 1:
-		act 'Lead the horse to the field':
-			cla
-			*clr
-			minut += 60
-			grandpaQW['chore_lead_horse_to_field'] = 2
-			hndiwrk_exp += rand(0,3)
-			gs 'stat'
+	'<center><h4>Grandparents'' Barn</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
+	'One of your grandparents'' dearest possessions, the boar, Nickle.'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
-			'You take Desperado by the bridle and lead him to the field. There, you let him free in the paddock area, and watch him run about for a bit before moving on.'
+	act 'Leave':minut += 1 & gt 'gadsarai'
 
-			act 'Continue':gt'gadfield','field'
-		end
-	end
-	if grandpaQW['chore_bathe_horse'] = 1 and sunWeather = 1 and temper >= 15:
-		act 'Lead the horse to the river':
-			cla
-			*clr
+	if grandpaQW['chore_feed_boar'] = 1:
+		act 'Feed the hog (0:30)':
+			*clr & cla
 			minut += 30
-			grandpaQW['chore_bathe_horse_prog'] = 1
-			hndiwrk_exp += rand(0,3)
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
-			'You take Desperado by the bridle and lead him to the river.'
-
-			act 'Continue':gt'gadriver', 'gadbitch'
-		end
-	end
-	if grandpaQW['chore_brush_horse'] = 1:
-		act 'Groom the horse':
-			cla
-			*clr
-			minut += 60
-			grandpaQW['chore_brush_horse'] = 2
-			hndiwrk_exp += rand(0,3)
+			grandpaQW['chore_feed_boar'] = 2
+			hndiwrk_exp += rand(1,3)
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/comb_horse.jpg"></center>'
-			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. You are satisfied with the result - he is looking as clean and healthy as ever.'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_boar.jpg"></center>'
+			'You grab the feed bag and fill Nickle''s trough. You stand there and watch for a few minutes as he eats like a... well, like a pig.'
 
-			act 'Continue':gt 'gadsarai','horse'
+			act 'Finish':gt 'gadsarai','boar'
+			act 'Return back to your grandfather': minut += 3 & gt 'gadhouse', 'grandpa'
 		end
 	end
-
-	act 'Go':minut += 5 & gt'gadsarai'
 end
 
 --- gadsarai ---------------------------------

locations/gadukino.qsrc

@@ -108,10 +108,10 @@ if $ARGS[0] = '':
 		*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 from nine until noon.'
+			if hour >= 6 and hour <= 16:
+				'An old farm truck is parked halfway off one of the roads nearby. The farmer who owns it will buy <a href="exec: gt ''gadukino'',''collection_point''">mushrooms and berries</a> from the locals to sell back in the city. He makes multiple trips from Gadukino to the city each day to ensure the freshest produce so he can be found from 6 am to 4 pm.'
 			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.'
+				'This time of year, a truck usually comes by multiple times per day between 6 am and 4 pm to purchase mushrooms and berries from the locals.'
 			end
 		else
 			'During the summer, a truck usually comes into town from the city to buy fresh mushrooms and berries from the locals. It''s not the right season for it right now though.'
@@ -127,8 +127,11 @@ if $ARGS[0] = '':
 			'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
 			'One of the building facing the square has a sign saying General Store. A sign in the door proclaims it "CLOSED". It looks like the only place in the village to buy goods.'
 		end
+
+		act 'Walk to the forest road (0:10)':minut += 10 & gt 'gadroad'
+		act 'Walk to the highway (0:15)':minut += 15 & nroad = 10 & gt 'road'
 		if hour >= 6 and hour < 20:
-			act 'Walk through the village':
+			act 'Walk around the village (0:15)':
 				*clr & cla
 				minut += 15
 				menu_off = 1
@@ -144,14 +147,64 @@ if $ARGS[0] = '':
 				end
 			end
 		end
-
-		act 'Walk to the forest road':minut += 10 & gt 'gadroad'
+		if month >= 6 and month <= 9 and hour >= 6 and hour <= 16: act 'Sell mushrooms and berries': gt 'gadukino','collection_point'
 		!!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:
+		if (hour <= 5 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'
 		end
+	end
+end
+
+if $ARGS[0] = 'collection_point':
+	*clr & cla
+	menu_off = 1
+	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 25<b>₽</b>/kg, berries 25<b>₽</b>/kg"'
+
+	act 'Go back to the village center':minut += 1 & gt 'gadukino'
+	if boletus > 0 and bilberry > 0:
+		act 'Sell all your mushrooms and berries':
+			*clr & cla
+			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*25+bilberry*25>> <b>₽</b>.'
+			gs 'stat'
+
+			act'Continue':boletus = 0 &  bilberry = 0 & gt 'gadukino','collection_point'
+		end
+	end
+	if boletus > 0:
+		act 'Sell all your mushrooms':
+			*clr & cla
+			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*25>> <b>₽</b>.'
+			gs 'stat'
 
-		act 'Walk to the highway':minut += 15 & nroad = 10 & gt 'road'
+			act'Continue':boletus = 0 & gt 'gadukino','collection_point'
+		end
+	end
+	if bilberry > 0:
+		act 'Sell all your berries':
+			*clr & cla
+			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*25>> <b>₽</b>.'
+			gs 'stat'
+
+			act'Continue':bilberry = 0 & gt 'gadukino','collection_point'
+		end
 	end
 end
 
@@ -638,58 +691,5 @@ if $ARGS[0] = 'other_events':
 	end
 end
 
-if $ARGS[0] = 'collection_point':
-	*clr & cla
-	menu_off = 1
-	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 25<b>₽</b>/kg, berries 25<b>₽</b>/kg"'
-
-	act 'Go back to the village center':minut += 1 & gt 'gadukino'
-	if boletus > 0 and bilberry > 0:
-		act 'Sell all your mushrooms and berries':
-			*clr & cla
-			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*25+bilberry*25>> <b>₽</b>.'
-			gs 'stat'
-
-			act'Continue':boletus = 0 &  bilberry = 0 & gt 'gadukino','collection_point'
-		end
-	end
-	if boletus > 0:
-		act 'Sell all your mushrooms':
-			*clr & cla
-			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*25>> <b>₽</b>.'
-			gs 'stat'
-
-			act'Continue':boletus = 0 & gt 'gadukino','collection_point'
-		end
-	end
-	if bilberry > 0:
-		act 'Sell all your berries':
-			*clr & cla
-			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*25>> <b>₽</b>.'
-			gs 'stat'
-
-			act'Continue':bilberry = 0 & gt 'gadukino','collection_point'
-		end
-	end
-end
-
 --- gadukino ---------------------------------
 

locations/grandmahelp.qsrc

@@ -26,9 +26,9 @@ if $ARGS[0] = 'start':
 		gt 'grandmahelp', 'milkcows'
 	elseif grandmaQW['chore_type'] = 3:
 		gt 'grandmahelp', 'groceries'
-	elseif grandmaQW['chore_type'] = 4 and grandmaQW['chore_mushrooms_given'] >= 6:
+	elseif grandmaQW['chore_type'] = 4 and boletus_stored >= 5:
 		gt 'grandmahelp', 'can_mushrooms'
-	elseif grandmaQW['chore_type'] = 5 and grandmaQW['chore_berries_given'] >= 5:
+	elseif grandmaQW['chore_type'] = 5 and bilberry_stored >= 5:
 		gt 'grandmahelp', 'can_berries'
 	elseif grandmaQW['chore_type'] = 6 and grandmaQW['chore_harvest_done'] = 1:
 		gt 'grandmahelp', 'can_veggies'
@@ -40,11 +40,11 @@ if $ARGS[0] = 'start':
 		gt 'grandmahelp', 'waterplants'
 	elseif grandmaQW['chore_type'] = 10 and sunWeather = 1:
 		gt 'grandmahelp', 'harvest'
-	elseif grandmaQW['chore_type'] = 11:
+	elseif grandmaQW['chore_type'] = 11 and boletus_stored <= 18:
 		gt 'grandmahelp', 'pickforest_mushrooms'
-	elseif grandmaQW['chore_type'] = 12:
+	elseif grandmaQW['chore_type'] = 12 and bilberry_stored <= 18:
 		gt 'grandmahelp', 'pickforest_berries'
-	elseif grandmaQW['chore_type'] = 13:
+	elseif grandmaQW['chore_type'] = 13 and ((boletus_stored + bilberry_stored) <= 16):
 		gt 'grandmahelp', 'pickforest_both'
 	else
 		'"There is nothing to do today <<$pcs_nickname>>, take the day off.'
@@ -68,6 +68,7 @@ if $ARGS[0] = 'cleanfloor':
 		'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'
+		act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 	end
 end
 
@@ -80,7 +81,6 @@ if $ARGS[0] = 'washclothes':
 		*clr & cla
 		minut += 60
 		grandmaQW['chore_wash_clothes'] = 2
-		grandmaQW['help_amount'] += 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
@@ -94,6 +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'
+			act 'Return back to your grandmother': minut += 1 & gt 'gadhouse', 'grandma'
 		end
 	end
 end
@@ -141,7 +142,7 @@ if $ARGS[0] = 'can_mushrooms':
 		minut += 45
 		gs'stat'
 
-		grandmaQW['chore_mushrooms_given'] -= 6
+		boletus_stored -= 5
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_mushrooms.jpg"></center>'
 		'Grandma gives you a basket of mushrooms and you spend a while cleaning them, washing them, and cutting them up, in preparation for canning.'
 		act 'Continue':
@@ -157,6 +158,7 @@ if $ARGS[0] = 'can_mushrooms':
 				gs'stat'
 
 				grandmaQW['chore_can_mushrooms'] = 0
+				grandmaQW['help_amount'] += 2
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
 				'Finally, you help Grandma take them out of the canner and set them aside to cool.'
 				'"Thank you, <<$pcs_nickname>>," she says. "It is important to save food up for the hard winter months. Sure, now you can just walk to the store and get whatever you want, but it wasn''t always that way!"'
@@ -176,7 +178,7 @@ if $ARGS[0] = 'can_berries':
 		minut += 45
 		gs'stat'
 
-		grandmaQW['chore_berries_given'] -= 5
+		bilberry_stored -= 5
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_berries.jpg"></center>'
 		'Grandma gives you a basket of berries and you spend a while cleaning them, removing stems, and picking out any shriveled or bad ones.'
 		act 'Continue':
@@ -253,6 +255,7 @@ if $ARGS[0] = 'feedchickens':
 		'You take the grain mix for the chickens with you and walk over to the yard.'
 
 		act 'Continue':gt'gaddvor','chickens'
+		
 	end
 end
 

locations/grandpahelp.qsrc

@@ -87,11 +87,11 @@ if $ARGS[0] = 'start':
 		gt 'grandpahelp', 'grazecows'
 	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5 and ARRSIZE('swimwear') > 0:
 		gt 'grandpahelp', 'washhorse'
-	elseif grandpaQW['chore_type'] = 10:
+	elseif grandpaQW['chore_type'] = 10 and boletus_stored <= 18:
 		gt 'grandpahelp', 'pickforest_mushrooms'
-	elseif grandpaQW['chore_type'] = 11:
+	elseif grandpaQW['chore_type'] = 11 and bilberry_stored <= 18:
 		gt 'grandpahelp', 'pickforest_berries'
-	elseif grandpaQW['chore_type'] = 12:
+	elseif grandpaQW['chore_type'] = 12 and ((boletus_stored + bilberry_stored) <= 16):
 		gt 'grandpahelp', 'pickforest_both'
 	elseif grandpaQW['chore_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
 		'"<<$pcs_nickname>>, we need to help out with baling hay today. We have to go to the field to meet the others."'
@@ -161,6 +161,7 @@ if $ARGS[0] = 'cleanyard':
 		gs'stat'
 
 		act 'Continue':gt'gaddvor'
+		act 'Return back to your grandfather': minut += 1 & gt 'gadhouse', 'grandpa'
 	end
 end
 

locations/saveupdater.qsrc

@@ -719,7 +719,7 @@ end
 if rex > 0 and rex > npc_rel['A57']: npc_rel['A57'] = rex & killvar 'rex'
 
 !!------------------------------village variable clean up/translation---------------------------------------
-if findvel > 0: BikeLoc = findvel & killvar findvel
+if findvel > 0: BikeLoc = findvel & killvar 'findvel'
 !!------------------------------grandparent variable clean up---for 0.8.0 release---------------------------
 !!---Grandpa
 If grandpa_bilberry > 0: grandpaQW['chore_berry_quantity'] = grandpa_bilberry & killvar 'grandpa_bilberry'

locations/sister.qsrc

@@ -430,7 +430,7 @@ if $ARGS[0] = 'scene1':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_3.jpg"></center>'
 				'You turn down the invitation.'
 				'"Sorry Roma, I would love to, but I can''t get behind at school. I have homework and books to read, you know what it''s like."'
-				act 'Finish':SiSgdk = 0 & gt 'sister'
+				act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 			end
 			if razradbeg > 0:
 				act 'No (training)':
@@ -439,7 +439,7 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_4.jpg"></center>'
 					'You turn down the invitation.'
 					'"I would love to, but I have a competition to prepare for. I have to train."'
-					act 'Finish':SiSgdk = 0 & gt 'sister'
+					act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 				end
 			end
 			if volleysostav = 1 or volleysostav = 2:
@@ -449,19 +449,17 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_5.jpg"></center>'
 					'You turn down the invitation.'
 					'"I can''t, the coach does not allow my to stay out late, and drinking is also prohibited."'
-					act 'Finish':SiSgdk = 0 & gt 'sister'
+					act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 				end
 			end
 			act 'Yes':
 				sisterQW['party'] = 1
 				*clr & cla
-				!! Sicaa: This image seems wrong, given that doing anything lesbian with your sister is no longer necessary for the party. Changing it to a different picture as a temporary measure
-				!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_2.jpg"></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_03.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 				'You agree to go to the party.'
 				'"Awesome <<$pcs_nickname>>, it''ll be fun. We will meet here, don''t forget to be there before 18:00, otherwise we will leave without you."'
 				'Anya gives Roma a dirty look, but he just shrugs it off.'
-				act 'Finish':SiSgdk = 0 & gt 'sister'
+				act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 			end
 		end
 	end

locations/swamp.qsrc

@@ -33,11 +33,11 @@ if $ARGS[0] = 'start':
 	'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'
+	act 'Head back to the forest (0:15)': 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':
+		act 'Go to the hunters cabin (0:15)':
 			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
 			if hour >= 6 and hour <= 22:
 				swamp_stuck = 0