Jelajahi Sumber

Converted all of Grandpa's variables into a single array. Also cleaned up a bit of dialog, rearranged some things.

richard_butte 4 tahun lalu
induk
melakukan
0e8a9b6dba

+ 1 - 1
locations/bedrPar.qsrc

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

+ 6 - 6
locations/gadbana.qsrc

@@ -49,7 +49,7 @@ if mira = 0:
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 2
-				grandma_trouble += 1
+				grandmaQW['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
-				grandma_trouble += rand(0,1)
+				grandmaQW['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
-				grandma_trouble += 1
+				grandmaQW['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
-				grandma_trouble += rand(0,1)
+				grandmaQW['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
-							grandma_trouble += 1
+							grandmaQW['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
-							grandma_trouble += rand(0,1)
+							grandmaQW['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'

+ 6 - 6
locations/gaddvor.qsrc

@@ -13,10 +13,10 @@ if $ARGS[0]='':
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 	if hour >= 6 and hour < 22:
-		if grandma_trouble = 10:
+		if grandmaQW['trouble'] = 10:
 			*clr & cla
 			menu_off = 1
-			killvar 'grandma_trouble'
+			grandmaQW['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.'
@@ -53,7 +53,7 @@ if $ARGS[0]='':
 		*nl
 		'You are naked and can only go into your grandparent''s house to get dressed or go to the banya.'
 	else
-		if feed_chickens = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are <a href="exec:gt ''gaddvor'',''chickens''">chickens</a> running around.'
+		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 mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''miroslava'', ''Start''">Mira</a> stands next to you.'
 
@@ -109,14 +109,14 @@ if $ARGS[0] = 'chickens':
 	gs 'stat'
 
 	!job Granny
-	if feed_chickens = 1:
+	if grandmaQW['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
-			grandmahelp += 1
-			feed_chickens = 0
+			grandmaQW['help'] += 1
+			grandmaQW['feed_chickens'] = 0
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 9 - 9
locations/gadfield.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'field':
 			end
 
 			minut += 360
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			grandpaQW['haying_time'] = 0
 			hndiwrk_exp += rand(0,2)
 			gs 'stat'
@@ -103,7 +103,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
-			grandmahelp += rand(0,1)
+			grandmaQW['help'] += rand(0,1)
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -137,7 +137,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
-			grandmahelp += rand(0,1)
+			grandmaQW['help'] += rand(0,1)
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -171,7 +171,7 @@ if $ARGS[0] = 'cow':
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 				grandpaQW['graze_cow_exp'] = 1
-				grandmahelp += 1
+				grandmaQW['help'] += 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -272,7 +272,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
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			minut += 60
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
@@ -336,7 +336,7 @@ 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
-				grandmahelp += 1
+				grandmaQW['help'] += 1
 				grandpaQW['graze_cow_exp'] = 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
@@ -404,7 +404,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.'
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 			minut += 60
 			hndiwrk_exp += rand(0,3)
@@ -443,7 +443,7 @@ 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
-				grandmahelp += 1
+				grandmaQW['help'] += 1
 				grandpaQW['graze_cow_exp'] = 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
@@ -546,7 +546,7 @@ if $ARGS[0] = 'cow3':
 			minut += 60
 			mira = 0
 			grandpaQW['graze_cow'] = 0
-			grandmahelp += 1
+			grandmaQW['help'] += 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)
-		grandma_trouble += rand(7,10)
+		grandmaQW['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)
-		grandma_trouble += rand(1,3)
+		grandmaQW['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)
-		grandma_trouble += rand(1,3)
+		grandmaQW['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
-		grandma_trouble += rand(0,1)
+		grandmaQW['trouble'] += rand(0,1)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'

+ 17 - 17
locations/gadgarden.qsrc

@@ -36,15 +36,15 @@ if $ARGS[0] = 'garden':
 	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
 
 	!job Granny
-	if work_garden = 1:
+	if grandmaQW['work_garden'] = 1:
 		act 'Work in the garden (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			work_garden = 0
-			grandmahelp += 3
+			grandmaQW['work_garden'] = 0
+			grandmaQW['help'] += 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 water_garden = 1:
-		act 'Water the garden (1:00)':
+	if grandmaQW['water_garden'] = 1:
+		act 'Water the plants (1:00)':
 			cla
 			*clr
 			menu_off = 1
 			gs 'sweat', 'add', 10
 			minut += 60
-			water_garden = 0
-			grandmahelp += 1
+			grandmaQW['water_garden'] = 0
+			grandmaQW['help'] += 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 harvest_garden = 1:
+	if grandmaQW['harvest_garden'] = 1:
 		act 'Harvest (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			harvest_garden = 0
-			grandmahelp += 3
+			grandmaQW['harvest_garden'] = 0
+			grandmaQW['help'] += 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 collect_strawberries = 1:
+	if grandmaQW['collect_strawberries'] = 1:
 		act 'Collect strawberries (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			collect_strawberries = 0
-			grandmahelp += 5
+			grandmaQW['collect_strawberries'] = 0
+			grandmaQW['help'] += 5
 			agil_exp += 1
 			fat -= 1
 			hndiwrk_exp += rand(3,9)
@@ -163,7 +163,7 @@ if $ARGS[0] = 'strawberry':
 			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries.jpg"></center>'
 			if CloSkirtShortness > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_ski.jpg"></center>'
 			if CloSkirtShortness > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_tanga.jpg"></center>'
-			'You wander through the plot collecting ripe strawberries in the basket.'
+			'You wander through the plot for several hours, collecting ripe strawberries and placing them in the basket.'
 
 			act 'Finish':gt'gadgarden','strawberry'
 		end
@@ -212,15 +212,15 @@ if $ARGS[0] = 'fruit_garden':
 		end
 	end
 	!job Granny
-	if fruit_collect = 1:
+	if grandmaQW['fruit_collect'] = 1:
 		act 'Collect fruit (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			fruit_collect = 0
-			grandmahelp += 5
+			grandmaQW['fruit_collect'] = 0
+			grandmaQW['help'] += 5
 			agil_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)

+ 65 - 29
locations/gadhouse.qsrc

@@ -15,10 +15,10 @@ if $ARGS[0] = 'start':
 	frost = 0
 	mira_temp = rand(1,5)
 
-	if monthbabkapay ! month and monthgrandmahelp ! month and hour >= 6 and hour < 22:
-		monthbabkapay = month
-		monthgrandmahelp = month
-		if grandmahelp > 0: money += grandmahelp*50
+	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
 		money += 2000
 		minut += 10
 
@@ -29,24 +29,24 @@ 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 + grandmahelp * 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''] * 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 grandmahelp > 0:
-				'"You were quite helpful over the last few weeks, so here''s <<2000 + grandmahelp * 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'] > 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.'
 			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.'
+				'"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
-		grandmahelp = 0
+		grandmaQW['help'] = 0
 		act 'Continue': gt 'gadhouse', 'start'
 
 	elseif $grandpaQW['gather_quest'] = 'mushroom' and boletus >= grandpaQW['mushroom_qty'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmahelp += 1
+		grandmaQW['help'] += 1
 		boletus -= grandpaQW['mushroom_qty']
 		minut += 5
 		$grandpaQW['gather_quest'] = ''
@@ -64,7 +64,7 @@ if $ARGS[0] = 'start':
 
 	elseif $grandpaQW['gather_quest'] = 'both' and boletus >= grandpaQW['mushroom_qty'] and bilberry >= grandpaQW['berry_qty'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmahelp += 1
+		grandmaQW['help'] += 1
 		boletus -= grandpaQW['mushroom_qty']
 		bilberry -= grandpaQW['berry_qty']
 		minut += 5
@@ -83,7 +83,7 @@ if $ARGS[0] = 'start':
 
 	elseif $grandpaQW['gather_quest'] = 'berry' and bilberry >= grandpaQW['berry_qty'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmahelp += 1
+		grandmaQW['help'] += 1
 		bilberry -= grandpaQW['berry_qty']
 		minut += 5
 		$grandpaQW['gather_quest'] = ''
@@ -196,7 +196,7 @@ if $ARGS[0] = 'main':
 			menu_off = 1
 			minut += 1
 			inhib_exp += rand(0,2)
-			grandma_trouble += rand(1,3)
+			grandmaQW['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'
@@ -210,7 +210,7 @@ if $ARGS[0] = 'main':
 			menu_off = 1
 			minut += 1
 			inhib_exp += rand(0,2)
-			grandma_trouble += rand(1,3)
+			grandmaQW['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'
@@ -219,10 +219,46 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	act 'Prepare a full meal (0:30)':gs 'food', 'm_meal'
+	if grandmaQW['cleanfloor'] = 1:
+		act 'Clean the floor for Grandma (1:00)':
+			*clr & cla
+			minut += 60
+			grandmaQW['cleanfloor'] = 0
+			grandmaQW['help'] += 1
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
+			'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
+			
+			act 'Continue':gt 'gadhouse', 'start'
+		end
+	end
 
-	act 'Prepare a light meal (0:25)':gs 'food', 's_meal'
+	if grandmaQW['washclothes'] = 1:
+		act 'Wash Grandpa''s clothes for Grandma (1:00)':
+			*clr & cla
+			minut += 60
+			grandmaQW['washclothes'] = 0
+			grandmaQW['help'] += 1
+			gs'stat'
+
+			'<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':
+				*clr & cla
+				minut += 10
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
+				'Once you are done with the washing, you walk over to the clothesline where you carefully hang the clothes to dry.'
 
+				act 'Continue':gt'gaddvor'
+			end    
+		end
+	end
+
+	act 'Prepare a full meal (0:30)':gs 'food', 'm_meal'
+	act 'Prepare a light meal (0:25)':gs 'food', 's_meal'
 	act 'Have a snack (0:15)':gs 'food', 'snack'
 
 	dynamic $sandwich
@@ -287,7 +323,7 @@ if $ARGS[0] = 'grandma':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	if grandmatalkday ! daystart: grandmatalk = 0
+	if grandmaQW['talk_day'] ! daystart: grandmaQW['talk_hour'] = 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
@@ -302,12 +338,12 @@ if $ARGS[0] = 'grandma':
 		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
 
-		if grandmahelpday ! daystart: act 'Offer to help out': grandmahelpday = daystart & gt'grandmahelp', 'start'
+		if grandmaQW['help_day'] ! daystart: act 'Offer to help out': grandmaQW['help_day'] = daystart & gt'grandmahelp', 'start'
 
-		if grandmatalkgad = 0:
+		if grandmaQW['talk_abt_gadukino'] = 0:
 			act 'Ask about the village (0:10)':
 				*clr & cla
-				grandmatalkgad = 1
+				grandmaQW['talk_abt_gadukino'] = 1
 				minut += 10
 				pcs_mood += 5
 				gs 'stat'
@@ -328,11 +364,11 @@ if $ARGS[0] = 'grandma':
 			end
 		end
 		!125e
-		if hour >= grandmatalk + 3:
+		if hour >= grandmaQW['talk_hour'] + 3:
 			act 'Chat with your grandmother (0:10)':
 				*clr & cla
-				grandmatalk = hour
-				grandmatalkday = daystart
+				grandmaQW['talk_hour'] = hour
+				grandmaQW['talk_day'] = daystart
 				minut += 10
 				pcs_mood += RAND(5,10)
 				gs 'stat'
@@ -344,10 +380,10 @@ if $ARGS[0] = 'grandma':
 			end
 		end
 
-		if grandmastory ! daystart:
+		if grandmaQW['story_day'] ! daystart:
 			act 'Ask her to tell you a story (0:20)':
 				*clr & cla
-				grandmastory = daystart
+				grandmaQW['story_day'] = daystart
 				minut += 20
 				pcs_mood += rand(10,15)
 				gs 'stat'
@@ -417,7 +453,7 @@ if $ARGS[0]='grandpa':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	if grandpaQW['talk_day'] ! daystart:grandpaQW['talk'] = 0
+	if grandpaQW['talk_day'] ! daystart:grandpaQW['talk_hour'] = 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
@@ -461,10 +497,10 @@ if $ARGS[0]='grandpa':
 			end
 		end
 
-		if hour >= grandpaQW['talk'] + 3:
+		if hour >= grandpaQW['talk_hour'] + 3:
 			act 'Chat with your grandfather (0:10)':
 				*clr & cla
-				grandpaQW['talk'] = hour
+				grandpaQW['talk_hour'] = hour
 				grandpaQW['talk_day'] = daystart
 				minut += 10
 				pcs_mood += RAND(5,10)
@@ -539,7 +575,7 @@ if $ARGS[0] = 'intro':
 	$metka = ''
 	$loc = 'gadhouse'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
-	monthbabkapay = month
+	grandmaQW['month_paid'] = month
 	display_bb = 1
 	menu_off = 1
 	hour = 6

+ 3 - 3
locations/gadriver.qsrc

@@ -516,7 +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)
-						grandmahelp += 1
+						grandmaQW['help'] += 1
 						grandpaQW['horse_river'] = 3
 						gs 'stat'
 						
@@ -546,7 +546,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)
-							grandmahelp += 1
+							grandmaQW['help'] += 1
 							grandpaQW['horse_river'] = 3
 							gs 'stat'
 							
@@ -586,7 +586,7 @@ if $ARGS[0] = 'gadbitch':
 				else
 					minut += 30
 					hndiwrk_exp += rand(0,3)
-					grandmahelp += rand(0,1)
+					grandmaQW['help'] += rand(0,1)
 					grandpaQW['horse_river'] = 0
 					gs 'stat'
 					

+ 9 - 9
locations/gadsarai.qsrc

@@ -171,7 +171,7 @@ if $ARGS[0] = 'boar':
 			cla
 			*clr
 			minut += 30
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			grandpaQW['feed_boar'] = 0
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
@@ -195,13 +195,13 @@ if $ARGS[0] = 'cow':
 
 	act 'Leave':minut += 5 & gt 'gadsarai'
 
-	if milk_cow = 1:
+	if grandmaQW['milk_cow'] = 1:
 		act 'Milk the cow':
 			cla
 			*clr
 			minut += 30
-			milk_cow = 0
-			grandmahelp += 1
+			grandmaQW['milk_cow'] = 0
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -217,7 +217,7 @@ if $ARGS[0] = 'cow':
 			*clr
 			minut += 30
 			grandpaQW['feed_cow'] = 0
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -232,7 +232,7 @@ if $ARGS[0] = 'cow':
 			cla
 			*clr
 			minut += 60
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -265,7 +265,7 @@ if $ARGS[0] = 'horse':
 			*clr
 			minut += 30
 			grandpaQW['feed_horse'] = 0
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -281,7 +281,7 @@ if $ARGS[0] = 'horse':
 			*clr
 			minut += 60
 			grandpaQW['horse_field'] = 0
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -312,7 +312,7 @@ if $ARGS[0] = 'horse':
 			*clr
 			minut += 60
 			grandpaQW['comb_horse'] = 0
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 4 - 4
locations/gadukino_event.qsrc

@@ -1022,12 +1022,12 @@ if $ARGS[0] = 'go_home_ender':
 	menu_off = 1
 	*clr & cla
 	minut += rand(15,25)
-	if grandmahelp > 0:
+	if grandmaQW['help'] > 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 <<grandmahelp*50>> rubles.'
-		money += grandmahelp*50
-		grandmahelp = 0
+		'Before leaving grandma gives you <<grandmaQW[''help'']*50>> rubles.'
+		money += grandmaQW['help'] * 50
+		grandmaQW['help'] = 0
 	end
 	gadstay = 0
 	gs 'stat'

+ 61 - 48
locations/grandmahelp.qsrc

@@ -1,79 +1,85 @@
 # grandmahelp
 
 menu_off = 1
-gs'stat'
+gs 'stat'
 
 frost = 0
 
 '<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
 
-'You ask your grandmother if you there was something you could help out with something here at home. Your grandmother turns to you and says:'
+'You ask your grandmother if you there is anything you could help out with. Your grandmother turns to you and says:'
 
 if $ARGS[0] = 'start':
 	if month <= 4 or month >= 10:
-		grandmahelping = rand(0,2)
+		grandmaQW['help_type'] = rand(0,2)
 	elseif month = 5 or month = 6:
-		grandmahelping = rand(0,5)
+		grandmaQW['help_type'] = rand(0,5)
 	else
-		grandmahelping = rand(0,6)
+		grandmaQW['help_type'] = rand(0,6)
 	end
 
-	if grandmahelping = 0: 
+	if grandmaQW['help_type'] = 0: 
 		gt 'grandmahelp', 'cleanfloor'
-	elseif grandmahelping = 1:
+	elseif grandmaQW['help_type'] = 1:
 		gt 'grandmahelp', 'washclothes'
-	elseif grandmahelping = 2 and hour < 9 and hour > 20:
+	elseif grandmaQW['help_type'] = 2 and hour < 9 and hour > 20:
 		gt 'grandmahelp', 'milkcows'
-	elseif grandmahelping = 3:
+	elseif grandmaQW['help_type'] = 3:
 		gt 'grandmahelp', 'feedchickens'
-	elseif grandmahelping = 4 and sunWeather = 1:
+	elseif grandmaQW['help_type'] = 4 and sunWeather = 1:
 		gt 'grandmahelp', 'checkplants'
-	elseif grandmahelping = 5 and sunWeather = 1:
+	elseif grandmaQW['help_type'] = 5 and sunWeather = 1:
 		gt 'grandmahelp', 'waterplants'
-	elseif grandmahelping = 6 and sunWeather = 1:
+	elseif grandmaQW['help_type'] = 6 and sunWeather = 1:
 		gt 'grandmahelp', 'harvest'
 	else
-		'"There is nothing to do today <<$pcs_nickname>>, take a day off.'
-		act 'Go':gt 'gadhouse', 'start'
+		'"There is nothing to do today <<$pcs_nickname>>, take the day off.'
+		act 'Continue':gt 'gadhouse', 'start'
 	end
 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?"'
+	'"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?"'
 
-	act 'Clean the floor (1:00)':
+	grandmaQW['cleanfloor'] = 1
+	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Agree and start cleaning (1:00)':
 		*clr & cla
 		minut += 60
-		grandmahelp += 1
+		grandmaQW['cleanfloor'] = 0
+		grandmaQW['help'] += 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
 		'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
 		
-		act 'Go':gt 'gadhouse', 'start'
+		act 'Continue':gt 'gadhouse', 'start'
 	end
 end
 
 if $ARGS[0] = 'washclothes':
-	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes."'
+	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes?"'
 	
-	act 'Wash clothes (1:00)':
+	grandmaQW['washclothes'] = 1
+	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Agree and start washing (1:00)':
 		*clr & cla
 		minut += 60
-		grandmahelp += 1
+		grandmaQW['washclothes'] = 0
+		grandmaQW['help'] += 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
-		'You pick up grandfathers dirty clothes and take it with you outside where you soak them in the metal basin for an hour.'
+		'You pick up 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':
 		    *clr & cla
 		    minut += 10
 		    gs'stat'
 		    '<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
-		    'You are done with the washing and walk over to the yard where you carefully hang the clothes to dry.'
+		    'Once you are done with the washing, you walk over to the clothesline where you carefully hang the clothes to dry.'
 
-		    act 'Go':gt'gaddvor'
+		    act 'Continue':gt'gaddvor'
 		end    
 	end
 end
@@ -81,41 +87,44 @@ end
 if $ARGS[0] = 'feedchickens':
 	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
 	
-	act 'Go to the yard (0:10)':
+	grandmaQW['feed_chickens'] = 1
+	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Agree and go to the yard (0:10)':
 		*clr & cla
-		feed_chickens = 1
 		minut += 10
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
 		'You take the grain mix for the chickens with you and walk over to the yard.'
 
-		act 'Go':gt'gaddvor'
+		act 'Continue':gt'gaddvor','chickens'
 	end
 end
 
 if $ARGS[0] = 'milkcows':
 	' "<<$pcs_nickname>>, go to the barn and milk the cows."'
 
-	act 'Go to the barn (0:10)':
+	grandmaQW['milk_cow'] = 1
+	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		minut += 10
-		milk_cow = 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 		'You walk over to the barn where the cows are kept.'
 
-		act 'Further':gt'gadsarai'
+		act 'Continue':gt'gadsarai','cow'
 	end	
 end
 
 if $ARGS[0] = 'checkplants':
-	'"<<$pcs_nickname>>, go to the garden and check on the plants."'
+	'"<<$pcs_nickname>>, can you please go work in the garden?"'
 
-	act 'Go to garden (0:10)':
+	grandmaQW['work_garden'] = 1
+	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Agree and go to the garden (0:10)':
 		*clr & cla
-        work_garden = 1
 		minut += 10
 		gs'stat'
 
@@ -127,18 +136,19 @@ if $ARGS[0] = 'checkplants':
 end
 
 if $ARGS[0] = 'waterplants':
-	'"Dear <<$pcs_nickname>>, could you go and water the planted field in the garden?"'
+	'"Dear <<$pcs_nickname>>, could you go and water the plants in the garden?"'
 
-	act 'Go to the garden (0:10)':
+	grandmaQW['water_garden'] = 1
+	act 'Agree and continue':gt 'gadhouse', 'start'
+	act 'Agree and go to the garden (0:10)':
 		*clr & cla
-        water_garden = 1
 		minut += 10
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You bring a bucket along with you to the garden.'
+		'You bring a watering can along with you to the garden.'
 
-		act 'Further':gt'gadgarden','garden'
+		act 'Continue':gt'gadgarden','garden'
 	end
 end
 
@@ -146,44 +156,47 @@ 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?"'
 		
-		act 'Go to the garden (0:10)':
+		grandmaQW['collect_strawberries'] = 1
+		act 'Agree and continue':gt 'gadhouse', 'start'
+		act 'Agree and go to the strawberry plot (0:10)':
 			*clr & cla
-			collect_strawberries = 1
 			minut += 10
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You bring a basket with you and walk to the strawberry plot in the garden.'
 
-			act 'Further':gt'gadgarden','strawberry'
+			act 'Continue':gt'gadgarden','strawberry'
 		end
 	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?"'
 
-		act 'Go to the garden (0:10)':
+		grandmaQW['fruit_collect'] = 1
+		act 'Agree and continue':gt 'gadhouse', 'start'
+		act 'Agree and go to the orchard (0:10)':
 			*clr & cla
-			fruit_collect = 1
 			minut += 10
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You bring a basket with you and walk to the fruit garden.'
 
-			act 'Further':gt'gadgarden','fruit_garden'
+			act 'Continue':gt'gadgarden','fruit_garden'
 		end
 	elseif month = 9:
-		'"<<$pcs_nickname>> dear, could you go to the garden today, it''s time to collect the harvest."'
+		'"<<$pcs_nickname>> dear, could you go to the garden today? It''s time to collect the harvest."'
 
-		act 'Go to garden (0:10)':
+		grandmaQW['harvest_garden'] = 1
+		act 'Agree and continue':gt 'gadhouse', 'start'
+		act 'Agree and go to the garden (0:10)':
 			*clr & cla
-			harvest_garden = 1
 			minut += 10
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You bring the harvest tools with you and go over to the garden.'
 
-			act 'Further':gt'gadgarden','garden'
+			act 'Continue':gt'gadgarden','garden'
 		end
 	end
 end

+ 2 - 2
locations/grandpahelp.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 			'"I''ve brought some firewood grandfather," you said to your grandfather.'
 			'"You are very quick <<$pcs_nickname>>." he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
 			minut += 20
-			grandmahelp += 1
+			grandmaQW['help'] += 1
 			gs'stat'
 
 			act 'Go':gt 'gadhouse', 'start'
@@ -145,7 +145,7 @@ 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
-		grandmahelp += 1
+		grandmaQW['help'] += 1
 		if month >= 4 and month <= 10:
 			fat -= rand(1,3)
 		else

+ 4 - 4
locations/preSYS.qsrc

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