1
0
Prechádzať zdrojové kódy

Overhaul to the way grandparent chores work. Most chores must now be 'turned in' before they are considered complete. Also added guide text to stat_display, and made it to where not helping your grandparents for 3+ days will negatively affect your allowance.

richard_butte 4 rokov pred
rodič
commit
178216c26f

+ 10 - 0
locations/cikl.qsrc

@@ -1498,6 +1498,16 @@ mira_go_river = 0
 forestpicnic = 0
 if Mira_no > 0: Mira_no -= 1
 if Mira_no < 0: Mira_no = 0
+if gadstay = 1:
+	if daystart > (grandmaQW['last_day_helped'] + 3) and daystart > (grandpaQW['last_day_helped'] + 3):
+		if (daystart - grandmaQW['last_day_helped']) <= (daystart - grandpaQW['last_day_helped']):
+			'You haven''t helped your grandparents with any chores in <<daystart - grandmaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'
+		else
+			'You haven''t helped your grandparents with any chores in <<daystart - grandpaQW[''last_day_helped'']>> days. You should help out more regularly to stay on your grandparents'' good side.'
+		end
+		grandmaQW['help_amount'] -= 1
+	end
+end
 if catout ! 0: catout = 0
 if feedcat ! 0: feedcat = 0
 

+ 5 - 2
locations/gaddvor.qsrc

@@ -71,13 +71,16 @@ if $ARGS[0]='':
 					'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
 				end
 				minut += 60
-				grandpaQW['chore_clean_yard'] = 0
-				grandmaQW['help_amount'] += 1
+				grandpaQW['chore_clean_yard'] = 2
 				if month >= 4 and month <= 10:
 					fat -= rand(1,3)
+					pcs_stam -= 5
+					gs 'sweat', 'add', 10
 				else
 					stren_exp += 1
 					fat -= rand(1,5)
+					pcs_stam -= 10
+					gs 'sweat', 'add', 5
 				end
 				gs'stat'
 

+ 153 - 75
locations/gadfield.qsrc

@@ -44,14 +44,14 @@ if $ARGS[0] = 'field':
 	if flowerday ! daystart and grigory_flower = 10: gt 'grigory', 'flower6'
 	if flowerday ! daystart and grigory_flower > 10: gt 'grigory', 'flower8'
 	if hour >= 9 and hour <= 19 and week < 6:'Grandfather''s horse <a href="exec: gt ''gadfield'',''horse''">Desperado</a> is grazing the field.'
-	if hour >= 9 and hour <= 19 and grandpaQW['chore_herd_cattle'] = 0:'You see <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a> in the middle of the field.'
-	if hour >= 6 and hour <= 20 and grandpaQW['chore_herd_cattle'] = 1:'You notice <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a>.'
+	if hour >= 9 and hour <= 19 and grandpaQW['chore_herd_cattle'] = 0:'You notice a large <a href="exec: gt ''gadfield'',''cow''">herd of cows</a> in the middle of the field.'
+	if hour >= 6 and hour <= 20 and grandpaQW['chore_herd_cattle'] = 1:'You see the <a href="exec: gt ''gadfield'',''cow''">herd of cows</a> out in the middle of the field.'
 	if hour >= 7 and hour <= 20 and grandpaQW['chore_bale_hay'] = 1:'You see a crowd of people working on the field.'
 
 	act 'Head back to the road':minut += 10 & gt'gadroad'
 	
-	if hour >= 7 and hour <= 20 and grandpaQW['chore_bale_hay'] = 1:
-		act 'Go to the hayfield':
+	if hour >= 7 and hour <= 13 and grandpaQW['chore_bale_hay'] = 1:
+		act 'Spend the day helping to bale hay (6:00)':
 			gs 'food', 'm_meal'
 			*clr & cla
 			menu_off = 1
@@ -59,21 +59,16 @@ if $ARGS[0] = 'field':
 			if npc_rel['A60'] >= 15:
 				npc_rel['A60'] += 1
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/haying_time_mira.jpg"></center>'
-				'Most of the village has shown up to help out with the hay. You and Mira also partake in the activities. You are really enjoying yourself, especially considering you''re spending time, sitting on the fresh cut hay, talking to Mira.'
+				'Most of the village has shown up to help out with the hay. Mira is there too, and you both partake in the activities. You are really enjoying yourself, and working alongside Mira makes the day fly by. By the end of the day, you are both exhausted, but smiling.'
 			else
-				fat -= 5
-				stren_exp += 1
-				agil_exp += 1
-				vital_exp += 1
-				gs 'sweat', 'add', 20
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/haying_time.jpg"></center>'
-				'Almost all of the villagers have shown up to help out with the fresh cut hay. You decide to join them.'
+				'Almost all of the villagers have shown up to help out with the fresh cut hay. You spend most of the day working hard and sweating as you help gather the fresh-cut hay. It is difficult, but you get a great workout and end the day feeling exhausted, but quite satisfied.'
 			end
 
-			minut += 360
-			grandmaQW['help_amount'] += 1
-			grandpaQW['chore_bale_hay'] = 0
-			hndiwrk_exp += rand(0,2)
+			gs 'exercise', 'tier1', 360, 'stren_exp', 'vital_exp'
+			if sunWeather = 1:pcs_tan += 1
+			grandpaQW['chore_bale_hay'] = 2
+			hndiwrk_exp += rand(0,8)
 			gs 'stat'
 
 			act 'Continue':gt'gadfield','field'
@@ -129,7 +124,7 @@ if $ARGS[0] = 'cow':
 	temp = rand(1,5)
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
-	'The cow herd is standing in the middle of the field.'
+	'The cattle herd is standing in the middle of the field. Some of the cows are munching on grass, others are just staring idly around.'
 	if mira = 1: MiraLoc = 41 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is standing next to you.'
 
 	if grandpaQW['chore_herd_cattle'] = 0:act 'Leave them be':gt'gadfield','field'
@@ -140,7 +135,7 @@ if $ARGS[0] = 'cow':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
 			'Seeing the cow herd on the field, you decide to help your grandfather bring the cows home...'
 			minut += 60
-			grandmaQW['help_amount'] += rand(0,1)
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -153,8 +148,8 @@ if $ARGS[0] = 'cow':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_wait.jpg"></center>'
-				if grandpaQW['chore_herd_cattle_experience'] = 0:'Some time flies by while waiting for the locals to finish their gathering.'
-				if grandpaQW['chore_herd_cattle_experience'] = 1:'Some time flies by while waiting for the locals and their children to finish their gathering.'
+				if grandpaQW['chore_herd_cattle_experience'] = 0:'Some time flies by while waiting for the locals to finish bringing their cows to the field.'
+				if grandpaQW['chore_herd_cattle_experience'] = 1:'Some time flies by while waiting for the locals and their children to finish bringing their cows to the field.'
 
 				if hour >= 9:minut += 20
 				if hour < 9:minut += 60
@@ -169,12 +164,20 @@ if $ARGS[0] = 'cow':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow'+rand(1,4)+'.jpg"></center>'
-				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
+				'You spend an hour herding the cows, watching out for any stragglers and driving them back to the herd. Instead of letting your grandfather do all the work, you roll up the sleeves and try to do most of the work yourself.'
 
 				minut += 60
-				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+				if temper >= 25 and sunWeather = 1:
+					pcs_hydra -= 12
+					pcs_stam -= 8
+					gs 'sweat', 'add', 10
+				else
+					pcs_hydra -= 6
+					gs 'sweat', 'add', 5
+					pcs_stam -= 5
+				end
 				grandpaQW['chore_herd_cattle_experience'] = 1
-				grandmaQW['help_amount'] += 1
+				if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -186,7 +189,7 @@ if $ARGS[0] = 'cow':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_run.jpg"></center>'
-					'Since you have nothing to do, you run intervals across the field for an hour.'
+					'Since the cows are all behaving, you decide to spend some time jogging around the field.'
 
 					frost = 0
 					minut += 60
@@ -194,7 +197,14 @@ if $ARGS[0] = 'cow':
 					run_exp += 1
 					gs 'sweat', 'add', 10
 					pcs_mood += 5
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 24
+					pcs_stam -= 8
+					if temper >= 25 and sunWeather = 1:
+						pcs_hydra -= 24
+						gs 'sweat', 'add', 12
+					else
+						pcs_hydra -= 18
+						gs 'sweat', 'add', 10
+					end
 					gs 'stat'
 
 					act 'Continue':gt'gadfield','cow'
@@ -205,11 +215,11 @@ if $ARGS[0] = 'cow':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_sun.jpg"></center>'
-					'It''s really warm outside so you decide to sunbathe for an hour.'
+					'It''s sunny and warm outside, and since the cows are behaving, you decide to work on your tan for an hour.'
 					minut += 60
 					pcs_mood += 10
 					pcs_tan += 1
-					gs 'sweat', 'add', 10
+					gs 'sweat', 'add', 5
 					gs 'stat'
 
 					act 'Continue':gt'gadfield','cow'
@@ -219,7 +229,7 @@ if $ARGS[0] = 'cow':
 						*clr & cla
 						menu_off = 1
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_lying.jpg"></center>'
-						'You lie down on the grass and doze off for an hour.'
+						'You feel drowsy watching the cows stand around, so you lie down on the grass. You doze off and wake up about an hour later.'
 
 						minut += 60
 						pcs_mood += 10
@@ -234,12 +244,20 @@ if $ARGS[0] = 'cow':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_flowers.jpg"></center>'
-					'You spend an hour wandering the field, picking flowers.'
+					'Keeping one eyes on the cattle, you spend an hour wandering the field, picking flowers.'
 					minut += 60
 					pcs_mood += 20
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+					pcs_stam -= 4
+					if temper >= 25 and sunWeather = 1:
+						pcs_hydra -= 8
+						gs 'sweat', 'add', 5
+					else
+						pcs_hydra -= 5
+						gs 'sweat', 'add', 3
+					end
 					gs 'stat'
 
+
 					act 'Continue':gt'gadfield','cow'
 				end
 				act 'Read a book (1:00)':
@@ -247,7 +265,7 @@ if $ARGS[0] = 'cow':
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_book'+rand(1,2)+'.jpg"></center>'
 					minut += 60
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+					if temper >= 25 and sunWeather = 1:pcs_hydra -= 6
 					if pcs_nerd > 0:
 						lastread = totminut
 						lastreadday = daystart
@@ -272,9 +290,17 @@ if $ARGS[0] = 'cow':
 			*clr & cla
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go.jpg"></center>'
-			'Looking at his watch, grandpa turns to you and says "The time is around lunchtime so it''s time to take the herd to the watering hole." You begin to gather the cows and lead them to the river.'
+			'Looking at his watch, Grandpa turns to you and says, "It''s about lunchtime, which means it''s time to take the herd to the watering hole." You begin to gather the cows and lead them to the river.'
 
-			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+			if temper >= 25 and sunWeather = 1:
+				pcs_hydra -= 12
+				pcs_stam -= 8
+				gs 'sweat', 'add', 10
+			else
+				pcs_hydra -= 6
+				gs 'sweat', 'add', 5
+				pcs_stam -= 5
+			end
 			grandmaQW['help_amount'] += 1
 			minut += 60
 			hndiwrk_exp += rand(0,3)
@@ -300,7 +326,7 @@ if grandpaQW['chore_herd_cattle'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mira2.jpg"></center>'
 	'While keeping an eye on the cow herd, you see Mira in the distance, approaching. You happily wave to her.'
-	'" - Hi, <<$pcs_nickname>>. I wanted to visit you and brought water with me," she says nearing you. " - Have you missed me?"'
+	'"Hi, <<$pcs_nickname>>. I wanted to visit you and brought water with me," she says nearing you. "Have you missed me?"'
 	minut += 5
 	npc_rel['A60'] += 1
 	mira = 1
@@ -324,10 +350,10 @@ if $ARGS[0] = 'cow2':
 	'<center><H4>River</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_river.jpg"></center>'
 
-	'The cow herd is standing by the river.'
+	'The cattle herd is near the river. Some of the cows are munching on grass, some are drinking from the river, and some are just standing or lying around.'
 
 	if mira = 1: MiraLoc = 42 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
-	if temper >= 15 and sunWeather = 1:'- "You can go for a swim while there is time, <<$pcs_nickname>>. I''ll keep an eye on the herd," said your grandfather.'
+	if temper >= 15 and sunWeather = 1:'"You can go for a swim if you want, <<$pcs_nickname>>. I''ll keep an eye on the herd," says your grandfather.'
 
 	if grandpaQW['chore_herd_cattle'] = 1:
 		if hour < 16:
@@ -335,11 +361,20 @@ if $ARGS[0] = 'cow2':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow'+rand(1,4)+'.jpg"></center>'
-				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
+				'You spend an hour herding the cows, watching out for any stragglers and driving them back to the herd. Instead of letting your grandfather do all the work, you roll up the sleeves and try to do most of the work yourself.'
+
 				minut += 60
-				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandmaQW['help_amount'] += 1
+				if temper >= 25 and sunWeather = 1:
+					pcs_hydra -= 12
+					pcs_stam -= 8
+					gs 'sweat', 'add', 10
+				else
+					pcs_hydra -= 6
+					gs 'sweat', 'add', 5
+					pcs_stam -= 5
+				end
 				grandpaQW['chore_herd_cattle_experience'] = 1
+				if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -350,11 +385,11 @@ if $ARGS[0] = 'cow2':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river.jpg"></center>'
-					'You take a quick swim, cooling off your body.'
+					'You spend a few minutes spashing around in the river, which feels cool and refreshing.'
 					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 					minut += 15
 					cumspclnt = 4 & gs 'cum_cleanup'
-					pcs_sweat = 10 + rand(0,4)
+					pcs_stam -= 3
 					pcs_mood += 5
 					if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
 					if pcs_stren < 30:stren_exp += 1
@@ -366,7 +401,7 @@ if $ARGS[0] = 'cow2':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_sun.jpg"></center>'
-					'You lie down to sunbathe, while grandpa looks after the herd.'
+					'You lie down to sunbathe by the river, while Grandpa looks after the herd.'
 					minut += 30
 					gs 'sweat', 'add', 10
 					pcs_mood += 5
@@ -405,10 +440,19 @@ if $ARGS[0] = 'cow2':
 			*clr & cla
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go.jpg"></center>'
-			'Looking at his watch, grandpa says that it''s time to drive the herd back on the field, but now closer to the forest. The two of you begin to gather the scattered herd and head toward the forest.'
-			grandmaQW['help_amount'] += 1
-			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+			'Looking at his watch, Grandpa says that it''s time to drive the herd over near the forest. The two of you begin to gather the herd and drive them toward the forest.'
+			
 			minut += 60
+			if temper >= 25 and sunWeather = 1:
+				pcs_hydra -= 12
+				pcs_stam -= 8
+				gs 'sweat', 'add', 10
+			else
+				pcs_hydra -= 6
+				gs 'sweat', 'add', 5
+				pcs_stam -= 5
+			end
+			if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -432,7 +476,7 @@ if $ARGS[0] = 'cow3':
 	'<center><H4>Field near the forest</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_forest.jpg"></center>'
 
-	'The cow herd is standing on a field near the forest.'
+	'The cattle herd is grazing in a field near the forest.'
 
 	if mira = 1: MiraLoc = 43 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
@@ -442,81 +486,107 @@ if $ARGS[0] = 'cow3':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow'+rand(1,4)+'.jpg"></center>'
-				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
+				'You spend an hour herding the cows, watching out for any stragglers and driving them back to the herd. Instead of letting your grandfather do all the work, you roll up the sleeves and try to do most of the work yourself.'
+
 				minut += 60
-				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandmaQW['help_amount'] += 1
+				if temper >= 25 and sunWeather = 1:
+					pcs_hydra -= 12
+					pcs_stam -= 8
+					gs 'sweat', 'add', 10
+				else
+					pcs_hydra -= 6
+					gs 'sweat', 'add', 5
+					pcs_stam -= 5
+				end
 				grandpaQW['chore_herd_cattle_experience'] = 1
+				if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
 				act 'Continue':gt'gadfield','cow3'
 			end
 			if mira = 0:
-				act 'Take a run (1:00)':
+				act 'Take a run on the field (1:00)':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_run.jpg"></center>'
-					'Since you have nothing to do, you run intervals across the field for an hour.'
+					'Since the cows are all behaving, you decide to spend some time jogging around the field.'
+
 					frost = 0
 					minut += 60
 					fat -= 5
 					run_exp += 1
 					gs 'sweat', 'add', 10
 					pcs_mood += 5
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 24
+					pcs_stam -= 8
+					if temper >= 25 and sunWeather = 1:
+						pcs_hydra -= 24
+						gs 'sweat', 'add', 12
+					else
+						pcs_hydra -= 18
+						gs 'sweat', 'add', 10
+					end
 					gs 'stat'
 
-					act 'Continue':gt'gadfield','cow3'
+					act 'Continue':gt'gadfield','cow'
 				end
 			end
 			if temper >= 15 and sunWeather = 1 and mira = 0:
-				act 'Pick flowers (1:00)':
-					*clr & cla
-					menu_off = 1
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_flowers.jpg"></center>'
-					'You spent an hour wandering around the field, picking flowers.'
-					minut += 60
-					pcs_mood += 20
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-					gs 'stat'
-
-					act 'Continue':gt'gadfield','cow3'
-				end
 				act 'Tan (1:00)':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_sun.jpg"></center>'
-					'You sunbathe for an hour.'
+					'It''s sunny and warm outside, and since the cows are behaving, you decide to work on your tan for an hour.'
 					minut += 60
 					pcs_mood += 10
 					pcs_tan += 1
-					gs 'sweat', 'add', 10
+					gs 'sweat', 'add', 5
 					gs 'stat'
 
-					act 'Continue':gt'gadfield','cow3'
+					act 'Continue':gt'gadfield','cow'
 				end
 				if pcs_sleep < 40:
-					act 'Nap on the grass (1:00)':
+					act 'Take a nap (1:00)':
 						*clr & cla
 						menu_off = 1
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_lying.jpg"></center>'
-						'You lie down on the grass and doze off for an hour.'
+						'You feel drowsy watching the cows stand around, so you lie down on the grass. You doze off and wake up about an hour later.'
+
 						minut += 60
 						pcs_mood += 10
 						pcs_sleep+= 9
 						if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 						gs 'stat'
 
-						act 'Continue':gt'gadfield','cow3'
+						act 'Continue':gt'gadfield','cow'
 					end
 				end
+				act 'Pick flowers (1:00)':
+					*clr & cla
+					menu_off = 1
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_flowers.jpg"></center>'
+					'Keeping one eyes on the cattle, you spend an hour wandering the field, picking flowers.'
+					minut += 60
+					pcs_mood += 20
+					pcs_stam -= 4
+					if temper >= 25 and sunWeather = 1:
+						pcs_hydra -= 8
+						gs 'sweat', 'add', 5
+					else
+						pcs_hydra -= 5
+						gs 'sweat', 'add', 3
+					end
+					gs 'stat'
+
+
+					act 'Continue':gt'gadfield','cow'
+				end
 				act 'Read a book (1:00)':
 					*clr & cla
 					menu_off = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_book'+rand(1,2)+'.jpg"></center>'
 					minut += 60
-					if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+					if temper >= 25 and sunWeather = 1:pcs_hydra -= 6
 					if pcs_nerd > 0:
 						lastread = totminut
 						lastreadday = daystart
@@ -525,7 +595,7 @@ if $ARGS[0] = 'cow3':
 						pcs_mood = 100
 						if pcs_stren > 1: stren_deg -= 1
 						if pcs_vital > 5: vital_deg -= 1
-						'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
+						 'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
 					else
 						blizoruk += 1
 						pcs_mood += 10
@@ -542,13 +612,21 @@ if $ARGS[0] = 'cow3':
 			menu_off = 1
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_home.jpg"></center>'
-			'Looking at his watch, grandpa says that it is late and time to drive the herd home. You hurry and gather up the cows and drive them towards the village.'
+			'As sunset approaches, Grandpa says that it is late and time to drive the herd home. You hurry and gather up the cows and drive them back towards the village.'
 
-			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
+			if temper >= 25 and sunWeather = 1:
+				pcs_hydra -= 12
+				pcs_stam -= 8
+				gs 'sweat', 'add', 10
+			else
+				pcs_hydra -= 6
+				gs 'sweat', 'add', 5
+				pcs_stam -= 5
+			end
 			minut += 60
 			mira = 0
 			grandpaQW['chore_herd_cattle'] = 0
-			grandmaQW['help_amount'] += 1
+			grandmaQW['help_amount'] += 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 207 - 10
locations/gadhouse.qsrc

@@ -49,6 +49,7 @@
 !! 
 !! grandpaQW['chore_bale_hay']					0/1 - is the "bale hay in the field" quest active?
 !! grandpaQW['chore_bathe_horse']				0/1 - is the "bathe the horse in the river" quest active?
+!! grandpaQW['chore_bathe_horse_prog']			0/1/2 - progress of "bathe the horse in the river" quest
 !! grandpaQW['chore_brush_horse']				0/1 - is the "brush the horse" quest active?
 !! grandpaQW['chore_clean_yard']				0/1 - is the "clean the yard" quest active?
 !! grandpaQW['chore_feed_boar']					0/1 - is the "feed the pig" quest active?
@@ -285,7 +286,7 @@ if $ARGS[0] = 'main':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
 			'You pick up your grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
 			
-			act 'Hang the Laundry':
+			act 'Hang the laundry':
 				*clr & cla
 				minut += 10
 				gs'stat'
@@ -663,7 +664,7 @@ if $ARGS[0] = 'grandma':
 		end
 		
 		if grandmaQW['chore_harvest_garden'] = 2:
-			act 'Give her the fruit you collected':
+			act 'Give her the vegetables from the garden':
 				*clr & cla
 				grandmaQW['help_amount'] += 1
 				minut += 2
@@ -899,10 +900,185 @@ if $ARGS[0]='grandpa':
 
 	!!---------------------- 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':
+		if grandpaQW['chore_fetch_firewood'] = 2:
+			act 'Tell him you got the firewood':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_fetch_firewood'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"I''ve brought in some firewood, Grandpa," you say to your grandfather.'
+				'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "Just set down it over there."'
+				'You put down the heavy wood gratefully. "Is there anything else you need?"'
+				'"No, that is all I have for you today," he says.'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_feed_horse'] = 2:
+			act 'Tell him you fed Desperado':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_feed_horse'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"I fed the horse, Grandpa."'
+				'"Thank you <<$pcs_nickname>>," he says. "It is very important to make sure a horse is well fed. They are hard workers and deserve their meals."'
+				'You smile in agreement. "I am sure Desperado is a very hard worker."'
+				'"He may not be the young stallion he once was," your grandfather says, "but he is a trusted friend."'
+				'He obviously cares a great deal about his horse.'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_feed_cow'] = 2:
+			act 'Tell him you fed Dawn':
 				*clr & cla
 				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_feed_cow'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You tell your grandfather, "I fed Dawn her hay, Grandpa."'
+				'"Very good, <<$pcs_nickname>>," he says. "I presume she acted like we were starving her to death?"'
+				'"Well, she was definitely excited," you say with a laugh.'
+				'"She always is when it comes to eating," he says.'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_clean_yard'] = 2:
+			act 'Tell him you cleaned up the yard':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_clean_yard'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"I finished cleaning the yard, Grandpa," you say as you stretch your sore arms.'
+				'"Very good," he says. "It is more work than it seems, isn''t it?"'
+				'"Yes sir, it is," you agree. "Is there anything else you need me to do?"'
+				'"No, that is all for today, <<$pcs_nickname>>."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_brush_horse'] = 2:
+			act 'Tell him you finished grooming Desperado':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_brush_horse'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"I brushed the horse, Grandpa," you tell your grandfather.'
+				'"You scrubbed him down with the curry brush?" he asks.'
+				'"Yes sir, I did," you say.'
+				'"Even his belly?"'
+				'"Yes, even his belly."'
+				'"And did you wash his face and comb his mane and tail?"'
+				'"Ugh, yes Grandpa, I did everything just like you showed me when I was a kid."'
+				'"Don''t sass me, <<$pcs_firstname>>," you grandfather says with a scowl. "Properly brushing a horse is very important for their health."'
+				'The rebuke stings a little. "Sorry, Grandpa."'
+				'His face softens when he sees he upset you. "...No, child, I''m sorry. You did me a favor and here I am berating you for it. Thank you for brushing the horse, <<$pcs_nickname>>."'
+				'"It''s okay Grandpa. I know Desperado is important to you," you say.'
+				'He smiles and rubs your shoulder. "Thank you again. You may rest now, there is nothing else to do today."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_feed_boar'] = 2:
+			act 'Tell him you fed Nickle':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_feed_boar'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to your grandfather and tell him, "I fed the pig, Grandpa."'
+				'"Thank you <<$pcs_nickname>>," he says.'
+				'"You''re welcome! Is there anything else you need?"'
+				'"No, you can take the rest of the day off, granddaughter."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_lead_horse_to_field'] = 2:
+			act 'Tell him you took Desperado to the field':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_lead_horse_to_field'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"Hey Grandpa, I took Desperado out to the field."'
+				'"Good, good," he says. "Horses need freedom to run."'
+				'You nod. "He seemed pretty happy to be able to run around."'
+				'Your grandfather smiles at that. "Thank you <<$pcs_nickname>>. You can rest for now."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_lead_cow_to_field'] = 2:
+			act 'Tell him you took Dawn to the field':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				minut += 5
+				grandpaQW['chore_lead_cow_to_field'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"Hi Grandpa!" you say. "I took Dawn out to the field."'
+				'"Were the others there?" he asks.'
+				'You nod. "Yes, sir. I asked them to drive her home later - they seemed fine with that."'
+				'"Yes, here in the country we all must help one another. Soon it will be our turn to watch the cattle."'
+				'"All of them? For the whole village? Just us?" you ask incredulously.'
+				'"No child, there will be a few others with us. But don''t look so surprised - it does not take many people to herd cows."'
+				'You think of the stories you have heard of a few herders driving thousands of cattle. "Hmm, I guess that''s true..."'
+				'Your grandfather smiles and ruffles your hair. "But that is not a problem for today. Go and take the rest of the day off."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
+		if grandpaQW['chore_bathe_horse'] = 2:
+			act 'Tell him you bathed Desperado':
+				*clr & cla
+				grandmaQW['help_amount'] += 2
+				minut += 5
+				grandpaQW['chore_bathe_horse'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to your grandfather and tell him, "I gave Desperado a bath in the river, Grandpa."'
+				'"Thank you <<$pcs_nickname>>," he says. "Grooming him is all well and good, but sometimes it''s not enough."'
+				'"You''re welcome! It was actually a lot of fun. Is there anything else you need?"'
+				'"No, you can take the rest of the day off, granddaughter."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		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']
 				minut += 5
 				grandpaQW['chore_gather_mushrooms'] = 0
@@ -920,10 +1096,10 @@ if $ARGS[0]='grandpa':
 			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':
+		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'] += 1
+				grandmaQW['help_amount'] += 3
 				bilberry -= grandpaQW['chore_berry_quantity']
 				minut += 5
 				grandpaQW['chore_gather_berries'] = 0
@@ -941,10 +1117,10 @@ if $ARGS[0]='grandpa':
 			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':
+		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'] += 1
+				grandmaQW['help_amount'] += 3
 				boletus -= grandpaQW['chore_mushroom_quantity']
 				bilberry -= grandpaQW['chore_berry_quantity']
 				minut += 5
@@ -963,6 +1139,27 @@ if $ARGS[0]='grandpa':
 			end
 		end
 		
+		if grandpaQW['chore_bale_hay'] = 2:
+			act 'Tell him you helped the townspeople bale hay':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				minut += 5
+				grandpaQW['chore_bale_hay'] = 0
+				gs 'stat'
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'"I spent all day helping with the hay, Grandpa," you tell him, stretching your sore muscles.'
+				'He smiles proudly at you and says, "Yes, I was there too, <<$pcs_nickname>>. I saw you working hard."'
+				'"That was a lot of work!" you exclaim. "I''m completely exhausted."'
+				'"Yes, yes it is," he says. "I am worn out myself. I won''t be able to do it much longer, but you are still young and strong. I am very proud that my granddaughter is such a hard worker."'
+				'Maybe it''s just the exhaustion, but your eyes tear up slightly at that. Your grandfather is usually pretty sparing with his praise.'
+				'"Thank you, Grandpa," you say, giving him a tight hug, which he returns with surprising strength for his age.'
+				'After a few moments he lets go, and tells you, "Go and get some rest, child. You have earned it."'
+
+				act 'Continue': gt 'gadhouse', 'grandpa'
+			end
+		end
+
 	!!---------------------- turning in grandpa chores END
 
 		if grandpaQW['talked_about_forest'] = 0:

+ 6 - 8
locations/gadriver.qsrc

@@ -498,7 +498,7 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
-		if grandpaQW['chore_bathe_horse'] = 2:
+		if grandpaQW['chore_bathe_horse_prog'] = 1:
 			act 'Look at Desperado':
 				*clr & cla
 				
@@ -516,8 +516,7 @@ if $ARGS[0] = 'gadbitch':
 						pcs_mood += 5
 						if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 						hndiwrk_exp += rand(1,3)
-						grandmaQW['help_amount'] += 1
-						grandpaQW['chore_bathe_horse'] = 3
+						grandpaQW['chore_bathe_horse_prog'] = 2
 						gs 'stat'
 						
 						if $clothingworntype = 'nude':
@@ -546,8 +545,7 @@ if $ARGS[0] = 'gadbitch':
 							pcs_mood += 5
 							if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 							hndiwrk_exp += rand(1,3)
-							grandmaQW['help_amount'] += 1
-							grandpaQW['chore_bathe_horse'] = 3
+							grandpaQW['chore_bathe_horse_prog'] = 2
 							gs 'stat'
 							
 							if $clothingworntype = 'nude':
@@ -573,7 +571,7 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
-		if grandpaQW['chore_bathe_horse'] = 3:
+		if grandpaQW['chore_bathe_horse_prog'] = 2:
 			act 'Lead Desperado back home':
 				if $clothingworntype = 'swimwear':
 					cla
@@ -586,8 +584,8 @@ if $ARGS[0] = 'gadbitch':
 				else
 					minut += 30
 					hndiwrk_exp += rand(0,3)
-					grandmaQW['help_amount'] += rand(0,1)
-					grandpaQW['chore_bathe_horse'] = 0
+					grandpaQW['chore_bathe_horse'] = 2
+					grandpaQW['chore_bathe_horse_prog'] = 0
 					gs 'stat'
 					
 					gt'gadsarai'

+ 23 - 29
locations/gadsarai.qsrc

@@ -49,22 +49,20 @@ if $ARGS[0] = '':
 	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
 	
 	if grandpaQW['chore_fetch_firewood'] = 1:
-		act 'Fetch firewood for Grandpa (0:20)':
+		act 'Gather firewood for Grandpa (0:10)':
 			*clr & cla
 			if month >= 4 and month <= 10:
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
 			end
-			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry and walking back to the house.'
-			'"I''ve brought some firewood grandfather," you said to your grandfather.'
-			'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "There is no more work for today."'
-			grandpaQW['chore_fetch_firewood'] = 0
-			minut += 20
+			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry.'
+			grandpaQW['chore_fetch_firewood'] = 2
+			minut += 10
 			grandmaQW['help_amount'] += 1
 			gs'stat'
 
-			act 'Continue':gt 'gadhouse', 'start'
+			act 'Continue':gt 'gadsarai'
 		end
 	end
 	
@@ -182,12 +180,12 @@ if $ARGS[0] = 'boar':
 
 	'<center><H4>The barn</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/boar.jpg"></center>'
-	'One of your grandparents dearest possessions, the boar Nickle.'
+	'One of your grandparents'' dearest possessions: the boar, Nickle.'
 
 	act 'Leave':minut += 5 & gt 'gadsarai'
 
 	if grandpaQW['chore_feed_boar'] = 1:
-		act 'Feed the boar':
+		act 'Feed the hog':
 			cla
 			*clr
 			minut += 30
@@ -197,7 +195,7 @@ if $ARGS[0] = 'boar':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_boar.jpg"></center>'
-			'You fed Nickle and went on about your business.'
+			'You grab the feed bag and fill Nickle''s trough. You stand there and watch for a few minutes as he eats like a... well, like a pig.'
 
 			act 'Finish':gt 'gadsarai','boar'
 		end
@@ -221,14 +219,13 @@ if $ARGS[0] = 'cow':
 			*clr
 			minut += 30
 			grandmaQW['chore_milk_cow'] = 2
-			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/milk_cow.jpg"></center>'
 			'You start milking Dawn, improving for each time you do it.'
 
-			act 'Finish':gt 'gadsarai','cow'
+			act 'Continue':gt 'gadsarai','cow'
 		end
 	end
 	if grandpaQW['chore_feed_cow'] = 1:
@@ -236,15 +233,14 @@ if $ARGS[0] = 'cow':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['chore_feed_cow'] = 0
-			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_feed_cow'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_cow.jpg"></center>'
-			'You fed Dawn and continued on with your day.'
+			'Dawn is obviously excited about feeding time, shaking her head and doing little cow tippy-taps with her feet. You dump a sizable amount of hay in her trough and watch as she digs in.'
 
-			act 'Finish':gt 'gadsarai','cow'
+			act 'Continue':gt 'gadsarai','cow'
 		end
 	end
 	if grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1:
@@ -259,7 +255,7 @@ if $ARGS[0] = 'cow':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
 			if grandpaQW['chore_lead_cow_to_field'] = 1:
 				'You lead Dawn to the field, where you let the shepherds take over.'
-				grandpaQW['chore_lead_cow_to_field'] = 0
+				grandpaQW['chore_lead_cow_to_field'] = 2
 			end
 			if grandpaQW['chore_herd_cattle'] = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
 
@@ -284,15 +280,15 @@ if $ARGS[0] = 'horse':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['chore_feed_horse'] = 0
-			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_feed_horse'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_horse.jpg"></center>'
-			'You fed Desperado and went on about your business.'
+			'You grab a sack of grain and fill Desperado''s feed bucket. You hang the bucket from his stall and gently pat his nose as he begins to eat.'
+			'You watch him eat for a little while before moving on.'
 
-			act 'Finish':gt 'gadsarai','horse'
+			act 'Continue':gt 'gadsarai','horse'
 		end
 	end
 	if grandpaQW['chore_lead_horse_to_field'] = 1:
@@ -300,13 +296,12 @@ if $ARGS[0] = 'horse':
 			cla
 			*clr
 			minut += 60
-			grandpaQW['chore_lead_horse_to_field'] = 0
-			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_lead_horse_to_field'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
-			'You took Desperado by the bridle and led it to the field. There, you let it run free in the paddock area, and went on with your business.'
+			'You take Desperado by the bridle and lead him to the field. There, you let him free in the paddock area, and watch him run about for a bit before moving on.'
 
 			act 'Continue':gt'gadfield','field'
 		end
@@ -316,12 +311,12 @@ if $ARGS[0] = 'horse':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['chore_bathe_horse'] = 2
+			grandpaQW['chore_bathe_horse_prog'] = 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
-			'You took Desperado by the bridle and led it to the river.'
+			'You take Desperado by the bridle and lead him to the river.'
 
 			act 'Continue':gt'gadriver', 'gadbitch'
 		end
@@ -331,13 +326,12 @@ if $ARGS[0] = 'horse':
 			cla
 			*clr
 			minut += 60
-			grandpaQW['chore_brush_horse'] = 0
-			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_brush_horse'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/comb_horse.jpg"></center>'
-			'You groom Desperado for an hour. When finished, you''re satisfied with the result. Desperado is looking as healthy as ever.'
+			'You spend about an hour cleaning and brushing Desperado, scrubbing his coat and brushing his mane and tail. You are satisfied with the result - he is looking as clean and healthy as ever.'
 
 			act 'Continue':gt 'gadsarai','horse'
 		end

+ 13 - 14
locations/grandpahelp.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'start':
 			act 'Continue':gt'gadsarai','horse'
 		end
 	elseif grandpaQW['chore_type'] = 2:
-		'"<<$pcs_nickname>>, go to the barn to feed the cows."'
+		'"<<$pcs_nickname>>, go to the barn and feed the cow."'
 
 		grandpaQW['chore_feed_cow'] = 1
 		act 'Tell him that you will do it in a little while':gt 'gadhouse', 'grandpa'
@@ -88,7 +88,7 @@ if $ARGS[0] = 'start':
 		gt 'grandpahelp', 'leadcows'
 	elseif grandpaQW['chore_type'] = 8 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'grazecows'
-	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5:
+	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5 and ARRSIZE('swimwear') > 0:
 		gt 'grandpahelp', 'washhorse'
 	elseif grandpaQW['chore_type'] = 10:
 		gt 'grandpahelp', 'pickforest_mushrooms'
@@ -101,11 +101,11 @@ if $ARGS[0] = 'start':
 		'"Okay, grandfather," you replied.'
 
 		grandpaQW['chore_bale_hay'] = 1
-		act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
+		act 'Tell him you will head over there soon':gt 'gadhouse', 'grandpa'
 		act 'Grab a rake and head to the field (0:40)':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
-			'With the rake in your hand you met up with the other local residents at the field. All the present at the field got assigned to a task. You work hard gathering the hay.'
+			'With the rake in your hand, you go to meet up with the other local residents at the field.'
 			minut += 40
 			gs'stat'
 
@@ -148,14 +148,13 @@ if $ARGS[0] = 'cleanyard':
 		*clr & cla
 		if month >= 4 and month <= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
-			'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
+			'Armed with a rake, you begin cleaning the yard. You''re pleased, seeing the yard clean. You return the rake to the shed and continue on with your business.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
-			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
+			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself, seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
 		end
 		minut += 60
-		grandpaQW['chore_clean_yard'] = 0
-		grandmaQW['help_amount'] += 1
+		grandpaQW['chore_clean_yard'] = 2
 		if month >= 4 and month <= 10:
 			fat -= rand(1,3)
 		else
@@ -169,7 +168,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 hog?"'
 
 	grandpaQW['chore_feed_boar'] = 1
 	act 'Tell him you will get to it soon':gt 'gadhouse', 'grandpa'
@@ -191,7 +190,7 @@ end
 if $ARGS[0] = 'washhorse':
 	'"It''s good weather today. Take Desperado to the river and give him a bath."'
 
-		grandpaQW['chore_bathe_horse'] = 1
+	grandpaQW['chore_bathe_horse'] = 1
 	act 'Tell him you will do it in a little while':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -270,7 +269,7 @@ if $ARGS[0] = 'grazecows':
 end
 
 if $ARGS[0] = 'leadcows':
-	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter, could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
+	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter, could you lead the cow to the field and tell the herders to drive her home at the end of the day?"'
 
 	grandpaQW['chore_lead_cow_to_field'] = 1
 	act 'Tell him you will soon':gt 'gadhouse', 'grandpa'
@@ -290,7 +289,7 @@ if $ARGS[0] = 'pickforest_mushrooms':
 	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."'
+	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos 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)':
@@ -311,7 +310,7 @@ if $ARGS[0] = 'pickforest_berries':
 	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."'
+	'"<<grandpaQW[''chore_berry_quantity'']>> kilos 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)':
@@ -333,7 +332,7 @@ if $ARGS[0] = 'pickforest_both':
 	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."'
+	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kilos 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)':

+ 155 - 1
locations/stat_display.qsrc

@@ -2014,6 +2014,9 @@ if $nichStatMsg ! '': $stat_msg += '<br><b><<$nichStatMsg>></b>'
 
 if npc_QW['A113'] = 1: $stat_msg += '<br>You owe Vadim Bely <<belgangpay>> <b><b>₽</b></b> and you need to pay him <<belgangpayweek>> <b>₽</b></b> this week.'
 
+!!------------------ Things without an icon (End) -------------------
+
+!!------------------ Gadukino chores and such -------------------
 if display_bb = 1:
 	if boletus + bilberry > 0:
 		if boletus + bilberry >= 10:
@@ -2030,7 +2033,158 @@ if display_bb = 1:
 	end
 end
 
-!!------------------ Things without an icon (End) -------------------
+!! Grandma chores
+if grandmaQW['chore_clean_floor'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would clean the floors in her house today.</b>'
+elseif grandmaQW['chore_clean_floor'] = 2:
+    $stat_msg += '<br><b>You cleaned the floors for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_wash_clothes'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would wash clothes for her today.</b>'
+elseif grandmaQW['chore_wash_clothes'] = 2:
+    $stat_msg += '<br><b>You washed clothes for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_milk_cow'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would milk the cow in the barn for her today.</b>'
+elseif grandmaQW['chore_milk_cow'] = 2:
+    $stat_msg += '<br><b>You milked the cow for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_groceries'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would go get groceries for her today.</b>'
+elseif grandmaQW['chore_groceries'] = 2:
+    $stat_msg += '<br><b>You got the groceries for Grandma - you should go give them to her.</b>'
+elseif grandmaQW['chore_can_mushrooms'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would help her can mushrooms today.</b>'
+elseif grandmaQW['chore_can_berries'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would help her can berries today.</b>'
+elseif grandmaQW['can_veggies'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would help her can vegetables today.</b>'
+elseif grandmaQW['chore_feed_chickens'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would feed the chickens for her today.</b>'
+elseif grandmaQW['chore_feed_chickens'] = 2:
+    $stat_msg += '<br><b>You fed the chickens for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_work_in_garden'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would work in the garden today.</b>'
+elseif grandmaQW['chore_work_in_garden'] = 2:
+    $stat_msg += '<br><b>You worked in the garden for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_water_garden'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would water the plants in the garden today.</b>'
+elseif grandmaQW['chore_water_garden'] = 2:
+    $stat_msg += '<br><b>You watered the plants in the garden for Grandma - you should let her know that it is done.</b>'
+elseif grandmaQW['chore_collect_strawberries'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would pick strawberries from the garden for her today.</b>'
+elseif grandmaQW['chore_collect_strawberries'] = 2:
+    $stat_msg += '<br><b>You picked strawberries for Grandma - you should give them to her.</b>'
+elseif grandmaQW['chore_collect_fruit'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would collect fruit from the garden for her today.</b>'
+elseif grandmaQW['chore_collect_fruit'] = 2:
+    $stat_msg += '<br><b>You collected fruit for Grandma - you should give them to her.</b>'
+elseif grandmaQW['chore_harvest_garden'] = 1:
+    $stat_msg += '<br><b>You promised Grandma you would harvest vegetables from the garden for her today.</b>'
+elseif grandmaQW['chore_harvest_garden'] = 2:
+    $stat_msg += '<br><b>You harvested vegetables for Grandma - you should give them to her.</b>'
+elseif grandmaQW['chore_gather_mushrooms'] > 0 and grandmaQW['chore_gather_mushrooms'] < 3:
+	if boletus < grandmaQW['chore_mushroom_quantity']:
+		grandmaQW['chore_gather_mushrooms'] = 1
+		$stat_msg += '<br><b>You promised Grandma you would pick <<grandmaQW[''chore_mushroom_quantity'']>> kg of mushrooms for her today.</b>'
+	else
+		grandmaQW['chore_gather_mushrooms'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandmaQW[''chore_mushroom_quantity'']>> kg of mushrooms that Grandma asked for - you should give them to her.</b>'
+	end
+elseif grandmaQW['chore_gather_berries'] > 0 and grandmaQW['chore_gather_berries'] < 3:
+	if bilberry < grandmaQW['chore_berry_quantity']:
+		grandmaQW['chore_gather_berries'] = 1
+		$stat_msg += '<br><b>You promised Grandma you would pick <<grandmaQW[''chore_berry_quantity'']>> kg of berries for her today.</b>'
+	else
+		grandmaQW['chore_gather_berries'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandmaQW[''chore_berry_quantity'']>> kg of berries that Grandma asked for - you should give them to her.</b>'
+	end
+elseif grandmaQW['chore_gather_both'] > 0 and grandmaQW['chore_gather_both'] < 3:
+	if bilberry < grandmaQW['chore_berry_quantity'] or boletus < grandmaQW['chore_mushroom_quantity']:
+		grandmaQW['chore_gather_both'] = 1
+		$stat_msg += '<br><b>You promised Grandma you would pick <<grandmaQW[''chore_mushroom_quantity'']>> kg of mushrooms and <<grandmaQW[''chore_berry_quantity'']>> kg of berries for her today.</b>'
+	else
+		grandmaQW['chore_gather_both'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandmaQW[''chore_mushroom_quantity'']>> kg of mushrooms and <<grandmaQW[''chore_berry_quantity'']>> kg of berries that Grandma asked for - you should give them to her.</b>'
+	end
+end
+
+!! Grandpa chores
+if grandpaQW['chore_fetch_firewood'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would fetch firewood for him today.</b>'
+elseif grandpaQW['chore_fetch_firewood'] = 2:
+    $stat_msg += '<br><b>You fetched some firewood for Grandpa - you should give it to him.</b>'
+elseif grandpaQW['chore_feed_horse'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would feed the horse in the barn for him today.</b>'
+elseif grandpaQW['chore_feed_horse'] = 2:
+    $stat_msg += '<br><b>You fed the horse for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_feed_cow'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would feed the cow in the barn for him today.</b>'
+elseif grandpaQW['chore_feed_cow'] = 2:
+    $stat_msg += '<br><b>You fed the cow for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_clean_yard'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would clean the yard for him today.</b>'
+elseif grandpaQW['chore_clean_yard'] = 2:
+    $stat_msg += '<br><b>You cleaned the yard for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_brush_horse'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would groom the horse for him today.</b>'
+elseif grandpaQW['chore_brush_horse'] = 2:
+    $stat_msg += '<br><b>You groomed the horse for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_feed_boar'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would feed the pig in the barn for him today.</b>'
+elseif grandpaQW['chore_feed_boar'] = 2:
+    $stat_msg += '<br><b>You fed the pig for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_lead_horse_to_field'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would take the horse from the barn to the field for him today.</b>'
+elseif grandpaQW['chore_lead_horse_to_field'] = 2:
+    $stat_msg += '<br><b>You took the horse to the field for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_lead_cow_to_field'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would take the cow from the barn to the field for him today.</b>'
+elseif grandpaQW['chore_lead_cow_to_field'] = 2:
+    $stat_msg += '<br><b>You took the cow to the field for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_bathe_horse'] = 1:
+    $stat_msg += '<br><b>You promised Grandpa you would take the horse from the barn and bathe it in the river for him today.</b>'
+elseif grandpaQW['chore_bathe_horse'] = 2:
+    $stat_msg += '<br><b>You bathed the horse for Grandpa - you should let him know that it is done.</b>'
+elseif grandpaQW['chore_bathe_horse_prog'] = 1:
+    $stat_msg += '<br><b>You have taken the horse to the river, but haven''t bathed him yet.</b>'
+elseif grandpaQW['chore_bathe_horse'] = 2:
+    $stat_msg += '<br><b>You have bathed the horse in the river, but haven''t led him back home yet.</b>'
+elseif grandpaQW['chore_gather_mushrooms'] > 0 and grandpaQW['chore_gather_mushrooms'] < 3:
+	if boletus < grandpaQW['chore_mushroom_quantity']:
+		grandpaQW['chore_gather_mushrooms'] = 1
+		$stat_msg += '<br><b>You promised Grandpa you would pick <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms for him today.</b>'
+	else
+		grandpaQW['chore_gather_mushrooms'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms that Grandpa asked for - you should give them to him.</b>'
+	end
+elseif grandpaQW['chore_gather_berries'] > 0 and grandpaQW['chore_gather_berries'] < 3:
+	if bilberry < grandpaQW['chore_berry_quantity']:
+		grandpaQW['chore_gather_berries'] = 1
+		$stat_msg += '<br><b>You promised Grandpa you would pick <<grandpaQW[''chore_berry_quantity'']>> kg of berries for him today.</b>'
+	else
+		grandpaQW['chore_gather_berries'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandpaQW[''chore_berry_quantity'']>> kg of berries that Grandpa asked for - you should give them to him.</b>'
+	end
+elseif grandpaQW['chore_gather_both'] > 0 and grandpaQW['chore_gather_both'] < 3:
+	if bilberry < grandpaQW['chore_berry_quantity'] or boletus < grandpaQW['chore_mushroom_quantity']:
+		grandpaQW['chore_gather_both'] = 1
+		$stat_msg += '<br><b>You promised Grandpa you would pick <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries for him today.</b>'
+	else
+		grandpaQW['chore_gather_both'] = 2
+		$stat_msg += '<br><b>You have picked the <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries that Grandpa asked for - you should give them to him.</b>'
+	end
+end
+
+!! in case both grandparents gave you forest gathering chores
+if (boletus >= grandpaQW['chore_mushroom_quantity'] or boletus >= grandmaQW['chore_mushroom_quantity']) and (boletus < (grandpaQW['chore_mushroom_quantity'] + grandmaQW['chore_mushroom_quantity'])):
+	temp_boletus = (grandpaQW['chore_mushroom_quantity'] + grandmaQW['chore_mushroom_quantity']) - boletus
+	$stat_msg += '<br><b>You need <<temp_boletus>> more '+iif(temp_boletus = 1, 'kilo', 'kilos')+' of mushrooms to satisfy both of your grandparents'' requests.</b>'
+end
+if (bilberry >= grandpaQW['chore_berry_quantity'] or bilberry >= grandmaQW['chore_berry_quantity']) and (bilberry < (grandpaQW['chore_berry_quantity'] + grandmaQW['chore_berry_quantity'])):
+	temp_bilberry = (grandpaQW['chore_berry_quantity'] + grandmaQW['chore_berry_quantity']) - bilberry
+	$stat_msg += '<br><b>You need <<temp_bilberry>> more '+iif(temp_bilberry = 1, 'kilo', 'kilos')+' of berries to satisfy both of your grandparents'' requests.</b>'
+end
+
+
+!!------------------ Gadukino chores and such (End) -------------------
 
 if enable_extra_msg = 1:
 	if hour < meethour[0] and svidanie[0] = 1: