Browse Source

[changed] berry and mushroom picking for Grandma and Grandpa can now be a day late with much deminished rewards, simply because taking the chore late can make it impossible to achieve

Kevin_Smarts 1 year ago
parent
commit
c412585eed
2 changed files with 278 additions and 111 deletions
  1. 12 0
      locations/cikl.qsrc
  2. 266 111
      locations/gadhouse.qsrc

+ 12 - 0
locations/cikl.qsrc

@@ -1300,14 +1300,20 @@ elseif grandmaQW['chore_harvest_garden'] = 1 or grandmaQW['chore_harvest_garden'
 	grandmaQW['chore_harvest_garden'] = 0
 	grandmaQW['disappointment'] = 1
 elseif grandmaQW['chore_gather_mushrooms'] = 1 or grandmaQW['chore_gather_mushrooms'] = 2:
+	grandmaQW['disappointment'] = 2
+elseif grandmaQW['chore_gather_mushrooms'] = 1 or grandmaQW['chore_gather_mushrooms'] = 2 and grandmaQW['disappointment'] = 2:
 	grandmaQW['chore_gather_mushrooms'] = 0
 	grandmaQW['chore_mushroom_quantity'] = 0
 	grandmaQW['disappointment'] = 1
 elseif grandmaQW['chore_gather_berries'] = 1 or grandmaQW['chore_gather_berries'] = 2:
+	grandmaQW['disappointment'] = 2
+elseif grandmaQW['chore_gather_berries'] = 1 or grandmaQW['chore_gather_berries'] = 2 and grandmaQW['disappointment'] = 2:
 	grandmaQW['chore_gather_berries'] = 0
 	grandmaQW['chore_berry_quantity'] = 0
 	grandmaQW['disappointment'] = 1
 elseif grandmaQW['chore_gather_both'] = 1 or grandmaQW['chore_gather_both'] = 2:
+	grandmaQW['disappointment'] = 2
+elseif grandmaQW['chore_gather_both'] = 1 or grandmaQW['chore_gather_both'] = 2 and grandmaQW['disappointment'] = 2:
 	grandmaQW['chore_gather_both'] = 0
 	grandmaQW['chore_mushroom_quantity'] = 0
 	grandmaQW['chore_berry_quantity'] = 0
@@ -1347,14 +1353,20 @@ elseif grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_lead_cow_to_
 	grandpaQW['chore_lead_cow_to_field'] = 0
 	grandpaQW['disappointment'] = 1
 elseif grandpaQW['chore_gather_mushrooms'] = 1 or grandpaQW['chore_gather_mushrooms'] = 2:
+	grandpaQW['disappointment'] = 2
+elseif grandpaQW['chore_gather_mushrooms'] = 1 or grandpaQW['chore_gather_mushrooms'] = 2 and grandpaQW['disappointment'] = 2:
 	grandpaQW['chore_gather_mushrooms'] = 0
 	grandpaQW['chore_mushroom_quantity'] = 0
 	grandpaQW['disappointment'] = 1
 elseif grandpaQW['chore_gather_berries'] = 1 or grandpaQW['chore_gather_berries'] = 2:
+	grandpaQW['disappointment'] = 2
+elseif grandpaQW['chore_gather_berries'] = 1 or grandpaQW['chore_gather_berries'] = 2 and grandpaQW['disappointment'] = 2:
 	grandpaQW['chore_gather_berries'] = 0
 	grandpaQW['chore_berry_quantity'] = 0
 	grandpaQW['disappointment'] = 1
 elseif grandpaQW['chore_gather_both'] = 1 or grandpaQW['chore_gather_both'] = 2:
+	grandpaQW['disappointment'] = 2
+elseif grandpaQW['chore_gather_both'] = 1 or grandpaQW['chore_gather_both'] = 2 and grandpaQW['disappointment'] = 2:
 	grandpaQW['chore_gather_both'] = 0
 	grandpaQW['chore_mushroom_quantity'] = 0
 	grandpaQW['chore_berry_quantity'] = 0

+ 266 - 111
locations/gadhouse.qsrc

@@ -79,7 +79,7 @@
 !! grandpaQW['last_day_talked']					The most recent day Sveta chatted with Grandpa.
 !! grandpaQW['last_hour_talked']				The most recent hour Sveta chatted with Grandpa. Checked against hour, allows for several chats through the day.
 !! grandpaQW['talked_about_forest']				0/1 - has Sveta asked Grandpa about the forest? Makes the "Ask about forest" option a one-time thing.
-!! grandmaQW['disappointment']					0/1 - marks if you failed a chore and Grandpa is disappointed in you. Causes a lecture and -1 to help_amount
+!! grandmaQW['disappointment']					0/1/2 - marks if you failed a chore and Grandpa is disappointed in you. Causes a lecture and -1 to help_amount. 2 is time extension to next day for berry and mushroom collecting in the forest
 !!
 !! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - END
 
@@ -827,74 +827,154 @@ if $ARGS[0] = 'grandma':
 		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']
-				boletus_stored += grandmaQW['chore_mushroom_quantity']
-				minut += 5
-				grandmaQW['chore_gather_mushrooms'] = 0
-				gs 'stat'
+			if grandmaQW['disappointment'] = 2:
+				act 'Give Grandma the mushrooms she asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 1
+					boletus -= grandmaQW['chore_mushroom_quantity']
+					boletus_stored += grandmaQW['chore_mushroom_quantity']
+					grandmaQW['chore_gather_mushrooms'] = 0
+					grandmaQW['chore_mushroom_quantity'] = 0
+					grandmaQW['disappointment'] = 0
+					minut += 5
+					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. They will have to go down in the root cellar until we are ready to can them."'
-				'"Do you think that will be enough?"'
-				'She laughs. "Oh, with your grandfather around, it is never enough!"'
-				'"I can get more, if you want me to."'
-				'"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'
+					'<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 takes them from you. "Thank you my sweet girl, better late than never. I hope you were OK in the forest. They will have to go down in the root cellar until we are ready to can them."'
+					'"Do you think that will be enough?"'
+					'She laughs. "Oh, with your grandfather around, it is never enough!"'
+					'"I can get more, if you want me to."'
+					'"No need for that, little one," she clucks. "You''ve done enough for now."'
+					'You give her a quick hug in response, and carry on.'
+
+					act 'Continue': grandmaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'grandma'
+				end
+			else
+				act 'Give Grandma the mushrooms she asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 3
+					boletus -= grandmaQW['chore_mushroom_quantity']
+					boletus_stored += grandmaQW['chore_mushroom_quantity']
+					grandmaQW['chore_gather_mushrooms'] = 0
+					minut += 5
+					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. They will have to go down in the root cellar until we are ready to can them."'
+					'"Do you think that will be enough?"'
+					'She laughs. "Oh, with your grandfather around, it is never enough!"'
+					'"I can get more, if you want me to."'
+					'"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
 		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']
-				bilberry_stored += grandmaQW['chore_berry_quantity']
-				minut += 5
-				grandmaQW['chore_gather_berries'] = 0
-				gs 'stat'
+			if grandmaQW['disappointment'] = 2:
+				act 'Give Grandma the berries she asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 1
+					bilberry -= grandmaQW['chore_berry_quantity']
+					bilberry_stored += grandmaQW['chore_berry_quantity']
+					grandmaQW['chore_gather_berries'] = 0
+					grandmaQW['chore_berry_quantity'] = 0
+					grandmaQW['disappointment'] = 0
+					minut += 5
+					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. They will have to go down in the root cellar until we are ready to can them."'
-				'You heft the basket up and carry it in the kitchen. Walking back over to Grandma, you ask, "Do you think that will be enough for the winter?"'
-				'"Oh no dear," your Grandma says, "the winter is long and cold and you must gather as much as you can, while you can."'
-				'Seeing the dismayed look on your face, she adds, "But that is enough for today! I know it is harder work than it seems. You can rest now, child."'
-				'Relieved, you give your grandmother a peck on the cheek and move on.'
-
-				act 'Continue': grandmaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+					'You walk over to Grandma and set the heavy basket of berries on the ground next to her.'
+					'"Grandma, I got all the berries!"'
+					'"Oh, thank you, <<$pcs_nickname>>," Grandma replied. "Those look fine if a little late. They will have to go down in the root cellar until we are ready to can them."'
+					'You heft the basket up and carry it in the kitchen. Walking back over to Grandma, you ask, "Do you think that will be enough for the winter?"'
+					'"Oh no dear," your Grandma says, "the winter is long and cold and you must gather as much as you can, while you can."'
+					'Seeing the dismayed look on your face, she adds, "But that is enough for today! I know it is harder work than it seems. You can rest now, child."'
+					'Relieved, you give your grandmother a peck on the cheek and move on.'
+
+					act 'Continue': grandmaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+				end
+			else
+				act 'Give Grandma the berries she asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 3
+					bilberry -= grandmaQW['chore_berry_quantity']
+					bilberry_stored += grandmaQW['chore_berry_quantity']
+					grandmaQW['chore_gather_berries'] = 0
+					minut += 5
+					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. They will have to go down in the root cellar until we are ready to can them."'
+					'You heft the basket up and carry it in the kitchen. Walking back over to Grandma, you ask, "Do you think that will be enough for the winter?"'
+					'"Oh no dear," your Grandma says, "the winter is long and cold and you must gather as much as you can, while you can."'
+					'Seeing the dismayed look on your face, she adds, "But that is enough for today! I know it is harder work than it seems. You can rest now, child."'
+					'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
 		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']
-				boletus_stored += grandmaQW['chore_mushroom_quantity']
-				bilberry_stored += grandmaQW['chore_berry_quantity']
-				minut += 5
-				grandmaQW['chore_gather_both'] = 0
-				gs 'stat'
+			if grandmaQW['disappointment'] = 2:
+				act 'Give Grandma the mushrooms and berries she asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 1
+					boletus -= grandmaQW['chore_mushroom_quantity']
+					bilberry -= grandmaQW['chore_berry_quantity']
+					boletus_stored += grandmaQW['chore_mushroom_quantity']
+					bilberry_stored += grandmaQW['chore_berry_quantity']
+					grandmaQW['chore_gather_berries'] = 0
+					grandmaQW['chore_berry_quantity'] = 0
+					grandmaQW['chore_gather_mushrooms'] = 0
+					grandmaQW['chore_mushroom_quantity'] = 0
+					grandmaQW['disappointment'] = 0
+					minut += 5
+					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>>, they will have to go down in the root cellar until we are ready to can them," your Grandma replied.'
-				'"Do I need to go out on another run, or do you think that''s enough?"'
-				'"Well, little one," your Grandma says, "There is a difference between enough, and enough for today."'
-				'"Oh..." you say, unsure of what to make of her response.'
-				'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'
+					'<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, <<$pcs_nickname>>. I was starting to think you had forgotten about me, they will have to go down in the root cellar until we are ready to can them," your Grandma replied.'
+					'"Do I need to go out on another run, or do you think that''s enough?"'
+					'"Well, little one," your Grandma says, "There is a difference between enough, and enough for today."'
+					'"Oh..." you say, unsure of what to make of her response.'
+					'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_berry_quantity'] = 0 & gt 'gadhouse', 'grandma'
+				end
+			else
+				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']
+					boletus_stored += grandmaQW['chore_mushroom_quantity']
+					bilberry_stored += 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>>, they will have to go down in the root cellar until we are ready to can them," your Grandma replied.'
+					'"Do I need to go out on another run, or do you think that''s enough?"'
+					'"Well, little one," your Grandma says, "There is a difference between enough, and enough for today."'
+					'"Oh..." you say, unsure of what to make of her response.'
+					'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
 		end
 
@@ -1216,70 +1296,145 @@ if $ARGS[0]='grandpa':
 		end
 
 		if grandpaQW['chore_gather_mushrooms'] = 2 and boletus >= grandpaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 20:
-			act 'Give him the mushrooms he asked for':
-				*clr & cla
-				grandmaQW['help_amount'] += 3
-				boletus -= grandpaQW['chore_mushroom_quantity']
-				boletus_stored += grandpaQW['chore_mushroom_quantity']
-				minut += 5
-				grandpaQW['chore_gather_mushrooms'] = 0
-				gs 'stat'
+			if grandpaQW['disappointment'] = 2:
+				act 'Give him the mushrooms he asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 1
+					boletus -= grandpaQW['chore_mushroom_quantity']
+					boletus_stored += grandpaQW['chore_mushroom_quantity']
+					grandpaQW['disappointment'] = 0
+					minut += 5
+					grandpaQW['chore_mushroom_quantity'] = 0
+					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. They will have to go down in the root cellar until your grandmother is ready to can them."'
-				'You kiss your grandfather on the cheek and get on with your day.'
-
-				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
+					'<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 happy," your grandfather replies with a smile. "The mushrooms are in a part of the forest that is difficult to reach, so no wonder it took you so long."'
+					'"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. They will have to go down in the root cellar until your grandmother is ready to can them."'
+					'You kiss your grandfather on the cheek and get on with your day.'
+
+					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
+				end
+			else
+				act 'Give him the mushrooms he asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 3
+					boletus -= grandpaQW['chore_mushroom_quantity']
+					boletus_stored += grandpaQW['chore_mushroom_quantity']
+					minut += 5
+					grandpaQW['chore_gather_mushrooms'] = 0
+					gs 'stat'
+
+					'<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. They will have to go down in the root cellar until your grandmother is ready to can them."'
+					'You kiss your grandfather on the cheek and get on with your day.'
+
+					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
+				end
 			end
 		end
 
 		if grandpaQW['chore_gather_berries'] = 2 and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
-			act 'Give him the berries he asked for':
-				*clr & cla
-				grandmaQW['help_amount'] += 3
-				bilberry -= grandpaQW['chore_berry_quantity']
-				bilberry_stored += grandpaQW['chore_berry_quantity']
-				minut += 5
-				grandpaQW['chore_gather_berries'] = 0
-				gs 'stat'
+			if grandpaQW['disappointment'] = 2:
+				act 'Give him the berries he asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 1
+					bilberry -= grandpaQW['chore_berry_quantity']
+					bilberry_stored += grandpaQW['chore_berry_quantity']
+					grandpaQW['disappointment'] = 0
+					minut += 5
+					grandpaQW['chore_berry_quantity'] = 0
+					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. They will have to go down in the root cellar until your grandmother is ready to can them."'
-				'You kiss your grandfather on the cheek, you go on with your business.'
-
-				act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+					'<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, I thought I asked for these yesterday," Grandpa replied. "It''s hard to keep track of things as you get older, just as it is 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. They will have to go down in the root cellar until your grandmother is ready to can them."'
+					'You kiss your grandfather on the cheek, you go on with your business.'
+
+					act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+				end
+			else
+				act 'Give him the berries he asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 3
+					bilberry -= grandpaQW['chore_berry_quantity']
+					bilberry_stored += grandpaQW['chore_berry_quantity']
+					minut += 5
+					grandpaQW['chore_gather_berries'] = 0
+					gs 'stat'
+
+					'<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. They will have to go down in the root cellar until your grandmother is ready to can them."'
+					'You kiss your grandfather on the cheek, you go on with your business.'
+
+					act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+				end
 			end
 		end
 
 		if grandpaQW['chore_gather_both'] = 2 and boletus >= grandpaQW['chore_mushroom_quantity'] and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
-			act 'Give him the mushrooms and berries he asked for':
-				*clr & cla
-				grandmaQW['help_amount'] += 3
-				boletus -= grandpaQW['chore_mushroom_quantity']
-				bilberry -= grandpaQW['chore_berry_quantity']
-				boletus_stored += grandpaQW['chore_mushroom_quantity']
-				bilberry_stored += grandpaQW['chore_berry_quantity']
-				minut += 5
-				grandpaQW['chore_gather_both'] = 0
-				gs 'stat'
+			if grandpaQW['disappointment'] = 2:
+				act 'Give him the mushrooms and berries he asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 3
+					boletus -= grandpaQW['chore_mushroom_quantity']
+					bilberry -= grandpaQW['chore_berry_quantity']
+					boletus_stored += grandpaQW['chore_mushroom_quantity']
+					bilberry_stored += grandpaQW['chore_berry_quantity']
+					grandpaQW['disappointment'] = 0
+					minut += 5
+					grandpaQW['chore_berry_quantity'] = 0
+					grandpaQW['chore_mushroom_quantity'] = 0
+					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. They will have to go down in the root cellar until your grandmother is ready to can them."'
-				'You give him a smooch on the cheek and go on with your day.'
-
-				act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+					'<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>>, better late than never," 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. They will have to go down in the root cellar until your grandmother is ready to can them."'
+					'You give him a smooch on the cheek and go on with your day.'
+
+					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+				end
+			else
+				act 'Give him the mushrooms and berries he asked for':
+					*clr & cla
+					grandmaQW['help_amount'] += 3
+					boletus -= grandpaQW['chore_mushroom_quantity']
+					bilberry -= grandpaQW['chore_berry_quantity']
+					boletus_stored += grandpaQW['chore_mushroom_quantity']
+					bilberry_stored += grandpaQW['chore_berry_quantity']
+					minut += 5
+					grandpaQW['chore_gather_both'] = 0
+					gs 'stat'
+
+					'<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. They will have to go down in the root cellar until your grandmother is ready to can them."'
+					'You give him a smooch on the cheek and go on with your day.'
+
+					act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
+				end
 			end
 		end