Browse Source

[fixed] inconsistent return location for gadhouse dynamics.
[changed] multiple gotos for Gadhouse, to all use gt 'gadhouse', 'start' consistently.
[changed] Gadhouse locatrion to lowercase.

3xpurt 5 years ago
parent
commit
0964452349

+ 1 - 1
glife.qproj

@@ -504,7 +504,7 @@
 		<Location name="farmhomeride"/>
 	</Folder>
 	<Folder name="Gadyukino">
-		<Location name="Gadhouse"/>
+		<Location name="gadhouse"/>
 		<Location name="grandmahelp"/>
 		<Location name="grandpahelp"/>
 		<Location name="Gaddvor"/>

+ 1 - 1
locations/Gaddvor.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0]='':
 
 
 	if StoryLine = 1:
-		act 'Enter your grandparents'' house':minut += 1 & gt 'Gadhouse'
+		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
 		act 'Enter the banya':minut += 1 & gt 'Gadbana'
 	end
 

+ 21 - 21
locations/Gadhouse.qsrc

@@ -1,9 +1,9 @@
 # Gadhouse
 
-if $ARGS[0]='' or $ARGS[0] = 'Start':
+if $ARGS[0] = 'start':
 	CLOSE ALL
 	$location_type = 'indoors'
-	$metka = ''
+	$metka = 'start'
 	$loc = 'Gadhouse'
 	$menu_loc = 'Gadhouse'
 	$menu_arg = ''
@@ -41,7 +41,7 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 			grandmahelp = 0
 			gs 'stat'
 		end
-		act 'Further': gt 'Gadhouse', 'Start'
+		act 'Further': gt 'gadhouse', 'start'
 
 	elseif go_in_boletus = 1 and boletus >= grandpa_boletus and hour >= 6 and hour < 22:
 		*clr & cla
@@ -59,7 +59,7 @@ if $ARGS[0]='' or $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 'Further': grandpa_boletus = 0 & gt 'Gadhouse', 'Start'
+		act 'Further': grandpa_boletus = 0 & gt 'gadhouse', 'start'
 
 	elseif go_in_boletus_bilberry = 1 and boletus >= grandpa_boletus and bilberry >= grandpa_bilberry and hour >= 6 and hour < 22:
 		*clr & cla
@@ -78,7 +78,7 @@ if $ARGS[0]='' or $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 'Further': grandpa_boletus = 0 & grandpa_bilberry = 0 & gt 'Gadhouse', 'Start'
+		act 'Further': grandpa_boletus = 0 & grandpa_bilberry = 0 & gt 'gadhouse', 'start'
 
 	elseif go_in_bilberry = 1 and bilberry >= grandpa_bilberry and hour >= 6 and hour < 22:
 		*clr & cla
@@ -96,7 +96,7 @@ if $ARGS[0]='' or $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 'Further': grandpa_bilberry = 0 & gt 'Gadhouse', 'Start'
+		act 'Further': grandpa_bilberry = 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
@@ -109,7 +109,7 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 		'You notice Mira coming towards your grandparents home.'
 		'You step out on the porch and greet Mira. She replies "Hi <<$pcs_nickname>>, I was really bored being all alone at home. Do you want to do something?"'
 
-		act 'Further':gt'Gadhouse', 'Start'
+		act 'Further':gt 'gadhouse', 'start'
 
 	else
 		gt 'Gadhouse', 'Main'
@@ -295,7 +295,7 @@ if $ARGS[0] = 'grandma':
 		'Grandma looks a little shocked but its nothing she hasn''t seen before.'
 		'"Go put some clothes on dear, you''ll give your poor grandpa a heart attack if he sees you."'
 
-		act 'Maybe you should get dressed before talking to her':gt 'Gadhouse', 'Start'
+		act 'Maybe you should get dressed before talking to her':gt 'gadhouse', 'start'
 	else
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
 		
@@ -321,7 +321,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 'Finish':gt 'gadhouse', 'start'
 			end
 		end
 		!125e
@@ -337,7 +337,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', 'start'
 			end
 		end
 
@@ -404,11 +404,11 @@ 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 'You thank your grandmother for the story':gt 'gadhouse', 'start'
 			end
 		end
 
-		act 'Leave her alone':gt 'Gadhouse', 'Start'
+		act 'Leave her alone':gt 'gadhouse', 'start'
 	end
 end
 
@@ -425,7 +425,7 @@ if $ARGS[0]='grandpa':
 		'Grandpa looks shocked but it doesn''t stop him from having a good look at you.'
 		'"My God <<$pcs_nickname>>! Are you trying to give me a heart attack? Go and put some clothes on!"'
 
-		act 'Maybe you should get dressed before talking to him':gt 'Gadhouse', 'Start'
+		act 'Maybe you should get dressed before talking to him':gt 'gadhouse', 'start'
 	else
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 		
@@ -437,7 +437,7 @@ if $ARGS[0]='grandpa':
 			'You promise to bring grandpa <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries.'
 		end
 
-		act 'Leave him alone':gt 'Gadhouse', 'Start'
+		act 'Leave him alone':gt 'gadhouse', 'start'
 		
 		if grandpahelpday ! daystart:act 'Offer to help':grandpahelpday = daystart & gt'grandpahelp', 'start'
 		if grandpatalkforest = 0:
@@ -455,7 +455,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 'Finish':gt 'gadhouse', 'start'
 			end
 		end
 		
@@ -471,7 +471,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', 'start'
 			end
 		end
 	end
@@ -495,7 +495,7 @@ if $ARGS[0]='villagecat':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat1.jpg"></center>'
 		'You gently pet Boniface, giving him a good scratch behind the ears. You hear him start to purr. As soon as you stop scratching him, the purring stops too. That lazy bastard... he''s living the good life!'
 
-		act 'Continue':minut += 2 & gt 'Gadhouse', 'Start'
+		act 'Continue':minut += 2 & gt 'gadhouse', 'start'
 	end
 
 	if feedcat = 1:
@@ -506,7 +506,7 @@ if $ARGS[0]='villagecat':
 			feedcat = 2
 			'<center><video autoplay loop src="images/locations/gadukino/grandparents/feedboniface.mp4"></video></center>'
 			'When Boniface sees you moving towards the cupboard, he jumps down off of the table and runs to his food dish. It is obvious that he feels that you are moving far too slowly and rattles his bowl to make sure you understand that he is starving while you dawdle.'
-			act 'Continue': gt 'Gadhouse', 'Start'
+			act 'Continue': gt 'gadhouse', 'start'
 		end
 	end
 
@@ -517,18 +517,18 @@ if $ARGS[0]='villagecat':
 				minut += 10
 				gs 'stat'
 				'You open the door for Boniface who saunters around you only to stop in the doorway as he becomes aware that it is raining out. He glares up at you as if the rain was your fault. He stares out into the wet for another moment then sedately turns around and goes back to his box.'
-				act 'Continue': gt 'Gadhouse', 'Start'
+				act 'Continue': gt 'gadhouse', 'start'
 			else
 				*clr & cla
 				minut +=10
 				gs 'stat'
 				catout = 2
 				'You open the door for Boniface who saunters around you only to stop in the doorway as he stops to consider if he really wants to go outside. After considering all the pros and cons, he finally decides to go out.'
-				act 'Continue': gt 'Gadhouse', 'Start'
+				act 'Continue': gt 'gadhouse', 'start'
 			end
 		end
 	end
-	act 'Leave Boniface alone':minut += 2 & gt 'Gadhouse', 'Start'
+	act 'Leave Boniface alone':minut += 2 & gt 'gadhouse', 'start'
 end
 
 if $ARGS[0] = 'intro':

+ 8 - 8
locations/Miroslava.qsrc

@@ -534,7 +534,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 
 					act'Go home':
 						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):
-							minut += 15 & gt'Gadhouse'
+							minut += 15 & gt 'gadhouse', 'start'
 						else
 							*clr & cla
 							minut += 5
@@ -544,7 +544,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/dressbch.jpg"></center>'
 							'You changed into your regular clothes and went home with Mira.'
 
-							act 'Continue': minut += 15 & gt'Gadhouse'
+							act 'Continue': minut += 15 & gt 'gadhouse', 'start'
 						end
 					end
 				end
@@ -561,7 +561,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_tv'+rand(1,12)+'.jpg"></center>'
 					'You and Mira watch TV for an hour.'
 
-					act'Continue':gt'Gadhouse'
+					act'Continue':gt 'gadhouse', 'start'
 				end
 			end
 
@@ -594,7 +594,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					gs 'Miroslava', 'miraclothes'
 					'You say goodbye to Mira, and she went home.'
 
-					act 'Walk back home':gt'Gadhouse'
+					act 'Walk back home':gt 'gadhouse', 'start'
 				end
 			end
 		end
@@ -616,7 +616,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						mira_guest = 1
 						minut += 15
 						npc_rel['A60'] += 1
-						gt 'Gadhouse'
+						gt 'gadhouse', 'start'
 					else
 						*clr & cla
 						npc_rel['A60'] += 1
@@ -629,7 +629,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/river/dressbch.jpg"></center>'
 						'You change into your clothes and go home with Mira.'
 
-						act 'Continue': gt'Gadhouse'
+						act 'Continue': gt'Gadhouse', 'start'
 					end
 				end
 
@@ -662,7 +662,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_tv'+rand(1,12)+'.jpg"></center>'
 					'You watch TV with Mira for an hour.'
 
-					act'Continue':gt'Gadhouse'
+					act'Continue':gt 'gadhouse', 'start'
 				end
 
 				act'Refuse':
@@ -1181,7 +1181,7 @@ if $ARGS[0] = 'Leave':
 	elseif MiraLoc = 3:
 		gt 'gadforest', '1'
 	elseif MiraLoc = 6:
-		gt 'Gadhouse'
+		gt 'gadhouse', 'start'
 	elseif MiraLoc = 7:
 		gt 'Gaddvor'
 	elseif MiraLoc = 43:

+ 1 - 1
locations/MiroslavaHome.qsrc

@@ -190,7 +190,7 @@ if $ARGS[0] = 'mirabrother':
 														'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto8.jpg"></center>'
 														'After a couple of minutes you feel his warm sticky cum hit the back of your throat and being to swallow it all down. Mira''s brother stands still for a minute, his eyes closed in bliss. Finally he takes his cock out of your mouth, zips up pants, sits on a motorcycle and drives you back to the village...'
 
-														act 'Go back to your grandparents house': gt 'Gadhouse'
+														act 'Go back to your grandparents house': gt 'gadhouse', 'start'
 													end
 												end
 											end

+ 1 - 1
locations/famdorfride.qsrc

@@ -7,7 +7,7 @@ minut += 60
 gs 'stat'
 'When the clock strikes noon, your stepfather goes to get the Volga out of its garage. A few minutes later he arrives at your house and you and your mother get in. You quietly sit in the back of the car, watching the surroundings zip by. After roughly an hour you reach the village of Gadukino, where your grandparents live.'
 
-act 'Enter your grandparents'' house':gt 'Gadhouse'
+act 'Enter your grandparents'' house':gt 'gadhouse', 'start'
 
 --- famdorfride ---------------------------------
 

+ 2 - 2
locations/farmhomeride.qsrc

@@ -5,7 +5,7 @@ onceridePerDay=daystart
 indorf = 0
 if month = 6 or month = 7 or month = 8:
 '<<$npc_nickname[''A29'']>> asks you "Well, <<$pcs_nickname>>, do you want to come home with us or spend summer in the village?"'
-     act'Go home with your parents':
+	 act'Go home with your parents':
 		*clr & cla
 		if hour < 20: hour = 20 & minut = 0
 		minut += 60
@@ -13,7 +13,7 @@ if month = 6 or month = 7 or month = 8:
 		'You leave the village by the Volga River with your family and an hour later you have returned home in Pavlovsk.'
 		act 'Go home': gt'korrPar'
 	end
-	act'Stay in village':gt'Gadhouse'
+	act'Stay in village':gt 'gadhouse', 'start'
 else
 	if hour < 20: hour = 20 & minut = 0
 	gs 'stat'

+ 1 - 1
locations/gadforestlost.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'forestrescue':
 	if $clothingworntype ! 'nude' or swamp_clothes = 0:
 		'You can''t wait to get back to your grandparents house and have a bath and a nice hot meal.'
 
-		act 'To your grandparents house':gt'Gadhouse'
+		act 'To your grandparents house':gt 'gadhouse', 'start'
 	elseif $clothingworntype = 'nude' or swamp_clothes = 1:
 		'The ranger looks you up and down and you feel like he is about to ask you something but he decides against it.'
 		'You remember you left your clothes by the edge of the woods and ask the ranger to take you there instead.'

+ 4 - 4
locations/gadriver.qsrc

@@ -1178,7 +1178,7 @@ if $ARGS[0] = 'fishing':
 					'As soon as you enter the house, Boniface immediately jumps down to the floor and twines around your feet. The furry beast starts yowling very loudly and pawing at your legs. He has obviously detected the smell of fresh fish. You treat Boniface to a small fish and within a few minutes all that remains is a pile of fish bones.'
 					if fish >0: fish = 0 & 'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
 
-					act 'Finish': gt 'Gadhouse'
+					act 'Finish': gt 'gadhouse', 'start'
 				end
 				act 'Give the fish to your grandmother':
 					cla
@@ -1187,7 +1187,7 @@ if $ARGS[0] = 'fishing':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/givefish.jpg"></center>'
 					'You try to give the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
 
-					act 'Finish': gt 'Gadhouse'
+					act 'Finish': gt 'gadhouse', 'start'
 				end
 			else
 				act 'Leave':gt $loc, $metka
@@ -1240,7 +1240,7 @@ if $ARGS[0] = 'fishing':
 				'As soon as you enter the house, Boniface immediately jumps down to the floor and twines around your feet. The furry beast starts yowling very loudly and pawing at your legs. He has obviously detected the smell of fresh fish. You treat Boniface to a small fish and within a few minutes all that remains is a pile of fish bones.'
 				if fish >0: fish = 0 & 'You try to give the rest of the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
 
-				act 'Finish': gt 'Gadhouse'
+				act 'Finish': gt 'gadhouse', 'start'
 			end
 			act 'Give the fish to your grandmother':
 				cla
@@ -1249,7 +1249,7 @@ if $ARGS[0] = 'fishing':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/givefish.jpg"></center>'
 				'You try to give the fish to your grandmother, but she takes one look at the intact fish and point at your grandfather. He sighs heavily then takes the fish outside to clean them.'
 
-				act 'Finish': gt 'Gadhouse'
+				act 'Finish': gt 'gadhouse', 'start'
 			end
 		else
 			act 'Leave':gt $loc, $metka

+ 2 - 2
locations/gadukino_event.qsrc

@@ -1005,7 +1005,7 @@ if $ARGS[0] = 'go_home':
 					staygad = daystart
 					gadstay = 1 & !Flag to monthly pay scene
 					indorf = 0
-					gt 'gadhouse'
+					gt 'gadhouse', 'start'
 				end
 				act 'Go home': gs 'gadukino_event','go_home_ender'
 			else
@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'to_gadukino':
 	minut += rand(15,25)
 	gs 'stat'
 	'You get into the Lada with the rest of your family and before you know, you''ve arrived in Gadukino. Your grandparents have lived here for forty years.'
-	act 'Go into the house': gt 'gadhouse'
+	act 'Go into the house': gt 'gadhouse', 'start'
 end
 
 !from 1.2.5, [zz_func]

+ 2 - 2
locations/grandmahelp.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 		gt 'grandmahelp', 'harvest'
 	else
 		'"There is nothing to do today <<$pcs_nickname>>, take a day off.'
-		act 'Go':gt'Gadhouse'			
+		act 'Go':gt 'gadhouse', 'start'
 	end
 end
 
@@ -50,7 +50,7 @@ if $ARGS[0] = 'cleanfloor':
 		'<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'
+		act 'Go':gt 'gadhouse', 'start'
 	end
 end
 

+ 3 - 3
locations/grandpahelp.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 			grandmahelp += 1
 			gs'stat'
 
-			act 'Go':gt'Gadhouse'
+			act 'Go':gt 'gadhouse', 'start'
 		end
 	elseif grandpahelping = 1:
 		'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
@@ -125,7 +125,7 @@ if $ARGS[0] = 'start':
 				'"You can take the day off."'
 			end
 		end
-		act 'Leave':gt'Gadhouse'
+		act 'Leave':gt 'gadhouse', 'start'
 	end
 end
 
@@ -287,7 +287,7 @@ if $ARGS[0] = 'pickforest':
 		'"How much should I pick, grandpa?"'
 		'"<<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries will be enough," grandfather replies. "Just don`t get lost."'
 	end
-	act 'Go':gt'Gadhouse'
+	act 'Go':gt 'gadhouse', 'start'
 end
 
 --- grandpahelp ---------------------------------

+ 3 - 3
locations/grigory.qsrc

@@ -449,7 +449,7 @@ if $ARGS[0] = 'flower3':
 	'"But how do I find out who did it? Did you maybe see someone in the yard this morning?"'
 	'Grandfather barks a little laugh, "Even if I knew, and I don''t, I wouldnt tell you," He shakes his head, "Got to make the man work for it."'
 	'Waving dismissively, you know grandfather is done talking about it.'
-	act 'Continue':gt 'Gadhouse', 'Start'
+	act 'Continue':gt 'gadhouse', 'start'
 end
 
 if $ARGS[0] = 'flower4':
@@ -461,7 +461,7 @@ if $ARGS[0] = 'flower4':
 	'"But I don''t know who it is," You say, feeling a little overwhelmed.'
 	'"But that is the magic of it!" Grandmother says, clearly overjoyed by the situation. She leans forward, kissing your cheek, "Whoever this boy is, he will reveal himself if you just let him."'
 	'Not feeling much better, you thank her.'
-	act 'Continue':gt 'Gadhouse', 'Start'
+	act 'Continue':gt 'gadhouse', 'start'
 end
 
 if $ARGS[0] = 'flower5':
@@ -1021,7 +1021,7 @@ if $ARGS[0] = 'romantic_event':
 				'You''re unable to hide a little smile, "Until next time Grigory."'
 				'Turning on his heel, he starts to wander back towards the town''s center.'
 
-				act 'Continue':gt 'Gadhouse', 'Start'
+				act 'Continue':gt 'gadhouse', 'start'
 			end
 
 			act 'Grigory''s Home':

+ 1 - 1
locations/preCSB.qsrc

@@ -603,7 +603,7 @@ if $ARGS[0] = 'game_start':
 				
 				act 'Start your new life': 
 					if $starting_location = 'pavlovsk': gt 'bedrPar'
-					if $starting_location = 'gadukino': gt 'gadhouse'
+					if $starting_location = 'gadukino': gt 'gadhouse', 'start'
 				end
 			end
 		end