Browse Source

Few more corrections, also changed the flow of grandma/grandpa conversations so you don't have to continually click on their names to talk to them more than once

richard_butte 4 years ago
parent
commit
2372eedf1c
5 changed files with 35 additions and 34 deletions
  1. 6 5
      locations/gaddvor.qsrc
  2. 1 1
      locations/gadfield.qsrc
  3. 5 5
      locations/gadhouse.qsrc
  4. 10 10
      locations/grandmahelp.qsrc
  5. 13 13
      locations/grandpahelp.qsrc

+ 6 - 5
locations/gaddvor.qsrc

@@ -52,6 +52,8 @@ if $ARGS[0]='':
 	if $clothingworntype = 'nude':
 		*nl
 		'You are naked and can only go into your grandparent''s house to get dressed or go to the banya.'
+		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.'
 
@@ -82,6 +84,10 @@ if $ARGS[0]='':
 				act 'Continue':gt'gaddvor'
 			end
 		end
+		if StoryLine = 1:
+			act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
+			act 'Enter the banya':minut += 1 & gt 'gadbana'
+		end
 		act 'Go to the barn':minut += 1 & gt 'gadsarai'
 		act 'Go to the garden':minut += 1 & gt'gadgarden','garden'
 
@@ -101,11 +107,6 @@ if $ARGS[0]='':
 		end
 	end
 
-	if StoryLine = 1:
-		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
-		act 'Enter the banya':minut += 1 & gt 'gadbana'
-	end
-
 	clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 	if clothesAtLocation = 1:
 		if $clothingworntype = 'nude':

+ 1 - 1
locations/gadfield.qsrc

@@ -132,7 +132,7 @@ 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 'Back':gt'gadfield','field'
+	if grandpaQW['graze_cow'] = 0:act 'Leave them be':gt'gadfield','field'
 	if hour = 19 and grandpaQW['graze_cow'] = 0:
 		act 'Lead the cows home (1:00)':
 			*clr & cla

+ 5 - 5
locations/gadhouse.qsrc

@@ -360,7 +360,7 @@ if $ARGS[0] = 'grandma':
 				'"If you like running, you can take a run on the road leading into the forest. Or you can take a ride on our old bike. I''m pretty sure the bike is in the shed. Make sure to look for it if you''re interested. And if you want to watch your figure, then go to the garden, have some fruit, it''s as healthy as the diet meals you''re eating, if not more healthier."'
 				'"That''s about it my dear granddaughter. Now run along, don''t bother me anymore. My soap opera "Santa Barbara" is about to begin, I don''t want to miss a second of it."'
 
-				act 'Finish':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandma'
 			end
 		end
 		!125e
@@ -376,7 +376,7 @@ if $ARGS[0] = 'grandma':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
 				'You spend some time talking with your grandmother. She''s sometimes difficult to understand. Her nearly toothless mouth makes the pronunciation of words difficult for her. Most of what she says boils down to the same thing, life is much more fun when you''re young!'
 
-				act 'Continue':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandma'
 			end
 		end
 
@@ -443,7 +443,7 @@ if $ARGS[0] = 'grandma':
 					'"Ever since that day the fear I experienced never disappeared, as I''ve felt it through my whole life. I’ll carry on this fear for the remaining days of my life…"'
 				end
 				!125e
-				act 'You thank your grandmother for the story':gt 'gadhouse', 'start'
+				act 'Thank her for the story':gt 'gadhouse', 'grandma'
 			end
 		end
 	end
@@ -493,7 +493,7 @@ if $ARGS[0]='grandpa':
 				'"There''s one more thing... While you''re in the woods, avoid dressing yourself up in fancy clothes. You might damage them. It''s better to dress in more comfortable clothes instead..."'
 				'"Well, I think that''s everything <<$pcs_nickname>>, run along now, and remember what I''ve told you."'
 
-				act 'Finish':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandpa'
 			end
 		end
 
@@ -509,7 +509,7 @@ if $ARGS[0]='grandpa':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 				'Your grandfather stops complaining and smiles at you, he loves telling stories. He has lived a rich and eventful life, and you enjoy listening to his stories and talking to him. He mostly reminisces about his past, and reflects on his earlier life.'
 
-				act 'Continue':gt 'gadhouse', 'start'
+				act 'Continue':gt 'gadhouse', 'grandpa'
 			end
 		end
 	end

+ 10 - 10
locations/grandmahelp.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 		gt 'grandmahelp', 'harvest'
 	else
 		'"There is nothing to do today <<$pcs_nickname>>, take the day off.'
-		act 'Continue':gt 'gadhouse', 'start'
+		act 'Continue':gt 'gadhouse', 'grandma'
 	end
 end
 
@@ -42,7 +42,7 @@ 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
-	act 'Tell her you will do it soon':gt 'gadhouse', 'start'
+	act 'Tell her you will do it soon':gt 'gadhouse', 'grandma'
 	act 'Agree and start cleaning (1:00)':
 		*clr & cla
 		minut += 60
@@ -61,7 +61,7 @@ if $ARGS[0] = 'washclothes':
 	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes?"'
 	
 	grandmaQW['washclothes'] = 1
-	act 'Tell her you will wash them in a little bit':gt 'gadhouse', 'start'
+	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
@@ -88,7 +88,7 @@ if $ARGS[0] = 'feedchickens':
 	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
 	
 	grandmaQW['feed_chickens'] = 1
-	act 'Tell her you will do it in a little while':gt 'gadhouse', 'start'
+	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
 		minut += 10
@@ -105,7 +105,7 @@ if $ARGS[0] = 'milkcows':
 	' "<<$pcs_nickname>>, go to the barn and milk the cows."'
 
 	grandmaQW['milk_cow'] = 1
-	act 'Tell her you will do it in a bit':gt 'gadhouse', 'start'
+	act 'Tell her you will do it in a bit':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		minut += 10
@@ -122,7 +122,7 @@ if $ARGS[0] = 'checkplants':
 	'"<<$pcs_nickname>>, can you please go work in the garden?"'
 
 	grandmaQW['work_garden'] = 1
-	act 'Tell her you will get to it later':gt 'gadhouse', 'start'
+	act 'Tell her you will get to it later':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the garden (0:10)':
 		*clr & cla
 		minut += 10
@@ -139,7 +139,7 @@ if $ARGS[0] = 'waterplants':
 	'"Dear <<$pcs_nickname>>, could you go and water the plants in the garden?"'
 
 	grandmaQW['water_garden'] = 1
-	act 'Tell her you will do it after a while':gt 'gadhouse', 'start'
+	act 'Tell her you will do it after a while':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the garden (0:10)':
 		*clr & cla
 		minut += 10
@@ -157,7 +157,7 @@ if $ARGS[0] = 'harvest':
 		'"<<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
 		
 		grandmaQW['collect_strawberries'] = 1
-		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'start'
+		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
 			minut += 10
@@ -172,7 +172,7 @@ if $ARGS[0] = 'harvest':
 		'"<<$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
-		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'start'
+		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
 			minut += 10
@@ -187,7 +187,7 @@ if $ARGS[0] = 'harvest':
 		'"<<$pcs_nickname>> dear, could you go to the garden today? It''s time to collect the harvest."'
 
 		grandmaQW['harvest_garden'] = 1
-		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'start'
+		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
 			minut += 10

+ 13 - 13
locations/grandpahelp.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 		'"<<$pcs_nickname>>, could you run out to the barn and bring some firewood for the stove?"'
 
 		grandpaQW['fetch_firewood'] = 1
-		act 'Tell him you will go get some in just a bit':gt 'gadhouse', 'start'
+		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
 			if month >= 4 and month <= 10:
@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 		'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
 
 		grandpaQW['feed_horse'] = 1
-		act 'Tell him that you will get to it in a little bit':gt 'gadhouse', 'start'
+		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
 			if month >= 4 and month <= 10:
@@ -62,7 +62,7 @@ if $ARGS[0] = 'start':
 		'"<<$pcs_nickname>>, go to the barn to feed the cows."'
 
 		grandpaQW['feed_cow'] = 1
-		act 'Tell him that you will do it in a little while':gt 'gadhouse', 'start'
+		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
 			if month >= 4 and month <= 10:
@@ -97,7 +97,7 @@ if $ARGS[0] = 'start':
 		'"Okay, grandfather," you replied.'
 
 		grandpaQW['haying_time'] = 1
-		act 'Tell him you will meet him there':gt 'gadhouse', 'start'
+		act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
 		act 'Grab a rake and head to the field (0:40)':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
@@ -131,7 +131,7 @@ if $ARGS[0] = 'start':
 				'"You can take the day off."'
 			end
 		end
-		act 'Continue':gt 'gadhouse', 'start'
+		act 'Continue':gt 'gadhouse', 'grandpa'
 	end
 end
 
@@ -139,7 +139,7 @@ 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
-	act 'Tell him that you''ll do it in a minute':gt 'gadhouse', 'start'
+	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
 		if month >= 4 and month <= 10:
@@ -168,7 +168,7 @@ if $ARGS[0] = 'feedhogs':
 	'"<<$pcs_nickname>>, could you go to the barn and feed the hogs."'
 
 	grandpaQW['feed_boar'] = 1
-	act 'Tell him you will get to it soon':gt 'gadhouse', 'start'
+	act 'Tell him you will get to it soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		if month >= 4 and month <= 10:
@@ -188,7 +188,7 @@ if $ARGS[0] = 'washhorse':
 	'"It''s good weather today. Take Desperado to the river and give him a bath."'
 
 		grandpaQW['horse_river'] = 1
-	act 'Tell him you will do it in a little while':gt 'gadhouse', 'start'
+	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
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -204,7 +204,7 @@ if $ARGS[0] = 'groomhorse':
 	'"Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
 
 	grandpaQW['comb_horse'] = 1
-	act 'Tell him you will do it in a bit':gt 'gadhouse', 'start'
+	act 'Tell him you will do it in a bit':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		if month >= 4 and month <= 10:
@@ -224,7 +224,7 @@ 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
-	act 'Tell him you will do it soon':gt 'gadhouse', 'start'
+	act 'Tell him you will do it soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -244,7 +244,7 @@ if $ARGS[0] = 'grazecows':
 	end
 
 	grandpaQW['graze_cow'] = 1
-	act 'Tell him you will meet him there':gt 'gadhouse', 'start'
+	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:
@@ -269,7 +269,7 @@ 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
-	act 'Tell him you will soon':gt 'gadhouse', 'start'
+	act 'Tell him you will soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
@@ -302,7 +302,7 @@ if $ARGS[0] = 'pickforest':
 		'"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."'
 	end
-	act 'Tell him you will go get some soon':gt 'gadhouse', 'start'
+	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the forest (1:00)':
 		*clr & cla
 		if hour >= 6 and hour < 22: