Browse Source

More states for chore variables. New chores for grandparents. Chores must be "turned in" when complete. Rearranged some conversation flow with grandparents. Changed Grandpa's mushroom/berry chore to not be automatically completed as soon as walking in the house.

richard_butte 4 years ago
parent
commit
df707e71b8

+ 1 - 2
locations/gaddvor.qsrc

@@ -140,8 +140,7 @@ if $ARGS[0] = 'chickens':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens2.jpg"></center>'
 			'You decide to feed the chickens. You pick up a bucket full of bird''s seed and grain mix and toss it on the ground. They immediately rush over and start to greedily eat. You watch them for a bit before you go about your business.'
 			minut += 30
-			grandmaQW['help_amount'] += 1
-			grandmaQW['chore_feed_chickens'] = 0
+			grandmaQW['chore_feed_chickens'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 8 - 13
locations/gadgarden.qsrc

@@ -43,8 +43,7 @@ if $ARGS[0] = 'garden':
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['chore_work_in_garden'] = 0
-			grandmaQW['help_amount'] += 3
+			grandmaQW['chore_work_in_garden'] = 2
 			stren_exp += 1
 			fat -= rand(1,5)
 			hndiwrk_exp += rand(3,9)
@@ -63,8 +62,7 @@ if $ARGS[0] = 'garden':
 			menu_off = 1
 			gs 'sweat', 'add', 10
 			minut += 60
-			grandmaQW['chore_water_garden'] = 0
-			grandmaQW['help_amount'] += 1
+			grandmaQW['chore_water_garden'] = 2
 			vital_exp += 1
 			fat -= rand(1,2)
 			hndiwrk_exp += rand(0,3)
@@ -83,8 +81,7 @@ if $ARGS[0] = 'garden':
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['chore_harvest_garden'] = 0
-			grandmaQW['help_amount'] += 3
+			grandmaQW['chore_harvest_garden'] = 2
 			stren_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)
@@ -153,16 +150,15 @@ if $ARGS[0] = 'strawberry':
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['chore_collect_strawberries'] = 0
-			grandmaQW['help_amount'] += 5
+			grandmaQW['chore_collect_strawberries'] = 2
 			agil_exp += 1
 			fat -= 1
 			hndiwrk_exp += rand(3,9)
 			gs 'stat'
 
-			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries.jpg"></center>'
-			if CloSkirtShortness > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_ski.jpg"></center>'
-			if CloSkirtShortness > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_tanga.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_ski.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_tanga.jpg"></center>'
 			'You wander through the plot for several hours, collecting ripe strawberries and placing them in the basket.'
 
 			act 'Finish':gt'gadgarden','strawberry'
@@ -219,8 +215,7 @@ if $ARGS[0] = 'fruit_garden':
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['chore_collect_fruit'] = 0
-			grandmaQW['help_amount'] += 5
+			grandmaQW['chore_collect_fruit'] = 2
 			agil_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)

+ 489 - 83
locations/gadhouse.qsrc

@@ -6,19 +6,33 @@
 !! -------------------------
 !! grandmaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
 !!
-!! grandmaQW['chore_clean_floor']				0/1 - is the "clean the floor" quest active?
-!! grandmaQW['chore_collect_fruit']				0/1 - is the "collect fruit" quest active?
-!! grandmaQW['chore_collect_strawberries']		0/1 - is the "collect strawberries" quest active?
-!! grandmaQW['chore_feed_chickens']				0/1 - is the "feed the chickens" quest active?
-!! grandmaQW['chore_harvest_garden']			0/1 - is the "harvest veggies from the garden" quest active?
-!! grandmaQW['chore_milk_cow']					0/1 - is the "milk the cow" quest active?
-!! grandmaQW['chore_wash_clothes']				0/1 - is the "wash Grandpa's clothes" quest active?
-!! grandmaQW['chore_water_garden']				0/1 - is the "water the garden" quest active?
-!! grandmaQW['chore_work_in_garden']			0/1 - is the "work in the garden" quest active?
-!! 
+!! For all of the Grandma chores where 0/1/2/3 are possible values:
+!! 0 = not active
+!! 1 = assigned but not done yet
+!! 2 = done but not turned in/reported yet
+!! 3 = not done in time, triggers Grandma disappointment. cikl takes any chore in state 1 or 2 and turns it into state 3.
+!!
+!! grandmaQW['chore_clean_floor']				0/1/2/3 - is the "clean the floor" quest active?
+!! grandmaQW['chore_collect_fruit']				0/1/2/3 - is the "collect fruit" quest active?
+!! grandmaQW['chore_collect_strawberries']		0/1/2/3 - is the "collect strawberries" quest active?
+!! grandmaQW['chore_feed_chickens']				0/1/2/3 - is the "feed the chickens" quest active?
+!! grandmaQW['chore_harvest_garden']			0/1/2/3 - is the "harvest veggies from the garden" quest active?
+!! grandmaQW['chore_milk_cow']					0/1/2/3 - is the "milk the cow" quest active?
+!! grandmaQW['chore_wash_clothes']				0/1/2/3 - is the "wash Grandpa's clothes" quest active?
+!! grandmaQW['chore_water_garden']				0/1/2/3 - is the "water the garden" quest active?
+!! grandmaQW['chore_work_in_garden']			0/1/2/3 - is the "work in the garden" quest active?
+!! grandmaQW['chore_mushrooms_given']			How many kg of mushrooms has Sveta collected for Grandma? Used with chore_can_mushrooms.
+!! grandmaQW['chore_berries_given']				How many kg of berries has Sveta collected for Grandma? Used with chore_can_berries.
+!! grandmaQW['chore_harvest_done']				Has Sveta harvested veggies from the garden? Used with chore_can_veggies.
+!! grandmaQW['chore_gather_mushrooms']			0/1/2/3 - is the "gather mushrooms" quest active?
+!! grandmaQW['chore_gather_berries']			0/1/2/3 - is the "gather berries" quest active?
+!! grandmaQW['chore_gather_both']				0/1/2/3 - is the "gather mushrooms and berries" quest active?
+!! grandmaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandma want?
+!! grandmaQW['chore_berry_quantity']			How many kg of berries does Grandma want?
+
 !! Other Variables - Grandma
 !! -------------------------
-!! grandmaQW['help_amount']						Semi-abstract representation of how helpful Sveta has been. Longer, more arduous tasks get more points.
+!! grandmaQW['help_amount']						Semi-abstract representation of how helpful Sveta has been. Longer, more arduous tasks get more points. Affects monthly allowance.
 !! grandmaQW['last_day_asked_for_story']		The most recent day Sveta asked Grandma to tell her a story. Checked against daystart (i.e. was it today?)
 !! grandmaQW['last_day_helped']					The most recent day Sveta asked Grandma if she could help her with anything.
 !! grandmaQW['last_day_talked']					The most recent day Sveta chatted with Grandma.
@@ -46,9 +60,11 @@
 !! grandpaQW['chore_lead_cow_to_field']			0/1 - is the "just take the cow to the field and drop it off there" quest active?
 !! grandpaQW['chore_lead_horse_to_field']		0/1 - is the "take the horse to the field" quest active?
 !! 
-!! grandpaQW['chore_gather_from_forest']		Variable storage for the type of "gather mushrooms/berries from the forest" quest. Possible values: '', 'mushroom', 'berry', 'both'
-!! grandpaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandpa want? Used with chore_gather_from_forest.
-!! grandpaQW['chore_berry_quantity']			How many kg of berries does Grandpa want? Used with chore_gather_from_forest.
+!! grandpaQW['chore_gather_mushrooms']			0/1 - is the "gather mushrooms" quest active?
+!! grandpaQW['chore_gather_berries']			0/1 - is the "gather berries" quest active?
+!! grandpaQW['chore_gather_both']				0/1 - is the "gather mushrooms and berries" quest active?
+!! grandpaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandpa want?
+!! grandpaQW['chore_berry_quantity']			How many kg of berries does Grandpa want?
 !! 
 !! 
 !! Other Variables - Grandpa
@@ -103,61 +119,6 @@ if $ARGS[0] = 'start':
 		grandmaQW['help_amount'] = 0
 		act 'Continue': gt 'gadhouse', 'start'
 
-	elseif $grandpaQW['chore_gather_from_forest'] = 'mushroom' and boletus >= grandpaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 22:
-		*clr & cla
-		grandmaQW['help_amount'] += 1
-		boletus -= grandpaQW['chore_mushroom_quantity']
-		minut += 5
-		$grandpaQW['chore_gather_from_forest'] = ''
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
-		'Upon entering the house you immediately walk up to 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 grandpa. "But if I need some help, I''ll be sure to let you know."'
-		'You kiss your grandfather on the cheek and get on with your day.'
-
-		act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
-
-	elseif $grandpaQW['chore_gather_from_forest'] = 'both' and boletus >= grandpaQW['chore_mushroom_quantity'] and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 22:
-		*clr & cla
-		grandmaQW['help_amount'] += 1
-		boletus -= grandpaQW['chore_mushroom_quantity']
-		bilberry -= grandpaQW['chore_berry_quantity']
-		minut += 5
-		$grandpaQW['chore_gather_from_forest'] = ''
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
-		'Upon entering the house you immediately walk up to grandpa.'
-		'"Grandpa, here are the mushrooms and berries!"'
-		'"Oh, thank you <<$pcs_nickname>>." you grandpa replied.'
-		'"If you want, I can go out for an another run."'
-		'"You don''t need to do that <<$pcs_nickname>>," your grandpa said. "But I''ll be sure to let you know if something comes up."'
-		'You give your grandpa 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'
-
-	elseif $grandpaQW['chore_gather_from_forest'] = 'berry' and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 22:
-		*clr & cla
-		grandmaQW['help_amount'] += 1
-		bilberry -= grandpaQW['chore_berry_quantity']
-		minut += 5
-		$grandpaQW['chore_gather_from_forest'] = ''
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
-		'Upon entering the house you immediately walk up to grandpa.'
-		'"Grandpa, here are the berries!"'
-		'"Oh, thank you, nicely done," grandpa replied. "It''s hard for your grandmother to gather the berries, and the berries are needed so she can make jam for the winter."'
-		'"If you need some more berries I''ll be glad to go out and gather some more."'
-		'"There''s no need <<$pcs_nickname>>," your grandpa said. "But if your grandma need some more berries, I''ll let you know."'
-		'You kiss your grandfather on the cheek, you go on with your business.'
-
-		act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
-
 	elseif mira_temp = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or miragopQW >= 10 or mirasex > 1):
 		*clr & cla
 		mira_guestday = daystart
@@ -269,7 +230,7 @@ if $ARGS[0] = 'main':
 		if staygad ! daystart and home_owned[2] = 1: gs 'gadukino_event', 'go_home'
 	end
 
-	 if $clothingworntype ! 'nude':
+	if $clothingworntype ! 'nude':
 		act 'Go outside':minut += 1 & gt 'gaddvor'
 	elseif $clothingworntype = 'nude':
 		act 'Go outside naked':
@@ -279,7 +240,7 @@ if $ARGS[0] = 'main':
 			inhib_exp += rand(0,2)
 			grandmaQW['nudity_trouble'] += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
-			'It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
+			'It''s certainly risky leaving the house like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -304,8 +265,7 @@ if $ARGS[0] = 'main':
 		act 'Clean the floor for Grandma (1:00)':
 			*clr & cla
 			minut += 60
-			grandmaQW['chore_clean_floor'] = 0
-			grandmaQW['help_amount'] += 1
+			grandmaQW['chore_clean_floor'] = 2
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
@@ -319,8 +279,7 @@ if $ARGS[0] = 'main':
 		act 'Wash Grandpa''s clothes for Grandma (1:00)':
 			*clr & cla
 			minut += 60
-			grandmaQW['chore_wash_clothes'] = 0
-			grandmaQW['help_amount'] += 1
+			grandmaQW['chore_wash_clothes'] = 2
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
@@ -337,7 +296,9 @@ if $ARGS[0] = 'main':
 			end    
 		end
 	end
-
+	
+	act 'Talk to Grandma':gt 'gadhouse','grandma'
+	act 'Talk to Grandpa':gt 'gadhouse','grandpa'
 	act 'Prepare a full meal (0:30)':gs 'food', 'm_meal'
 	act 'Prepare a light meal (0:25)':gs 'food', 's_meal'
 	act 'Have a snack (0:15)':gs 'food', 'snack'
@@ -416,11 +377,387 @@ if $ARGS[0] = 'grandma':
 		act 'Maybe you should get dressed before talking to her':gt 'gadhouse', 'start'
 	else
 		act 'Leave her alone':gt 'gadhouse', 'start'
+
+		if grandmaQW['chore_can_mushrooms'] = 1:
+			act 'Help Grandma can mushrooms (2:00)':
+				*clr & cla
+				minut += 45
+				gs'stat'
+
+				grandmaQW['chore_mushrooms_given'] -= 6
+				'<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.'
+				act 'Continue':
+					*clr & cla
+					minut += 60
+					gs'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+					'Once they are prepared, you help put them in glass jars. Once they are all ready, Grandma places the jars in her canner and boils them for an hour.'
+					act 'Continue':
+						*clr & cla
+						minut += 15
+						gs'stat'
+						
+						grandmaQW['chore_can_mushrooms'] = 0
+						grandmaQW['help_amount'] += 2
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
+						'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!"'
+						act 'Finish':gt 'gadhouse','start'
+					end
+				end
+			end
+		end
+
+		if grandmaQW['chore_can_berries'] = 1:
+			act 'Help Grandma can berries (2:00)':
+				*clr & cla
+				minut += 45
+				gs'stat'
+
+				grandmaQW['chore_berries_given'] -= 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':
+					*clr & cla
+					minut += 60
+					gs'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+					'Once they are prepared, you help pour them into glass jars. Once they are all ready, Grandma places the jars in her canner and boils them for an hour.'
+					act 'Continue':
+						*clr & cla
+						minut += 15
+						gs'stat'
+
+						grandmaQW['chore_can_berries'] = 0
+						grandmaQW['help_amount'] += 2
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_berries.jpg"></center>'
+						'Finally, you help Grandma take them out of the canner and set them aside to cool.'
+						'"There, now we will have berries for the winter," she says. "I think your grandfather could live off of these berries alone! He will be very grateful that you helped me."'
+						act 'Finish':gt 'gadhouse','start'
+					end
+				end
+			end
+		end
+		
+		if grandmaQW['chore_can_veggies'] = 1:
+			act 'Help Grandma can veggies (3:00)':
+				*clr & cla
+				minut += 75
+				gs'stat'
+
+				grandmaQW['chore_harvest_done'] = 0
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_veggies.jpg"></center>'
+				'You and Grandma spend some time sorting out all of the different vegetables from the garden. Once they are sorted you begin cleaning them, cutting them up, removing stems and leaves, and preparing them for canning.'
+				act 'Continue':
+					*clr & cla
+					minut += 90
+					gs'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+					'It is a tedious process, but eventually you finish, and help Grandma put them all in jars. You stand by while she boils the jars, helping her remove them from the canner when needed and replacing them with others.'
+					act 'Continue':
+						*clr & cla
+						minut += 15
+						gs'stat'
+
+						grandmaQW['chore_can_veggies'] = 0
+						grandmaQW['help_amount'] += 3
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_veggies.jpg"></center>'
+						'Finally, you help Grandma take the last of the jars out of the canner and set them aside to cool.'
+						'"You know <<$pcs_nickname>>, if you know how to can your own food, you can survive years of poor harvests," she says.'
+						'"Your grandfather and I had many hard times when we were younger, but saving our crops when we could kept us from starving to death in the bad times. You would do well to remember that, young lady!"'
+						act 'Finish':gt 'gadhouse','start'
+					end
+				end
+			end
+		end
+
 		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
 
+	!! ask for chore from Grandma
 		if grandmaQW['last_day_helped'] ! daystart: act 'Offer to help out': grandmaQW['last_day_helped'] = daystart & gt'grandmahelp', 'start'
 
+	!!---------------------- turning in grandma chores START
+
+		if grandmaQW['chore_clean_floor'] = 2:
+			act 'Tell her you cleaned the floor':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_clean_floor'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"Grandma, the floors are all clean!" you say proudly.'
+				'"Thank you child," your grandmother says, "You have saved my hands and knees a great deal of aching."'
+				'You give her a warm smile and continue on with your day.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_wash_clothes'] = 2:
+			act 'Tell her you washed the clothes':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_wash_clothes'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"Grandma, I finished washing Grandpa''s dirty clothes," you tell her.'
+				'"Thank you <<$pcs_nickname>>. I have no idea how that man gets so dirty!"'
+				'You and your grandmother share a laugh, and you give her a hug before moving on.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_milk_cow'] = 2:
+			act 'Tell her you milked the cow':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_milk_cow'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"Grandma, I milked Dawn and put the milk away," you tell her.'
+				'"Thank you <<$pcs_nickname>>. She''s such a sweet thing, isn''t she?" your grandmother asks fondly.'
+				'"Um, yes, she is very nice for a cow," you say, smiling. "She''s the nicest cow I know."'
+				'Grandma nods sagely at that, and you grin and continue on with your day.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_groceries'] = 2:
+			act 'Give her the groceries':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_groceries'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You show Grandma your sacks of groceries and tell her the grocer will be by later.'
+				'"Thank you <<$pcs_nickname>>. He''s a nice young man. I''ve known him since he was a child, you know."'
+				'"Yes he''s very nice," you say, "but where do you want me to put this stuff?"'
+				'"Oh yes, yes," she says, as if she forgot you were standing there with arms full of groceries. "Just put them in the kitchen, little one, I will put them away in a minute."'
+				'You lug the bags into the kitchen and heft them up on the table, before coming back to Grandma.'
+				'"Anything else you need, Grandma?" you ask.'
+				'"No, that is all, <<$pcs_nickname>>," she says, and gives you a gentle pat on the back.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_feed_chickens'] = 2:
+			act 'Tell her you fed the chickens':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_feed_chickens'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"I fed the chickens, Grandma," you tell her.'
+				'"Good, thank you, <<$pcs_nickname>>," she says. "A fat chicken is a happy chicken, and happy chickens lay the best eggs."'
+				'She nods to herself as if she had said something very wise.'
+				'"Um, well, I''m happy to help, Grandma," you say, and give her a quick hug.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_work_in_garden'] = 2:
+			act 'Tell her you worked in the garden':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 4
+				grandmaQW['chore_work_in_garden'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"I finished working in the garden, Grandma."'
+				'"Good, thank you, <<$pcs_nickname>>," she says. "Did you pull out all the weeds?"'
+				'"Yes I did," you say, "and I watered all the plants, and I checked for pests, and everything."'
+				'"Good, good," she nods. "It is very important to take care of your garden, <<$pcs_nickname>>. It is how we provide for ourselves when no one else will."'
+				'You nod at her advice, and she smiles.'
+				'"You know, you remind me very much of your mother," she says. "She and Luda were always talking about the garden when they were your age."'
+				if npc_QW['A29'] < 2:
+					'"Really?" you ask, trying to picture your mother working in the old garden.'
+					'"Oh yes, yes," Grandma says. "Your mother especially. Every day Natasha would say, ''Luda, Luda, I have to go to the garden,'' and Luda would say, ''But sister, you were just in the garden yesterday!''"'
+					'She purses her lips for a moment and continues, "She wasn''t very good at gardening though, I''m afraid. As much time as she seemed to spend there, I would still find weeds and pests all the time."'
+				else
+					'You struggle to contain your laughter. "Oh yeah, <<$npc_nickname[''A29'']>> has told me all about the ''garden'', Grandma. Like mother, like daughter, I guess!"'
+					'Grandma nods. "Yes, I suppose that is true. She wasn''t much of a gardener though - I always found weeds and pests, no matter how much time she spent there."'
+				end
+				'You grin to yourself, thinking of how <<$npc_nickname[''A29'']>> must have been at your age.'
+				'"Anyway," she continues, "thank you for doing that for me, <<$pcs_nickname>>. My old bones complain when I do it."'
+				'She gives you a peck on the cheek and sends you on your way.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_water_garden'] = 2:
+			act 'Tell her you watered the garden':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_water_garden'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'"I watered all the plants in the garden, Grandma," you tell her.'
+				'"Thank you, <<$pcs_nickname>>," she says. "A healthy plant is always thirsty. You should have some water too, if you want to be a healthy girl."'
+				'"Maybe I will. Is there anything else you need?"'
+				'"No, sweet child. That is enough for today," she says, and gives you a gentle pat on the arm.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_collect_strawberries'] = 2:
+			act 'Give her the strawberries you picked':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_collect_strawberries'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You walk up to Grandma and give her the basket of strawberries.'
+				'"I picked all the strawberries I could find, Grandma," you say.'
+				'"Oh <<$pcs_nickname>>," she exclaims, "don''t these just look wonderful? They are plump and juicy this year."'
+				'You smile and say, "They taste pretty good too!"'
+				'Your grandmother gives you a rueful look and says, "I don''t remember asking you to eat the strawberries, child."'
+				'She cannot hold the charade, though, and breaks into a smile. "I never could resist eating a few fresh off the plant either."'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_collect_fruit'] = 2:
+			act 'Give her the fruit you collected':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_collect_fruit'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You walk up to Grandma and give her the basket of fruit.'
+				'"I gathered all the fruits I could reach," you say.'
+				'"Thank you, <<$pcs_nickname>>," she says. "I cannot reach or bend like I used to, so you have done me a great favor."'
+				'You smile and hug your grandmother, and go on about your day.'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_harvest_garden'] = 2:
+			act 'Give her the fruit you collected':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 2
+				grandmaQW['chore_harvest_garden'] = 0
+				grandmaQW['chore_harvest_done'] = 1
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You bring the baskets of vegetables from the garden into the kitchen and set them on the table, then go back to your grandmother.'
+				'"I think I got everything I could out of the garden, Grandma," you tell her. "There was so much!"'
+				'"Yes child," she says. "We have been blessed with a healthy garden this year. There were many times in the past we were not so lucky."'
+				'Your smile falters a bit, unsure of how to take that.'
+				'"Oh don''t worry yourself, little <<$pcs_nickname>>," she says, cupping your cheek with her hand. "Forgive an old woman of her wistful ways. We are lucky to have such a kind granddaughter to help us bring in the harvest."'
+				'You place your youthful hand over her wizened old one and smile at her. "I am happy to help, Grandma. Is there anything else you need?"'
+				'"No, child, you have done more than your fair share today. Soon we will have to preserve these vegetables to keep them from spoiling, but for now you can rest."'
+				
+				act 'Continue': gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_gather_mushrooms'] = 2 and boletus >= grandmaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 20:
+			act 'Give Grandma the mushrooms she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				boletus -= grandmaQW['chore_mushroom_quantity']
+				grandmaQW['chore_mushrooms_given'] += 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."'
+				'"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."'
+				'"No need for that, little one," she clucks. "You''ve done enough for one day."'
+				'You give her a quick hug in response, and carry on.'
+				
+				act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'grandma'
+			end
+		end
+		
+		if grandmaQW['chore_gather_berries'] = 2 and bilberry >= grandmaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+			act 'Give Grandma the berries she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				bilberry -= grandmaQW['chore_berry_quantity']
+				grandmaQW['chore_berries_given'] += grandmaQW['chore_berry_quantity']
+				minut += 5
+				grandmaQW['chore_gather_berries'] = 0
+				gs 'stat'
+
+				'<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?"'
+				'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."'
+				'Relieved, you give your grandmother a peck on the cheek and move on.'
+
+				act 'Continue': grandmaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+			end
+		end
+
+		if grandmaQW['chore_gather_both'] = 2 and boletus >= grandmaQW['chore_mushroom_quantity'] and bilberry >= grandmaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+			act 'Give Grandma the mushrooms and berries she asked for':
+				*clr & cla
+				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']
+				minut += 5
+				grandmaQW['chore_gather_both'] = 0
+				gs 'stat'
+
+				'<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.'
+				'"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.'
+				'She smiles gently and pats your head. "You''ve done enough for today, child."'
+				'You smile back awkwardly, still a little unsure, but give your Grandma a smooch on the cheek and go on with your day.'
+
+				act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & grandmaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+			end
+		end
+
+	!!---------------------- turning in grandma chores END
+
 		if grandmaQW['talked_about_gadukino'] = 0:
 			act 'Ask about the village (0:10)':
 				*clr & cla
@@ -549,16 +886,85 @@ if $ARGS[0]='grandpa':
 		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 
-		if $grandpaQW['chore_gather_from_forest'] = 'mushroom':
-			'You promise to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms.'
-		elseif $grandpaQW['chore_gather_from_forest'] = 'berry':
-			'You promise to bring grandpa <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
-		elseif $grandpaQW['chore_gather_from_forest'] = 'both':
-			'You promise to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
+		if grandpaQW['chore_gather_mushrooms'] = 1:
+			'You promised to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms.'
+		elseif grandpaQW['chore_gather_berries'] = 1:
+			'You promised to bring grandpa <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
+		elseif grandpaQW['chore_gather_both'] = 1:
+			'You promised to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
 		end
 
-
+	!! ask for chore from Grandpa
 		if grandpaQW['last_day_helped'] ! daystart:act 'Offer to help':grandpaQW['last_day_helped'] = daystart & gt'grandpahelp', 'start'
+
+	!!---------------------- turning in grandpa chores START
+
+		if grandpaQW['chore_gather_mushrooms'] = 1 and boletus >= grandpaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 20:
+			act 'Give Grandpa the mushrooms he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				boletus -= grandpaQW['chore_mushroom_quantity']
+				minut += 5
+				grandpaQW['chore_gather_mushrooms'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"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."'
+				'You kiss your grandfather on the cheek and get on with your day.'
+
+				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
+			end
+		end
+		
+		if grandpaQW['chore_gather_berries'] = 1 and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+			act 'Give Grandpa the berries he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				bilberry -= grandpaQW['chore_berry_quantity']
+				minut += 5
+				grandpaQW['chore_gather_berries'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"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."'
+				'You kiss your grandfather on the cheek, you go on with your business.'
+
+				act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+			end
+		end
+
+		if grandpaQW['chore_gather_both'] = 1 and boletus >= grandpaQW['chore_mushroom_quantity'] and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+			act 'Give Grandpa the mushrooms and berries he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				boletus -= grandpaQW['chore_mushroom_quantity']
+				bilberry -= grandpaQW['chore_berry_quantity']
+				minut += 5
+				grandpaQW['chore_gather_both'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"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 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'
+			end
+		end
+		
+	!!---------------------- turning in grandpa chores END
+
 		if grandpaQW['talked_about_forest'] = 0:
 			act 'Ask about the forest (0:10)':
 				*clr & cla

+ 18 - 0
locations/gadmarket.qsrc

@@ -42,6 +42,24 @@ killvar '$gadmarkettab'
 gs 'stat'
 
 act 'Leave the market': minut += 5 & gt 'gadukino'
+if grandmaQW['chore_groceries'] = 1:
+	act 'Gather the things on Grandma''s list (0:30)':
+		*clr & cla
+		minut += 30
+		gs 'stat'
+		
+		grandmaQW['chore_groceries'] = 2
+		grandmaQW['help_amount'] += 1
+		
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/market.jpg"></center>'
+		'You take out the list Grandma gave you and begin browsing the shelves for the items she needs. After about half an hour you have gotten everything on the list.'
+		*nl
+		'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'
+	end
+end
 
 --- gadmarket ---------------------------------
 

+ 1 - 1
locations/gadsarai.qsrc

@@ -220,7 +220,7 @@ if $ARGS[0] = 'cow':
 			cla
 			*clr
 			minut += 30
-			grandmaQW['chore_milk_cow'] = 0
+			grandmaQW['chore_milk_cow'] = 2
 			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'

+ 229 - 26
locations/grandmahelp.qsrc

@@ -11,11 +11,11 @@ frost = 0
 
 if $ARGS[0] = 'start':
 	if month <= 4 or month >= 10:
-		grandmaQW['chore_type'] = rand(0,2)
+		grandmaQW['chore_type'] = rand(0,6)
 	elseif month = 5 or month = 6:
-		grandmaQW['chore_type'] = rand(0,5)
+		grandmaQW['chore_type'] = rand(0,9)
 	else
-		grandmaQW['chore_type'] = rand(0,6)
+		grandmaQW['chore_type'] = rand(0,13)
 	end
 
 	if grandmaQW['chore_type'] = 0: 
@@ -25,13 +25,27 @@ if $ARGS[0] = 'start':
 	elseif grandmaQW['chore_type'] = 2 and hour < 9 and hour > 20:
 		gt 'grandmahelp', 'milkcows'
 	elseif grandmaQW['chore_type'] = 3:
+		gt 'grandmahelp', 'groceries'
+	elseif grandmaQW['chore_type'] = 4 and grandmaQW['chore_mushrooms_given'] >= 6:
+		gt 'grandmahelp', 'can_mushrooms'
+	elseif grandmaQW['chore_type'] = 5 and grandmaQW['chore_berries_given'] >= 5:
+		gt 'grandmahelp', 'can_berries'
+	elseif grandmaQW['chore_type'] = 6 and grandmaQW['chore_harvest_done'] = 1:
+		gt 'grandmahelp', 'can_veggies'
+	elseif grandmaQW['chore_type'] = 7:
 		gt 'grandmahelp', 'feedchickens'
-	elseif grandmaQW['chore_type'] = 4 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 8 and sunWeather = 1:
 		gt 'grandmahelp', 'checkplants'
-	elseif grandmaQW['chore_type'] = 5 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 9 and sunWeather = 1:
 		gt 'grandmahelp', 'waterplants'
-	elseif grandmaQW['chore_type'] = 6 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 10 and sunWeather = 1:
 		gt 'grandmahelp', 'harvest'
+	elseif grandmaQW['chore_type'] = 11:
+		gt 'grandmahelp', 'pickforest_mushrooms'
+	elseif grandmaQW['chore_type'] = 12:
+		gt 'grandmahelp', 'pickforest_berries'
+	elseif grandmaQW['chore_type'] = 13:
+		gt 'grandmahelp', 'pickforest_both'
 	else
 		'"There is nothing to do today <<$pcs_nickname>>, take the day off.'
 		act 'Continue':gt 'gadhouse', 'grandma'
@@ -46,7 +60,7 @@ if $ARGS[0] = 'cleanfloor':
 	act 'Agree and start cleaning (1:00)':
 		*clr & cla
 		minut += 60
-		grandmaQW['chore_clean_floor'] = 0
+		grandmaQW['chore_clean_floor'] = 2
 		grandmaQW['help_amount'] += 1
 		gs'stat'
 
@@ -65,7 +79,7 @@ if $ARGS[0] = 'washclothes':
 	act 'Agree and start washing (1:00)':
 		*clr & cla
 		minut += 60
-		grandmaQW['chore_wash_clothes'] = 0
+		grandmaQW['chore_wash_clothes'] = 2
 		grandmaQW['help_amount'] += 1
 		gs'stat'
 
@@ -84,23 +98,6 @@ if $ARGS[0] = 'washclothes':
 	end
 end
 
-if $ARGS[0] = 'feedchickens':
-	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
-	
-	grandmaQW['chore_feed_chickens'] = 1
-	act 'Tell her you will do it in a little while':gt 'gadhouse', 'grandma'
-	act 'Agree and go to the yard (0:10)':
-		*clr & cla
-		minut += 10
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
-		'You take the grain mix for the chickens with you and walk over to the yard.'
-
-		act 'Continue':gt'gaddvor','chickens'
-	end
-end
-
 if $ARGS[0] = 'milkcows':
 	' "<<$pcs_nickname>>, go to the barn and milk the cows."'
 
@@ -118,6 +115,147 @@ if $ARGS[0] = 'milkcows':
 	end	
 end
 
+if $ARGS[0] = 'groceries':
+	'"Oh yes, <<$pcs_nickname>>. I was going to go down to the store today to buy some groceries, but my knees are aching. Do you think you could go down there and get them for me? I have a list of what we need and the grocer will come by later to collect the money."'
+	
+	grandmaQW['chore_groceries'] = 1
+	act 'Tell her you will go to the store later':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the store (0:15)':
+		*clr & cla
+		minut += 15
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
+		'Your grandmother shuffles around looking for her list for a few minutes, finally finding it and giving it to you. You grab a basket and set out for the store.'
+		act 'Continue':gt 'gadmarket'
+	end
+end
+
+if $ARGS[0] = 'can_mushrooms':
+	'"I need to get some of these mushrooms canned, <<$pcs_nickname>>, so we can store them. Can you please help me prepare them?"'
+	
+	grandmaQW['chore_can_mushrooms'] = 1
+	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
+	act 'Agree to help her right now (2:00)':
+		*clr & cla
+		minut += 45
+		gs'stat'
+
+		grandmaQW['chore_mushrooms_given'] -= 6
+		'<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':
+			*clr & cla
+			minut += 60
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+			'Once they are prepared, you help put them in glass jars. Once they are all ready, Grandma places the jars in her canner and boils them for an hour.'
+			act 'Continue':
+				*clr & cla
+				minut += 15
+				gs'stat'
+
+				grandmaQW['chore_can_mushrooms'] = 0
+				'<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!"'
+				act 'Finish':gt 'gadhouse','start'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'can_berries':
+	'"It is time to can these berries, <<$pcs_nickname>>. Can you please help me? My fingers aren''t as spry as they used to be."'
+	
+	grandmaQW['chore_can_berries'] = 1
+	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
+	act 'Agree to help her right now (2:00)':
+		*clr & cla
+		minut += 45
+		gs'stat'
+
+		grandmaQW['chore_berries_given'] -= 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':
+			*clr & cla
+			minut += 60
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+			'Once they are prepared, you help pour them into glass jars. Once they are all ready, Grandma places the jars in her canner and boils them for an hour.'
+			act 'Continue':
+				*clr & cla
+				minut += 15
+				gs'stat'
+
+				grandmaQW['chore_can_berries'] = 0
+				grandmaQW['help_amount'] += 2
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_berries.jpg"></center>'
+				'Finally, you help Grandma take them out of the canner and set them aside to cool.'
+				'"There, now we will have berries for the winter," she says. "I think your grandfather could live off of these berries alone! He will be very grateful that you helped me."'
+				act 'Finish':gt 'gadhouse','start'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'can_veggies':
+	'"We have had good luck with the garden this year, <<$pcs_nickname>>. But now we need to can these vegetables before they spoil. Can you help me please?"'
+	
+	grandmaQW['chore_can_veggies'] = 1
+	act 'Tell her you will help her in a little while':gt 'gadhouse', 'grandma'
+	act 'Agree to help her right now (3:00)':
+		*clr & cla
+		minut += 75
+		gs'stat'
+
+		grandmaQW['chore_harvest_done'] = 0
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_veggies.jpg"></center>'
+		'You and Grandma spend some time sorting out all of the different vegetables from the garden. Once they are sorted you begin cleaning them, cutting them up, removing stems and leaves, and preparing them for canning.'
+		act 'Continue':
+			*clr & cla
+			minut += 90
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+			'It is a tedious process, but eventually you finish, and help Grandma put them all in jars. You stand by while she boils the jars, helping her remove them from the canner when needed and replacing them with others.'
+			act 'Continue':
+				*clr & cla
+				minut += 15
+				gs'stat'
+
+				grandmaQW['chore_can_veggies'] = 0
+				grandmaQW['help_amount'] += 3
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_veggies.jpg"></center>'
+				'Finally, you help Grandma take the last of the jars out of the canner and set them aside to cool.'
+				'"You know <<$pcs_nickname>>, if you know how to can your own food, you can survive years of poor harvests," she says.'
+				'"Your grandfather and I had many hard times when we were younger, but saving our crops during the good times kept us from starving to death in the bad times. You would do well to remember that, young lady!"'
+				act 'Finish':gt 'gadhouse','start'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'feedchickens':
+	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
+	
+	grandmaQW['chore_feed_chickens'] = 1
+	act 'Tell her you will do it in a little while':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the yard (0:10)':
+		*clr & cla
+		minut += 10
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
+		'You take the grain mix for the chickens with you and walk over to the yard.'
+
+		act 'Continue':gt'gaddvor','chickens'
+	end
+end
+
 if $ARGS[0] = 'checkplants':
 	'"<<$pcs_nickname>>, can you please go work in the garden?"'
 
@@ -131,7 +269,7 @@ if $ARGS[0] = 'checkplants':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You go to the garden.'
 
-		act 'Further':gt'gadgarden','garden'
+		act 'Continue':gt'gadgarden','garden'
 	end
 end
 
@@ -201,5 +339,70 @@ if $ARGS[0] = 'harvest':
 	end
 end
 
+if $ARGS[0] = 'pickforest_mushrooms':
+	grandmaQW['chore_gather_mushrooms'] = 1
+	grandmaQW['chore_mushroom_quantity'] = rand(3,5)
+	'"<<$pcs_nickname>>, it''s mushroom season. Would you mind going into the forest to pick some for us?"'
+	'"How much do we need, Grandma?", you ask.'
+	'"Oh, I would say you should be able to find at least <<grandmaQW[''chore_mushroom_quantity'']>> kilos," Grandma replies.'
+
+	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
+	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 decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
+		minut += 60
+		act 'Continue': gt 'gadforest', '1'
+	end	
+end
+
+if $ARGS[0] = 'pickforest_berries':
+	grandmaQW['chore_gather_berries'] = 1
+	grandmaQW['chore_berry_quantity'] = rand(3,5)
+	'"<<$pcs_nickname>>, the wild berries are ripe for picking. We should gather them now while we can."'
+	'"How much do you want, Grandma?" you ask.'
+	'"<<grandmaQW[''chore_berry_quantity'']>> kilos will be a good start," Grandma replies.'
+	
+	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		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 decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
+		minut += 60
+		act 'Continue': gt 'gadforest', '1'
+	end		
+end
+
+if $ARGS[0] = 'pickforest_both':
+	grandmaQW['chore_gather_both'] = 1
+	grandmaQW['chore_mushroom_quantity'] = rand(1,2)
+	grandmaQW['chore_berry_quantity'] = rand(2,3)
+	'"This is the time of year that the forest provides us its gifts, <<$pcs_nickname>>. Can you go and harvest some mushrooms and berries for us?"'
+	'"How much of each should I get?" you ask.'
+	'"If you could, try to find <<grandmaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandmaQW[''chore_berry_quantity'']>> kilos of berries," Grandma replies. "It is important to stock up while we can."'
+	
+	act 'Tell her you will go get some soon':gt 'gadhouse', 'grandma'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		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 decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
+		minut += 60
+		act 'Continue': gt 'gadforest', '1'
+	end	
+end
+
+
 --- grandmahelp ---------------------------------
 

+ 58 - 24
locations/grandpahelp.qsrc

@@ -90,10 +90,14 @@ if $ARGS[0] = 'start':
 		gt 'grandpahelp', 'grazecows'
 	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5:
 		gt 'grandpahelp', 'washhorse'
-	elseif grandpaQW['chore_type'] >= 10 and grandpaQW['chore_type'] < 13 and $grandpaQW['chore_gather_from_forest'] = '' and ARRSIZE('swimwear') > 0:
-		gt 'grandpahelp', 'pickforest'
+	elseif grandpaQW['chore_type'] = 10:
+		gt 'grandpahelp', 'pickforest_mushrooms'
+	elseif grandpaQW['chore_type'] = 11:
+		gt 'grandpahelp', 'pickforest_berries'
+	elseif grandpaQW['chore_type'] = 12:
+		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 hay gathering today. We have to go to the field and help out."'
+		'"<<$pcs_nickname>>, we need to help out with baling hay today. We have to go to the field to meet the others."'
 		'"Okay, grandfather," you replied.'
 
 		grandpaQW['chore_bale_hay'] = 1
@@ -160,7 +164,7 @@ if $ARGS[0] = 'cleanyard':
 		end
 		gs'stat'
 
-		act 'Go':gt'gaddvor'
+		act 'Continue':gt'gaddvor'
 	end
 end
 
@@ -281,27 +285,56 @@ if $ARGS[0] = 'leadcows':
 	end
 end
 
-if $ARGS[0] = 'pickforest':
-	if grandpaQW['chore_type'] = 10:
-		$grandpaQW['chore_gather_from_forest'] = 'mushroom'
-		grandpaQW['chore_mushroom_quantity'] = rand(2,3)
-		'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
-		'"How much should I pick, grandpa?", you ask.'
-		'"<<grandpaQW[''chore_mushroom_quantity'']>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
-	elseif grandpaQW['chore_type'] = 11:
-		$grandpaQW['chore_gather_from_forest'] = 'berry'
-		grandpaQW['chore_berry_quantity'] = rand(3,5)
-		'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
-		'"How much should I pick, grandpa?" you ask.'
-		'"<<grandpaQW[''chore_berry_quantity'']>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
-	elseif grandpaQW['chore_type'] = 12:
-		$grandpaQW['chore_gather_from_forest'] = 'both'
-		grandpaQW['chore_mushroom_quantity'] = rand(1,2)
-		grandpaQW['chore_berry_quantity'] = rand(2,3)
-		'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and has a craving for some fresh berries."'
-		'"How much should I pick, grandpa?"'
-		'"<<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries will be enough," grandfather replies. "Just don''t get lost."'
+if $ARGS[0] = 'pickforest_mushrooms':
+	grandpaQW['chore_gather_mushrooms'] = 1
+	grandpaQW['chore_mushroom_quantity'] = rand(2,3)
+	'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
+	'"How much should I pick, grandpa?", you ask.'
+	'"<<grandpaQW[''chore_mushroom_quantity'']>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
+	
+	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		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
+
+if $ARGS[0] = 'pickforest_berries':
+	grandpaQW['chore_gather_berries'] = 1
+	grandpaQW['chore_berry_quantity'] = rand(3,5)
+	'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
+	'"How much should I pick, grandpa?" you ask.'
+	'"<<grandpaQW[''chore_berry_quantity'']>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
+
+	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		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
+
+if $ARGS[0] = 'pickforest_both':
+	grandpaQW['chore_gather_both'] = 1
+	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
+	grandpaQW['chore_berry_quantity'] = rand(2,3)
+	'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and I have a craving for some fresh berries."'
+	'"How much should I pick, grandpa?"'
+	'"<<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries will be enough," grandfather replies. "Just don''t get lost."'
+
 	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
@@ -316,5 +349,6 @@ if $ARGS[0] = 'pickforest':
 	end
 end
 
+
 --- grandpahelp ---------------------------------
 

+ 3 - 3
locations/saveupdater.qsrc

@@ -748,9 +748,9 @@ If graze_cow_exp > 0: grandpaQW['chore_herd_cattle_experience'] = graze_cow_exp
 If haying_time > 0: grandpaQW['chore_bale_hay'] = haying_time & killvar 'haying_time'
 If horse_field > 0: grandpaQW['chore_lead_horse_to_field'] = horse_field & killvar 'horse_field'
 If horse_river > 0: grandpaQW['chore_bathe_horse'] = horse_river & killvar 'horse_river'
-If go_in_bilberry > 0: $grandpaQW['chore_gather_from_forest'] = 'berry' & killvar 'go_in_bilberry'
-If go_in_boletus > 0: $grandpaQW['chore_gather_from_forest'] = 'mushroom' & killvar 'go_in_boletus'
-If go_in_boletus_bilberry > 0: $grandpaQW['chore_gather_from_forest'] = 'both' & killvar 'go_in_boletus_bilberry'
+If go_in_bilberry > 0: grandpaQW['chore_gather_berries'] = go_in_bilberry & killvar 'go_in_bilberry'
+If go_in_boletus > 0: grandpaQW['chore_gather_mushrooms'] = go_in_boletus & killvar 'go_in_boletus'
+If go_in_boletus_bilberry > 0: grandpaQW['chore_gather_both'] = go_in_boletus_bilberry & killvar 'go_in_boletus_bilberry'
 !!---Grandma
 If grandma_trouble > 0: grandmaQW['nudity_trouble'] = grandma_trouble & killvar 'grandma_trouble'
 If grandmastory > 0: grandmaQW['last_day_asked_for_story'] = grandmastory & killvar 'grandmastory'