Renamed sauna->city_sauna and saunawhore->city_saunawhore

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/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/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/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/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