[change] Renamed street to city_residential

locations/BDSM_Club.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'Hos':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/hosjaika.jpg"></center>'
 	'After a few visits to your Mistress you are getting a little closer. Seeing her this evening, you catch her a little tipsy. Instead of already familiar perversions, you just sit in the kitchen and drink wine, talking about life. In conversation, the Mistress mentions a BDSM club. Sounds interesting, you and the Mistress pour glass after glass and slowly you gather details from her. Turns out, the city has an elite BDSM-club, and the missus is in it. After much persuasion, she gives you a business card – a piece of cardboard with three-dimensional logo without inscriptions, and explains how to get to the Club.'
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'start':

locations/BDsex.qsrc

@@ -494,7 +494,7 @@ if $ARGS[0] = 'end':
 
 	if BDcafe = 1:
 		BDcafe = 0
-		act 'Leave':gt 'street'
+		act 'Leave':gt 'city_residential'
 	elseif Yuri_sex = 1:
 		Yuri_sex = 0
 		cumspclnt = 4

locations/BurgerTip.qsrc

@@ -372,7 +372,7 @@ if $ARGS[0] = 'work':
 								'Anatoly is furious: "How? <<$pcs_nickname>>? You''re just a common whore?" If that''s the case you can stay here, and ply your trade. I guess I was wrong about you." He storms off, and moments later you here the screech of his car tires as he drives away.'
 								'The madam continues: "<<$pcs_nickname>>, you''re a whore. You will always be a whore. If you do manage to trick some nice man your past will eventually catch up with you. Consider this a free lesson."'
 								
-								act 'Leave':gt 'street'
+								act 'Leave':gt 'city_residential'
 							elseif SaunaWhore = 0:
 								'You head into the sauna, and up to your luxury room. Anatoly doesn''t waste anytime undressing, and motions for you to do the same. When you are both naked, he motions for you to come to him. You know just what to do.'
 
@@ -430,7 +430,7 @@ if $ARGS[0] = 'work':
 										gs 'arousal', 'end'
 										gs 'stat'
 						
-										act 'Leave':gt 'street'
+										act 'Leave':gt 'city_residential'
 									end
 								end
 							end

locations/Cheatmenu_din.qsrc

@@ -2431,7 +2431,7 @@ $cheatmenu = {
 	*nl
 	*nl
 	'<a href="exec:gt''pavResidential''">Teleport to Pavlovsk</a>'
-	'<a href="exec:gt''street''">Teleport to City</a>'
+	'<a href="exec:gt''city_residential''">Teleport to City</a>'
 	'<a href="exec:gt''gadukino''">Teleport to Gadukino</a>'
 	'<a href="exec:gt''dachi''">Teleport to Suburban Cooperative</a>'
 	*nl

locations/IrinaRoom.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	act 'Leave':
 		cla
 		minut += 5
-		gt 'street'
+		gt 'city_residential'
 	end
 
 	act 'Ring Iras doorbell':
@@ -31,7 +31,7 @@ if $ARGS[0] = 'start':
 			act 'Leave':
 				cla
 				minut += 5
-				gt 'street'
+				gt 'city_residential'
 			end
 		end
 	end
@@ -70,7 +70,7 @@ if $ARGS[0] = 'first1':
 	'You and Ira settle in the kitchen with a bottle of wine and some fruits, you talk and chat merrily.'
 	'You''re both a bit tipsy and the conversation becomes more candid.'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 
 	if IrinaQW = 1:
 		act 'Suggest drinking to sisterhood':gt 'IrinaRoom', 'first2'
@@ -131,7 +131,7 @@ if $ARGS[0] = 'sex':
 		cla
 		minut += 5
 		gs 'arousal', 'end'
-		gt 'street'
+		gt 'city_residential'
 	end
 end
 
@@ -176,7 +176,7 @@ if $ARGS[0] = 'first4':
 	act 'Leave':
 		cla
 		minut += 5
-		gt 'street'
+		gt 'city_residential'
 	end
 end
 
@@ -265,7 +265,7 @@ if $ARGS[0] = 'first9':
 		cla
 		minut += 5
 		gs 'arousal', 'end'
-		gt 'street'
+		gt 'city_residential'
 	end
 end
 

locations/LCwork.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'start1':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-		    act 'Get out of his car':money += randLCpay & gt 'street'
+		    act 'Get out of his car':money += randLCpay & gt 'city_residential'
 		end
 	end
 end
@@ -93,7 +93,7 @@ if $ARGS[0] = 'start2':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Get out of his van':money += randLCpay & gt 'street'
+		act 'Get out of his van':money += randLCpay & gt 'city_residential'
 	end
 end
 
@@ -192,7 +192,7 @@ if $ARGS[0] = 'start4':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Leave their apartment building':money += randLCpay & gt 'street'
+			act 'Leave their apartment building':money += randLCpay & gt 'city_residential'
 		end
 	else
 !!second visit, only happens if you have seen them once.
@@ -232,7 +232,7 @@ if $ARGS[0] = 'start4':
 				gs 'cum_call', 'anal', $boy
 				gs 'stat'
 				
-				act 'Leave their apartment building':money += randLCpay & gt 'street'
+				act 'Leave their apartment building':money += randLCpay & gt 'city_residential'
 !!end of expanded scene
 			end
 		end
@@ -266,7 +266,7 @@ if $ARGS[0] = 'start5':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave her apartment':money += randLCpay & gt 'street'
+	act 'Leave her apartment':money += randLCpay & gt 'city_residential'
 end
 
 if $ARGS[0] = 'start6':
@@ -306,7 +306,7 @@ if $ARGS[0] = 'start6':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Leave his apartment':money += randLCpay & gt 'street'
+		act 'Leave his apartment':money += randLCpay & gt 'city_residential'
 	end
 end
 

locations/Military.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 		minut += 60
 		money += 5000
 
-		act 'Go back to town':gt 'street'
+		act 'Go back to town':gt 'city_residential'
 	end
 end
 

locations/ParkKafe.qsrc

@@ -1186,8 +1186,8 @@ if $ARGS[0] = 'end':
 	gs 'stat'
 	killvar 'pk_rand'
 	killvar 'park_food'
-	if $ARGS[1] = 'street':
-		gt 'street'
+	if $ARGS[1] = 'city_residential':
+		gt 'city_residential'
 	elseif $ARGS[1] = 'cafe':
 		gt 'parkKafe', 'start'
 	else

locations/Peterroom.qsrc

@@ -205,7 +205,7 @@ if $ARGS[0] = 'end':
 		end
 		act 'The house':
 			gs 'arousal', 'end'
-			gt 'street'
+			gt 'city_residential'
 		end
 	end
 end

locations/RynokHoz.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'the_beginning':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Go home':gt 'street'
+				act 'Go home':gt 'city_residential'
 			
 			elseif gbrand >= 95 and palevorin = 1:
 				cla
@@ -89,7 +89,7 @@ if $ARGS[0] = 'the_beginning':
 
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Go home':gt 'street'
+					act 'Go home':gt 'city_residential'
 				end
 								
 				gs 'willpower', 'gangbang', 'resist', 'hard'
@@ -128,7 +128,7 @@ if $ARGS[0] = 'the_beginning':
 						gs 'arousal', 'end'
 						gs 'stat'
 						
-						act 'Go home':gt 'street'
+						act 'Go home':gt 'city_residential'
 					end
 				else
 					act 'Agree to gangbang (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -164,7 +164,7 @@ if $ARGS[0] = 'the_beginning':
 				'After some time, he pulls his dick mostly out of your mouth. Only leaving in the head and with in moments you feel and taste his sperm as he shoots his load in your mouth, spurt after spurt, filling your mouth up with his semen. Once he is done cumming he pulls his dick out of your mouth and wipes it off on your lips. As you get dressed he writes you a premium for the amount of 2,000 <b>₽</b> and leaving it on the table as he leaves.'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Go home':gt 'street'
+				act 'Go home':gt 'city_residential'
 			
 			elseif gbrand >= 95 and palevorin = 1:
 			
@@ -180,7 +180,7 @@ if $ARGS[0] = 'the_beginning':
 
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Go home':gt 'street'
+					act 'Go home':gt 'city_residential'
 				end
 				
 				gs 'willpower', 'bj', 'resist', 'hard'
@@ -210,7 +210,7 @@ if $ARGS[0] = 'the_beginning':
 						gs 'arousal', 'bj', 20, 'sub', 'rough', 'group'
 						gs 'stat'
 						
-						act 'Go home':gt 'street'
+						act 'Go home':gt 'city_residential'
 					end
 				else
 					act 'Agree to suck them as well (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -282,7 +282,7 @@ if $ARGS[0] = 'group':
 
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go home':gt 'street'
+			act 'Go home':gt 'city_residential'
 		end
 	end
 end
@@ -315,7 +315,7 @@ if $ARGS[0] = 'sex':
 			gs 'arousal', 'end'
 			gs 'stat'
 	
-			act 'Go home':gt 'street'
+			act 'Go home':gt 'city_residential'
 		elseif rand_act = 1:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vagmis1.jpg"></center>'
@@ -336,7 +336,7 @@ if $ARGS[0] = 'sex':
 				gs 'arousal', 'end'
 				gs 'stat'
 			
-				act 'Go home':gt 'street'
+				act 'Go home':gt 'city_residential'
 			end
 		else
 			gs 'stat'
@@ -360,7 +360,7 @@ if $ARGS[0] = 'sex':
 				gs 'arousal', 'end'
 				gs 'stat'
 			
-				act 'Go home':gt 'street'
+				act 'Go home':gt 'city_residential'
 			end
 		end
 	end

locations/WorkHosp.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/hospital.jpg"></center>'
 		'Your shift has ended.'
 
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end
 

locations/bobka.qsrc

@@ -163,7 +163,7 @@ if $ARGS[0] = 'inject':
 
 	act 'Leave the drug den':
 		minut += 5
-		gt 'street'
+		gt 'city_residential'
 	end
 end
 
@@ -336,7 +336,7 @@ if $ARGS[0] = 'peewhore':
 
 	act 'Leave the drug den':
 		minut += 5
-		gt 'street'
+		gt 'city_residential'
 	end
 end
 

locations/bordelv.qsrc

@@ -94,7 +94,7 @@ if $ARGS[0] = 'end':
 				act 'Leave':
 					npc_rel['A220'] = 0
 					vikaend = 1
-					gt 'street'
+					gt 'city_residential'
 				end
 				
 				gs 'willpower', 'misc', 'self'
@@ -106,7 +106,7 @@ if $ARGS[0] = 'end':
 						gs 'willpower', 'pay', 'self'
 						gs 'stat'
 						'You begin to comfort her by saying that you did not want to hurt her and what you uttered was because it came as a shock. Vika nears you and you hug her, soon after she stops crying and says that she should get back to work, and walks you to the exit.'
-						act 'Leave':gt 'street'
+						act 'Leave':gt 'city_residential'
 					end
 				else
 					act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -123,7 +123,7 @@ if $ARGS[0] = 'end':
 					'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off me. It was so hot." you say quietly.'
 					'Vika breaths out, relieved, "I was worried that you would not understand. I have to go back to work now, you should leave." Vika says as she leads you to the exit.'
 
-					act 'Leave':gt 'street'
+					act 'Leave':gt 'city_residential'
 				end
 			else
 				act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -135,7 +135,7 @@ if $ARGS[0] = 'end':
 				'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off me. It was so hot." you say quietly.'
 				'Vika breaths out, relieved, "I was worried that you would not understand. I have to go back to work now, you should leave." Vika says as she leads you to the exit.'
 
-				act 'Leave':gt 'street'
+				act 'Leave':gt 'city_residential'
 			end
 			
 			gs 'willpower', 'misc', 'self', 'hard'
@@ -150,7 +150,7 @@ if $ARGS[0] = 'end':
 					'"That was so hot! Can you talk to your boss, I want to work here?" you ask.'
 					'Vika lets out a relieving sigh, "And here I was worried that you would not understand. I''ll ask the boss, but I can not guarantee they''ll take you on. I have to go back to work, you should leave." Vika says and leads you to the exit.'
 
-					act 'Leave':gt 'street'
+					act 'Leave':gt 'city_residential'
 				end
 			else
 				act 'Ask about a job at the brothel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -178,7 +178,7 @@ if $ARGS[0] = 'out':
 		gs 'arousal', 'end'
 		gs 'stat'
 	
-		gt 'street'
+		gt 'city_residential'
 	end
 	
 	gs 'willpower', 'misc', 'self', 'hard'
@@ -191,7 +191,7 @@ if $ARGS[0] = 'out':
 			gs 'arousal', 'end'
 			gs 'stat'
 			'Seeing her upset, you begin to comfort her by saying that you did not want to hurt her and that you''re sorry. Vika walks up to you and you hug each other. Shortly thereafter she stops crying and says that she should get back to work, as she walks you to the exit.'
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 	else
 		act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/burger.qsrc

@@ -215,7 +215,7 @@ if $ARGS[0] = 'dishes':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Out of the car':gt 'street'
+							act 'Out of the car':gt 'city_residential'
 						end
 					end
 
@@ -300,7 +300,7 @@ if $ARGS[0] = 'dishes':
 													gs 'arousal', 'end'
 													gs 'stat'
 
-													act 'Out of the car':gt 'street'
+													act 'Out of the car':gt 'city_residential'
 												end
 											end
 										end

locations/cafe2.qsrc

@@ -11,19 +11,19 @@ if $ARGS[0] = 'beginning':
 		'<<$boydesc>> asks you to dance.'
 
 		act 'Dance':gt 'Cafe2', 'dance'
-		act 'Leave':gt 'street'
+		act 'Leave':gt 'city_residential'
 	elseif deyst > 25 and deyst <= 50:
 		'<<$boydesc>> sits down at your table and orders a drink and a snack.'
 
 		act 'Drink':gt 'Cafe2', 'booze'
-		act 'Leave':gt 'street'
+		act 'Leave':gt 'city_residential'
 	elseif deyst > 50 and deyst <= 75:
 		'<<$boydesc>> invites you to join a party nearby.'
 
 		act 'Agree':gt 'Cafe2', 'kompashka'
 
 		if pcs_horny < 75:
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 	elseif deyst > 75:
 		'<<$boydesc>> begins to flirt with you and tries to take pictures. <<$boydesc>> asks you to go with him to the toilet.'
@@ -31,7 +31,7 @@ if $ARGS[0] = 'beginning':
 		act 'Agree':gt 'Cafe3', 'toilet'
 
 		if pcs_horny < 75:
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 	end
 end
@@ -116,7 +116,7 @@ if $ARGS[0] = 'dance':
 					act 'Agree':gt 'Cafe3', 'house'
 
 					if pcs_horny < 75:
-						act 'Leave':gt 'street'
+						act 'Leave':gt 'city_residential'
 					end
 				elseif deyst > 75:
 					'Keeping your waist held <<$boydesc>> asks you to go to the toilet and continue.'
@@ -124,7 +124,7 @@ if $ARGS[0] = 'dance':
 					act 'Agree':gt 'Cafe3', 'toilet'
 
 					if pcs_horny < 75:
-						act 'Leave':gt 'street'
+						act 'Leave':gt 'city_residential'
 					end
 				end
 			end
@@ -165,7 +165,7 @@ if $ARGS[0] = 'dance':
 								*clr & cla
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'street'
+								gt 'city_residential'
 							end
 						else
 							act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -181,7 +181,7 @@ if $ARGS[0] = 'dance':
 								*clr & cla
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'street'
+								gt 'city_residential'
 							end
 						else
 							act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -194,7 +194,7 @@ if $ARGS[0] = 'dance':
 		end
 
 		if pcs_horny < 75:
-			act 'Stop dancing and leave':gt 'street'
+			act 'Stop dancing and leave':gt 'city_residential'
 		end
 	end
 end
@@ -218,7 +218,7 @@ if $ARGS[0] = 'dance2':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -248,7 +248,7 @@ if $ARGS[0] = 'booze':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -268,7 +268,7 @@ if $ARGS[0] = 'booze':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -299,7 +299,7 @@ if $ARGS[0] = 'kompashka':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -319,7 +319,7 @@ if $ARGS[0] = 'kompashka':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/cafe3.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'house':
 					gs 'stat'
 					gs 'cum_manage'
 
-					act 'Leave':gt 'street'
+					act 'Leave':gt 'city_residential'
 				end
 
 				act 'Try to remove his hands':
@@ -113,7 +113,7 @@ if $ARGS[0] = '0':
 			gs 'arousal', 'vaginal', 15, 'sub'
 			gs 'stat'
 
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		elseif deysts = 2:
 			guy += 1
 			dynamic $vagstart
@@ -126,7 +126,7 @@ if $ARGS[0] = '0':
 			gs 'arousal', 'vaginal', 15, 'sub'
 			gs 'stat'
 			
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		elseif deysts = 3:
 			guy += 1
 			dynamic $vagstart
@@ -139,7 +139,7 @@ if $ARGS[0] = '0':
 			gs 'arousal', 'vaginal', 15, 'sub'
 			gs 'stat'
 			
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 	elseif deyst < 85:
 		'<<$boydesc>> tells you that he wants you to suck it'
@@ -186,7 +186,7 @@ if $ARGS[0] = '0':
 
 				'You try to wipe off the sperm of your face, but that just makes it worse.'
 
-				act 'Leave':gt 'street'
+				act 'Leave':gt 'city_residential'
 			end
 
 			act 'Suck on':
@@ -206,7 +206,7 @@ if $ARGS[0] = '0':
 					gs 'stat'
 					'<<$boydesc>> looks at you as you swallow his sperm.'
 
-					act 'Leave':gt 'street'
+					act 'Leave':gt 'city_residential'
 				end
 
 				act 'Spit out':
@@ -219,7 +219,7 @@ if $ARGS[0] = '0':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Leave':gt 'street'
+					act 'Leave':gt 'city_residential'
 				end
 			end
 		end
@@ -256,7 +256,7 @@ if $ARGS[0] = '0':
 			gs 'stat'
 			gs 'cum_manage'
 
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 	end
 end
@@ -405,7 +405,7 @@ if $ARGS[0] = 'kompashka':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'coffee':

locations/carF.qsrc

@@ -1,7 +1,7 @@
 # carF
 
 $enddrive = {
-	if cardrive = 1:gt 'street'
+	if cardrive = 1:gt 'city_residential'
 	if cardrive = 2:gt 'city_center'
 	if cardrive = 3:gt 'city_industrial'
 	if cardrive = 4:gt 'lake', 'start'

locations/clener.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave': minut += 5 & gt 'street'
+	act 'Leave': minut += 5 & gt 'city_residential'
 	
 	if jouryQwNo = 1 and hour = 17:
 		'You see Yuri walking down the corridor, you remember him making a move on you but you refused him. He looks at you, smiles and approaches you.'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'start':
 			menu_off = 1
 			'You ask Boris Ivanovich whether he has more work for you. He says that he needs a cleaner to clean the toilets. You''ll be almost able to work every day. Cleaning toilets for an hour earns you 65 <b>₽</b> upfront.'
 
-			act 'Refuse and leave': minut += 5 & gt 'street'
+			act 'Refuse and leave': minut += 5 & gt 'city_residential'
 
 			act 'Accept':
 				cla
@@ -229,7 +229,7 @@ if $ARGS[0] = 'start':
 			menu_off = 1
 			'You head into the office that advertised the job. You see a large man in a jacket sitting there. He tells you can clean the Office for 65 <b>₽</b> per hour, payed upfront.'
 
-			act 'Refuse and leave': minut += 5 & gt 'street'
+			act 'Refuse and leave': minut += 5 & gt 'city_residential'
 
 			act 'Accept':
 				cla
@@ -475,7 +475,7 @@ if $ARGS[0] = 'borodachSex':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 	end
 end
@@ -507,7 +507,7 @@ if $ARGS[0] = 'ohrhjcum':
 		gs 'arousal', 'hj', 5, 'dom'
 		gs 'stat'
 		
-		act 'Leave':gt 'street'
+		act 'Leave':gt 'city_residential'
 	end
 end
 
@@ -554,7 +554,7 @@ if $ARGS[0] = 'ohrbjcum':
 			gs 'arousal', 'end'
 			gs 'stat'
 		
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 
 		act 'Spit it out':
@@ -568,7 +568,7 @@ if $ARGS[0] = 'ohrbjcum':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 	end
 end
@@ -589,7 +589,7 @@ if $ARGS[0] = 'ohrsex':
 		gs 'arousal', 'end'
 		gs 'stat'
 			
-		act 'Leave':gt 'street'
+		act 'Leave':gt 'city_residential'
 	end
 end
 --- clener ---------------------------------

locations/club.qsrc

@@ -439,7 +439,7 @@ if $ARGS[0] = 'bar':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club1.jpg"></center>'
 			'You''re so drunk, you can barely remember where you live.'
 
-			act 'Try to go home':gt 'street'
+			act 'Try to go home':gt 'city_residential'
 			killvar 'temp'
 			exit
 		elseif temp = 6:

locations/dima.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 	act 'Leave': 
 		cla
 		minut += 5
-		gt 'street'
+		gt 'city_residential'
 	end
 end
 

locations/din_npc.qsrc

@@ -11,7 +11,7 @@ $go_home = {
 		elseif curr_home = 2:
 		gt 'gadukino'
 		elseif curr_home = 3:
-		gt 'street'
+		gt 'city_residential'
 		end
 }
 

locations/dina.qsrc

@@ -7,7 +7,7 @@ $brodila = {
 	elseif home_owned[4] = 1:
 		gt'korr2x','start'
 	else
-		gt'street', 'start'
+		gt'city_residential', 'start'
 	end
 }
 
@@ -17,7 +17,7 @@ $brodilr = {
 	elseif home_owned[4] = 1:
 		gt'liames'
 	else
-		gt'street','start'
+		gt'city_residential','start'
 	end
 }
 
@@ -27,7 +27,7 @@ $brodilk = {
 	elseif home_owned[4] = 1:
 		gt'kuhr2x','start'
 	else
-		gt'street', 'start'
+		gt'city_residential', 'start'
 	end
 }
 
@@ -39,7 +39,7 @@ $brodils = {
 	elseif StoryLine = 1 and home_owned[2] = 1:
 		gt 'sitrPar'
 	else
-		gt'street', 'start'
+		gt'city_residential', 'start'
 	end
 }
 

locations/dinsexgivi.qsrc

@@ -131,7 +131,7 @@ if $ARGS[0] = 'endirinaaftergang':
 	gs 'stat'
 	'Exhausted, tired and with a heavy taste of sperm you get home with Ira after a hard day. You get to the entrance of Iras house and she kisses you on the lips enveloping you in the aroma of sperm, then goes home.'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 --- dinsexgivi ---------------------------------

locations/ender.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = 'loss':
 		act 'Dress and escape from the gym':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-			gt'street'
+			gt'city_residential'
 		end
 		exit
 	elseif fightEnding = 8:
@@ -330,7 +330,7 @@ if $ARGS[0] = 'win':
 		act 'Dress and leave':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-			gt'street'
+			gt'city_residential'
 		end
 		exit
 	elseif fightEnding = 8 or fightEnding = 9:
@@ -381,7 +381,7 @@ if $ARGS[0] = 'win':
 			elseif curr_home = 2:
 				gt 'gadukino'
 			elseif curr_home = 3:
-				gt 'street'
+				gt 'city_residential'
 			end
 		end
 	elseif fightEnding = 12:
@@ -554,7 +554,7 @@ if $ARGS[0] = 'surrender':
 		act 'Dress and flee the gym':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-			gt'street'
+			gt'city_residential'
 		end
 		exit
 	elseif fightEnding = 8:

locations/etoexhib.qsrc

@@ -1590,7 +1590,7 @@ if $ARGS[0] = 'pos51':
 			xgt $curloc
 		else
 			minut += 1
-			xgt 'street'
+			xgt 'city_residential'
 		end
 	end
 

locations/event.qsrc

@@ -162,7 +162,7 @@ if $ARGS[0] = 'dima':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt'street'
+					gt'city_residential'
 				end
 			else
 				act 'Make excuses and go (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -323,7 +323,7 @@ if $ARGS[0] = 'dima10':
 	'<center><img <<$set_imgh>> src="images/characters/city/dmitry/sex/dima6.jpg"></center>'
 	'You are tied to the radiator weeping uncontrolably. Your ass is on fire after the whipping. The drunken men have gine to bed. Finally you hear them snoring loudly.'
 
-	act 'Struggle free and escape':gt 'street'
+	act 'Struggle free and escape':gt 'city_residential'
 	act 'Fall asleep':gt 'event', 'dima11'
 end
 
@@ -394,7 +394,7 @@ if $ARGS[0] = 'dima15':
 		if runrnd < 9:
 			gt 'event', 'dima18'
 		else
-			gt 'street'
+			gt 'city_residential'
 		end
 	end
 
@@ -473,7 +473,7 @@ if $ARGS[0] = 'dima21':
 	minut -= 80
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'dima30':
@@ -483,7 +483,7 @@ if $ARGS[0] = 'dima30':
 	gs 'stat'
 	'I confess, I am a sinner, a writer from me worthless, and all my dark little thoughts went to the recent arrival of women. If there are interesting ideas/scenarios to continue - fling in a personal, zabubenyu'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'dima31':
@@ -585,7 +585,7 @@ if $ARGS[0] = 'dima36':
 	'After sitting in this position for a few minutes, you start to free your hands. Once they''re loose, You tear off the blindfold, and wipe as much of the sperm of your face as is possible.'
 	'Looking around, you find the box Alex had put your stuff it. You get dressed and find a passage that leads to the street above.'
 	
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 if $ARGS[0] = 'dima37':
 	cla
@@ -601,7 +601,7 @@ if $ARGS[0] = 'dima37':
 	'Your dress is trampled and torn in places, but still able to cover your body. You are lost, but after a while find the supermarket, where you met Dima.'
 	'Only then do you realize Alex took all your money.'
 
-	act 'Relax':gt 'street'
+	act 'Relax':gt 'city_residential'
 end
 if $ARGS[0] = 'dima38':
 	cls
@@ -619,7 +619,7 @@ if $ARGS[0] = 'dima38':
 	gs 'arousal', 'bj', 10, 'sub', 'deepthroat', 'rough', 'bound'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'dima39':
@@ -691,7 +691,7 @@ if $ARGS[0] = 'dima43':
 	'When Alex returns, he unties you, and hands you your stuff. He says that he was sorry he has to leave and would be very happy for another "rendezvous" with you.'
 	'You dress, Take your things and hurriedly leave him.'
 
-	act 'Go to the yard':gt 'street'
+	act 'Go to the yard':gt 'city_residential'
 end
 if $ARGS[0] = 'dima44':
 	cls
@@ -703,7 +703,7 @@ if $ARGS[0] = 'dima44':
 	'Unfortunately he took your money. You find a sharpened stone, and when your hands are free, you carefully wipe the semen from your face.'
 	'You are lost, but after a while manage to find yourself the supermarket where you met Dimitry.'
 
-	act 'Relax':gt 'street'
+	act 'Relax':gt 'city_residential'
 end
 if $ARGS[0] = 'dima45':
 	cls
@@ -876,7 +876,7 @@ if $ARGS[0] = 'dima52':
 	gs 'arousal', 'bj', 20, 'group','sub'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Relax':gt 'street'
+	act 'Relax':gt 'city_residential'
 end
 
 

locations/events.qsrc

@@ -344,7 +344,7 @@ if $ARGS[0] = 'snkayf1':
 
 	if snkz = 4:
 		minut += 120
-		gt'street'
+		gt'city_residential'
 	end
 
 	if snkz = 5:

locations/gopnew.qsrc

@@ -120,7 +120,7 @@ if $ARGS[0] = 'start1':
 				minut += 5
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Decline and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -147,7 +147,7 @@ if $ARGS[0] = 'start2':
 				minut += 5
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Decline and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'start2':
 			gopota += 1
 			'You walk through the park with Vasan, but don''t find any marks worth robbing. You still had a fun time chatting with him, though.'
 
-			act 'Say goodbye and go back home': minut += 5 & gt 'street'
+			act 'Say goodbye and go back home': minut += 5 & gt 'city_residential'
 		elseif goprandwork < 95:
 			cla
 			gopstop += 1
@@ -176,7 +176,7 @@ if $ARGS[0] = 'start2':
 			minut += 60
 			'You help the guys steal a few cellphones by distracting random people in the park, but didn''t get much done. The few rubles you all got for selling the items, were immediately used to buy more beer.'
 
-			act 'Say goodbye and go back home': minut += 5 & gt 'street'
+			act 'Say goodbye and go back home': minut += 5 & gt 'city_residential'
 		else
 			cla
 			gopstop += 1
@@ -186,7 +186,7 @@ if $ARGS[0] = 'start2':
 			money += randmon
 			'You and the guys had a pretty good day, and they managed to steal several wallets and cell phones while you distracted the marks. After Vasan sells the lot to the pawn shop, he gives you your share: <<randmon>> <b>₽</b>.'
 
-			act 'Say goodbye and go back home': minut += 5 & gt 'street'
+			act 'Say goodbye and go back home': minut += 5 & gt 'city_residential'
 		end
 	end
 end
@@ -198,7 +198,7 @@ if $ARGS[0] = 'start3':
 	'"Of course not! You know me!" you reassure them. You sit down and tell the guys what happened, omitting some of the sexual details. When you''re finished, one of them grins: "We should find this cop bitch, and catch her! You deserve to fuck her, after all she did to you!"'
 	'The other Gopniks laugh, and you laugh with them. If only they knew...'
 
-	act 'Excuse yourself and leave': minut += 5 & gt 'street'
+	act 'Excuse yourself and leave': minut += 5 & gt 'city_residential'
 end
 
 if $ARGS[0] = 'start4':
@@ -217,7 +217,7 @@ if $ARGS[0] = 'start4':
 				minut += 5
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Decline and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -262,7 +262,7 @@ if $ARGS[0] = 'start5':
 					gopopusday = daystart
 					'You offer him the 2,000 <b>₽</b> he expects from you. He counts it quickly and gives you an affirmative grunt.'
 
-					act 'Walk away quickly': minut += 5 & gt 'street'
+					act 'Walk away quickly': minut += 5 & gt 'city_residential'
 
 					if GLust > 0:
 						cla
@@ -290,7 +290,7 @@ if $ARGS[0] = 'start5':
 			else
 				'Vasan spits on the ground in front of you and grunts: "You''re lucky no one wants you right now, bitch. Get out of here, before I change my mind."'
 
-				act 'Get away from him': minut += 5 & gt 'street'
+				act 'Get away from him': minut += 5 & gt 'city_residential'
 			end
 		end
 	end
@@ -302,7 +302,7 @@ if $ARGS[0] = 'start5':
 		if gopopusday = daystart:
 			'Vasan laughs: "Look at her run! A bit bow-legged at that... probably fresh from getting her worthless cunt fucked again! Keep running, whore!"'
 
-			act 'Run away from them': minut += 5 & gt 'street'
+			act 'Run away from them': minut += 5 & gt 'city_residential'
 		elseif gopopusday ! daystart:
 			'Unfortunately, he doesn''t. He and his friends quickly overtake you and surround you.'
 			'"Do you have cum in your ears or something, slut? We asked you a question! Where''s our fucking money?" Vasan shouts.'
@@ -314,7 +314,7 @@ if $ARGS[0] = 'start5':
 					gopopusday = daystart
 					'You offer him the 2,000 <b>₽</b> he expects from you. He counts it quickly and gives you an affirmative grunt.'
 
-					act 'Walk away quickly': minut += 5 & gt 'street'
+					act 'Walk away quickly': minut += 5 & gt 'city_residential'
 
 					if GLust > 0:
 						cla
@@ -355,7 +355,7 @@ if $ARGS[0] = 'start6':
 				minut += 5
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Quickly leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -363,7 +363,7 @@ if $ARGS[0] = 'start6':
 	else
 		'When you approach them, he gives you a dismissive nod, noticing you didn''t ignore him. "Good, you listened. Now get out of here, before we change our minds."'
 
-		act 'Quickly leave': minut += 5 & gt 'street'
+		act 'Quickly leave': minut += 5 & gt 'city_residential'
 	end
 end
 
@@ -385,7 +385,7 @@ if $ARGS[0] = 'start7':
 				gopdolg = 0
 				'You give the guy <<gopdolg>> <b>₽</b>. He counts the money, almost disappointed to see it''s all there.'
 
-				act 'Quickly go away': minut += 5 & gt 'street'
+				act 'Quickly go away': minut += 5 & gt 'city_residential'
 			end
 		else
 			'"Guys, please! I have no money!" you cry out, with tears in your eyes.'
@@ -397,7 +397,7 @@ if $ARGS[0] = 'start7':
 		exit
 	end
 
-	act 'Quickly walk away from them': minut += 5 & gt 'street'
+	act 'Quickly walk away from them': minut += 5 & gt 'city_residential'
 end
 
 if $ARGS[0] = 'pivas':
@@ -559,7 +559,7 @@ if $ARGS[0] = 'pivas':
 		if VasanTut = 2 or BerezaTut = 2 or VitekTut = 2 or KostilTut = 2 or UdmurtTut = 2 or SeriTut = 2:gt 'gopnew', 'sexstart'
 	end
 
-	act 'Leave them be': minut += 5 & gt 'street'
+	act 'Leave them be': minut += 5 & gt 'city_residential'
 end
 
 if $ARGS[0] = 'bazar':
@@ -801,7 +801,7 @@ if $ARGS[0] = 'tf':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Return to the streets': minut += 5 & gt 'street'
+					act 'Return to the streets': minut += 5 & gt 'city_residential'
 				end
 			end
 		end
@@ -818,14 +818,14 @@ if $ARGS[0] = 'dolg':
 	'You feel dazzled when you hear the amount - <<gopdolg>> <b>₽</b>! How the hell are you supposed to gather than in ten days?'
 	'"We will find you if you don''t pay, <<$pcs_nickname>>. Don''t bother trying to hide from us," Konstantin says with a mean grin on his face."'
 
-	act 'Leave while you can': minut += 5 & gt 'street'
+	act 'Leave while you can': minut += 5 & gt 'city_residential'
 
 	act 'Tell them you can''t gather that much money':
 		cla
 		'"Guys, come on!" you plead. "I can''t gather that amount on such short notice!"'
 		'Not my problem," Vasan shrugs. "Perhaps you can earn it with your body, eh? You seem to be good at that..."'
 
-		act 'Leave': minut += 5 & gt 'street'
+		act 'Leave': minut += 5 & gt 'city_residential'
 
 		act 'Ask if there is another way':
 			cla
@@ -833,7 +833,7 @@ if $ARGS[0] = 'dolg':
 			'"How about you pay us directly with your body? I guess I wouldn''t mind a good fuck every now and then, and neither would my buddies! Fine... forget about the money, but you''re ours to fuck whenever we want. Deal?" Vasan grins.'
 			'The large bulge in his groin tells you he wants you to start ''paying'' right away, if you say yes. It might be your only way out, though... how are you going to gather <<gopdolg>> <b>₽</b> in ten days?'
 
-			act 'Refuse, maybe you can get the money after all': minut += 5 & gt 'street'
+			act 'Refuse, maybe you can get the money after all': minut += 5 & gt 'city_residential'
 
 			act 'Agree to let them fuck you when they want':
 				gnewQW = 6
@@ -893,7 +893,7 @@ if $ARGS[0] = 'sexstart':
 			act 'Go with Gray':SeriTut = 3 & gs 'gopnew', 'sexboy1'
 		end
 	end
-	act 'Leave': minut += 5 & gt 'street'
+	act 'Leave': minut += 5 & gt 'city_residential'
 end
 
 if $ARGS[0] = 'sexboy':
@@ -1017,7 +1017,7 @@ if $ARGS[0] = '1':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave': minut += 5 & gt 'street'
+	act 'Leave': minut += 5 & gt 'city_residential'
 end
 
 if $ARGS[0] = '11':
@@ -1049,7 +1049,7 @@ if $ARGS[0] = '11':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave': minut += 5 & gt 'street'
+			act 'Leave': minut += 5 & gt 'city_residential'
 		end
 
 		act 'Spit it out':
@@ -1062,7 +1062,7 @@ if $ARGS[0] = '11':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave': minut += 5 & gt 'street'
+			act 'Leave': minut += 5 & gt 'city_residential'
 		end
 	end
 
@@ -1081,7 +1081,7 @@ if $ARGS[0] = '11':
 			'He wipes the last remains of sperm off onto your cheek, and makes you lick his cock clean before tucking it back into his pants. Then he leaves, no longer caring about what you do.'
 		end
 
-		act 'Leave': minut += 5 & gt 'street'
+		act 'Leave': minut += 5 & gt 'city_residential'
 	end
 end
 
@@ -1112,7 +1112,7 @@ if $ARGS[0] = '12':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave': minut += 5 & gt 'street'
+	act 'Leave': minut += 5 & gt 'city_residential'
 end
 
 if $ARGS[0] = '2':
@@ -1153,7 +1153,7 @@ if $ARGS[0] = '2':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Leave': minut += 5 & gt 'street'
+		act 'Leave': minut += 5 & gt 'city_residential'
 
 	elseif tiprand = 1 or GLust = 2:
 		pcs_vag += 1
@@ -1210,7 +1210,7 @@ if $ARGS[0] = '2':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Leave': minut += 5 & gt 'street'
+		act 'Leave': minut += 5 & gt 'city_residential'
 	end
 end
 
@@ -1264,7 +1264,7 @@ if $ARGS[0] = '3':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave': minut += 5 & gt 'street'
+	act 'Leave': minut += 5 & gt 'city_residential'
 end
 
 if $ARGS[0] = 'degrading':
@@ -1293,7 +1293,7 @@ if $ARGS[0] = 'degrading':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave': minut += 5 & gt 'street'
+	act 'Leave': minut += 5 & gt 'city_residential'
 end
 
 --- gopnew ---------------------------------

locations/kafe.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'They serve American style meals'
 	*nl
-	act 'Leave the diner': minut += 5 & gt 'street'
+	act 'Leave the diner': minut += 5 & gt 'city_residential'
 
 	act 'Sit down at a table': gt 'kafe', 'table'
 end
@@ -279,7 +279,7 @@ if $ARGS[0] = 'workPred':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Go home': minut += 5 & gt 'street'
+				act 'Go home': minut += 5 & gt 'city_residential'
 			end
 
 			if pcs_horny >= 50:
@@ -306,7 +306,7 @@ if $ARGS[0] = 'workPred':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Go home': minut += 5 & gt 'street'
+						act 'Go home': minut += 5 & gt 'city_residential'
 					end
 					gs 'willpower', 'swallow', 'force', 'medium'
 					if will_cost <= pcs_willpwr:
@@ -335,7 +335,7 @@ if $ARGS[0] = 'workPred':
 									gs 'arousal', 'end'
 									gs 'stat'
 
-									act 'Go home': minut += 5 & gt 'street'
+									act 'Go home': minut += 5 & gt 'city_residential'
 								end
 							end
 
@@ -347,7 +347,7 @@ if $ARGS[0] = 'workPred':
 								'You wiped the remnants of sperm off your face, help her to feet and sort her out. Ira, regaining her senses, looks to you with a beatific smile "That Givi is chock-bellied ugly, but he fucked me like I''ve never been fucked before. I even lost consciousness from an orgasm."'
 								'Ira is still floating in ecstasy, so you decide to walk her home. At her front door, she kisses you on the lips and leaves.'
 
-								act 'Go home': minut += 5 & gt 'street'
+								act 'Go home': minut += 5 & gt 'city_residential'
 							end
 						end
 					else
@@ -764,7 +764,7 @@ if $ARGS[0] = 'workPred':
 					'The basement has all the tools set out ready. You sit on a chair and a heavily tattooed orangutan comes up to you with a clip and a pair of scissors, he pull your tongue out of your mouth and pierces it with lightning speed. Into the bleeding wound in your tonuge he attaches a small bar.'
 					'Damn, it''s very painful. You moan with your tongue hanging out, the bandits laughing at your pain. Finally your tongue is freed. Tears roll down your cheeks as the bandits escort you out of the cottages.'
 
-					act 'Go home': minut += 5 & gt 'street'
+					act 'Go home': minut += 5 & gt 'city_residential'
 				elseif kaferand > 25 and (opusk > 0 or gnewQW = 5) and pirsA > 0 and hour >= 12 and hour <= 19 and cafe_mobster ! daystart:
 					*clr & cla
 					cafe_mobster = daystart
@@ -863,7 +863,7 @@ if $ARGS[0] = 'razvod':
 		'<<$boydesc>> invites you to dance.'
 		act 'Dance with him':gt 'cafe2', 'dance'
 		if pcs_horny < 75:
-			act 'Leave': minut += 5 & gt 'street'
+			act 'Leave': minut += 5 & gt 'city_residential'
 		end
 	elseif deyst = 1:
 		'<<$boydesc>> asks permission to sit down at the same table as you.'
@@ -875,7 +875,7 @@ if $ARGS[0] = 'razvod':
 				gs 'willpower', 'pay', 'resist'
 				minut += 5
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -890,7 +890,7 @@ if $ARGS[0] = 'razvod':
 				gs 'willpower', 'pay', 'resist'
 				minut += 5
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -911,7 +911,7 @@ if $ARGS[0] = 'razvod':
 					if will_cost <= pcs_willpwr:
 						act 'Tell him to fuck off (<<will_cost>> Willpower)':
 							gs 'willpower', 'pay', 'resist'
-							gt 'street'
+							gt 'city_residential'
 						end
 					else
 						act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -922,7 +922,7 @@ if $ARGS[0] = 'razvod':
 					end
 				else
 					'"Well, okay, get out of here, you are ugly anyway."'
-					act 'Continue': gt 'street'
+					act 'Continue': gt 'city_residential'
 				end
 			end
 		else

locations/kafe2.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'givi':
 				npc_rel['A41'] -= 5
 				'You take time off to leave early, Givi was a little angry but let you go.'
 
-				act 'Move away':gt 'street'
+				act 'Move away':gt 'city_residential'
 			end
 		end
 
@@ -465,7 +465,7 @@ if $ARGS[0] = 'ira':
 
 				'You make your way home with Irina. <<$irinatalk>> You get to the house where she lives. <<$irinaend>>'
 
-				act 'Say goodbye':gt 'street'
+				act 'Say goodbye':gt 'city_residential'
 			end
 		end
 	end
@@ -505,7 +505,7 @@ if $ARGS[0] = 'tamdin':
 			if clener = 1:'You walk down the street with Tamara, she does not live far from you and when you get to her house she stops and says goodbye.'
 			if clener = 0:clener = 1 & 'You walk down the street with Tamara, Tamara tells you that she sometimes works as a cleaner in an office building nearby.'
 
-			act 'Say goodbye':gt 'street'
+			act 'Say goodbye':gt 'city_residential'
 		end
 	end
 end

locations/kafeend.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = '':
 	kafe_rand = rand(0, 100)
 
 	if kafe_rand > 15:
-		gt 'street'
+		gt 'city_residential'
 	elseif kafe_rand = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand.jpg"></center>'
 		'On leaving the cafe you see a large crowd of young people deciding where to go next. You also notice that one of the girls wasted no time and has started blowing her boyfriend completely undeterred by the crowd.'
@@ -76,14 +76,14 @@ if $ARGS[0] = 'end':
 	gs 'arousal', 'voyeur', 5
 	gs 'stat'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'end_sex':
 	gs 'arousal', 'voyeur_sex', 5
 	gs 'stat'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 --- kafeend ---------------------------------

locations/kameraKPZ.qsrc

@@ -47,7 +47,7 @@ else
 					'<center><img <<$set_imgh>> src="images/locations/city/shared/car.jpg"></center>'
 					'You got into the car and drove off. Anatoly said. "Now I''ll take you to your house. I think you need some rest. Ivan lives in the city industrial region, act like you know. But remember, if it is what mischief again, I''m not going to pull out. And remember girl. You have to court where it month. During this time, you should either give me back my money, or prove me guilty of Ivan, or you sit. I''ll make sure that your term would not have been suspended. Otpravishsya six years quilted stitching in some sort of wilderness surrounded by old prostitutes drug addicts, cheats and other charges. And by the court you will transfer the money to me until you have paid the entire amount. If anything, find me in bystroezhke. " You came to your house and said goodbye with Anatoly.'
 
-					act 'Out of the car.':gt 'street'
+					act 'Out of the car.':gt 'city_residential'
 				end
 			end
 		end

locations/kathouse0.qsrc

@@ -9,7 +9,7 @@ gs 'stat'
 'She gives you a kiss on the mouth and leaves you, and you promptly fall asleep again.'
 'A few hours later you wake up again, and a man you''ve never seen before is watching you curiously from the couch. He must be one of Kat''s many friends-with-benefits she told you about.'
 
-act 'Leave Kat''s house':gt 'street'
+act 'Leave Kat''s house':gt 'city_residential'
 
 act 'Seduce the guy':
 	cla

locations/katspalnya.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 	if hour >= 18 and hour < 23:'<a href="exec:gt ''katspalnya'', ''kat''">Kat</a> is sitting on the couch. She''s watching TV.'
 	if hour >= 23 or hour < 6:'<a href="exec:gt ''katspalnya'', ''katslip''">Kat</a> is sound asleep in her huge bed.'
 
-	act 'Leave Kat''s apartment':gt 'street'
+	act 'Leave Kat''s apartment':gt 'city_residential'
 end
 
 if $ARGS[0] = 'katslip':

locations/kavkazkafe.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'podgivi':
 			'Suddenly the door to the back room opens and in walks Ashot. You looked at the Caucasians.'
 			'Givi says, "Hey, know what? We like you <<$pcs_nickname>>, we like filling your holes, now you two fuck horseman, never will you forget.'
 
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 			act 'Okay.':gt 'kavkazkafe', 'grup'
 		elseif podrand < 70 and kavslut = 0 and giviAnalOnce = 1:
 			gs 'bdman', 'ashot'
@@ -54,7 +54,7 @@ if $ARGS[0] = 'podgivi':
 							'You blurt out, "This is too much for me, I''m going home!" and turn to leave.'
 							'Givi trots after you, "<<$pcs_nickname>> wait, I thought you''d like, I didn''t mean to offend you."'
 
-							act 'Leave':gt 'street'
+							act 'Leave':gt 'city_residential'
 						end
 					else
 						act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -144,7 +144,7 @@ if $ARGS[0] = 'podgivi':
 									'You blurt out, "What would a goddess do with money? You silly man. I''m going home!" and turn to leave.'
 									'Givi trots after you, "<<$pcs_nickname>> wait, I''m sorry, please forgive me."'
 
-									act 'Leave':gt 'street'
+									act 'Leave':gt 'city_residential'
 								end
 							else
 								act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -159,7 +159,7 @@ if $ARGS[0] = 'podgivi':
 				'"Whoa, what a fine ass. <<$pcs_nickname>> suck me, I will give you bonus.'
 
 				act 'Kneel':gt 'kavkazkafe', 'givibj'
-				act 'Leave':gt 'street'
+				act 'Leave':gt 'city_residential'
 			end
 		end
 	end
@@ -269,7 +269,7 @@ if $ARGS[0] = 'grupcum':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'givirape':
@@ -313,7 +313,7 @@ if $ARGS[0] = 'givirapebj':
 	money += 5000
 	gs 'stat'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'givirape2':
@@ -345,7 +345,7 @@ if $ARGS[0] = 'givirape2':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 
@@ -425,7 +425,7 @@ if $ARGS[0] = 'givibj5':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'givibj6':
@@ -438,7 +438,7 @@ if $ARGS[0] = 'givibj6':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'givisex':
@@ -488,7 +488,7 @@ if $ARGS[0] = 'givisex1':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 	end
 end
@@ -508,7 +508,7 @@ if $ARGS[0] = 'givianal':
 		gs 'bdsex', 'ancum'
 		gs 'arousal', 'end'
 
-		act 'Leave':gt 'street'
+		act 'Leave':gt 'city_residential'
 	end
 end
 

locations/klofdomhouse.qsrc

@@ -20,11 +20,11 @@ if $ARGS[0] = 'start':
 		else
 			'No one home'
 
-			act 'Go home':gt 'street'
+			act 'Go home':gt 'city_residential'
 		end
 	end
 
-	act 'Go home':gt 'street'
+	act 'Go home':gt 'city_residential'
 end
 
 if $ARGS[0] = 'start1':
@@ -41,7 +41,7 @@ if $ARGS[0] = 'start1':
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/klof.jpg"></center>'
 		'You ring the doorbell. Jora answers, scratching his belly. He yawns and says he is busy.'
 
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end
 
@@ -65,7 +65,7 @@ if $ARGS[0] = 'ev1':
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/klof.jpg"></center>'
 		'You ring the doorbell. Jora answers, scratching his belly. He yawns and says he is busy.'
 
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end
 
@@ -94,7 +94,7 @@ if $ARGS[0] = 'ev3':
 !!Image needed	'<center><img <<$set_imgh>> src="images/pc/pnx.jpg"></center>'
 	'You decide that the guys are looking for a maid, tell them to try the phonebook and leave.'
 
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = 'ev4':
@@ -152,7 +152,7 @@ if $ARGS[0] = 'ev6':
 	'You are approached by Jora who hands you money, "Earned yourself a crumb."'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Go home':gt 'street'
+	act 'Go home':gt 'city_residential'
 end
 
 if $ARGS[0] = 'ev7':
@@ -214,7 +214,7 @@ if $ARGS[0] = 'ev13':
 		guy += 1
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end
 
@@ -250,7 +250,7 @@ if $ARGS[0] = 'ev14':
 		guy += 1
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end
 
@@ -284,7 +284,7 @@ if $ARGS[0] = 'ev15':
 		'Jora hands you money, "Earned yourself a crumb."'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end
 
@@ -322,7 +322,7 @@ if $ARGS[0] = 'ev 16':
 		guy += 1
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end
 
@@ -358,7 +358,7 @@ if $ARGS[0] = 'ev 17':
 		guy += 1
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end
 
@@ -395,7 +395,7 @@ if $ARGS[0] = 'ev 18':
 		'Seymon hands you money, "Earned yourself a crumb."'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end
 
@@ -443,7 +443,7 @@ if $ARGS[0] = 'ev19':
 	gang += 1
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Go home':gt 'street'
+	act 'Go home':gt 'city_residential'
 end
 
 if $ARGS[0] = 'ev20':
@@ -469,7 +469,7 @@ if $ARGS[0] = 'ev21':
 	'From the room comes an ugly old man.'
 	'"Too early for you to progress in our business." He says.'
 
-	act 'Go home':gt 'street'
+	act 'Go home':gt 'city_residential'
 end
 
 if $ARGS[0] = 'ev22':
@@ -486,7 +486,7 @@ if $ARGS[0] = 'ev22':
 		act 'Go home (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -507,7 +507,7 @@ if $ARGS[0] = 'ev23':
 		act 'Get out of here (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -528,7 +528,7 @@ if $ARGS[0] = 'ev24':
 		act 'Get out of here (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -551,7 +551,7 @@ if $ARGS[0] = 'ev25':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -575,7 +575,7 @@ if $ARGS[0] = 'ev26':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -597,7 +597,7 @@ if $ARGS[0] = 'ev27':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -620,7 +620,7 @@ if $ARGS[0] = 'ev28':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -642,7 +642,7 @@ if $ARGS[0] = 'ev29':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -664,7 +664,7 @@ if $ARGS[0] = 'ev30':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -686,7 +686,7 @@ if $ARGS[0] = 'ev31':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -709,7 +709,7 @@ if $ARGS[0] = 'ev32':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -732,7 +732,7 @@ if $ARGS[0] = 'ev33':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -768,7 +768,7 @@ if $ARGS[0] = 'ev34':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Get out of here (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -855,7 +855,7 @@ if $ARGS[0] = 'ev39':
 			gs 'willpower', 'pay', 'resist'
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'street'
+			gt 'city_residential'
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -896,7 +896,7 @@ if $ARGS[0] = 'ev41':
 	act 'Go home':
 		gs 'arousal', 'end'
 		gs 'stat'
-		gt 'street'
+		gt 'city_residential'
 	end
 end
 

locations/korr.qsrc

@@ -46,7 +46,7 @@ act '<b>Go to the street</b>':
 		xgt $curloc
 	else
 		minut += 2
-		xgt 'street', 'start'
+		xgt 'city_residential', 'start'
 	end
 end
 

locations/kuhr.qsrc

@@ -304,7 +304,7 @@ if fullmorrout = 1:
 		minut +=1
 		killvar 'fullmorrout'
 		gs 'korr'
-		xgt 'street', 'start'
+		xgt 'city_residential', 'start'
 		
 	end
 end

locations/lake.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'start':
 			act'Return':gt 'lake','start'
 		else
 			minut += 40
-			gt 'street'
+			gt 'city_residential'
 		end
 	end
 

locations/lesbidomhouse.qsrc

@@ -12,11 +12,11 @@ if $ARGS[0] = 'start':
 
 	if temp = 0:
 		'You ring the doorbell several times, but no one comes to answer the door. When you try to look inside through the windows, you don''t see any movement either.'
-		act 'Leave':gt'street'
+		act 'Leave':gt'city_residential'
 	else
 		$location_type = 'indoors'
 		'You ring the doorbell several times, and eventually you hear an electronic *click*. The door slowly swings open, even though no one came to answer it.'
-		act 'Leave':gt'street'
+		act 'Leave':gt'city_residential'
 		if lesbiQW = 1:
 			act 'Enter the house': gt 'lesbidomhouse','QW1'
 		elseif lesbiQW = 2:
@@ -114,7 +114,7 @@ if $ARGS[0] = 'QW1':
 				'Mistress puts her hand on yours reassuringly: "There''s no need to be nervous, <<$pcs_nickname>>. We don''t start until next time. Today is just for getting to know one another. So... why don''t you tell me a little about yourself?"'
 				'You have a few more sips of the wine, and your nerves and uncertainly soon fade away. You begin to tell her about yourself, the topic soon moving to your sexual adventures when she asks you about them: how many guys you''ve been with, how many at once, how many times you''ve had anal, whether you liked it, and many other questions. You confess all kinds of intimate details to her, barely giving it a second thought.'
 				'Before you know it, the wine bottle in front of you is empty. And as it turns out, you drank most of it. Mistress is still on her first glass. She looks at you sternly, and says it''s time for you to go now. When she ushers you out the door, she says: "I''ll be awaiting your return, I can''t wait to share my knowledge with you."'
-				act 'Leave her apartment':gt'street'
+				act 'Leave her apartment':gt'city_residential'
 			end
 		end
 
@@ -158,7 +158,7 @@ if $ARGS[0] = 'QW1':
 					'Natalya puts her hand on yours reassuringly: "I think you will love it. But, we don''t start until next time. Today is just for getting to know one another. So... why don''t you tell me a little about yourself?"'
 					'You have a few more sips of the wine, and your nerves and uncertainly soon fade away. You begin to tell her about yourself, the topic soon moving to your sexual adventures when she asks you about them: how many guys you''ve been with, how many at once, how many times you''ve had anal, whether you liked it, and many other questions. You confess all kinds of intimate details to her, barely giving it a second thought.'
 					'Before you know it, the wine bottle in front of you is empty. And as it turns out, you drank most of it. Natalya is still on her first glass. She looks at you sternly, and says it''s time for you to go now. When she ushers you out the door, she says: "I''ll be awaiting your return, I can''t wait to share my knowledge with you."'
-					act 'Leave her apartment':gt'street'
+					act 'Leave her apartment':gt'city_residential'
 				end
 			end
 		else
@@ -206,7 +206,7 @@ if $ARGS[0] = 'QW2':
 		
 		gs 'stat'
 		
-		act 'Leave her apartment':gt'street'
+		act 'Leave her apartment':gt'city_residential'
 	end
 
 	gs 'willpower', 'humiliation', 'resist', 'hard'
@@ -241,7 +241,7 @@ if $ARGS[0] = 'QW2':
 				'Suddenly she gives you a hard slap on the ass, and tells you: "Time''s up. You need to go."'
 				'You carefully take off her lingerie set and put your own clothes back on. When you gather your things and get ready to leave, you try to think back of what you have learned from her demeanour and lessons today. Not much, to be honest... but it was fascinating to see her work with you.'
 		
-				act 'Leave her apartment':gt'street'
+				act 'Leave her apartment':gt'city_residential'
 			end
 		end
 	else
@@ -276,7 +276,7 @@ if $ARGS[0] = 'QW2':
 					'When the 30 minutes are over, she orders you to quickly dress and leave. She walks you to the door after watching you get dressed, and tells you with a steel expression: "If you decide to come back, you know what I expect from you. Today was unacceptable, and I will not tolerate it again."'
 					'When you step outside her door, you feel a bit unnerved. You didn''t learn anything! Mistress displayed a lot of control, though. You decide to give yourself some time to let today''s lesson sink in. Maybe you missed something?'
 						
-					act 'Leave her apartment':gt'street'
+					act 'Leave her apartment':gt'city_residential'
 				end					
 			end
 		else
@@ -317,7 +317,7 @@ if $ARGS[0] = 'QW3':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Leave her apartment':gt'street'
+		act 'Leave her apartment':gt'city_residential'
 	end
 	if MistressResist = 1:
 		act 'Refuse to be a pet':
@@ -462,7 +462,7 @@ if $ARGS[0] = 'QW3':
 										gs 'arousal', 'end'
 										gs 'stat'
 										
-										act 'Get dressed and leave':gt'street'
+										act 'Get dressed and leave':gt'city_residential'
 									end
 								end
 							end
@@ -508,7 +508,7 @@ if $ARGS[0] = 'QW3':
 					'She lets you stand in this position for ten more minutes, while she has a cup of coffee. When you''re finally allowed to put your clothes back on, you wince when the fabric touches the whip marks. You''re not sure how you''re going to sit down, for the next few days...'
 					'Mistress definitely made her point today; these ''lessons'' from her are not going to be easy. She will make it hurt, if you do not comply with what she wants. She will make it hurt badly. Is it really worth it?'
 						
-					act 'Leave her apartment':gt'street'
+					act 'Leave her apartment':gt'city_residential'
 				end
 			end
 		else
@@ -564,7 +564,7 @@ if $ARGS[0] = 'QW4':
 			gs 'arousal', 'end'
 			gs 'stat'
 				
-			act 'Leave her apartment':gt'street'
+			act 'Leave her apartment':gt'city_residential'
 		end
 	end
 	if MistressResist = 2:
@@ -632,7 +632,7 @@ if $ARGS[0] = 'QW4':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act '"Leave Natalya''s apartment"':gt'street'
+					act '"Leave Natalya''s apartment"':gt'city_residential'
 				end
 			end
 		end
@@ -671,7 +671,7 @@ if $ARGS[0] = 'QW4':
 					'She looks down at you a full minute and scans your body from head to toe, focusing on your pussy in particular. Still she shrugs: "Too late, slave. You ruined it."'
 					'Then, she passively waves her hand at you and tells you to get out. Not wanting to anger her any further, you quickly get dressed in the hallway before she can change her mind.'
 
-					act 'Leave her apartment':gt'street'
+					act 'Leave her apartment':gt'city_residential'
 				end
 			end
 		else
@@ -739,7 +739,7 @@ if $ARGS[0] = 'QW5':
 			'It''s only then that you notice what she said. ''Keep you?'' She doesn''t own you! She''s really taking this teaching thing seriously...'
 			$orgasm_or = 'yes'
 			
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	end
 
@@ -814,7 +814,7 @@ if $ARGS[0] = 'QW5':
 							gs 'arousal', 'end'
 							gs 'stat'
 							
-							act 'Leave her apartment':gt'street'
+							act 'Leave her apartment':gt'city_residential'
 						end
 					end
 				else
@@ -849,7 +849,7 @@ if $ARGS[0] = 'QW5':
 						gs 'arousal', 'end'
 						gs 'stat'
 						
-						act 'Leave her apartment':gt'street'
+						act 'Leave her apartment':gt'city_residential'
 					end
 				end
 			end
@@ -942,7 +942,7 @@ if $ARGS[0] = 'QW6':
 								gs 'arousal', 'end'
 								gs 'stat'
 					
-								act 'Leave her apartment':gt'street'
+								act 'Leave her apartment':gt'city_residential'
 							end
 						else
 							'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub8.jpg"></center>'
@@ -959,7 +959,7 @@ if $ARGS[0] = 'QW6':
 							gs 'arousal', 'end'
 							gs 'stat'
 								
-							act 'Leave her apartment':gt'street'
+							act 'Leave her apartment':gt'city_residential'
 						end
 					end
 				else
@@ -987,7 +987,7 @@ if $ARGS[0] = 'QW6':
 						gs 'arousal', 'end'
 						gs 'stat'
 						
-						act 'Leave her apartment':gt'street'
+						act 'Leave her apartment':gt'city_residential'
 					end
 				end
 			end
@@ -1001,7 +1001,7 @@ if $ARGS[0] = 'QW6':
 			'While you clean, you begin to reflect on your current situation and Mistress in general. You can''t help but admire her, despite the torture she is putting you through. She clearly knows what she is doing, wearing you down like she is... she''s such a strong woman, so convincing! And if you keep paying attention, you will learn how to do this to other girls too! You just have to suffer through it, for a little while longer... it will be worth it in the long run for sure!'
 			'After two hours of cleaning, Mistress releases you. She deftly removes the cuffs and collar from you, says you can go and leaves without another word.'
 
-			act 'Leave her apartment':minut += 120 & pcs_mood = 5 & gt'street'
+			act 'Leave her apartment':minut += 120 & pcs_mood = 5 & gt'city_residential'
 		elseif temp = 2:
 		
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub11.jpg"></center>'
@@ -1010,7 +1010,7 @@ if $ARGS[0] = 'QW6':
 			'While you clean, you begin to reflect on your current situation and Mistress in general. You can''t help but admire her, despite the torture she is putting you through. She clearly knows what she is doing, wearing you down like she is... she''s such a strong woman, so convincing! And if you keep paying attention, you will learn how to do this to other girls too! You just have to suffer through it, for a little while longer... it will be worth it in the long run for sure!'
 			'After two hours of cleaning, Mistress says you can get up and take off the apron. She takes the apron out of your hands, says you can go and leaves without another word.'
 
-			act 'Leave her apartment':minut += 120 & pcs_mood = 5 & gt'street'
+			act 'Leave her apartment':minut += 120 & pcs_mood = 5 & gt'city_residential'
 		end
 	end
 end
@@ -1106,7 +1106,7 @@ if $ARGS[0] = 'QW7':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Thank her and leave':gt'street'
+					act 'Thank her and leave':gt'city_residential'
 				end
 			end
 		end
@@ -1192,7 +1192,7 @@ if $ARGS[0] = 'QW8':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Leave her apartment':gt'street'
+			act 'Leave her apartment':gt'city_residential'
 		end
 	end
 	gs 'willpower', 'exhib', 'resist'
@@ -1260,7 +1260,7 @@ if $ARGS[0] = 'QW8':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Leave her apartment':gt'street'
+					act 'Leave her apartment':gt'city_residential'
 				end
 			end
 			act 'Beg for forgiveness':
@@ -1301,7 +1301,7 @@ if $ARGS[0] = 'QW8':
 					'She nods, satisfied with your recovery. "Good. Now get out."'
 					'You quickly get up and leave the room, putting your clothes on in the hallway with no regard for the fact that Mistress just peed all over you. You thank your lucky stars that Mistress was in such a good mood today, but realize you really have to be more obedient from now on.'
 
-					act 'Leave her apartment': gt 'street'
+					act 'Leave her apartment': gt 'city_residential'
 				end
 			end
 		end
@@ -1399,7 +1399,7 @@ if $ARGS[0] = 'QW9':
 							'Still besides herself with rage, Mistress feels like she needs to drive her point home by whipping your ass for good measure. You meekly let her put the ball gag back into your mouth, aware of the fact that you''re screaming too much when she beats you. You deserve this. Hopefully, Mistress will find it in her heart to give you one final chance so you can prove to her that you are worthy of her attention.'
 							'After a half hour, Mistress undoes your binds and pushes you out of her home, naked. She tosses your clothes out of a window soon after and you get silently get dressed in the streets, thinking about what just happened.'
 
-							act 'Get dressed and leave':gt'street'
+							act 'Get dressed and leave':gt'city_residential'
 						end
 					end
 				end
@@ -1447,7 +1447,7 @@ if $ARGS[0] = 'QW10a':
 		gs 'arousal', 'foreplay', 30, 'sub'
 		gs 'stat'
 		
-		act 'Leave her apartment':gt'street'
+		act 'Leave her apartment':gt'city_residential'
 	elseif temp = 1:
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub19.jpg"></center>'
 		'Once you are naked, Mistress eyes your body up and down again like she always does. You remember your position lectures, and present yourself while you can see her mull over what to do with you today.'
@@ -1477,10 +1477,10 @@ if $ARGS[0] = 'QW10a':
 				gs 'arousal', 'end'
 				gs 'stat'
 		
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		else
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	else
 		if analplugin = 1:
@@ -1520,10 +1520,10 @@ if $ARGS[0] = 'QW10a':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		else
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	end
 end
@@ -1583,7 +1583,7 @@ if $ARGS[0] = 'QW10b1':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	else
 		act 'Continue':
@@ -1606,7 +1606,7 @@ if $ARGS[0] = 'QW10b1':
 			gs 'arousal', 'end'
 			gs 'stat'
 				
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	end
 end
@@ -1669,10 +1669,10 @@ if $ARGS[0] = 'QW10b2':
 					gs 'arousal', 'end'
 					gs 'stat'
 				
-					act 'Leave her apartment':gt'street'
+					act 'Leave her apartment':gt'city_residential'
 				end
 			else
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		end
 	elseif temp = 1:
@@ -1706,10 +1706,10 @@ if $ARGS[0] = 'QW10b2':
 					gs 'arousal', 'end'
 					gs 'stat'
 				
-					act 'Leave her apartment':gt'street'
+					act 'Leave her apartment':gt'city_residential'
 				end
 			else
-				act 'Wait til she unties you and leave':gt'street'
+				act 'Wait til she unties you and leave':gt'city_residential'
 			end
 		end
 	else
@@ -1760,10 +1760,10 @@ if $ARGS[0] = 'QW10b2':
 					gs 'arousal', 'end'
 					gs 'stat'
 				
-					act 'Leave her apartment':gt'street'
+					act 'Leave her apartment':gt'city_residential'
 				end
 			else
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		end
 	end
@@ -1806,7 +1806,7 @@ if $ARGS[0] = 'QW10b3':
 			gs 'arousal', 'end'
 			gs 'stat'
 					
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	else
 		act 'Continue':
@@ -1843,10 +1843,10 @@ if $ARGS[0] = 'QW10b3':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Thank her and leave':gt'street'
+					act 'Thank her and leave':gt'city_residential'
 				end
 			else
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		end
 	end
@@ -1899,10 +1899,10 @@ if $ARGS[0] = 'QW10c':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Leave her apartment':gt'street'
+					act 'Leave her apartment':gt'city_residential'
 				end
 			else
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		end
 		act '"Anything but that, please!"':
@@ -1938,7 +1938,7 @@ if $ARGS[0] = 'QW10c':
 					'Mistress keeps you restrained on her bed for four full hours, occasionally checking up on you to see if you''re okay. Every time she comes in, she raises your hopes and then immediately crushes them by walking out again."'
 					'After those four hours she strokes your hair for a second before untying your bonds one by one. While she unbinds you, she says: "Poor slave... why do you make me keep punishing you? You should trust that I know what''s best for you..."'
 					
-					act 'Get dressed and leave':gt'street'
+					act 'Get dressed and leave':gt'city_residential'
 				end
 			else
 				act 'Continue':
@@ -1958,7 +1958,7 @@ if $ARGS[0] = 'QW10c':
 					if pcs_makeup > 1: pcs_makeup = 0 & 'If you were wearing any make-up, that''s definitely ruined now.'
 					'Mistress inspects your work and nods approvingly: "Good enough, slave. You''re dismissed."'
 
-					act 'Get dressed and leave':gt'street'
+					act 'Get dressed and leave':gt'city_residential'
 				end
 			end
 		end
@@ -2000,10 +2000,10 @@ if $ARGS[0] = 'QW10c':
 				gs 'arousal', 'end'
 				gs 'stat'
 					
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		else
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	else
 		minut += 40
@@ -2036,10 +2036,10 @@ if $ARGS[0] = 'QW10c':
 				gs 'arousal', 'end'
 				gs 'stat'
 					
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		else
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	end
 end
@@ -2071,7 +2071,7 @@ if $ARGS[0] = 'QW11':
 		'"Good luck!" the other woman grins, as you walk by her on your way out. Damn, she overheard everything... what must she be thinking of you?'
 		'You''re a bit distraught as you step out the door. You''re not allowed back in, until you suck <i>twenty dicks</i> of guys you don''t even know! Would Mistress find out if you just came back after a few days, even if you didn''t do all twenty? And also, do you think you could lie to her? Maybe you should just get it over with...'
 
-		act 'Leave her apartment':gt'street'	
+		act 'Leave her apartment':gt'city_residential'	
 	elseif mistressqwest > 20:
 		minut += 5
 		pcs_horny += 20
@@ -2135,7 +2135,7 @@ if $ARGS[0] = 'QW11':
 			'"Put those on and leave, slave", she says nodding at your clothes. "Your assignment still stands. Do not disappoint me again!"'
 			'Mistress walks off before you can say anything. You wallow in self-pity while you carefully put your clothes back on, wincing whenever the fabric touches one of the countless welts on your body.'
 			
-			act 'Leave her apartment':gt'street'
+			act 'Leave her apartment':gt'city_residential'
 		end
 	end
 end
@@ -2199,7 +2199,7 @@ if $ARGS[0] = 'QW12':
 					'You have a pleasant chat with Mistress for another half hour, after which she apologizes; she really has other things to attend to today. She gives you a light peck on the cheek and grins: "So, slave... how does it feel to be owned?"'
 					'"It feels good, Mistress", you admit.'
 					
-					act 'Get dressed and leave':gt 'street'
+					act 'Get dressed and leave':gt 'city_residential'
 				end
 				act 'Ask if you can think it over':
 					cla
@@ -2214,7 +2214,7 @@ if $ARGS[0] = 'QW12':
 					'"That''s fair", you nod. "I will get back to you soon."'
 					'With nothing left to say, you stand up and get ready to leave Mistress'' apartment.'
 					
-					act 'Get dressed and leave':gt 'street'
+					act 'Get dressed and leave':gt 'city_residential'
 				end
 				act 'Refuse to sign a contract':
 					cla
@@ -2231,7 +2231,7 @@ if $ARGS[0] = 'QW12':
 					'She offers you a luxurious black business card with a gold trim. "If you''re interested... this will get you in."'
 					'Then she stands up, and signals for you to do the same. She says: "I guess this is where we part ways, then. Take care, <<$pcs_nickname>>."'
 					
-					act 'Say goodbye to Mistress and leave':gt 'street'
+					act 'Say goodbye to Mistress and leave':gt 'city_residential'
 				end
 			end
 		end
@@ -2259,7 +2259,7 @@ if $ARGS[0] = 'QW12':
 			'"That would be nice, Mistress", you smile back at her. When you see her break open a rather old looking bottle of wine you feel touched; this must''ve meant a lot to her too.'
 			'You have a pleasant chat with for another half hour, after which she apologizes; she really has other things to attend to today. She gives you a light peck on the cheek and grins: "So, slave, how does it feel to be owned?"'
 			'"It feels good, Mistress", you admit.'
-			act 'Leave her apartment':gt 'street'
+			act 'Leave her apartment':gt 'city_residential'
 		end
 		act 'Ask for a shorter term':
 			cla
@@ -2283,7 +2283,7 @@ if $ARGS[0] = 'QW12':
 				'"That would be nice, Mistress", you smile back at her. When you see her break open a rather old looking bottle of wine you feel touched; this must''ve meant a lot to her too.'
 				'You have a pleasant chat with Mistress for another half hour, after which she apologizes; she really has other things to attend to today. She gives you a light peck on the cheek and grins: "So, slave, how does it feel to be owned?"'
 				'"It feels good, Mistress", you admit.'
-				act 'Leave her apartment':gt 'street'
+				act 'Leave her apartment':gt 'city_residential'
 			end
 			act 'Decline':
 				cla
@@ -2298,7 +2298,7 @@ if $ARGS[0] = 'QW12':
 				'She finally breaks it, saying: "You know, I wasn''t lying when I said I see potential in you. There''s a BDSM club near the city, where people with interest in our lifestyle can go to explore their interests. I think you would enjoy going there."'
 				'She offers you a luxurious black business card with a gold trim. "If you''re interested... this will get you in."'
 				'Then she stands up, and signals for you to do the same. She says: "I guess this is where we part ways, then. Take care, <<$pcs_nickname>>."'
-				act 'Say goodbye to Mistress and leave':gt 'street'
+				act 'Say goodbye to Mistress and leave':gt 'city_residential'
 			end
 		end
 		act 'Refuse to sign the contract':
@@ -2314,7 +2314,7 @@ if $ARGS[0] = 'QW12':
 			'She finally breaks it, saying: "You know, I wasn''t lying when I said I see potential in you. There''s a BDSM club near the city, where people with interest in our lifestyle can go to explore their interests. I think you would enjoy going there."'
 			'She offers you a luxurious black business card with a gold trim. "If you''re interested... this will get you in."'
 			'Then she stands up, and signals for you to do the same. She says: "I guess this is where we part ways, then. Take care, <<$pcs_nickname>>."'
-			act 'Say goodbye to Mistress and leave':gt 'street'
+			act 'Say goodbye to Mistress and leave':gt 'city_residential'
 		end
 	end
 end

locations/lesbimistress.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'start':
 					gs 'arousal', 'foreplay', 40, 'sub', 'maso'
 					gs 'stat'
 			
-					act 'Leave':minut += 5 & gt'street'
+					act 'Leave':minut += 5 & gt'city_residential'
 				else
 					lesbiday = daystart
 					if BDSMtaxi = 0 and ((mistresscontract - daystart < 300 and mistresscontract - daystart > 200) or mistresscontract - daystart < 120): gt 'lesbimistress', 'BDSMEV'
@@ -160,7 +160,7 @@ if $ARGS[0] = 'gholefinish':
 		gs 'arousal', 'end'
 		gs 'stat'
 					
-		act 'Leave her apartment':gt'street'
+		act 'Leave her apartment':gt'city_residential'
 	end
 end
 
@@ -199,7 +199,7 @@ if $ARGS[0] = 'gholepunish':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Leave her apartment':gt'street'
+		act 'Leave her apartment':gt'city_residential'
 	end
 end
 
@@ -242,7 +242,7 @@ if $ARGS[0] = 'severe_1':
 	'After you''ve been bound for about two hours, Mistress comes back and carefully takes the vase out for of your stretched cunt. She caresses it for a moment before untying you.'
 	'"You looked beautiful, <<$pcs_nickname>>. I have the pictures to prove it", she winks, indicating that you can go now.'
 
-	act 'Get dressed and leave':gt'street'
+	act 'Get dressed and leave':gt'city_residential'
 end
 
 if $ARGS[0] = 'severe_2':
@@ -281,7 +281,7 @@ if $ARGS[0] = 'severe_2':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	end
 end
 
@@ -328,10 +328,10 @@ if $ARGS[0] = 'severe_3':
 			gs 'arousal', 'end'
 			gs 'stat'
 		
-			act 'Leave':gt'street'
+			act 'Leave':gt'city_residential'
 		end
 	else
-		act 'Leave':gt'street'
+		act 'Leave':gt'city_residential'
 	end
 end
 
@@ -369,7 +369,7 @@ if $ARGS[0] = 'severe_4':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub76.jpg"></center>'
@@ -388,7 +388,7 @@ if $ARGS[0] = 'severe_4':
 		gs 'arousal', 'end'
 		gs 'stat'
 			
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	end
 end
 
@@ -446,7 +446,7 @@ if $ARGS[0] = 'punish_1':
 				gs 'arousal', 'end'
 				gs 'stat'
 			
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		end
 	else
@@ -469,7 +469,7 @@ if $ARGS[0] = 'punish_1':
 			'When Mistress next enters the room, she immediately sees what happened. The large puddle on the table, your blubbering face trying to utter excuses through the gag. You can tell she actually feels bad for putting you through that.'
 			'"I... you can go, <<$pcs_nickname>>. I''m sorry. I''ll have someone else clean it up. Just go", she mutters.'
 
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	end
 end
@@ -489,7 +489,7 @@ if $ARGS[0] = 'punish_2':
 	'When Mistress comes back, she looks tired. "You''re dismissed, slave," she says, after she unties you. "See yourself out, I''m going to take a nap."'
 	'As you try to rub the numbness out of your sore muscles, you watch Mistress go to her bedroom. Well, that sucked...'
 
-	act 'Leave her apartment':gt'street'
+	act 'Leave her apartment':gt'city_residential'
 end
 
 if $ARGS[0] = 'punish_3':
@@ -558,7 +558,7 @@ if $ARGS[0] = 'punish_3':
 				gs 'arousal', 'end'
 				gs 'stat'
 			
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		else
 			MistressAdoration += 1
@@ -570,7 +570,7 @@ if $ARGS[0] = 'punish_3':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Leave her apartment':gt'street'
+			act 'Leave her apartment':gt'city_residential'
 		end
 	else
 		act 'Moo':
@@ -610,7 +610,7 @@ if $ARGS[0] = 'punish_3':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	end
 end
@@ -637,7 +637,7 @@ if $ARGS[0] = 'punish_4':
 	'Masha grins and licks her lips greedily, already looking forward to the day. After nearly two hours, Mistress says you can get up and leave for today.'
 	'Masha is still there, and she smiles deviously as you move to the hallway: "Bye slave, see you soon! Can''t wait to get to know you..."'
 
-	act 'Get dressed and leave':gt'street'
+	act 'Get dressed and leave':gt'city_residential'
 end
 
 if $ARGS[0] = 'punish_5':
@@ -669,7 +669,7 @@ if $ARGS[0] = 'punish_5':
 		'"That was nice, slave. I slept like a log", Mistress says. "You''re dismissed."'
 		'"Yes, Mistress. Thank you", you reply, trying to hide your disappointment. That was not at all how you hoped a sleepover with Mistress would go.'
 
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	else
 		spank += 1
 		gs 'sweat', 'add', 20
@@ -696,7 +696,7 @@ if $ARGS[0] = 'punish_5':
 		gs 'arousal', 'end'
 		gs 'stat'
 			
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	end
 end
 
@@ -824,7 +824,7 @@ if $ARGS[0] = 'punish_6':
 								gs 'arousal', 'end'
 								gs 'stat'
 								
-								act 'Get dressed and leave':gt'street'
+								act 'Get dressed and leave':gt'city_residential'
 							end
 							gs 'willpower', 'vaginal', 'resist', 'medium'
 							if will_cost <= pcs_willpwr:
@@ -846,7 +846,7 @@ if $ARGS[0] = 'punish_6':
 									gs 'arousal', 'end'
 									gs 'stat'
 					
-									act 'Get dressed and leave':gt'street'
+									act 'Get dressed and leave':gt'city_residential'
 								end
 							else
 								act 'You''d rather not! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -911,7 +911,7 @@ if $ARGS[0] = 'neutral_1':
 			'You dutifully count the slaps between cries, and when Mistress delivers the final stroke, she tells you to sit in the corner for thirty minutes and think about how you disappointed her.'
 			'Almost immediately you feel tears burning in your eyes, but not from the spanking. Sure... that hurts, but you can live with it. You''re crying because you let Mistress down and upset her. Even though today started off so nicely.'
 
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	else
 		MistressAdoration += 1
@@ -919,7 +919,7 @@ if $ARGS[0] = 'neutral_1':
 		*nl
 		'Eventually Mistress returns, she takes the pot off you and undoes all your binds.'
 		'"You did well today." She whispers in your ear as she unfastens ball gag.'
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	end
 end
 
@@ -959,7 +959,7 @@ if $ARGS[0] = 'neutral_2':
 		gs 'arousal', 'end'
 		gs 'stat'
 				
-		act 'See yourself out':gt'street'
+		act 'See yourself out':gt'city_residential'
 	end
 	act 'Tease her by taking it slow':
 		cla
@@ -979,7 +979,7 @@ if $ARGS[0] = 'neutral_2':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'See yourself out':gt'street'
+		act 'See yourself out':gt'city_residential'
 	end
 end
 
@@ -1013,7 +1013,7 @@ if $ARGS[0] = 'neutral_3':
 		'She puts the laptop in her bag and runs for the door: "I really have to get going though, can''t be late! I''ll make sure we have some fun next time, you deserve it! See yourself out, okay?"'
 		'"Yes Mistress, thank you. Good luck on your meeting", you tell her. As you remove the collar and panties and put everything back the way you found it, you can''t help but think about it. What could she have planned for you, if she thinks pictures like that would be a great help?'
 
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	end
 end
 
@@ -1036,7 +1036,7 @@ if $ARGS[0] = 'neutral_4':
 	'"That was fun, but at the same time unnerving", she chuckles. "I felt like I was being watched by a bank robber while I was reading my novel!"'
 	'You laugh while you rub some feeling back into your sore muscles. Mistress kisses you on your cheek: "Thanks, babe... I needed that. See yourself out, will you?"'
 
-	act 'Get dressed and leave':gt'street'
+	act 'Get dressed and leave':gt'city_residential'
 end
 
 if $ARGS[0] = 'neutral_5':
@@ -1073,7 +1073,7 @@ if $ARGS[0] = 'neutral_5':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Leave her apartment':gt'street'
+		act 'Leave her apartment':gt'city_residential'
 	end
 end
 
@@ -1092,7 +1092,7 @@ if $ARGS[0] = 'neutral_6':
 		'"I bet any dish washer would love to clean this plate, haha!" Mistress jokes, as she puts out her food. She eats slowly, savouring her meal. You can''t help but notice her caressing your boobs every time she changes cutlery. When she finishes, she gives you a light peck on the lips before untying you.'
 		'"Delicious..." she muses. "Time for you to go, slave."'
 
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub65.jpg"></center>'
 		'Mistress smiles mysteriously, and gestures for you to keep undressing while she goes to collect some things. When she comes back, she has some peculiar items in her hands.'
@@ -1103,7 +1103,7 @@ if $ARGS[0] = 'neutral_6':
 		'You sigh, and bark in response. Mistress beams at you: "Good girl! Who''s a good girl!" You bark again.'
 		'For the next two hours, she trains you in being a good pet slave. Sometimes leashing you, sometimes letting you run free. She even plays fetch with you at some point. Luckily there is no litter box anywhere, or she''d probably have you use that too!'
 
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	end
 end
 
@@ -1130,7 +1130,7 @@ if $ARGS[0] = 'neutral_7':
 	'Mistress gives you a confident nod and reassures you: "I know you''ll make me proud, slave. Come, I''ll let you out."'
 	'"Good luck, slave!" the other woman grins, as you walk by her on your way out. Damn, she overheard everything... what must she be thinking of you?'
 	
-	act 'Leave her apartment':gt'street'
+	act 'Leave her apartment':gt'city_residential'
 end
 
 if $ARGS[0] = 'neutral_8':
@@ -1173,10 +1173,10 @@ if $ARGS[0] = 'neutral_8':
 			gs 'arousal', 'end'
 			gs 'stat'
 		
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	else
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	end
 end
 
@@ -1279,7 +1279,7 @@ if $ARGS[0] = 'neutral_9':
 						gs 'arousal', 'end'
 						gs 'stat'
 						
-						act 'Go back home':gt'street'
+						act 'Go back home':gt'city_residential'
 					end
 				end
 			end
@@ -1316,7 +1316,7 @@ if $ARGS[0] = 'treat_1':
 		'You get plenty of time to think. Several hours later, Mistress finally comes to unlock you.'
 		'"Don''t take the gag out until you''re fully clothed and ready to leave, I don''t want to hear another word from you today", she tells you dismissively.'
 
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	end
 	act 'Masturbate in front of her':
 		cla
@@ -1343,7 +1343,7 @@ if $ARGS[0] = 'treat_1':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	end
 end
 
@@ -1380,7 +1380,7 @@ if $ARGS[0] = 'treat_2':
 		gs 'arousal', 'end'
 		gs 'stat'
 	
-		act 'Get dressed and leave':gt'street'
+		act 'Get dressed and leave':gt'city_residential'
 	end
 
 	act 'Offer to thank her with your mouth':
@@ -1398,7 +1398,7 @@ if $ARGS[0] = 'treat_2':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Leave her apartment':gt'street'
+		act 'Leave her apartment':gt'city_residential'
 	end
 end
 
@@ -1465,7 +1465,7 @@ if $ARGS[0] = 'treat_3':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Get dressed and leave':gt'street'
+					act 'Get dressed and leave':gt'city_residential'
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub72.jpg"></center>'
@@ -1483,7 +1483,7 @@ if $ARGS[0] = 'treat_3':
 				gs 'arousal', 'end'
 				gs 'stat'
 					
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		end
 	else
@@ -1523,7 +1523,7 @@ if $ARGS[0] = 'treat_3':
 					gs 'arousal', 'end'
 					gs 'stat'
 				
-					act 'Get dressed and leave':gt'street'
+					act 'Get dressed and leave':gt'city_residential'
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub73.jpg"></center>'
@@ -1537,7 +1537,7 @@ if $ARGS[0] = 'treat_3':
 				gs 'arousal', 'end'
 				gs 'stat'
 					
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		end
 	end
@@ -1572,7 +1572,7 @@ if $ARGS[0] = 'treat_4':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Get dressed and leave':gt'street'				
+	act 'Get dressed and leave':gt'city_residential'				
 end
 
 if $ARGS[0] = 'amazing_1':
@@ -1613,7 +1613,7 @@ if $ARGS[0] = 'amazing_1':
 			gs 'arousal', 'end'
 			gs 'stat'
 				
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	elseif temp = 1:
 		act 'Continue':
@@ -1638,7 +1638,7 @@ if $ARGS[0] = 'amazing_1':
 			gs 'arousal', 'end'
 			gs 'stat'
 				
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	elseif temp = 2:
 		act 'Continue':
@@ -1657,7 +1657,7 @@ if $ARGS[0] = 'amazing_1':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	elseif temp = 3:
 		act 'Continue':
@@ -1694,7 +1694,7 @@ if $ARGS[0] = 'amazing_1':
 				gs 'arousal', 'end'
 				gs 'stat'
 			
-				act 'Get dressed and leave':gt'street'
+				act 'Get dressed and leave':gt'city_residential'
 			end
 		end
 	end
@@ -1731,7 +1731,7 @@ if $ARGS[0] = 'amazing_2':
 			'She locks it around your neck anyway, and cuffs your hands together. She lazily attaches a chain from your beautiful collar to the cuffs, but is too distraught to even worry about locking you down further.'
 			'"Just... sit like this for a while and think", she mutters dejectedly. After an hour she comes back, and unlocks the handcuffs. Then she unlocks your collar and carefully puts it back into its box. "That''s it for today. Just go."'
 
-			act 'Get dressed and leave':gt'street'
+			act 'Get dressed and leave':gt'city_residential'
 		end
 	else
 		act 'Refuse to go out wearing a collar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1753,7 +1753,7 @@ if $ARGS[0] = 'amazing_2':
 		'After an hour, Mistress decides the two of you should go back home. After you change back to your regular clothes, Mistress kisses your cheek softly again and embraces you.'
 		'"Thanks, <<$pcs_nickname>>, I needed that. Sometimes it''s nice to just let loose and enjoy each other''s company for a change. Don''t get too comfortable though! Next time we''ll get back to making you the best slavegirl this city has ever seen", she grins evilly and smacks you on your ass. "I should check up on Lilia to make sure she''s okay. See yourself out, will you?"'
 
-		act 'Leave her apartment':gt'street'
+		act 'Leave her apartment':gt'city_residential'
 	end
 end
 
@@ -1834,7 +1834,7 @@ if $ARGS[0] = 'amazing_3':
 					'The two of you quickly get dressed, giggling softly. When you leave the pool, Mistress kisses your cheek and says: "Thanks, <<$pcs_nickname>>, I had fun. Do you want me to give you a ride home, or do you want to stay here?"'
 					
 					act 'Stay in the city center':gt'city_center'
-					act 'Go back to the residential district with her':gt'street'
+					act 'Go back to the residential district with her':gt'city_residential'
 				end
 			end
 		end
@@ -1889,7 +1889,7 @@ if $ARGS[0] = 'renewal':
 			'Mistress is disappointed of course, but to your surprise she does not object.'
 			'She simply sighs: "Get up, then. I had a feeling you would say no."'
 			'When you get up to your feet, Mistress walks over to you and gives you a tender kiss on your forehead. "Take care, <<$pcs_nickname>>... maybe I''ll see you again at the club one day."'
-			act 'Say goodbye to Mistress and leave': gt 'street'
+			act 'Say goodbye to Mistress and leave': gt 'city_residential'
 		end
 	!Mistress is underwhelmed with your performance, and fears she might be wasting her efforts on you. You will have to beg her to allow you to stay, or you can agree and just leave. If you beg, MistressObedience = 2 will be set and you will play through an 'unpleasant' scene, but you can renew.
 	else
@@ -1912,7 +1912,7 @@ if $ARGS[0] = 'renewal':
 			'You do as she says, noticing how Mistress'' demeanour suddenly changed a lot. It''s as if she completely lost interest in you, the moment you didn''t speak up when she expressed her doubts.'
 			'You chat for a few more minutes, reminiscing to the good times of your service. Then she walks you to the door and says: "I guess this is where we part ways, then. Take care, <<$pcs_nickname>>."'
 			'"Farewell, Mistress", you mutter, feeling a bit sad despite knowing it was the only choice.'
-			act 'Leave her apartment':gt'street'
+			act 'Leave her apartment':gt'city_residential'
 		end
 	end
 end
@@ -2116,7 +2116,7 @@ if $ARGS[0] = 'mistmeet':
 							gs 'arousal', 'end'
 							gs 'stat'
 							
-							act 'Finish':gt'street'
+							act 'Finish':gt'city_residential'
 						end
 					else
 						act 'Further':
@@ -2134,7 +2134,7 @@ if $ARGS[0] = 'mistmeet':
 							gs 'arousal', 'end'
 							gs 'stat'
 		
-							act 'Finish':gt'street'
+							act 'Finish':gt'city_residential'
 						end
 					end
 				end

locations/lesbisubhouse.qsrc

@@ -19,15 +19,15 @@ if $ARGS[0] = 'start':
 		if mistsexshop = 1 and hour >= 12 and hour < 17 and slavejobday ! daystart:
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/doorlock.jpg"></center>'
 			'You ring the bell, but no one opens. Then you remember: Your slave is probably working in the sexshop''s basement right now.'
-			act 'Leave':gt'street'
+			act 'Leave':gt'city_residential'
 		elseif mistsexshop = 0 and hour >= 20 and hour < 22 and lesbiday = daystart and slavejobday ! daystart and slavejoballexp >= 50:
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/doorlock.jpg"></center>'
 			'You ring the bell, but no one opens. You can''t hear anything from inside, so it seems like nobody''s home. But where could your slave be?'
-			act 'Leave':gt'street'
+			act 'Leave':gt'city_residential'
 		elseif mistsexshop = 2 and hour >= 16 and hour <= 23:
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/doorlock.jpg"></center>'
 			'You ring the bell, but no one opens. Then you remember: Your slave is probably whoring herself out near the highway right now.'
-			act 'Leave':gt'street'
+			act 'Leave':gt'city_residential'
 		else
 			if mistendbound > 50 and temp = 0:
 				$location_type = 'indoors'
@@ -147,12 +147,12 @@ if $ARGS[0] = 'start':
 							if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 							'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-							act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'street'
+							act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 						end
-						act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'street'
+						act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'city_residential'
 					end
 				else
-					act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+					act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 				end
 				act 'Pee on her, then leave':
 					cls
@@ -168,7 +168,7 @@ if $ARGS[0] = 'start':
 					if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 					'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-					act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+					act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 				end
 			end
 			act 'Fuck her ass':
@@ -243,12 +243,12 @@ if $ARGS[0] = 'start':
 							if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 							'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-							act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'street'
+							act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 						end
-						act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'street'
+						act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'city_residential'
 					end
 				else
-					act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+					act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 				end
 				act 'Pee on her, then leave':
 					cls
@@ -264,7 +264,7 @@ if $ARGS[0] = 'start':
 					if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 					'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-					act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+					act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 				end
 			end
 			act 'Fuck your pussy with her mouth... sort of':
@@ -308,12 +308,12 @@ if $ARGS[0] = 'start':
 							if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 							'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-							act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'street'
+							act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 						end
-						act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'street'
+						act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'city_residential'
 					end
 				else
-					act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+					act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 				end
 				act 'Pee on her, then leave':
 					cls
@@ -329,7 +329,7 @@ if $ARGS[0] = 'start':
 					if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 					'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-					act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+					act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 				end
 			end
 		else
@@ -534,12 +534,12 @@ if $ARGS[0] = 'start':
 								if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 								'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-								act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'street'
+								act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 							end
-							act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'street'
+							act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'city_residential'
 						end
 					else
-						act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+						act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 					end
 					act 'Pee on her, then leave':
 						cls
@@ -555,7 +555,7 @@ if $ARGS[0] = 'start':
 						if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 						'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-						act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+						act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 					end
 				end
 				act 'Fuck her in the ass':
@@ -608,12 +608,12 @@ if $ARGS[0] = 'start':
 								if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 								'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-								act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'street'
+								act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 							end
-							act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'street'
+							act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'city_residential'
 						end
 					else
-						act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+						act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 					end
 					act 'Pee on her, then leave':
 						cls
@@ -629,7 +629,7 @@ if $ARGS[0] = 'start':
 						if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 						'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-						act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+						act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 					end
 				end
 				act 'Fuck your ass with her mouth... sort of':
@@ -673,12 +673,12 @@ if $ARGS[0] = 'start':
 								if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 								'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-								act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'street'
+								act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 							end
-							act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'street'
+							act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'city_residential'
 						end
 					else
-						act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+						act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 					end
 					act 'Pee on her, then leave':
 						cls
@@ -694,7 +694,7 @@ if $ARGS[0] = 'start':
 						if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 						'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-						act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+						act 'What a relief - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 					end
 				end
 			end
@@ -1058,7 +1058,7 @@ if $ARGS[0] = 'start':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Enough sex for now':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'street'
+					act 'Enough sex for now':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'city_residential'
 				end
 			end
 			if mistpiss >= 20:
@@ -1084,12 +1084,12 @@ if $ARGS[0] = 'start':
 						if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 						'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-						act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'street'
+						act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 					end
-						act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'street'
+						act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'city_residential'
 				end
 			else
-				act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+				act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 			end
 		end
 		act 'Fuck my ass':
@@ -1131,12 +1131,12 @@ if $ARGS[0] = 'start':
 						if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 						'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-						act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'street'
+						act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 					end
-						act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'street'
+						act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'city_residential'
 				end
 			else
-				act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+				act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 			end
 		end
 	end
@@ -1165,7 +1165,7 @@ if $ARGS[0] = 'ev1':
 			gs 'arousal', 'voyeur', 15, 'dom', 'lesbian', 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Enough of this for now - Leave':gt'street'
+			act 'Enough of this for now - Leave':gt'city_residential'
 		end
 	elseif lesbiQW = 3:
 		cls
@@ -1230,7 +1230,7 @@ if $ARGS[0] = 'ev1':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'It''s good to be Mistress - Leave the apartment for now':gt'street'
+						act 'It''s good to be Mistress - Leave the apartment for now':gt'city_residential'
 					end
 				end
 			end
@@ -1290,7 +1290,7 @@ if $ARGS[0] = 'ev1':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'What a show - Leave for now':gt'street'
+					act 'What a show - Leave for now':gt'city_residential'
 				end
 			end
 
@@ -1342,7 +1342,7 @@ if $ARGS[0] = 'ev1':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'And she better not forget it - Leave the apartment':gt'street'
+							act 'And she better not forget it - Leave the apartment':gt'city_residential'
 						end
 					end
 
@@ -1359,7 +1359,7 @@ if $ARGS[0] = 'ev1':
 						gs 'arousal', 'anal_strap_give', 10, 'dom', 'lesbian'
 						gs 'stat'
 
-						act 'There goes her anal virginity - Leave the apartment':gt'street'
+						act 'There goes her anal virginity - Leave the apartment':gt'city_residential'
 					end
 				end
 			end
@@ -1657,12 +1657,12 @@ if $ARGS[0] = 'ev1':
 						if mistpiss >= 20:'She opens her mouth wide and eagerly tries to catch your hot yellow stream of urine, rubbing her pussy all the while.'
 						'When your bladder is empty, you finish dressing and exit the apartment, leaving your slave alone, dirty, wet and covered in your urine.'
 
-						act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'street'
+						act 'You needed a bathroom break anyway - Leave now':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 					end
-					act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'street'
+					act 'YOU decide when you''re going to pee on her - Leave the apartment':mistbondage = 0 & mistressfist = 0 & mistpiss -= 1 & gt'city_residential'
 				end
 			else
-				act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'street'
+				act 'Enough sex for now - Leave the apartment':mistbondage = 0 & mistressfist = 0 & gt'city_residential'
 			end
 		end
 	else
@@ -1670,7 +1670,7 @@ if $ARGS[0] = 'ev1':
 		'What happend: Dead end'
 		'Location: lesbisubhouse'
 		'Variable lesbiQW: <<lesbiQW>>'
-		act 'Continue': gt'street'
+		act 'Continue': gt'city_residential'
 	end
 end
 

locations/love.qsrc

@@ -230,7 +230,7 @@ gs 'npcgeneratec', 0, '<<$loverdesc[lover_number]>>''s "friend"', rand(18,32)
 
 	loverlove[lover_number] = 2
 	'"Okay, it''s time to go, <<$pcs_nickname>>." says <<$loverdesc[lover_number]>>. You head for the exit.'
-	act 'Leave':gt 'street'
+	act 'Leave':gt 'city_residential'
 end
 
 if $ARGS[0] = '2':

locations/mainQW.qsrc

@@ -63,7 +63,7 @@ act 'Investigate':
 				act 'Leave':
 					minut += 15
 					if StoryLine = 0:
-						gt 'street'
+						gt 'city_residential'
 					else
 						gt 'pavResidential'
 					end

locations/metro.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	if sound = 0:PLAY 'sound/metro' + rand(1,4) + '.mp3',30
 	'<center><b><font color="maroon">Metro station</font></b></center>'
-	if $loc = 'street':
+	if $loc = 'city_residential':
 		'<center><b><font color="maroon">Residential Area</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platresident.jpg"></center>'
 	elseif $loc = 'city_center':
@@ -41,9 +41,9 @@ if $ARGS[0] = 'start':
 	end
 	
 	if money >= 16:
-		if $loc ! 'street':
+		if $loc ! 'city_residential':
 			act 'Go to the <b>Residential Area</b> (16 <b>₽</b>)':
-				$loc = 'street'
+				$loc = 'city_residential'
 				$metka = ''
 				money -= 16
 				minut += 10

locations/musorkaexh.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'pos2':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/bum.jpg"></center>'
 	'You see a hungover homeless man. He looks at you and you give him an angry look.'
 
-	act 'Leave':gt'street'
+	act 'Leave':gt'city_residential'
 end
 
 if $ARGS[0] = 'pos3':
@@ -25,7 +25,7 @@ if $ARGS[0] = 'pos3':
 	'"Is that you, young lady? Do not fear the old man!" The bum says with a predatory smile.'
 
 	act 'Ask what he needs':gt'musorkaexh','pos4'
-	act 'Leave':gt'street'
+	act 'Leave':gt'city_residential'
 end
 
 if $ARGS[0] = 'pos4':
@@ -60,7 +60,7 @@ if $ARGS[0] = 'pos5':
 	'He looks at you with her tearful eyes.'
 
 	act 'Allow him to kiss your hand':gt'musorkaexh','pos7'
-	act 'Of course not! Fuck the nasty old man!':gt'street'
+	act 'Of course not! Fuck the nasty old man!':gt'city_residential'
 end
 
 if $ARGS[0] = 'pos6':
@@ -75,7 +75,7 @@ if $ARGS[0] = 'pos6':
 	'You are standing in front of a hungover homeless man.'
 	'"Wow, so much. So much booze... uh, I mean, now I can buy gifts for the grandchildren, cough, cough.'
 
-	act 'Leave':gt'street'
+	act 'Leave':gt'city_residential'
 end
 
 if $ARGS[0] = 'pos7':
@@ -97,7 +97,7 @@ if $ARGS[0] = 'pos7':
 		'Suddenly, pulling your hand to him, he grabs you by the buttocks and starts, right through your clothes, kissing and sniffing furiously between your legs.'
 		'"Argh, sniff, sniff, what a beauty!'
 		
-		act 'Slap the freak and run away':gt'street'
+		act 'Slap the freak and run away':gt'city_residential'
 	end
 end
 
@@ -136,10 +136,10 @@ if $ARGS[0] = 'pos8':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Leave':gt'street'
+		act 'Leave':gt'city_residential'
 	end
 
-	act 'Leave':gt'street'
+	act 'Leave':gt'city_residential'
 end
 
 if $ARGS[0] = 'pos9':
@@ -154,7 +154,7 @@ if $ARGS[0] = 'pos9':
 	'Olga: - I certainly never thought, that I will do it. I was sent here Court, for public works, as a punishment for an administrative offense. Although in principle the right thing, and for the karma helpful, help people. If you''re interested, Take a business card, people we really need.'
 	'(On the business card is written "Mercy Clinic". Address indicates the city industrial region.'
 
-	act 'Leave':gt'street'
+	act 'Leave':gt'city_residential'
 end
 
 if $ARGS[0] = 'pos10':
@@ -194,7 +194,7 @@ if $ARGS[0] = 'pos10':
 				gs 'arousal', 'end'
 				'"No, that''s disgusting!"'
 				'You turn around and walk away from the trash.'
-				act 'Leave': gt'street'
+				act 'Leave': gt'city_residential'
 			else
 				gs 'npcgeneratec', 0, 'Homeless', rand(25,55)
 				gs 'boyStat', $npclastgenerated
@@ -226,7 +226,7 @@ if $ARGS[0] = 'pos10':
 							gs 'arousal', 'end'
 							gs 'stat'
 							
-							act 'Leave': gt'street'
+							act 'Leave': gt'city_residential'
 						end
 						act 'On your face':
 							*clr & cla
@@ -240,7 +240,7 @@ if $ARGS[0] = 'pos10':
 							gs 'arousal', 'end'
 							gs 'stat'
 							
-							act'Leave':gt'street'
+							act'Leave':gt'city_residential'
 						end
 					end
 				end
@@ -259,16 +259,16 @@ if $ARGS[0] = 'pos10':
 						gs 'arousal', 'end'
 						gs 'stat'
 					
-						act'Leave':gt'street'
+						act'Leave':gt'city_residential'
 					end
 				end
 			end
 		end
 
-		act 'Leave':gt'street'
+		act 'Leave':gt'city_residential'
 	end
 
-	act 'Leave':gt'street'
+	act 'Leave':gt'city_residential'
 end
 
 --- musorkaexh ---------------------------------

locations/narkopriton.qsrc

@@ -9,7 +9,7 @@ menu_off = 1
 'A local drug den, where you know addicts come to buy and use heroin in peace.'
 'A skinny guy opens the door, with a paranoid look in his eyes. He says doubtfully: "Are you sure you can afford to be here? My product ain''t cheap..."'
 
-act 'Get out of here': minut += 5 & gt 'street'
+act 'Get out of here': minut += 5 & gt 'city_residential'
 act 'You roll your eyes and push the door open': gt 'narkopriton', 'start'
 
 if $ARGS[0] = 'start':
@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'The skinny guy at the door looks you up and down as you enter, "So what can I get for you, honey?"'
 	if drugUser = 1:
-		act 'Leave the drug den': minut += 5 & gt 'street'
+		act 'Leave the drug den': minut += 5 & gt 'city_residential'
 		act 'Ask for heroin': gt 'narkopriton', 'heroin'
 		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
 		act 'Ask for weed': gt 'narkopriton', 'joints'
@@ -27,7 +27,7 @@ if $ARGS[0] = 'start':
 	elseif drugUser = 0:
 		'"Ahhh, what do you have?" you ask.'
 		'His eyes light up at a freshy and smiles wildy, "Well I have some H and amphetamine."'
-		act 'Leave the drug den': minut += 5 & gt 'street'
+		act 'Leave the drug den': minut += 5 & gt 'city_residential'
 		act 'Ask for heroin': gt 'narkopriton', 'heroin'
 		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
 		act 'Ask for weed': gt 'narkopriton', 'joints'
@@ -46,7 +46,7 @@ if $ARGS[0] = 'amphetamine':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'"That''ll be 80 <b>₽</b> per pill," he says.'
 	'You have <<amphetamine>> pills.'
-	act 'Leave the drug den': minut += 5 & gt 'street'
+	act 'Leave the drug den': minut += 5 & gt 'city_residential'
 	if money >= 1600:
 		act 'Buy 20 (1,600 <b>₽</b>)':
 			money -= 1600
@@ -86,7 +86,7 @@ if $ARGS[0] = 'joints':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'"That''ll be 250 <b>₽</b> for enough weed to make five joints," he says.'
 	'You have enough weed for <<joint>> joints.'
-	act 'Leave the drug den': minut += 5 & gt 'street'
+	act 'Leave the drug den': minut += 5 & gt 'city_residential'
 	if money >= 1000:
 		act 'Buy enough weed for 20 joints (1,000 <b>₽</b>)':
 			money -= 1000
@@ -126,7 +126,7 @@ if $ARGS[0] = 'cocaine':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'"That''ll be 360 <b>₽</b> for enough cocaine to get you high once," he says.'
 	'You have enough cocaine for <<dur>> lines.'
-	act 'Leave the drug den': minut += 5 & gt 'street'
+	act 'Leave the drug den': minut += 5 & gt 'city_residential'
 	if money >= 7200:
 		act 'Buy enough cocaine for 20 lines (7,200 <b>₽</b>)':
 			money -= 7200
@@ -165,7 +165,7 @@ if $ARGS[0] = 'heroin':
 	'<center><b>Local drug den</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'"That''ll be 300 <b>₽</b>," he says.'
-	act 'Leave the drug den': minut += 5 & gt 'street'
+	act 'Leave the drug den': minut += 5 & gt 'city_residential'
 	if money >= 420:
 		act 'Buy and use heroin (420 <b>₽</b>)':
 			money -= 420
@@ -189,7 +189,7 @@ if $ARGS[0] = 'heroin':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 						'You change your mind and give the syringe back to the guy.'
 						'"I don''t do refunds girl," he said.'
-						act '"I know," you say and leave': minut += 5 & gt 'street'
+						act '"I know," you say and leave': minut += 5 & gt 'city_residential'
 					end
 				else
 					act 'You can''t help but think of all the horror stories and return the drugs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -216,7 +216,7 @@ if $ARGS[0] = 'heroin':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/den/usingheroin.jpg"></center>'
 				'You buy some heroin and find a quiet place in the house to use it, and without thinking twice you shoot up.'
 
-				act 'Leave the drug den': minut += 5 & gt 'street'
+				act 'Leave the drug den': minut += 5 & gt 'city_residential'
 			end
 		end
 	elseif money < 500 and SLomka > 0:
@@ -245,7 +245,7 @@ if $ARGS[0] = 'drugslut':
 				gs 'willpower', 'drugs', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Leave dejectedly (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -288,7 +288,7 @@ if $ARGS[0] = 'drugslut':
 						gs 'willpower', 'bj', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'street'
+						gt 'city_residential'
 					end
 				else
 					act 'Change your mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -356,7 +356,7 @@ if $ARGS[0] = 'drugslut':
 				gs 'willpower', 'drugs', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'street'
+				gt 'city_residential'
 			end
 		else
 			act 'Leave dejectedly (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -405,7 +405,7 @@ if $ARGS[0] = 'drugslut':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Leave the drug den': minut += 5 & gt 'street'
+						act 'Leave the drug den': minut += 5 & gt 'city_residential'
 					end
 				end
 
@@ -416,7 +416,7 @@ if $ARGS[0] = 'drugslut':
 						gs 'willpower', 'bj', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'street'
+						gt 'city_residential'
 					end
 				else
 					act 'Change your mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/nastja.qsrc

@@ -142,7 +142,7 @@ if $ARGS[0] = 'pos8':
 		gs 'arousal', 'voyeur', 60, 'exhibitionism'
 		gs 'stat'
 		
-		act 'Say goodbye and go home':gt 'street'
+		act 'Say goodbye and go home':gt 'city_residential'
 	end
 end
 
@@ -195,7 +195,7 @@ if $ARGS[0] = 'pos9':
 					gs 'arousal', 'end'
 					gs 'stat'
 		
-					act 'Run out and hop into a taxi with Nastya':gt 'street'
+					act 'Run out and hop into a taxi with Nastya':gt 'city_residential'
 				end
 			end
 		end
@@ -213,7 +213,7 @@ if $ARGS[0] = 'pos9':
 			gs 'arousal', 'end'
 			gs 'stat'
 		
-			act 'Get a cab and go home':gt 'street'
+			act 'Get a cab and go home':gt 'city_residential'
 		end
 	end
 end
@@ -243,7 +243,7 @@ if $ARGS[0] = 'pos10':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Let the taxi take you home':gt 'street'
+		act 'Let the taxi take you home':gt 'city_residential'
 	end
 end
 
@@ -302,7 +302,7 @@ if $ARGS[0] = 'pos11':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Let the taxi take you home':gt 'street'
+					act 'Let the taxi take you home':gt 'city_residential'
 				end
 			end
 		end
@@ -422,7 +422,7 @@ if $ARGS[0] = 'pos18':
 	'"Yeah, maybe you''re right", Nastya reluctantly agrees, though you can tell that she''s disappointed by your answer. She sighs heavily. "It''s just a fantasy."'
 	'You talk about a few more fantasies and issues like molestation but soon decide that it''s time to pack your things and head home.'
 
-	act 'Leave the beach and go home':gt 'street'
+	act 'Leave the beach and go home':gt 'city_residential'
 end
 
 if $ARGS[0] = 'pos19':
@@ -476,7 +476,7 @@ if $ARGS[0] = 'pos21':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Head home':gt 'street'
+	act 'Head home':gt 'city_residential'
 end
 
 if $ARGS[0] = 'pos22':

locations/obj_din.qsrc

@@ -2402,7 +2402,7 @@ if $ARGS[0] = 'emergency':
 
 	cla
 	if StoryLine = 1:act 'Go to Pavlovsk':gt 'pavResidential'
-	act 'Go to City Residental':gt 'street'
+	act 'Go to City Residental':gt 'city_residential'
 	if $loc ! '' and $metka ! '':
 		act 'Cancel':gt $loc, $metka
 	elseif $loc ! '':

locations/park.qsrc

@@ -242,7 +242,7 @@ if $ARGS[0] = 'exit':
 	act 'Don''t leave': gt 'park', 'start'
 	!!this leads to the old street walker content, blocked until it''s fixed up or moved into the new street walker content (julzor)
 	!!act 'Go to the highway near the park (0:05)':minut += 5 & gt 'park', 'whore'
-	act 'Go to the Residential Area (0:20)':minut += 20 & gt 'street'
+	act 'Go to the Residential Area (0:20)':minut += 20 & gt 'city_residential'
 	act 'Go to the City Center (0:35)':minut += 35 & gt 'city_center'
 	act 'Go to the City Industrial Region (1:00)':minut += 60 & gt 'city_industrial'
 end

locations/parkivent.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = '1':
 					locbegrand = rand(0, 4)
 
 					if locbegrand = 0:gt 'park', 'start'
-					if locbegrand = 1:gt 'street'
+					if locbegrand = 1:gt 'city_residential'
 					if locbegrand = 2:gt 'city_center'
 					if locbegrand = 3:gt 'nord'
 					if locbegrand = 4:gt 'lake', 'start'
@@ -346,7 +346,7 @@ if $ARGS[0] = '3':
 							if locbegrand = 0:
 								act 'Take a look around to see where you are':gt 'park', 'start'
 							elseif locbegrand = 1:
-								act 'Take a look around to see where you are':gt 'street'
+								act 'Take a look around to see where you are':gt 'city_residential'
 							elseif locbegrand = 2:
 								act 'Take a look around to see where you are':gt 'city_center'
 							elseif locbegrand = 3:

locations/pharmacy.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/aptekabusy<<people>>.jpg"></center>'
 		*nl
 		'When you go up to check out their is <<people>> ' + iif(people < 2 or people > 4, 'people' , 'man' ) + ' in line before you.'
-		act 'Leave the pharmacy': minut += 5 & gt 'street'
+		act 'Leave the pharmacy': minut += 5 & gt 'city_residential'
 		act 'Wait for your turn' :
 			minut += rand(1,4) * people
 			people = 0
@@ -45,7 +45,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 		'<center>Their is a young woman behind the counter in a white coat,as you approach she asks. "Hello, what can I help you with?"</center>'
 	end
 
-	act 'Leave the pharmacy': minut += 5 & gt 'street'
+	act 'Leave the pharmacy': minut += 5 & gt 'city_residential'
 
 	!! output for purchased item
 	iif($ARGS[1] = '', '', '<center><<$ARGS[1]>></center>')

locations/poli.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'start':
 
 	if workhosp = 1 and hour >= 8 and hour <= 9 and week < 6:act 'Begin your work day':gt 'poli', 'beginwork'
 
-	act 'Leave the clinic': minut += 5 & gt 'street'
+	act 'Leave the clinic': minut += 5 & gt 'city_residential'
 	act 'Go see a cosmetic surgeon':gt 'poli','cosmetic1'
 	if lact_ev['pcs_knows_milkbank'] >= 1:
 		act 'Go to the breast milk donation office': minut += 5 & gt 'poli','milk_donation_room'
@@ -182,10 +182,10 @@ if $ARGS[0] = 'start':
 				act 'Go to Dr. Ninel':gt 'poli', 'ninel3'
 			elseif ninelrand = 1:
 				'At the reception desk you are told that Dr. Ninel can''t see you today.'
-				act 'Leave the clinic': minut += 5 & gt 'street'
+				act 'Leave the clinic': minut += 5 & gt 'city_residential'
 			elseif ninelrand = 2:
 				'At the reception desk you are told that Dr. Ninel is making house calls today.'
-				act 'Leave the clinic': minut += 5 & gt 'street'
+				act 'Leave the clinic': minut += 5 & gt 'city_residential'
 			end
 		end
 	end
@@ -229,11 +229,11 @@ if $ARGS[0] = 'start':
 						'You pay the dentist to straighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 					end
 
-					act 'Leave the clinic': minut += 5 & gt 'street'
+					act 'Leave the clinic': minut += 5 & gt 'city_residential'
 				end
 			end
 				
-			act 'Leave the clinic': minut += 5 & gt 'street'
+			act 'Leave the clinic': minut += 5 & gt 'city_residential'
 		end
 	end
 
@@ -271,11 +271,11 @@ if $ARGS[0] = 'start':
 					'<center><img <<$set_imgh>> src="images/pc/body/anus/<<anpic>>.jpg"></center>'
 					'You pay for the massage therapy and the doctor spends an hour carefully massaging your anal muscles, occasionally rubbing some ointment on them. It really isn''t as much fun as it looked in the brochure.'
 
-					act 'Leave the clinic': minut += 5 & gt 'street'
+					act 'Leave the clinic': minut += 5 & gt 'city_residential'
 				end
 			end
 
-			act 'Leave the clinic': minut += 5 & gt 'street'
+			act 'Leave the clinic': minut += 5 & gt 'city_residential'
 		end
 	end
 
@@ -628,7 +628,7 @@ if $ARGS[0] = 'drPP':
 					'He explains: "I removed the condom as soon as I found it. You might still feel sick for another while, but the feeling should slowly subside."'
 					'You thank the doctor.'
 
-					act 'Leave the clinic': minut += 5 & gt 'street'
+					act 'Leave the clinic': minut += 5 & gt 'city_residential'
 				end
 			end
 		else
@@ -649,7 +649,7 @@ if $ARGS[0] = 'drPP':
 					'"Don''t worry is just the common cold. Get some vitamins in the drugstore, have a couple days of bed rest and everything will be alright. Make sure to keep warm!"'
 					'You thank the Doctor.'
 
-					act 'Leave the clinic': minut += 5 & gt 'street'
+					act 'Leave the clinic': minut += 5 & gt 'city_residential'
 				end
 			end
 		end
@@ -690,7 +690,7 @@ if $ARGS[0] = 'ninel':
 					'"Don''t worry is just a common cold. Buy some vitamins in the drugstore, have a couple days of bed rest and everything will be alright. Make sure to keep warm."'
 					'You thank the Doctor.'
 
-					act 'Go home': minut += 5 & gt 'street'
+					act 'Go home': minut += 5 & gt 'city_residential'
 				end
 			end
 		else
@@ -830,7 +830,7 @@ if $ARGS[0] = 'ninel':
 														gs 'arousal', 'end'
 														gs 'stat'
 														
-														act 'Leave the clinic': minut += 5 & gt 'street'
+														act 'Leave the clinic': minut += 5 & gt 'city_residential'
 													end
 												end
 											end
@@ -971,7 +971,7 @@ if $ARGS[0] = 'ninel2':
 											gs 'arousal', 'end'
 											gs 'stat'
 											
-											act 'Thank Ninel and go': minut += 5 & gt 'street'
+											act 'Thank Ninel and go': minut += 5 & gt 'city_residential'
 										end
 									end
 								end
@@ -1045,7 +1045,7 @@ if $ARGS[0] = 'ninel3':
 						gs 'arousal', 'end'
 						gs 'stat'
 											
-						act 'Freshen up and go': minut += 5 & gt 'street'
+						act 'Freshen up and go': minut += 5 & gt 'city_residential'
 					end
 				end
 			end
@@ -1112,7 +1112,7 @@ if $ARGS[0] = 'discharge':
 	smena = 0
 	'The chief of staff looks disappointed as he says: "So... you''re leaving us, huh? That''s a shame. Here is your outstanding pay, <<pay>> <b>₽</b> and your employment history. Take care."'
 
-	act 'Leave the clinic': minut += 5 & gt 'street'
+	act 'Leave the clinic': minut += 5 & gt 'city_residential'
 end
 
 if $ARGS[0] = '0':

locations/pornstudio.qsrc

@@ -279,7 +279,7 @@ if $ARGS[0] = 'delivery':
 			'You go to the sauna, and are introduced to the local managers. It is explained to you who you need to deliver to, and reminded that it is necessary to return the envelope the same day you receive it.'
 			'"Don''t forget to use secure transport. We''ll see you on Fridays and don''t fuck up."'
 
-			act 'Leave':bomzQW = 2 & gt 'street'
+			act 'Leave':bomzQW = 2 & gt 'city_residential'
 		end
 	end
 end

locations/preTG.qsrc

@@ -493,7 +493,7 @@ if $ARGS[0] = 'sleepPRE':
 					*clr
 					'<center><img <<$set_imgh>> src="images/system/transgender.jpg"></center>'
 					'Welcome to the Transgender version! You may have lost your masculinity and your old life, but numerous new possibilities are opening up before you, not least aided in your newfound knowledge of the magical nature of the world!'
-					act 'Begin': gt 'street'
+					act 'Begin': gt 'city_residential'
 				end
 			end
 		end

locations/qwmeet.qsrc

@@ -110,7 +110,7 @@ if $ARGS[0] = 'qwmeetdy':
 		'Vladimir looked out of the car "This is my driver, Glory. He may be a little scary. I''ll call you <<$pcs_nickname>>"'
 		'The Asian man smiled again and you shut the back door. Leaping into the driver''s seat, he again looked at you greedily, undressing you with his eyes, and slammed his door with a smirk. The wheels screeched and the car immediately jumped away from the pavement and flew away, disappearing into the distance.'
 
-		act 'Go home':gt 'street'
+		act 'Go home':gt 'city_residential'
 	end
 end &! --- qwmeetdy ---
 
@@ -472,7 +472,7 @@ if $ARGS[0] = 'qwbereg2':
 	'You sat in the back seat of the car and Vladimir, pleased, though tired and sat down next to you. Glory vtopil as usual and flew down the road.'
 	'Soon you were already around your porch. Vladimir promised to call you and left with Slava.'
 
-	act 'Go home':gt 'street'
+	act 'Go home':gt 'city_residential'
 end &! --- qwpbereg2 ---
 
 !! start of the third date
@@ -523,7 +523,7 @@ if $ARGS[0] = 'qwmeetdin':
 		if VladimirKnowAboutHusband = 0:
 			'Soon, you came out of the restaurant and took a seat in the car with Vladimir, thanking him you leant back in your seat, heading home. On the way back Vladimir leant towards you and pointedly whispered, "Care to invite me in?"'
 
-			act 'Sorry, but I need to get on':gt 'street'
+			act 'Sorry, but I need to get on':gt 'city_residential'
 
 			if husband <= 0:
 				act 'Invite':
@@ -546,13 +546,13 @@ if $ARGS[0] = 'qwmeetdin':
 					VladimirKnowAboutHusband = 1
 					'You told Vladimir that you have a husband. He started apologizing time and again before he said goodbye to you.'
 
-					act 'Leave':gt 'street'
+					act 'Leave':gt 'city_residential'
 				end
 			end
 		elseif VladimirKnowAboutHusband = 1:
 			'After the meal you left the restaurant and got into the car with Vladimir. He suggested that you go with him, to a safe place.'
 
-			act 'Sorry, but I need to get on':gt 'street'
+			act 'Sorry, but I need to get on':gt 'city_residential'
 
 			act 'Agree':
 				*clr & cla

locations/rinok.qsrc

@@ -64,7 +64,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 		$metka = ''
 		gs 'arousal', 'end'
 		gs 'stat'
-		gt 'street'
+		gt 'city_residential'
 	end
 
 	if workrin = 1:
@@ -243,7 +243,7 @@ if $ARGS[0] = 'tailor':
 						'You undress and give the clothes you need adjusting to Jacob Solomonovich, it is fifteen minutes until your clothes and returned to you.'
 					end
 
-					act 'Leave': minut += 10 & gt 'street'
+					act 'Leave': minut += 10 & gt 'city_residential'
 				end
 
 				act 'Take in different clothes':gt 'clothing', 'view_clothing_list', 'resize'
@@ -268,11 +268,11 @@ if $ARGS[0] = 'tailor':
 					'Jacob Solomonovich jumps up smartly and nimbly removes the tape from his neck and begins to measure your chest, waist and hips.'
 					'"Well, I can adjust any clothing that doesn''t fit you any more for 500 <b>₽</b> per item."'
 
-					act 'Leave': minut += 10 & gt 'street'
+					act 'Leave': minut += 10 & gt 'city_residential'
 				end
 			end
 		end
-		act 'Leave': minut += 10 & gt 'street'
+		act 'Leave': minut += 10 & gt 'city_residential'
 	end
 end
 

locations/rinwork.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'start':
 				workrin = 0
 				'Uh, you''re fucking useless. Here''s your papers. Hit the road, I do not want to see you ever again!'
 
-				act 'Leave':gt 'street'
+				act 'Leave':gt 'city_residential'
 
 				exit
 			end
@@ -105,7 +105,7 @@ if $ARGS[0] = 'start':
 								'Go with him, before it gets worse'
 							end
 
-							act 'Leave':gt 'street'
+							act 'Leave':gt 'city_residential'
 						end
 					end
 
@@ -146,7 +146,7 @@ if $ARGS[0] = 'start':
 									'Before you notice him raising his hand, you feel the burning on your cheek as he slaps you. "Then get out of her whore, your fired and I don''t want to see you back here!" He says very loudly as he pushes you out from behind his stall, loud enough that many people are looking your direction now at what is going on.'
 									'With shame and a burning cheek you walk away.'
 									if rinslut = 0:rinslut = 1
-									act 'Leave':gt 'street'
+									act 'Leave':gt 'city_residential'
 								end
 							else
 								act 'Get fired (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -195,7 +195,7 @@ if $ARGS[0] = 'start':
 									if repa < 6:repa = 6
 									'Then fuck you, you little fucking whore, your fired and by tomorrow the whole town will know what a whore you are."'
 
-									act 'Leave':gt 'street'
+									act 'Leave':gt 'city_residential'
 								end
 							else
 								act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -205,10 +205,10 @@ if $ARGS[0] = 'start':
 						act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end	
 				else
-					act 'Leave work':gt 'street'
+					act 'Leave work':gt 'city_residential'
 				end
 			else
-				act 'Leave work':gt 'street'
+				act 'Leave work':gt 'city_residential'
 			end	
 		end
 		exit

locations/sauna.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sauna.jpg"></center>'
 	'Luxurious high quality public sauna founded long time ago. The sauna houses separate changing rooms and shower facilities for men and women.'
 
-	act 'Leave':minut += 10 & gt 'street'
+	act 'Leave':minut += 10 & gt 'city_residential'
 
 	if SaunaWhore > 0:act 'Head to work':gt 'saunawhore', 'saunawork'
 
@@ -31,7 +31,7 @@ if $ARGS[0] = '':
 			gs 'stat'
 			'You hand over the disk to him and you are handed back a thick envelope.'
 
-			act 'Leave':minut += 10 & gt 'street'
+			act 'Leave':minut += 10 & gt 'city_residential'
 		end
 	end
 

locations/saunawhore.qsrc

@@ -1020,7 +1020,7 @@ if $ARGS[0] = 'saunawork':
 			'You quickly gather your stuff before he has a change of heart and step outside the sauna.'
 			npc_QW['A113'] = 2
 
-			act 'Leave':gt 'street'
+			act 'Leave':gt 'city_residential'
 		end
 	end
 end

locations/shop.qsrc

@@ -51,7 +51,7 @@ if $shoplocation = 'main':
 	end
 
 	!! Store in the residential district
-	if $loc = 'street':
+	if $loc = 'city_residential':
 		if rand(1, 20) = 20:
 			if dimaQW = 0:
 				'By the store entrance a man is looking at you appreciatively.'
@@ -95,7 +95,7 @@ if $shoplocation = 'main':
 							gs 'arousal', 'end'
 							gs 'stat'
 							
-							act 'Leave': minut += 3 & gt 'street'
+							act 'Leave': minut += 3 & gt 'city_residential'
 						else
 							cla
 							gs 'pain', 6, 'asscheeks', 'slap'
@@ -112,7 +112,7 @@ if $shoplocation = 'main':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Leave': minut += 3 & gt 'street'
+							act 'Leave': minut += 3 & gt 'city_residential'
 						end
 					end
 				end
@@ -125,10 +125,10 @@ if $shoplocation = 'main':
 	!! This is connected to the trade mission
 	if TorgPredZ > 0:
 		!! the location of the shop hasn''t been done today
-		if ($loc = 'street' and StreetShopTPday ! daystart) or ($loc = 'city_industrial' and nordShopTPday ! daystart) or ($loc = 'torgcentr' and downShopTPday ! daystart):
+		if ($loc = 'city_residential' and StreetShopTPday ! daystart) or ($loc = 'city_industrial' and nordShopTPday ! daystart) or ($loc = 'torgcentr' and downShopTPday ! daystart):
 			act 'Arrange products':
 				*clr & cla
-				if $loc = 'street':StreetShopTPday = daystart
+				if $loc = 'city_residential':StreetShopTPday = daystart
 				if $loc = 'city_industrial':nordShopTPday = daystart
 				if $loc = 'torgcentr':downShopTPday = daystart
 

locations/street.qsrc

@@ -1,11 +1,11 @@
-# street
+# city_residential
 
 music_loop = 0
 CLOSE ALL
 $metka = ''
-$loc = 'street'
+$loc = 'city_residential'
 $location_type = 'public_outdoors'
-$menu_loc = 'street'
+$menu_loc = 'city_residential'
 $menu_arg = ''
 menu_off = 0
 killvar '$locclass'
@@ -21,7 +21,7 @@ if sound = 0:
 end
 
 !all random events move to [street_events], and display them before show location. by illume
-if streetevent_hour + 2 < hour:gt'street_event','street', 'main'
+if streetevent_hour + 2 < hour:gt'street_event','city_residential', 'main'
 
 '<center><h2>St. Petersburg</h2></center>'
 '<center><b>Residential Area</b></center>'
@@ -39,7 +39,7 @@ else
 	end
 end
 
-gs'street_event','street', 'extras'
+gs'street_event','city_residential', 'extras'
 
 if opusk > 0 or gnewQW = 5:
 	if rand(0,9) = 0:gt 'gopnew', 'start5'
@@ -89,7 +89,7 @@ act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
 
-if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''street'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''city_residential'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 if Enable_tablemap = 0:
 	if katkey = 1:'<a href="exec:gt ''katspalnya'', ''start''">Kats</a> apartment'
 	if IrinaQW >= 1:'<a href="exec:gt ''IrinaRoom'', ''start''">Irenes</a> apartment is not far away from yours.'
@@ -126,7 +126,7 @@ if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building wh
 
 'The city''s large <a href="exec:minut += 20 & gt ''park'', ''start''">central park</a> is about a 20-minute walk away.'
 'The city''s only <a href="exec:minut += 40 & gt ''lake'', ''start''">lake</a> is just a 40-minute walk away.'
-'24 Hour <a href="exec:$loc = ''street'' & gt ''pharmacy'', ''start''">Pharmacy</a>.'
+'24 Hour <a href="exec:$loc = ''city_residential'' & gt ''pharmacy'', ''start''">Pharmacy</a>.'
 
 if Enable_tablemap = 0:
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
@@ -163,5 +163,5 @@ if hour >= 20 or hour <= 4:
 	end
 end
 
---- street ---------------------------------
+--- city_residential ---------------------------------
 

locations/street_event.qsrc

@@ -1,6 +1,6 @@
 # street_event
 
-!{$arg[0]='city_center','street','city_industrial' for trigger position.  if call this with gs, $curloc work the same.
+!{$arg[0]='city_center','city_residential','city_industrial' for trigger position.  if call this with gs, $curloc work the same.
 1. location indepent events, list: rape, rob, hijack, ask phonenumber, no pantie&skirt, $street_cum, $mobile_check
  all events were only in [street], except shantpopala duplicate in [street][down].
  original event chance in [street]:
@@ -23,7 +23,7 @@ streetevent_hour = hour
 streetev_home = 0
 
 !!not sure what all this if and elseif below is for, but the images need to be changed to our new images for if it is day, night, winter etc. If they are going to be used. Since it has image calls.
-if $ARGS[0] = 'street':
+if $ARGS[0] = 'city_residential':
 	$streetev_title = '<center><b>Residential Area</b></center>'
 	streetev_rob = 1
 	streetev_hijack = 1

locations/street_walker.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'work':
 		prst_loc = 0
 	elseif $loc = 'city_industrial':
 		prst_loc = 1
-	elseif $loc = 'street':
+	elseif $loc = 'city_residential':
 		prst_loc = 2
 	end
 	gs 'street_walker', 'start'
@@ -799,7 +799,7 @@ if $ARGS[0] = 'end':
 	elseif prst_loc = 1:
 		gt 'city_industrial', 'redlight'
 	else
-		gt 'street'
+		gt 'city_residential'
 	end
 end
 

locations/succubus.qsrc

@@ -90,7 +90,7 @@ end
 
 !!*********
 
-!!This is the 'park' and 'street' call
+!!This is the 'park' and 'city_residential' call
 
 if $ARGS[0] = 'RapistFight':
 	gs 'stat'
@@ -770,7 +770,7 @@ if $args[0] = 'sucwalkinggo':
 		sctemp = rand(1,5)
 		if sucslpzone = 1:
 			if sctemp = 1: $sucgoloc = 'city_industrial' & $sucgometka = ''
-			if sctemp = 2: $sucgoloc = 'street' & $sucgometka = ''
+			if sctemp = 2: $sucgoloc = 'city_residential' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'city_center' & $sucgometka = ''
 			if sctemp = 4: $sucgoloc = 'park' & $sucgometka = 'start'
 			if sctemp = 5: $sucgoloc = 'lake' & $sucgometka = 'start'

locations/taxi.qsrc

@@ -40,9 +40,9 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'locations':
-	if $loc ! 'street':
+	if $loc ! 'city_residential':
 		act 'Go to the city''s residential area':
-			$loc = 'street'
+			$loc = 'city_residential'
 			gt 'taxi', 'trip'
 		end
 	end
@@ -369,7 +369,7 @@ end
 
 if $ARGS[0] = 'random':
 	if rand(0,3) = 0:
-		gt 'street'
+		gt 'city_residential'
 	elseif rand(0,2) = 0:
 		gt 'city_center'
 	elseif rand(0,1) = 0: