Merge remote-tracking branch 'upstream/master'

glife.qproj

@@ -161,8 +161,8 @@
 		<Location name="lesbidomhouse"/>
 		<Location name="lesbimistress"/>
 		<Location name="lesbisubhouse"/>
-		<Location name="cafe2"/>
-		<Location name="cafe3"/>
+		<Location name="city_kafeevents2"/>
+		<Location name="city_kafeevents3"/>
 		<Location name="ParkKafe"/>
 	</Folder>
 	<Folder name="Magic Quests">
@@ -257,24 +257,24 @@
 	</Folder>
 	<Folder name="Home Street - Locations">
 		<Location name="city_residential"/>
-		<Location name="pharmacy"/>
-		<Location name="clener"/>
-		<Location name="dima"/>
+		<Location name="city_pharmacy"/>
+		<Location name="city_smalloffice"/>
+		<Location name="city_dima"/>
 		<Location name="dinsexgivi"/>
-		<Location name="IrinaRoom"/>
-		<Location name="kafe"/>
-		<Location name="kafe2"/>
-		<Location name="kafeend"/>
-		<Location name="kavkazkafe"/>
-		<Location name="klofdomhouse"/>
+		<Location name="city_irinaroom"/>
+		<Location name="city_kafe"/>
+		<Location name="city_kafe2"/>
+		<Location name="city_kafeend"/>
+		<Location name="city_kavkazkafe"/>
+		<Location name="city_jorahouse"/>
 		<Location name="city_lake"/>
 		<Location name="dort"/>
-		<Location name="narkopriton"/>
-		<Location name="bobka"/>
+		<Location name="city_drugden"/>
+		<Location name="city_bobka"/>
 		<Location name="city_park"/>
 		<Location name="parkdin"/>
 		<Location name="parkivent"/>
-		<Location name="poli"/>
+		<Location name="city_clinic"/>
 		<Location name="rinok"/>
 		<Location name="rinwork"/>
 		<Location name="sauna"/>
@@ -303,7 +303,7 @@
 		<Location name="MBathrooms"/>
 	</Folder>
 	<Folder name="Trade Representative">
-		<Location name="torgpred"/>
+		<Location name="city_trademission"/>
 		<Location name="StasQW"/>
 		<Location name="StasSex"/>
 	</Folder>

locations/ParkKafe.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'guys':
 					'One guy lies down and roughly pulls you on top. He groans in pleasure when his hard member rubs against your tight pussy, then he starts fucking your pussy relentlessly. The other guy lines up behind you and shoves his penis up your ass. You moan, both in pain and pleasure, at the sensation of being filled in both holes.'
 					'One of them finishes deep inside you while the other pulls out and cums on your ass.'
 					gs 'arousal', 'anal', 5
-					gs 'arousal', 'vaginal', -5,
+					gs 'arousal', 'vaginal', -5
 					gs 'cum_call', '', $boy
 					gs 'cum_call', 'anus', $boy
 					gs 'arousal', 'end'

locations/bass.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/pool/bass.jpg"></center>'
 	'You must wear a swimsuit in the pool.'
 
-	if db >= 1 and Goraday ! daystart:act 'Search ZHoru':Goraday = daystart & gt 'klofdomhouse', 'ev42'
+	if db >= 1 and Goraday ! daystart:act 'Search ZHoru':Goraday = daystart & gt 'city_jorahouse', 'ev42'
 
 	act 'Swim':
 		cla

locations/brother_voyeur.qsrc

@@ -1720,7 +1720,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 		
 		act'Fuck him till he cums':gt'brother_voyeur','shower_creampie'
 			
-		act'Fill me up!':'brother_voyeur','shower_fill_me_up'
+		act'Fill me up!':gt 'brother_voyeur','shower_fill_me_up'
 		
 	elseif brothercumchoice = 3:
 		'"<<$pcs_nickname>>-! I''m almost there! Let me cum on your face!"'

locations/casino.qsrc

@@ -216,7 +216,7 @@ if $ARGS[0] = 'roulette_result':
 
 	'<right><img <<$set_imgh>> src="images/locations/city/industrial/casino/resul.jpg"></right>'
 	*nl
-	'The ball stopps at <<x_rul>> <<$color>>'
+	'The ball stops at <<x_rul>> <<$color>>'
 
 	if kh ! 0:
 		if kh = 1:

locations/bobka.qsrc → locations/city_bobka.qsrc

@@ -1,4 +1,4 @@
-# bobka
+# city_bobka
 
 menu_off = 1
 
@@ -27,7 +27,7 @@ if ARGS[0] = 0:
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Inject yourself with the drugs': gt 'bobka', 'inject'
+	act 'Inject yourself with the drugs': gt 'city_bobka', 'inject'
 end
 
 if ARGS[0] = 1:
@@ -58,7 +58,7 @@ if ARGS[0] = 1:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Inject yourself with the drugs ': gt 'bobka', 'inject'
+		act 'Inject yourself with the drugs ': gt 'city_bobka', 'inject'
 	end
 end
 
@@ -88,7 +88,7 @@ if ARGS[0] = 2:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Inject yourself with the drugs ': gt 'bobka', 'inject'
+		act 'Inject yourself with the drugs ': gt 'city_bobka', 'inject'
 	end
 end
 
@@ -110,12 +110,12 @@ if ARGS[0] = 3:
 			gs 'willpower', 'bj', 'resist'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'bobka', 'rimming2'
+			gt 'city_bobka', 'rimming2'
 		end
 	else
 		act 'Lick his ass reluctantly (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Lick his ass enthusiastically':gt 'bobka', 'rimming3'
+	act 'Lick his ass enthusiastically':gt 'city_bobka', 'rimming3'
 end
 
 if ARGS[0] = 4:
@@ -136,12 +136,12 @@ if ARGS[0] = 4:
 			gs 'willpower', 'swallow', 'resist'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'bobka', 'peeface'
+			gt 'city_bobka', 'peeface'
 		end
 	else
 		act 'Let him pee on your face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Open your mouth for him':gt 'bobka', 'peeswallow'
+	act 'Open your mouth for him':gt 'city_bobka', 'peeswallow'
 end
 
 if $ARGS[0] = 'inject':
@@ -179,7 +179,7 @@ if $ARGS[0] = 'rimming2':
 	'Bobka laughs: "That''s better. You sluts always need some encouragement!"'
 	'He forces your face onto his ass, and you do your best to please him with your tongue. The mere thought of it sickens you, but at the same time there''s nothing you can do to stop yourself now...'
 
-	act 'Moan and put your tongue to work':gt 'bobka', 'rimming4'
+	act 'Moan and put your tongue to work':gt 'city_bobka', 'rimming4'
 end
 
 if $ARGS[0] = 'rimming3':
@@ -191,7 +191,7 @@ if $ARGS[0] = 'rimming3':
 	'Bobka laughs: "That''s it, whore! I knew you were a keeper... you love this, don''t you?" as he forces your face against his ass.'
 	'"Time to really get your tongue in there, where it belongs! And put some effort into it, or else..." he smirks.'
 
-	act 'Moan and put your tongue to work':gt 'bobka', 'rimming4'
+	act 'Moan and put your tongue to work':gt 'city_bobka', 'rimming4'
 end
 
 if $ARGS[0] = 'rimming4':
@@ -208,7 +208,7 @@ if $ARGS[0] = 'rimming4':
 	'Bobka''s cock stands fully erect now, and he lazily begins to jerk off while you fuck his ass with your tongue. He grins when he sees your pleading look: "Soon, slut. Keep licking!"'
 	'"Hopefully he cums soon, at least then it will be over..." you think to yourself, not even caring that he''s probably going to cum all over your face when he does.'
 
-	act 'Continue':gt 'bobka', 'rimming5'
+	act 'Continue':gt 'city_bobka', 'rimming5'
 end
 
 if $ARGS[0] = 'rimming5':
@@ -230,7 +230,7 @@ if $ARGS[0] = 'rimming5':
 	'With a deep sigh you take his flaccid penis in your mouth, and lick it clean. After spending so much time around his anus, the taste of his semen is almost pleasant in comparison.'
 	'He scoffs when he sees the hopeful look in your eyes: "That was... disappointing, <<$pcs_nickname>>. Show some more enthusiasm next time! Heroin whores can''t afford to be squeamish, remember that."'
 	'While he looks hesitant for a while, eventually he hands you a syringe.'
-	act 'Inject yourself with the drugs ': gt 'bobka', 'inject'
+	act 'Inject yourself with the drugs ': gt 'city_bobka', 'inject'
 end
 
 if $ARGS[0] = 'peeface':
@@ -240,7 +240,7 @@ if $ARGS[0] = 'peeface':
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/peeface.jpg"></center>'
 	'Bobka releases his flaccid penis from his trousers, and unleashes a warm stream of urine almost immediately. When you wince and close your eyes, he shouts angrily: "Don''t turn away! Open your eyes and look at me, slut! Right now!"'
 
-	act 'Look into his eyes':gt 'bobka', 'peeface2'
+	act 'Look into his eyes':gt 'city_bobka', 'peeface2'
 end
 
 if $ARGS[0] = 'peeface2':
@@ -252,7 +252,7 @@ if $ARGS[0] = 'peeface2':
 	'You open your eyes and look at him obediently, keeping your face so the urine at least won''t splash up your nose. His urine smells horribly and slowly drips down your body, forming a puddle underneath you. Your mind is going through a desperate struggle as you sit there; on the one hand you feel terrible for demeaning yourself so much, but on the other hand you''re happily anticipating your next high.'
 	'When you wipe your eyes clear with the back of your trembling hands, Bobka smiles meanly.'
 
-	act 'Ask for the dose':gt 'bobka', 'peeface3'
+	act 'Ask for the dose':gt 'city_bobka', 'peeface3'
 end
 
 if $ARGS[0] = 'peeface3':
@@ -264,7 +264,7 @@ if $ARGS[0] = 'peeface3':
 	'Bobka gets closer to you and shakes the last drops off his penis, and then wipes it on your hair.'
 	'"Did you like your shower? It seems just right, for the whore that you are..." he smiles serenely, seeing the defeated look in your eyes. He knows he''s very close to breaking you for good, and offers you the syringe without playing any games.'
 
-	act 'Grab the syringe':gt 'bobka', 'peewhore'
+	act 'Grab the syringe':gt 'city_bobka', 'peewhore'
 end
 
 if $ARGS[0] = 'peeswallow':
@@ -279,7 +279,7 @@ if $ARGS[0] = 'peeswallow':
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/peeswallow.jpg"></center>'
 	'As soon as you open your mouth, a torrent of Bobka''s urine enters your mouth. You nearly choke and cough from the horrible taste, and grimace from the nasty smell that fills your nostrils.'
 
-	act 'Cough uncontrollably':gt 'bobka', 'peeswallow2'
+	act 'Cough uncontrollably':gt 'city_bobka', 'peeswallow2'
 end
 
 if $ARGS[0] = 'peeswallow2':
@@ -293,7 +293,7 @@ if $ARGS[0] = 'peeswallow2':
 	'"Swallow it, whore! Swallow it all, or you''re not getting anything!" Bobka barks loudly.'
 	'You throw your head back and open your mouth as far as you can, just letting the urine flow directly into your stomach without even bothering to swallow. Your stomach fills quickly, and you feel a bit bloated when the stream finally slows down.'
 
-	act 'Swallow the last drops':gt 'bobka', 'peeswallow3'
+	act 'Swallow the last drops':gt 'city_bobka', 'peeswallow3'
 end
 
 if $ARGS[0] = 'peeswallow3':
@@ -304,7 +304,7 @@ if $ARGS[0] = 'peeswallow3':
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/peeswallow3.jpg"></center>'
 	'Bobka steps a bit closer to you and puts the tip of his cock directly onto your lower lip and then makes you close your mouth, making you suck the last drops out of him directly.'
 
-	act 'Lick his cock clean':gt 'bobka', 'peeswallow4'
+	act 'Lick his cock clean':gt 'city_bobka', 'peeswallow4'
 end
 
 if $ARGS[0] = 'peeswallow4':
@@ -318,7 +318,7 @@ if $ARGS[0] = 'peeswallow4':
 	'While you try not to think about what you just did to earn it, you extend your trembling hand.'
 	'Bobka laughs as he offers you a syringe and the 100 <b>₽</b> he promised you: "I think you may have found your calling! This might be a decent career for you... maybe I can make some arrangements. Anyway, here you go. I hope it was worth it."'
 
-	act 'Grab the syringe':gt 'bobka', 'peewhore'
+	act 'Grab the syringe':gt 'city_bobka', 'peewhore'
 end
 
 if $ARGS[0] = 'peewhore':
@@ -340,5 +340,5 @@ if $ARGS[0] = 'peewhore':
 	end
 end
 
---- bobka ---------------------------------
+--- city_bobka ---------------------------------
 

locations/poli.qsrc → locations/city_clinic.qsrc

@@ -1,13 +1,13 @@
-# poli
+# city_clinic
 $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
 	CLOSE all
-	$sexloc = 'poli'
-	$loc = 'poli'
+	$sexloc = 'city_clinic'
+	$loc = 'city_clinic'
 	$metka = 'start'
 	$location_type = 'indoors'
-	$menu_loc = 'poli'
+	$menu_loc = 'city_clinic'
 	$menu_arg = 'start'
 	menu_off = 0
 	*clr & cla
@@ -33,18 +33,18 @@ if $ARGS[0] = 'start':
 	*nl
 	if pcs_gpolimilkdonation >= 2 and lactation['active'] > 0 and lact_ev['pcs_knows_milkbank'] < 1 and lactation['pc_aware'] > 0:
 		*nl
-		'<a href="exec: minut += 5 & gt ''poli'', ''milk_reception''">Ask</a> at the reception if there is the possibilty for breast milk donation'
+		'<a href="exec: minut += 5 & gt ''city_clinic'', ''milk_reception''">Ask</a> at the reception if there is the possibilty for breast milk donation'
 	elseif pcs_gpolimilkdonation < 2 and lactation['active'] > 0 and lact_ev['pcs_knows_milkbank'] < 1 and lactation['pc_aware'] > 0:
 		*nl
-		'At the reception a small <a href="exec: minut += 5 & gt ''poli'', ''milk_advertisement''">advertisement</a> catches your eye.'
+		'At the reception a small <a href="exec: minut += 5 & gt ''city_clinic'', ''milk_advertisement''">advertisement</a> catches your eye.'
 	end
 
-	if workhosp = 1 and hour >= 8 and hour <= 9 and week < 6:act 'Begin your work day':gt 'poli', 'beginwork'
+	if workhosp = 1 and hour >= 8 and hour <= 9 and week < 6:act 'Begin your work day':gt 'city_clinic', 'beginwork'
 
 	act 'Leave the clinic': minut += 5 & gt 'city_residential'
-	act 'Go see a cosmetic surgeon':gt 'poli','cosmetic1'
+	act 'Go see a cosmetic surgeon':gt 'city_clinic','cosmetic1'
 	if lact_ev['pcs_knows_milkbank'] >= 1:
-		act 'Go to the breast milk donation office': minut += 5 & gt 'poli','milk_donation_room'
+		act 'Go to the breast milk donation office': minut += 5 & gt 'city_clinic','milk_donation_room'
 	end
 
 	if pcs_health < (pcs_vital * 10 + pcs_stren * 5) or pain['total'] > 10:
@@ -55,13 +55,13 @@ if $ARGS[0] = 'start':
 			gs 'medical_din','healthTreatment'
 			gs 'stat'
 
-			if hosprand = 0:gt 'poli', '0'
-			if hosprand = 1:gt 'poli', '1'
-			if hosprand = 2:gt 'poli', '2'
+			if hosprand = 0:gt 'city_clinic', '0'
+			if hosprand = 1:gt 'city_clinic', '1'
+			if hosprand = 2:gt 'city_clinic', '2'
 			'The doctor guides you to a bed and tells you to lie down, after which he gives you a combined painkiller, steroid and vitamin shot.'
 			'You feel drowsy for a little while, but afterwards you feel a lot better. The shot sped up your aching body''s recovery by a lot, meaning the pain probably won''t come back nearly as strongly when the shot wears off, and should aid your health recovery over the coming days.'
 
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -72,19 +72,19 @@ if $ARGS[0] = 'start':
 			minut += 60
 			pcs_mood = 100
 
-			if hosprand = 0:gt 'poli', '0'
-			if hosprand = 1:gt 'poli', '1'
-			if hosprand = 2:gt 'poli', '2'
+			if hosprand = 0:gt 'city_clinic', '0'
+			if hosprand = 1:gt 'city_clinic', '1'
+			if hosprand = 2:gt 'city_clinic', '2'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/therapy1.jpg"></center>'
 			'You lie down on the therapist''s couch and tell him all about your troubles. You immediately feel much better, but the therapist seems to be in a state of shock.'
 
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 		end
 	end
 
 	gs 'medical_din', 'birth_control'
 			
-	act 'Go to the STD clinic':gt 'poli', 'stdclinic'
+	act 'Go to the STD clinic':gt 'city_clinic', 'stdclinic'
 
 	if money >= 15000 and preg = 1 and pregchem < 1863 and knowpreg = 1:
 		act 'Get an abortion (15,000 <b>₽</b>)':
@@ -99,7 +99,7 @@ if $ARGS[0] = 'start':
 			minut += 60
 			gs 'stat'
 
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 		end
 	end
 	
@@ -148,7 +148,7 @@ if $ARGS[0] = 'start':
 			gs 'cum_cleanup', 'reset'
 			dynamic $d_cycreport_choice
 			gs 'stat'
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -159,14 +159,14 @@ if $ARGS[0] = 'start':
 				polisickday = daystart
 				terrnd = rand(0, 1)
 
-				if terrnd = 0:gt 'poli', 'drPP'
-				if terrnd = 1:gt 'poli', 'ninel'
+				if terrnd = 0:gt 'city_clinic', 'drPP'
+				if terrnd = 1:gt 'city_clinic', 'ninel'
 			end
 		else
 			act 'See Dr. Ninel':
 				*clr & cla
 				polisickday = daystart
-				gt 'poli', 'ninel2'
+				gt 'city_clinic', 'ninel2'
 			end
 		end
 	end
@@ -179,7 +179,7 @@ if $ARGS[0] = 'start':
 
 			if ninelrand = 0:
 				'At the reception desk you are told that Dr. Ninel is in her office.'
-				act 'Go to Dr. Ninel':gt 'poli', 'ninel3'
+				act 'Go to Dr. Ninel':gt 'city_clinic', 'ninel3'
 			elseif ninelrand = 1:
 				'At the reception desk you are told that Dr. Ninel can''t see you today.'
 				act 'Leave the clinic': minut += 5 & gt 'city_residential'
@@ -193,11 +193,11 @@ if $ARGS[0] = 'start':
 	if cumcondslip > 0 and cumcondslip_aware > 0:
 		act 'See a Doctor':
 			*clr & cla
-			gt 'poli', 'drPP'
+			gt 'city_clinic', 'drPP'
 		end
 	end
 
-	if katjob > 0:act 'Visit the chief doctor': gt 'poli', 'glavdoc'
+	if katjob > 0:act 'Visit the chief doctor': gt 'city_clinic', 'glavdoc'
 
 	if pcs_teeth > -1:
 		act 'Go to the dentist':
@@ -291,7 +291,7 @@ if $ARGS[0] = 'start':
 			glassqw = 2
 			glass = 1
 			blizoruk += 1
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -304,7 +304,7 @@ if $ARGS[0] = 'start':
 
 			if glass = 1:'The doctor adds, there is also the option to buy glasses for 4,500 <b>₽</b>.'
 
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 
 			if glass = 1:
 				if money >= 4500:
@@ -316,7 +316,7 @@ if $ARGS[0] = 'start':
 						gs 'stat'
 						'You buy a new, more stylish pair of glasses.'
 
-						act 'Return to the entrance':gt 'poli', 'start'
+						act 'Return to the entrance':gt 'city_clinic', 'start'
 					end
 				else
 					*nl
@@ -334,7 +334,7 @@ if $ARGS[0] = 'start':
 						glass = 0
 						gs 'stat'
 						'You undergo laser eye surgery. Your eyesight is much better now.'
-						act 'Return to the entrance':gt 'poli', 'start'
+						act 'Return to the entrance':gt 'city_clinic', 'start'
 					end
 				else
 					*nl
@@ -361,9 +361,9 @@ if $ARGS[0] = 'stdclinic':
 	'		Complete cure for yeast infection - 15,000 <b>₽</b>.'
 	'	Treatment requires hospitalization on first Monday of each month.'
 	
-	act 'Leave':gt 'poli', 'start'
+	act 'Leave':gt 'city_clinic', 'start'
 
-	if money >= 1000: act 'Take STD test (1,000 <b>₽</b>)': gt 'poli', 'stdcheck'
+	if money >= 1000: act 'Take STD test (1,000 <b>₽</b>)': gt 'city_clinic', 'stdcheck'
 
 	if GerpesNapr > 0 and money >= 450 and GerpesUkolDay ! daystart:
 		act 'Get herpes shot (450 <b>₽</b>). You need <<GerpesNapr>> more injections to complete the treatment.':
@@ -377,7 +377,7 @@ if $ARGS[0] = 'stdclinic':
 			'You see the nurse and she gives you a painful injection in your ass.'
 			
 			if GerpesNapr = 0:Gerpes = -10 & 'You have completed the treatment.'
-			act 'Leave':gt 'poli', 'start'	
+			act 'Leave':gt 'city_clinic', 'start'	
 		end
 	end
 
@@ -394,7 +394,7 @@ if $ARGS[0] = 'stdclinic':
 
 			if TriperNapr = 0:TriperOral = 0 & TriperOralSigns = 0 & Triper = 0 & Venera -= 1 & TriperOnce = 0 & 'You have completed the treatment.'
 
-			act 'Leave':gt 'poli', 'start'
+			act 'Leave':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -413,7 +413,7 @@ if $ARGS[0] = 'stdclinic':
 
 			'"That''s it, you might still feel a bit off but the infection is now cured".'
 
-			act 'Leave':gt 'poli', 'start'
+			act 'Leave':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -433,7 +433,7 @@ if $ARGS[0] = 'stdclinic':
 			'There''s an ambulance waiting outside. It drives you to a cutting edge medical facility, where you spend 3 days being treated and pampered.'
 			'After a long recovery, you have been completely cured of your herpes.'
 
-			act 'Leave':gt 'poli', 'start'
+			act 'Leave':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -450,7 +450,7 @@ if $ARGS[0] = 'stdclinic':
 			'There''s an ambulance waiting outside. It drives you to a cutting edge medical facility, where you spend 3 days being treated and pampered.'
 			'After a long recovery, you have been completely cured of your thrush.'
 
-			act 'Leave':gt 'poli', 'start'
+			act 'Leave':gt 'city_clinic', 'start'
 		end
 	end
 end
@@ -490,16 +490,16 @@ if $ARGS[0] = 'stdcheck':
 							'The doctor, unfazed, speaks in a calm voice: "Oh, you noticed that huh? The camera is there for your safety as well as mine, miss. I''ve been accused of molestation before."'
 							'"Then it hit me: people on the internet pay good money to see my examinations! Two birds with one stone, right?" he continues. After a moment of silence he adds with a wicked grin: "Okay... since you spotted the camera, I''ll offer you a choice. If you give me 10.000 <b>₽</b> I''ll delete the footage, as if you were never here. I''d be losing a lot of income, so that''s only fair."'
 							'Before you can reply he adds: "Or if you don''t mind being watched by a few thousand people who you''ll probably never meet anyway, I can give you... 3000 <b>₽</b> to keep quiet. It''s your call."'
-							act 'Pay him to delete the footage':gt 'poli', 'ven1'
-							act 'Take the bribe':gt 'poli', 'ven2'
+							act 'Pay him to delete the footage':gt 'city_clinic', 'ven1'
+							act 'Take the bribe':gt 'city_clinic', 'ven2'
 							act 'Threaten to report him':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/bg28qy97.jpg"></center>'
 								'The doctor brings his face very close to yours and hisses: "Look at where you are, bitch! You better shut your fucking mouth right now, I can make you disappear just like THAT and everyone would be none the wiser!" He snaps his fingers for emphasis. "I made you a very generous offer, don''t make me regret that. An unfortunate ''complication'' is easy to arrange..."'
 								'Then he becomes his calm self again and sighs: "Anyway, let''s forget what you just said and start over. Are you going to compensate me for having to delete the footage?"'
-								act 'Pay him to delete the footage':gt 'poli', 'ven1'
-								act 'Take the bribe':gt 'poli', 'ven2'
-								act 'Try to escape':gt 'poli', 'ven3'
+								act 'Pay him to delete the footage':gt 'city_clinic', 'ven1'
+								act 'Take the bribe':gt 'city_clinic', 'ven2'
+								act 'Try to escape':gt 'city_clinic', 'ven3'
 							end
 						end
 					else
@@ -544,7 +544,7 @@ if $ARGS[0] = 'stdcheck':
 							'Doctor is pleased that you do not have a sexually transmitted disease.'
 						end
 
-						act 'Leave':gt 'poli', 'stdclinic'
+						act 'Leave':gt 'city_clinic', 'stdclinic'
 					end
 				end
 			end
@@ -560,7 +560,7 @@ if $ARGS[0] = 'ven1':
     '<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/gy93cr29.jpg"></center>'
     'You lie down, almost crying, mulling over the doctor''s words again and again in your head. You know it is not fair, but you can''t allow these images to go public and decide to pay him to delete the footage.'
 	'You pull the money from your wallet and give it to him, hoping he''ll keep true to his word...'
-    act 'Return to the lobby':gt'poli','start'
+    act 'Return to the lobby':gt'city_clinic','start'
 end
 
 if $ARGS[0] = 'ven2':
@@ -571,7 +571,7 @@ if $ARGS[0] = 'ven2':
     '<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/gy93cr29.jpg"></center>'
     'You lie down, almost crying, mulling over the doctor''s words again and again in your head. After a while you decide that you want the money... you probably won''t be recognized, and even if you do: you can always pretend you didn''t know you were being filmed?'
 	'The doctor seems somewhat surprised to hear your answer, but gives you the money as promised. He grins: "Don''t worry, most of my subscribers don''t live in the city. Maybe a hundred, tops... what are the odds of you running into one of them the coming weeks?"'
-    act 'Leave his office':gt'poli','start'
+    act 'Leave his office':gt'city_clinic','start'
 end
 
 if $ARGS[0] = 'ven3':
@@ -1076,13 +1076,13 @@ if $ARGS[0] = 'glavdoc':
 			'You shake his hand and sort out the paperwork with the personnel department afterwards. Whatever Kat told them must''ve worked, none of them ask any questions about your credentials!'
 			'Five minutes later when you leave the office, you''re holding a shiny new employee pass and a booklet with relevant information.'
 
-			act 'Return to the lobby':gt 'poli', 'start'
+			act 'Return to the lobby':gt 'city_clinic', 'start'
 		end
 	end
 
-	if workhosp = 1:act 'Quit your job':gt 'poli', 'discharge'
+	if workhosp = 1:act 'Quit your job':gt 'city_clinic', 'discharge'
 
-	act 'Return to the lobby':gt 'poli', 'start'
+	act 'Return to the lobby':gt 'city_clinic', 'start'
 end
 
 if $ARGS[0] = 'beginwork':
@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'beginwork':
 		gt 'WorkHosp', 'start'
 	end
 
-	act 'Quit your job':gt 'poli', 'discharge'
+	act 'Quit your job':gt 'city_clinic', 'discharge'
 
 end
 
@@ -1128,7 +1128,7 @@ if $ARGS[0] = '0':
 			gs 'willpower', 'sex', 'resist'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'poli', 'start'
+			gt 'city_clinic', 'start'
 		end
 	else
 		act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1156,7 +1156,7 @@ if $ARGS[0] = '1':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'poli', 'start'
+			gt 'city_clinic', 'start'
 		end
 	else
 		act 'Storm out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1179,7 +1179,7 @@ if $ARGS[0] = '2':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex3.jpg"></center>'
 	'Going to the office you catch a nurse kneeling before the doctor with his cock in her mouth.'
 
-	act 'Leave':gt 'poli', 'start'
+	act 'Leave':gt 'city_clinic', 'start'
 
 	act 'Walk in':
 		*clr & cla
@@ -1193,7 +1193,7 @@ if $ARGS[0] = '2':
 				gs 'willpower', 'cuni', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'poli', 'start'
+				gt 'city_clinic', 'start'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1236,68 +1236,68 @@ if $ARGS[0] = 'cosmetic1':
 	'String implants slowly absorb your body fluids and grow larger over time. We can also drain it for you if it becomes too large.'
 	*nl
 	if money >= 80000 and lashair = 0:
-		'<a href="exec:gt ''poli'', ''electrolysis''">Electrolysis</a> laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''electrolysis''">Electrolysis</a> laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
 		else
 		'Electrolysis - laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
 	end
 	if money >= 25000 and pcs_lip < 4:
-		'<a href="exec:gt ''poli'', ''lipPlus''">Lip enlargement surgery</a> - 25,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''lipPlus''">Lip enlargement surgery</a> - 25,000 <b>₽</b>'
 		else
 		'Lip enlargement surgery - 25,000 <b>₽</b>'
 	end
 	if money >= 30000 and pcs_lip ! 0:
-		'<a href="exec:gt ''poli'', ''lipMin''">Lip reduction surgery</a> - 30,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''lipMin''">Lip reduction surgery</a> - 30,000 <b>₽</b>'
 		else
 		'Lip reduction surgery - 30,000 <b>₽</b>'
 	end
 	if money >= 90000 and pcs_eyesize < 3:
-		'<a href="exec:gt ''poli'', ''eyePlus''">Eye enlargement surgery</a> - 90,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''eyePlus''">Eye enlargement surgery</a> - 90,000 <b>₽</b>'
 		else
 		'Eye enlargement surgery - 90,000 <b>₽</b>'
 	end
 	if money >= 90000 and pcs_eyesize ! 0:
-		'<a href="exec:gt ''poli'', ''eyeMin''">Eye reduction surgery</a> - 90,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''eyeMin''">Eye reduction surgery</a> - 90,000 <b>₽</b>'
 		else
 		'Eye reduction surgery - 90,000 <b>₽</b>' 
 	end
 	if money >= 75000 and salo > 40:
-		'<a href="exec:gt ''poli'', ''lyposuction''">Liposuction</a> - 75,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''lyposuction''">Liposuction</a> - 75,000 <b>₽</b>'
 		else
 		'Liposuction - 75,000 <b>₽</b>'
 	end
 	''
 	if money >= 90000 and silicone ! 0:
-		'<a href="exec:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & gt ''poli'', ''bImplantA''">Remove breast implants</a> - 90,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & gt ''city_clinic'', ''bImplantA''">Remove breast implants</a> - 90,000 <b>₽</b>'
 		else
 		'Remove breast implants - 90,000 <b>₽</b>'
 	end
 	if money >= 170000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 10 & gt ''poli'', ''bImplantA''">Get small breast implants</a> - 170,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 10 & gt ''city_clinic'', ''bImplantA''">Get small breast implants</a> - 170,000 <b>₽</b>'
 		else
 		'Get small breast implants - 170,000 <b>₽</b>'
 	end
 	if money >= 180000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & gt ''poli'', ''bImplantA''">Get medium breast implants</a> - 180,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 20 & gt ''city_clinic'', ''bImplantA''">Get medium breast implants</a> - 180,000 <b>₽</b>'
 		else
 		'Get medium breast implants - 180,000 <b>₽</b>'
 	end
 	if money >= 190000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 30 & gt ''poli'', ''bImplantA''">Get large breast implants</a> - 190,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 30 & gt ''city_clinic'', ''bImplantA''">Get large breast implants</a> - 190,000 <b>₽</b>'
 		else
 		'Get large breast implants - 190,000 <b>₽</b>'
 	end
 	if money >= 200000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 40 & gt ''poli'', ''bImplantA''">Get XXL breast implants</a> - 200,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 40 & gt ''city_clinic'', ''bImplantA''">Get XXL breast implants</a> - 200,000 <b>₽</b>'
 		else
 		'Get XXL breast implants - 200,000 <b>₽</b>'
 	end
 	if money >= 200000 and silicone = 0 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & fillimplant = 1 & gt ''poli'', ''bImplantA''">Get fillable implants</a> - 200,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 20 & fillimplant = 1 & gt ''city_clinic'', ''bImplantA''">Get fillable implants</a> - 200,000 <b>₽</b>'
 		else
 		'Get fillable implants - 200,000 <b>₽</b>'
 	end
 	if money >= 250000 and silicone = 0 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & stringimplant = 1 & gt ''poli'', ''bImplantA''">Get string implants</a> - 250,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 20 & stringimplant = 1 & gt ''city_clinic'', ''bImplantA''">Get string implants</a> - 250,000 <b>₽</b>'
 		else
 		'Get string implants - 250,000 <b>₽</b>'
 	end
@@ -1309,7 +1309,7 @@ if $ARGS[0] = 'cosmetic1':
 		'Buy silicone bag - 500 <b>₽</b>'
 	end
 
-	act 'Go back':gt 'poli','start'
+	act 'Go back':gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'electrolysis':
@@ -1323,7 +1323,7 @@ if $ARGS[0] = 'electrolysis':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/electrolysis.jpg"></center>'
 	'The surgeon has you strip completely and lie down on the table. Over next few hours you are treated by a laser over and over again. When the treatment is finished and you get up from the table, your skin feels silky smooth.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'lipPlus':
@@ -1337,7 +1337,7 @@ if $ARGS[0] = 'lipPlus':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'lipMin':
@@ -1351,7 +1351,7 @@ if $ARGS[0] = 'lipMin':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'eyePlus':
@@ -1365,7 +1365,7 @@ if $ARGS[0] = 'eyePlus':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'eyeMin':
@@ -1379,7 +1379,7 @@ if $ARGS[0] = 'eyeMin':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'lyposuction':
@@ -1394,7 +1394,7 @@ if $ARGS[0] = 'lyposuction':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'bImplantA':
@@ -1428,7 +1428,7 @@ if $ARGS[0] = 'bImplantA':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'milk_advertisement':
@@ -1442,7 +1442,7 @@ if $ARGS[0] = 'milk_advertisement':
 		'You are not sure why this cought your attention.'
 	end
 	if lact_ev['pcs_knows_milkbank'] < 1: lact_ev['pcs_knows_milkbank'] = 1
-	act 'Go back':gt 'poli','start'
+	act 'Go back':gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'milk_reception':
@@ -1452,7 +1452,7 @@ if $ARGS[0] = 'milk_reception':
 	'She waves into a general direction down the hallway.'
 	'Nurse at the reception: There should be a sign on the door, it is only a small room.'
 	if lact_ev['pcs_knows_milkbank'] < 1: lact_ev['pcs_knows_milkbank'] = 1
-	act 'Go back':gt 'poli','start'
+	act 'Go back':gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'milk_donation_room':
@@ -1460,7 +1460,7 @@ if $ARGS[0] = 'milk_donation_room':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/milkbank/milkbank_door.jpg"></center>'
 	'There is a door with a sign on it, indicating this is the office for the milk donation.'
-	act 'Go back':gt 'poli','start'
+	act 'Go back':gt 'city_clinic','start'
 	if lactation['pc_aware'] > 0 and hour < 10 or hour > 19:
 		'The door seems to be locked, nobody is here.'
 		'There is a sign that reads "Opening hours are 10:00 to 19:00 daily.'
@@ -1538,15 +1538,15 @@ if $ARGS[0] = 'milk_donation_room':
 					lact_ev['poli_sample_vol'] = lact_ev['poli_milkedvolume']
 					lact_ev['poli_milkedvolume'] = 0
 					lact_ev['pcs_milkbank_firsttime'] = 1
-					act 'Leave':gt 'poli','start'
+					act 'Leave':gt 'city_clinic','start'
 				end
 			else
 				!!	if rand(1,100) > 98:
-				!!		gt 'poli','milk_bank_guy'
+				!!		gt 'city_clinic','milk_bank_guy'
 				!!	else
-				!!		gt 'poli','milk_bank'
+				!!		gt 'city_clinic','milk_bank'
 				!!	end
-				gt 'poli','milk_bank'
+				gt 'city_clinic','milk_bank'
 			end
 		end
 	else
@@ -1556,7 +1556,7 @@ end
 
 if $ARGS[0] = 'milk_bank_guy':
 	'content not finished yet'
-	act 'Leave':gt 'poli','start'
+	act 'Leave':gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'milk_bank':
@@ -1590,7 +1590,7 @@ if $ARGS[0] = 'milk_bank':
 			'Paid money: <<((lact_ev[''poli_totalmilkdonated'']/50)*100)>><b>₽</b>'
 			'<br>----------------------------------------'
 		end
-		act 'Leave': gt 'poli', 'milk_donation_room'
+		act 'Leave': gt 'city_clinic', 'milk_donation_room'
 	end
 	if lactation['active'] > 0:
 		act 'Donate breast milk':
@@ -1607,18 +1607,18 @@ if $ARGS[0] = 'milk_bank':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/milkbank/pumping_room.jpg"></center>'
 				'The employee leads you into one of the free rooms and invites you to sit down.'
 				'She prepares the breast pump and signales you to prepare yourself.'
-				act 'continue': gt 'poli','milk_donation'
+				act 'continue': gt 'city_clinic','milk_donation'
 			end
 			act 'Don''t follow her':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
 				'You: Ah Sorry! I forgot something and can''t donate now.'
-				act 'Leave':gt 'poli', 'milk_donation_room'
+				act 'Leave':gt 'city_clinic', 'milk_donation_room'
 			end
 		end
 	end
-	act 'Leave':gt 'poli','start'
+	act 'Leave':gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'milk_donation':
@@ -1685,9 +1685,9 @@ if $ARGS[0] = 'milk_donation':
 			if lactation['breastmv'] > lactation['breastmm']/2 and lactation['breastmv'] >= 100000:
 				'The employee looks at your breasts'
 				'Nurse: It seems there is still some milk left, do you want to donate more?'
-				act 'have your breasts pumped again': gt 'poli','milk_donation'
+				act 'have your breasts pumped again': gt 'city_clinic','milk_donation'
 			else
-				act 'ask to donate more': gt 'poli','milk_donation'
+				act 'ask to donate more': gt 'city_clinic','milk_donation'
 			end
 			act 'enough for today':
 				*clr & cla
@@ -1700,19 +1700,19 @@ if $ARGS[0] = 'milk_donation':
 				end
 				act 'leave':
 					lact_ev['poli_milkedvolume'] = 0
-					gt 'poli', 'milk_donation_room'
+					gt 'city_clinic', 'milk_donation_room'
 				end
 			end
 		end
 	elseif lact_ev['poli_donationsessioncount'] > 0:
 		'Sorry Ms. <<$pcs_lastname>>, we are closing now.'
 		'You put on your top, and the employee hands you <<lact_ev[''poli_donatemoney'']>><b>₽</b> for your donated breast milk.'
-		act 'Leave':minut += 5 & gt 'poli', 'milk_donation_room'
+		act 'Leave':minut += 5 & gt 'city_clinic', 'milk_donation_room'
 	else
 		'The milk donation service is closed. It''s open every day between 10:00 and 19:00.'
-		act 'Leave':minut += 5 & gt 'poli', 'milk_donation_room'
+		act 'Leave':minut += 5 & gt 'city_clinic', 'milk_donation_room'
 	end
 end
 
---- poli ---------------------------------
+--- city_clinic ---------------------------------
 

locations/dima.qsrc → locations/city_dima.qsrc

@@ -1,8 +1,8 @@
-# dima
+# city_dima
 
-$loc = 'dima'
+$loc = 'city_dima'
 $metka = 'start'
-$menu_loc = 'dima'
+$menu_loc = 'city_dima'
 $menu_arg = ''
 menu_off = 0
 
@@ -21,5 +21,5 @@ if $ARGS[0] = 'start':
 	end
 end
 
---- dima ---------------------------------
+--- city_dima ---------------------------------
 

locations/narkopriton.qsrc → locations/city_drugden.qsrc

@@ -1,4 +1,4 @@
-# narkopriton
+# city_drugden
 
 *clr & cla
 gs 'stat'
@@ -10,7 +10,7 @@ menu_off = 1
 'A skinny guy opens the door, with a paranoid look in his eyes. He says doubtfully: "Are you sure you can afford to be here? My product ain''t cheap..."'
 
 act 'Get out of here': minut += 5 & gt 'city_residential'
-act 'You roll your eyes and push the door open': gt 'narkopriton', 'start'
+act 'You roll your eyes and push the door open': gt 'city_drugden', 'start'
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -19,21 +19,21 @@ if $ARGS[0] = 'start':
 	'The skinny guy at the door looks you up and down as you enter, "So what can I get for you, honey?"'
 	if drugUser = 1:
 		act 'Leave the drug den': minut += 5 & gt 'city_residential'
-		act 'Ask for heroin': gt 'narkopriton', 'heroin'
-		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
-		act 'Ask for weed': gt 'narkopriton', 'joints'
-		act 'Ask for cocaine': gt 'narkopriton', 'cocaine'
+		act 'Ask for heroin': gt 'city_drugden', 'heroin'
+		act 'Ask for amphetamine': gt 'city_drugden', 'amphetamine'
+		act 'Ask for weed': gt 'city_drugden', 'joints'
+		act 'Ask for cocaine': gt 'city_drugden', 'cocaine'
 		if StoryLine = 1 and snarkozak = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'narkozakladka'
 	elseif drugUser = 0:
 		'"Ahhh, what do you have?" you ask.'
 		'His eyes light up at a freshy and smiles wildy, "Well I have some H and amphetamine."'
 		act 'Leave the drug den': minut += 5 & gt 'city_residential'
-		act 'Ask for heroin': gt 'narkopriton', 'heroin'
-		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
-		act 'Ask for weed': gt 'narkopriton', 'joints'
-		act 'Ask for cocaine': gt 'narkopriton', 'cocaine'
+		act 'Ask for heroin': gt 'city_drugden', 'heroin'
+		act 'Ask for amphetamine': gt 'city_drugden', 'amphetamine'
+		act 'Ask for weed': gt 'city_drugden', 'joints'
+		act 'Ask for cocaine': gt 'city_drugden', 'cocaine'
 	elseif (StrongNarkota > 23 and amphHigh > 23) or amphHigh > 23 or StrongNarkota > 23:
-		gt 'narkopriton', 'kiteHigh'
+		gt 'city_drugden', 'kiteHigh'
 	end
 end
 
@@ -53,7 +53,7 @@ if $ARGS[0] = 'amphetamine':
 			drugUser = 1
 			amphetamine += 20
 			minut += 5
-			gt 'narkopriton', 'amphetamine'
+			gt 'city_drugden', 'amphetamine'
 		end
 	end
 	if money >= 800:
@@ -62,7 +62,7 @@ if $ARGS[0] = 'amphetamine':
 			drugUser = 1
 			amphetamine += 10
 			minut += 5
-			gt 'narkopriton', 'amphetamine'
+			gt 'city_drugden', 'amphetamine'
 		end
 	end
 	if money >= 400:
@@ -71,12 +71,12 @@ if $ARGS[0] = 'amphetamine':
 			drugUser = 1
 			amphetamine += 5
 			minut += 5
-			gt 'narkopriton', 'amphetamine'
+			gt 'city_drugden', 'amphetamine'
 		end
 	end
-	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
-	act 'Buy some weed instead': gt 'narkopriton', 'joints'
-	act 'Buy some cocaine instead': gt 'narkopriton', 'cocaine'
+	act 'Buy some heroin instead': gt 'city_drugden', 'heroin'
+	act 'Buy some weed instead': gt 'city_drugden', 'joints'
+	act 'Buy some cocaine instead': gt 'city_drugden', 'cocaine'
 end
 
 if $ARGS[0] = 'joints':
@@ -93,7 +93,7 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 20
 			minut += 5
-			gt 'narkopriton', 'joints'
+			gt 'city_drugden', 'joints'
 		end
 	end
 	if money >= 500:
@@ -102,7 +102,7 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 10
 			minut += 5
-			gt 'narkopriton', 'joints'
+			gt 'city_drugden', 'joints'
 		end
 	end
 	if money >= 250:
@@ -111,12 +111,12 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 5
 			minut += 5
-			gt 'narkopriton', 'joints'
+			gt 'city_drugden', 'joints'
 		end
 	end
-	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
-	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
-	act 'Buy some cocaine instead': gt 'narkopriton', 'cocaine'
+	act 'Buy some heroin instead': gt 'city_drugden', 'heroin'
+	act 'Buy some amphetamine instead':	gt 'city_drugden', 'amphetamine'
+	act 'Buy some cocaine instead': gt 'city_drugden', 'cocaine'
 end
 
 if $ARGS[0] = 'cocaine':
@@ -133,7 +133,7 @@ if $ARGS[0] = 'cocaine':
 			drugUser = 1
 			dur += 20
 			minut += 5
-			gt 'narkopriton', 'cocaine'
+			gt 'city_drugden', 'cocaine'
 		end
 	end
 	if money >= 3600:
@@ -142,7 +142,7 @@ if $ARGS[0] = 'cocaine':
 			drugUser = 1
 			dur += 10
 			minut += 5
-			gt 'narkopriton', 'cocaine'
+			gt 'city_drugden', 'cocaine'
 		end
 	end
 	if money >= 1800:
@@ -151,12 +151,12 @@ if $ARGS[0] = 'cocaine':
 			drugUser = 1
 			dur += 5
 			minut += 5
-			gt 'narkopriton', 'cocaine'
+			gt 'city_drugden', 'cocaine'
 		end
 	end
-	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
-	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
-	act 'Buy some weed instead': gt 'narkopriton', 'joints'
+	act 'Buy some heroin instead': gt 'city_drugden', 'heroin'
+	act 'Buy some amphetamine instead':	gt 'city_drugden', 'amphetamine'
+	act 'Buy some weed instead': gt 'city_drugden', 'joints'
 end
 
 if $ARGS[0] = 'heroin':
@@ -220,11 +220,11 @@ if $ARGS[0] = 'heroin':
 			end
 		end
 	elseif money < 500 and SLomka > 0:
-		act 'Beg him to give you some':	gs 'narkopriton', 'drugslut'
+		act 'Beg him to give you some':	gs 'city_drugden', 'drugslut'
 	end
-	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
-	act 'Buy some weed instead': gt 'narkopriton', 'joints'
-	act 'Buy some cocaine instead': gt 'narkopriton', 'cocaine'
+	act 'Buy some amphetamine instead':	gt 'city_drugden', 'amphetamine'
+	act 'Buy some weed instead': gt 'city_drugden', 'joints'
+	act 'Buy some cocaine instead': gt 'city_drugden', 'cocaine'
 end
 
 if $ARGS[0] = 'drugslut':
@@ -279,7 +279,7 @@ if $ARGS[0] = 'drugslut':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 				'You keep begging Bobka to give you some heroin, while you follow him to an empty room. He just laughs at you and says: <<$bobtalk>>'
 
-				act '<<$bobtext>>':	NarkShmaraTimes += 1 & gt 'bobka', bobrand
+				act '<<$bobtext>>':	NarkShmaraTimes += 1 & gt 'city_bobka', bobrand
 				
 				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
@@ -426,4 +426,4 @@ if $ARGS[0] = 'drugslut':
 	end
 end
 
---- narkopriton ---------------------------------
+--- city_drugden ---------------------------------

locations/IrinaRoom.qsrc → locations/city_irinaroom.qsrc

@@ -1,9 +1,9 @@
-# IrinaRoom
+# city_irinaroom
 
 if $ARGS[0] = 'start':
 	cla
 	*clr
-	$menu_loc = 'IrinaRoom'
+	$menu_loc = 'city_irinaroom'
 	$menu_arg = 'start'
 	menu_off = 0
 	minut += 5
@@ -24,7 +24,7 @@ if $ARGS[0] = 'start':
 		if hour >= 16 and hour <= 21 and week >= 6 and IrinaQW ! 2:
 			'You ring the bell and Ira opens the door, she smiles and invites you in.'
 
-			act 'Enter apartment':gt 'IrinaRoom', 'first'
+			act 'Enter apartment':gt 'city_irinaroom', 'first'
 		else
 			'You rang the doorbell but no one answers.'
 
@@ -41,7 +41,7 @@ if $ARGS[0] = 'first':
 	cla
 	clr
 	*clr
-	$menu_loc = 'IrinaRoom'
+	$menu_loc = 'city_irinaroom'
 	$menu_arg = 'first'
 	menu_off = 0
 	gs 'stat'
@@ -49,7 +49,7 @@ if $ARGS[0] = 'first':
 	'<center><img <<$set_imgh>> src="images/characters/city/ira/irinaroom.jpg"></center>'
 	'A small studio apartment, Ira keeps it neat and tidy'
 
-	act 'Drink in the kitchen':gt 'IrinaRoom', 'first1'
+	act 'Drink in the kitchen':gt 'city_irinaroom', 'first1'
 end
 
 if $ARGS[0] = 'first1':
@@ -73,11 +73,11 @@ if $ARGS[0] = 'first1':
 	act 'Leave':gt 'city_residential'
 
 	if IrinaQW = 1:
-		act 'Suggest drinking to sisterhood':gt 'IrinaRoom', 'first2'
+		act 'Suggest drinking to sisterhood':gt 'city_irinaroom', 'first2'
 	end
 
 	if IrinaQW >= 10:
-		act 'Kiss':gt 'IrinaRoom', 'kiss'
+		act 'Kiss':gt 'city_irinaroom', 'kiss'
 	end
 end
 
@@ -93,7 +93,7 @@ if $ARGS[0] = 'kiss':
 	gs 'arousal', 'kiss', 10, 'lesbian'
 	gs 'stat'
 
-	act 'Sex':gt 'IrinaRoom', 'sex'
+	act 'Sex':gt 'city_irinaroom', 'sex'
 end
 
 if $ARGS[0] = 'sex':
@@ -145,7 +145,7 @@ if $ARGS[0] = 'first2':
 	'<center><img <<$set_imgh>> src="images/characters/city/ira/irinaqw1.jpg"></center>'
 	'You suggest drinking to sister to Ira. Although slightly odd, this simple ritual removes tensions and brings you closer.'
 
-	act 'Kiss':gt 'IrinaRoom', 'first3'
+	act 'Kiss':gt 'city_irinaroom', 'first3'
 end
 
 if $ARGS[0] = 'first3':
@@ -160,8 +160,8 @@ if $ARGS[0] = 'first3':
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
 
-	act 'Ira undress':gt 'IrinaRoom', 'first4'
-	act 'Ira drink more':gt 'IrinaRoom', 'first5'
+	act 'Ira undress':gt 'city_irinaroom', 'first4'
+	act 'Ira drink more':gt 'city_irinaroom', 'first5'
 end
 
 if $ARGS[0] = 'first4':
@@ -197,7 +197,7 @@ if $ARGS[0] = 'first5':
 	gs 'arousal', 'foreplay', 10, 'lesbian'
 	gs 'stat'
 
-	act 'Kiss':gt 'IrinaRoom', 'first6'
+	act 'Kiss':gt 'city_irinaroom', 'first6'
 end
 
 if $ARGS[0] = 'first6':
@@ -211,7 +211,7 @@ if $ARGS[0] = 'first6':
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
 
-	act 'Fondle breasts':gt 'IrinaRoom', 'first7'
+	act 'Fondle breasts':gt 'city_irinaroom', 'first7'
 end
 
 if $ARGS[0] = 'first7':
@@ -225,7 +225,7 @@ if $ARGS[0] = 'first7':
 	gs 'arousal', 'foreplay_give', 5, 'lesbian'
 	gs 'stat'
 
-	act 'Lick pussy':gt 'IrinaRoom', 'first8'
+	act 'Lick pussy':gt 'city_irinaroom', 'first8'
 end
 
 if $ARGS[0] = 'first8':
@@ -245,7 +245,7 @@ if $ARGS[0] = 'first8':
 	minut -= 10
 	gs 'stat'
 
-	act 'Enjoy':gt 'IrinaRoom', 'first9'
+	act 'Enjoy':gt 'city_irinaroom', 'first9'
 end
 
 if $ARGS[0] = 'first9':
@@ -269,5 +269,5 @@ if $ARGS[0] = 'first9':
 	end
 end
 
---- IrinaRoom ---------------------------------
+--- city_irinaroom ---------------------------------
 

locations/klofdomhouse.qsrc → locations/city_jorahouse.qsrc

@@ -1,4 +1,4 @@
-# klofdomhouse
+# city_jorahouse
 !Jora dick = 16, silavag = 1
 !Seymon dick = 18, silavag = 2
 if $ARGS[0] = 'start':
@@ -13,10 +13,10 @@ if $ARGS[0] = 'start':
 
 		if klofQW = 2 and hour >= 16 and klofday ! daystart:
 			klofday = daystart
-			gt 'klofdomhouse', 'ev1'
+			gt 'city_jorahouse', 'ev1'
 		elseif klofQW > 2 and hour >= 16 and klofday ! daystart:
 			klofday = daystart
-			gt 'klofdomhouse', 'start1'
+			gt 'city_jorahouse', 'start1'
 		else
 			'No one home'
 
@@ -36,7 +36,7 @@ if $ARGS[0] = 'start1':
 	gs 'stat'
 
 	if kloftimes < 10:
-		gt 'klofdomhouse', 'ev7'
+		gt 'city_jorahouse', 'ev7'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/klof.jpg"></center>'
 		'You ring the doorbell. Jora answers, scratching his belly. He yawns and says he is busy.'
@@ -60,7 +60,7 @@ if $ARGS[0] = 'ev1':
 		'"Hey," you say.'
 		'"Ahh, you." The guy standing in the doorway responds, smiling.'
 
-		act 'Stop by':gt 'klofdomhouse', 'ev2'
+		act 'Stop by':gt 'city_jorahouse', 'ev2'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/klof.jpg"></center>'
 		'You ring the doorbell. Jora answers, scratching his belly. He yawns and says he is busy.'
@@ -80,9 +80,9 @@ if $ARGS[0] = 'ev2':
 	'"I see. I don''t know your names.'
 	'"Call me Jora, and my sidekick Semyon, and now you''re introduced, hurry up and clean up this in the apartment."'
 
-	act 'Clean up':gt 'klofdomhouse', 'ev4'
+	act 'Clean up':gt 'city_jorahouse', 'ev4'
 
-	if pcs_horny < 75:act 'Leave':gt 'klofdomhouse', 'ev3'
+	if pcs_horny < 75:act 'Leave':gt 'city_jorahouse', 'ev3'
 end
 
 if $ARGS[0] = 'ev3':
@@ -108,7 +108,7 @@ if $ARGS[0] = 'ev4':
 	'"When will have gotten better acquainted, we will talk business."'
 	'"Now be a good girl and take off your clothes, you are now the entertainment."'
 
-	act 'Fuck Jora':gt 'klofdomhouse', 'ev5'
+	act 'Fuck Jora':gt 'city_jorahouse', 'ev5'
 end
 
 if $ARGS[0] = 'ev5':
@@ -122,7 +122,7 @@ if $ARGS[0] = 'ev5':
 	'Into the room comes Semyon, "Suck my cock baby, yeah."'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
-	act 'Suck him':gt 'klofdomhouse', 'ev6'
+	act 'Suck him':gt 'city_jorahouse', 'ev6'
 end
 
 if $ARGS[0] = 'ev6':
@@ -162,7 +162,7 @@ if $ARGS[0] = 'ev7':
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/klof1.jpg"></center>'
 	'You enter the apartment'
 
-	act 'Say hello to the guys':gt 'klofdomhouse', 'ev8'
+	act 'Say hello to the guys':gt 'city_jorahouse', 'ev8'
 end
 
 if $ARGS[0] = 'ev8':
@@ -174,10 +174,10 @@ if $ARGS[0] = 'ev8':
 	'"Hello boys, did you miss me?" You say, blushing.'
 	gs 'arousal', 'foreplay', 5
 	gs 'stat'
-	act 'Entertain Jora':gt 'klofdomhouse', 'ev9'
-	act 'Entertain Semyon':gt 'klofdomhouse', 'ev10'
-	act 'Entertain both':gt 'klofdomhouse', 'ev19'
-	act 'Talk business with Jora':gt 'klofdomhouse', 'ev20'
+	act 'Entertain Jora':gt 'city_jorahouse', 'ev9'
+	act 'Entertain Semyon':gt 'city_jorahouse', 'ev10'
+	act 'Entertain both':gt 'city_jorahouse', 'ev19'
+	act 'Talk business with Jora':gt 'city_jorahouse', 'ev20'
 end
 
 if $ARGS[0] = 'ev9':
@@ -187,9 +187,9 @@ if $ARGS[0] = 'ev9':
 	silavag = 1
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
-	act 'Have Jora fuck your pussy':gt 'klofdomhouse', 'ev13'
-	act 'Have Jora fuck your ass':gt 'klofdomhouse', 'ev14'
-	act 'Suck Jora':gt 'klofdomhouse', 'ev19'
+	act 'Have Jora fuck your pussy':gt 'city_jorahouse', 'ev13'
+	act 'Have Jora fuck your ass':gt 'city_jorahouse', 'ev14'
+	act 'Suck Jora':gt 'city_jorahouse', 'ev19'
 end
 
 if $ARGS[0] = 'ev13':
@@ -295,9 +295,9 @@ if $ARGS[0] = 'ev10':
 	silavag = 2
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
-	act 'Have Semyon fuck your pussy':gt 'klofdomhouse', 'ev 16'
-	act 'Have Semyon fuck your ass':gt 'klofdomhouse', 'ev 17'
-	act 'Suck Semyon':gt 'klofdomhouse', 'ev 18'
+	act 'Have Semyon fuck your pussy':gt 'city_jorahouse', 'ev 16'
+	act 'Have Semyon fuck your ass':gt 'city_jorahouse', 'ev 17'
+	act 'Suck Semyon':gt 'city_jorahouse', 'ev 18'
 end
 
 if $ARGS[0] = 'ev 16':
@@ -457,8 +457,8 @@ if $ARGS[0] = 'ev20':
 	act 'Talk to the boss':
 		cla
 
-		if klofQW < 10:gt 'klofdomhouse', 'ev21'
-		if klofQW >= 10:gt 'klofdomhouse', 'ev22'
+		if klofQW < 10:gt 'city_jorahouse', 'ev21'
+		if klofQW >= 10:gt 'city_jorahouse', 'ev22'
 	end
 end
 
@@ -479,7 +479,7 @@ if $ARGS[0] = 'ev22':
 	'From the room comes an ugly old man.'
 	'The boss looks closely at you and says, "Come to me, looks like you''re ready to make some more money."'
 
-	act 'Go to the boss''s room':gt 'klofdomhouse', 'ev23'
+	act 'Go to the boss''s room':gt 'city_jorahouse', 'ev23'
 	
 	gs 'willpower', 'misc', 'self', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -500,7 +500,7 @@ if $ARGS[0] = 'ev23':
 	'You go into the boss''s room, it is surprisingly well renovated and furnished.'
 	'"Well, Well, take off your clothes and show yourself." Says the boss.'
 
-	act 'Show yourself':gt 'klofdomhouse', 'ev24'
+	act 'Show yourself':gt 'city_jorahouse', 'ev24'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -521,7 +521,7 @@ if $ARGS[0] = 'ev24':
 	'You sit on the bed modestly.'
 	'"Show your breasts" Orders the boss.'
 
-	act 'Show your breasts':gt 'klofdomhouse', 'ev25'
+	act 'Show your breasts':gt 'city_jorahouse', 'ev25'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -543,7 +543,7 @@ if $ARGS[0] = 'ev25':
 	'"Show me your ass!" Orders the boss'
 	gs 'arousal', 'flashlite', 5, 'sub'
 	gs 'stat'
-	act 'Show your ass':gt 'klofdomhouse', 'ev26'
+	act 'Show your ass':gt 'city_jorahouse', 'ev26'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -567,7 +567,7 @@ if $ARGS[0] = 'ev26':
 	'"Let''s get rid of that dress!" He says.'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	act 'Remove your dress':gt 'klofdomhouse', 'ev27'
+	act 'Remove your dress':gt 'city_jorahouse', 'ev27'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -589,7 +589,7 @@ if $ARGS[0] = 'ev27':
 	'You take off your dress'
 	'"Spreads your legs!" You receive an order.'
 
-	act 'Spread your legs':gt 'klofdomhouse', 'ev28'
+	act 'Spread your legs':gt 'city_jorahouse', 'ev28'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -612,7 +612,7 @@ if $ARGS[0] = 'ev28':
 	'"And now seduce me" Smiles the boss.'
 	gs 'arousal', 'foreplay', 5, 'sub'
 	gs 'stat'
-	act 'Seduce the boss':gt 'klofdomhouse', 'ev29'
+	act 'Seduce the boss':gt 'city_jorahouse', 'ev29'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -634,7 +634,7 @@ if $ARGS[0] = 'ev29':
 	'You roll over on your side and show the boss your charms.'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	act 'Give him a better view':gt 'klofdomhouse', 'ev30'
+	act 'Give him a better view':gt 'city_jorahouse', 'ev30'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -656,7 +656,7 @@ if $ARGS[0] = 'ev30':
 	'You get on all fours and show off your ass to the boss, you noticed that he is fidgeting in his chair. He undoes his pants and gives you a look that you immediately understand.'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	act 'Lick the boss''s cock':gt 'klofdomhouse', 'ev31'
+	act 'Lick the boss''s cock':gt 'city_jorahouse', 'ev31'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -678,7 +678,7 @@ if $ARGS[0] = 'ev31':
 	'You gently began to lick his penis.'
 	gs 'arousal', 'foreplay', 5, 'sub'
 	gs 'stat'
-	act 'Suck it':gt 'klofdomhouse', 'ev32'
+	act 'Suck it':gt 'city_jorahouse', 'ev32'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -701,7 +701,7 @@ if $ARGS[0] = 'ev32':
 	'In a hoarse voice the boss orders, "Spreads your legs, bitch."'
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
-	act 'Spread your legs':gt 'klofdomhouse', 'ev33'
+	act 'Spread your legs':gt 'city_jorahouse', 'ev33'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -724,7 +724,7 @@ if $ARGS[0] = 'ev33':
 	'"Well, now I''ll check your pussy" States the boss.'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	act 'Let him fuck your pussy':gt 'klofdomhouse', 'ev34'
+	act 'Let him fuck your pussy':gt 'city_jorahouse', 'ev34'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -760,7 +760,7 @@ if $ARGS[0] = 'ev34':
 
 	'"Now I try your ass."'
 
-	act 'Let him fuck your ass':gt 'klofdomhouse', 'ev35'
+	act 'Let him fuck your ass':gt 'city_jorahouse', 'ev35'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -795,9 +795,9 @@ if $ARGS[0] = 'ev35':
 
 	'You feel that the boss is ready to cum.'
 
-	act 'Kneel in front of him':gt 'klofdomhouse', 'ev36'
-	act 'Let him end in your ass':gt 'klofdomhouse', 'ev37'
-	act 'Stick his cock in your pussy':gt 'klofdomhouse', 'ev38'
+	act 'Kneel in front of him':gt 'city_jorahouse', 'ev36'
+	act 'Let him end in your ass':gt 'city_jorahouse', 'ev37'
+	act 'Stick his cock in your pussy':gt 'city_jorahouse', 'ev38'
 end
 
 if $ARGS[0] = 'ev36':
@@ -810,7 +810,7 @@ gs 'cum_manage'
 	'You jump from his member and start wanking his cock until the boss cums on your face.'
 	gs 'arousal', 'hj', 5, 'sub'
 	gs 'stat'
-	act 'Get out of bed':gt 'klofdomhouse', 'ev39'
+	act 'Get out of bed':gt 'city_jorahouse', 'ev39'
 end
 
 if $ARGS[0] = 'ev37':
@@ -823,7 +823,7 @@ gs 'cum_manage'
 	'You start furiously thrusting your ass trying to help him quickly reach orgasm. You fill the warm feeling that tells you he has cum in your ass.'
 	gs 'arousal', 'anal', 5, 'sub'
 	gs 'stat'
-	act 'Get out of bed':gt 'klofdomhouse', 'ev39'
+	act 'Get out of bed':gt 'city_jorahouse', 'ev39'
 end
 
 if $ARGS[0] = 'ev38':
@@ -836,7 +836,7 @@ if $ARGS[0] = 'ev38':
 	'Fine, but if you have a kid it''s not mine." Says the boss.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
-	act 'Get out of bed':gt 'klofdomhouse', 'ev39'
+	act 'Get out of bed':gt 'city_jorahouse', 'ev39'
 end
 
 if $ARGS[0] = 'ev39':
@@ -847,7 +847,7 @@ if $ARGS[0] = 'ev39':
 	'"Well you pass to bed test, now to check your obedience."'
 	'"Serve both my boys only your pussy, both at the same time." Orders the boss.'
 
-	act 'Obediently serve the boys':gt 'klofdomhouse', 'ev40'
+	act 'Obediently serve the boys':gt 'city_jorahouse', 'ev40'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -882,7 +882,7 @@ if $ARGS[0] = 'ev40':
 	elseif horand > stat['vaginal']:
 		pcs_horny += 10 & 'You are not satisfied'
 	end
-	act 'Get up and get dressed':gt 'klofdomhouse', 'ev41'
+	act 'Get up and get dressed':gt 'city_jorahouse', 'ev41'
 end
 
 if $ARGS[0] = 'ev41':
@@ -907,7 +907,7 @@ if $ARGS[0] = 'ev42':
 	'You look around and notice Jora in the crowd.'
 	'He motions to you and says, "Come on baby, swim."'
 
-	act 'Go swimming':gt 'klofdomhouse', 'ev43'
+	act 'Go swimming':gt 'city_jorahouse', 'ev43'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -930,7 +930,7 @@ if $ARGS[0] = 'ev43':
 	'You dress up in a swimsuit and wait for Jora.'
 	'Jora finds you a spot by the pool and tells you, "Lie down <<$pcs_nickname>> wait until more people gather." He goes for a swim.'
 
-	act 'Lie down beside the pool':gt 'klofdomhouse', 'ev44'
+	act 'Lie down beside the pool':gt 'city_jorahouse', 'ev44'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -954,7 +954,7 @@ if $ARGS[0] = 'ev44':
 	'You lay around the pool, the pool is filling up with people.'
 	'Jora swims up to you orders, "Take off your clothes in front of the crowd."'
 
-	act 'Hesitantly remove your top':gt 'klofdomhouse', 'ev45'
+	act 'Hesitantly remove your top':gt 'city_jorahouse', 'ev45'
 
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -984,7 +984,7 @@ if $ARGS[0] = 'ev45':
 
 	'Jora says with a grin, "Show the people those tits, they want some entertainment."'
 
-	act 'Remove hands':gt 'klofdomhouse', 'ev46'
+	act 'Remove hands':gt 'city_jorahouse', 'ev46'
 	gs 'arousal', 'flashlite', 5, 'sub'
 	gs 'exhibitionism', 1
 	gs 'stat'
@@ -1014,7 +1014,7 @@ if $ARGS[0] = 'ev46':
 	'You lift your arms behind his head and strike a pose.'
 	'Jora orders, "Remove the rest."'
 
-	act 'Go into the water and remove bikini bottoms':gt 'klofdomhouse', 'ev47'
+	act 'Go into the water and remove bikini bottoms':gt 'city_jorahouse', 'ev47'
 
 	act 'Get out of here':
 		gs 'arousal', 'end'
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'ev47':
 	'You pull off your bikini bottoms and let them drift away in water.'
 	'Jora orders, "Come out and show yourself to everyone."'
 
-	act 'Get out of the water':gt 'klofdomhouse', 'ev48'
+	act 'Get out of the water':gt 'city_jorahouse', 'ev48'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'exhibitionism', 1
 	gs 'stat'
@@ -1060,7 +1060,7 @@ if $ARGS[0] = 'ev48':
 	'You go to the edge of the pool, around you there is a crowd of excited guys.'
 	'Jora orders you, "Spread your legs."'
 
-	act 'Spread your legs':gt 'klofdomhouse', 'ev49'
+	act 'Spread your legs':gt 'city_jorahouse', 'ev49'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'exhibitionism', 3
 	gs 'stat'
@@ -1088,7 +1088,7 @@ if $ARGS[0] = 'ev49':
 	'The excitement covers you in heat so you go into the shallow water and relax.'
 	'Jora orders, "Spread your lips."'
 
-	act 'Spread your lips':gt 'klofdomhouse', 'ev50'
+	act 'Spread your lips':gt 'city_jorahouse', 'ev50'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
 	
@@ -1114,7 +1114,7 @@ if $ARGS[0] = 'ev50':
 	'Most of the mens mouths are gaping open.'
 	'Jora orders, "play with yourself."'
 
-	act 'Caressing your pussy':gt 'klofdomhouse', 'ev51'
+	act 'Caressing your pussy':gt 'city_jorahouse', 'ev51'
 	gs 'arousal', 'vaginal_finger', 5, 'exhibitionism', 'sub'
 	gs 'stat'
 	
@@ -1139,7 +1139,7 @@ if $ARGS[0] = 'ev51':
 	'You are so excited that you pay no attention to the crowd and start to masturbate.'
 	'The gathered men are silently drooling.'
 
-	act 'Cum':gt 'klofdomhouse', 'ev52'
+	act 'Cum':gt 'city_jorahouse', 'ev52'
 	gs 'arousal', 'masturbate', 5, 'exhibitionism', 'sub'
 	gs 'stat'
 	
@@ -1167,7 +1167,7 @@ if $ARGS[0] = 'ev52':
 	'Jora hands you a dildo and says, "Insert this."'
 	gs 'arousal', 'masturbate', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Insert Dildo':gt 'klofdomhouse', 'ev53'
+	act 'Insert Dildo':gt 'city_jorahouse', 'ev53'
 
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -1191,7 +1191,7 @@ if $ARGS[0] = 'ev53':
 	'Jora hands you a second Dildo and says "Insert this in the same hole."'
 	gs 'arousal', 'vaginal_dildo', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Insert second Dildo':gt 'klofdomhouse', 'ev54'
+	act 'Insert second Dildo':gt 'city_jorahouse', 'ev54'
 end
 
 if $ARGS[0] = 'ev54':
@@ -1202,7 +1202,7 @@ if $ARGS[0] = 'ev54':
 	'Jora orders, "Put one in your ass."'
 	gs 'arousal', 'vaginal_dildo', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Put one in your ass':gt 'klofdomhouse', 'ev55'
+	act 'Put one in your ass':gt 'city_jorahouse', 'ev55'
 
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -1228,7 +1228,7 @@ if $ARGS[0] = 'ev55':
 	gs 'arousal', 'anal_dildo', 5, 'exhibitionism', 'sub'
 	minut -= 5
 	gs 'stat'
-	act 'Breathe':gt 'klofdomhouse', 'ev56'
+	act 'Breathe':gt 'city_jorahouse', 'ev56'
 end
 
 if $ARGS[0] = 'ev56':
@@ -1239,7 +1239,7 @@ if $ARGS[0] = 'ev56':
 	'He inserts a glass into you and fills it with a can of beer.'
 	gs 'arousal', 'vaginal_dildo', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Obediently hold the glass':gt 'klofdomhouse', 'ev57'
+	act 'Obediently hold the glass':gt 'city_jorahouse', 'ev57'
 
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -1262,7 +1262,7 @@ if $ARGS[0] = 'ev57':
 	'Jora leisurely drinks the beer with a straw, then smiling says, "Suck my dick, bitch."'
 	gs 'arousal', 'foreplay', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Suck Jora':gt 'klofdomhouse', 'ev58'
+	act 'Suck Jora':gt 'city_jorahouse', 'ev58'
 end
 
 if $ARGS[0] = 'ev58':
@@ -1273,7 +1273,7 @@ if $ARGS[0] = 'ev58':
 	'Once he is aroused Jora orders, "Get on my dick."'
 	gs 'arousal', 'bj', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Fuck Jora':gt 'klofdomhouse', 'ev60'
+	act 'Fuck Jora':gt 'city_jorahouse', 'ev60'
 end
 
 if $ARGS[0] = 'ev60':
@@ -1291,7 +1291,7 @@ if $ARGS[0] = 'ev60':
 	'Jora is ready to cum.'
 	gs 'arousal', 'vaginal', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Take it':gt 'klofdomhouse', 'ev61'
+	act 'Take it':gt 'city_jorahouse', 'ev61'
 end
 
 if $ARGS[0] = 'ev61':
@@ -1303,7 +1303,7 @@ if $ARGS[0] = 'ev61':
 	gs 'stat'
 	'Jora gets up and goes to the showers saying to the crowd, "This bitch is all yours."'
 
-	act 'Fuck the crowd':gt 'klofdomhouse', 'ev62'
+	act 'Fuck the crowd':gt 'city_jorahouse', 'ev62'
 
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -1350,7 +1350,7 @@ if $ARGS[0] = 'ev62':
 	guy += 5
 	gang += 1
 	gs 'stat'
-	act 'Fuck the crowd':gt 'klofdomhouse', 'ev63'
+	act 'Fuck the crowd':gt 'city_jorahouse', 'ev63'
 end
 
 if $ARGS[0] = 'ev63':
@@ -1399,7 +1399,7 @@ if $ARGS[0] = 'ev63':
 	minut -= 10
 	guy += 3
 	gs 'stat'
-	act 'Fuck the crowd':gt 'klofdomhouse', 'ev64'
+	act 'Fuck the crowd':gt 'city_jorahouse', 'ev64'
 end
 
 if $ARGS[0] = 'ev64':
@@ -1427,7 +1427,7 @@ if $ARGS[0] = 'ev64':
 	minut -= 10
 	guy += 3
 	gs 'stat'
-	act 'Get up and dress in your swimsuit':gt 'klofdomhouse', 'ev65'
+	act 'Get up and dress in your swimsuit':gt 'city_jorahouse', 'ev65'
 end
 
 if $ARGS[0] = 'ev65':
@@ -1447,5 +1447,5 @@ end
 
 !!Jesus, what hueta, I cried tears of blood
 
---- klofdomhouse ---------------------------------
+--- city_jorahouse ---------------------------------
 

locations/kafe.qsrc → locations/city_kafe.qsrc

@@ -1,9 +1,9 @@
-# kafe
+# city_kafe
 
 if $ARGS[0] = 'start':
 	$metka = 'start'
-	$loc = 'kafe'
-	$menu_loc = 'kafe'
+	$loc = 'city_kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'start'
 	menu_off = 0
 	kafe_food = (pcs_ate + pcs_drank)
@@ -15,19 +15,19 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
 	'With its bright neon signs, pictures of flashy American muscle cars and pop-art, and a jukebox playing popular music ranging from the 50s to the 80s, The Roadhouse is something of a specialty diner, having been designed to have a retro, American feel. From the outside, the place doesn’t look very big, but in reality the diner is quite spacious, comfortably able to fit a well stocked bar, a moderately sized dinning area while also offering a handful of private booths tucked away in darker corners of the diner, and even boasting a dance floor with a small stage to play live music when available.'
-	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
+	'Sitting at one end of the bar, you see <a href="exec:gt ''city_kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
 	*nl
 	act 'Leave the diner': minut += 5 & gt 'city_residential'
 
-	act 'Sit down at a table': gt 'kafe', 'table'
+	act 'Sit down at a table': gt 'city_kafe', 'table'
 end
 
 if $ARGS[0] = 'table':
 	$metka = 'table'
-	$loc = 'kafe'
-	$menu_loc = 'kafe'
+	$loc = 'city_kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'table'
 	menu_off = 0
 	$location_type = 'public_indoors'
@@ -36,24 +36,24 @@ if $ARGS[0] = 'table':
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
 	'With its bright neon signs, pictures of flashy American muscle cars and pop-art, and a jukebox playing popular music ranging from the 50s to the 80s, The Roadhouse is something of a specialty diner, having been designed to have a retro, American feel. From the outside, the place doesn’t look very big, but in reality the diner is quite spacious, comfortably able to fit a well stocked bar, a moderately sized dinning area while also offering a handful of private booths tucked away in darker corners of the diner, and even boasting a dance floor with a small stage to play live music when available.'
-	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
+	'Sitting at one end of the bar, you see <a href="exec:gt ''city_kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
 
-	act 'Get up from the table':gt 'kafe', 'start'
+	act 'Get up from the table':gt 'city_kafe', 'start'
 
 	act 'Order from the menu (0:05)':gs 'food_menu'
 	if kafe_food < (pcs_ate + pcs_drank):
 		if rand(1, 10) > 5:
 			gs 'boy'
 			'A man comes over to your table <<$boybody>> <<$boybod>> <<$boyface>> introducing himself as <<$boydesc>>.'
-			xgt 'kafe', 'razvod'
+			xgt 'city_kafe', 'razvod'
 		end
 	end
 end
 
 if $ARGS[0] = 'vlad':
-	$menu_loc = 'kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'vlad'
 	menu_off = 0
 	cla
@@ -99,7 +99,7 @@ if $ARGS[0] = 'vlad':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Leave':gt 'kafe', 'start'
+						act 'Leave':gt 'city_kafe', 'start'
 					end
 				end
 			end
@@ -137,7 +137,7 @@ if $ARGS[0] = 'vlad':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Leave':gt 'kafe', 'start'
+						act 'Leave':gt 'city_kafe', 'start'
 					end
 				end
 			end
@@ -152,7 +152,7 @@ if $ARGS[0] = 'vlad':
 			smenaKafe = 0
 			'Givi Karapetovich sadly shakes his head, "Okay, here''s your <<pay>> <b>₽</b> and employment history. Go."'
 
-			act 'Leave':gt 'kafe', 'start'
+			act 'Leave':gt 'city_kafe', 'start'
 		end
 	end
 
@@ -188,19 +188,19 @@ if $ARGS[0] = 'vlad':
 					smenaKafe = 0
 					'You hand over your work book, and with a smile Givi takes it. "Don''t forget: work is every Tuesday, Wednesday and Thursday, and you need to be here between 11 and 12."'
 
-					act 'Leave':gt 'kafe', 'start'
+					act 'Leave':gt 'city_kafe', 'start'
 				end
 			end
 
-			act 'Leave':gt 'kafe', 'start'
+			act 'Leave':gt 'city_kafe', 'start'
 		end
 	end
 
-	act 'Leave':gt 'kafe', 'start'
+	act 'Leave':gt 'city_kafe', 'start'
 end
 
 if $ARGS[0] = 'work':
-	$menu_loc = 'kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'work'
 	menu_off = 0
 	$location_type = 'event'
@@ -217,7 +217,7 @@ if $ARGS[0] = 'work':
 		minut = 0
 		hour = 12
 		npc_rel['A41'] += rand(5, 10)
-		gt 'kafe', 'workPred'
+		gt 'city_kafe', 'workPred'
 	end
 
 	act 'Resign':
@@ -229,24 +229,24 @@ if $ARGS[0] = 'work':
 		smenaKafe = 0
 		'Givi Karapetovich sadly shakes his head, "Okay, here''s your <<pay>> <b>₽</b> and employment history. Go."'
 
-		act 'Leave':gt 'kafe', 'start'
+		act 'Leave':gt 'city_kafe', 'start'
 	end
 end
 
 if $ARGS[0] = 'workPred':
-	$menu_loc = 'kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'workPred'
 	menu_off = 0
 	$metka = 'workPred'
-	$loc = 'kafe'
+	$loc = 'city_kafe'
 	$location_type = 'event'
 	*clr & cla
 	gs 'kit_din'
 	gs 'stat'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-	'You''re at work in the café, the cook <a href="exec:gt ''kafe2'', ''ashot''">Ashot</a> is busy in the kitchen. Your fellow server <a href="exec:gt ''kafe2'', ''ira''">Ira</a> waits tables with customers. The owner <a href="exec:gt ''kafe2'', ''givi''">Givi K.</a> is standing behind the bar.'
-	'A small door leads to the <a href="exec:gt ''kafe2'', ''toilet''">toilets</a>.'
+	'You''re at work in the café, the cook <a href="exec:gt ''city_kafe2'', ''ashot''">Ashot</a> is busy in the kitchen. Your fellow server <a href="exec:gt ''city_kafe2'', ''ira''">Ira</a> waits tables with customers. The owner <a href="exec:gt ''city_kafe2'', ''givi''">Givi K.</a> is standing behind the bar.'
+	'A small door leads to the <a href="exec:gt ''city_kafe2'', ''toilet''">toilets</a>.'
 
 	if npc_rel['A41'] > 60:npc_rel['A41'] = 60
 	if npc_rel['A41'] > 50 and GiviSex = 0:npc_rel['A41'] = 50
@@ -380,7 +380,7 @@ if $ARGS[0] = 'workPred':
 				'You serve customers at a table and receive <<chai>> <b>₽</b> as tip.'
 			end
 
-			act 'Move away':gt 'kafe', 'workPred'
+			act 'Move away':gt 'city_kafe', 'workPred'
 
 			if znarand > pcs_apprnc or pcs_lover < 3:
 				kaferand = rand(0, 100)
@@ -391,7 +391,7 @@ if $ARGS[0] = 'workPred':
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/kafe1.jpg"></center>'
 					'Serving a table at one of the private booths you see two men seducing a pretty drunk girl. Pretty soon she is on her knees sucking on both of their cocks. One of the men is looking at you with a clear invitation to join them.'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 
 					if daystart > 10 and stat['vaginal'] > 0:
 						act 'Join them':
@@ -417,7 +417,7 @@ if $ARGS[0] = 'workPred':
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/kafe2.jpg"></center>'
 					'You serve a table in the attic, with two men. Each time you come by they try to pinch or slap your butt, or run their hands under your skirt.'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 
 					if daystart > 10 and stat['vaginal'] > 0:
 						act 'Succumb':
@@ -431,11 +431,11 @@ if $ARGS[0] = 'workPred':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/waitress_client.jpg"></center>'
 					'At the table in a separate room sits a man. He looks at you appreciatively and says, "Girl, want to keep me company?" You notice the bulge in his trousers, he''s obviously aroused.'
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 					act 'Sit down next to him':
 						*clr & cla
 						'You sit down next to the client. And look at him waiting for what he would do. He takes your hand and puts it on his crotch.'
-						act 'Leave':gt 'kafe', 'workPred'
+						act 'Leave':gt 'city_kafe', 'workPred'
 						if pcs_horny >= 50 or stat['bj'] > 0:
 							act 'Unbutton his pants':
 								*clr & cla
@@ -453,7 +453,7 @@ if $ARGS[0] = 'workPred':
 									gs 'arousal', 'hj', 5, 'sub', 'prostitution'
 									gs 'stat'
 
-									act 'Leave':gt 'kafe', 'workPred'
+									act 'Leave':gt 'city_kafe', 'workPred'
 								end
 								act 'Suck his dick':
 									*clr & cla
@@ -472,7 +472,7 @@ if $ARGS[0] = 'workPred':
 										money += 700
 										gs 'stat'
 
-										act 'Leave':gt 'kafe', 'workPred'
+										act 'Leave':gt 'city_kafe', 'workPred'
 									end
 								end
 							end
@@ -482,14 +482,14 @@ if $ARGS[0] = 'workPred':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/waitress_client.jpg"></center>'
 					'At the table in a separate room sits a man. He looked appreciatively at you and says, "Girl, can you help? I have prepared a great tip for you, but accidentally dropped it under the table. And I myself have eaten too much so that I can no longer bend down..." you notice he is undoing the fly on his trousers, his intention is obvious.'
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 					act 'Crawl under the table':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/waitress_work_3_1.jpg"></center>'
 						'"Well, now." You reply.'
 						'You could do with the tip and getting onto all fours, you climb under the table. You do find a 500 ruble note there, but when you reach for it, the mans shoe lowers onto the edge of it. He unzips his pants, pulls out his penis and points at it.'
-						act 'Leave':gt 'kafe', 'workPred'
+						act 'Leave':gt 'city_kafe', 'workPred'
 						if pcs_horny >= 50 or stat['bj'] > 0:
 							act 'Suck':
 								*clr & cla
@@ -510,7 +510,7 @@ if $ARGS[0] = 'workPred':
 									money += 500
 									gs 'stat'
 
-									act 'Leave':gt 'kafe', 'workPred'
+									act 'Leave':gt 'city_kafe', 'workPred'
 								end
 							end
 						end
@@ -526,7 +526,7 @@ if $ARGS[0] = 'workPred':
 						money += 300
 						gs 'stat'
 						'You tactfully leave the booth, and after a couple of minutes they leave you a 300 <b>₽</b> tip.'
-						act 'Leave':gt 'kafe', 'workPred'
+						act 'Leave':gt 'city_kafe', 'workPred'
 					end
 					act 'Break it up':
 						*clr & cla
@@ -537,16 +537,16 @@ if $ARGS[0] = 'workPred':
 						if iverand = 1:'The guy says you are a fucking whore and calls you frigid, finishes in his girlfriends mouth and leaves without leaving a tip.'
 						if iverand = 2:
 							'The guy gets out a 500 ruble bill, "For your discretion."'
-							act 'Expel them':gt 'kafe', 'workPred'
+							act 'Expel them':gt 'city_kafe', 'workPred'
 							act 'Discreetly leave':
 								*clr & cla
 								money += 500
 								gs 'stat'
 								'You take the money and leave the couple to their own devices.'
-								act 'Leave':gt 'kafe', 'workPred'
+								act 'Leave':gt 'city_kafe', 'workPred'
 							end
 						end
-						act 'Leave':gt 'kafe', 'workPred'
+						act 'Leave':gt 'city_kafe', 'workPred'
 					end
 
 					if stat['bj'] > 10 and swallow > 5 and pcs_horny >= 50:
@@ -561,7 +561,7 @@ if $ARGS[0] = 'workPred':
 								gs 'stat'
 								'You tactfully leave the booth, and after a couple of minutes they leave you a 300 <b>₽</b> tip.'
 
-								act 'Leave':gt 'kafe', 'workPred'
+								act 'Leave':gt 'city_kafe', 'workPred'
 							end
 
 							act 'Kneel before the guy':
@@ -585,7 +585,7 @@ if $ARGS[0] = 'workPred':
 									gs 'arousal', 'end'
 									gs 'stat'
 
-									act 'Leave':gt 'kafe', 'workPred'
+									act 'Leave':gt 'city_kafe', 'workPred'
 								end
 							end
 						end
@@ -597,7 +597,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 6:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand3.jpg"></center>'
@@ -605,7 +605,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 7:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand4.jpg"></center>'
@@ -613,7 +613,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 8:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand5.jpg"></center>'
@@ -621,7 +621,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 9:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand6.jpg"></center>'
@@ -629,7 +629,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 10:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand7.jpg"></center>'
@@ -637,7 +637,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 11:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand8.jpg"></center>'
@@ -645,7 +645,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 12:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand9.jpg"></center>'
@@ -653,7 +653,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 13:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand10.jpg"></center>'
@@ -661,7 +661,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 14:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand11.jpg"></center>'
@@ -669,7 +669,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 15:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand12.jpg"></center>'
@@ -677,7 +677,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 16:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand13.jpg"></center>'
@@ -685,7 +685,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 17:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand14.jpg"></center>'
@@ -693,7 +693,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 18:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand15.jpg"></center>'
@@ -701,7 +701,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 19:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand16.jpg"></center>'
@@ -709,7 +709,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 20:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand17.jpg"></center>'
@@ -717,7 +717,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 21:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand18.jpg"></center>'
@@ -725,7 +725,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 22:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand19.jpg"></center>'
@@ -733,7 +733,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 23:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand20.jpg"></center>'
@@ -741,7 +741,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 24:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand21.jpg"></center>'
@@ -749,7 +749,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand >= 90 and (opusk > 0 or gnewQW = 5) and pirsA = 0:
 					*clr & cla
 					pirsA = 1
@@ -801,7 +801,7 @@ if $ARGS[0] = 'workPred':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'return to work':gt 'kafe', 'workPred'
+						act 'return to work':gt 'city_kafe', 'workPred'
 					end
 				end
 			elseif znarand <= pcs_apprnc and pcs_lover < 3:
@@ -816,7 +816,7 @@ if $ARGS[0] = 'workPred':
 					money += 10
 					'The man is angry he leaves you a 10 <b>₽</b> tip and goes.'
 
-					act 'Move away':gt 'kafe', 'workPred'
+					act 'Move away':gt 'city_kafe', 'workPred'
 				end
 
 				act 'Yes':
@@ -827,7 +827,7 @@ if $ARGS[0] = 'workPred':
 					'The man is glad that you do not mind dating him. He introduces himself as <<$boydesc>> and asks for your phone number, promising to call you back tomorrow.'
 					'Then he leaves you a hundred <b>₽</b> tip and goes.'
 
-					act 'Move away':gt 'kafe', 'workPred'
+					act 'Move away':gt 'city_kafe', 'workPred'
 				end
 			end
 		end
@@ -839,35 +839,35 @@ if $ARGS[0] = 'workPred':
 				act 'Leave':
 					cla
 					minut += 5
-					gt 'kafeend'
+					gt 'city_kafeend'
 				end
 			else
-				gt 'kafe2', 'givipredlog'
+				gt 'city_kafe2', 'givipredlog'
 			end
 		end
 	end
 end
 
 if $ARGS[0] = 'razvod':
-	$menu_loc = 'kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'razvod'
 	menu_off = 0
 	$location_type = 'event'
 	cla
-	act 'Get up from the table':gt 'kafe', 'start'
+	act 'Get up from the table':gt 'city_kafe', 'start'
 
 	act 'Order from the menu (0:05)':gs 'food_menu'
 
 	deyst = rand(0, 3)
 	if deyst = 0:
 		'<<$boydesc>> invites you to dance.'
-		act 'Dance with him':gt 'cafe2', 'dance'
+		act 'Dance with him':gt 'city_kafeevents2', 'dance'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'city_residential'
 		end
 	elseif deyst = 1:
 		'<<$boydesc>> asks permission to sit down at the same table as you.'
-		act 'Drink with him':gt 'cafe2', 'booze'
+		act 'Drink with him':gt 'city_kafeevents2', 'booze'
 		gs 'willpower', 'drink', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
@@ -882,7 +882,7 @@ if $ARGS[0] = 'razvod':
 		end	
 	elseif deyst = 2:
 		'<<$boydesc>> invites you to a nearby party which he is going to.'
-		act 'Agree to party':gt 'cafe2', 'kompashka'
+		act 'Agree to party':gt 'city_kafeevents2', 'kompashka'
 		gs 'willpower', 'drink', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
@@ -931,5 +931,5 @@ if $ARGS[0] = 'razvod':
 	end
 end
 
---- kafe ---------------------------------
+--- city_kafe ---------------------------------
 

locations/kafe2.qsrc → locations/city_kafe2.qsrc

@@ -1,11 +1,11 @@
-# kafe2
+# city_kafe2
 
 if $ARGS[0] = 'toilet':
 
 	$location_type = 'bathroom'
-	$locM = 'kafe2'
+	$locM = 'city_kafe2'
 	$metkaM = 'toilet'
-	$menu_loc = 'kafe2'
+	$menu_loc = 'city_kafe2'
 	$menu_arg = 'toilet'
 	menu_off = 0
 	gs 'stat'
@@ -19,7 +19,7 @@ if $ARGS[0] = 'toilet':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/tuarand.jpg"></center>'
 		'Going to the toilet you see in one of the booths, a drunk girl with bottle in hand riding a guys dick standing over the toilet facing away from him.'
 
-		act 'Leave':gt 'kafe', 'workPred'
+		act 'Leave':gt 'city_kafe', 'workPred'
 
 		exit
 	elseif turand = 1:
@@ -28,7 +28,7 @@ if $ARGS[0] = 'toilet':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/tuarand1.jpg"></center>'
 		'Going to the toilet you see a skinny girl sucking dick as the guy photographs everything in the mirror.'
 
-		act 'Leave':gt 'kafe', 'workPred'
+		act 'Leave':gt 'city_kafe', 'workPred'
 
 		exit
 	elseif turand = 2:
@@ -37,12 +37,12 @@ if $ARGS[0] = 'toilet':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/tuarand2.jpg"></center>'
 		'Going to the toilet you catch a redhead sucking her boyfriends cock.'
 
-		act 'Leave':gt 'kafe', 'workPred'
+		act 'Leave':gt 'city_kafe', 'workPred'
 
 		exit
 	end
 
-	act 'Leave':gt 'kafe', 'workPred'
+	act 'Leave':gt 'city_kafe', 'workPred'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
@@ -79,7 +79,7 @@ if $ARGS[0] = 'givi':
 				gs 'stat'
 				'You Givi if he will give Ira a raise. Givi grunts, "What for?" You appeal to his better nature, saying that she is your close friend and you want to help her. Givi promise to think about a wage increase.'
 
-				act 'Move away':gt 'kafe', 'workPred'
+				act 'Move away':gt 'city_kafe', 'workPred'
 			end
 		end
 
@@ -97,14 +97,14 @@ if $ARGS[0] = 'givi':
 
 				if npc_rel['A41'] = 90:'As you depart a hand slaps you on the ass. Turning around you see that Givi is smiling mischievously.'
 
-				act 'Move away':gt 'kafe', 'workPred'
+				act 'Move away':gt 'city_kafe', 'workPred'
 			elseif GiviSex >= 1 and kavslut = 0:
 				npc_rel['A41'] = 100
 				'You talk at the bar with the cafe owner and part-time bartender Givi.'
 				'"Hey <<$pcs_nickname>>, I enjoyed it so much last time. Stay with me tonight and help."'
 				'As you depart a hand slaps you on the ass. Turning around you see that Givi is smiling mischievously.'
 
-				act 'Move away':gt 'kafe', 'workPred'
+				act 'Move away':gt 'city_kafe', 'workPred'
 			elseif GiviSex >= 1 and kavslut > 0:
 				npc_rel['A41'] = 100
 				givirand = rand(0, 100)
@@ -144,7 +144,7 @@ if $ARGS[0] = 'givi':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Move away':gt 'kafe', 'workPred'
+							act 'Move away':gt 'city_kafe', 'workPred'
 						end
 					end
 
@@ -153,13 +153,13 @@ if $ARGS[0] = 'givi':
 							cla
 							'"Wow, <<$pcs_nickname>> you dirty slut, if you spend some quality time with me I could give you a pay rise, think of all the pretty dresses you could buy." Says Givi.'
 
-							act 'Move away':gt 'kafe', 'workPred'
+							act 'Move away':gt 'city_kafe', 'workPred'
 						end
 					end
 				elseif givirand >= 10 or Venera >= 4:
 					'Givi slaps you on the ass strongly and whinnied. "<<$pcs_nickname>>, that''s one fine ass!"'
 
-					act 'Move away':gt 'kafe', 'workPred'
+					act 'Move away':gt 'city_kafe', 'workPred'
 				end
 			end
 		end
@@ -170,20 +170,20 @@ if $ARGS[0] = 'givi':
 			act 'Leave':
 				cla
 				minut += 5
-				gt 'kafeend'
+				gt 'city_kafeend'
 			end
 		else
-			gt 'kafe2', 'givipredlog'
+			gt 'city_kafe2', 'givipredlog'
 		end
 	end
 end
 
 if $ARGS[0] = 'ashot':
-	$loc = 'kafe2'
+	$loc = 'city_kafe2'
 	$metka = 'ashot'
 	cls
 	gs 'stat'
-	'You go into the kitchen where trainee chef Ashot is cooking. Dishwasher <a href="exec:gt ''kafe2'', ''tamdin''">Tamara</a> as always stands near the sink and washes the dishes.'
+	'You go into the kitchen where trainee chef Ashot is cooking. Dishwasher <a href="exec:gt ''city_kafe2'', ''tamdin''">Tamara</a> as always stands near the sink and washes the dishes.'
 
 	if hour < 22:
 		act 'Eat some food (0:30)':
@@ -206,11 +206,11 @@ if $ARGS[0] = 'ashot':
 				pcs_horny += 10
 				'As you walk further into the kitchen, Ashot comes up to you and squeezes your ass really tight, it makes you squeal. Ashot laughs.'
 
-				act 'Move away':gt 'kafe', 'workPred'
+				act 'Move away':gt 'city_kafe', 'workPred'
 			elseif giviSex = 0 and Ashotsex = 0:
 				'You talk in the kitchen with chef Ashot.'
 
-				act 'Move away':gt 'kafe', 'workPred'
+				act 'Move away':gt 'city_kafe', 'workPred'
 			elseif giviSex > 0 and Ashotsex > 0:
 				Ashotrand = rand(0, 100)
 
@@ -220,7 +220,7 @@ if $ARGS[0] = 'ashot':
 					gs 'arousal', 'foreplay', 10, 'sub'
 					gs 'stat'
 
-					act 'Move away':gt 'kafe', 'workPred'
+					act 'Move away':gt 'city_kafe', 'workPred'
 				elseif Ashotrand <= 20:
 					*clr
 					cla
@@ -273,7 +273,7 @@ if $ARGS[0] = 'ashot':
 
 									'You feel the heat as jets of sperm hit inside your anus. Having finished in your ass, Ashot says that such a fuckable hole needs to be fucked. He pulls out his member and you feel a slow trickle of sperm dripping from your butt.'
 
-									act 'Move away':gt 'kafe', 'workPred'
+									act 'Move away':gt 'city_kafe', 'workPred'
 								end
 							end
 						else
@@ -309,7 +309,7 @@ if $ARGS[0] = 'ashot':
 
 								'You feel the heat as jets of sperm hit inside your anus. Having finished in your ass, Ashot says that such a fuckable hole needs to be fucked. He pulls out his member and you feel a slow trickle of sperm dripping from your butt.'
 
-								act 'Move away':gt 'kafe', 'workPred'
+								act 'Move away':gt 'city_kafe', 'workPred'
 							end
 						end
 					end
@@ -330,7 +330,7 @@ if $ARGS[0] = 'ashot':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Move away':gt 'kafe', 'workPred'
+	act 'Move away':gt 'city_kafe', 'workPred'
 end
 
 if $ARGS[0] = 'ira':
@@ -368,11 +368,11 @@ if $ARGS[0] = 'ira':
 				'Irina clearly looks apprehensive and tries not to look you in the eye. You approach her and try to calm her down. Irina dismissively nods and says, "I''m willing to pretend that nothing ever happened. I don''t want anybody to know about it." You agree with Ira.'
 			end
 
-			act 'Move away':gt 'kafe', 'workPred'
+			act 'Move away':gt 'city_kafe', 'workPred'
 		end
 	else
 		if IrinaSlut >= 2:
-			gt 'kafe2', 'givipredlog'
+			gt 'city_kafe2', 'givipredlog'
 		elseif IrinaSlut < 2:
 			act 'Go home with Irina':
 				cla
@@ -418,7 +418,7 @@ if $ARGS[0] = 'ira':
 
 					$irinaend = 'Ira standing by her door invites you to come in with her.'
 
-					act 'Visit Ira':gt 'IrinaRoom', 'first'
+					act 'Visit Ira':gt 'city_irinaroom', 'first'
 				elseif npc_rel['A93'] >= 100 and IrinaQW = 2:
 					if GiviSex >= 1 and Kavslut = 0:
 						$irinatalk = 'Irina is mostly silent all the way, but finally musters up the determination to say, she did not expect you to be not only sleeping with men, but also with women. Trying to be polite, it''s not that she is against sexual minorities, but she did not want to sleep with women, they are so soft and nasty, just awful.'
@@ -436,7 +436,7 @@ if $ARGS[0] = 'ira':
 
 					$irinaend = 'Standing at the door of her house Ira invites you to come to visit her.'
 
-					act 'Visit Ira':gt 'IrinaRoom', 'first'
+					act 'Visit Ira':gt 'city_irinaroom', 'first'
 				elseif npc_rel['A93'] >= 100 and IrinaQW >= 10 and IrinaSlut = 1:
 					if GiviSex >= 1 and Kavslut = 0:
 						$irinatalk = 'Ira, smiling, tells you that she is surprised and did not expect to find sex with a woman so much pleasure.'
@@ -448,7 +448,7 @@ if $ARGS[0] = 'ira':
 
 					$irinaend = 'Standing at the door of her house Ira invites you to come to visit her.'
 
-					act 'Visit Ira':gt 'IrinaRoom', 'first'
+					act 'Visit Ira':gt 'city_irinaroom', 'first'
 				elseif npc_rel['A93'] >= 100 and IrinaQW >= 10 and IrinaSlut = 0:
 					if GiviSex >= 1 and Kavslut = 0:
 						$irinatalk = 'Ira smiling surprised that she did not expect to have sex with a woman so much pleasure.'
@@ -460,7 +460,7 @@ if $ARGS[0] = 'ira':
 
 					$irinaend = 'Standing at the door of her house Ira invites you to come to visit her.'
 
-					act 'Visit Ira':gt 'IrinaRoom', 'first'
+					act 'Visit Ira':gt 'city_irinaroom', 'first'
 				end
 
 				'You make your way home with Irina. <<$irinatalk>> You get to the house where she lives. <<$irinaend>>'
@@ -493,7 +493,7 @@ if $ARGS[0] = 'tamdin':
 				'Caucasian slut you, fuck off.'
 			end
 
-			act 'Move away':gt 'kafe', 'workPred'
+			act 'Move away':gt 'city_kafe', 'workPred'
 		end
 	else
 		'She already going home and offers to walk with you.'
@@ -514,12 +514,12 @@ if $ARGS[0] = 'givipredlog':
 	if IrinaSlut >= 2:
 		'Givi circles around Ira and brazenly squeezes her ass, snorting "Whoa, Ira, you''re a real slut." He turns to you, "Hey <<$pcs_nickname>> stay this evening, earn bonuses."'
 
-		act 'Stay with them':gt 'kavkazkafe', 'podgivi'
+		act 'Stay with them':gt 'city_kavkazkafe', 'podgivi'
 
 		act 'Go home':
 			cla
 			minut += 5
-			gt 'kafeend'
+			gt 'city_kafeend'
 		end
 
 		exit
@@ -537,10 +537,10 @@ if $ARGS[0] = 'givipredlog':
 				act 'I can''t tonight':
 					cla
 					minut += 5
-					gt 'kafeend'
+					gt 'city_kafeend'
 				end
 
-				act 'Help Givi':gt 'kavkazkafe', 'podgivi'
+				act 'Help Givi':gt 'city_kavkazkafe', 'podgivi'
 
 				exit
 		elseif GiviSex = 0:
@@ -550,10 +550,10 @@ if $ARGS[0] = 'givipredlog':
 				cla
 				npc_rel['A41'] = 0
 				minut += 5
-				gt 'kafeend'
+				gt 'city_kafeend'
 			end
 
-			act 'Help Givi':gt 'kavkazkafe', 'podgivi'
+			act 'Help Givi':gt 'city_kavkazkafe', 'podgivi'
 
 			exit
 		end
@@ -561,12 +561,12 @@ if $ARGS[0] = 'givipredlog':
 		act 'Go home':
 			cla
 			minut += 5
-			gt 'kafeend'
+			gt 'city_kafeend'
 		end
 	end
 
-	act 'Help Givi':gt 'kavkazkafe', 'podgivi'
+	act 'Help Givi':gt 'city_kavkazkafe', 'podgivi'
 end
 
---- kafe2 ---------------------------------
+--- city_kafe2 ---------------------------------
 

locations/kafeend.qsrc → locations/city_kafeend.qsrc

@@ -1,4 +1,4 @@
-# kafeend
+# city_kafeend
 
 if $ARGS[0] = '':
 	kafe_rand = rand(0, 100)
@@ -8,67 +8,67 @@ if $ARGS[0] = '':
 	elseif kafe_rand = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand.jpg"></center>'
 		'On leaving the cafe you see a large crowd of young people deciding where to go next. You also notice that one of the girls wasted no time and has started blowing her boyfriend completely undeterred by the crowd.'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand1.jpg"></center>'
 		'Coming out of the cafe you notice a car parked in the dark, passing it you see a light in the open trunk and see a guy there hammering his chick, so much so that the shocks are creaking as the car bounces. The girl just moans and whispers, "More, more!"'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand2.jpg"></center>'
 		'On leaving the cafe you saw a large crowd of young people deciding where to go next. In the crowd you are surprised to see one of the girls licking the pussy of another oblivious to the other people there.'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand3.jpg"></center>'
 		'Coming out of the cafe and on your way home, you walk past a car. You suddenly see a woman sitting on her heels give a contented guy a blowjob.'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 4:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand4.jpg"></center>'
 		'Coming out of the cafe and on your way home, you notice at the side of the cafe a couple, she is squatting down and sucking his cock.'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 5:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand5.jpg"></center>'
 		'Coming out of the cafe and on your way home, you walk past a car. You suddenly see a woman sitting in the front seat of the car blowing a guy as he stands by the door.'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 6:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand6.jpg"></center>'
 		'Coming out of the cafe you notice between parked cars a girl sitting with her pants down and pissing, while smiling blissfully.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 7:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand7.jpg"></center>'
 		'Coming out of the cafe you see a laughing woman, dancing badly, showing off her panties, but still managing to drink from a cup.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 8:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand8.jpg"></center>'
 		'Coming out of the cafe you noticed a girl lying on the pavement, she is wearing just a sweater and her pussy is completely exposed. The girl obviously passed out, drunk as a skunk.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 9:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand9.jpg"></center>'
 		'Coming out of the cafe you noticed on the bench asleep a drunk guy with a girl, apparently sleep caught up with them during petting, you deduce from the scene.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 10:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand10.jpg"></center>'
 		'Coming out of the cafe you notice a man and a drunk girl in the carpark, trying to drag another girl off the path.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 11:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand11.jpg"></center>'
 		'Coming out of the cafe, you have to step over drunk girl passed out that right in front of the entrance lying on the pavement.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 12:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand12.jpg"></center>'
 		'Coming out of the cafe, you see that the girl fell asleep drunk, sitting on a bin and collapsed there.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 13:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand13.jpg"></center>'
 		'Coming out of the cafe you notice one girl trying to get her friend off the road, her drunken girlfriend mumbles something drunkenly giggling.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 14:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand14.jpg"></center>'
 		'Coming out of the cafe you notice a drunk girl lying on the ground without any panties.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 15:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand15.jpg"></center>'
 		'Coming out of the cafe, you see a man leading his wife somewhere, clearly very drunk see has started to strip here on the street and is nearly naked.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	end
 end
 
@@ -86,5 +86,5 @@ if $ARGS[0] = 'end_sex':
 	act 'Leave':gt 'city_residential'
 end
 
---- kafeend ---------------------------------
+--- city_kafeend ---------------------------------
 

locations/cafe2.qsrc → locations/city_kafeevents2.qsrc

@@ -1,4 +1,4 @@
-# cafe2
+# city_kafeevents2
 
 menu_off = 1
 
@@ -10,17 +10,17 @@ if $ARGS[0] = 'beginning':
 	if deyst <= 25:
 		'<<$boydesc>> asks you to dance.'
 
-		act 'Dance':gt 'Cafe2', 'dance'
+		act 'Dance':gt 'city_kafeevents2', 'dance'
 		act 'Leave':gt 'city_residential'
 	elseif deyst > 25 and deyst <= 50:
 		'<<$boydesc>> sits down at your table and orders a drink and a snack.'
 
-		act 'Drink':gt 'Cafe2', 'booze'
+		act 'Drink':gt 'city_kafeevents2', 'booze'
 		act 'Leave':gt 'city_residential'
 	elseif deyst > 50 and deyst <= 75:
 		'<<$boydesc>> invites you to join a party nearby.'
 
-		act 'Agree':gt 'Cafe2', 'kompashka'
+		act 'Agree':gt 'city_kafeevents2', 'kompashka'
 
 		if pcs_horny < 75:
 			act 'Leave':gt 'city_residential'
@@ -28,7 +28,7 @@ if $ARGS[0] = 'beginning':
 	elseif deyst > 75:
 		'<<$boydesc>> begins to flirt with you and tries to take pictures. <<$boydesc>> asks you to go with him to the toilet.'
 
-		act 'Agree':gt 'Cafe3', 'toilet'
+		act 'Agree':gt 'city_kafeevents3', 'toilet'
 
 		if pcs_horny < 75:
 			act 'Leave':gt 'city_residential'
@@ -49,7 +49,7 @@ if $ARGS[0] = 'dance':
 	if deyst <= 25:
 		'During the dance <<$boydesc>> conducts himself confidently and correctly, his strong hands hold your waist tightly. Finally the song ends.'
 
-		act 'Finish the dance':gt 'Cafe2', 'dance2'
+		act 'Finish the dance':gt 'city_kafeevents2', 'dance2'
 	elseif deyst > 25 and deyst <= 80:
 		pcs_horny += 5
 		clr
@@ -65,7 +65,7 @@ if $ARGS[0] = 'dance':
 
 		'During the dance <<$boydesc>> gently hugs you and strokes your back down to the hips. His strong hands press your fragile body to his, pressing your soft <<$titsize>> breasts against his body. <<$didanc>>Finally, the song ends.'
 
-		act 'Finish the dance':gt 'Cafe2', 'dance2'
+		act 'Finish the dance':gt 'city_kafeevents2', 'dance2'
 	elseif deyst > 80:
 		pcs_horny += 8
 		gs 'stat'
@@ -113,7 +113,7 @@ if $ARGS[0] = 'dance':
 				if deyst <= 75:
 					'Keeping your waist held <<$boydesc>> invites you back to his home.'
 
-					act 'Agree':gt 'Cafe3', 'house'
+					act 'Agree':gt 'city_kafeevents3', 'house'
 
 					if pcs_horny < 75:
 						act 'Leave':gt 'city_residential'
@@ -121,7 +121,7 @@ if $ARGS[0] = 'dance':
 				elseif deyst > 75:
 					'Keeping your waist held <<$boydesc>> asks you to go to the toilet and continue.'
 
-					act 'Agree':gt 'Cafe3', 'toilet'
+					act 'Agree':gt 'city_kafeevents3', 'toilet'
 
 					if pcs_horny < 75:
 						act 'Leave':gt 'city_residential'
@@ -157,7 +157,7 @@ if $ARGS[0] = 'dance':
 					if deyst <= 75:
 						'Keeping your waist held <<$boydesc>> invites you back to his home.'
 
-						act 'Agree':gt 'Cafe3', 'house'
+						act 'Agree':gt 'city_kafeevents3', 'house'
 
 						gs 'willpower', 'sex', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
@@ -173,7 +173,7 @@ if $ARGS[0] = 'dance':
 					elseif deyst > 75:
 						'Keeping your waist held <<$boydesc>> asks you to go to the toilet and continue.'
 
-						act 'Agree':gt 'Cafe3', 'toilet'
+						act 'Agree':gt 'city_kafeevents3', 'toilet'
 
 						gs 'willpower', 'sex', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
@@ -206,11 +206,11 @@ if $ARGS[0] = 'dance2':
 	if deyst >= pcs_apprnc:
 		'The dance ends and <<$boydesc>> kisses you goodbye.'
 
-		act 'Say goodbye':gt 'kafe', 'start'
+		act 'Say goodbye':gt 'city_kafe', 'start'
 	elseif deyst < pcs_apprnc:
 		'The dance ends and <<$boydesc>> suggests going to his place.'
 
-		act 'Agree':gt 'Cafe3', 'house'
+		act 'Agree':gt 'city_kafeevents3', 'house'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -236,11 +236,11 @@ if $ARGS[0] = 'booze':
 	if deyst < 75:
 		'It seems you''ve had enough and should go home, <<$boydesc>> kisses you goodbye.'
 
-		act 'Say goodbye':gt 'kafe', 'start'
+		act 'Say goodbye':gt 'city_kafe', 'start'
 	elseif deyst >= 75 and deyst < 95:
 		'It seems you''ve had enough and should go home, <<$boydesc>> suggests you should go to him.'
 
-		act 'Agree':gt 'Cafe3', 'house'
+		act 'Agree':gt 'city_kafeevents3', 'house'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -260,7 +260,7 @@ if $ARGS[0] = 'booze':
 		gs 'arousal', 'foreplay', -5
 		gs 'stat'
 
-		act 'Agree':gt 'Cafe3', 'toilet'
+		act 'Agree':gt 'city_kafeevents3', 'toilet'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -287,11 +287,11 @@ if $ARGS[0] = 'kompashka':
 	if deyst < 60:
 		'You think you''ve had enough and should go home, <<$boydesc>> kisses you goodbye.'
 
-		act 'Say goodbye':gt 'kafe', 'start'
+		act 'Say goodbye':gt 'city_kafe', 'start'
 	elseif deyst >= 60 and deyst < 90:
 		'You think you''ve had enough and should go home, <<$boydesc>> suggests you go to his place.'
 
-		act 'Agree':gt 'Cafe3', 'house'
+		act 'Agree':gt 'city_kafeevents3', 'house'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -311,7 +311,7 @@ if $ARGS[0] = 'kompashka':
 		gs 'arousal', 'foreplay', -5
 		gs 'stat'
 		
-		act 'Agree':gt 'Cafe3', 'kompashka'
+		act 'Agree':gt 'city_kafeevents3', 'kompashka'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -327,5 +327,5 @@ if $ARGS[0] = 'kompashka':
 	end
 end
 
---- cafe2 ---------------------------------
+--- city_kafeevents2 ---------------------------------
 

locations/cafe3.qsrc → locations/city_kafeevents3.qsrc

@@ -1,4 +1,4 @@
-# cafe3
+# city_kafeevents3
 
 menu_off = 1
 
@@ -149,7 +149,7 @@ if $ARGS[0] = '0':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'cafe3', '0'
+				gt 'city_kafeevents3', '0'
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -232,7 +232,7 @@ if $ARGS[0] = '0':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'cafe3', '0'
+				gt 'city_kafeevents3', '0'
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -285,7 +285,7 @@ if $ARGS[0] = 'toilet':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'kafe', 'start'
+			act 'Leave':gt 'city_kafe', 'start'
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -322,7 +322,7 @@ if $ARGS[0] = 'toilet':
 			if bjrand >= 50 or repa = 6:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial<<picrand>>.jpg"></center>'
 
 
-			act 'Leave':gt 'kafe', 'start'
+			act 'Leave':gt 'city_kafe', 'start'
 		end
 
 		act 'Suck on':
@@ -340,7 +340,7 @@ if $ARGS[0] = 'toilet':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Leave':gt 'kafe', 'start'
+				act 'Leave':gt 'city_kafe', 'start'
 			end
 
 			act 'Spit out':
@@ -353,7 +353,7 @@ if $ARGS[0] = 'toilet':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Leave':gt 'kafe', 'start'
+				act 'Leave':gt 'city_kafe', 'start'
 			end
 		end
 	end
@@ -432,5 +432,5 @@ if $ARGS[0] = 'coffee':
 	act 'Show him out':gt 'Korr'
 end
 
---- cafe3 ---------------------------------
+--- city_kafeevents3 ---------------------------------
 

locations/kavkazkafe.qsrc → locations/city_kavkazkafe.qsrc

@@ -1,4 +1,4 @@
-# kavkazkafe
+# city_kavkazkafe
 if $ARGS[0] = 'podgivi':
 	gs 'bdman', 'givi'
 	minut += 30
@@ -10,10 +10,10 @@ if $ARGS[0] = 'podgivi':
 		smenaKafe += 1
 		if rand(0, 1) = 0:
 			'Givi grins as he grabs you both by your hands "Hey, come heifers, have fun."'
-			act 'Go.':gt 'kavkazkafe', 'threesome'
+			act 'Go.':gt 'city_kavkazkafe', 'threesome'
 		else
 			'Ashot entered the room and says, "Well bitches, no need to finger your holes, now you can have real horsemen in all of them."'
-			act 'Go.':gt 'kavkazkafe', 'foursome'
+			act 'Go.':gt 'city_kavkazkafe', 'foursome'
 		end
 	else
 		podrand = rand(0, 100)
@@ -25,7 +25,7 @@ if $ARGS[0] = 'podgivi':
 			'Givi says, "Hey, know what? We like you <<$pcs_nickname>>, we like filling your holes, now you two fuck horseman, never will you forget.'
 
 			act 'Leave':gt 'city_residential'
-			act 'Okay.':gt 'kavkazkafe', 'grup'
+			act 'Okay.':gt 'city_kavkazkafe', 'grup'
 		elseif podrand < 70 and kavslut = 0 and giviAnalOnce = 1:
 			gs 'bdman', 'ashot'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/podsob.jpg"></center>'
@@ -43,7 +43,7 @@ if $ARGS[0] = 'podgivi':
 					'Givi laughes. "You are a feisty girl, yes? I know you want to ride two big digits, we will not tell anyone, do not be afraid."'
 					'Ashot comes up to you and holds his arms out to hug you.'
 
-					act 'Embrace him':gt 'kavkazkafe', 'grup'
+					act 'Embrace him':gt 'city_kavkazkafe', 'grup'
 
 					gs 'willpower', 'misc', 'resist', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -64,7 +64,7 @@ if $ARGS[0] = 'podgivi':
 				act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end	
 			
-			act 'Do it':gt 'kavkazkafe', 'grup'
+			act 'Do it':gt 'city_kavkazkafe', 'grup'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/podsob.jpg"></center>'
 			'You go into the back room with Givi and begin to count wine bottles aloud to him, as he writes figures in his notebook.'
@@ -77,7 +77,7 @@ if $ARGS[0] = 'podgivi':
 					'You grin and continue pretending to count bottles as if nothing happened. Givi starts groping you with both hands.'
 					'"<<$pcs_nickname>>. I want you. Come to me sweetie."'
 					'Givis strong hands turn you around. You are now face to face with Givi.'
-					act 'Kneel':gt 'kavkazkafe', 'givibj'
+					act 'Kneel':gt 'city_kavkazkafe', 'givibj'
 					
 					gs 'willpower', 'misc', 'resist', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -90,7 +90,7 @@ if $ARGS[0] = 'podgivi':
 
 							act 'Kneel':
 								money += 5000
-								gt 'kavkazkafe', 'givibj'
+								gt 'city_kavkazkafe', 'givibj'
 							end
 
 							gs 'willpower', 'misc', 'resist', 'hard'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'podgivi':
 									'You blurt out, "That''s not what I meant, I''m going home!" and turn to leave.'
 									'Givi grabs you by the arm and drags you to a chair in the back.'
 
-									act 'Trying to get away':gt 'kavkazkafe', 'givirape'
+									act 'Trying to get away':gt 'city_kavkazkafe', 'givirape'
 								end
 							else
 								act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -119,7 +119,7 @@ if $ARGS[0] = 'podgivi':
 					'You straighten up and look at the Givi. "That is most definitely not your notepad, Givi K."'
 					'Givi is licking his lips, his eyes burning with desire, he speaks in short bursts, "Hey <<$pcs_nickname>>, you''re so juicy, squishy bum, you want money, I''ll do bonus, you live like a queen."'
 
-					act 'Kneel':gt 'kavkazkafe', 'givibj'
+					act 'Kneel':gt 'city_kavkazkafe', 'givibj'
 
 					gs 'willpower', 'misc', 'resist', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -132,7 +132,7 @@ if $ARGS[0] = 'podgivi':
 
 							act 'Kneel':
 								money += 5000
-								gt 'kavkazkafe', 'givibj'
+								gt 'city_kavkazkafe', 'givibj'
 							end
 
 							gs 'willpower', 'misc', 'resist', 'hard'
@@ -158,7 +158,7 @@ if $ARGS[0] = 'podgivi':
 				'Givi slaps your ass with relish.'
 				'"Whoa, what a fine ass. <<$pcs_nickname>> suck me, I will give you bonus.'
 
-				act 'Kneel':gt 'kavkazkafe', 'givibj'
+				act 'Kneel':gt 'city_kavkazkafe', 'givibj'
 				act 'Leave':gt 'city_residential'
 			end
 		end
@@ -188,7 +188,7 @@ if $ARGS[0] = 'grup':
 	gs 'arousal', 'bj', 5,'dick[1]','sub', 'group'
 	minut -= 5
 	gs 'stat'
-	act 'Helplessly moo':gt 'kavkazkafe', 'grup1'
+	act 'Helplessly moo':gt 'city_kavkazkafe', 'grup1'
 end
 
 if $ARGS[0] = 'grup1':
@@ -207,12 +207,12 @@ if $ARGS[0] = 'grup1':
 		gs 'arousal', 'anal_finger', 5, 'sub', 'group'
 		gs 'stat'
 
-		act 'Keep sucking':gt 'kavkazkafe', 'grup2'
+		act 'Keep sucking':gt 'city_kavkazkafe', 'grup2'
 	else
 		'Ashot suddenly pulls his cock out of you and taking you by the shoulders pushes you to your knees in front of him.'
 		gs 'stat'
 
-		act 'Kneel patiently':gt 'kavkazkafe', 'grupcum'
+		act 'Kneel patiently':gt 'city_kavkazkafe', 'grupcum'
 	end
 end
 
@@ -230,12 +230,12 @@ if $ARGS[0] = 'grup2':
 		gs 'arousal', 'anal_finger', 5, 'sub', 'group'
 		gs 'stat'
 
-		act 'Double Penetration':gt 'kavkazkafe', 'grup3'
+		act 'Double Penetration':gt 'city_kavkazkafe', 'grup3'
 	else
 		'Ashot suddenly pulls his cock out of you and taking you by the shoulders pushes you to your knees in front of him.'
 		gs 'stat'
 
-		act 'Kneel patiently':gt 'kavkazkafe', 'grupcum'
+		act 'Kneel patiently':gt 'city_kavkazkafe', 'grupcum'
 	end
 end
 
@@ -254,7 +254,7 @@ if $ARGS[0] = 'grup3':
 	'Ashot suddenly pulls his cock out of you and taking you by the shoulders pushes you to your knees in front of him.'
 	gs 'stat'
 
-	act 'Kneel patiently':gt 'kavkazkafe', 'grupcum'
+	act 'Kneel patiently':gt 'city_kavkazkafe', 'grupcum'
 end
 
 if $ARGS[0] = 'grupcum':
@@ -286,7 +286,7 @@ if $ARGS[0] = 'givirape':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/rape.jpg"></center>'
 	'Givi produces a roll of tape and begins to bind you, to stop your shouting he puts a ballgag on you.'
 	'Finally, he shakes you to remove any slack, you can not even twitch.'
-	act 'Helplessly moo':gt 'kavkazkafe', 'givirape1'
+	act 'Helplessly moo':gt 'city_kavkazkafe', 'givirape1'
 end
 
 if $ARGS[0] = 'givirape1':
@@ -294,8 +294,8 @@ if $ARGS[0] = 'givirape1':
 	'Givi takes the gag out of your mouth and fills it with his thick, unwashed member.'
 	gs 'arousal', 'bj', 5, 'sub', 'rough'
 	gs 'stat'
-	act 'Suck':gt 'kavkazkafe', 'givirapebj'
-	act 'Bite':gt 'kavkazkafe', 'givirape2'
+	act 'Suck':gt 'city_kavkazkafe', 'givirapebj'
+	act 'Bite':gt 'city_kavkazkafe', 'givirape2'
 end
 
 if $ARGS[0] = 'givirapebj':
@@ -362,8 +362,8 @@ if $ARGS[0] = 'givibj':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/before.jpg"></center>'
 	'You nod and kneel in front of big-bellied Armenians lap. He unbuttons his pants and pulls out his long and thick cock, which ends up right in your face, almost touching you.'
 
-	act 'Stroke his dick':gt 'kavkazkafe', 'givibj1'
-	act 'Suck it':gt 'kavkazkafe', 'givibj3'
+	act 'Stroke his dick':gt 'city_kavkazkafe', 'givibj1'
+	act 'Suck it':gt 'city_kavkazkafe', 'givibj3'
 end
 
 if $ARGS[0] = 'givibj1':
@@ -372,8 +372,8 @@ if $ARGS[0] = 'givibj1':
 	gs 'arousal', 'hj', 5, 'sub'
 	gs 'stat'
 
-	act 'Suck his thumb':gt 'kavkazkafe', 'givibj2'
-	act 'Suck his cock':gt 'kavkazkafe', 'givibj3'
+	act 'Suck his thumb':gt 'city_kavkazkafe', 'givibj2'
+	act 'Suck his cock':gt 'city_kavkazkafe', 'givibj3'
 end
 
 if $ARGS[0] = 'givibj2':
@@ -383,7 +383,7 @@ if $ARGS[0] = 'givibj2':
 	gs 'arousal', 'hj', 3, 'sub'
 	gs 'stat'
 
-	act 'Suck his cock':gt 'kavkazkafe', 'givibj3'
+	act 'Suck his cock':gt 'city_kavkazkafe', 'givibj3'
 end
 
 if $ARGS[0] = 'givibj3':
@@ -394,7 +394,7 @@ if $ARGS[0] = 'givibj3':
 	gs 'arousal', 'bj', 3, 'sub'
 	gs 'stat'
 
-	act 'Suck on':gt 'kavkazkafe', 'givibj4'
+	act 'Suck on':gt 'city_kavkazkafe', 'givibj4'
 end
 
 if $ARGS[0] = 'givibj4':
@@ -403,14 +403,14 @@ if $ARGS[0] = 'givibj4':
 	gs 'arousal', 'bj', 3, 'sub'
 	gs 'stat'
 
-	act 'Remove from your mouth':gt 'kavkazkafe', 'givibj5'
-	act 'Continue sucking':gt 'kavkazkafe', 'givibj6'
+	act 'Remove from your mouth':gt 'city_kavkazkafe', 'givibj5'
+	act 'Continue sucking':gt 'city_kavkazkafe', 'givibj6'
 
 	if givitime > 1:
 		if rand(0, 100) >= 75:
 			cla
 			'Givi takes his member out of your mouth, starts walking around you and says, "<<$pcs_nickname>>, take off your clothes and stay right there."'
-			act 'Doggy-Style':gt 'kavkazkafe', 'givisex'
+			act 'Doggy-Style':gt 'city_kavkazkafe', 'givisex'
 		end
 	end
 end
@@ -449,10 +449,10 @@ if $ARGS[0] = 'givisex':
 	if givitime > 5 and rand(0, 100) >= 75 and stat['anal'] > 0 and giviVagOnce = 1:
 		'<<$pcs_nickname>>, I want you in the ass.'
 
-		act 'No way':gt 'kavkazkafe', 'givisex1'
-		act 'Grin and bare it':gt 'kavkazkafe', 'givianal'
+		act 'No way':gt 'city_kavkazkafe', 'givisex1'
+		act 'Grin and bare it':gt 'city_kavkazkafe', 'givianal'
 	else
-		act 'Close your eyes':gt 'kavkazkafe', 'givisex1'
+		act 'Close your eyes':gt 'city_kavkazkafe', 'givisex1'
 	end
 end
 
@@ -474,14 +474,14 @@ if $ARGS[0] = 'givisex1':
 		'Givi suddenly takes out his member and strongly works his fingers in your ass.'
 		gs 'arousal', 'anal_finger', 3, 'sub'
 		gs 'stat'
-		act 'Close your eyes':gt 'kavkazkafe', 'givianal'
+		act 'Close your eyes':gt 'city_kavkazkafe', 'givianal'
 
 	else
 		if rand(0, 10) >= 8:
 			'Givi suddenly pulls his cock out and taking you by the shoulders puts you on your knees in front of him.'
 
-			act 'Remove from your mouth':gt 'kavkazkafe', 'givibj5'
-			act 'Continue sucking':gt 'kavkazkafe', 'givibj6'
+			act 'Remove from your mouth':gt 'city_kavkazkafe', 'givibj5'
+			act 'Continue sucking':gt 'city_kavkazkafe', 'givibj6'
 		else
 			pose = 1
 			gs 'dinSex','sexcum'
@@ -502,8 +502,8 @@ if $ARGS[0] = 'givianal':
 		'Givi suddenly pulls his cock out and taking you by the shoulders puts you on your knees in front of him.'
 		gs 'stat'
 
-		act 'Remove from your mouth':gt 'kavkazkafe', 'givibj5'
-		act 'Continue sucking':gt 'kavkazkafe', 'givibj6'
+		act 'Remove from your mouth':gt 'city_kavkazkafe', 'givibj5'
+		act 'Continue sucking':gt 'city_kavkazkafe', 'givibj6'
 	else
 		gs 'bdsex', 'ancum'
 		gs 'arousal', 'end'
@@ -602,5 +602,5 @@ if $ARGS[0] = 'foursome':
 	end
 end
 
---- kavkazkafe ---------------------------------
+--- city_kavkazkafe ---------------------------------
 

locations/pharmacy.qsrc → locations/city_pharmacy.qsrc

@@ -1,4 +1,4 @@
-# pharmacy
+# city_pharmacy
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -17,19 +17,19 @@ if $ARGS[0] = 'start':
 			minut += rand(1,4) * people
 			people = 0
 			gs 'stat'
-			gt 'pharmacy', 'shop'
+			gt 'city_pharmacy', 'shop'
 		end
 	else
-		gt 'pharmacy', 'shop'
+		gt 'city_pharmacy', 'shop'
 	end
 end
 
 if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	*clr & cla
 	$location_type = 'public_indoors'
-	$loc = 'pharmacy'
+	$loc = 'city_pharmacy'
 	$metka = 'shop'
-	$menu_loc = 'pharmacy'
+	$menu_loc = 'city_pharmacy'
 	$menu_arg = 'shop'
 	menu_off = 0
 	gs 'stat'
@@ -72,7 +72,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	if pcs_knows_nipplecream > 0:
 		*P func ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', $curloc, $ARGS[0])
 	end
-	if KandidNapr = 1: *P func ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $curloc, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''pharmacy'', ''buy_antifungal''">buy</a>','')+'')
+	if KandidNapr = 1: *P func ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $curloc, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''city_pharmacy'', ''buy_antifungal''">buy</a>','')+'')
 	*P '</table></center>'
 end
 
@@ -82,15 +82,15 @@ if $ARGS[0] = 'buy_antifungal':
 		Kandidoz = 0
 		gs 'stat'
 		$gardmess = '<center><font color="green">You bought 1 <b>Antifungal medication</b>.</font></center><br>You put the money on the counter and immediately open the package and swallow the tablet. A while later, you feel better.'
-		gt 'pharmacy', 'shop'
+		gt 'city_pharmacy', 'shop'
 	elseif Kandidoz < 30 and KandidozOnce > 0:
 		'You don''t need the medication right now. Your thrush is currently in remission, taking vitamins will ensure that it stays that way.'
 	else
 		msg '<center>You don''t need any antifungal medication right now.</center>'
 		*nl
-		gt 'pharmacy', 'shop'
+		gt 'city_pharmacy', 'shop'
 	end
 end
 
---- pharmacy ---------------------------------
+--- city_pharmacy ---------------------------------
 

locations/city_residential.qsrc

@@ -92,15 +92,15 @@ gs 'taxi'
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''city_residential'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 if Enable_tablemap = 0:
 	if katkey = 1:'<a href="exec:gt ''katspalnya'', ''start''">Kats</a> apartment'
-	if IrinaQW >= 1:'<a href="exec:gt ''IrinaRoom'', ''start''">Irenes</a> apartment is not far away from yours.'
-	if hour >= 16 and hour < 22 and dimaQW > 0:'<a href="exec:gt ''dima'', ''start''">Dimas</a> apartment'
-	if klofQW >= 2:'<a href="exec:gt ''klofdomhouse'', ''start''">Joras</a> apartment'
+	if IrinaQW >= 1:'<a href="exec:gt ''city_irinaroom'', ''start''">Irenes</a> apartment is not far away from yours.'
+	if hour >= 16 and hour < 22 and dimaQW > 0:'<a href="exec:gt ''city_dima'', ''start''">Dimas</a> apartment'
+	if klofQW >= 2:'<a href="exec:gt ''city_jorahouse'', ''start''">Joras</a> apartment'
 else
 	st_count=0 & $show_table=''
 	if katkey = 1:gs'show_table','<a href="exec:gt ''katspalnya'', ''start''">Kats</a> apartment','3'
-	if IrinaQW >= 1:gs'show_table','<a href="exec:gt ''IrinaRoom'', ''start''">Irenes</a> apartment is not far away from yours.','3'
+	if IrinaQW >= 1:gs'show_table','<a href="exec:gt ''city_irinaroom'', ''start''">Irenes</a> apartment is not far away from yours.','3'
 	if hour >= 16 and hour < 22 and dimaQW > 0:gs'show_table','<a href="exec:gt ''dima'', ''start''">Dimas</a> apartment','3'
-	if klofQW >= 2:gs'show_table','<a href="exec:gt ''klofdomhouse'', ''start''">Joras</a> apartment','3'
+	if klofQW >= 2:gs'show_table','<a href="exec:gt ''city_jorahouse'', ''start''">Joras</a> apartment','3'
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
 		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Natalya Petrovnas</a> apartment.'
 	elseif lesbiday ! daystart and subdom = 2:
@@ -115,18 +115,18 @@ end
 
 if hour >= 5 and hour <= 23:'The <a href="exec: minut += 5 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 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 ''poli'', ''start''">clinic</a> is also nearby.'
+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 >= 11 and hour < 12 and week > 1 and week < 5 and workKafe = 1:'The side door of <a href="exec: minut += 5 & gt ''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 ''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 >= 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>.'
-if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec: minut += 5 & gt ''clener'', ''start''">cleaning lady</a> is needed.'
+if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec: minut += 5 & gt ''city_smalloffice'', ''start''">cleaning lady</a> is needed.'
 
 'The city''s large <a href="exec:minut += 20 & gt ''city_park'', ''start''">central park</a> is about a 20-minute walk away.'
 'The city''s only <a href="exec:minut += 40 & gt ''city_lake'', ''start''">lake</a> is just a 40-minute walk away.'
-'24 Hour <a href="exec:$loc = ''city_residential'' & gt ''pharmacy'', ''start''">Pharmacy</a>.'
+'24 Hour <a href="exec:$loc = ''city_residential'' & gt ''city_pharmacy'', ''start''">Pharmacy</a>.'
 
 if Enable_tablemap = 0:
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
@@ -146,7 +146,7 @@ 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>.'
 end
 
-if SNarkPriton > 0:'The <a href="exec:minut += 5 & gt ''narkopriton''">drug house</a> is clearly recognizable by the syringes and the trash that lies in front of it.'
+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 >= 20 or hour <= 4:

locations/clener.qsrc → locations/city_smalloffice.qsrc

@@ -1,6 +1,6 @@
-# clener
+# city_smalloffice
 if $ARGS[0] = 'start':
-	$menu_loc = 'clener'
+	$menu_loc = 'city_smalloffice'
 	$menu_arg = 'start'
 	menu_off = 0
 	CLOSE ALL
@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 
 	if svQW >= 1:
 		if hour >= 8 and hour <= 16 and week < 6:
-			'The door to the<a href="exec:gt ''torgpred''">Trade Mission</a> is open.'
+			'The door to the<a href="exec:gt ''city_trademission''">Trade Mission</a> is open.'
 		else
 			'The door of the trade mission is closed. There''s a note on the door, Open hours: Saturday and Sunday 8:00--16:00'
 		end
@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			'Still smiling he says, "<<$pcs_nickname>>, want to grab a cup of coffee?"'
 
-			act 'Decline': jouryQwNo = 1 & gt 'clener', 'start'
+			act 'Decline': jouryQwNo = 1 & gt 'city_smalloffice', 'start'
 
 			act 'Accept':
 				*clr & cla
@@ -41,7 +41,7 @@ if $ARGS[0] = 'start':
 				'You nod and the two of you head off to the café, where Yuri orders coffee. You sit down at the table and begin to sip on your coffee. Yuri is painfully quiet, he has no sense of humor and is very stiff.'
 				'It''s pretty clear that he likes you, but he does not know how to put a move on you. As you finish the coffee Yuri finally suggests if you want to follow him to his home.'
 
-				act 'No': jouryQwNo = 1 & gt 'clener', 'start'
+				act 'No': jouryQwNo = 1 & gt 'city_smalloffice', 'start'
 
 				act 'Go with Yuri': gt 'youry', 'quest'
 			end
@@ -86,9 +86,9 @@ if $ARGS[0] = 'start':
 							gs 'stat'
 							'You smile and Sasha pours more vodka, not stopping his caressing of your buttocks.'
 
-							if pcs_horny < 50: gs 'clener', 'borodachNo2'
+							if pcs_horny < 50: gs 'city_smalloffice', 'borodachNo2'
 
-							gs 'clener', 'borodachDrink'
+							gs 'city_smalloffice', 'borodachDrink'
 						end
 
 						gs 'willpower', 'hj', 'self'
@@ -111,8 +111,8 @@ if $ARGS[0] = 'start':
 								gs 'stat'
 								
 								
-								gs 'clener', 'ohrhj'
-								gs 'clener', 'ohrbj'
+								gs 'city_smalloffice', 'ohrhj'
+								gs 'city_smalloffice', 'ohrbj'
 							end
 						else
 							act 'Put your hand on his pants (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -124,7 +124,7 @@ if $ARGS[0] = 'start':
 			gs 'arousal', 'end'
 			gs 'stat'
 							
-			act 'Leave':gt 'clener', 'start'
+			act 'Leave':gt 'city_smalloffice', 'start'
 		end
 	end
 
@@ -138,7 +138,7 @@ if $ARGS[0] = 'start':
 			'"Fulfilment?" you reply.'
 			'The guard smiles, "You''re right, the only word that came up in my head was fucking."'
 
-			act 'Leave':gt 'clener', 'start'
+			act 'Leave':gt 'city_smalloffice', 'start'
 
 			act 'Laugh out loud':
 				cla
@@ -151,7 +151,7 @@ if $ARGS[0] = 'start':
 
 				gs 'willpower', 'drink', 'resist'
 				if will_cost <= pcs_willpwr:
-					act 'Sorry, I have to go (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+					act 'Sorry, I have to go (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_smalloffice', 'start'
 				else
 					act 'Sorry, I have to go (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
@@ -182,9 +182,9 @@ if $ARGS[0] = 'start':
 								'"Hey! What are you doing?" you ask.'
 								'"Relax, it was merely an accident." Sasha starts muttering as he pours another shot, "Let''s have a drink."'
 
-								if pcs_horny < 50: gs 'clener', 'borodachNo'
+								if pcs_horny < 50: gs 'city_smalloffice', 'borodachNo'
 
-								gs 'clener', 'borodachDrink'
+								gs 'city_smalloffice', 'borodachDrink'
 							end
 						else
 							act 'React (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -196,8 +196,8 @@ if $ARGS[0] = 'start':
 							pcs_horny += 15
 							gs 'stat'
 							'You continue on as usual, trying not to pay attention to it, since it was only a casual touch. Sasha pours more vodka and says, "The second shot always tastes better." as he takes another quaff.'
-							if pcs_horny < 50: gs 'clener', 'borodachNo'
-							gs 'clener', 'borodachDrink'
+							if pcs_horny < 50: gs 'city_smalloffice', 'borodachNo'
+							gs 'city_smalloffice', 'borodachDrink'
 						end
 					end
 				end
@@ -218,7 +218,7 @@ if $ARGS[0] = 'start':
 				clenerT = 1
 				'You agree to work as a cleaner.'
 
-				act 'Leave':gt 'clener', 'start'
+				act 'Leave':gt 'city_smalloffice', 'start'
 			end
 		end
 	end
@@ -236,7 +236,7 @@ if $ARGS[0] = 'start':
 				clener = 2
 				'You agree to work as a cleaner.'
 
-				act 'Leave': gt 'clener', 'start'
+				act 'Leave': gt 'city_smalloffice', 'start'
 			end
 		end
 	end
@@ -277,7 +277,7 @@ if $ARGS[0] = 'start':
 						'You look angrily at him, "No, I don''t mix business with pleasure..." Yuri looks dejected as he moves away from you.'
 						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 
-						act 'Leave': gt 'clener', 'start'
+						act 'Leave': gt 'city_smalloffice', 'start'
 					end
 
 					act 'Yes':
@@ -288,7 +288,7 @@ if $ARGS[0] = 'start':
 						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 						'As you leave, you notice Yuri awiting you. He''s pretty nervous and it seems as if he doesn''t know what to do. Not knowing what to say, he blurts out, "How about we head over to my place, watch some movies, drink champagne and talk."'
 
-						act 'No': jouryQwNo = 1 & gt 'clener', 'start'
+						act 'No': jouryQwNo = 1 & gt 'city_smalloffice', 'start'
 
 						act 'Go with Yuri': gt 'youry', 'quest'
 					end
@@ -304,7 +304,7 @@ if $ARGS[0] = 'start':
 
 			'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 
-			act 'Leave':gt 'clener', 'start'
+			act 'Leave':gt 'city_smalloffice', 'start'
 		end
 	end
 
@@ -337,7 +337,7 @@ if $ARGS[0] = 'start':
 							'You''re offended by his behaviour and without any hesitation you tell Yuri to go to hell. He quickly turns and walks away.'
 							'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
 
-							act 'Leave':gt 'clener', 'start'
+							act 'Leave':gt 'city_smalloffice', 'start'
 						end
 					else
 						act 'Fuck you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -349,7 +349,7 @@ if $ARGS[0] = 'start':
 						'Yuri only sees you as a simple fuck whore. But you''re willing to put up with it and agree to visit him afterwards. Yuri nods in satisfaction and leaves the toilet.'
 						'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
 
-						act 'Leave':gt 'clener', 'start'
+						act 'Leave':gt 'city_smalloffice', 'start'
 					end
 				end
 
@@ -374,7 +374,7 @@ if $ARGS[0] = 'start':
 						'You ask him about the details. Stasik tells you, "It''s very simple. In the northern, central and residential areas there are supermarkets. You come to our office to find out what your assignment is, then you visit all the three stores and arrange our products there, making changes according to the assignment. At the checkout you take a receipt confirming that you''ve been to work."' 
 						'"Afterwards, you head back to our office and we will pay you. How does 500 <b>₽</b> sound for a few hours work? No hard labour, what do you say?"'
 
-						act 'Not interested':gt 'clener', 'start'
+						act 'Not interested':gt 'city_smalloffice', 'start'
 
 						act 'Accept':
 							*clr & cla
@@ -383,7 +383,7 @@ if $ARGS[0] = 'start':
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener2.jpg"></center>'
 							'You grin and nod acceptingly, Stas nods confirming the deal, and after that walks out of the toilet.'
 
-							act 'Leave':gt 'clener', 'start'
+							act 'Leave':gt 'city_smalloffice', 'start'
 						end
 					end
 				end
@@ -393,7 +393,7 @@ if $ARGS[0] = 'start':
 
 			'You wash the floor and polish all the booths and urinals. You are given 65 <b>₽</b> for your work.'
 
-			act 'Leave':gt 'clener', 'start'
+			act 'Leave':gt 'city_smalloffice', 'start'
 		end
 	end
 end
@@ -408,11 +408,11 @@ if $ARGS[0] = 'borodachNo':
 
 		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
-			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_smalloffice', 'start'
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		gs 'clener', 'borodachDrink'
+		gs 'city_smalloffice', 'borodachDrink'
 	end
 end
 
@@ -426,11 +426,11 @@ if $ARGS[0] = 'borodachNo2':
 
 		gs 'willpower', 'sex', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_smalloffice', 'start'
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		gs 'clener', 'borodachSex'
+		gs 'city_smalloffice', 'borodachSex'
 	end
 end
 
@@ -442,8 +442,8 @@ if $ARGS[0] = 'borodachDrink':
 		pcs_horny += 20
 		gs 'stat'
 		'You drink and eat some more cheese, you realize that you are happily drunk. The guard''s hand does not stop caressing your ass.'
-		gs 'clener', 'borodachNo2'
-		gs 'clener', 'borodachSex'
+		gs 'city_smalloffice', 'borodachNo2'
+		gs 'city_smalloffice', 'borodachSex'
 	end
 end
 
@@ -489,9 +489,9 @@ if $ARGS[0] = 'ohrhj':
 		gs 'arousal', 'hj', 5, 'dom'
 		gs 'stat'
 		
-		gs 'clener', 'ohrbj'
-		gs 'clener', 'ohrhjcum'
-		gs 'clener', 'ohrsex'
+		gs 'city_smalloffice', 'ohrbj'
+		gs 'city_smalloffice', 'ohrhjcum'
+		gs 'city_smalloffice', 'ohrsex'
 	end
 end
 
@@ -523,8 +523,8 @@ if $ARGS[0] = 'ohrbj':
 		gs 'arousal', 'bj', 5, 'sub'
 		gs 'stat'
 		
-		gs 'clener', 'ohrbjcum'
-		gs 'clener', 'ohrsex'
+		gs 'city_smalloffice', 'ohrbjcum'
+		gs 'city_smalloffice', 'ohrsex'
 	end
 end
 
@@ -592,5 +592,5 @@ if $ARGS[0] = 'ohrsex':
 		act 'Leave':gt 'city_residential'
 	end
 end
---- clener ---------------------------------
+--- city_smalloffice ---------------------------------
 

locations/torgpred.qsrc → locations/city_trademission.qsrc

@@ -1,5 +1,5 @@
-# torgpred
-$menu_loc = 'torgpred'
+# city_trademission
+$menu_loc = 'city_trademission'
 $menu_arg = ''
 menu_off = 0
 gs 'stat'
@@ -7,7 +7,7 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener.jpg"></center>'
 'You walk down the hall to the office at the end. You read Director written on the door, you knock on the door and enter. Sitting behind the desk is Stas while Vitali sits in a large comfortable chair and in the third chair you see a woman.'
 
-act 'Leave': gt 'clener', 'start'
+act 'Leave': gt 'city_smalloffice', 'start'
 
 if svQW = 2:
 	if TorgPredDay ! daystart:
@@ -21,7 +21,7 @@ if svQW = 2:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stasoffice.jpg"></center>'
 				'You tell Stas you want the job. He smiles and hands you a paper, "Don''t forget, you need to promote all three items at all the supermarkets."'
 
-				act 'Leave': gt 'clener', 'start'
+				act 'Leave': gt 'city_smalloffice', 'start'
 			end
 		end
 	end
@@ -94,7 +94,7 @@ if svQW = 2:
 
 			if StVaGang > 0:'' & !!Stas and Valera believe whore Sveta
 
-			act 'Leave': gt 'clener', 'start'
+			act 'Leave': gt 'city_smalloffice', 'start'
 		end
 	end
 
@@ -129,7 +129,7 @@ if svQW = 2:
 				cla
 				gs 'stat'
 
-				act 'Leave': gt 'clener', 'start'
+				act 'Leave': gt 'city_smalloffice', 'start'
 			end
 		end
 
@@ -137,7 +137,7 @@ if svQW = 2:
 			cla
 			'You frown a little, "I am very flattered but I need to think about this, it''s a big step. Just give me a little time to think it over ok?" Stas frowns a bit but finally nods.'
 
-			act 'Leave': gt 'clener', 'start'
+			act 'Leave': gt 'city_smalloffice', 'start'
 		end
 
 		gs 'willpower', 'misc', 'self', 'easy'
@@ -149,7 +149,7 @@ if svQW = 2:
 				gs 'stat'
 				'You shake your head, "You''re a nice guy Stas but I just don''t feel that way towards you, I''m sorry." Stas seems a bit offended by that, "I thought, we had something, more than just a fling."'
 
-				act 'Leave': gt 'clener', 'start'
+				act 'Leave': gt 'city_smalloffice', 'start'
 			end
 		else
 			act 'Tell him no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -157,5 +157,5 @@ if svQW = 2:
 	end
 end
 
---- torgpred ---------------------------------
+--- city_trademission ---------------------------------
 

locations/events.qsrc

@@ -251,7 +251,7 @@ if $ARGS[0] = 'narkozakladka':
 	'<center><b>Shooting galleries</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'You decide to ask, and whether there are any dealers in Pavlovsk. To which the man replied, "Go to the train station platform, it will cost you though..."'
-	'And then he looks at you menacingly at you, "And if I hear that you''ve caused any trouble, well death will seem like a good escape."'
+	'And then he looks at you menacingly "And if I hear that you''ve caused any trouble, well death will seem like a good escape."'
 	act 'Agree':
 		*clr & cla
 		snarkozak = 1
@@ -259,7 +259,7 @@ if $ARGS[0] = 'narkozakladka':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 		'You gulp and stammer "I assure you there willl be no problems"'
 		'Guy nods, "Good then you can find a range of product at the end of the platform."'
-		act 'Leave':gt'narkopriton'
+		act 'Leave':gt'city_drugden'
 	end
 end
 

locations/food_menu.qsrc

@@ -215,7 +215,7 @@ elseif $loc = 'cafe_parco':
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
 	$_drink['5,price'] = 200
-elseif $loc = 'kafe':
+elseif $loc = 'city_kafe':
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/menus/roadhouse.jpg"</center><br>'

locations/housecall.qsrc

@@ -154,7 +154,7 @@ if $ARGS[0] = 'ninel0':
 											cla
 											*clr
 											minut += 120
-											gt 'poli', 'drPP'
+											gt 'city_clinic', 'drPP'
 										end
 									end
 

locations/parkivent.qsrc

@@ -963,7 +963,7 @@ if $ARGS[0] = 'find_baby':
 							'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
 							'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
 							minut += 30
-							act 'Finish': gt 'poli', 'start'
+							act 'Finish': gt 'city_clinic', 'start'
 						end
 						!!if pcs_mood > 80:
 						!!	  act 'Take him with you':
@@ -999,7 +999,7 @@ if $ARGS[0] = 'find_baby':
 									'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
 									'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
 									minut += 35
-									act 'Finish': gt 'poli', 'start'
+									act 'Finish': gt 'city_clinic', 'start'
 								end
 								!!if pcs_mood > 80:
 								!!	  act 'Take him with you':
@@ -1046,7 +1046,7 @@ if $ARGS[0] = 'find_baby':
 									'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
 									'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
 									minut += 35
-									act 'Finish': gt 'poli', 'start'
+									act 'Finish': gt 'city_clinic', 'start'
 								end
 								!!if pcs_mood > 80:
 								!!	  act 'Take him with you':
@@ -1068,7 +1068,7 @@ if $ARGS[0] = 'find_baby':
 							'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
 							'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
 							minut += 35
-							act 'Finish': gt 'poli', 'start'
+							act 'Finish': gt 'city_clinic', 'start'
 						end
 						!!if pcs_mood > 80:
 						!!	  act 'Take him with you':
@@ -1083,7 +1083,7 @@ if $ARGS[0] = 'find_baby':
 				'You take the baby and walk to the hospital in the residential area of St. Petersburg.'
 				'They take him at the reception and you explain what happened. A nurse takes the baby away and the receptionist assures you that they are taking care of him.'
 				minut += 30
-				act 'Finish': gt 'poli', 'start'
+				act 'Finish': gt 'city_clinic', 'start'
 			end
 			if pcs_mood < 20:				
 				act 'Call an ambulance and leave.':

locations/sexdvanadva.qsrc

@@ -158,7 +158,7 @@ if $ARGS[0] = 'end':
 	act 'Leave':
 		if kafesexrand = 1:
 			kafesexrand = 0
-			gt 'kafe', 'workPred'
+			gt 'city_kafe', 'workPred'
 		end
 
 		if kazsexdva = 1:

locations/sexdvoe.qsrc

@@ -405,7 +405,7 @@ if $ARGS[0] = 'end':
 
 		if kafesexrand = 1:
 			kafesexrand = 0
-			gt 'kafe', 'workPred'
+			gt 'city_kafe', 'workPred'
 		end
 		gt $sexloc, 'start'
 	end

locations/sexshop.qsrc

@@ -872,7 +872,7 @@ if $ARGS[0] = 'pip':
 			act 'Masturbate':
 				cla
 				'You caress your pussy with your fingers and enjoy the pleasant sensation between your legs.'
-				gs 'arousal', 'masturbate', 5,
+				gs 'arousal', 'masturbate', 5
 				gs 'arousal', 'end'
 				gs 'stat'	
 
@@ -964,7 +964,7 @@ if $ARGS[0] = 'kendra':
 				end
 			end
 		end
-	elseif kendraslave += 1
+	elseif kendraslave += 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend.jpg"></center>'
 		'As you browse the store, you see Kendra trying on latex clothes. Then she notices you, at about the same time.'
 		'"Who do we have here? My favorite bitch. Come to me, and service me. I just bought a new toy and I am very excited to try it out." Kendra laughs, as she motions for you to follow her into the basement.'

locations/street_event.qsrc

@@ -1241,7 +1241,7 @@ if $ARGS[1] = 'main':
 								gs 'stat'
 								'<<$streetev_title>>'
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
-								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she see''s how much money you gave her. She gets up and hugs you tightly with one arm, while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you and as you walk away, she hugs her cat and you hear her tall him that tonight they will sleep indoors and eat.'
+								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she see''s how much money you gave her. She gets up and hugs you tightly with one arm, while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you and as you walk away, she hugs her cat and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
 							end
 						end