Merge remote-tracking branch 'netuttki/master'

locations/Komp.qsrc

@@ -21,15 +21,15 @@ if $ARGS[0] = 'start':
 		internet_store = internet
 		internet = 100000
 		act 'Browse the internet':gt 'komp', 'brows'
-	else
+	elseif $loc = 'dachain':
+		internet = 0
+	else	
 		'You have <<internet>> hours of prepaid internet access remaining.'
 		if internet > 0: act 'Browse the internet':gt 'komp', 'brows'
 	end
 
-	act 'Shut your computer down':
-		if $loc = 'shulga_room' or $loc = 'anushapt': internet = internetS
-		gt 'komp', 'fin'
-	end
+	act 'Shut your computer down': gt 'komp', 'fin'
+
 end
 
 if $ARGS[0] = 'brows':
@@ -1845,6 +1845,10 @@ if $ARGS[0] = 'hotornot':
 	end
 end
 
-if $ARGS[0] = 'fin': gt $loc, $metka
+if $ARGS[0] = 'fin': 
+	if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'dachain': internet = internetS
+	gt $loc, $metka
+end
+
 
 --- komp ---------------------------------

locations/dachain.qsrc

@@ -13,6 +13,8 @@ if $args[0] = '':
 	$metkaM = ''
 	$menu_arg = ''
 	menu_off = 0
+	internetS = internet
+
 	killvar '$locclass'
 	*clr & cla
 	gs 'stat'
@@ -30,6 +32,9 @@ if $args[0] = '':
 	*nl
 	'There is a sofa in front of the fireplace, a kitchen alcove opposite the bed and the door to the bathroom next to that.'
 	*nl
+	if komp = 1:'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the table.'
+	*nl
+	
 	if hour >= 6 and hour <= 20 and etoexhib = 11:'Kopashatsya working in the garden, hmm ... maybe sometime <a href="exec:gt ''etoexhib'', ''pos10''">motivate</a> for them to work quicker and smarter.'
 	if hour >= 6 and hour <= 20 and etoexhib = 12:'Leave in <a href="exec:gt ''etoexhib'', ''pos11''">garden in lingerie and robe.</a>'
 	if hour >= 6 and hour <= 20 and etoexhib = 13 and temp ! daystart:'I wonder how to <a href="exec:gt ''etoexhib'', ''pos12''">garden</a>'

locations/din_npc.qsrc

@@ -6,22 +6,24 @@
 ! 3 = St. Petersburg Apt
 
 $go_home = {
-		if curr_home = 1:
-		gt 'pav_residential'
-		elseif curr_home = 2:
-		gt 'gadukino'
-		elseif curr_home = 3:
-		gt 'city_residential'
+		if curr_home = 12:
+			gt 'swampyard', 'start'		
+		elseif $home_location = 'pav_complex':
+			gt 'pav_complex', 'start'
+		else
+			gt $home_location				
 		end
 }
 
 $go_straight_home = {
-		if curr_home = 1:
-		gt 'korrPar'
-		elseif curr_home = 2:
-		gt 'gaddvor'
-		elseif curr_home = 3:
-		gt 'korr'
+		if curr_home = 10:
+			gt 'etoexhib', 'pos40'
+		elseif curr_home = 11:
+			gt 'obroom', 'start'
+		elseif curr_home = 12:
+			gt 'swamphouse', 'start'
+		else
+			gt $home_entrance
 		end
 }
 --- din_npc ---------------------------------

locations/ender.qsrc

@@ -375,15 +375,8 @@ if $ARGS[0] = 'win':
 
 		'You''ve managed to batter one of your attackers face while you broke the others nose. As he spits you can see that his spit is mixed with blood as he can barely hold his hand up to surrender. You quickly run over to them and empty the cash from their pockets and mock them that this should cover you expenses. The attacker quickly rise up and run away in fear.'
 
-		act 'Go home':
-			if curr_home = 1:
-				gt 'pav_residential'
-			elseif curr_home = 2:
-				gt 'gadukino'
-			elseif curr_home = 3:
-				gt 'city_residential'
-			end
-		end
+		act 'Go home':	dynamic $go_home
+
 	elseif fightEnding = 12:
 		zverSlutQW = 1
 		lariskaQwestStart = daystart + 7

locations/gadhouse.qsrc

@@ -93,11 +93,11 @@ if $ARGS[0] = 'start':
 	$menu_arg = ''
 	menu_off = 1
 	$locclass = 'singleroom'
-	curr_home = 2
+
 	display_bb = 1
 	frost = 0
 	mira_temp = rand(1,10)
-
+	home_owned[14] = 1
 	gs 'gadhouse', 'nudity_trouble_limit'
 
 	!! Grandma sends Sveta back to Pavlovsk for school to start
@@ -153,6 +153,7 @@ if $ARGS[0] = 'start':
 	!!Grandma kicks Sveta out for being a whore
 	elseif grandmaQW['nudity_trouble_limit'] = 50 and hour >= 6 and hour < 20:
 		*clr & cla
+		home_owned[14] = 0
 		grandmaQW['help_amount'] = 0
 		grandmaQW['block'] = 1
 		minut += 5

locations/gschool_girls_bathroom.qsrc

@@ -1018,7 +1018,7 @@ if $ARGS[0] = 'caught3':
 		act 'Not the ear':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caughtpr3.jpg"></center>'
-			'She tosses the cigarette between your legs into the toilet, followed by her grabbing your uniform in one hand and your ear with her other hand. She painfully twists your ear and drags you out of the stall, so fast you nearly stumble and fall. "You will learn to respect me and this school, no matter what. Before I am done with you missy you will either be toying the line or begging to be expelled."'
+			'She tosses the cigarette between your legs into the toilet, followed by her grabbing your uniform in one hand and your ear with her other hand. She painfully twists your ear and drags you out of the stall, so fast you nearly stumble and fall. "You will learn to respect me and this school, no matter what. Before I am done with you missy you will either be toeing the line or begging to be expelled."'
 			act 'She''s really pissed':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caughtpr4.jpg"></center>'

locations/korr.qsrc

@@ -63,7 +63,7 @@ minut += 1
 housrA = 1
 housrMir = 0
 elektro += 1
-curr_home = 3
+
 gs 'stat'
 gs 'themes', 'indoors'
 '<center><b><font color="maroon">Corridor</font></b></center>'

locations/korrPar.qsrc

@@ -23,7 +23,7 @@ saunaYouRoom = 0
 boycherdaksex = 0
 minut += 1
 bonusZ = 0
-curr_home = 1
+
 display_bb = 0
 gs 'stat'
 gs 'themes', 'indoors'

locations/obj_din.qsrc

@@ -256,6 +256,8 @@ if $ARGS[0] = 'cur_home':
 	if home_owned[11] = 1: 'Set current home as <a href="exec:gs ''set_home'', 11 & gs ''obj_din'', ''cur_home''">University halls</a>'
 	if home_owned[12] = 1: 'Set current home as <a href="exec:gs ''set_home'', 12 & gs ''obj_din'', ''cur_home''">Hunter''s lodge in Gadukino</a>'
 	if home_owned[13] = 1: 'Set current home as <a href="exec:gs ''set_home'', 13 & gs ''obj_din'', ''cur_home''">Shared apartment in Pavlovsk</a>'
+	if home_owned[14] = 1: 'Set current home as <a href="exec:gs ''set_home'', 14 & gs ''obj_din'', ''cur_home''">Grandparent''s house in Gadukino</a>'
+	
 !!Apostrophe colour correction - KS ''''
 	'</td></tr></table></center>'
 end

locations/parkM.qsrc

@@ -150,9 +150,11 @@ if $ARGS[0] = 'sexrand3':
 	gs 'arousal', 'bj', 15, 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':
-		if curr_home = 1:
+	act 'Leave':		
+		if $home_town = 'pavlovsk'
 			gt 'pav_park', 'start'
+		elseif $home_town = 'oldtown'
+			gt 'parks', 'start'
 		else
 			gt 'city_park', 'start'
 		end
@@ -171,8 +173,10 @@ if $ARGS[0] = 'sexrand4':
 	gs 'cum_call', '', $lover[lover_number], 1
 	gs 'stat'
 	act 'Leave':
-		if curr_home = 1:
+		if $home_town = 'pavlovsk'
 			gt 'pav_park', 'start'
+		elseif $home_town = 'oldtown'
+			gt 'parks', 'start'
 		else
 			gt 'city_park', 'start'
 		end

locations/pav_shared_apt.qsrc

@@ -267,6 +267,7 @@ if $ARGS[0] = 'start':
 				'You do not have enough money to pay the rest of the rent in cash, even if you wanted to. Guess you''ll have to find a new living place...'
 				rentPaid = 0
 				pavSharedAptEnabled = 0
+				home_owned[13] = 0
 			end
 		end
 	end
@@ -313,6 +314,7 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/revenge/crying.jpg"></center>'
 		'You''ve been kicked out of the apartment due to having children.'
 		pavSharedAptEnabled = 0
+		home_owner[13] = 0
 		act 'Leave':gt 'pav_complex', 'start'
 	end
 end
@@ -327,6 +329,7 @@ if $ARGS[0] = 'payCash':
 		money -= cash
 		rentPaid = 1
 		pavSharedAptEnabled = 1
+		home_owned[13] = 1
 	else
 		'You do not have enough money to pay it.'
 	end
@@ -438,9 +441,9 @@ if $ARGS[0] = 'intro':
 		'<font color=#<<$nd_font>>>"As <<$sp_name>> told you, we could decrease your rent if you would do some homekeeping stuff we really suck at. But only if you want, of course."</font>'
 		'<font color=#<<$sp_font>>>"So what do you say <<$pcs_firstname>>?"</font>'
 		act 'Say that you changed your mind about this':pavIntroStep = 40 & gt 'pav_shared_apt', 'intro'
-		act 'Say you will pay the rent the normal way':pavSharedAptEnabled = 1 & pavIntroStep = 10 & gt 'pav_shared_apt', 'intro'
-		act 'Say you don''t mind doing the homekeeping stuff':pavSharedAptEnabled = 1 & pavIntroStep = 20 & gt 'pav_shared_apt', 'intro'
-		act 'Say you don''t mind anything':pavSharedAptEnabled = 1 & pavIntroStep = 30 & gt 'pav_shared_apt', 'intro'
+		act 'Say you will pay the rent the normal way':pavSharedAptEnabled = 1 & home_owned[13] = 1 & pavIntroStep = 10 & gt 'pav_shared_apt', 'intro'
+		act 'Say you don''t mind doing the homekeeping stuff':pavSharedAptEnabled = 1 & home_owned[13] = 1 & pavIntroStep = 20 & gt 'pav_shared_apt', 'intro'
+		act 'Say you don''t mind anything':pavSharedAptEnabled = 1 & home_owned[13] = 1 & pavIntroStep = 30 & gt 'pav_shared_apt', 'intro'
 	elseif pavIntroStep = 10:
 		minut += 2
 		'<font color=#<<$sp_font>>>"Fine. So the rest of this week you have for free, but you need to prepay the next week. OK?"</font>'

locations/set_home.qsrc

@@ -1,45 +1,76 @@
 # set_home
 
-home_cur = ARGS[0]
-if home_cur = 1:
+curr_home = ARGS[0]
+if curr_home = 1:
 	$home_name = 'City residential apartment'
 	$home_town = 'city'
-elseif home_cur = 2:
+	$home_location = 'city_residential'
+	$hone_entrance = 'korr'
+elseif curr_home = 2:
 	$home_name = 'Parent''s home in Pavlovsk'
 	$home_town = 'pavlovsk'
-elseif home_cur = 3:
+	$home_location = 'pav_complex'
+	$home_entrance = 'korrPar'
+elseif curr_home = 3:
 	$home_name = 'My cottage in the cooperative farm'
 	$home_town = 'city'
-elseif home_cur = 4:
+	$home_location = 'dachamy'
+	$home_entrance = 'dachamy'
+elseif curr_home = 4:
 	$home_name = 'Old town apartment'
-	$home_town = 'city'
-elseif home_cur = 5:
+	$home_town = 'oldtown'
+	$home_location = 'liames'
+	$home_entrance = 'koor2x'
+elseif curr_home = 5:
 	$home_name = 'My mansion'
 	$home_town = 'city'
-elseif home_cur = 6:
+	$home_location = 'youplace'
+	$home_entrance = 'ymans'
+elseif curr_home = 6:
 	$home_name = 'My hotel room in Pavlovsk'
 	$home_town = 'pavlovsk'
-elseif home_cur = 7:
+	$home_location = 'pav_train'
+	$home_entrance = 'HotelHole'
+elseif curr_home = 7:
 	$home_name = 'Nicholas'' Apartment'
 	$home_town = 'city'
-elseif home_cur = 8:
+	$home_location = 'city_center'
+	$home_entrance = 'nichBedroomServant'
+elseif curr_home = 8:
 	$home_name = 'Niko''s apartment'
 	$home_town = 'pavlovsk'
-elseif home_cur = 9:
+	$home_location = 'pav_residential'
+	$home_entrance = 'pav_residential'
+elseif curr_home = 9:
 	$home_name = 'Uncle Sergey''s apartment'
 	$home_town = 'pavlovsk'
-elseif home_cur = 10:
+	$home_location = 'pav_complex'
+	$home_entrance = 'shulgahall'
+elseif curr_home = 10:
 	$home_name = 'Lyceum school'
 	$home_town = 'pavlovsk'
-elseif home_cur = 11:
+	$home_location = 'pav_commercial'
+	$home_entrance = 'etoexhib'
+elseif curr_home = 11:
 	$home_name = 'University halls'
 	$home_town = 'city'
-elseif home_cur = 12:
+	$home_location = 'city_island'
+	$home_entrance = 'obroom'
+elseif curr_home = 12:
 	$home_name = 'Hunter''s lodge in Gadukino'
 	$home_town = 'gadukino'
-elseif home_cur = 13:
+	$home_location = 'swampyard'
+	$home_entrance = 'swamphouse'
+elseif curr_home = 13:
 	$home_name = 'Shared apartment in Pavlovsk'
 	$home_town = 'pavlovsk'
+	$home_location = 'pav_complex'
+	$home_entrance = 'korrPar'
+elseif curr_home = 14:
+	$home_name = 'Grandparent''s house in Gadukino'
+	$home_town = 'gadukino'
+	$home_location = 'gaddvor'
+	$hone_entrance = 'gaddvor'
 end
 
 --- set_home ---------------------------------

locations/sexm.qsrc

@@ -150,41 +150,20 @@ if $ARGS[0] = 'start':
 					gs 'lover', 'remove', lover_number
 					'"What, you are married! You didn''t think to say anything earlier? I thought I loved you, you bitch!" he shouts and then runs away in tears.'
 
-					act 'Go to your apartment':
-						if curr_home = 1:
-							gt 'korrPar'
-						elseif curr_home = 2:
-							gt 'gadukino'
-						elseif curr_home = 3:
-							gt 'korr'
-						end
-					end
+					act 'Go to your apartment': dynamic $go_straight_home
+
 				elseif haraklover[lover_number] = 1:
 					'"Well then, see you, I''ll call you," he said quietly and left.'
 
-					act 'Go to your apartment':
-						if curr_home = 1:
-							gt 'korrPar'
-						elseif curr_home = 2:
-							gt 'gadukino'
-						elseif curr_home = 3:
-							gt 'korr'
-						end
-					end
+					act 'Go to your apartment': dynamic $go_straight_home
+
 				elseif haraklover[lover_number] = 2:
 					'"If your husband is in the apartment, maybe you can climb a little higher, perhaps up to the attic?" he says, with a sly grin.'
 
 					act 'Refuse':
 						loverrelation[lover_number] -= 1
-						if curr_home = 1:
-							gt 'korrPar'
-						elseif curr_home = 2:
-							gt 'gadukino'
-						elseif curr_home = 3:
-							gt 'korr'
-						end
+						dynamic $go_straight_home
 					end
-
 					act 'Agree':
 						loverrelation[lover_number] += 1
 						boycherdaksex = 1
@@ -481,13 +460,7 @@ if $ARGS[0] = 'strapon':
 	act 'Wipe your hands and walk him to the door':
 		cla
 		gs 'arousal', 'end'
-		if curr_home = 1:
-			gt 'korrPar'
-		elseif curr_home = 2:
-			gt 'gadukino'
-		elseif curr_home = 3:
-			gt 'korr'
-		end
+		dynamic $go_straight_home
 	end
 end
 
@@ -654,13 +627,7 @@ if $ARGS[0] = 'startPod':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				gs 'lover', 'remove', lover_number
-				if curr_home = 1:
-					gt 'korrPar'
-				elseif curr_home = 2:
-					gt 'gadukino'
-				elseif curr_home = 3:
-					gt 'korr'
-				end
+				dynamic $go_straight_home		
 			end
 		else
 			act 'Fuck off! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -677,13 +644,7 @@ if $ARGS[0] = 'startPod':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				gs 'lover', 'remove', lover_number
-				if curr_home = 1:
-					gt 'korrPar'
-				elseif curr_home = 2:
-					gt 'gadukino'
-				elseif curr_home = 3:
-					gt 'korr'
-				end
+				dynamic $go_straight_home
 			end
 		else
 			act 'Fuck off! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -711,13 +672,7 @@ if $ARGS[0] = 'doggy':
 
 	act 'Collect clothes and leave':
 		cla
-		if curr_home = 1:
-			gt 'korrPar'
-		elseif curr_home = 2:
-			gt 'gadukino'
-		elseif curr_home = 3:
-			gt 'korr'
-		end
+		dynamic $go_straight_home
 	end
 end
 
@@ -754,13 +709,7 @@ if $ARGS[0] = 'blow':
 			act 'Leave':
 				cla
 				gs 'arousal', 'end'
-				if curr_home = 1:
-					gt 'korrPar'
-				elseif curr_home = 2:
-					gt 'gadukino'
-				elseif curr_home = 3:
-					gt 'korr'
-				end
+				dynamic $go_straight_home
 			end
 		end
 		gs 'willpower', 'swallow', 'resist', 'medium'
@@ -800,13 +749,7 @@ if $ARGS[0] = 'blow':
 				act 'Leave':
 					cla
 					gs 'arousal', 'end'
-					if curr_home = 1:
-						gt 'korrPar'
-					elseif curr_home = 2:
-						gt 'gadukino'
-					elseif curr_home = 3:
-						gt 'korr'
-					end
+					dynamic $go_straight_home
 				end
 			end
 		else
@@ -835,13 +778,7 @@ if $ARGS[0] = 'blow':
 		act 'Wipe your hands and walk away':
 			cla
 			gs 'arousal', 'end'
-			if curr_home = 1:
-				gt 'korrPar'
-			elseif curr_home = 2:
-				gt 'gadukino'
-			elseif curr_home = 3:
-				gt 'korr'
-			end
+			dynamic $go_straight_home
 		end
 	end
 end
@@ -949,13 +886,7 @@ if $ARGS[0] = 'gangbang':
 			act 'Leave':
 				cla
 				gs 'arousal', 'end'
-				if curr_home = 1:
-					gt 'korrPar'
-				elseif curr_home = 2:
-					gt 'gadukino'
-				elseif curr_home = 3:
-					gt 'korr'
-				end
+				dynamic $go_straight_home
 			end
 		end
 	end
@@ -998,27 +929,13 @@ if $ARGS[0] = 'popala':
 				gs 'lover', 'remove', lover_number
 				'"Wait,you''re married! You deceived me even though I loved you. Goodbye!" your guy shouts at you and runs after your husband.'
 
-				act 'Leave':
-					if curr_home = 1:
-						gt 'korrPar'
-					elseif curr_home = 2:
-						gt 'gadukino'
-					elseif curr_home = 3:
-						gt 'korr'
-					end
-				end
+				act 'Leave':  dynamic $go_straight_home
+
 			elseif haraklover[lover_number] = 1:
 				'"Well, I see you are not only for me, so perhaps I''ll go, but if you want I can stay and comfort you " said <<$loverdesc[lover_number]>>'
 
-				act 'Let him go':
-					if curr_home = 1:
-						gt 'korrPar'
-					elseif curr_home = 2:
-						gt 'gadukino'
-					elseif curr_home = 3:
-						gt 'korr'
-					end
-				end
+				act 'Let him go': dynamic $go_straight_home
+
 
 				act 'Let him stay':
 					loverrelation[lover_number] += 1
@@ -1033,13 +950,7 @@ if $ARGS[0] = 'popala':
 
 				act 'Refuse':
 					loverrelation[lover_number] -= 1
-					if curr_home = 1:
-						gt 'korrPar'
-					elseif curr_home = 2:
-						gt 'gadukino'
-					elseif curr_home = 3:
-						gt 'korr'
-					end
+					dynamic $go_straight_home
 				end
 
 				act 'Continue':
@@ -1065,15 +976,8 @@ if $ARGS[0] = 'popala':
 				'"So you''re married! you deceived me even though I loved you. You are a despicable liar. Goodbye!" your guy shouted and ran out of the room.'
 				'"He''s right, you''re a liar, and you do not deserve me, you''re a fallen woman, I don''t want to see you again" You husband burst into tears and ran out to follow the guy.'
 
-				act 'Leave':
-					if curr_home = 1:
-						gt 'korrPar'
-					elseif curr_home = 2:
-						gt 'gadukino'
-					elseif curr_home = 3:
-						gt 'korr'
-					end
-				end
+				act 'Leave': dynamic $go_straight_home
+
 			elseif haraklover[lover_number] = 1:
 				'<<$loverdesc[lover_number]>> stood by you and watched as you fucked your husband, "Wow, you seem to really enjoy sex with your husband. This really can''t compare to what we did. Well maybe you can use your mouth and I can still be useful" he said.'
 				'"Sure, come on." perked <<$husName>> "Dear lie down on the bed"'
@@ -1142,27 +1046,12 @@ if $ARGS[0] = 'popala':
 				gs 'lover', 'remove', lover_number
 				'"Wait,you''re married!, you deceived me even though I loved you. Goodbye!" your guy shouted and ran out of the room.'
 
-				act 'Leave':
-					if curr_home = 1:
-						gt 'korrPar'
-					elseif curr_home = 2:
-						gt 'gadukino'
-					elseif curr_home = 3:
-						gt 'korr'
-					end
-				end
+				act 'Leave': dynamic $go_straight_home
+				
 			elseif haraklover[lover_number] = 1:
 				'"Well, I see am not the only one for you, so perhaps I''ll go. But if you want I can stay and comfort you " said <<$loverdesc[lover_number]>>'
 
-				act 'Let him go':
-					if curr_home = 1:
-						gt 'korrPar'
-					elseif curr_home = 2:
-						gt 'gadukino'
-					elseif curr_home = 3:
-						gt 'korr'
-					end
-				end
+				act 'Let him go': dynamic $go_straight_home
 
 				act 'Let him stay':
 					loverrelation[lover_number] += 1
@@ -1177,13 +1066,7 @@ if $ARGS[0] = 'popala':
 
 				act 'Refuse':
 					loverrelation[lover_number] -= 1
-					if curr_home = 1:
-						gt 'korrPar'
-					elseif curr_home = 2:
-						gt 'gadukino'
-					elseif curr_home = 3:
-						gt 'korr'
-					end
+					dynamic $go_straight_home
 				end
 
 				act 'Continue':
@@ -1215,13 +1098,7 @@ if $ARGS[0] = 'popala':
 					
 					act 'Leave':
 						gs 'arousal', 'end'
-						if curr_home = 1:
-							gt 'korrPar'
-						elseif curr_home = 2:
-							gt 'gadukino'
-						elseif curr_home = 3:
-							gt 'korr'
-						end
+						dynamic $go_straight_home
 					end
 				end
 			elseif haraklover[lover_number] = 1:
@@ -1294,15 +1171,8 @@ if $ARGS[0] = 'popala':
 			'while getting up you could see in the corner of the room your husband giving blow after blow to your lover, and <<$loverdesc[lover_number]>> was trying hard to escape out the door, finally he succeeds and he runs out of the apartment at a breakneck pace.'
 			'<<$husName>> looked at you, "Here ... you ... whore ... cock ... and pussy ... and ass ... and in your mouth." he says putting a strong emphasis on every word. At the end of the last word, he kicks you in the face, rendering you unconscious. You woke up two hours later. Your husband was gone and so was all of his stuff. Some of your stuff was missing too'
 
-			act 'Leave':
-				if curr_home = 1:
-					gt 'korrPar'
-				elseif curr_home = 2:
-					gt 'gadukino'
-				elseif curr_home = 3:
-					gt 'korr'
-				end
-			end
+			act 'Leave': dynamic $go_straight_home
+
 		elseif izvratH = 1:
 			gs 'lover', 'remove', lover_number
 			houseslut += 1
@@ -1328,13 +1198,7 @@ if $ARGS[0] = 'endsex':
 
 	boycherdaksex = 0
 	gs 'arousal', 'end'
-	if curr_home = 1:
-		gt 'korrPar'
-	elseif curr_home = 2:
-		gt 'gadukino'
-	elseif curr_home = 3:
-		gt 'korr'
-	end
+	dynamic $go_straight_home
 end
 
 --- sexm ---------------------------------