Преглед изворни кода

Reworked grandparent variables one last time, to make them as clear as possible.

richard_butte пре 4 година
родитељ
комит
513bc357dd

+ 1 - 1
locations/bedrPar.qsrc

@@ -229,7 +229,7 @@ if $ARGS[0] = 'intro':
 	$metka = ''
 	$loc = 'korrPar'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
-	grandmaQW['month_paid'] = month
+	grandmaQW['last_month_paid'] = month
 	menu_off = 1
 	hour = 6
 	gs 'stat'

+ 2 - 2
locations/cikl.qsrc

@@ -1492,8 +1492,8 @@ gs 'body_shape', 'basebeautycalc'
 !! vovan, from 1.2.5
 hunters_check = 0
 mushroom_pickers = 0
-grandpaQW['horse_river'] = 0
-grandpaQW['haying_time'] = 0
+grandpaQW['chore_bathe_horse'] = 0
+grandpaQW['chore_bale_hay'] = 0
 mira_go_river = 0
 forestpicnic = 0
 if Mira_no > 0: Mira_no -= 1

+ 6 - 6
locations/gadbana.qsrc

@@ -49,7 +49,7 @@ if mira = 0:
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 2
-				grandmaQW['trouble'] += 1
+				grandmaQW['nudity_trouble'] += 1
 			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in potentially getting caught.'
@@ -67,7 +67,7 @@ if mira = 0:
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 1
-				grandmaQW['trouble'] += rand(0,1)
+				grandmaQW['nudity_trouble'] += rand(0,1)
 			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
@@ -271,7 +271,7 @@ else
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 2
-				grandmaQW['trouble'] += 1
+				grandmaQW['nudity_trouble'] += 1
 			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
@@ -288,7 +288,7 @@ else
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 1
-				grandmaQW['trouble'] += rand(0,1)
+				grandmaQW['nudity_trouble'] += rand(0,1)
 			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
@@ -360,7 +360,7 @@ else
 						if gadbana_stripping ! daystart:
 							gadbana_stripping = daystart
 							inhib_exp += 2
-							grandmaQW['trouble'] += 1
+							grandmaQW['nudity_trouble'] += 1
 						end
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone but Mira saw you go outside naked, there''s a thrill in potentially getting caught.'
 						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
@@ -377,7 +377,7 @@ else
 						if gadbana_stripping ! daystart:
 							gadbana_stripping = daystart
 							inhib_exp += 1
-							grandmaQW['trouble'] += rand(0,1)
+							grandmaQW['nudity_trouble'] += rand(0,1)
 						end
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone but Mira saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'

+ 9 - 9
locations/gaddvor.qsrc

@@ -13,10 +13,10 @@ if $ARGS[0]='':
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 	if hour >= 6 and hour < 22:
-		if grandmaQW['trouble'] = 10:
+		if grandmaQW['nudity_trouble'] = 10:
 			*clr & cla
 			menu_off = 1
-			grandmaQW['trouble'] = 0
+			grandmaQW['nudity_trouble'] = 0
 			'<center><h4>Your grandparents'' yard</h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma_trouble.jpg"></center>'
 			'Suddenly your grandmother approaches you with disappointed look on her face. "I had higher expectations of you young lady! You should be ashamed of yourself running around outdoors without clothes. You have embarrassed me AND your grandfather! Unlike you, we have to live in this village, and with the people in it. If you keep this up, I''ll be cutting your time here short and sending you back to your mother, and she can deal with your sinful behaviour. Go and get dressed immediately!" She then walks off. You are too ashamed to say anything.'
@@ -55,12 +55,12 @@ if $ARGS[0]='':
 		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
 		act 'Enter the banya':minut += 1 & gt 'gadbana'
 	else
-		if grandmaQW['feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are several <a href="exec:gt ''gaddvor'',''chickens''">chickens</a> running around.'
+		if grandmaQW['chore_feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are several <a href="exec:gt ''gaddvor'',''chickens''">chickens</a> running around.'
 
 		if mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''miroslava'', ''Start''">Mira</a> stands next to you.'
 
 		act '<b>Leave and go into the village</b>':minut += 5 & gt 'gadukino'
-		if 	grandpaQW['clean_yard'] = 1:
+		if 	grandpaQW['chore_clean_yard'] = 1:
 			act 'Clean up the yard for Grandpa (1:00)':
 				*clr & cla
 				if month >= 4 and month <= 10:
@@ -71,8 +71,8 @@ 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['clean_yard'] = 0
-				grandmaQW['help'] += 1
+				grandpaQW['chore_clean_yard'] = 0
+				grandmaQW['help_amount'] += 1
 				if month >= 4 and month <= 10:
 					fat -= rand(1,3)
 				else
@@ -134,14 +134,14 @@ if $ARGS[0] = 'chickens':
 	gs 'stat'
 
 	!job Granny
-	if grandmaQW['feed_chickens'] = 1:
+	if grandmaQW['chore_feed_chickens'] = 1:
 		act 'Feed the chickens':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens2.jpg"></center>'
 			'You decide to feed the chickens. You pick up a bucket full of bird''s seed and grain mix and toss it on the ground. They immediately rush over and start to greedily eat. You watch them for a bit before you go about your business.'
 			minut += 30
-			grandmaQW['help'] += 1
-			grandmaQW['feed_chickens'] = 0
+			grandmaQW['help_amount'] += 1
+			grandmaQW['chore_feed_chickens'] = 0
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 26 - 26
locations/gadfield.qsrc

@@ -44,13 +44,13 @@ 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['graze_cow'] = 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['graze_cow'] = 1:'You notice <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a>.'
-	if hour >= 7 and hour <= 20 and grandpaQW['haying_time'] = 1:'You see a crowd of people working on the field.'
+	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 >= 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['haying_time'] = 1:
+	if hour >= 7 and hour <= 20 and grandpaQW['chore_bale_hay'] = 1:
 		act 'Go to the hayfield':
 			gs 'food', 'm_meal'
 			*clr & cla
@@ -71,8 +71,8 @@ if $ARGS[0] = 'field':
 			end
 
 			minut += 360
-			grandmaQW['help'] += 1
-			grandpaQW['haying_time'] = 0
+			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_bale_hay'] = 0
 			hndiwrk_exp += rand(0,2)
 			gs 'stat'
 
@@ -106,7 +106,7 @@ if $ARGS[0] = 'horse':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You spot your grandfather''s horse wandering loose in the field and decide to help out by taking Desperado home. Reaching for the bridle, you start leading Desperado towards the village.'
 			minut += 60
-			grandmaQW['help'] += rand(0,1)
+			grandmaQW['help_amount'] += rand(0,1)
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -132,29 +132,29 @@ if $ARGS[0] = 'cow':
 	'The cow herd is standing in the middle of the field.'
 	if mira = 1: MiraLoc = 41 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is standing next to you.'
 
-	if grandpaQW['graze_cow'] = 0:act 'Leave them be':gt'gadfield','field'
-	if hour = 19 and grandpaQW['graze_cow'] = 0:
+	if grandpaQW['chore_herd_cattle'] = 0:act 'Leave them be':gt'gadfield','field'
+	if hour = 19 and grandpaQW['chore_herd_cattle'] = 0:
 		act 'Lead the cows home (1:00)':
 			*clr & cla
 			menu_off = 1
 			'<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'] += rand(0,1)
+			grandmaQW['help_amount'] += rand(0,1)
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			act 'To your grandparent''s barn':gt'gadsarai'
 		end
 	end
-	if grandpaQW['graze_cow'] = 1:
+	if grandpaQW['chore_herd_cattle'] = 1:
 		if hour < 10:
 			act 'Wait until the herd is gathered':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_wait.jpg"></center>'
-				if grandpaQW['graze_cow_exp'] = 0:'Some time flies by while waiting for the locals to finish their gathering.'
-				if grandpaQW['graze_cow_exp'] = 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 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 hour >= 9:minut += 20
 				if hour < 9:minut += 60
@@ -173,8 +173,8 @@ if $ARGS[0] = 'cow':
 
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandpaQW['graze_cow_exp'] = 1
-				grandmaQW['help'] += 1
+				grandpaQW['chore_herd_cattle_experience'] = 1
+				grandmaQW['help_amount'] += 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -275,7 +275,7 @@ if $ARGS[0] = 'cow':
 			'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.'
 
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-			grandmaQW['help'] += 1
+			grandmaQW['help_amount'] += 1
 			minut += 60
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
@@ -295,7 +295,7 @@ end
 !MiraLoc = 5 (Mira with gop)
 !---------------------------------------------
 
-if grandpaQW['graze_cow'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and sunWeather = 1 and hour >= 10 and temp = 1 and Mira_no = 0 and(npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
+if grandpaQW['chore_herd_cattle'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and sunWeather = 1 and hour >= 10 and temp = 1 and Mira_no = 0 and(npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mira2.jpg"></center>'
@@ -329,7 +329,7 @@ if $ARGS[0] = 'cow2':
 	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 grandpaQW['graze_cow'] = 1:
+	if grandpaQW['chore_herd_cattle'] = 1:
 		if hour < 16:
 			act 'Herd cows with your grandfather (1:00)':
 				*clr & cla
@@ -338,8 +338,8 @@ if $ARGS[0] = 'cow2':
 				'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.'
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandmaQW['help'] += 1
-				grandpaQW['graze_cow_exp'] = 1
+				grandmaQW['help_amount'] += 1
+				grandpaQW['chore_herd_cattle_experience'] = 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -406,7 +406,7 @@ if $ARGS[0] = 'cow2':
 			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'] += 1
+			grandmaQW['help_amount'] += 1
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 			minut += 60
 			hndiwrk_exp += rand(0,3)
@@ -436,7 +436,7 @@ if $ARGS[0] = 'cow3':
 
 	if mira = 1: MiraLoc = 43 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
-	if grandpaQW['graze_cow'] = 1:
+	if grandpaQW['chore_herd_cattle'] = 1:
 		if hour < 19:
 			act 'Herd cows with your grandfather (1:00)':
 				*clr & cla
@@ -445,8 +445,8 @@ if $ARGS[0] = 'cow3':
 				'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.'
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandmaQW['help'] += 1
-				grandpaQW['graze_cow_exp'] = 1
+				grandmaQW['help_amount'] += 1
+				grandpaQW['chore_herd_cattle_experience'] = 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -547,8 +547,8 @@ if $ARGS[0] = 'cow3':
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 			minut += 60
 			mira = 0
-			grandpaQW['graze_cow'] = 0
-			grandmaQW['help'] += 1
+			grandpaQW['chore_herd_cattle'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 4 - 4
locations/gadforest.qsrc

@@ -318,7 +318,7 @@ if $ARGS[0] = 'caught':
 	caught_rand = rand(0, 100)
 	if caught_rand > 90:
 		inhib_exp += rand(0,3)
-		grandmaQW['trouble'] += rand(7,10)
+		grandmaQW['nudity_trouble'] += rand(7,10)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -326,7 +326,7 @@ if $ARGS[0] = 'caught':
 		'You''ve been spotted walking home naked by all the women of the village. They are all sitting there scolding you. Your grandparents are definitely going to find out about this.'
 	elseif caught_rand > 70:
 		inhib_exp += rand(0,4)
-		grandmaQW['trouble'] += rand(1,3)
+		grandmaQW['nudity_trouble'] += rand(1,3)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -334,14 +334,14 @@ if $ARGS[0] = 'caught':
 		'You''ve been spotted walking home naked by a woman from the village. You want to hope she doesn''t tell your grandparents.'
 	elseif caught_rand > 50:
 		inhib_exp += rand(0,3)
-		grandmaQW['trouble'] += rand(1,3)
+		grandmaQW['nudity_trouble'] += rand(1,3)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_man'+rand(1,5)+'.jpg"></center>'
 		'You''ve been spotted walking home naked by a man from the village. You want to hope he doesn''t tell your grandparents.'
 	else
-		grandmaQW['trouble'] += rand(0,1)
+		grandmaQW['nudity_trouble'] += rand(0,1)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'

+ 15 - 15
locations/gadgarden.qsrc

@@ -36,15 +36,15 @@ if $ARGS[0] = 'garden':
 	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
 
 	!job Granny
-	if grandmaQW['work_garden'] = 1:
+	if grandmaQW['chore_work_in_garden'] = 1:
 		act 'Work in the garden (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['work_garden'] = 0
-			grandmaQW['help'] += 3
+			grandmaQW['chore_work_in_garden'] = 0
+			grandmaQW['help_amount'] += 3
 			stren_exp += 1
 			fat -= rand(1,5)
 			hndiwrk_exp += rand(3,9)
@@ -56,15 +56,15 @@ if $ARGS[0] = 'garden':
 		end
 	end
 	!job Granny
-	if grandmaQW['water_garden'] = 1:
+	if grandmaQW['chore_water_garden'] = 1:
 		act 'Water the plants (1:00)':
 			cla
 			*clr
 			menu_off = 1
 			gs 'sweat', 'add', 10
 			minut += 60
-			grandmaQW['water_garden'] = 0
-			grandmaQW['help'] += 1
+			grandmaQW['chore_water_garden'] = 0
+			grandmaQW['help_amount'] += 1
 			vital_exp += 1
 			fat -= rand(1,2)
 			hndiwrk_exp += rand(0,3)
@@ -76,15 +76,15 @@ if $ARGS[0] = 'garden':
 		end
 	end
 	!job Granny
-	if grandmaQW['harvest_garden'] = 1:
+	if grandmaQW['chore_harvest_garden'] = 1:
 		act 'Harvest (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['harvest_garden'] = 0
-			grandmaQW['help'] += 3
+			grandmaQW['chore_harvest_garden'] = 0
+			grandmaQW['help_amount'] += 3
 			stren_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)
@@ -146,15 +146,15 @@ if $ARGS[0] = 'strawberry':
 		end
 	end
 	!job Granny
-	if grandmaQW['collect_strawberries'] = 1:
+	if grandmaQW['chore_collect_strawberries'] = 1:
 		act 'Collect strawberries (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['collect_strawberries'] = 0
-			grandmaQW['help'] += 5
+			grandmaQW['chore_collect_strawberries'] = 0
+			grandmaQW['help_amount'] += 5
 			agil_exp += 1
 			fat -= 1
 			hndiwrk_exp += rand(3,9)
@@ -212,15 +212,15 @@ if $ARGS[0] = 'fruit_garden':
 		end
 	end
 	!job Granny
-	if grandmaQW['fruit_collect'] = 1:
+	if grandmaQW['chore_collect_fruit'] = 1:
 		act 'Collect fruit (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['fruit_collect'] = 0
-			grandmaQW['help'] += 5
+			grandmaQW['chore_collect_fruit'] = 0
+			grandmaQW['help_amount'] += 5
 			agil_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)

+ 114 - 55
locations/gadhouse.qsrc

@@ -1,5 +1,65 @@
 # gadhouse
 
+!! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - START
+!! 
+!! Quest Variables - Grandma
+!! -------------------------
+!! grandmaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
+!!
+!! grandmaQW['chore_clean_floor']				0/1 - is the "clean the floor" quest active?
+!! grandmaQW['chore_collect_fruit']				0/1 - is the "collect fruit" quest active?
+!! grandmaQW['chore_collect_strawberries']		0/1 - is the "collect strawberries" quest active?
+!! grandmaQW['chore_feed_chickens']				0/1 - is the "feed the chickens" quest active?
+!! grandmaQW['chore_harvest_garden']			0/1 - is the "harvest veggies from the garden" quest active?
+!! grandmaQW['chore_milk_cow']					0/1 - is the "milk the cow" quest active?
+!! grandmaQW['chore_wash_clothes']				0/1 - is the "wash Grandpa's clothes" quest active?
+!! grandmaQW['chore_water_garden']				0/1 - is the "water the garden" quest active?
+!! grandmaQW['chore_work_in_garden']			0/1 - is the "work in the garden" quest active?
+!! 
+!! Other Variables - Grandma
+!! -------------------------
+!! grandmaQW['help_amount']						Semi-abstract representation of how helpful Sveta has been. Longer, more arduous tasks get more points.
+!! grandmaQW['last_day_asked_for_story']		The most recent day Sveta asked Grandma to tell her a story. Checked against daystart (i.e. was it today?)
+!! grandmaQW['last_day_helped']					The most recent day Sveta asked Grandma if she could help her with anything.
+!! grandmaQW['last_day_talked']					The most recent day Sveta chatted with Grandma.
+!! grandmaQW['last_hour_talked']				The most recent hour Sveta chatted with Grandma. Checked against hour, allows for several chats through the day.
+!! grandmaQW['last_month_paid']					The most recent month Grandma paid Sveta for her help (i.e. was it the current month?)
+!! grandmaQW['nudity_trouble']					Semi-abstract representation of how annoyed Grandma is by Svetas exhibitionism. At 10 she reprimands Sveta (no effect).
+!! grandmaQW['talked_about_gadukino']			0/1 - has Sveta asked Grandma about Gadukino? Makes the "Ask about Gadukino" option a one-time thing.
+!! 
+!! ------------------------------------------------------------------------ 
+!! 
+!! Quest Variables - Grandpa
+!! -------------------------
+!! grandpaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
+!! 
+!! 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_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?
+!! grandpaQW['chore_feed_cow']					0/1 - is the "feed the cow" quest active?
+!! grandpaQW['chore_feed_horse']				0/1 - is the "feed the horse" quest active?
+!! grandpaQW['chore_fetch_firewood']			0/1 - is the "fetch firewood from the barn" quest active?
+!! grandpaQW['chore_herd_cattle']				0/1 - is the "herd cows in the field" quest active?
+!! grandpaQW['chore_herd_cattle_experience']	Has Sveta ever done the "herd cows in the field" quest before? (Practically useless, barely changes a couple of action descriptions.)
+!! grandpaQW['chore_lead_cow_to_field']			0/1 - is the "just take the cow to the field and drop it off there" quest active?
+!! grandpaQW['chore_lead_horse_to_field']		0/1 - is the "take the horse to the field" quest active?
+!! 
+!! grandpaQW['chore_gather_from_forest']		Variable storage for the type of "gather mushrooms/berries from the forest" quest. Possible values: '', 'mushroom', 'berry', 'both'
+!! grandpaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandpa want? Used with chore_gather_from_forest.
+!! grandpaQW['chore_berry_quantity']			How many kg of berries does Grandpa want? Used with chore_gather_from_forest.
+!! 
+!! 
+!! Other Variables - Grandpa
+!! -------------------------
+!! grandpaQW['last_day_helped']					The most recent day Sveta asked Grandpa if she could help him with anything.
+!! 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.
+!!
+!! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - END
+
 if $ARGS[0] = 'start':
 	CLOSE ALL
 	$location_type = 'indoors'
@@ -15,10 +75,9 @@ if $ARGS[0] = 'start':
 	frost = 0
 	mira_temp = rand(1,5)
 
-	if grandmaQW['month_paid'] ! month and grandmaQW['month_helped'] ! month and hour >= 6 and hour < 22:
-		grandmaQW['month_paid'] = month
-		grandmaQW['month_helped'] = month
-		if grandmaQW['help'] > 0: money += grandmaQW['help'] * 50
+	if grandmaQW['last_month_paid'] ! month and hour >= 6 and hour < 22:
+		grandmaQW['last_month_paid'] = month
+		if grandmaQW['help_amount'] > 0: money += grandmaQW['help_amount'] * 50
 		money += 2000
 		minut += 10
 
@@ -29,27 +88,27 @@ if $ARGS[0] = 'start':
 			'Upon entering the house, you let out a screech as you catch sight of your grandmother, throwing yourself at her, wrapping your arms around her neck. She embraces you tightly. She starts by saying "Dear <<$pcs_nickname>>, you''re only skin and bones, but don''t worry, a few months here and you''ll be looking your usual self again ."'
 			'"But look at you, you sure have grown up. A young woman." she says proudly. She continues "Grandpa and I keep getting older and older and need some help around the house. What do you say youngling? You will not have to do much. Here''s the deal, you lend us a helping hand on the farm as much as possible, and we will pay you for each chore you do. It will be a great life lesson, you will learn about hard work. What do you say?"'
 			'"Of course I''ll help out, Grandma." you answer.'
-			'"I''m glad to hear that <<$pcs_nickname>>, here is little something upfront so you know we are serious," Grandma says and hands over <<2000 + grandmaQW[''help''] * 50>>  rubels.'
+			'"I''m glad to hear that <<$pcs_nickname>>, here is little something upfront so you know we are serious," Grandma says and hands over <<2000 + grandmaQW[''help_amount''] * 50>>  rubels.'
 			'"Thanks Babushka!" you kiss her on the cheek before you head on out.'
 		else
 			'When you got out of bed, your grandmother called you over to her.'
 			'"I imagine you''ve spent all your allowance on sweets so lets see what we can do to give you some more pocket money, hmmmm?" she says as she opens her purse.'
-			if grandmaQW['help'] > 0:
-				'"You were quite helpful over the last few weeks, so here''s <<2000 + grandmaQW[''help''] * 50>> rubles." She starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
+			if grandmaQW['help_amount'] > 0:
+				'"You were quite helpful over the last few weeks, so here''s <<2000 + grandmaQW[''help_amount''] * 50>> rubles." She starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
 			else
 				'"We really could have used your help last month," she says mournfully as she counts out some bills. "Maybe this month you''ll do more to help us?" She looks at you sternly as she hands you 2000 rubles.'
 			end
 			gs 'stat'
 		end
-		grandmaQW['help'] = 0
+		grandmaQW['help_amount'] = 0
 		act 'Continue': gt 'gadhouse', 'start'
 
-	elseif $grandpaQW['gather_quest'] = 'mushroom' and boletus >= grandpaQW['mushroom_qty'] and hour >= 6 and hour < 22:
+	elseif $grandpaQW['chore_gather_from_forest'] = 'mushroom' and boletus >= grandpaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmaQW['help'] += 1
-		boletus -= grandpaQW['mushroom_qty']
+		grandmaQW['help_amount'] += 1
+		boletus -= grandpaQW['chore_mushroom_quantity']
 		minut += 5
-		$grandpaQW['gather_quest'] = ''
+		$grandpaQW['chore_gather_from_forest'] = ''
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
@@ -60,15 +119,15 @@ if $ARGS[0] = 'start':
 		'"There''s no need <<$pcs_nickname>>." - said your grandpa. "But if I need some help, I''ll be sure to let you know."'
 		'You kiss your grandfather on the cheek and get on with your day.'
 
-		act 'Continue': grandpaQW['mushroom_qty'] = 0 & gt 'gadhouse', 'start'
+		act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
 
-	elseif $grandpaQW['gather_quest'] = 'both' and boletus >= grandpaQW['mushroom_qty'] and bilberry >= grandpaQW['berry_qty'] and hour >= 6 and hour < 22:
+	elseif $grandpaQW['chore_gather_from_forest'] = 'both' and boletus >= grandpaQW['chore_mushroom_quantity'] and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmaQW['help'] += 1
-		boletus -= grandpaQW['mushroom_qty']
-		bilberry -= grandpaQW['berry_qty']
+		grandmaQW['help_amount'] += 1
+		boletus -= grandpaQW['chore_mushroom_quantity']
+		bilberry -= grandpaQW['chore_berry_quantity']
 		minut += 5
-		$grandpaQW['gather_quest'] = ''
+		$grandpaQW['chore_gather_from_forest'] = ''
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
@@ -79,14 +138,14 @@ if $ARGS[0] = 'start':
 		'"You don''t need to do that <<$pcs_nickname>>," your grandpa said. "But I''ll be sure to let you know if something comes up."'
 		'You give your grandpa a smooch on the cheek and go on with your day.'
 
-		act 'Continue': grandpaQW['mushroom_qty'] = 0 & grandpaQW['berry_qty'] = 0 & gt 'gadhouse', 'start'
+		act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
 
-	elseif $grandpaQW['gather_quest'] = 'berry' and bilberry >= grandpaQW['berry_qty'] and hour >= 6 and hour < 22:
+	elseif $grandpaQW['chore_gather_from_forest'] = 'berry' and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmaQW['help'] += 1
-		bilberry -= grandpaQW['berry_qty']
+		grandmaQW['help_amount'] += 1
+		bilberry -= grandpaQW['chore_berry_quantity']
 		minut += 5
-		$grandpaQW['gather_quest'] = ''
+		$grandpaQW['chore_gather_from_forest'] = ''
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
@@ -97,7 +156,7 @@ if $ARGS[0] = 'start':
 		'"There''s no need <<$pcs_nickname>>," your grandpa said. "But if your grandma need some more berries, I''ll let you know."'
 		'You kiss your grandfather on the cheek, you go on with your business.'
 
-		act 'Continue': grandpaQW['berry_qty'] = 0 & gt 'gadhouse', 'start'
+		act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
 
 	elseif mira_temp = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or miragopQW >= 10 or mirasex > 1):
 		*clr & cla
@@ -218,7 +277,7 @@ if $ARGS[0] = 'main':
 			menu_off = 1
 			minut += 1
 			inhib_exp += rand(0,2)
-			grandmaQW['trouble'] += rand(1,3)
+			grandmaQW['nudity_trouble'] += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
@@ -232,7 +291,7 @@ if $ARGS[0] = 'main':
 			menu_off = 1
 			minut += 1
 			inhib_exp += rand(0,2)
-			grandmaQW['trouble'] += rand(1,3)
+			grandmaQW['nudity_trouble'] += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flashlite', 10, 'exhibitionism'
 			gs 'arousal', 'end'
@@ -241,12 +300,12 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	if grandmaQW['cleanfloor'] = 1:
+	if grandmaQW['chore_clean_floor'] = 1:
 		act 'Clean the floor for Grandma (1:00)':
 			*clr & cla
 			minut += 60
-			grandmaQW['cleanfloor'] = 0
-			grandmaQW['help'] += 1
+			grandmaQW['chore_clean_floor'] = 0
+			grandmaQW['help_amount'] += 1
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
@@ -256,12 +315,12 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	if grandmaQW['washclothes'] = 1:
+	if grandmaQW['chore_wash_clothes'] = 1:
 		act 'Wash Grandpa''s clothes for Grandma (1:00)':
 			*clr & cla
 			minut += 60
-			grandmaQW['washclothes'] = 0
-			grandmaQW['help'] += 1
+			grandmaQW['chore_wash_clothes'] = 0
+			grandmaQW['help_amount'] += 1
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
@@ -345,7 +404,7 @@ if $ARGS[0] = 'grandma':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	if grandmaQW['talk_day'] ! daystart: grandmaQW['talk_hour'] = 0
+	if grandmaQW['last_day_talked'] ! daystart: grandmaQW['last_hour_talked'] = 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
@@ -360,12 +419,12 @@ if $ARGS[0] = 'grandma':
 		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
 
-		if grandmaQW['help_day'] ! daystart: act 'Offer to help out': grandmaQW['help_day'] = daystart & gt'grandmahelp', 'start'
+		if grandmaQW['last_day_helped'] ! daystart: act 'Offer to help out': grandmaQW['last_day_helped'] = daystart & gt'grandmahelp', 'start'
 
-		if grandmaQW['talk_abt_gadukino'] = 0:
+		if grandmaQW['talked_about_gadukino'] = 0:
 			act 'Ask about the village (0:10)':
 				*clr & cla
-				grandmaQW['talk_abt_gadukino'] = 1
+				grandmaQW['talked_about_gadukino'] = 1
 				minut += 10
 				pcs_mood += 5
 				gs 'stat'
@@ -386,11 +445,11 @@ if $ARGS[0] = 'grandma':
 			end
 		end
 		!125e
-		if hour >= grandmaQW['talk_hour'] + 3:
+		if hour >= grandmaQW['last_hour_talked'] + 3:
 			act 'Chat with your grandmother (0:10)':
 				*clr & cla
-				grandmaQW['talk_hour'] = hour
-				grandmaQW['talk_day'] = daystart
+				grandmaQW['last_hour_talked'] = hour
+				grandmaQW['last_day_talked'] = daystart
 				minut += 10
 				pcs_mood += RAND(5,10)
 				gs 'stat'
@@ -402,10 +461,10 @@ if $ARGS[0] = 'grandma':
 			end
 		end
 
-		if grandmaQW['story_day'] ! daystart:
+		if grandmaQW['last_day_asked_for_story'] ! daystart:
 			act 'Ask her to tell you a story (0:20)':
 				*clr & cla
-				grandmaQW['story_day'] = daystart
+				grandmaQW['last_day_asked_for_story'] = daystart
 				minut += 20
 				pcs_mood += rand(10,15)
 				gs 'stat'
@@ -475,7 +534,7 @@ if $ARGS[0]='grandpa':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	if grandpaQW['talk_day'] ! daystart:grandpaQW['talk_hour'] = 0
+	if grandpaQW['last_day_talked'] ! daystart:grandpaQW['last_hour_talked'] = 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
@@ -490,20 +549,20 @@ if $ARGS[0]='grandpa':
 		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 
-		if $grandpaQW['gather_quest'] = 'mushroom':
-			'You promise to bring grandpa <<grandpaQW[''mushroom_qty'']>> kg of mushrooms.'
-		elseif $grandpaQW['gather_quest'] = 'berry':
-			'You promise to bring grandpa <<grandpaQW[''berry_qty'']>> kg of berries.'
-		elseif $grandpaQW['gather_quest'] = 'both':
-			'You promise to bring grandpa <<grandpaQW[''mushroom_qty'']>> kg mushrooms and <<grandpaQW[''berry_qty'']>> kg of berries.'
+		if $grandpaQW['chore_gather_from_forest'] = 'mushroom':
+			'You promise to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms.'
+		elseif $grandpaQW['chore_gather_from_forest'] = 'berry':
+			'You promise to bring grandpa <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
+		elseif $grandpaQW['chore_gather_from_forest'] = 'both':
+			'You promise to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
 		end
 
 
-		if grandpaQW['help_day'] ! daystart:act 'Offer to help':grandpaQW['help_day'] = daystart & gt'grandpahelp', 'start'
-		if grandpaQW['talk_abt_forest'] = 0:
+		if grandpaQW['last_day_helped'] ! daystart:act 'Offer to help':grandpaQW['last_day_helped'] = daystart & gt'grandpahelp', 'start'
+		if grandpaQW['talked_about_forest'] = 0:
 			act 'Ask about the forest (0:10)':
 				*clr & cla
-				grandpaQW['talk_abt_forest'] = 1
+				grandpaQW['talked_about_forest'] = 1
 				minut += 10
 				pcs_mood += 5
 				goforest += 1
@@ -519,11 +578,11 @@ if $ARGS[0]='grandpa':
 			end
 		end
 
-		if hour >= grandpaQW['talk_hour'] + 3:
+		if hour >= grandpaQW['last_hour_talked'] + 3:
 			act 'Chat with your grandfather (0:10)':
 				*clr & cla
-				grandpaQW['talk_hour'] = hour
-				grandpaQW['talk_day'] = daystart
+				grandpaQW['last_hour_talked'] = hour
+				grandpaQW['last_day_talked'] = daystart
 				minut += 10
 				pcs_mood += RAND(5,10)
 				gs 'stat'
@@ -597,7 +656,7 @@ if $ARGS[0] = 'intro':
 	$metka = ''
 	$loc = 'gadhouse'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
-	grandmaQW['month_paid'] = month
+	grandmaQW['last_month_paid'] = month
 	display_bb = 1
 	menu_off = 1
 	hour = 6

+ 8 - 8
locations/gadriver.qsrc

@@ -498,7 +498,7 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
-		if grandpaQW['horse_river'] = 2:
+		if grandpaQW['chore_bathe_horse'] = 2:
 			act 'Look at Desperado':
 				*clr & cla
 				
@@ -516,8 +516,8 @@ 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'] += 1
-						grandpaQW['horse_river'] = 3
+						grandmaQW['help_amount'] += 1
+						grandpaQW['chore_bathe_horse'] = 3
 						gs 'stat'
 						
 						if $clothingworntype = 'nude':
@@ -546,8 +546,8 @@ 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'] += 1
-							grandpaQW['horse_river'] = 3
+							grandmaQW['help_amount'] += 1
+							grandpaQW['chore_bathe_horse'] = 3
 							gs 'stat'
 							
 							if $clothingworntype = 'nude':
@@ -573,7 +573,7 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
-		if grandpaQW['horse_river'] = 3:
+		if grandpaQW['chore_bathe_horse'] = 3:
 			act 'Lead Desperado back home':
 				if $clothingworntype = 'swimwear':
 					cla
@@ -586,8 +586,8 @@ if $ARGS[0] = 'gadbitch':
 				else
 					minut += 30
 					hndiwrk_exp += rand(0,3)
-					grandmaQW['help'] += rand(0,1)
-					grandpaQW['horse_river'] = 0
+					grandmaQW['help_amount'] += rand(0,1)
+					grandpaQW['chore_bathe_horse'] = 0
 					gs 'stat'
 					
 					gt'gadsarai'

+ 29 - 29
locations/gadsarai.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = '':
 		else
 			'On your right is a <a href="exec: gt ''gadsarai'',''cow'' ">cattle</a> barn.'
 		end
-		if hour > 9 and hour < 20 and week < 6 or grandpaQW['horse_river'] = 2:
+		if hour > 9 and hour < 20 and week < 6 or grandpaQW['chore_bathe_horse'] = 2:
 			'On your left is a horse stable.'
 		else
 			'On your left is a <a href="exec: gt ''gadsarai'',''horse'' ">horse</a> stable.'
@@ -48,7 +48,7 @@ if $ARGS[0] = '':
 
 	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
 	
-	if grandpaQW['fetch_firewood'] = 1:
+	if grandpaQW['chore_fetch_firewood'] = 1:
 		act 'Fetch firewood for Grandpa (0:20)':
 			*clr & cla
 			if month >= 4 and month <= 10:
@@ -59,9 +59,9 @@ if $ARGS[0] = '':
 			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry and walking back to the house.'
 			'"I''ve brought some firewood grandfather," you said to your grandfather.'
 			'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "There is no more work for today."'
-			grandpaQW['fetch_firewood'] = 0
+			grandpaQW['chore_fetch_firewood'] = 0
 			minut += 20
-			grandmaQW['help'] += 1
+			grandmaQW['help_amount'] += 1
 			gs'stat'
 
 			act 'Continue':gt 'gadhouse', 'start'
@@ -186,13 +186,13 @@ if $ARGS[0] = 'boar':
 
 	act 'Leave':minut += 5 & gt 'gadsarai'
 
-	if grandpaQW['feed_boar'] = 1:
+	if grandpaQW['chore_feed_boar'] = 1:
 		act 'Feed the boar':
 			cla
 			*clr
 			minut += 30
-			grandmaQW['help'] += 1
-			grandpaQW['feed_boar'] = 0
+			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_feed_boar'] = 0
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -215,13 +215,13 @@ if $ARGS[0] = 'cow':
 
 	act 'Leave':minut += 5 & gt 'gadsarai'
 
-	if grandmaQW['milk_cow'] = 1:
+	if grandmaQW['chore_milk_cow'] = 1:
 		act 'Milk the cow':
 			cla
 			*clr
 			minut += 30
-			grandmaQW['milk_cow'] = 0
-			grandmaQW['help'] += 1
+			grandmaQW['chore_milk_cow'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -231,13 +231,13 @@ if $ARGS[0] = 'cow':
 			act 'Finish':gt 'gadsarai','cow'
 		end
 	end
-	if grandpaQW['feed_cow'] = 1:
+	if grandpaQW['chore_feed_cow'] = 1:
 		act 'Feed the cow':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['feed_cow'] = 0
-			grandmaQW['help'] += 1
+			grandpaQW['chore_feed_cow'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -247,21 +247,21 @@ if $ARGS[0] = 'cow':
 			act 'Finish':gt 'gadsarai','cow'
 		end
 	end
-	if grandpaQW['cow_field'] = 1 or grandpaQW['graze_cow'] = 1:
+	if grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1:
 		act 'Lead the cow to the field':
 			cla
 			*clr
 			minut += 60
-			grandmaQW['help'] += 1
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
-			if grandpaQW['cow_field'] = 1:
+			if grandpaQW['chore_lead_cow_to_field'] = 1:
 				'You lead Dawn to the field, where you let the shepherds take over.'
-				grandpaQW['cow_field'] = 0
+				grandpaQW['chore_lead_cow_to_field'] = 0
 			end
-			if grandpaQW['graze_cow'] = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
+			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.'
 
 			act 'Continue':gt'gadfield','cow'
 		end
@@ -279,13 +279,13 @@ if $ARGS[0] = 'horse':
 	'Grandfather''s trusted assistant, the horse Desperado.'
 
 
-	if grandpaQW['feed_horse'] = 1:
+	if grandpaQW['chore_feed_horse'] = 1:
 		act 'Feed the horse':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['feed_horse'] = 0
-			grandmaQW['help'] += 1
+			grandpaQW['chore_feed_horse'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -295,13 +295,13 @@ if $ARGS[0] = 'horse':
 			act 'Finish':gt 'gadsarai','horse'
 		end
 	end
-	if grandpaQW['horse_field'] = 1:
+	if grandpaQW['chore_lead_horse_to_field'] = 1:
 		act 'Lead the horse to the field':
 			cla
 			*clr
 			minut += 60
-			grandpaQW['horse_field'] = 0
-			grandmaQW['help'] += 1
+			grandpaQW['chore_lead_horse_to_field'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -311,12 +311,12 @@ if $ARGS[0] = 'horse':
 			act 'Continue':gt'gadfield','field'
 		end
 	end
-	if grandpaQW['horse_river'] = 1 and sunWeather = 1 and temper >= 15:
+	if grandpaQW['chore_bathe_horse'] = 1 and sunWeather = 1 and temper >= 15:
 		act 'Lead the horse to the river':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['horse_river'] = 2
+			grandpaQW['chore_bathe_horse'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -326,13 +326,13 @@ if $ARGS[0] = 'horse':
 			act 'Continue':gt'gadriver', 'gadbitch'
 		end
 	end
-	if grandpaQW['comb_horse'] = 1:
+	if grandpaQW['chore_brush_horse'] = 1:
 		act 'Groom the horse':
 			cla
 			*clr
 			minut += 60
-			grandpaQW['comb_horse'] = 0
-			grandmaQW['help'] += 1
+			grandpaQW['chore_brush_horse'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 4 - 4
locations/gadukino_event.qsrc

@@ -1023,12 +1023,12 @@ if $ARGS[0] = 'go_home_ender':
 	menu_off = 1
 	*clr & cla
 	minut += rand(15,25)
-	if grandmaQW['help'] > 0:
+	if grandmaQW['help_amount'] > 0:
 		'<center><b><font color="maroon">Your grandmother</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
-		'Before leaving grandma gives you <<grandmaQW[''help'']*50>> rubles.'
-		money += grandmaQW['help'] * 50
-		grandmaQW['help'] = 0
+		'Before leaving grandma gives you <<grandmaQW[''help_amount'']*50>> rubles.'
+		money += grandmaQW['help_amount'] * 50
+		grandmaQW['help_amount'] = 0
 	end
 	gadstay = 0
 	gs 'stat'

+ 23 - 23
locations/grandmahelp.qsrc

@@ -11,26 +11,26 @@ frost = 0
 
 if $ARGS[0] = 'start':
 	if month <= 4 or month >= 10:
-		grandmaQW['help_type'] = rand(0,2)
+		grandmaQW['chore_type'] = rand(0,2)
 	elseif month = 5 or month = 6:
-		grandmaQW['help_type'] = rand(0,5)
+		grandmaQW['chore_type'] = rand(0,5)
 	else
-		grandmaQW['help_type'] = rand(0,6)
+		grandmaQW['chore_type'] = rand(0,6)
 	end
 
-	if grandmaQW['help_type'] = 0: 
+	if grandmaQW['chore_type'] = 0: 
 		gt 'grandmahelp', 'cleanfloor'
-	elseif grandmaQW['help_type'] = 1:
+	elseif grandmaQW['chore_type'] = 1:
 		gt 'grandmahelp', 'washclothes'
-	elseif grandmaQW['help_type'] = 2 and hour < 9 and hour > 20:
+	elseif grandmaQW['chore_type'] = 2 and hour < 9 and hour > 20:
 		gt 'grandmahelp', 'milkcows'
-	elseif grandmaQW['help_type'] = 3:
+	elseif grandmaQW['chore_type'] = 3:
 		gt 'grandmahelp', 'feedchickens'
-	elseif grandmaQW['help_type'] = 4 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 4 and sunWeather = 1:
 		gt 'grandmahelp', 'checkplants'
-	elseif grandmaQW['help_type'] = 5 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 5 and sunWeather = 1:
 		gt 'grandmahelp', 'waterplants'
-	elseif grandmaQW['help_type'] = 6 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 6 and sunWeather = 1:
 		gt 'grandmahelp', 'harvest'
 	else
 		'"There is nothing to do today <<$pcs_nickname>>, take the day off.'
@@ -41,13 +41,13 @@ end
 if $ARGS[0] = 'cleanfloor':
 	'"There is always something to do, <<$pcs_nickname>>. I''ve gotten quite old and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
 
-	grandmaQW['cleanfloor'] = 1
+	grandmaQW['chore_clean_floor'] = 1
 	act 'Tell her you will do it soon':gt 'gadhouse', 'grandma'
 	act 'Agree and start cleaning (1:00)':
 		*clr & cla
 		minut += 60
-		grandmaQW['cleanfloor'] = 0
-		grandmaQW['help'] += 1
+		grandmaQW['chore_clean_floor'] = 0
+		grandmaQW['help_amount'] += 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
@@ -60,13 +60,13 @@ end
 if $ARGS[0] = 'washclothes':
 	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes?"'
 	
-	grandmaQW['washclothes'] = 1
+	grandmaQW['chore_wash_clothes'] = 1
 	act 'Tell her you will wash them in a little bit':gt 'gadhouse', 'grandma'
 	act 'Agree and start washing (1:00)':
 		*clr & cla
 		minut += 60
-		grandmaQW['washclothes'] = 0
-		grandmaQW['help'] += 1
+		grandmaQW['chore_wash_clothes'] = 0
+		grandmaQW['help_amount'] += 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
@@ -87,7 +87,7 @@ end
 if $ARGS[0] = 'feedchickens':
 	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
 	
-	grandmaQW['feed_chickens'] = 1
+	grandmaQW['chore_feed_chickens'] = 1
 	act 'Tell her you will do it in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the yard (0:10)':
 		*clr & cla
@@ -104,7 +104,7 @@ end
 if $ARGS[0] = 'milkcows':
 	' "<<$pcs_nickname>>, go to the barn and milk the cows."'
 
-	grandmaQW['milk_cow'] = 1
+	grandmaQW['chore_milk_cow'] = 1
 	act 'Tell her you will do it in a bit':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -121,7 +121,7 @@ end
 if $ARGS[0] = 'checkplants':
 	'"<<$pcs_nickname>>, can you please go work in the garden?"'
 
-	grandmaQW['work_garden'] = 1
+	grandmaQW['chore_work_in_garden'] = 1
 	act 'Tell her you will get to it later':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the garden (0:10)':
 		*clr & cla
@@ -138,7 +138,7 @@ end
 if $ARGS[0] = 'waterplants':
 	'"Dear <<$pcs_nickname>>, could you go and water the plants in the garden?"'
 
-	grandmaQW['water_garden'] = 1
+	grandmaQW['chore_water_garden'] = 1
 	act 'Tell her you will do it after a while':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the garden (0:10)':
 		*clr & cla
@@ -156,7 +156,7 @@ if $ARGS[0] = 'harvest':
 	if month = 7:
 		'"<<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
 		
-		grandmaQW['collect_strawberries'] = 1
+		grandmaQW['chore_collect_strawberries'] = 1
 		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the strawberry plot (0:10)':
 			*clr & cla
@@ -171,7 +171,7 @@ if $ARGS[0] = 'harvest':
 	elseif month = 8:
 		'"<<$pcs_nickname>> dear, the fruits are ripe and it is time to start collecting them, could you go and do it today?"'
 
-		grandmaQW['fruit_collect'] = 1
+		grandmaQW['chore_collect_fruit'] = 1
 		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the orchard (0:10)':
 			*clr & cla
@@ -186,7 +186,7 @@ if $ARGS[0] = 'harvest':
 	elseif month = 9:
 		'"<<$pcs_nickname>> dear, could you go to the garden today? It''s time to collect the harvest."'
 
-		grandmaQW['harvest_garden'] = 1
+		grandmaQW['chore_harvest_garden'] = 1
 		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the garden (0:10)':
 			*clr & cla

+ 46 - 46
locations/grandpahelp.qsrc

@@ -9,19 +9,19 @@ gs'stat'
 if $ARGS[0] = 'start':
 
 	if month <= 4 or month >= 10:
-		grandpaQW['help_type'] = rand(0,5)
+		grandpaQW['chore_type'] = rand(0,5)
 	elseif month = 5:
-		grandpaQW['help_type'] = rand(3,8)
+		grandpaQW['chore_type'] = rand(3,8)
 	elseif month = 6 or month = 9:
-		grandpaQW['help_type'] = rand(3,12)
+		grandpaQW['chore_type'] = rand(3,12)
 	else
-		grandpaQW['help_type'] = rand(3,13)
+		grandpaQW['chore_type'] = rand(3,13)
 	end
 
-	if grandpaQW['help_type'] = 0:
+	if grandpaQW['chore_type'] = 0:
 		'"<<$pcs_nickname>>, could you run out to the barn and bring some firewood for the stove?"'
 
-		grandpaQW['fetch_firewood'] = 1
+		grandpaQW['chore_fetch_firewood'] = 1
 		act 'Tell him you will go get some in just a bit':gt 'gadhouse', 'grandpa'
 		act 'Agree and go to fetch firewood (0:20)':
 			*clr & cla
@@ -33,17 +33,17 @@ if $ARGS[0] = 'start':
 			'You put on some warm clothes and run over to the barn to collect some firewood. '
 			'"I''ve brought some firewood grandfather," you said to your grandfather.'
 			'"You are very quick <<$pcs_nickname>>." he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
-			grandpaQW['fetch_firewood'] = 0
+			grandpaQW['chore_fetch_firewood'] = 0
 			minut += 20
-			grandmaQW['help'] += 1
+			grandmaQW['help_amount'] += 1
 			gs'stat'
 
 			act 'Continue':gt 'gadhouse', 'start'
 		end
-	elseif grandpaQW['help_type'] = 1:
+	elseif grandpaQW['chore_type'] = 1:
 		'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
 
-		grandpaQW['feed_horse'] = 1
+		grandpaQW['chore_feed_horse'] = 1
 		act 'Tell him that you will get to it in a little bit':gt 'gadhouse', 'grandpa'
 		act 'Agree and go to the barn (0:10)':
 			*clr & cla
@@ -58,10 +58,10 @@ if $ARGS[0] = 'start':
 
 			act 'Continue':gt'gadsarai','horse'
 		end
-	elseif grandpaQW['help_type'] = 2:
+	elseif grandpaQW['chore_type'] = 2:
 		'"<<$pcs_nickname>>, go to the barn to feed the cows."'
 
-		grandpaQW['feed_cow'] = 1
+		grandpaQW['chore_feed_cow'] = 1
 		act 'Tell him that you will do it in a little while':gt 'gadhouse', 'grandpa'
 		act 'Agree and go to the barn (0:10)':
 			*clr & cla
@@ -76,27 +76,27 @@ if $ARGS[0] = 'start':
 
 			act 'Continue':gt'gadsarai','cow'
 		end
-	elseif grandpaQW['help_type'] = 3:
+	elseif grandpaQW['chore_type'] = 3:
 		gt 'grandpahelp', 'cleanyard'
-	elseif grandpaQW['help_type'] = 4:
+	elseif grandpaQW['chore_type'] = 4:
 		gt 'grandpahelp', 'groomhorse'
-	elseif grandpaQW['help_type'] = 5:
+	elseif grandpaQW['chore_type'] = 5:
 		gt 'grandpahelp', 'feedhogs'
-	elseif grandpaQW['help_type'] = 6 and hour >= 6 and hour < 9:
+	elseif grandpaQW['chore_type'] = 6 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'grazehorse'
-	elseif grandpaQW['help_type'] = 7 and hour >= 6 and hour < 9:
+	elseif grandpaQW['chore_type'] = 7 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'leadcows'
-	elseif grandpaQW['help_type'] = 8 and hour >= 6 and hour < 9:
+	elseif grandpaQW['chore_type'] = 8 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'grazecows'
-	elseif grandpaQW['help_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:
 		gt 'grandpahelp', 'washhorse'
-	elseif grandpaQW['help_type'] >= 10 and grandpaQW['help_type'] < 13 and $grandpaQW['gather_quest'] = '' and ARRSIZE('swimwear') > 0:
+	elseif grandpaQW['chore_type'] >= 10 and grandpaQW['chore_type'] < 13 and $grandpaQW['chore_gather_from_forest'] = '' and ARRSIZE('swimwear') > 0:
 		gt 'grandpahelp', 'pickforest'
-	elseif grandpaQW['help_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
+	elseif grandpaQW['chore_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
 		'"<<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
 		'"Okay, grandfather," you replied.'
 
-		grandpaQW['haying_time'] = 1
+		grandpaQW['chore_bale_hay'] = 1
 		act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
 		act 'Grab a rake and head to the field (0:40)':
 			*clr & cla
@@ -138,7 +138,7 @@ end
 if $ARGS[0] = 'cleanyard':
 	'"Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
 
-	grandpaQW['clean_yard'] = 1
+	grandpaQW['chore_clean_yard'] = 1
 	act 'Tell him that you''ll do it in a minute':gt 'gadhouse', 'grandpa'
 	act 'Agree and go clean up the yard (1:00)':
 		*clr & cla
@@ -150,8 +150,8 @@ if $ARGS[0] = 'cleanyard':
 			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
 		end
 		minut += 60
-		grandpaQW['clean_yard'] = 0
-		grandmaQW['help'] += 1
+		grandpaQW['chore_clean_yard'] = 0
+		grandmaQW['help_amount'] += 1
 		if month >= 4 and month <= 10:
 			fat -= rand(1,3)
 		else
@@ -167,7 +167,7 @@ end
 if $ARGS[0] = 'feedhogs':
 	'"<<$pcs_nickname>>, could you go to the barn and feed the hogs."'
 
-	grandpaQW['feed_boar'] = 1
+	grandpaQW['chore_feed_boar'] = 1
 	act 'Tell him you will get to it soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -187,7 +187,7 @@ end
 if $ARGS[0] = 'washhorse':
 	'"It''s good weather today. Take Desperado to the river and give him a bath."'
 
-		grandpaQW['horse_river'] = 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
@@ -203,7 +203,7 @@ end
 if $ARGS[0] = 'groomhorse':
 	'"Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
 
-	grandpaQW['comb_horse'] = 1
+	grandpaQW['chore_brush_horse'] = 1
 	act 'Tell him you will do it in a bit':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -223,7 +223,7 @@ end
 if $ARGS[0] = 'grazehorse':
 	'"<<$pcs_nickname>>, take Desperado to the field, my legs hurt so I need to rest for a bit. I''ll retrieve the horse up in the evening."'
 
-	grandpaQW['horse_field'] = 1
+	grandpaQW['chore_lead_horse_to_field'] = 1
 	act 'Tell him you will do it soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -237,17 +237,17 @@ if $ARGS[0] = 'grazehorse':
 end
 
 if $ARGS[0] = 'grazecows':
-	if grandpaQW['graze_cow_exp'] = 0: 
+	if grandpaQW['chore_herd_cattle_experience'] = 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."'
 	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."'
 	end
 
-	grandpaQW['graze_cow'] = 1
+	grandpaQW['chore_herd_cattle'] = 1
 	act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the field (0:40)':
 		*clr & cla
-		if grandpaQW['graze_cow_exp'] = 0:
+		if grandpaQW['chore_herd_cattle_experience'] = 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.'
 		else
@@ -268,7 +268,7 @@ 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."'
 
-	grandpaQW['cow_field'] = 1
+	grandpaQW['chore_lead_cow_to_field'] = 1
 	act 'Tell him you will soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -282,25 +282,25 @@ if $ARGS[0] = 'leadcows':
 end
 
 if $ARGS[0] = 'pickforest':
-	if grandpaQW['help_type'] = 10:
-		$grandpaQW['gather_quest'] = 'mushroom'
-		grandpaQW['mushroom_qty'] = rand(2,3)
+	if grandpaQW['chore_type'] = 10:
+		$grandpaQW['chore_gather_from_forest'] = 'mushroom'
+		grandpaQW['chore_mushroom_quantity'] = rand(2,3)
 		'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
 		'"How much should I pick, grandpa?", you ask.'
-		'"<<grandpaQW[''mushroom_qty'']>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
-	elseif grandpaQW['help_type'] = 11:
-		$grandpaQW['gather_quest'] = 'berry'
-		grandpaQW['berry_qty'] = rand(3,5)
+		'"<<grandpaQW[''chore_mushroom_quantity'']>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
+	elseif grandpaQW['chore_type'] = 11:
+		$grandpaQW['chore_gather_from_forest'] = 'berry'
+		grandpaQW['chore_berry_quantity'] = rand(3,5)
 		'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
 		'"How much should I pick, grandpa?" you ask.'
-		'"<<grandpaQW[''berry_qty'']>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
-	elseif grandpaQW['help_type'] = 12:
-		$grandpaQW['gather_quest'] = 'both'
-		grandpaQW['mushroom_qty'] = rand(1,2)
-		grandpaQW['berry_qty'] = rand(2,3)
+		'"<<grandpaQW[''chore_berry_quantity'']>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
+	elseif grandpaQW['chore_type'] = 12:
+		$grandpaQW['chore_gather_from_forest'] = 'both'
+		grandpaQW['chore_mushroom_quantity'] = rand(1,2)
+		grandpaQW['chore_berry_quantity'] = rand(2,3)
 		'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and has a craving for some fresh berries."'
 		'"How much should I pick, grandpa?"'
-		'"<<grandpaQW[''mushroom_qty'']>> kg mushrooms and <<grandpaQW[''berry_qty'']>> kg of berries will be enough," grandfather replies. "Just don''t get lost."'
+		'"<<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries will be enough," grandfather replies. "Just don''t get lost."'
 	end
 	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the forest (1:00)':

+ 1 - 1
locations/miroslava.qsrc

@@ -58,7 +58,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 		'You and Mira are best friends.'
 	end
 
-	if grandpaQW['graze_cow'] = 1:
+	if grandpaQW['chore_herd_cattle'] = 1:
 		act 'Talk to Mira':
 			menu_off = 1
 			*clr & cla

+ 4 - 4
locations/preSYS.qsrc

@@ -156,7 +156,7 @@ if $ARGS[0] = 'CSBStart':
 		act 'Start at the end of August':
 			month = 8
 			$month = 'August'
-			grandmaQW['month_paid'] = month
+			grandmaQW['last_month_paid'] = month
 			day = 26
 			week = 5
 			hour = 9
@@ -167,7 +167,7 @@ if $ARGS[0] = 'CSBStart':
 		act 'Start at the beginning of June':
 			month = 6
 			$month = 'June'
-			grandmaQW['month_paid'] = month
+			grandmaQW['last_month_paid'] = month
 			day = 1
 			week = 3
 			kanicont = 92
@@ -312,7 +312,7 @@ if $ARGS[0] = 'SGStart2':
 		act 'Start at the end of August':
 			month = 8
 			$month = 'August'
-			grandmaQW['month_paid'] = month
+			grandmaQW['last_month_paid'] = month
 			day = 26
 			week = 5
 			hour = 9
@@ -323,7 +323,7 @@ if $ARGS[0] = 'SGStart2':
 		act 'Start at the beginning of June':
 			month = 6
 			$month = 'June'
-			grandmaQW['month_paid'] = month
+			grandmaQW['last_month_paid'] = month
 			day = 1
 			week = 3
 			kanicont = 92

+ 36 - 37
locations/saveupdater.qsrc

@@ -703,44 +703,43 @@ if rex > 0 and rex > npc_rel['A57']: npc_rel['A57'] = rex & killvar 'rex'
 
 !!------------------------------grandparent variable clean up---for 0.8.0 release---------------------------
 !!---Grandpa
-If grandpa_bilberry > 0: grandpaQW['berry_qty'] = grandpa_bilberry & killvar 'grandpa_bilberry'
-If grandpa_boletus > 0: grandpaQW['mushroom_qty'] = grandpa_boletus & killvar 'grandpa_boletus'
-If grandpahelpday > 0: grandpaQW['help_day'] = grandpahelpday & killvar 'grandpahelpday'
-If grandpahelping > 0: grandpaQW['help_type'] = grandpahelping & killvar 'grandpahelping'
-If grandpatalk > 0: grandpaQW['talk_hour'] = grandpatalk & killvar 'grandpatalk'
-If grandpatalkday > 0: grandpaQW['talk_day'] = grandpatalkday & killvar 'grandpatalkday'
-If grandpatalkforest > 0: grandpaQW['talk_abt_forest'] = grandpatalkforest & killvar 'grandpatalkforest'
-If comb_horse > 0: grandpaQW['comb_horse'] = comb_horse & killvar 'comb_horse'
-If cow_field > 0: grandpaQW['cow_field'] = cow_field & killvar 'cow_field'
-If feed_boar > 0: grandpaQW['feed_boar'] = feed_boar & killvar 'feed_boar'
-If feed_cow > 0: grandpaQW['feed_cow'] = feed_cow & killvar 'feed_cow'
-If feed_horse > 0: grandpaQW['feed_horse'] = feed_horse & killvar 'feed_horse'
-If graze_cow > 0: grandpaQW['graze_cow'] = graze_cow & killvar 'graze_cow'
-If graze_cow_exp > 0: grandpaQW['graze_cow_exp'] = graze_cow_exp & killvar 'graze_cow_exp'
-If haying_time > 0: grandpaQW['haying_time'] = haying_time & killvar 'haying_time'
-If horse_field > 0: grandpaQW['horse_field'] = horse_field & killvar 'horse_field'
-If horse_river > 0: grandpaQW['horse_river'] = horse_river & killvar 'horse_river'
-If go_in_bilberry > 0: $grandpaQW['gather_quest'] = 'berry' & killvar 'go_in_bilberry'
-If go_in_boletus > 0: $grandpaQW['gather_quest'] = 'mushroom' & killvar 'go_in_boletus'
-If go_in_boletus_bilberry > 0: $grandpaQW['gather_quest'] = 'both' & killvar 'go_in_boletus_bilberry'
+If grandpa_bilberry > 0: grandpaQW['chore_berry_quantity'] = grandpa_bilberry & killvar 'grandpa_bilberry'
+If grandpa_boletus > 0: grandpaQW['chore_mushroom_quantity'] = grandpa_boletus & killvar 'grandpa_boletus'
+If grandpahelpday > 0: grandpaQW['last_day_helped'] = grandpahelpday & killvar 'grandpahelpday'
+If grandpahelping > 0: grandpaQW['chore_type'] = grandpahelping & killvar 'grandpahelping'
+If grandpatalk > 0: grandpaQW['last_hour_talked'] = grandpatalk & killvar 'grandpatalk'
+If grandpatalkday > 0: grandpaQW['last_day_talked'] = grandpatalkday & killvar 'grandpatalkday'
+If grandpatalkforest > 0: grandpaQW['talked_about_forest'] = grandpatalkforest & killvar 'grandpatalkforest'
+If comb_horse > 0: grandpaQW['chore_brush_horse'] = comb_horse & killvar 'comb_horse'
+If cow_field > 0: grandpaQW['chore_lead_cow_to_field'] = cow_field & killvar 'cow_field'
+If feed_boar > 0: grandpaQW['chore_feed_boar'] = feed_boar & killvar 'feed_boar'
+If feed_cow > 0: grandpaQW['chore_feed_cow'] = feed_cow & killvar 'feed_cow'
+If feed_horse > 0: grandpaQW['chore_feed_horse'] = feed_horse & killvar 'feed_horse'
+If graze_cow > 0: grandpaQW['chore_herd_cattle'] = graze_cow & killvar 'graze_cow'
+If graze_cow_exp > 0: grandpaQW['chore_herd_cattle_experience'] = graze_cow_exp & killvar 'graze_cow_exp'
+If haying_time > 0: grandpaQW['chore_bale_hay'] = haying_time & killvar 'haying_time'
+If horse_field > 0: grandpaQW['chore_lead_horse_to_field'] = horse_field & killvar 'horse_field'
+If horse_river > 0: grandpaQW['chore_bathe_horse'] = horse_river & killvar 'horse_river'
+If go_in_bilberry > 0: $grandpaQW['chore_gather_from_forest'] = 'berry' & killvar 'go_in_bilberry'
+If go_in_boletus > 0: $grandpaQW['chore_gather_from_forest'] = 'mushroom' & killvar 'go_in_boletus'
+If go_in_boletus_bilberry > 0: $grandpaQW['chore_gather_from_forest'] = 'both' & killvar 'go_in_boletus_bilberry'
 !!---Grandma
-If grandma_trouble > 0: grandmaQW['trouble'] = grandma_trouble & killvar 'grandma_trouble'
-If grandmastory > 0: grandmaQW['story_day'] = grandmastory & killvar 'grandmastory'
-If grandmatalk > 0: grandmaQW['talk_hour'] = grandmatalk & killvar 'grandmatalk'
-If grandmatalkday > 0: grandmaQW['talk_day'] = grandmatalkday & killvar 'grandmatalkday'
-If grandmatalkgad > 0: grandmaQW['talk_abt_gadukino'] = grandmatalkgad & killvar 'grandmatalkgad'
-If monthbabkapay > 0: grandmaQW['month_paid'] = monthbabkapay & killvar 'monthbabkapay'
-If monthgrandmahelp > 0: grandmaQW['month_helped'] = monthgrandmahelp & killvar 'monthgrandmahelp'
-If grandmahelpday > 0: grandmaQW['help_day'] = grandmahelpday & killvar 'grandmahelpday'
-If grandmahelp > 0: grandmaQW['help'] = grandmahelp & killvar 'grandmahelp'
-If grandmahelping > 0: grandmaQW['help_type'] = grandmahelping & killvar 'grandmahelping'
-If collect_strawberries > 0: grandmaQW['collect_strawberries'] = collect_strawberries & killvar 'collect_strawberries'
-If feed_chickens > 0: grandmaQW['feed_chickens'] = feed_chickens & killvar 'feed_chickens'
-If fruit_collect > 0: grandmaQW['fruit_collect'] = fruit_collect & killvar 'fruit_collect'
-If harvest_garden > 0: grandmaQW['harvest_garden'] = harvest_garden & killvar 'harvest_garden'
-If milk_cow > 0: grandmaQW['milk_cow'] = milk_cow & killvar 'milk_cow'
-If water_garden > 0: grandmaQW['water_garden'] = water_garden & killvar 'water_garden'
-If work_garden > 0: grandmaQW['work_garden'] = work_garden & killvar 'work_garden'
+If grandma_trouble > 0: grandmaQW['nudity_trouble'] = grandma_trouble & killvar 'grandma_trouble'
+If grandmastory > 0: grandmaQW['last_day_asked_for_story'] = grandmastory & killvar 'grandmastory'
+If grandmatalk > 0: grandmaQW['last_hour_talked'] = grandmatalk & killvar 'grandmatalk'
+If grandmatalkday > 0: grandmaQW['last_day_talked'] = grandmatalkday & killvar 'grandmatalkday'
+If grandmatalkgad > 0: grandmaQW['talked_about_gadukino'] = grandmatalkgad & killvar 'grandmatalkgad'
+If monthbabkapay > 0: grandmaQW['last_month_paid'] = monthbabkapay & killvar 'monthbabkapay'
+If grandmahelpday > 0: grandmaQW['last_day_helped'] = grandmahelpday & killvar 'grandmahelpday'
+If grandmahelp > 0: grandmaQW['help_amount'] = grandmahelp & killvar 'grandmahelp'
+If grandmahelping > 0: grandmaQW['chore_type'] = grandmahelping & killvar 'grandmahelping'
+If collect_strawberries > 0: grandmaQW['chore_collect_strawberries'] = collect_strawberries & killvar 'collect_strawberries'
+If feed_chickens > 0: grandmaQW['chore_feed_chickens'] = feed_chickens & killvar 'feed_chickens'
+If fruit_collect > 0: grandmaQW['chore_collect_fruit'] = fruit_collect & killvar 'fruit_collect'
+If harvest_garden > 0: grandmaQW['chore_harvest_garden'] = harvest_garden & killvar 'harvest_garden'
+If milk_cow > 0: grandmaQW['chore_milk_cow'] = milk_cow & killvar 'milk_cow'
+If water_garden > 0: grandmaQW['chore_water_garden'] = water_garden & killvar 'water_garden'
+If work_garden > 0: grandmaQW['chore_work_in_garden'] = work_garden & killvar 'work_garden'
 !!---------------------------end of grandparent variable clean up---for 0.8.0 release-----------------------
 
 !! ----- Natasha story variables migrated to array ----- 0.8.0