[fixed] missing last line in grandpahelp, *clr & cla in a wrong position, small fix for bottle/buterbrod in grandpahelp

locations/Gadhouse.qsrc

@@ -239,8 +239,11 @@ if $ARGS[0] = 'Main':
 	gs 'subkid'
 
 	if gobelen>0:'You have <<gobelen>> completed tapestries.'
-	if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> lessons.'
-	if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
+	if pcs_sewng >= 40 and tkan > 0:
+		'You have enough fabric for <<tkan>> lessons.'
+	elseif pcs_sewng >= 40 and tkan <= 0:
+		'You do not have any fabric.'
+	end
 	if pcs_sewng >= 80:
 		if newgobelen = 0 and tkan > 0:
 			act'Start a new tapestry':
@@ -425,13 +428,18 @@ if $ARGS[0]='grandpa':
 
 		act 'Maybe you should get dressed before talking to him':gt 'Gadhouse', 'Start'
 	else
-
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 		
-		if go_in_boletus = 1:'You promise to bring grandpa <<grandpa_boletus>> kg of mushrooms.'
-		if go_in_bilberry = 1:'You promise to bring grandpa <<grandpa_bilberry>> kg of berries.'
-		if go_in_boletus_bilberry = 1:'You promise to bring grandpa <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries.'
+		if go_in_boletus = 1:
+			'You promise to bring grandpa <<grandpa_boletus>> kg of mushrooms.'
+		elseif go_in_bilberry = 1:
+			'You promise to bring grandpa <<grandpa_bilberry>> kg of berries.'
+		elseif go_in_boletus_bilberry = 1:
+			'You promise to bring grandpa <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries.'
+		end
 
+		act 'Leave him alone':gt 'Gadhouse', 'Start'
+		
 		if grandpahelpday ! daystart:act 'Offer to help':grandpahelpday = daystart & gt'grandpahelp'
 		if grandpatalkforest = 0:
 			act 'Ask about the forest (0:10)':
@@ -451,7 +459,7 @@ if $ARGS[0]='grandpa':
 				act 'Finish':gt 'Gadhouse', 'Start'
 			end
 		end
-		!125e
+		
 		if hour >= grandpatalk + 3:
 			act 'Chat with your grandfather (0:10)':
 				*clr & cla
@@ -467,8 +475,6 @@ if $ARGS[0]='grandpa':
 				act 'Continue':gt 'Gadhouse', 'Start'
 			end
 		end
-
-		act 'Leave him alone':gt 'Gadhouse', 'Start'
 	end
 end
 

locations/grandpahelp.qsrc

@@ -7,18 +7,17 @@ gs'stat'
 'You walk up to your grandfather and ask if he needs any help. Grandpa thinks for a moment and says:'
 
 if month <= 4 or month >= 10:
-	grandpahelping = RAND(0,5)
+	grandpahelping = rand(0,5)
 elseif month = 5:
-	grandpahelping = RAND(3,8)
+	grandpahelping = rand(3,8)
 elseif month = 6 or month = 9:
-	grandpahelping = RAND(3,12)
+	grandpahelping = rand(3,12)
 else
-	grandpahelping = RAND(3,13)
+	grandpahelping = rand(3,13)
 end
 
-!month >= 1 and month < 5 and month > 9
 if grandpahelping = 0:
-	'"- <<$pcs_nickname>>, could you bring firewood for the stove?"'
+	'"<<$pcs_nickname>>, could you bring firewood for the stove?"'
 
 	act 'Fetch firewood (0:15)':
 		*clr & cla
@@ -28,8 +27,8 @@ if grandpahelping = 0:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
 		end
 		'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."'
+		'"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."'
 		minut += 15
 		grandmahelp += 1
 		gs'stat'
@@ -37,24 +36,24 @@ if grandpahelping = 0:
 		act 'Go':gt'Gadhouse'
 	end
 elseif grandpahelping = 1:
-	'"- <<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
+	'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
 
 	act 'Go to the barn (0:15)':
+		*clr & cla
 		if month >= 4 and month <= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
 		end
 		'You went to the barn and fed the horse.'
-		*clr & cla
 		feed_horse = 1
 		minut += 15
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 elseif grandpahelping = 2:
-	'"- <<$pcs_nickname>>, go to the barn to feed the cows."'
+	'"<<$pcs_nickname>>, go to the barn to feed the cows."'
 
 	act 'Go to the barn (0:15)':
 		*clr & cla
@@ -68,7 +67,7 @@ elseif grandpahelping = 2:
 		feed_cow = 1
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 elseif grandpahelping = 3:
 	gt 'grandpahelp', 'cleanyard'
@@ -76,26 +75,19 @@ elseif grandpahelping = 4:
 	gt 'grandpahelp', 'groomhorse'
 elseif grandpahelping = 5:
 	gt 'grandpahelp', 'feedhogs'
-!month = 5
 elseif grandpahelping = 6 and hour >= 6 and hour < 9:
 	gt 'grandpahelp', 'grazehorse'
 elseif grandpahelping = 7 and hour >= 6 and hour < 9:
 	gt 'grandpahelp', 'leadcows'
 elseif grandpahelping = 8 and hour >= 6 and hour < 9:
 	gt 'grandpahelp', 'grazecows'
-!month = 6 or month = 9
 elseif grandpahelping = 9 and temper >= 15 and sunWeather = 1 and week > 5:
 	gt 'grandpahelp', 'washhorse'
-elseif grandpahelping = 10 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
-	gt 'grandpahelp', 'pickforest'
-elseif grandpahelping = 11 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
-	gt 'grandpahelp', 'pickforest'
-elseif grandpahelping = 12 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
+elseif grandpahelping >= 10 and grandpahelping < 13 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
 	gt 'grandpahelp', 'pickforest'
-!month = 7 or month = 8
 elseif grandpahelping = 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."'
-	'"- Okay, grandfather," you replied. You grab a rake, and start walking towards the field.'
+	'"<<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
+	'"Okay, grandfather," you replied. You grab a rake, and start walking towards the field.'
 
 	act 'Go to the field (0:40)':
 		*clr & cla
@@ -105,37 +97,37 @@ elseif grandpahelping = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and
 		minut += 40
 		gs'stat'
 
-		act 'Further':gt'gadfield','field'
+		act 'Continue':gt'gadfield','field'
 	end
 else
 	if hour >= 9:
 		randmsg = rand(0,5)
 		if randmsg = 0:
-			'"- You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
+			'"You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
 		elseif randmsg = 1:
-			'"- You can rest today child, there is nothing to do."'
+			'"You can rest today child, there is nothing to do."'
 		elseif randmsg = 2:
-			'"- You can rest today <<$pcs_nickname>>, there is nothing to do."'
+			'"You can rest today <<$pcs_nickname>>, there is nothing to do."'
 		elseif randmsg = 3:
-			'"- There''s no work today <<$pcs_nickname>>, go and rest up."'
+			'"There''s no work today <<$pcs_nickname>>, go and rest up."'
 		elseif randmsg = 4:
-			'"- You can rest today my dear granddaughter."'
+			'"You can rest today my dear granddaughter."'
 		else
-			'"- You can take the day off to rest up."'
+			'"You can take the day off to rest up."'
 		end
 	else
 		randmsg = rand(0,1)
 		if randmsg = 0:
-			'"- You don''t need to help out today <<$pcs_nickname>>."'
+			'"You don''t need to help out today <<$pcs_nickname>>."'
 		else
-			'"- You can take the day off."'
+			'"You can take the day off."'
 		end
 	end
-	act 'Go':gt'Gadhouse'
+	act 'Leave':gt'Gadhouse'
 end
 
 if $ARGS[0] = 'cleanyard':
-	'"- Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
+	'"Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
 
 	act 'Clean up the yard (1:00)':
 		*clr & cla
@@ -149,10 +141,10 @@ if $ARGS[0] = 'cleanyard':
 		minut += 60
 		grandmahelp += 1
 		if month >= 4 and month <= 10:
-			fat -= RAND(1,3)
+			fat -= rand(1,3)
 		else
 			stren_exp += 1
-			fat -= RAND(1,5)
+			fat -= rand(1,5)
 		end
 		gs'stat'
 
@@ -161,7 +153,7 @@ if $ARGS[0] = 'cleanyard':
 end
 
 if $ARGS[0] = 'feedhogs':
-	'"- <<$pcs_nickname>>, could you go to the barn and feed the hogs."'
+	'"<<$pcs_nickname>>, could you go to the barn and feed the hogs."'
 
 	act 'Go to the barn (0:15)':
 		*clr & cla
@@ -175,12 +167,12 @@ if $ARGS[0] = 'feedhogs':
 		minut += 15
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 end
 
 if $ARGS[0] = 'washhorse':
-	'"- It''s good weather today. Take Desperado to the river and give him a bath."'
+	'"It''s good weather today. Take Desperado to the river and give him a bath."'
 
 	act 'Go to the barn (0:10)':
 		*clr & cla
@@ -190,12 +182,12 @@ if $ARGS[0] = 'washhorse':
 		minut += 10
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 end
 
 if $ARGS[0] = 'groomhorse':
-	'"- Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
+	'"Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
 
 	act 'Go to the barn (0:15)':
 		*clr & cla
@@ -209,12 +201,12 @@ if $ARGS[0] = 'groomhorse':
 		minut += 15
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 end
 
 if $ARGS[0] = 'grazehorse':
-	'"- <<$pcs_nickname>>, take the horse to the field, my legs hurt so I need to rest for a bit. I`ll retrieve the horse up in the evening."'
+	'"<<$pcs_nickname>>, take the horse to the field, my legs hurt so I need to rest for a bit. I`ll retrieve the horse up in the evening."'
 
 	act 'Go to the barn (0:15)':
 		*clr & cla
@@ -224,54 +216,40 @@ if $ARGS[0] = 'grazehorse':
 		minut += 15
 		gs'stat'
 
-		act 'Further':& gt'Gadsarai'
+		act 'Continue':& gt'Gadsarai'
 	end
 end
 
 if $ARGS[0] = 'grazecows':
 	if graze_cow_exp = 0: 
-		'"- <<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat and lead the herd to the field. I''ll meet you there."'
+		'"<<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat and lead the herd to the field. I''ll meet you there."'
 	else
-		'"- <<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
+		'"<<$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
 
-	if graze_cow_exp = 0:
-		act 'Go to the barn (0:20)':
-			gs 'food', 'm_meal' &! use current one, *clr & cla will clear messages
-			*clr & cla
+	act 'Go to the field (0:20)':
+		*clr & cla
+		if graze_cow_exp = 0:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You take a little nibble of a sandwich and go to the shed where the herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
-			graze_cow = 1
-			pcs_mood += 20
-			pcs_health += 10
-			minut += 20
-			bottle += 1
-			buterbrod += 1
-			gs'stat'
-
-			act 'Further':gt'Gadsarai'
-		end
-	else
-		act 'Go to the field (0:20)':
-			gs 'food', 'm_meal' &! use current one, *clr & cla will clear messages
-			*clr & cla
+		else
 			'<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.'
-			graze_cow = 1
-			pcs_mood += 20
-			pcs_health += 10
-			minut += 20
-			bottle += 1
-			buterbrod += 1
-			gs'stat'
-
-			act 'Further':gt'gadfield','cow'
 		end
+		graze_cow = 1
+		pcs_mood += 20
+		pcs_health += 10
+		minut += 20
+		if bottle = 0: bottle = 1
+		if buterbrod = 0: buterbrod = 1
+		gs'stat'
+
+		act 'Continue':gt'gadfield','cow'
 	end
 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:15)':
 		*clr & cla
@@ -281,32 +259,33 @@ if $ARGS[0] = 'leadcows':
 		minut += 15
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
+		act 'Continue':gt'Gadsarai'
 	end
 end
 
 if $ARGS[0] = 'pickforest':
-	grandpa_boletus = rand(2,3)
-	grandpa_bilberry = rand(3,5)
 	if grandpahelping = 10:
 		go_in_boletus = 1
-		'"- <<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
-		'"- How much should I pick, grandpa?", you ask.'
-		'"- <<grandpa_boletus>> kg will be enough," grandfather replies. "- Be careful so you don''t get lost."'
+		grandpa_boletus = 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.'
+		'"<<grandpa_boletus>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
 	elseif grandpahelping = 11:
 		go_in_bilberry = 1
-		'"- <<$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.'
-		'"- <<grandpa_bilberry>> kg will be enough," grandfather replies. "- Just be careful so you don''t get lost."'
+		grandpa_bilberry = 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.'
+		'"<<grandpa_bilberry>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
 	elseif grandpahelping = 12:
-		grandpa_bilberry = rand(2,3)
 		go_in_boletus_bilberry = 1
-		'"- <<$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?"'
-		'"- <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries will be enough," grandfather replies. "- Just don`t get lost."'
+		grandpa_boletus = rand(1,2)
+		grandpa_bilberry = 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?"'
+		'"<<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries will be enough," grandfather replies. "Just don`t get lost."'
 	end
 	act 'Go':gt'Gadhouse'
 end
 
---- grandpahelp ---------------------------------
+--grandpahelp ---------------------------------