Merge remote-tracking branch 'netuttki/master'

glife.qproj

@@ -260,7 +260,7 @@
 		<Location name="city_pharmacy"/>
 		<Location name="city_smalloffice"/>
 		<Location name="city_dima"/>
-		<Location name="dinsexgivi"/>
+		<Location name="city_kafegivisex"/>
 		<Location name="city_irinaroom"/>
 		<Location name="city_kafe"/>
 		<Location name="city_kafe2"/>
@@ -272,16 +272,16 @@
 		<Location name="city_drugden"/>
 		<Location name="city_bobka"/>
 		<Location name="city_park"/>
-		<Location name="parkdin"/>
-		<Location name="parkivent"/>
+		<Location name="park_walkeventsrnd"/>
+		<Location name="park_walkevents"/>
 		<Location name="city_clinic"/>
-		<Location name="rinok"/>
-		<Location name="rinwork"/>
-		<Location name="sauna"/>
-		<Location name="saunawhore"/>
-		<Location name="trashplace"/>
-		<Location name="musorkaexh"/>
-		<Location name="RynokHoz"/>
+		<Location name="city_market"/>
+		<Location name="city_marketwork"/>
+		<Location name="city_sauna"/>
+		<Location name="city_saunawhore"/>
+		<Location name="city_trashplace"/>
+		<Location name="city_trashplaceevents"/>
+		<Location name="city_marketsex"/>
 	</Folder>
 	<Folder name="BDSM_Club">
 		<Location name="BDSM_Club"/>

locations/abduction.qsrc

@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'abdSoldSauna':
 	stanok = stanok_bak
 	deodorant = deodorant_bak
 
-	act 'Continue':gt 'sauna', 'saunaroom'
+	act 'Continue':gt 'city_sauna', 'saunaroom'
 end
 
 if $ARGS[0] = 'abdFailedCustomer':

locations/belgang.qsrc

@@ -190,7 +190,7 @@ elseif $ARGS[0] = 'payday':
 					'Silence fills the room as he waits for you to acknowledge what he just said. Mortified about what might happen if you don''t, you nod. He decides to paint the picture anyway: "If you try to escape or refuse to work, we''ll put a bullet in your head, chop you up and bury you in the woods in pieces. And that would be a waste, with such a pretty face as yours." He pinches your cheeks and then slaps your face; not hard enough to be painful, but it certainly drives the message home. You can tell he''s dead serious.'
 					'After looking you in the eyes for a few more seconds to make sure you get the message, he turns around and leaves. You are all alone now.'
 					
-					act 'Look around': gt 'sauna', 'saunaroom'
+					act 'Look around': gt 'city_sauna', 'saunaroom'
 				end	
 			end
 		end

locations/carF.qsrc

@@ -10,7 +10,7 @@ $enddrive = {
 	if cardrive = 7:gt 'autoservisF', 'start'
 	if cardrive = 9:gt 'autotraidF', 'start'
 	if cardrive = 10:gt 'city_park', 'whore'
-	if cardrive = 11:gt 'sauna'
+	if cardrive = 11:gt 'city_sauna'
 	if cardrive = 12:gt 'obekt'
 	if cardrive = 13:gt 'dachi'	
 	if cardrive = 14:gt 'liam'

locations/dinsexgivi.qsrc → locations/city_kafegivisex.qsrc

@@ -1,4 +1,4 @@
-# dinsexgivi
+# city_kafegivisex
 
 menu_off = 1
 
@@ -13,7 +13,7 @@ if $ARGS[0] = 'threesome':
 		gs 'dinsex','vaginal_sex',10
 		gs 'arousal', 'vaginal', 5, 'sub'
 		gs 'stat'
-		gs 'dinsexgivi', 'giviirasexdivibor2'
+		gs 'city_kafegivisex', 'giviirasexdivibor2'
 	!!	dynamic $giviirasexdivibor2
 	end
 end
@@ -27,7 +27,7 @@ if $ARGS[0] = 'threesome2':
 		picrand = rand(1, 2)
 		'<center><img <<$set_imgh>> src="images/shared/sex/group/threec<<picrand>>.jpg"></center>'
 		'Ira sits on Givi his member inside her pussy and begins to frantically jump on his thick and solid cock.'
-		gs 'dinsexgivi', 'giviirasexdivibor'
+		gs 'city_kafegivisex', 'giviirasexdivibor'
 	!!	dynamic $giviirasexdivibor
 	end
 end
@@ -47,7 +47,7 @@ if $ARGS[0] = 'giviirasexdivibor':
 
 		'While Ira bounces on the thick cock she twists around, brings her lips to your nipple and starts sucking.'
 		'Givi groans and removes his member from Ira.'
-		gs 'dinsexgivi', 'giviirasexdivibor3'
+		gs 'city_kafegivisex', 'giviirasexdivibor3'
 	!!	dynamic $giviirasexdivibor3
 	end
 
@@ -68,7 +68,7 @@ if $ARGS[0] = 'giviirasexdivibor':
 		gs 'stat'
 		
 		'Givi groans and removes his member from Ira.'
-		gs 'dinsexgivi', 'giviirasexdivibor3'
+		gs 'city_kafegivisex', 'giviirasexdivibor3'
 	!!	dynamic $giviirasexdivibor3
 	end
 end
@@ -98,7 +98,7 @@ if $ARGS[0] = 'giviirasexdivibor2':
 		end
 
 		'Givi groans and removes his member from you.'
-		gs 'dinsexgivi', 'giviirasexdivibor3'
+		gs 'city_kafegivisex', 'giviirasexdivibor3'
 	!!	dynamic $giviirasexdivibor3
 	end
 end
@@ -120,7 +120,7 @@ if $ARGS[0] = 'giviirasexdivibor3':
 
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':gs 'dinsexgivi', 'endirinaaftergang'
+		act 'Leave':gs 'city_kafegivisex', 'endirinaaftergang'
 	!!	dynamic $endirinaaftergang
 	end
 end
@@ -134,5 +134,5 @@ if $ARGS[0] = 'endirinaaftergang':
 	act 'Leave':gt 'city_residential'
 end
 
---- dinsexgivi ---------------------------------
+--- city_kafegivisex ---------------------------------
 

locations/city_kavkazkafe.qsrc

@@ -528,8 +528,8 @@ if $ARGS[0] = 'threesome':
 			'You and Ira kneel and begin to suck Givis dick together, taking turns sucking the shaft then licking his testicles, sometimes kissing each other.'
 			gs 'arousal', 'bj', 3, 'sub', 'group'
 			gs 'stat'
-			gs 'dinsexgivi', 'threesome'
-			gs 'dinsexgivi', 'threesome2'
+			gs 'city_kafegivisex', 'threesome'
+			gs 'city_kafegivisex', 'threesome2'
 		!!	dynamic $threesomedin
 		else
 			picrand = rand(1, 3)
@@ -537,8 +537,8 @@ if $ARGS[0] = 'threesome':
 			'You kneel down and start sucking dick while Ira kisses Givi.'
 			gs 'arousal', 'bj', 3, 'sub', 'group'
 			gs 'stat'
-			gs 'dinsexgivi', 'threesome'
-			gs 'dinsexgivi', 'threesome2'
+			gs 'city_kafegivisex', 'threesome'
+			gs 'city_kafegivisex', 'threesome2'
 		!!	dynamic $threesomedin
 		end
 	end
@@ -550,7 +550,7 @@ if $ARGS[0] = 'threesome':
 		'You kiss Givi while Ira works his cock getting it combat ready.'
 		gs 'arousal', 'kiss', 3, 'sub', 'group'
 		gs 'stat'
-		gs 'dinsexgivi', 'threesome2'
+		gs 'city_kafegivisex', 'threesome2'
 	!!	dynamic $threesomedin2
 	end
 end
@@ -596,7 +596,7 @@ if $ARGS[0] = 'foursome':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Leave':gt 'dinsexgivi', 'endirinaaftergang'
+				act 'Leave':gt 'city_kafegivisex', 'endirinaaftergang'
 			end
 		end
 	end

locations/rinok.qsrc → locations/city_market.qsrc

@@ -1,4 +1,4 @@
-# rinok
+# city_market
 $location_type = 'public_outdoors'
 if $ARGS[0] = 'start' or $metka = 'start':
 	CLOSE ALL
@@ -18,8 +18,8 @@ if $ARGS[0] = 'start' or $metka = 'start':
 	minut = minut + 5
 	mag = 1
 	$metka = 'start'
-	$loc = 'rinok'
-	$menu_loc = 'rinok'
+	$loc = 'city_market'
+	$menu_loc = 'city_market'
 	$menu_arg = 'start'
 	
 	'<center><b><font color="maroon">Marketplace</font></b></center>'
@@ -34,14 +34,14 @@ if $ARGS[0] = 'start' or $metka = 'start':
 		''
 	end
 	*pl '<center><table align="center" width=80%>'
-	*P FUNC ('$stock_item', 10, 'Dishwashing detergent', 400, 'fairy', 'rinok')
-	*P FUNC ('$stock_item', 10, 'Clothing detergent', 400, 'poroshok', 'rinok')
-	*P FUNC ('$stock_item', 8, 'Plates', 450, 'cltarelka', 'rinok')
-	*P FUNC ('$stock_item', 20, 'Cosmetics', 1000, 'kosmetica', 'rinok')
-	*P FUNC ('$stock_item', 25, 'Razors (number of shaves)', 300, 'stanok', 'rinok')
-	*P FUNC ('$stock_item', 10, 'Tampons', 160, 'tampon', 'rinok')
-	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 80, 'sanpad', 'rinok')
-	*P FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'rinok', '', iif(bag > 0, 0, 1), 'You need a purse')
+	*P FUNC ('$stock_item', 10, 'Dishwashing detergent', 400, 'fairy', 'city_market')
+	*P FUNC ('$stock_item', 10, 'Clothing detergent', 400, 'poroshok', 'city_market')
+	*P FUNC ('$stock_item', 8, 'Plates', 450, 'cltarelka', 'city_market')
+	*P FUNC ('$stock_item', 20, 'Cosmetics', 1000, 'kosmetica', 'city_market')
+	*P FUNC ('$stock_item', 25, 'Razors (number of shaves)', 300, 'stanok', 'city_market')
+	*P FUNC ('$stock_item', 10, 'Tampons', 160, 'tampon', 'city_market')
+	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 80, 'sanpad', 'city_market')
+	*P FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'city_market', '', iif(bag > 0, 0, 1), 'You need a purse')
 	'</table></center>'
 	*pl
 	if analplugIN = 1 and $pantyworntype = 'none' and PCloSkirt > 2:
@@ -80,7 +80,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 					'Arthur unloads stuff from his truck and gives them to you. You start hanging the clothes on the stall.'
 					'Before leaving Arthur gives you instructions. "Sell at whatever price you want, but at the end of your shift I will charge you 1000 <b>₽</b> for each item sold. You should be making me no less than <<arturplan>> <b>₽</b>."'
 
-					act 'To work':gt 'rinwork', 'start'
+					act 'To work':gt 'city_marketwork', 'start'
 				end
 			end
 		end
@@ -90,7 +90,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 			workrin = 0
 			'You retired from work and collect papers.'
 
-			act 'Leave':gt 'rinok', 'start'
+			act 'Leave':gt 'city_market', 'start'
 		end
 	end
 
@@ -105,7 +105,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 			'Pay is a percentage of sales, paid at end of shift. Your shifts would be Tuesdays, Thursdays and Saturdays. From 8 till 14.'
 			'Government insist I have your papers, so it would be your main job.'
 
-			act 'Leave':gt 'rinok', 'start'
+			act 'Leave':gt 'city_market', 'start'
 
 			act 'Take the job':
 				cla
@@ -114,7 +114,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 				arturplan = 5000
 				'You give your papers to Arthur and shaking your hand he welcomes you on board.'
 
-				act 'Leave':gt 'rinok', 'start'
+				act 'Leave':gt 'city_market', 'start'
 			end
 		end
 	end
@@ -136,7 +136,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 
 				'You bought the book for fantasy 350 <b>₽</b>.'
 
-				act 'Leave':gt'rinok','start'
+				act 'Leave':gt'city_market','start'
 			end
 		end
 
@@ -150,7 +150,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 
 				'You bought the book for science fiction 350 <b>₽</b>.'
 
-				act 'Leave':gt'rinok','start'
+				act 'Leave':gt'city_market','start'
 			end
 		end
 
@@ -164,11 +164,11 @@ if $ARGS[0] = 'start' or $metka = 'start':
 
 				'You bought the novel for the ladies 350 <b>₽</b>.'
 
-				act 'Leave':gt'rinok','start'
+				act 'Leave':gt'city_market','start'
 			end
 		end
 
-		act 'Leave':gt'rinok','start'
+		act 'Leave':gt'city_market','start'
 	end
 
 	if coat[5] < 1:
@@ -179,7 +179,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 	act 'View clothing':
 		cla
 		minut += 5
-		gt 'rinok', 'clo'
+		gt 'city_market', 'clo'
 	end
 end
 
@@ -195,12 +195,12 @@ if $ARGS[0] = 'clo':
 	act 'Return':
 		cla
 		minut += 5
-		gt 'rinok', 'start'
+		gt 'city_market', 'start'
 	end
 
 	i = 15
 	:loopcheap
-	if cheap[i] = 0:*p '<a href="exec: i = <<i>> & gt ''rinok'', ''marketclo''"><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<i>>.jpg" 	height="400" /></a>'
+	if cheap[i] = 0:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<i>>.jpg" 	height="400" /></a>'
 	i += 1
 	if i <= 20:jump 'loopcheap'
 end
@@ -210,7 +210,7 @@ if $ARGS[0] = 'marketclo':
 
 	if cheap[i] ! 0:
 		msg 'You already own these clothes.'
-		gt 'rinok', 'clo'
+		gt 'city_market', 'clo'
 	end
 
 	gt 'clothing', 'view_clothing_item', 'shop', 'cheap',i, 750
@@ -276,5 +276,5 @@ if $ARGS[0] = 'tailor':
 	end
 end
 
---- rinok ---------------------------------
+--- city_market ---------------------------------
 

locations/RynokHoz.qsrc → locations/city_marketsex.qsrc

@@ -1,4 +1,4 @@
-# RynokHoz
+# city_marketsex
 
 ! Sex acts for rinwork (city market working)
 !
@@ -367,5 +367,5 @@ if $ARGS[0] = 'sex':
 end
 
 
---- RynokHoz ---------------------------------
+--- city_marketsex ---------------------------------
 

locations/rinwork.qsrc → locations/city_marketwork.qsrc

@@ -1,4 +1,4 @@
-# rinwork
+# city_marketwork
 $location_type = 'event_outdoors'
 
 ! Variables used
@@ -26,9 +26,9 @@ $location_type = 'event_outdoors'
 
 if $ARGS[0] = 'start':
 	$metka = 'start'
-	$loc = 'rinwork'
+	$loc = 'city_marketwork'
 	cla & *clr
-	$menu_loc = 'rinwork'
+	$menu_loc = 'city_marketwork'
 	$menu_arg = 'start'
 	menu_off = 0
 	gs 'stat'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'start':
 						cla
 						'You start making excuses. Arthur says to you, "Hey, don''t insult me, your stall is dirty, it has dust and dirt all over it. I should fine you, but if you''re nice I will let you off.'
 
-						act 'Go to warehouse':gt 'RynokHoz', 'the_beginning'
+						act 'Go to warehouse':gt 'city_marketsex', 'the_beginning'
 
 						act 'No':
 							cla
@@ -109,19 +109,19 @@ if $ARGS[0] = 'start':
 						end
 					end
 
-					act 'Go with him':gt 'RynokHoz', 'the_beginning'
+					act 'Go with him':gt 'city_marketsex', 'the_beginning'
 					
 				elseif palevorin = 2:
 					'Artur goes behind you into the stall carrying some stuff, then he comes up behind you are working and gives your ass a slap and squeeze. "I am glad you turned Abdul and Hasan down. I like having you all to myself."'
 					'You turn your head to look at him and smile. "I like that too, but maybe from now on you can lock the door first?"'
 					'He laughs and nods. "Of course of course, anything for you my sweet. If you wish the door to be locked from now on the door will be locked from now on. Speaking of which, come let us go try locking the door to make sure it works and have lunch."'
-					act 'Go with Artur':palevorin = 3 & gt 'RynokHoz', 'the_beginning'
+					act 'Go with Artur':palevorin = 3 & gt 'city_marketsex', 'the_beginning'
 					
 				elseif palevorin = 4:
 					'Artur goes behind you into the stall carrying some stuff. He comes up behind you are working and gives your ass a slap and squeeze, with one hand while the other one snakes around and roughly grabs your tit, as he whispers in your ear. "So you like cock, I didn''t think you were a little slut but that''s ok, I like dirty sluts."'
 					'He cuts you off before you can make any protest about being slut. "No it is good, I can use this. Now come let us go to the warehouse so I can fuck you."'
 					
-					act 'Go with him ':palevorin = 5 & gt 'RynokHoz', 'sex'
+					act 'Go with him ':palevorin = 5 & gt 'city_marketsex', 'sex'
 					
 					gs 'willpower', 'sex', 'resist', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -133,7 +133,7 @@ if $ARGS[0] = 'start':
 							'You see the anger flare up in his eyes. "So you think you are to good for me whore? I gave you a job, I treated you nice and then you fuck those two and now I am not good enough?" He shakes his head. "No get your ass in the warehouse now or you are fired and I will tell Abdul and Hasan they are free to tell everyone about how you greedily took their cocks like the little slut you are."'
 							'You are a bit shocked at this level of anger and the ultimatum. You are unsure what to do, go with him, keep your job, and your rep. Or refuse and find a new job and hope no one believes them.'
 
-							act 'Go to warehouse':palevorin = 5 & gt 'RynokHoz', 'sex'
+							act 'Go to warehouse':palevorin = 5 & gt 'city_marketsex', 'sex'
 
 							gs 'willpower', 'sex', 'resist', 'hard'
 							if will_cost <= pcs_willpwr:
@@ -162,11 +162,11 @@ if $ARGS[0] = 'start':
 					if sexgrouprand = 1:
 						'Artur walks up and slaps your ass hard and grabs you roughly by one arm. "Hey bitch, how would you like to make some extra money? My friends need company."'
 						
-						act 'Go with him':gt 'RynokHoz', 'group'
+						act 'Go with him':gt 'city_marketsex', 'group'
 					else
 						'Artur walks up and slaps your ass hard and grabs you roughly by one arm. "Bitch get your fucking ass in the warehouse."'
 						
-						act 'Go with him':gt 'RynokHoz', 'sex'
+						act 'Go with him':gt 'city_marketsex', 'sex'
 					end
 					
 					gs 'willpower', 'sex', 'resist', 'hard'
@@ -177,9 +177,9 @@ if $ARGS[0] = 'start':
 							gs 'stat'
 							'You start making excuses. Arthur says to you, "Hey, don''t insult me you fucking slut, I was there. I know what a whore you are. Now get your fucking ass in the warehouse or the whole town will know what a whore you are."'
 							if sexgrouprand = 1:
-								act 'Go to warehouse':gt 'RynokHoz', 'group'
+								act 'Go to warehouse':gt 'city_marketsex', 'group'
 							else
-								act 'Go to warehouse':gt 'RynokHoz', 'sex'
+								act 'Go to warehouse':gt 'city_marketsex', 'sex'
 							end
 							
 							gs 'willpower', 'sex', 'resist', 'hard'
@@ -215,7 +215,7 @@ if $ARGS[0] = 'start':
 	elseif hour < 14:
 		act 'Laze around (0:15)':
 			minut += 15
-			gt 'rinwork', 'start'
+			gt 'city_marketwork', 'start'
 		end
 
 		if money >= 200:
@@ -241,7 +241,7 @@ if $ARGS[0] = 'start':
 					if talkrand = 1:'Hassan opens trunks and puts clothes on the counter.'
 					if talkrand >= 2:'Hassan drags trunks to his stall.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 1:
 				$rintak = 'On the next stall Abdul is talking loudly and giving clothes to saleswoman Anna.'
@@ -254,7 +254,7 @@ if $ARGS[0] = 'start':
 					if talkrand = 1:'Abdul slaps Annas ass, she pretends that nothing happened.'
 					if talkrand >= 2:'Abdul drags trunks to his stall.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 2:
 				$rintak = 'Abdul and Hassan stand beside your stall and saying something guttural.'
@@ -267,7 +267,7 @@ if $ARGS[0] = 'start':
 					if talkrand = 1:'Abdul and Hassan ignore you and discuss what sounds like clothes prices.'
 					if talkrand >= 2:'Abdul looks at you and says to Hassan, "Look at that a girl, she looks like a good fuck, yeah."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 3:
 				$rintak = 'Anna hangs clothes on her stall shouting at Nadia.'
@@ -284,7 +284,7 @@ if $ARGS[0] = 'start':
 						'Nadia tells her how some pervert molested her on the subway rubbing his dick on her ass.'
 					end
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 4:
 				$rintak = 'Arthur is talking about something with Abdullah.'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'start':
 					if talkrand = 1:'Abdul and Arthur ignore you and discuss what sounds like clothes prices.'
 					if talkrand >= 2:'Abdul looks at you and says to Arthur, "Nice girl you got there, you fucking her?."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand >= 5:
 				$rintak = 'Arthur, Abdul Hassan are talking loudly, about something in foreign language.'
@@ -310,7 +310,7 @@ if $ARGS[0] = 'start':
 					if talkrand = 1:'Armenians ignore you and discuss what sounds like clothes prices.'
 					if talkrand >= 2:'Abdul looks at you and says to the other Armenians, "Pretty little girl, can i have her?"'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			end
 
@@ -324,7 +324,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Hassan says to Nadia "Nadia, why you refuse? Come here, have some wine."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 1:
 				$rintak = 'At the stall in front of you sits Nadia doing crossword puzzles.'
@@ -335,7 +335,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia leaves the crossword and willingly gossips with you.'
 					
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 2:
 				$rintak = 'Nadias stall in front of you has many buyers and she fusses before them laying out goods.'
@@ -346,7 +346,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 3:
 				$rintak = 'At the next stall Anna is drinking coffee.'
@@ -357,7 +357,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anna is happy to chat with you about any old nonsense.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 4:
 				$rintak = 'At the next stall Anna tries to interest buyers in her goods.'
@@ -368,7 +368,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anya is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand >= 5:
 				$rintak = 'Anna is gossiping with Aunt Katya.'
@@ -380,7 +380,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Aunt Katya is talking about her pies and Anya complains that it because of her bloody pies that her ass is twice as big as it was.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			end
 
@@ -394,7 +394,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'The Armenians seem to be trying to persuade Nadia to have sex with them.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 1:
 				$rintak = 'At the stall in front of you sits Nadia eating cake.'
@@ -410,7 +410,7 @@ if $ARGS[0] = 'start':
 						'Nadia tells you about an office building not too far away that is looking for a cleaner.'
 					end
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 2:
 				$rintak = 'Nadias stall in front of you has many buyers and she fusses before laying out goods.'
@@ -421,7 +421,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 3:
 				$rintak = 'At the next stall Anna is reading a newspaper.'
@@ -432,7 +432,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anna is happy to chat with you about any old nonsense.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 4:
 				$rintak = 'At the next stall Anna tries to interest buyers in her goods.'
@@ -443,7 +443,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anya is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand >= 5:
 				$rintak = 'Nadia is approached by three Armenians, Aslan, Camille and Mukhtar and they begin to molest her, she swears at them and tries to dodge.'
@@ -453,7 +453,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'The Armenians seem to be trying to persuade Nadia to have sex with them.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			end
 
@@ -468,7 +468,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia shies away from talking in front of Hassan.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 1:
 				$rintak = 'Nadia is surrounded by customers.'
@@ -479,7 +479,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 2:
 				$rintak = 'Nadia talks with Anna.'
@@ -499,7 +499,7 @@ if $ARGS[0] = 'start':
 						'Nadia tells her how some pervert molested her on the subway rubbing his dick on her ass.'
 					end
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 3:
 				$rintak = 'Anna  is selling clothing to customers.'
@@ -510,7 +510,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anna is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 4:
 				$rintak = 'Anna is drinking coffee sitting at her stall.'
@@ -521,7 +521,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anna happily chats with you about nonsense.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand >= 5:
 				$rintak = 'Nadia is idly trying to catch flies.'
@@ -532,7 +532,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia glad for the distraction and has fun chatting with you.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			end
 
@@ -595,25 +595,25 @@ if $ARGS[0] = 'start':
 				act 'Now this is very fashionable':
 					cla
 					tipred = 3
-					gs 'rinwork', 'answerrin'
+					gs 'city_marketwork', 'answerrin'
 				end
 
 				act 'This item is very high quality and reliable':
 					cla
 					tipred = 1
-					gs 'rinwork', 'answerrin'
+					gs 'city_marketwork', 'answerrin'
 				end
 
 				act 'You''ll find this very reasonable':
 					cla
 					tipred = 0
-					gs 'rinwork', 'answerrin'
+					gs 'city_marketwork', 'answerrin'
 				end
 
 				act 'That is so you':
 					cla
 					tipred = 2
-					gs 'rinwork', 'answerrin'
+					gs 'city_marketwork', 'answerrin'
 				end
 			end
 		end
@@ -632,10 +632,10 @@ if $ARGS[0] = 'answerrin':
 			pokpay = rand(1300, 1500)
 		end
 		'<<$poktip>> asks you for a price'
-		gs 'rinwork', 'tellprice'
+		gs 'city_marketwork', 'tellprice'
 	else
 		'<<$poktip>> puts the item back and leaves.'
-		act 'Further':gt 'rinwork', 'start'
+		act 'Further':gt 'city_marketwork', 'start'
 	end
 end
 
@@ -654,24 +654,24 @@ if $ARGS[0] = 'tellprice':
 				rinvesh += 1
 				'The buyer takes the item and pays <<prodpay>> <b>₽</b>.'
 
-				act 'Sell it':gt 'rinwork', 'start'
+				act 'Sell it':gt 'city_marketwork', 'start'
 			else
 				'The buyer twirls clothing in their hands <<prodpay>> <b>₽</b> is too expensive.'
-				gs 'rinwork', 'haggling'
+				gs 'city_marketwork', 'haggling'
 			end
 		elseif prodpay > pokpay and prodpay <= pokpay + 100:
 			if poknorand >= 10:
 				'The buyer twirls clothing in their hands <<prodpay>> <b>₽</b> is too expensive.'
-				gs 'rinwork', 'haggling'
+				gs 'city_marketwork', 'haggling'
 			else
 				'Buyer puts the item back and leaves'
 
-				act 'Return':gt 'rinwork', 'start'
+				act 'Return':gt 'city_marketwork', 'start'
 			end
 		elseif prodpay > pokpay + 100:
 			'The buyer puts the item back and leaves.'
 
-			act 'Return':gt 'rinwork', 'start'
+			act 'Return':gt 'city_marketwork', 'start'
 		end
 	end
 end
@@ -691,7 +691,7 @@ if $ARGS[0] = 'haggling':
 				'The buyer puts the item back and leaves.'
 			end
 			
-			act 'Haggle':gt 'rinwork', 'start'
+			act 'Haggle':gt 'city_marketwork', 'start'
 		end
 	elseif prodpay >= 1050:
 		act 'Reduce the price by 50 <b>₽</b>':
@@ -707,12 +707,12 @@ if $ARGS[0] = 'haggling':
 				'The buyer puts the item back and leaves.'
 			end
 			
-			act 'Haggle':gt 'rinwork', 'start'
+			act 'Haggle':gt 'city_marketwork', 'start'
 		end
 	end
-	act 'You can not take less, take the item back':gt 'rinwork', 'start'
+	act 'You can not take less, take the item back':gt 'city_marketwork', 'start'
 end
 
 
---- rinwork ---------------------------------
+--- city_marketwork ---------------------------------
 

locations/city_park.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'start':
 
 	act 'Leave': gt 'city_park', 'exit'
 
-	act 'Walk around the park (1:00)': gt 'parkdin'
+	act 'Walk around the park (1:00)': gt 'park_walkeventsrnd'
 
 	gs 'treeCircEntry', 'CentralPark'
 
@@ -172,7 +172,7 @@ if $ARGS[0] = 'start':
 					end
 					'Halfway through your run, you pull up your top and expose your breasts. The cool air against your warm skin causes you to shiver, and almost immediately your nipples start to harden, a mixed reaction from the air hitting them and your growing excitement.'
 					*nl
-					gs 'parkivent', 'run_reactions'
+					gs 'park_walkevents', 'run_reactions'
 				end
 			end
 		end
@@ -192,13 +192,13 @@ if $ARGS[0] = 'start':
 					'No luck! After searching for half an hour, you find no one. For such a large city you would have thought there would be suitable prey around, your needs remain so maybe another search will be required?'
 					act 'Continue': gt 'city_park', 'start'
 				else
-					suchunt = 1 & gt 'parkivent', '1'
+					suchunt = 1 & gt 'park_walkevents', '1'
 				end
 			end
 		end
 
 		if knowsfairy >= 1 and pcs_magik > 4:
-			act 'Find a place the Fairy may be': fairylooking = 1 & gt 'parkdin'
+			act 'Find a place the Fairy may be': fairylooking = 1 & gt 'park_walkeventsrnd'
 		end
 	end
 

locations/city_residential.qsrc

@@ -117,8 +117,8 @@ if hour >= 5 and hour <= 23:'The <a href="exec: minut += 5 & gt ''metro'', ''sta
 if hour >= 8 and hour <= 20:'The <a href="exec: minut += 3 & gt ''shop'', ''start''">supermarket</a> is not far from here.'
 if (hour >= 8 and hour <= 20) or preg = 2:'The <a href="exec:gt ''city_clinic'', ''start''">clinic</a> is also nearby.'
 if hour >= 6 and hour <= 9 and military = 1 and week = 6:'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
-if hour >= 8 and hour <= 14 and week ! 1:'You could go shopping at the noisy local <a href="exec: minut += 10 & gt ''rinok'', ''start''">marketplace</a>.'
-if hour >= 8 and hour <= 15 and week < 6:'Near the market is a <a href="exec: minut += 10 & gt ''rinok'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'
+if hour >= 8 and hour <= 14 and week ! 1:'You could go shopping at the noisy local <a href="exec: minut += 10 & gt ''city_market'', ''start''">marketplace</a>.'
+if hour >= 8 and hour <= 15 and week < 6:'Near the market is a <a href="exec: minut += 10 & gt ''city_market'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'
 if hour >= 11 and hour < 12 and week > 1 and week < 5 and workKafe = 1:'The side door of <a href="exec: minut += 5 & gt ''city_kafe'', ''work''">"The Roadhouse"</a> is open, so employees can enter to begin their shift.'
 if hour >= 12 and hour <= 22 and week ! 1:'In a side alley, next to the uniquely styled diner <a href="exec: minut += 5 & gt ''city_kafe'', ''start''">"The Roadhouse"</a>, you can hear the swearing and laughing of some <a href="exec: minut += 5 & gt ''gopnew'', ''start''">gopniks</a>.'
 if hour > 22 or hour <= 3:'In one of the parking lots you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">gopniks</a>.'
@@ -141,13 +141,13 @@ if Enable_tablemap = 0:
 end
 
 if home_owned[1] = 0:
-	'In the courtyard of one of the apartment buildings, you see several <a href="exec: minut += 1 & gt ''trashplace''">trash bins</a>.'
+	'In the courtyard of one of the apartment buildings, you see several <a href="exec: minut += 1 & gt ''city_trashplace''">trash bins</a>.'
 else
-	'In the courtyard of your <a href="exec: gt ''etoexhib'', ''pos51''">apartment building</a>, you see several <a href="exec: minut += 1 & gt ''trashplace''">trash bins</a>.'
+	'In the courtyard of your <a href="exec: gt ''etoexhib'', ''pos51''">apartment building</a>, you see several <a href="exec: minut += 1 & gt ''city_trashplace''">trash bins</a>.'
 end
 
 if SNarkPriton > 0:'The <a href="exec:minut += 5 & gt ''city_drugden''">drug house</a> is clearly recognizable by the syringes and the trash that lies in front of it.'
-if hour >= 8 and hour <= 23 or saunaWorkWhore > 0 or workDisk = 2:'<a href="exec:minut += 10 & gt ''sauna''">The Sauna</a> is a 10 minute walk away. Rumors say the sauna is just the front for a brothel.'
+if hour >= 8 and hour <= 23 or saunaWorkWhore > 0 or workDisk = 2:'<a href="exec:minut += 10 & gt ''city_sauna''">The Sauna</a> is a 10 minute walk away. Rumors say the sauna is just the front for a brothel.'
 
 if hour >= 20 or hour <= 4:
 	*nl

locations/sauna.qsrc → locations/city_sauna.qsrc

@@ -1,13 +1,13 @@
-# sauna
+# city_sauna
 
 CLOSE ALL
 gs 'themes', 'indoors'
 
 if $ARGS[0] = '':
 	*clr & cla
-	$loc = 'sauna'
+	$loc = 'city_sauna'
 	$metka = ''
-	$menu_loc = 'sauna'
+	$menu_loc = 'city_sauna'
 	$menu_arg = ''
 	menu_off = 0
 	sauna += 1
@@ -18,7 +18,7 @@ if $ARGS[0] = '':
 
 	act 'Leave':minut += 10 & gt 'city_residential'
 
-	if SaunaWhore > 0:act 'Head to work':gt 'saunawhore', 'saunawork'
+	if SaunaWhore > 0:act 'Head to work':gt 'city_saunawhore', 'saunawork'
 
 	if week = 5 and workDisk = 2:
 		'There''s a security guard waiting at the entrance for you to arrive.'
@@ -35,14 +35,14 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if hour >= 8 and hour <= 23:act 'Head to the sauna':gt 'sauna', 'sauna2'
+	if hour >= 8 and hour <= 23:act 'Head to the sauna':gt 'city_sauna', 'sauna2'
 end
 
 if $ARGS[0] = 'sauna2':
 	*clr & cla
-	$loc = 'sauna'
+	$loc = 'city_sauna'
 	$metka = 'sauna2'
-	$menu_loc = 'sauna'
+	$menu_loc = 'city_sauna'
 	$menu_arg = 'sauna2'
 	menu_off = 0
 	$location_type = 'indoors'
@@ -52,7 +52,7 @@ if $ARGS[0] = 'sauna2':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sauna1.jpg"></center>'
 	'One hour visit - 2,000 <b>₽</b>'
 
-	act 'Leave':gt 'sauna'
+	act 'Leave':gt 'city_sauna'
 
 	if money >= 2000 and saunaday ! daystart:
 		act 'Stay (2,000 <b>₽</b>)':
@@ -78,20 +78,20 @@ if $ARGS[0] = 'sauna2':
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/sauna/sau.jpg"></center>'
 			'You spend an hour relaxing in the heat of the sauna, having a cool shower and dressing. You feel revitalised.'
 
-			act 'Leave':gt 'sauna'
+			act 'Leave':gt 'city_sauna'
 		end
 	end
 end
 
 if $ARGS[0] = 'saunaroom':
 	*clr & cla
-	$loc = 'sauna'
+	$loc = 'city_sauna'
 	$metka = 'saunaroom'
-	$locBroom = 'sauna'
+	$locBroom = 'city_sauna'
 	$metkaBroom = 'saunaroom'
-	$locM = 'sauna'
+	$locM = 'city_sauna'
 	$metkaM = 'saunaroom'
-	$menu_loc = 'sauna'
+	$menu_loc = 'city_sauna'
 	$menu_arg = 'saunaroom'
 	menu_off = 0
 	$location_type = 'private'
@@ -104,10 +104,10 @@ if $ARGS[0] = 'saunaroom':
 	'<br>The room has a thread bare <a href="exec:sec += 30 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
 	*nl
 
-	'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines, and a selection of adult toys are scattered throughout the room. There''s so much crap laying around, there''s barely enough space to do some basic <a href="exec:gt ''sauna'', ''saunafitness''">exercise</a>.'
+	'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines, and a selection of adult toys are scattered throughout the room. There''s so much crap laying around, there''s barely enough space to do some basic <a href="exec:gt ''city_sauna'', ''saunafitness''">exercise</a>.'
 	*nl
 
-	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt ''sauna'', ''saunaroom''">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt ''sauna'', ''saunaroom''">ON</a>.')
+	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt ''city_sauna'', ''saunaroom''">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt ''city_sauna'', ''saunaroom''">ON</a>.')
 	
 	*nl
 
@@ -115,10 +115,10 @@ if $ARGS[0] = 'saunaroom':
 	*nl
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 	*nl
-	gs 'saunawhore','debtPay'
+	gs 'city_saunawhore','debtPay'
 	if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
 
-	act '<b>Exit to the sauna</b>':gt 'saunawhore', 'saunawork'
+	act '<b>Exit to the sauna</b>':gt 'city_saunawhore', 'saunawork'
 
 	if workDolg > 0:
 		act 'Have some food (0:15)':
@@ -132,35 +132,35 @@ if $ARGS[0] = 'saunaroom':
 			act 'Ask for some cosmetics':
 				workDolg += 1200
 				kosmetica += 20
-				gt 'sauna', 'saunaroom'
+				gt 'city_sauna', 'saunaroom'
 			end
 		end
 		if shampoo = 0:
 			act 'Ask for some shampoo':
 				workDolg += 400
 				shampoo += 20
-				gt 'sauna', 'saunaroom'
+				gt 'city_sauna', 'saunaroom'
 			end
 		end
 		if stanok = 0:
 			act 'Ask for some razors':
 				workDolg += 700
 				stanok += 20
-				gt 'sauna', 'saunaroom'
+				gt 'city_sauna', 'saunaroom'
 			end
 		end
 		if tampon = 0:
 			act 'Ask for some tampons':
 				workDolg += 400
 				tampon += 20
-				gt 'sauna', 'saunaroom'
+				gt 'city_sauna', 'saunaroom'
 			end
 		end
 		if deodorant = 0:
 			act 'Ask for some deodorant':
 				workDolg += 200
 				deodorant += 20
-				gt 'sauna', 'saunaroom'
+				gt 'city_sauna', 'saunaroom'
 			end
 		end
 	end
@@ -227,7 +227,7 @@ if $ARGS[0] = 'saunaroom':
 end
 
 if $ARGS[0] = 'saunafitness':
-	$loc = 'sauna'
+	$loc = 'city_sauna'
 	$metka = 'saunaroom'
 	$location_type = 'indoors'
 	cla
@@ -250,5 +250,5 @@ if $ARGS[0] = 'saunafitness':
 	act 'Finish': gt $loc, $metka
 end
 
---- sauna ---------------------------------
+--- city_sauna ---------------------------------
 

locations/saunawhore.qsrc → locations/city_saunawhore.qsrc

@@ -1,4 +1,4 @@
-# saunawhore
+# city_saunawhore
 
 if moodTypeRand <= 0:
 	$moodType = 'bad'
@@ -10,7 +10,7 @@ end
 
 if $ARGS[0] = 'clientGate':
 
-	if rand(0,19) = 0:gt 'saunawhore', 'bdsmclient'
+	if rand(0,19) = 0:gt 'city_saunawhore', 'bdsmclient'
 
 	moodTypeRand = rand(-3, 3)
 
@@ -147,12 +147,12 @@ if $ARGS[0] = 'clientGate':
 			inhib_exp += 1
 		end
 		moodTypeRand += 1
-		act 'Get straight to business':gt 'saunawhore', 'strippedGate'
+		act 'Get straight to business':gt 'city_saunawhore', 'strippedGate'
 		gs 'arousal', 'foreplay', 3, 'prostitution'
 		gs 'stat'
 	else
-		if pcs_dancero >= 10:act 'Do a little striptease':gt 'saunawhore', 'striptease'
-		act 'Take off your clothes':gt 'saunawhore', 'simplystrip'
+		if pcs_dancero >= 10:act 'Do a little striptease':gt 'city_saunawhore', 'striptease'
+		act 'Take off your clothes':gt 'city_saunawhore', 'simplystrip'
 	end
 end
 
@@ -168,7 +168,7 @@ if $ARGS[0] = 'striptease':
 	moodTypeRand += 1
 	gs 'arousal', 'foreplay', 5, 'prostitution'
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'strippedGate'
+	act 'Continue':gt 'city_saunawhore', 'strippedGate'
 end
 
 if $ARGS[0] = 'simplystrip':
@@ -183,7 +183,7 @@ if $ARGS[0] = 'simplystrip':
 	moodTypeRand -= 1
 	gs 'arousal', 'foreplay', 2, 'prostitution'
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'strippedGate'
+	act 'Continue':gt 'city_saunawhore', 'strippedGate'
 end
 
 if $ARGS[0] = 'strippedGate':
@@ -191,9 +191,9 @@ if $ARGS[0] = 'strippedGate':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/nakedstand.jpg"></center>'
 	'You are fully naked in front of the client, his eyes devouring every inch of your young body.'
 
-	if pcs_dancero >= 20:act 'Dance naked':gt 'saunawhore', 'nakeddance'
-	if guy >= 20:act 'Present him your holes':gt 'saunawhore', 'holeshow'
-	act 'Kneel and open your mouth':gt 'saunawhore', 'blowjob'
+	if pcs_dancero >= 20:act 'Dance naked':gt 'city_saunawhore', 'nakeddance'
+	if guy >= 20:act 'Present him your holes':gt 'city_saunawhore', 'holeshow'
+	act 'Kneel and open your mouth':gt 'city_saunawhore', 'blowjob'
 end
 
 if $ARGS[0] = 'nakeddance':
@@ -207,7 +207,7 @@ if $ARGS[0] = 'nakeddance':
 	moodTypeRand += 1
 	gs 'arousal', 'foreplay', 5, 'prostitution'
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'blowjob'
+	act 'Continue':gt 'city_saunawhore', 'blowjob'
 end
 
 if $ARGS[0] = 'holeshow':
@@ -223,7 +223,7 @@ if $ARGS[0] = 'holeshow':
 	moodTypeRand += 1
 	gs 'arousal', 'foreplay', 5, 'prostitution'
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'blowjob'
+	act 'Continue':gt 'city_saunawhore', 'blowjob'
 end
 
 if $ARGS[0] = 'blowjob':
@@ -237,14 +237,14 @@ if $ARGS[0] = 'blowjob':
 		gs 'arousal', 'bj', 5, 'prostitution'
 		gs 'stat'
 
-		act 'Suck it':gt 'saunawhore', 'blowjobGate'
+		act 'Suck it':gt 'city_saunawhore', 'blowjobGate'
 	elseif $moodType = 'good':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/blowjob'+rand(1, 5)+'.mp4"></video></center>'
 		'You kneel in front of him and bite your lip, caressing his cock through his pants with your hands.'
 		'He comes close to you, fondles your hair and face and takes you gently by your arm, raising you up from the floor.'
 		'He directs you to the bed, undresses and both of you lie down.'
 
-		act 'Embrace him':gt 'saunawhore', 'fuckGate'
+		act 'Embrace him':gt 'city_saunawhore', 'fuckGate'
 	elseif $moodType = 'bad':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/slapface'+rand(1, 1)+'.mp4"></video></center>'
 		'You kneel in front of him and bite your lip, caressing his cock through his pants with your hands.'
@@ -261,7 +261,7 @@ if $ARGS[0] = 'blowjob':
 
 		gs 'pain', 2, 'armL', 'twist'
 		gs 'pain', 2, 'armR', 'twist'
-		act 'Brace yourself':gt 'saunawhore', 'fuckRoughGate'
+		act 'Brace yourself':gt 'city_saunawhore', 'fuckRoughGate'
 	end
 	gs 'stat'
 end
@@ -274,9 +274,9 @@ if $ARGS[0] = 'blowjobGate':
 	gs 'stat'
 	if dick > pcs_throat:
 		'There''s no way you''ll be able to fit the entire thing in your mouth.'
-		act 'Try to deepthroat him':gt 'saunawhore', 'blowjobCaress'
+		act 'Try to deepthroat him':gt 'city_saunawhore', 'blowjobCaress'
 	else
-		act 'Deepthroat him':gt 'saunawhore', 'blowjobDeepthroat'
+		act 'Deepthroat him':gt 'city_saunawhore', 'blowjobDeepthroat'
 	end
 end
 
@@ -290,11 +290,11 @@ if $ARGS[0] = 'blowjobCaress':
 	if $moodType = 'good':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/blowjob'+rand(1, 5)+'.mp4"></video></center>'
 		'He seems to enjoy your efforts anyway, and signals to you that he''s ready to move on to the next stage.'
-		act 'Continue':gt 'saunawhore', 'fuckGate'
+		act 'Continue':gt 'city_saunawhore', 'fuckGate'
 	elseif $moodType = 'fairly normal':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/blowjob'+rand(1, 5)+'.mp4"></video></center>'
 		'He seem to have enough of this. He takes your hand and directs you towards the bed.'
-		act 'Continue':gt 'saunawhore', 'fuckGate'
+		act 'Continue':gt 'city_saunawhore', 'fuckGate'
 	elseif $moodType = 'bad':
 		'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/slapface'+rand(1, 1)+'.mp4"></video></center>'
 		'He scowls at your pathetic attempt and pulls his cock out of your mouth.'
@@ -308,7 +308,7 @@ if $ARGS[0] = 'blowjobCaress':
 		end
 		gs 'pain', 1, 'cheeks', 'slap'
 		'Furious, he grabs you roughly by your arms, painfully twisting them behind your back, and slams you down on the bed.'
-		act 'Continue':gt 'saunawhore', 'fuckRoughGate'
+		act 'Continue':gt 'city_saunawhore', 'fuckRoughGate'
 	end
 	gs 'stat'
 end
@@ -326,7 +326,7 @@ if $ARGS[0] = 'blowjobDeepthroat':
 	gs 'arousal', 'bj', 5, 'prostitution', 'deepthroat'
 	'Finally he seems to have had enough of oral sex and signals you that he wants some more.'
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'fuckGate'
+	act 'Continue':gt 'city_saunawhore', 'fuckGate'
 end
 
 if $ARGS[0] = 'fuckGate':
@@ -335,10 +335,10 @@ if $ARGS[0] = 'fuckGate':
 	if noCondChance < 40:
 		'He leers at you lustfully and asks, "So baby, how much for not using a condom?"'
 		'When you hesitate, he adds, "C''mon, I''ll pay you double."'
-		act 'Let him fuck you without a condom':gt 'saunawhore', 'fuckGateCondomNo'
-		act 'Insist on using a condom':gt 'saunawhore', 'fuckGateCondomYes'
+		act 'Let him fuck you without a condom':gt 'city_saunawhore', 'fuckGateCondomNo'
+		act 'Insist on using a condom':gt 'city_saunawhore', 'fuckGateCondomYes'
 	else
-		gs 'saunawhore', 'fuckGateCondomYes'
+		gs 'city_saunawhore', 'fuckGateCondomYes'
 	end
 	gs 'stat'
 end
@@ -346,13 +346,13 @@ end
 if $ARGS[0] = 'fuckGateCondomYes':
 	useCondom = 1
 	moodTypeRand -= 2
-	gs 'saunawhore', 'fuckGateGo'
+	gs 'city_saunawhore', 'fuckGateGo'
 end
 
 if $ARGS[0] = 'fuckGateCondomNo':
 	useCondom = 2
 	moodTypeRand += 1
-	gs 'saunawhore', 'fuckGateGo'
+	gs 'city_saunawhore', 'fuckGateGo'
 end
 
 if $ARGS[0] = 'fuckGateGo':
@@ -363,16 +363,16 @@ if $ARGS[0] = 'fuckGateGo':
 	if $moodType = 'bad':
 		'"How do I want you whore? I want you screaming!"'
 		forced = 1
-		act 'Continue':gt 'saunawhore', 'fuckRoughGate'
+		act 'Continue':gt 'city_saunawhore', 'fuckRoughGate'
 	else
 		forced = 2
 		holeType = rand(1, 2)
 		if holeType = 1:
 			'"I want some pussy."'
-			act 'Spread your legs':gt 'saunawhore', 'fuckVaginal'
+			act 'Spread your legs':gt 'city_saunawhore', 'fuckVaginal'
 		elseif holeType = 2:
 			'"I want to fuck your ass."'
-			act 'Turn around and spread your ass':gt 'saunawhore', 'fuckAnal'
+			act 'Turn around and spread your ass':gt 'city_saunawhore', 'fuckAnal'
 		end
 	end
 	gs 'stat'
@@ -398,12 +398,12 @@ if $ARGS[0] = 'fuckVaginal':
 	if 	useCondom = 2:
 		act 'Ask him not to cum inside of you':
 			not_inside = 1
-			gt 'saunawhore', 'cumClientGate'
+			gt 'city_saunawhore', 'cumClientGate'
 		end
 	end
 	act 'Let him cum wherever he wants':
 		not_inside = 2
-		gt 'saunawhore', 'cumClientGate'
+		gt 'city_saunawhore', 'cumClientGate'
 	end
 end
 
@@ -426,7 +426,7 @@ if $ARGS[0] = 'fuckAnal':
 	gs 'stat'
 	act 'Let him cum wherever he wants':
 		not_inside = 2
-		gt 'saunawhore', 'cumClientGate'
+		gt 'city_saunawhore', 'cumClientGate'
 	end
 end
 
@@ -444,13 +444,13 @@ if $ARGS[0] = 'fuckRoughGate':
 	holeType = rand(1, 2)
 	if holeType = 1 and useCondom = 1:
 		'You feel the tip of his cock against your pussy... at least it feels like he''s using a condom.'
-		act 'Continue':gt 'saunawhore', 'fuckRoughVaginal'
+		act 'Continue':gt 'city_saunawhore', 'fuckRoughVaginal'
 	elseif holeType = 1 and useCondom = 2:
 		'You feel the tip of his cock against your pussy... and it feels like he''s not wearing a condom!'
-		act 'Continue':gt 'saunawhore', 'fuckRoughVaginal'
+		act 'Continue':gt 'city_saunawhore', 'fuckRoughVaginal'
 	elseif holeType = 2:
 		'You feel the tip of his cock pressing against your asshole... this is probably not going to be pleasant.'
-		act 'Continue':gt 'saunawhore', 'fuckRoughAnal'
+		act 'Continue':gt 'city_saunawhore', 'fuckRoughAnal'
 	end
 	gs 'stat'
 end
@@ -473,12 +473,12 @@ if $ARGS[0] = 'fuckRoughVaginal':
 	if 	useCondom = 2:
 		act 'Beg him not to cum inside of you':
 			not_inside = 1
-			gt 'saunawhore', 'cumClientGate'
+			gt 'city_saunawhore', 'cumClientGate'
 		end
 	end
 	act 'Let him cum wherever he wants':
 		not_inside = 2
-		gt 'saunawhore', 'cumClientGate'
+		gt 'city_saunawhore', 'cumClientGate'
 	end
 end
 
@@ -497,7 +497,7 @@ if $ARGS[0] = 'fuckRoughAnal':
 	''
 	'After seemingly endless assfucking, you can finally sense that he is almost ready to come.'
 	gs 'stat'
-	act 'Let him cum wherever he wants':gt 'saunawhore', 'cumClientGate'
+	act 'Let him cum wherever he wants':gt 'city_saunawhore', 'cumClientGate'
 end
 
 if $ARGS[0] = 'cumClientGate':
@@ -506,23 +506,23 @@ if $ARGS[0] = 'cumClientGate':
 			cumRand = rand(1, 10)
 			if cumRand <= 9 and holeType = 1:
 				'You feel his cock twitch and realize he is about to cum inside of you.'
-				act 'Continue':gt 'saunawhore', 'cumVaginal'
+				act 'Continue':gt 'city_saunawhore', 'cumVaginal'
 			elseif cumRand <= 9 and holeType = 2:
 				'You feel his cock twitch and realize he is about to cum in your ass.'
-				act 'Continue':gt 'saunawhore', 'cumAnal'
+				act 'Continue':gt 'city_saunawhore', 'cumAnal'
 			else
 				'He pulls out and brings his cock up in front of your face.'
-				act 'Continue':gt 'saunawhore', 'cumFace'
+				act 'Continue':gt 'city_saunawhore', 'cumFace'
 			end
 		else
 			cumRand = rand(1, 2)
 			if cumRand = 1 and holeType = 1:
 				'He just laughs and you realize he is going to cum inside of you anyway.'
-				act 'Continue':gt 'saunawhore', 'cumVaginal'
+				act 'Continue':gt 'city_saunawhore', 'cumVaginal'
 			elseif cumRand = 2:
 				'He smirks and says "Fine, how about in your eyes then, whore?"'
 				gs 'pain', 1, 'eyes', 'burn'
-				act 'Continue':gt 'saunawhore', 'cumFace'
+				act 'Continue':gt 'city_saunawhore', 'cumFace'
 			end
 		end
 	else
@@ -530,40 +530,40 @@ if $ARGS[0] = 'cumClientGate':
 			cumRand = rand(1, 5)
 			if cumRand = 1 and holeType = 1:
 				'You feel his cock twitch and realize he is about to cum inside of you.'
-				act 'Continue':gt 'saunawhore', 'cumVaginal'
+				act 'Continue':gt 'city_saunawhore', 'cumVaginal'
 			elseif cumRand = 1 and holeType = 2:
 				'You feel his cock twitch and realize he is about to cum in your ass.'
-				act 'Continue':gt 'saunawhore', 'cumAnal'
+				act 'Continue':gt 'city_saunawhore', 'cumAnal'
 			elseif cumRand = 2:
 				'He pulls out and brings his cock up in front of your face.'
-				act 'Continue':gt 'saunawhore', 'cumFace'
+				act 'Continue':gt 'city_saunawhore', 'cumFace'
 			elseif cumRand = 3:
 				'He pulls out and brings his cock up in front of your face.'
-				act 'Continue':gt 'saunawhore', 'cumMouth'
+				act 'Continue':gt 'city_saunawhore', 'cumMouth'
 			elseif cumRand = 4:
 				'He pulls out and holds his cock over your body.'
-				act 'Continue':gt 'saunawhore', 'cumBelly'
+				act 'Continue':gt 'city_saunawhore', 'cumBelly'
 			elseif cumRand = 5:
 				'He pulls out and holds his cock over your body.'
-				act 'Continue':gt 'saunawhore', 'cumTits'
+				act 'Continue':gt 'city_saunawhore', 'cumTits'
 			end
 		else
 			cumRand = rand(1, 9)
 			if cumRand <= 2:
 				'He nods, pulls out, and brings his cock up in front of your face.'
-				act 'Continue':gt 'saunawhore', 'cumFace'
+				act 'Continue':gt 'city_saunawhore', 'cumFace'
 			elseif cumRand <= 4:
 				'He nods, pulls out, and brings his cock up in front of your face.'
-				act 'Continue':gt 'saunawhore', 'cumMouth'
+				act 'Continue':gt 'city_saunawhore', 'cumMouth'
 			elseif cumRand <= 6:
 				'He nods, pulls out, and holds his cock over your body.'
-				act 'Continue':gt 'saunawhore', 'cumBelly'
+				act 'Continue':gt 'city_saunawhore', 'cumBelly'
 			elseif cumRand <= 8:
 				'He nods, pulls out, and holds his cock over your body.'
-				act 'Continue':gt 'saunawhore', 'cumTits'
+				act 'Continue':gt 'city_saunawhore', 'cumTits'
 			else
 				'He shakes his head and says "Sorry, I can''t stop now!" and you realize he''s going to cum in you anyway!'
-				act 'Continue':gt 'saunawhore', 'cumVaginal'
+				act 'Continue':gt 'city_saunawhore', 'cumVaginal'
 			end
 		end
 	end
@@ -595,7 +595,7 @@ if $ARGS[0] = 'cumVaginal':
 		if rand(1,100) >= 70:gs 'dinSex', 'std_trigger'
 	end
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'clientLeave'
+	act 'Continue':gt 'city_saunawhore', 'clientLeave'
 end
 
 if $ARGS[0] = 'cumAnal':
@@ -623,7 +623,7 @@ if $ARGS[0] = 'cumAnal':
 		gs 'cum_call', 'anus', 'sauna client', 0, 0, 0, cumVolMl
 	end
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'clientLeave'
+	act 'Continue':gt 'city_saunawhore', 'clientLeave'
 end
 
 if $ARGS[0] = 'cumFace':
@@ -636,7 +636,7 @@ if $ARGS[0] = 'cumFace':
 	end
 	gs 'cum_call', 'face', 0, 0, 0, cumVolMl
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'clientLeave'
+	act 'Continue':gt 'city_saunawhore', 'clientLeave'
 end
 
 if $ARGS[0] = 'cumMouth':
@@ -650,7 +650,7 @@ if $ARGS[0] = 'cumMouth':
 	if rand(1,100) >= 70:gs 'dinSex', 'std_trigger_oral'
 	gs 'cum_call', 'mouth', 0, 0, 0, cumVolMl
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'clientLeave'
+	act 'Continue':gt 'city_saunawhore', 'clientLeave'
 end
 
 if $ARGS[0] = 'cumBelly':
@@ -662,7 +662,7 @@ if $ARGS[0] = 'cumBelly':
 	end
 	gs 'cum_call', 'stomach', 0, 0, 0, cumVolMl
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'clientLeave'
+	act 'Continue':gt 'city_saunawhore', 'clientLeave'
 end
 
 if $ARGS[0] = 'cumTits':
@@ -675,7 +675,7 @@ if $ARGS[0] = 'cumTits':
 	end
 	gs 'cum_call', 'breasts', 0, 0, 0, cumVolMl
 	gs 'stat'
-	act 'Continue':gt 'saunawhore', 'clientLeave'
+	act 'Continue':gt 'city_saunawhore', 'clientLeave'
 end
 
 if $ARGS[0] = 'bdsmclient':
@@ -759,7 +759,7 @@ if $ARGS[0] = 'bdsmclient':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Head back to the main area':gt 'saunawhore', 'saunawork'
+							act 'Head back to the main area':gt 'city_saunawhore', 'saunawork'
 						end
 					end
 				end
@@ -790,14 +790,14 @@ if $ARGS[0] = 'clientLeave':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Head back to the main area':gt 'saunawhore', 'saunawork'
+		act 'Head back to the main area':gt 'city_saunawhore', 'saunawork'
 	elseif nichTarSauna = 1:
 		nichTarSaunaPay += payment
 		'Having finished with you, the client gets dressed, leaves the room, and pays the sauna <<payment>> <b>₽</b> for your services. This money will be collected by Taras later.'
 		'You earned <<nichTarSaunaPay>> <b>₽</b> for Taras.'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Head back to the main area':gt 'saunawhore', 'saunawork'
+		act 'Head back to the main area':gt 'city_saunawhore', 'saunawork'
 	else
 		money += payment
 		'Having finished with you, the client gets dressed, takes his wallet and hands you <<payment>> <b>₽</b>.'
@@ -805,18 +805,18 @@ if $ARGS[0] = 'clientLeave':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Take the money and see him out':gt 'saunawhore', 'saunawork'
+		act 'Take the money and see him out':gt 'city_saunawhore', 'saunawork'
 	end
 end
 
 !! saunawork start ---------------------------------------------------------------------------------
 
 if $ARGS[0] = 'saunawork':
-	$loc = 'saunawhore'
+	$loc = 'city_saunawhore'
 	$metka = 'saunawork'
-	$locBroom = 'saunawhore'
+	$locBroom = 'city_saunawhore'
 	$metkaBroom = 'saunawork'
-	$locM = 'saunawhore'
+	$locM = 'city_saunawhore'
 	$metkaM = 'saunawork'
 	$location_type = 'public_indoors'
 	saunaYouRoom = 1
@@ -838,16 +838,16 @@ if $ARGS[0] = 'saunawork':
 		'Nurse cames to you and takes from you <<paymamka>> per customer.'
 	end
 
-	gs 'saunawhore','debtPay'
+	gs 'city_saunawhore','debtPay'
 	if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
 
 	gs 'stat'
 
-	if workDolg <= 0:act 'Leave':gt 'sauna'
+	if workDolg <= 0:act 'Leave':gt 'city_sauna'
 
-	act 'Go to your room':gt 'sauna', 'saunaroom'
+	act 'Go to your room':gt 'city_sauna', 'saunaroom'
 
-	act 'Use the staff bathroom': minut += 1 & gt 'saunawhore', 'bathroom'
+	act 'Use the staff bathroom': minut += 1 & gt 'city_saunawhore', 'bathroom'
 
 	if workDolg > 0 and (pcs_mood <= 10 or SLomka > 0):
 		cls
@@ -860,7 +860,7 @@ if $ARGS[0] = 'saunawork':
 			gs 'drugs', 'heroin'
 			minut += 10
 			gs 'stat'
-			gt 'saunawhore', 'saunawork'
+			gt 'city_saunawhore', 'saunawork'
 		end
 		exit
 	end
@@ -875,7 +875,7 @@ if $ARGS[0] = 'saunawork':
 				gs 'drugs', 'heroin'
 				minut += 10
 				money -= 420
-				gt 'saunawhore', 'saunawork'
+				gt 'city_saunawhore', 'saunawork'
 			end
 			exit
 		end
@@ -899,7 +899,7 @@ if $ARGS[0] = 'saunawork':
 				'"I removed it as soon as I found it. If you were feeling sick, it should slowly subside."'
 				'You reflexively thank the Doctor even though he''s visiting you in this place.'
 
-				act 'Return':gt 'saunawhore', 'saunawork'
+				act 'Return':gt 'city_saunawhore', 'saunawork'
 			end
 		end
 	end
@@ -940,22 +940,22 @@ if $ARGS[0] = 'saunawork':
 							guy += 1
 							slutty += 1
 							SaunaWhore += 1
-							gt 'saunawhore', 'clientGate'
+							gt 'city_saunawhore', 'clientGate'
 						end
 					else
 						'The client examines you closely but turns away to chose another girl.'
 
-						act 'Continue':gt 'saunawhore', 'saunawork'
+						act 'Continue':gt 'city_saunawhore', 'saunawork'
 					end
 				else
 					'The client chooses another girl and she leads him to one of the back rooms.'
 
-					act 'Continue':gt 'saunawhore', 'saunawork'
+					act 'Continue':gt 'city_saunawhore', 'saunawork'
 				end
 			else
 				cla
 				'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
-				act 'Leave':gt 'saunawhore', 'saunawork'
+				act 'Leave':gt 'city_saunawhore', 'saunawork'
 			end
 		end
 	end
@@ -977,7 +977,7 @@ if $ARGS[0] = 'saunawork':
 				money += 100
 			end
 
-			act 'Leave':gt 'saunawhore', 'saunawork'
+			act 'Leave':gt 'city_saunawhore', 'saunawork'
 		end
 	end
 
@@ -1000,7 +1000,7 @@ if $ARGS[0] = 'saunawork':
 			gs 'sweat', 'add', 30
 
 
-			act 'Leave':gt 'saunawhore', 'saunawork'
+			act 'Leave':gt 'city_saunawhore', 'saunawork'
 		end
 	end
 
@@ -1026,9 +1026,9 @@ if $ARGS[0] = 'saunawork':
 end
 
 if $ARGS[0] = 'bathroom':
-	$loc = 'saunawhore'
+	$loc = 'city_saunawhore'
 	$metka = 'bathroom'
-	$locM = 'saunawhore'
+	$locM = 'city_saunawhore'
 	$metkaM = 'bathroom'
 	$location_type = 'bathroom'
 
@@ -1039,7 +1039,7 @@ if $ARGS[0] = 'bathroom':
 	'You enter the staff bathroom, which is usually cleaned by the girls that have only just started work here, voluntary or otherwise.'
 	'There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower, toilet, and basin.'
 
-	act 'Return to foyer': minut += 1 & gt 'saunawhore', 'saunawork'
+	act 'Return to foyer': minut += 1 & gt 'city_saunawhore', 'saunawork'
 
 	act 'Take a shower (0:15)':
 		cls
@@ -1096,5 +1096,5 @@ if $ARGS[0] = 'debtPay':
 	end
 end
 
---- saunaWhore ---------------------------------
+--- city_saunawhore ---------------------------------
 

locations/trashplace.qsrc → locations/city_trashplace.qsrc

@@ -1,4 +1,4 @@
-# trashplace
+# city_trashplace
 $location_type = 'public_outdoors'
 
 $bomzstartqwestdi = {
@@ -230,7 +230,7 @@ if bumtolik = 2 and rand(0, 1) = 1:
 	'You see the homeless person who you gave money to last time. He smiles, waving at you to stay and he comes up to you to say something.'
 	'"Girl, please excuse me, do not be afraid, hear me out."'
 
-	act 'Listen to him':gt'musorkaexh','pos8'
+	act 'Listen to him':gt'city_trashplaceevents','pos8'
 end
 
 if bumtolik = 3 and hour >= 6 and hour <= 20 and rand(0, 1) = 1:
@@ -244,7 +244,7 @@ if bumtolik = 3 and hour >= 6 and hour <= 20 and rand(0, 1) = 1:
 	*nl
 	'You find it uncomfortable and refuse to photograph the girl.'
 		
-	act 'Ask what she''s upto':gt'musorkaexh','pos9'
+	act 'Ask what she''s upto':gt'city_trashplaceevents','pos9'
 end
 
 if musor > 3:
@@ -259,19 +259,19 @@ if musor > 3:
 		if bomjqw > 0:
 			'"Hey, babe, come over here, show an old man some service!" you hear in an impudent rattle.'
 			'This is an old homeless man, you saw him last time.'
-			act 'See the homeless man':gt'musorkaexh','pos10'
+			act 'See the homeless man':gt'city_trashplaceevents','pos10'
 		end
 			
 		if bumtolik = 0:
 			'"Hey, there!" You hear from the bins.'
 			'You are scared and surprised.'
 
-			act 'See who spoke':gt'musorkaexh','pos2'
+			act 'See who spoke':gt'city_trashplaceevents','pos2'
 		elseif bumtolik = 1:
 			'"Hey, babe, come here, do an old man a favor!"'
 			'Wheezes the old bum you saw last time.'
 
-			act 'Listen to the homeless man':gt'musorkaexh','pos3'
+			act 'Listen to the homeless man':gt'city_trashplaceevents','pos3'
 		end
 
 		act 'Move away from the tank':gt $loc, $metka
@@ -414,5 +414,5 @@ end
 
 act 'Leave': minut += 1 & gt $loc, $metka
 
---- trashplace ---------------------------------
+--- city_trashplace ---------------------------------
 

locations/musorkaexh.qsrc → locations/city_trashplaceevents.qsrc

@@ -1,4 +1,4 @@
-# musorkaexh
+# city_trashplaceevents
 
 if $ARGS[0] = 'pos2':
 	*clr & cla
@@ -24,7 +24,7 @@ if $ARGS[0] = 'pos3':
 	'You are standing in front of a hungover homeless man.'
 	'"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 'Ask what he needs':gt'city_trashplaceevents','pos4'
 	act 'Leave':gt'city_residential'
 end
 
@@ -41,9 +41,9 @@ if $ARGS[0] = 'pos4':
 	'"In short, you want money."'
 	'"Yeah, yeah. Money."'
 
-	act 'Give him a trifle (20 <b>₽</b>)':gt'musorkaexh','pos5'
-	act 'Give him 100 <b>₽</b>':gt'musorkaexh','pos6'
-	act 'Leave':gt'trashplace'
+	act 'Give him a trifle (20 <b>₽</b>)':gt'city_trashplaceevents','pos5'
+	act 'Give him 100 <b>₽</b>':gt'city_trashplaceevents','pos6'
+	act 'Leave':gt'city_trashplace'
 end
 
 if $ARGS[0] = 'pos5':
@@ -59,7 +59,7 @@ if $ARGS[0] = 'pos5':
 	'"I am an old man, it might be the last time in my life?"'
 	'He looks at you with her tearful eyes.'
 
-	act 'Allow him to kiss your hand':gt'musorkaexh','pos7'
+	act 'Allow him to kiss your hand':gt'city_trashplaceevents','pos7'
 	act 'Of course not! Fuck the nasty old man!':gt'city_residential'
 end
 
@@ -271,5 +271,5 @@ if $ARGS[0] = 'pos10':
 	act 'Leave':gt'city_residential'
 end
 
---- musorkaexh ---------------------------------
+--- city_trashplaceevents ---------------------------------
 

locations/etoexhib.qsrc

@@ -500,7 +500,7 @@ if $ARGS[0] = 'pos15':
 	'You feel a guy standing behind you, he is a groper and is now intent on touching your ass!'
 	'His hand grabs one of your buttcheeks.'
 
-	act 'Move away':gt 'rinok', 'start'
+	act 'Move away':gt 'city_market', 'start'
 
 	act 'Next':
 		cla
@@ -525,7 +525,7 @@ if $ARGS[0] = 'pos15':
 		'"I''m sorry, I do not work here", you answered.'
 		'The woman must have startled the pervert because when you turned around, he was nowhere to be found.'
 
-		act 'Next':gt 'rinok', 'start'
+		act 'Next':gt 'city_market', 'start'
 	end
 end
 

locations/gskver.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'start':
 	!! If you already know about the treeCircle here in PavPark, go ahead and show it.
 	if tpKnown['PavlovskPark'] = 1:	gs 'treeCircEntry', 'PavlovskPark'
 
-	gs 'parkivent', 'run'
+	gs 'park_walkevents', 'run'
 
 	if hour >= 8 and hour < 22:
 		act 'Distribute flyers to earn money (50 <b>₽</b>) (1:00)':

locations/husbSex.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'dolgend':
 			'They take you to the sauna. The bandits drag you into a room start to explain. "You will live here and work, until the debt is paid off. Everything clear? If you try to escape we''ll put a bullet in your head and bury you in the woods, understood?"'
 			'You nod fearfully, realizing that they aren''t kidding.'
 
-			act 'Look around':gt 'sauna', 'saunaroom'
+			act 'Look around':gt 'city_sauna', 'saunaroom'
 		end
 
 		exit

locations/kuhr.qsrc

@@ -104,7 +104,7 @@ if musor > 3:
 		if $clothingworntype = 'nude':
 			'I can not go to the trash cans naked!'
 		else
-			killvar 'fullmorrout' & minut += 3 & gt 'trashplace', 'start'
+			killvar 'fullmorrout' & minut += 3 & gt 'city_trashplace', 'start'
 		end
 	end
 end

locations/lakecafe.qsrc

@@ -496,7 +496,7 @@ if $ARGS[0] = 'bandits':
 					'He pinches your cheeks and then slaps your face; not hard enough to be painful, but it certainly drives the message home. You can tell he''s dead serious.'
 					'After looking you in the eyes for a few more seconds to make sure you get the message, he turns around and leaves. You are all alone now.'
 
-					act 'Look around':gt 'sauna', 'saunaroom'
+					act 'Look around':gt 'city_sauna', 'saunaroom'
 				end
 			end
 		end

locations/leonid.qsrc

@@ -829,7 +829,7 @@ if $ARGS[0] = 'sold':
 	'"When whoring, I want you clean and made up. Earn me enough money and I may let you leave. Understood?"'
 	workDolg = 100000 + money
 	gs 'stat'
-	act 'Continue':gt 'sauna', 'saunaroom'
+	act 'Continue':gt 'city_sauna', 'saunaroom'
 end
 
 if $ARGS[0] = 'toilet':

locations/nichUtil.qsrc

@@ -1038,7 +1038,7 @@ if $ARGS[0] = 'onArouse':
 		nichTempNaughtyLoc = 1
 		if FUNC('nichUtil','isNicholasHome') = 1:
 			nichTempNaughtyLoc = 0
-		elseif nichGalaImplant > 1 and $loc = 'sauna':
+		elseif nichGalaImplant > 1 and $loc = 'city_sauna':
 			nichTempNaughtyLoc = 0
 		end
 		if nichTempNaughtyLoc = 1:

locations/parkdin.qsrc

@@ -1,4 +1,4 @@
-# parkdin
+# park_walkeventsrnd
 
 if suchunt = 1:
 	!!Used to randomize hunting times and make hunting faster the higher the suc level
@@ -8,25 +8,25 @@ else
 	minut += 60
 end
 gs 'stat'
-gs 'parkivent'
+gs 'park_walkevents'
 
 parkrand = rand(1,20)
 !!day
 if hour > 7 and hour < 21:
 	if parkrand < 10:
-		if parkrand = 1:gt 'parkivent', '1'
-		if parkrand = 2:gt 'parkivent', '2'
-		if parkrand = 3:gt 'parkivent', '3'
-		if parkrand = 4:gt 'parkivent', '4'
-		if parkrand = 5:gt 'parkivent', '5'
-		if parkrand = 6:gt 'parkivent', '6'
-		if parkrand = 7:gt 'parkivent', '7'
-		if parkrand = 8:gt 'parkivent', '8'
-		if parkrand = 9:gt 'parkivent', '9'
+		if parkrand = 1:gt 'park_walkevents', '1'
+		if parkrand = 2:gt 'park_walkevents', '2'
+		if parkrand = 3:gt 'park_walkevents', '3'
+		if parkrand = 4:gt 'park_walkevents', '4'
+		if parkrand = 5:gt 'park_walkevents', '5'
+		if parkrand = 6:gt 'park_walkevents', '6'
+		if parkrand = 7:gt 'park_walkevents', '7'
+		if parkrand = 8:gt 'park_walkevents', '8'
+		if parkrand = 9:gt 'park_walkevents', '9'
 	elseif parkrand = 19 and lactation['active'] > 0:
-        gt 'parkivent', 'find_baby'
+        gt 'park_walkevents', 'find_baby'
 	else
-		gt 'parkivent', 'empty'
+		gt 'park_walkevents', 'empty'
 	end
 else
 !!night
@@ -49,13 +49,13 @@ else
 	end
 
 	if parkrand <= 5:
-		gt 'parkivent', '1'
+		gt 'park_walkevents', '1'
 	elseif parkrand >= fairyrand and MagikDostup ! 1:
 		gt 'MagEncounterFairy'
 	else
-		gt 'parkivent', 'empty'
+		gt 'park_walkevents', 'empty'
 	end
 end
 
---- parkdin ---------------------------------
+--- park_walkeventsrnd ---------------------------------
 

locations/parkivent.qsrc

@@ -1,4 +1,4 @@
-# parkivent
+# park_walkevents
 
 if $ARGS[0] = 'empty':
 	menu_off = 1
@@ -213,7 +213,7 @@ if $ARGS[0] = '2':
 
 		exit
 	else
-		gt 'parkivent', 'empty'
+		gt 'park_walkevents', 'empty'
 	end
 end
 
@@ -463,7 +463,7 @@ if $ARGS[0] = '4':
 
 		exit
 	else
-		gt 'parkivent', 'empty'
+		gt 'park_walkevents', 'empty'
 	end
 end
 
@@ -519,7 +519,7 @@ if $ARGS[0] = '5':
 
 		exit
 	else
-		gt 'parkivent', 'empty'
+		gt 'park_walkevents', 'empty'
 	end
 end
 
@@ -553,13 +553,13 @@ if $ARGS[0] = '6':
 				'"Ouch...", you say groggily as you wake up.'
 				'"I thought you would never wake up.", a deep voice says. He grabs you by the hair and pulls you up, then takes his huge knife and holds it to your face. "Look pretty, if you don''t resist, this might be a pleasurable experience for you," he tells you, "Now take off your clothes, you won''t need them for now."'
 
-				act 'Take off your clothing':gt 'parkivent', '6a'
+				act 'Take off your clothing':gt 'park_walkevents', '6a'
 			end
 		end
 
 		exit
 	else
-		gt 'parkivent', 'empty'
+		gt 'park_walkevents', 'empty'
 	end
 end
 
@@ -604,7 +604,7 @@ if $ARGS[0] = '6a':
 				gs 'arousal', 'bj', 5, 'sub', 'humiliation', 'rough', 'rape'
 				gs 'stat'
 
-				act 'Suck him off':gt 'parkivent', '6b'
+				act 'Suck him off':gt 'park_walkevents', '6b'
 			end
 		end
 	end
@@ -744,7 +744,7 @@ if $ARGS[0] = '7':
 			exit
 		end
 	else
-		gt 'parkivent', 'empty'
+		gt 'park_walkevents', 'empty'
 	end
 end
 
@@ -772,7 +772,7 @@ if $ARGS[0] = '8':
 
 		exit
 	else
-		gt 'parkivent', 'empty'
+		gt 'park_walkevents', 'empty'
 	end
 end
 
@@ -829,7 +829,7 @@ if $ARGS[0] = '9':
 
 		exit
 	else
-		gt 'parkivent', 'empty'
+		gt 'park_walkevents', 'empty'
 	end
 end
 
@@ -862,7 +862,7 @@ if $ARGS[0] = 'run':
 					end
 					'Halfway through your run, you pull up your top and expose your breasts. The cool air against your warm skin causes you to shiver, and almost immediately your nipples start to harden, a mixed reaction from the air hitting them and your growing excitement.'
 					*nl
-					gs 'parkivent', 'run_reactions'
+					gs 'park_walkevents', 'run_reactions'
 				end
 			end
 		end
@@ -1099,11 +1099,11 @@ if $ARGS[0] = 'find_baby':
 		end
 		act 'Finish your walk':gt 'city_park', 'start'
 	else
-		gt 'parkivent', 'empty'
+		gt 'park_walkevents', 'empty'
 	end
 end
 
 
---- parkivent ---------------------------------
+--- park_walkevents ---------------------------------
 
 

locations/parks.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 		act 'Complete outing.':gt 'parks','start'
 	end
 
-	gs 'parkivent', 'run'
+	gs 'park_walkevents', 'run'
 
 	if hour >= 20 or hour < 6 :
 		if home_owned[4] = 0:

locations/portnoi2.qsrc

@@ -162,7 +162,7 @@ end
 if $loc = 'pav_factory':
 	act 'Leave': gt 'pav_industrial'
 else
-	act 'Leave' :gt 'rinok', 'tailor'
+	act 'Leave' :gt 'city_market', 'tailor'
 end
 
 --- portnoi2 ---------------------------------

locations/street_event.qsrc

@@ -490,7 +490,7 @@ if $ARGS[1] = 'main':
 						gs 'stat'
 						'You are at the sauna. The brutes drag you into a room and start to explain. "You''re going to live here and work until you have cleared your debt. Got it? Try to contact the authorities or escape, we''ll put a bullet in your head and bury you in the woods, understand?"'
 						'You become frightened as they''re convincing, so you just nod.'
-						act 'Look around':gt 'sauna', 'saunaroom'
+						act 'Look around':gt 'city_sauna', 'saunaroom'
 					end
 				end
 			end