Bladeren bron

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

julzor 4 jaren geleden
bovenliggende
commit
c7dedb375e

+ 30 - 5
locations/gaddvor.qsrc

@@ -52,12 +52,42 @@ if $ARGS[0]='':
 	if $clothingworntype = 'nude':
 		*nl
 		'You are naked and can only go into your grandparent''s house to get dressed or go to the banya.'
+		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
+		act 'Enter the banya':minut += 1 & gt 'gadbana'
 	else
 		if grandmaQW['feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are several <a href="exec:gt ''gaddvor'',''chickens''">chickens</a> running around.'
 
 		if mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''miroslava'', ''Start''">Mira</a> stands next to you.'
 
 		act '<b>Leave and go into the village</b>':minut += 5 & gt 'gadukino'
+		if 	grandpaQW['clean_yard'] = 1:
+			act 'Clean up the yard for Grandpa (1:00)':
+				*clr & cla
+				if month >= 4 and month <= 10:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
+					'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
+					'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
+				end
+				minut += 60
+				grandpaQW['clean_yard'] = 0
+				grandmaQW['help'] += 1
+				if month >= 4 and month <= 10:
+					fat -= rand(1,3)
+				else
+					stren_exp += 1
+					fat -= rand(1,5)
+				end
+				gs'stat'
+
+				act 'Continue':gt'gaddvor'
+			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 'Go to the barn':minut += 1 & gt 'gadsarai'
 		act 'Go to the garden':minut += 1 & gt'gadgarden','garden'
 
@@ -77,11 +107,6 @@ if $ARGS[0]='':
 		end
 	end
 
-	if StoryLine = 1:
-		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
-		act 'Enter the banya':minut += 1 & gt 'gadbana'
-	end
-
 	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 	if clothesAtLocation = 1:
 		if $clothingworntype = 'nude':

+ 5 - 3
locations/gadfield.qsrc

@@ -48,6 +48,8 @@ if $ARGS[0] = 'field':
 	if hour >= 6 and hour <= 20 and grandpaQW['graze_cow'] = 1:'You notice <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a>.'
 	if hour >= 7 and hour <= 20 and grandpaQW['haying_time'] = 1:'You see a crowd of people working on the field.'
 
+	act 'Head back to the road':minut += 10 & gt'gadroad'
+	
 	if hour >= 7 and hour <= 20 and grandpaQW['haying_time'] = 1:
 		act 'Go to the hayfield':
 			gs 'food', 'm_meal'
@@ -78,7 +80,6 @@ if $ARGS[0] = 'field':
 		end
 	end
 
-	act 'Back to the road':minut += 10 & gt'gadroad'
 end
 
 if $ARGS[0] = 'horse':
@@ -96,6 +97,8 @@ if $ARGS[0] = 'horse':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse.jpg"></center>'
 	'Your grandfather''s horse Desperado.'
 
+	act 'Go back to the field':gt'gadfield','field'
+
 	if hour = 19:
 		act 'Lead the horse home (1:00)':
 			*clr & cla
@@ -110,7 +113,6 @@ if $ARGS[0] = 'horse':
 			act 'To your grandparent''s barn':gt'gadsarai'
 		end
 	end
-	act 'To the field':gt'gadfield','field'
 end
 
 if $ARGS[0] = 'cow':
@@ -130,6 +132,7 @@ if $ARGS[0] = 'cow':
 	'The cow herd is standing in the middle of the field.'
 	if mira = 1: MiraLoc = 41 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is standing next to you.'
 
+	if grandpaQW['graze_cow'] = 0:act 'Leave them be':gt'gadfield','field'
 	if hour = 19 and grandpaQW['graze_cow'] = 0:
 		act 'Lead the cows home (1:00)':
 			*clr & cla
@@ -280,7 +283,6 @@ if $ARGS[0] = 'cow':
 			act 'Herd the cows to the river':gt'gadfield','cow2'
 		end
 	end
-	if grandpaQW['graze_cow'] = 0:act 'Back':gt'gadfield','field'
 end
 
 !MiaLoc tells us where Mira is Located

+ 5 - 5
locations/gadhouse.qsrc

@@ -360,7 +360,7 @@ if $ARGS[0] = 'grandma':
 				'"If you like running, you can take a run on the road leading into the forest. Or you can take a ride on our old bike. I''m pretty sure the bike is in the shed. Make sure to look for it if you''re interested. And if you want to watch your figure, then go to the garden, have some fruit, it''s as healthy as the diet meals you''re eating, if not more healthier."'
 				'"That''s about it my dear granddaughter. Now run along, don''t bother me anymore. My soap opera "Santa Barbara" is about to begin, I don''t want to miss a second of it."'
 
-				act 'Finish':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandma'
 			end
 		end
 		!125e
@@ -376,7 +376,7 @@ if $ARGS[0] = 'grandma':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You spend some time talking with your grandmother. She''s sometimes difficult to understand. Her nearly toothless mouth makes the pronunciation of words difficult for her. Most of what she says boils down to the same thing, life is much more fun when you''re young!'
 
-				act 'Continue':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandma'
 			end
 		end
 
@@ -443,7 +443,7 @@ if $ARGS[0] = 'grandma':
 					'"Ever since that day the fear I experienced never disappeared, as I''ve felt it through my whole life. I’ll carry on this fear for the remaining days of my life…"'
 				end
 				!125e
-				act 'You thank your grandmother for the story':gt 'gadhouse', 'start'
+				act 'Thank her for the story':gt 'gadhouse', 'grandma'
 			end
 		end
 	end
@@ -493,7 +493,7 @@ if $ARGS[0]='grandpa':
 				'"There''s one more thing... While you''re in the woods, avoid dressing yourself up in fancy clothes. You might damage them. It''s better to dress in more comfortable clothes instead..."'
 				'"Well, I think that''s everything <<$pcs_nickname>>, run along now, and remember what I''ve told you."'
 
-				act 'Finish':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandpa'
 			end
 		end
 
@@ -509,7 +509,7 @@ if $ARGS[0]='grandpa':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'Your grandfather stops complaining and smiles at you, he loves telling stories. He has lived a rich and eventful life, and you enjoy listening to his stories and talking to him. He mostly reminisces about his past, and reflects on his earlier life.'
 
-				act 'Continue':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandpa'
 			end
 		end
 	end

+ 17 - 16
locations/gadroad.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	act 'Go to Gadukino':minut += 20 & gt'gadukino'
+	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 to the fields':minut += 10 & gt'gadfield','field'
@@ -129,6 +129,22 @@ if $ARGS[0] = 'drinking_invite':
 	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'
+		if will_cost <= pcs_willpwr:
+			act 'No thanks, not tonight. (<<will_cost>> Willpower)':
+				gs 'willpower', 'drink', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				
+				gt 'gadroad'
+			end
+		else
+			act 'No thanks, not tonight. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	end
+
 	! 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)
@@ -149,21 +165,6 @@ if $ARGS[0] = 'drinking_invite':
 	else
 		act 'Go with them': minut += 15 & gt 'mitkabuh'
 	end
-	! 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'
-		if will_cost <= pcs_willpwr:
-			act 'No thanks, not tonight. (<<will_cost>> Willpower)':
-				gs 'willpower', 'drink', 'resist'
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				
-				gt 'gadroad'
-			end
-		else
-			act 'No thanks, not tonight. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-	end
 end
 
 --- gadroad ---------------------------------

+ 20 - 0
locations/gadsarai.qsrc

@@ -47,7 +47,27 @@ if $ARGS[0] = '':
 	gs 'stat'
 
 	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
+	
+	if grandpaQW['fetch_firewood'] = 1:
+		act 'Fetch firewood for Grandpa (0:20)':
+			*clr & cla
+			if month >= 4 and month <= 10:
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
+			end
+			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry and walking back to the house.'
+			'"I''ve brought some firewood grandfather," you said to your grandfather.'
+			'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "There is no more work for today."'
+			grandpaQW['fetch_firewood'] = 0
+			minut += 20
+			grandmaQW['help'] += 1
+			gs'stat'
 
+			act 'Continue':gt 'gadhouse', 'start'
+		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

+ 32 - 30
locations/gadukino.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = '':
 		'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
 		if StoryLine = 1:
-			'In the village you are approached by your old friend Mitka.'
+			'As you walk through the village, you are approached by Mitka, your childhood friend.'
 		else
 			if npc_rel['A63'] = 0:
 				'In the village you are approached by a boy about your age.'
@@ -97,27 +97,28 @@ if $ARGS[0] = '':
 		'A small village with many rickety wooden houses and even more ruins of houses. This village has seen better times.'
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
 		if StoryLine = 1:
-			'Nearby are a series of small farms, on one of which <a href="exec:minut += 5 & gt ''gaddvor''">your grandparents</a> live.'
-			act 'Grandparent''s house': minut += 5 & gt 'gaddvor'
+			'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</a> house.'
+		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>.'
 		*nl
 
 		if month >= 6 and month <= 9:
 			if hour >= 9 and hour <= 11:
-				'A truck from the city has come to <a href="exec: gt ''gadukino'',''collection_point''">collect</a> mushrooms and berries. Will stay around until 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 about noon.'
 			else
-				'Between 9.00 and 12.00, a truck will come to collect mushrooms and berries.'
+				'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
 		else
-			'It''s not the right season for mushrooms or berries. The truck which takes them in town won''t come.'
+			'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.'
 		end
 
 		!Looks like no reference to Gadmarket exists. Adding it...FinnMacha
 		*nl
 		if hour >= 8 and hour < 20:
 			'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 <a href="exec: minut += 5 & gt ''gadmarket''">General Store</a>. A sign in the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
+			'One of the buildings facing the square has a sign saying <a href="exec: minut += 5 & gt ''gadmarket''">General Store</a>. A sign in the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
+			act 'Go to the general store': minut += 5 & gt 'gadmarket'
 		else
 			'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.'
@@ -144,14 +145,14 @@ if $ARGS[0] = '':
 			end
 		end
 
-		act 'Go to the river':minut += 20 & gt 'gadriver', 'start'
-		act 'Go to the forest road':minut += 20 & gt 'gadroad'
+		act 'Walk down to the river':minut += 20 & gt 'gadriver', 'start'
+		act 'Walk to the old forest road':minut += 20 & 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'
 		end
 
-		act 'Go to the highway':minut += 30 & nroad = 10 & gt 'road'
+		act 'Walk to the highway':minut += 30 & nroad = 10 & gt 'road'
 	end
 end
 
@@ -246,8 +247,9 @@ if $ARGS[0] = 'find_meadow':
 	$menu_arg = 'find_meadow'
 	menu_off = 0
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/trail_meadow.jpg"></center>'
-	'Walking around the village you see a small path that leads between some houses, the path leads away from the village into a dense thicket...'
+	'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
@@ -299,6 +301,7 @@ if $ARGS[0] = 'mira_events':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/miroslava.jpg"></center>'
 		'Walking around the village you notice a young girl around your own age. You do not recognize her from the last time you were at the village. She is pulling on a rope attached to the collar on a small calf. The calf grunts with displeasure, shakes her head and refuses to move any further.'
+		act 'Walk away': gt 'gadukino'
 		act 'Help her':
 			*clr & cla
 			metmira = 1
@@ -306,19 +309,17 @@ if $ARGS[0] = 'mira_events':
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/mira.jpg"></center>'
-			'You decide to lend a hand to help the girl with the calf. You are lonely in the village, and maybe this girl, if you get to know her, could your trips to Gadukino less boring. You walk over to the girl and introduce yourself and ask if she wants help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a load slap on the rump. The calf is surprised and immediately moves forward away from you. The girl smiles in thanks and tells you her name is Miroslava, but everyone calls her Mira.'
+			'You decide to lend a hand to help the girl with the calf. You are lonely in the village, and maybe this girl, if you get to know her, could make your trips to Gadukino less boring. You walk over to the girl and introduce yourself and ask if she wants help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a load slap on the rump. The calf is surprised and immediately moves forward away from you. The girl smiles in thanks and tells you her name is Miroslava, but everyone calls her Mira.'
 			'Together you are able to guide the calf back into its pen. Mira turns out to be quite a sociable girl and conversationalist. You learn that her family was recently forced to move to the village from the city. Her father''s huge gambling debts to some questionable men forced him to eventually sell the family''s property in the city to pay them back. Mira is having a rough time adjusting to the life in a small village. She misses the apartment in the center of the city and the money to buy nice dresses and makeup with. After selling everything and paying off the debt, her father was told to leave the city "or else...".'
-			'They were left quite poor and could only afford to buy a house in this run-down dust-covered village.'
+			'They were left quite poor and could only afford to buy a house in this run-down, dust-covered village.'
 			if StoryLine = 1:
-				'You walk with her and chat until you reach her house, which is close by to your grandparent''s place. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
+				'You walk with her and chat until you reach her house, which turns out to be just down the road from your grandparent''s place. Mira invites you to come and visit her any time. She is just as bored in the village as you are.'
 			else
 				'You walk with her and chat until you reach her house, which is close by to the center of the village. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'
 			end
 
 			act 'Finish your walk': gt 'gadukino'
 		end
-
-		act 'Walk away': gt 'gadukino'
 	else
 		*clr & cla
 		! mira 2nd wish - pose as prostitute - one time event to fire so check for this first before repeatable mira events
@@ -326,6 +327,7 @@ if $ARGS[0] = 'mira_events':
 			'<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:
 				act 'Approach Mira (<<will_cost>> Willpower)':
@@ -441,7 +443,6 @@ if $ARGS[0] = 'mira_events':
 				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
 			
-			act 'Walk away': gt 'gadukino'
 		! mira slut events
 		elseif npc_QW['A60'] >= 11 and temper >= 10 and sunWeather = 1 and miraday ! daystart:
 			miraday = daystart
@@ -451,6 +452,7 @@ if $ARGS[0] = 'mira_events':
 				*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)':
@@ -509,7 +511,6 @@ if $ARGS[0] = 'mira_events':
 					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
 				
-				act 'Walk away': gt 'gadukino'
 			else
 				*clr & cla
 				
@@ -556,6 +557,7 @@ if $ARGS[0] = 'mira_events':
 				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'stat'
 				
+				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
 					act 'Continue watching (<<will_cost>> Willpower)':
@@ -578,7 +580,6 @@ if $ARGS[0] = 'mira_events':
 					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
 				
-				act 'Walk away': gt 'gadukino'
 			! mira first wish not done
 			elseif npc_QW['A60'] >= 4:
 				*clr & cla
@@ -587,6 +588,7 @@ if $ARGS[0] = 'mira_events':
 				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
 				gs 'stat'
 				
+				act 'Walk away': gt 'gadukino'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
 					act 'Continue watching (<<will_cost>> Willpower)':
@@ -609,7 +611,6 @@ if $ARGS[0] = 'mira_events':
 					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
 				
-				act 'Walk away': gt 'gadukino'
 			end
 		! quest not far along enough yet so just talking to mira or already watched mira have sex today
 		else
@@ -685,7 +686,7 @@ if $ARGS[0] = 'other_events':
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/walk.jpg"></center>'
-		'You kill time, walking through the village.'
+		'You kill some time walking through the village.'
 
 		act 'Finish your walk': gt 'gadukino'
 	end
@@ -697,11 +698,14 @@ if $ARGS[0] = 'collection_point':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-	'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 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 yours to buy their mushrooms and berries, too.'
+	'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"'
 
+	act 'Go back to the village center':gt 'gadukino'
 	if boletus > 0 and bilberry > 0:
-		act'Sell your mushrooms and berries':
+		act 'Sell your mushrooms and berries':
 			*clr & cla
 			minut += 30
 			money += boletus*150+bilberry*75
@@ -714,7 +718,7 @@ if $ARGS[0] = 'collection_point':
 		end
 	end
 	if boletus > 0:
-		act'Sell your mushrooms':
+		act 'Sell your mushrooms':
 			*clr & cla
 			minut += 30
 			money += boletus*150
@@ -726,19 +730,17 @@ if $ARGS[0] = 'collection_point':
 		end
 	end
 	if bilberry > 0:
-		act'Sell your berries':
+		act 'Sell your berries':
 			*clr & cla
 			minut += 30
 			money += bilberry*75
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collection_point.jpg"></center>'
-			'You decide to your berries for <<bilberry*75>> <b>₽</b>.'
+			'You decide to sell your berries for <<bilberry*75>> <b>₽</b>.'
 			gs 'stat'
 
 			act'Continue':bilberry = 0 & gt 'gadukino','collection_point'
 		end
 	end
-
-	act'Go back to the village center':gt'gadukino'
 end
 
 --- gadukino ---------------------------------

+ 20 - 19
locations/gadukino_event.qsrc

@@ -100,6 +100,17 @@ if $ARGS[0] = 'gang_apologise':
 	'Walking through the village you suddenly hear someone calling out to you by name. Turning back, you see that it is Uncle Stepan, coming your way. Remembering the recent events you pick up your pace. There is no way you want to experience that again.'
 	'"<<$pcs_nickname>>, wait, I need to speak with you," Stepan yelled from afar, seeing that you are ready run away.'
 
+	act 'Run away':
+		*clr & cla
+		minut += 15
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/girl_escapes.jpg"></center>'
+		'You started running away from the road, not stopping before you felt you were in the clear.'
+		'"Good thing I ran away from that evil man." you thought to yourself, looking around.'
+		act 'Continue':gt'meadow'
+	end
+
 	act 'Wait':
 		*clr & cla
 		minut += 5
@@ -164,16 +175,6 @@ if $ARGS[0] = 'gang_apologise':
 			end
 		end
 	end
-	act 'Run away':
-		*clr & cla
-		minut += 15
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/girl_escapes.jpg"></center>'
-		'You started running away from the road, not stopping before you felt you were in the clear.'
-		'"Good thing I ran away from that evil man." you thought to yourself, looking around.'
-		act 'Continue':gt'meadow'
-	end
 end
 
 if $ARGS[0] = 'gadriver_gang':
@@ -679,7 +680,6 @@ if $ARGS[0] = 'gadukino_mitka':
 	'Walking through the village you met Mitka. Seeing you, he started rubbing his crotch and said with a grin.'
 	'"Hey, <<$pcs_nickname>>, let''s go have some fun getting rid of this boner you just gave me."'
 
-	act 'Go with him': gt 'mitkasex', 'gad1', 'A63'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -697,6 +697,7 @@ if $ARGS[0] = 'gadukino_mitka':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with him': gt 'mitkasex', 'gad1', 'A63'
 end
 
 if $ARGS[0] = 'gadukino_kolyamba':
@@ -709,7 +710,6 @@ if $ARGS[0] = 'gadukino_kolyamba':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
 	'Walking through the village you met Kolyamba. Seeing you, he reached into his pants and started playing with his balls. He then grabbed you by the arm and dragged into the bushes next to the road.'
 
-	act 'Go with him': gt 'mitkasex', 'gad1', 'A61'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -727,6 +727,7 @@ if $ARGS[0] = 'gadukino_kolyamba':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with him': gt 'mitkasex', 'gad1', 'A61'
 end
 
 if $ARGS[0] = 'gadukino_vasyan':
@@ -739,7 +740,6 @@ if $ARGS[0] = 'gadukino_vasyan':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
 	'Walking through the village you met Vasyan. Seeing you, he smiled and waved you over to him. He kisses you on the lips and asks you to join him as he walked into the bushes next to the road.'
 
-	act 'Go with him': gt 'mitkasex', 'gad1', 'A62'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -757,6 +757,7 @@ if $ARGS[0] = 'gadukino_vasyan':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with him': gt 'mitkasex', 'gad1', 'A62'
 end
 
 if $ARGS[0] = 'gadukino_2boys':
@@ -782,7 +783,6 @@ if $ARGS[0] = 'gadukino_2boys':
 		vasyanday = daystart
 		'Walking through the village you met Kolyamba and Vasyan. Seeing you, they grin, grab you by the arms and drag you into the bushes.'
 	end
-	act 'Go with them': gt 'mitkasex', 'gad2'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -809,6 +809,7 @@ if $ARGS[0] = 'gadukino_2boys':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with them': gt 'mitkasex', 'gad2'
 end
 
 if $ARGS[0] = 'mira_mitka':
@@ -822,7 +823,6 @@ if $ARGS[0] = 'mira_mitka':
 	'Walking with Mira in the village you met Mitka. Seeing you and Mira, he starts playing with his balls and said with a grin.'
 	'"Oh hey girls, let''s go have some fun getting rid of this boner you both just gave me."'
 
-	act 'Go with him': gt 'mitkasex', 'forest1', 'A63'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -840,6 +840,7 @@ if $ARGS[0] = 'mira_mitka':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with him': gt 'mitkasex', 'forest1', 'A63'
 end
 
 if $ARGS[0] = 'mira_kolyamba':
@@ -852,7 +853,6 @@ if $ARGS[0] = 'mira_kolyamba':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/kolyamba.jpg"></center>'
 	'Walking with Mira in the village you met Kolyamba. Seeing you and Mira, he starts playing with his balls, and tries to grab you both by the hand.'
 
-	act 'Go with him': gt 'mitkasex', 'forest1', 'A61'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -870,6 +870,7 @@ if $ARGS[0] = 'mira_kolyamba':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with him': gt 'mitkasex', 'forest1', 'A61'
 end
 
 if $ARGS[0] = 'mira_vasyan':
@@ -882,7 +883,6 @@ if $ARGS[0] = 'mira_vasyan':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/vasyan.jpg"></center>'
 	'Walking with Mira in the village you met Vasyan. Seeing you and Mira, he smiles and tries to grab you both by the hand.'
 
-	act 'Go with them': gt 'mitkasex', 'forest1', 'A62'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
 			cla
@@ -899,6 +899,7 @@ if $ARGS[0] = 'mira_vasyan':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with them': gt 'mitkasex', 'forest1', 'A62'
 end
 
 if $ARGS[0] = 'mira_2boys':
@@ -924,7 +925,6 @@ if $ARGS[0] = 'mira_2boys':
 		vasyanday = daystart
 		'Walking with Mira in the village you met Kolyamba and Vasyan. Seeing you and Mira, they smile at each other, and drag you both into the bushes.'
 	end
-	act 'Go with them': gt 'mitkasex', 'forest2', $ARGS[1]
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -951,6 +951,7 @@ if $ARGS[0] = 'mira_2boys':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with them': gt 'mitkasex', 'forest2', $ARGS[1]
 end
 
 if $ARGS[0] = 'mira_3boys':
@@ -969,7 +970,6 @@ if $ARGS[0] = 'mira_3boys':
 
 	'Walking with Mira in the village you met Mitka, Kolyamba and Vasyan. Seeing you and Mira, they smile at each other, and drag you both into the bushes.'
 
-	act 'Go with them': gt 'mitkasex', 'forest3'
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -989,6 +989,7 @@ if $ARGS[0] = 'mira_3boys':
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	act 'Go with them': gt 'mitkasex', 'forest3'
 end
 
 if $ARGS[0] = 'go_home':

+ 10 - 10
locations/grandmahelp.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 		gt 'grandmahelp', 'harvest'
 	else
 		'"There is nothing to do today <<$pcs_nickname>>, take the day off.'
-		act 'Continue':gt 'gadhouse', 'start'
+		act 'Continue':gt 'gadhouse', 'grandma'
 	end
 end
 
@@ -42,7 +42,7 @@ if $ARGS[0] = 'cleanfloor':
 	'"There is always something to do, <<$pcs_nickname>>. I''ve gotten quite old and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
 
 	grandmaQW['cleanfloor'] = 1
-	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Tell her you will do it soon':gt 'gadhouse', 'grandma'
 	act 'Agree and start cleaning (1:00)':
 		*clr & cla
 		minut += 60
@@ -61,7 +61,7 @@ if $ARGS[0] = 'washclothes':
 	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes?"'
 	
 	grandmaQW['washclothes'] = 1
-	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Tell her you will wash them in a little bit':gt 'gadhouse', 'grandma'
 	act 'Agree and start washing (1:00)':
 		*clr & cla
 		minut += 60
@@ -88,7 +88,7 @@ if $ARGS[0] = 'feedchickens':
 	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
 	
 	grandmaQW['feed_chickens'] = 1
-	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Tell her you will do it in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the yard (0:10)':
 		*clr & cla
 		minut += 10
@@ -105,7 +105,7 @@ if $ARGS[0] = 'milkcows':
 	' "<<$pcs_nickname>>, go to the barn and milk the cows."'
 
 	grandmaQW['milk_cow'] = 1
-	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Tell her you will do it in a bit':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		minut += 10
@@ -122,7 +122,7 @@ if $ARGS[0] = 'checkplants':
 	'"<<$pcs_nickname>>, can you please go work in the garden?"'
 
 	grandmaQW['work_garden'] = 1
-	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Tell her you will get to it later':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the garden (0:10)':
 		*clr & cla
 		minut += 10
@@ -139,7 +139,7 @@ if $ARGS[0] = 'waterplants':
 	'"Dear <<$pcs_nickname>>, could you go and water the plants in the garden?"'
 
 	grandmaQW['water_garden'] = 1
-	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Tell her you will do it after a while':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the garden (0:10)':
 		*clr & cla
 		minut += 10
@@ -157,7 +157,7 @@ if $ARGS[0] = 'harvest':
 		'"<<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
 		
 		grandmaQW['collect_strawberries'] = 1
-		act 'Agree and continue':gt 'gadhouse', 'start'
+		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the strawberry plot (0:10)':
 			*clr & cla
 			minut += 10
@@ -172,7 +172,7 @@ if $ARGS[0] = 'harvest':
 		'"<<$pcs_nickname>> dear, the fruits are ripe and it is time to start collecting them, could you go and do it today?"'
 
 		grandmaQW['fruit_collect'] = 1
-		act 'Agree and continue':gt 'gadhouse', 'start'
+		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the orchard (0:10)':
 			*clr & cla
 			minut += 10
@@ -187,7 +187,7 @@ if $ARGS[0] = 'harvest':
 		'"<<$pcs_nickname>> dear, could you go to the garden today? It''s time to collect the harvest."'
 
 		grandmaQW['harvest_garden'] = 1
-		act 'Agree and continue':gt 'gadhouse', 'start'
+		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the garden (0:10)':
 			*clr & cla
 			minut += 10

+ 38 - 19
locations/grandpahelp.qsrc

@@ -19,9 +19,11 @@ if $ARGS[0] = 'start':
 	end
 
 	if grandpaQW['help_type'] = 0:
-		'"<<$pcs_nickname>>, could you bring firewood for the stove?"'
+		'"<<$pcs_nickname>>, could you run out to the barn and bring some firewood for the stove?"'
 
-		act 'Fetch firewood (0:20)':
+		grandpaQW['fetch_firewood'] = 1
+		act 'Tell him you will go get some in just a bit':gt 'gadhouse', 'grandpa'
+		act 'Agree and go to fetch firewood (0:20)':
 			*clr & cla
 			if month >= 4 and month <= 10:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
@@ -31,17 +33,18 @@ if $ARGS[0] = 'start':
 			'You put on some warm clothes and run over to the barn to collect some firewood. '
 			'"I''ve brought some firewood grandfather," you said to your grandfather.'
 			'"You are very quick <<$pcs_nickname>>." he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
+			grandpaQW['fetch_firewood'] = 0
 			minut += 20
 			grandmaQW['help'] += 1
 			gs'stat'
 
-			act 'Go':gt 'gadhouse', 'start'
+			act 'Continue':gt 'gadhouse', 'start'
 		end
 	elseif grandpaQW['help_type'] = 1:
 		'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
 
 		grandpaQW['feed_horse'] = 1
-		act 'Agree and continue':gt 'gadhouse', 'start'
+		act 'Tell him that you will get to it in a little bit':gt 'gadhouse', 'grandpa'
 		act 'Agree and go to the barn (0:10)':
 			*clr & cla
 			if month >= 4 and month <= 10:
@@ -59,7 +62,7 @@ if $ARGS[0] = 'start':
 		'"<<$pcs_nickname>>, go to the barn to feed the cows."'
 
 		grandpaQW['feed_cow'] = 1
-		act 'Agree and continue':gt 'gadhouse', 'start'
+		act 'Tell him that you will do it in a little while':gt 'gadhouse', 'grandpa'
 		act 'Agree and go to the barn (0:10)':
 			*clr & cla
 			if month >= 4 and month <= 10:
@@ -94,7 +97,7 @@ if $ARGS[0] = 'start':
 		'"Okay, grandfather," you replied.'
 
 		grandpaQW['haying_time'] = 1
-		act 'Agree and continue':gt 'gadhouse', 'start'
+		act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
 		act 'Grab a rake and head to the field (0:40)':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
@@ -128,14 +131,16 @@ if $ARGS[0] = 'start':
 				'"You can take the day off."'
 			end
 		end
-		act 'Leave':gt 'gadhouse', 'start'
+		act 'Continue':gt 'gadhouse', 'grandpa'
 	end
 end
 
 if $ARGS[0] = 'cleanyard':
 	'"Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
 
-	act 'Clean up the yard (1:00)':
+	grandpaQW['clean_yard'] = 1
+	act 'Tell him that you''ll do it in a minute':gt 'gadhouse', 'grandpa'
+	act 'Agree and go clean up the yard (1:00)':
 		*clr & cla
 		if month >= 4 and month <= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
@@ -145,6 +150,7 @@ if $ARGS[0] = 'cleanyard':
 			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
 		end
 		minut += 60
+		grandpaQW['clean_yard'] = 0
 		grandmaQW['help'] += 1
 		if month >= 4 and month <= 10:
 			fat -= rand(1,3)
@@ -162,7 +168,7 @@ if $ARGS[0] = 'feedhogs':
 	'"<<$pcs_nickname>>, could you go to the barn and feed the hogs."'
 
 	grandpaQW['feed_boar'] = 1
-	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Tell him you will get to it soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		if month >= 4 and month <= 10:
@@ -182,7 +188,7 @@ if $ARGS[0] = 'washhorse':
 	'"It''s good weather today. Take Desperado to the river and give him a bath."'
 
 		grandpaQW['horse_river'] = 1
-	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Tell him you will do it in a little while':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -198,7 +204,7 @@ if $ARGS[0] = 'groomhorse':
 	'"Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
 
 	grandpaQW['comb_horse'] = 1
-	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Tell him you will do it in a bit':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		if month >= 4 and month <= 10:
@@ -218,7 +224,7 @@ if $ARGS[0] = 'grazehorse':
 	'"<<$pcs_nickname>>, take Desperado to the field, my legs hurt so I need to rest for a bit. I''ll retrieve the horse up in the evening."'
 
 	grandpaQW['horse_field'] = 1
-	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Tell him you will do it soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -237,7 +243,9 @@ if $ARGS[0] = 'grazecows':
 		'"<<$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."'
 	end
 
-	act 'Go to the field (0:40)':
+	grandpaQW['graze_cow'] = 1
+	act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the field (0:40)':
 		*clr & cla
 		if grandpaQW['graze_cow_exp'] = 0:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -246,7 +254,6 @@ if $ARGS[0] = 'grazecows':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_field.jpg"></center>'
 			'You have a quick bite and go to the field where the village herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
 		end
-		grandpaQW['graze_cow'] = 1
 		pcs_mood += 20
 		pcs_health += 10
 		minut += 40
@@ -259,17 +266,18 @@ if $ARGS[0] = 'grazecows':
 end
 
 if $ARGS[0] = 'leadcows':
-	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
+	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter, could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
 
-	act 'Go to the barn (0:10)':
+	grandpaQW['cow_field'] = 1
+	act 'Tell him you will soon':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You walk over to the barn where the cows are kept.'
-		grandpaQW['cow_field'] = 1
 		minut += 10
 		gs'stat'
 
-		act 'Continue':gt'gadsarai'
+		act 'Continue':gt'gadsarai','cow'
 	end
 end
 
@@ -294,7 +302,18 @@ if $ARGS[0] = 'pickforest':
 		'"How much should I pick, grandpa?"'
 		'"<<grandpaQW[''mushroom_qty'']>> kg mushrooms and <<grandpaQW[''berry_qty'']>> kg of berries will be enough," grandfather replies. "Just don''t get lost."'
 	end
-	act 'Go':gt 'gadhouse', 'start'
+	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		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'
+	end
 end
 
 --- grandpahelp ---------------------------------