glife.qproj

@@ -267,7 +267,7 @@
 		<Location name="postevents"/>
 	</Folder>
 	<Folder name="Home Street - Locations">
-		<Location name="street"/>
+		<Location name="city_residential"/>
 		<Location name="pharmacy"/>
 		<Location name="clener"/>
 		<Location name="dima"/>
@@ -278,11 +278,11 @@
 		<Location name="kafeend"/>
 		<Location name="kavkazkafe"/>
 		<Location name="klofdomhouse"/>
-		<Location name="lake"/>
+		<Location name="city_lake"/>
 		<Location name="dort"/>
 		<Location name="narkopriton"/>
 		<Location name="bobka"/>
-		<Location name="park"/>
+		<Location name="city_park"/>
 		<Location name="parkdin"/>
 		<Location name="parkivent"/>
 		<Location name="poli"/>
@@ -656,6 +656,7 @@
 		<Location name="fbgameout"/>
 		<Location name="gschool_cheerleading"/>
 		<Location name="nerd_game_night"/>
+		<Location name="gopnik_initiation"/>
 	</Folder>
 	<Folder name="Shared_appartment">
 		<Location name="pavSharedApt"/>
@@ -670,6 +671,8 @@
 		<Location name="gdkin"/>
 		<Location name="gdksport"/>
 		<Location name="gdktoilet"/>
+		<Location name="gdktoilet_mens"/>
+		<Location name="gdktoilet_womens"/>
 		<Location name="gdksex"/>
 		<Location name="BMloc"/>
 		<Location name="ugel"/>
@@ -761,7 +764,7 @@
 		<Location name="brosok"/>
 	</Folder>
 	<Folder name="City Center">
-		<Location name="down"/>
+		<Location name="city_center"/>
 		<Location name="cityTrain"/>
 		<Location name="agentned"/>
 		<Location name="kameraKPZ"/>
@@ -777,6 +780,7 @@
 		<Location name="vipclub"/>
 		<Location name="danceclass"/>
 		<Location name="dorm"/>
+		<Location name="dormev1"/>
 		<Location name="downlibrary"/>
 		<Location name="fit"/>
 		<Location name="talent_agency"/>
@@ -799,8 +803,10 @@
 		<Location name="foto"/>
 		<Location name="foto_shoot"/>
 		<Location name="foto_events"/>
+		<Location name="foto_events2"/>
 		<Location name="foto_albums"/>
 		<Location name="foto_models"/>
+		<Location name="foto_models2"/>
 	</Folder>
 	<Folder name="Crime and Punishment">
 		<Location name="police_station"/>
@@ -808,7 +814,7 @@
 		<Location name="shoplifting"/>
 	</Folder>
 	<Folder name="North Side">
-		<Location name="Nord"/>
+		<Location name="city_industrial"/>
 		<Location name="nordtrain"/>
 		<Location name="Terminal"/>
 		<Location name="TerminalOffice"/>
@@ -900,7 +906,7 @@
 		<Location name="pronouns"/>
 	</Folder>
 	<Folder name="University">
-		<Location name="island"/>
+		<Location name="city_island"/>
 		<Location name="dolls"/>
 		<Location name="vecher"/>
 		<Location name="obkitchen"/>

locations/BDSM.qsrc

@@ -119,7 +119,7 @@ act 'Begin participating in the shooting':
 									'You spent 9 hours for the filming'
 									'and received <<pcs_apprnc * 125>> <b>₽</b> in cash'
 
-									act 'Leave the studio':gt 'down'
+									act 'Leave the studio':gt 'city_center'
 								end
 							end
 						end

locations/BDSM_Club.qsrc

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

locations/BDsex.qsrc

@@ -494,7 +494,7 @@ if $ARGS[0] = 'end':
 
 	if BDcafe = 1:
 		BDcafe = 0
-		act 'Leave':gt 'street'
+		act 'Leave':gt 'city_residential'
 	elseif Yuri_sex = 1:
 		Yuri_sex = 0
 		cumspclnt = 4
@@ -549,7 +549,7 @@ if $ARGS[0] = 'end':
 			tmpgorand = rand(0, 2)
 
 			if tmpgorand = 0: killvar 'tmpgorand' & dynamic $brodilr
-			if tmpgorand = 1: killvar 'tmpgorand' & gt 'down'
+			if tmpgorand = 1: killvar 'tmpgorand' & gt 'city_center'
 			if tmpgorand = 2: killvar 'tmpgorand' & gt 'nord'
 		end
 	else

locations/BurgerTip.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'work':
 				DayTerminalPapper = daystart
 				'Anatoly comes out of the office, and asks, "<<$pcs_nickname>>, I know it''s lunch time, but I really need these documents taken to the storage terminal in the city industrial area to be signed. I''ll give you the rest of the day off if you take care of it for me," he finishes, with a smile.'
 
-				act 'Deliver the papers':gt 'down'
+				act 'Deliver the papers':gt 'city_center'
 			elseif bosstiprand = 1:
 				'Anatoly comes out of the office, and says: "<<$pcs_nickname>>, before lunch I need you to head down to the loading dock, and sign for a shipment of food that''s due to arrive. There''s a gold star in it for you if take care of this for me."'
 
@@ -213,7 +213,7 @@ if $ARGS[0] = 'work':
 				dayBankPapper = daystart
 				'Anatoly comes out of the office, and says, "<<$pcs_nickname>>, please run these documents to the bank for me. I''ll give you the rest of the day off if you take care of it for me," he finishes, with a smile.'
 
-				act 'Go to the bank':gt 'down'
+				act 'Go to the bank':gt 'city_center'
 			elseif bosstiprand = 3:
 				'Anatoly comes out of the office, and says, "<<$pcs_nickname>>, call the that guy we had set up our computers. The on button of my PC seems to be broken."'
 
@@ -307,7 +307,7 @@ if $ARGS[0] = 'work':
 									'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe2.jpg"></center>'
 									'You tell him that you have to be getting home, and the little brat takes that as an opportunity to grope you, before you leave.'
 
-									act 'Leave.':gt 'down'
+									act 'Leave.':gt 'city_center'
 								end
 							end
 						end
@@ -372,7 +372,7 @@ if $ARGS[0] = 'work':
 								'Anatoly is furious: "How? <<$pcs_nickname>>? You''re just a common whore?" If that''s the case you can stay here, and ply your trade. I guess I was wrong about you." He storms off, and moments later you here the screech of his car tires as he drives away.'
 								'The madam continues: "<<$pcs_nickname>>, you''re a whore. You will always be a whore. If you do manage to trick some nice man your past will eventually catch up with you. Consider this a free lesson."'
 								
-								act 'Leave':gt 'street'
+								act 'Leave':gt 'city_residential'
 							elseif SaunaWhore = 0:
 								'You head into the sauna, and up to your luxury room. Anatoly doesn''t waste anytime undressing, and motions for you to do the same. When you are both naked, he motions for you to come to him. You know just what to do.'
 
@@ -430,7 +430,7 @@ if $ARGS[0] = 'work':
 										gs 'arousal', 'end'
 										gs 'stat'
 						
-										act 'Leave':gt 'street'
+										act 'Leave':gt 'city_residential'
 									end
 								end
 							end
@@ -452,7 +452,7 @@ if $ARGS[0] = 'work':
 							gs 'arousal', 'end'
 							gs 'stat'
 						
-							act 'Leave':gt 'down'
+							act 'Leave':gt 'city_center'
 						end
 					end
 				end
@@ -490,7 +490,7 @@ if $ARGS[0] = 'work':
 					gs 'stat'
 					'Two men join  Anatoly in his office for the meeting. You are tasked with bringing coffee and taking notes. An hour later, the men are gone and Anatoly sends you on your way.'
 
-					act 'Leave':gt 'down'
+					act 'Leave':gt 'city_center'
 				end
 			end
 		end
@@ -583,7 +583,7 @@ if $ARGS[0] = 'work':
 				'You quickly write out something that effectively says "I quit!" with some fancy words thrown in.'
 				'Anatoly pays you the <<pay>> <b>₽</b> you are owed, and says, "It''s over <<$pcs_nickname>>, get out of here."'
 
-				act 'Leave':gt 'down'
+				act 'Leave':gt 'city_center'
 			end
 		end
 
@@ -1075,7 +1075,7 @@ if $ARGS[0] = 'work4':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work7.jpg"></center>'
 	'When you refuse, Ivan says, "I''m tired of messing with you anyway, you stupid cunt. It''s easier just to get rid of you once and for all." With that, he turns and walks away.'
 
-	act 'Leave':gt 'down'
+	act 'Leave':gt 'city_center'
 end
 
 --- BurgerTip ---------------------------------

locations/Cheatmenu_din.qsrc

@@ -1375,7 +1375,7 @@ $cheatmenu['reputation'] = {
 		'You''ve been dating for <<loverdays[2]>> days. <a href="exec:loverdays[2] += 5 & dynamic $cheatmenu[''reputation'']">+5</a> <a href="exec:loverdays[2] -= 5 & dynamic $cheatmenu[''reputation'']">-5</a>'
 	end
 	*nl
-	if pav_slut >= 25:
+	if pav_slut >= 50:
 		gs 'fame'
 		'In Pavlovsk you are known as a <font color="red"><<$gnikname>></font> <a href="exec:pav_slut = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
 	end
@@ -1396,7 +1396,7 @@ $cheatmenu['reputation'] = {
 			'Your mother thinks that you are a virgin.'
 		end
 		*nl
-		if evgenQW >= 4 and pav_slut >= 125:
+		if evgenQW >= 4 and pav_slut >= 250:
 			'Your brother thinks you are a total whore. <a href="exec:evgenQW = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
 		elseif evgenQW >= 3:
 			'Your brother thinks you are a slut. <a href="exec:evgenQW = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
@@ -2431,7 +2431,7 @@ $cheatmenu = {
 	*nl
 	*nl
 	'<a href="exec:gt''pavResidential''">Teleport to Pavlovsk</a>'
-	'<a href="exec:gt''street''">Teleport to City</a>'
+	'<a href="exec:gt''city_residential''">Teleport to City</a>'
 	'<a href="exec:gt''gadukino''">Teleport to Gadukino</a>'
 	'<a href="exec:gt''dachi''">Teleport to Suburban Cooperative</a>'
 	*nl

locations/FedorEv4.qsrc

@@ -3068,13 +3068,13 @@ if $ARGS[0] = 'Regina Chat':
 		'Regina looks at you then sighs. "You''re not even trying to cover up anymore, are you? well at least make sure to get dressed before walking out the front door, ok?"'
 	elseif $clothingworntype = 'nude' and ReginaKozCaught >= 5 and ReginaKozQW = 1:
 		'Regina looks at you then sighs. "You''re not even trying to cover up anymore, are you? well at least make sure to get dressed before walking out the front door, ok?"'
-	elseif cumloc[11] = 1 and ReginaCumChat = 0 and ReginaKozQW = 0 or (cumloc[6] = 1 or cumloc[7] = 1) and ReginaCumChat = 0 and ReginaKozQW = 0:
+	elseif cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and ReginaCumChat = 0 and ReginaKozQW = 0:
 		ReginaCumChat += 1
 		'Regina squints and notices the cum on you. "Is that what I think it is? Can you please head to the bathroom and clean yourself up?"'
-	elseif cumloc[11] = 1 and ReginaKozQW = 0 or (cumloc[6] = 1 or cumloc[7] = 1) and ReginaKozQW = 0:
+	elseif cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and ReginaKozQW = 0:
 		ReginaKozQW = 1
 		'Regina gives you a stern look. "Young lady, you should at least clean up after you... well, you know what I mean."'
-	elseif cumloc[11] = 1 and ReginaKozQW = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and ReginaKozQW = 1:
+	elseif cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1) and ReginaKozQW = 1:
 		'Regina gives you a blank stare. "I won''t pry into your love life but could you do me a favor and clean yourself up afterward?"'
 	end
 	if pcs_health < healthmax:

locations/Gnpc2.qsrc

@@ -74,7 +74,7 @@ $din_gboy_go_to_disco = {
 				'While you are dancing with <<$boydesc>> a drunk kid in sweatpants and sweatshirt approaches.'
 				gs 'npcgeneratec', 0, 'Gopnik', rand((age - 1),(age + 1))
 				gs 'boyStat', $npclastgenerated, 1
-				if pav_slut < 75:
+				if pav_slut < 150:
 					'The Gopnik pushes <<$boydesc>> to the side and grabs you by the waist. "Let''s dance, babe!"'
 					*nl
 
@@ -287,7 +287,7 @@ $din_gboy_go_to_disco = {
 						gs 'stat'
 						'Your <<$bfTitle[numnpc]>> gets himself a beer at the bar and in the meantime you continue to dance.'
 
-						if pav_slut >= 75:
+						if pav_slut >= 150:
 							'Someone walks up to you "Hey, I''ve been watching you having fun with your boyfriend here. He still does''t know that you are a <<$gnikname>>? Maybe I should tell him?"'
 							*nl
 							set $bfBreakup = 'You tell the guy to go to hell and he walks away with a sullen look on his face. At this point, <<$boydesc>> comes back and asks, "What did that guy want from you?" You quickly lie, "He wanted to dance with me, but I turned him down." Unfortunately, the guy comes back and pulls your <<$bfTitle[numnpc]>> to the side. After a while, <<$boydesc>> returns and says "We''re through. Based on the shit I was just told, I won''t waste another minute on the likes of a whore like you!"'

locations/IrinaRoom.qsrc

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

locations/IvanEv.qsrc

@@ -124,10 +124,12 @@ if $ARGS[0] = 'School Chat':
 		act 'Move away': gt $loc, $metka
 	end
 	
+	if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
+	
 	act 'Chat':
 		cla
 		if $loc ! 'gdkin':
-			if pav_slut <= 50 and IvanShowerQW = 1:
+			if pav_slut <= 100 and IvanShowerQW = 1:
 				gs 'nogorslut'
 
 				act 'Leave': gt 'gschool_lessons', 'short_break'

locations/KatjaHomeTalk.qsrc

@@ -143,7 +143,7 @@ if $ARGS[0] = '':
 	!					'- Well will continue our dispute, - asked you '
 	!					'- continue, - Katya readily agreed'
 	!
-	!					act 'Further': gt 'katja_sex','park'
+	!					act 'Further': gt 'katja_sex','city_park'
 	!				end
 	!			end
 				if flag_KissEV = 2:
@@ -165,7 +165,7 @@ if $ARGS[0] = '':
 						'"Oh yea?" Kate said with a bit of anger, "Let''s see then, let''s go to the Park and see who can kiss more boys."'
 						'"Good." You agree, let''s dispute. And what''s the bet.'
 						'"Fine, now let''s go kiss some boys." Kate said.'
-						act 'Further': gt 'katja_sex','park'
+						act 'Further': gt 'katja_sex','city_park'
 					end
 				elseif katjaPreg = 0 or knowKatjaPreg = 1:
 					if KatjaHorny < 50:'Katka talks about school lessons, cosmetics, the latest fashion trends and other very important things.'

locations/LCwork.qsrc

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

locations/Military.qsrc

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

locations/NewCloShop.qsrc

@@ -159,7 +159,7 @@ if $ARGS[0] = 'dressingclothes':
 			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''dressingshmotmag''"><img src="images/pc/clothing/3expensive/<<i>>.jpg" 	height="250" /></a>  '
 		end
 		i += 12
-	if i <= 425:jump 'loopexpensive2'
+	if i <= 433:jump 'loopexpensive2'
 end
 
 if $ARGS[0] = 'dressingshmotmag':

locations/NikoDates.qsrc

@@ -230,6 +230,7 @@ if $ARGS[0] =  'Date 1_2':
 												gs'stat'											
 												'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow4.mp4"></video></center>'
 												'You stare into Niko''s eyes, feeling more turned on at how badly he craves you. You soon hear Niko groan as he begins pumping his cum down your throat which you do your best to swallow every drop of.'
+												swallow += 1
 												gs 'arousal', 'bj', 5, 'sub'
 												gs 'cum_call', 'mouth', 'A189', 1
 												gs 'arousal', 'end'
@@ -587,6 +588,7 @@ if $ARGS[0] =  'Cafeteria':
 			gs'stat'		
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/bj2.mp4"></video></center>'
 			'After a few minutes, Niko''s hand tightens around your breast as his penis begins throbbing in your mouth, causing Niko''s cum to shoot down your throat which you swallow as best you can. Once Niko is fully spent, he pulls you up and kisses your forehead, "That''s my girl, so beautiful and daring too. You really are a precious gem <<$pcs_firstname>>." Niko''s words, warm your already rapidly beating heart, leaving you speechless as he gives you a wink, before buttoning his pants then walking away.'
+			swallow += 1
 			gs 'cum_call', 'mouth', 'A189', 1
 			gs 'arousal', 'bj', 5
 			gs 'arousal', 'end'
@@ -615,16 +617,16 @@ if $ARGS[0] =  'Date 3':
 		act 'Talk to Niko':
 			*clr & cla
 			gs'stat'
-			'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+			'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 			*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-			'As Niko is applying the sunscreen, you say, "Do you mind if I ask you some more questions about your...family? I am really interested in getting to know you better." Niko pauses for a second then replies, "Sure, why not? Ask away." You then say, "You told me that you had a sister who...passed away, but you never told me what happened to your younger brother, or your father." Niko continues applying the sunscreen to your skin as he answers, "After my sister''s death, my father took it extremely hard and blamed himself for not being there. I believe that he lost faith in both Yurik and I.'
+			'As Niko is applying the sunscreen, you say, "Do you mind if I ask you some more questions about your...family? I am really interested in getting to know you better." Niko pauses for a second then replies, "Sure, why not? Ask away." You then say, "You told me that you had a sister who...passed away, but you never told me what happened to your younger brother or your father." Niko continues applying the sunscreen to your skin as he answers, "After my sister''s death, my brother and I have never really spoken much, at least not without it ending in a fight.'
 
 			act 'Continue listening':
 				*clr & cla
 				gs'stat'	
 				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad2.jpg"></center>'			
-				'It wasn''t my fault but of course, I received some of the blame for Yurik''s failure... I just can''t believe how fast it happened. One second she was on the sidewalk holding the cat then... Anyway my father began working even harder, trying to find a cure for my little brother''s condition. I don''t know much about his research. He always stayed locked in his study."'
+				'It wasn''t my fault but of course, I received some of the blame for Yurik''s failure... I just can''t believe how fast it happened. One second she was on the sidewalk holding the cat then... Anyway our sister died and my brother''s bitch of a girlfriend went missing shortly after. Good fucking riddance I say. She was nothing but a controlling bitch! and she deserved what she got..." Niko suddenly places his hand over his mouth, shutting himself up. It seems as if he caught himself saying something he shouldn''t have.'
 
 				act 'Go on':
 					*clr & cla
@@ -632,13 +634,13 @@ if $ARGS[0] =  'Date 3':
 					gs'stat'
 					'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad2.jpg"></center>'
-					'You ask, "What happened to them?" Niko replies, "They both died..." You ask, "But how?" Niko shrugs then remains silent. You realize that he is not interested in answering, so you ask, "So what happened to your mother?" Niko replies, "I never met her. She left my father shortly after I was born. Yurik told me that she was just a gold digger who only wanted my father''s money, but after a long heated argument, she left without ever looking back. What a greedy bitch!" You respond, "Are there any happy memories that you have with your family?" Niko shrugs as he says, "None that aren''t surrounded in bad memories. Let''s talk about something else."'
+					'Realizing that Niko is tensing up, you decide to shift the conversation back to his parents, "What happened to your parents?" Niko replies, "They both died..." You ask, "But how?" Niko shrugs then remains silent. You realize that he is not interested in answering, so you ask, "So what happened to your biological mother?" Niko replies, "I never met her. She left my father shortly after I was born. Yurik told me that she was just a gold digger who only wanted my father''s money, but after a long heated argument, she left without ever looking back. What a greedy bitch!" You respond, "Are there any happy memories that you have with your family?" Niko shrugs as he says, "None that aren''t surrounded in bad memories. Let''s talk about something else."'
 					
 					act 'Chat with Niko':
 						*clr & cla
 						minut += 15
 						gs'stat'
-						'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+						'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 						*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'				
 						'You and Niko spend the next 15 minutes, talking about various topics before Niko asks, "Hey <<$pcs_firstname>>, would you consider yourself a daring girl?" You scratch your head before replying, "I don''t know." Niko grins as he says, "Well let''s find out right now." Niko unbuttons his pants then says, "I dare you to suck me off right now." You look around at all the people around you then say, "But there are people around." Niko replies, "So? Come on, show me how daring you are. It will be really sexy." You bite your lip as you take one last look around.'
 
@@ -687,7 +689,7 @@ if $ARGS[0] =  'Date 3':
 											minut += 5
 											gs'stat'
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/3/d4.jpg"></center>'
-											'As you both get comfortably seated, you take this time to ask Niko, "Niko I hate to keep prying, but I feel that there is more to your story that you might need to get off your chest. Can you tell me how your brother died?" Niko takes a few second pause, before replying, "There was a fire in our old home and before you ask, No they didn''t die in the fire. My brother and I set up a christmas tree but sadly, we never realized how close we placed it to the fireplace. It would have been alright if we didn''t place rattling ornaments on the tree." You quickly ask, "How can rattling ornaments cause a fire?"'
+											'As you both get comfortably seated, you take this time to ask Niko, "Niko I hate to keep prying, but I feel that there is more to your story that you might need to get off your chest. Can you tell me how your brother died?" Niko takes a few second pause, before replying, "There was a fire in our old home and before you ask, No they didn''t die in the fire. My brother and I set up a Christmas tree but sadly, we never realized how close we placed it to the fireplace. It would have been alright if we didn''t place rattling ornaments on the tree." You quickly ask, "How can rattling ornaments cause a fire?"'
 
 											act 'Listen to Niko''s reply':
 												*clr & cla
@@ -1085,6 +1087,7 @@ if $ARGS[0] = 'Hallway Strip':
 								gs'stat'
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow4.mp4"></video></center>'
 								'You quicken your pace until you see Niko''s head slam into the wall as he begin shooting his warm seed into your mouth. You do your best to swallow every drop of his warm nectar, despite it''s sharp, tart taste. Niko looks down to you and says, "Thank you <<$pcs_firstname>>. You are truly a goddess. Now let''s get you dressed before someone notices us." Niko kneels down and picks up your clothes then helps you get dressed while occasionally checking to see if anyone has noticed. Once you are fully dressed, Niko whispers in your ear, "You were extremely daring today, I look forward to next time." Niko gives you a kiss on your cheek before walking back into the cafeteria.'
+								swallow += 1
 								gs 'cum_call', 'mouth', 'A189', 1
 								gs 'arousal', 'bj', 5
 								gs 'arousal', 'end'
@@ -1290,6 +1293,7 @@ if $ARGS[0] = 'Disco':
 								gs'stat'							
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow3.mp4"></video></center>'
 								'Niko''s head suddenly jerks back as he bites his lip, shooting his cum, down your throat. You do your best to swallow every drop, not wanting any of Niko''s cum to go to waste.'
+								swallow += 1
 								gs 'cum_call', 'mouth', 'A189', 1
 								gs 'arousal', 'bj', 5
 								gs'stat'
@@ -1306,7 +1310,7 @@ if $ARGS[0] = 'Disco':
 									act 'Collect your thoughts':
 										*clr & cla
 										gs'stat'
-										'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+										'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 										*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 										'You take a few seconds to collect your thoughts, <font color=#FF00FF>I''m sure those guys wont be a problem. I have nothing to worry about. I just need to wait for Niko then I can go home and relax.</font>' 
 										
@@ -1434,6 +1438,7 @@ if $ARGS[0] = 'After School 2':
 							gs'stat'
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow4.mp4"></video></center>'
 							'You suddenly hear Niko groan as he begins spraying his hot cum down your throat. You swallow it while enjoying the sting as it slides down your throat, knowing that you have fully satisfied Niko. You slowly look up to Niko, "I love you Nikolai. I love you with all my heart." Niko recoils in shock, "Uhh, I love you too and I''m...glad you enjoy our time together." You can tell that your sudden show of affection caught Niko off guard which makes you giggle for a few seconds as Niko buttons his pants then says, "You were outstanding today. I always have a blast when I''m with you. Here are your clothes. You should get dressed before anyone sees us."'
+							swallow += 1
 							gs 'cum_call', 'mouth', 'A189', 1
 							gs 'arousal', 'bj', 5
 							gs 'arousal', 'end'
@@ -1483,7 +1488,7 @@ if $ARGS[0] = 'Sonia Block':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/soniaupset.jpg"></center>'
 	'Niko wraps his arm around your neck then leads you to the locker room. As you are both walking, you suddenly hear, "No walking in the halls until class is back in session!" You turn to see Sonia Ivanko holding a notepad. Niko responds, "What''s it to you?" Sonia replies, "I''m the school hall monitor and it''s my duty to stop students from breaking the rules. so get back to the lunch room before I report you to the principle."'
 	*nl
-	'Niko grunts, "Fine! You really need to lightly up sometime Sonia. Better yet, try getting laid. It will help you not being such an up tight bitch." Sonia scowls then points her pencil at Niko. "Lunch room, NOW!" You can hear Niko utter under his voice, "If only <font color=#FF00FF>Sonia wasn''t such a prude and got laid</font> then we could have had a good time." As you both walk back to the cafeteria.'
+	'Niko grunts, "Fine! You really need to lighten up sometime Sonia. Better yet, try getting laid. It will help you not being such an up tight bitch." Sonia scowls then points her pencil at Niko. "Lunch room, NOW!" You can hear Niko utter under his voice, "If only <font color=#FF00FF>Sonia wasn''t such a prude and got laid</font> then we could have had a good time." As you both walk back to the cafeteria.'
 
 	act 'Walk away':gt 'gschool_lunch', 'break'
 end

locations/NikoEv2.qsrc

@@ -175,6 +175,7 @@ if $ARGS[0] = 'Reward':
 											gs'stat'
 											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/cum/throat1.mp4"></video></center>'
 											'Yurik suddenly grabs firmly onto the back of your head then shoves his penis as far down your throat as he can while groaning loudly. You can feel a surge of cum shooting down your throat which you have no choice but to swallow. Yurik pulls off of you as you continue swallow the last of his cum. Yurik begins dressing himself then walks up to you; with tears streaming down your face and says, "Whenever I am around, you will do whatever I say. Do you understand, girl?" You nod meekly, terrified of what Yurik could do to you. Yurik responds, "Good, i will be seeing you around and don''t try to avoid me, or that will make me ANGRY." Yurik then gets dressed before grabbing you up by your hair then pulling to toward the door where he opens it up before tossing you into Niko''s arms then closing the door.'
+											swallow += 1
 											gs 'cum_call', 'mouth', $boy
 											gs 'arousal', 'bj', 5
 											gs 'arousal', 'end'
@@ -258,13 +259,13 @@ if $ARGS[0] =  'Lunch Chat':
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color=#9b5800><<"Petia Alkaev">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/159.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
 			'As soon as you enter the locker room, you see Petia Alkaev waiting for you. Niko says, "Here she is." Petia responds, "I heard some things about you <<$pcs_nickname>>. Are they true?" You lower your head then ask, "What have you heard?" Petia replies, "I heard that you are Niko''s whore and that you do anything Niko tells you too. At least that is what Niko said." You look to Niko, who has a wide smile on his face. Niko nods to you, "No need to be shy <<$pcs_nickname>>, tell him." You lower your head again then say, "Yes it''s true." Niko responds, "What''s true?" with a confident smile on his face.' 
 
 			act 'Tell them':	
 				*clr & cla
 				gs'stat'	
-				'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+				'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 				*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 				'You reply, "I am Niko''s whore." Petia smiles as he responds, "Good, I always knew that you were a dirty girl. Now let''s do this." In your heart, you know what he wants, but you ask Niko anyway, "What do I need to do?" Niko replies, "Just suck his dick. It should be easy for you." You know that you''ve come too far to go back now, so you approach Petia then drop to your knees in front of him as he eagerly unbuttons his pants."'
 
@@ -322,6 +323,7 @@ if $ARGS[0] =  'Lunch Chat':
 											gs'stat'							
 											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow8.mp4"></video></center>'
 											'You can feel tears running down your cheeks as you lose yourself in the moment. Niko suddenly begins groaning as he fills your mouth with his warm seed which you try your best to swallow every drop of, wanting any part of Niko to stay inside you.'
+											swallow += 1
 											gs 'cum_call', 'mouth', $boy
 											gs 'arousal', 'bj', 5
 											gs 'arousal', 'end'
@@ -370,7 +372,7 @@ end
 if $ARGS[0] =  'Vicky Talk':
 	*clr & cla
 	gs'stat'
-	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+	'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 	'As you are leaving the cafeteria, you suddenly hear someone say, "I saw what you did in the locker room."'
 
@@ -386,7 +388,7 @@ if $ARGS[0] =  'Vicky Talk':
 			NikoEv = 15
 			minut += 5
 			gs'stat'
-			'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+			'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 			*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 			'"A whore?" You say as you slowly raise your head. Vicky then slowly nods before asking, "Then you accept it eh?" You take a second to think about it before saying, "Maybe I am. I... Just love the way he looks at me and all I can think of is pleasing him. It excites me and makes me feel alive and I don''t even care what others think of me. I only care about what Niko thinks."' 
 
@@ -440,7 +442,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 				gs 'clothing', 'strip'
 				gs'stat'
 				'<center><b><h4><font color=#9b5800><<"Petia Alkaev">></font></h4></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/47.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
 				'As you enter the locker room you see Petia waiting for you. You immediately know what he wants and you turn to Niko then ask, "Do you want me to suck his dick again?" But you say it with a smile. Niko looks at you with a surprised, but pleased look on his face, "You really seem to be getting into this, good, but no, he wants to fuck you this time. Don''t worry, he will pay a lot more this time. so take off your clothes." You obediently nod then remove your clothes. Petia watches you undress while removing his pants and stroking his penis.' 
 				*nl
 				'After fully undressing, you walk up to Petia then ask him, "How do you want me?" His jaw is hanging as he freezes for a few moments while scanning you body with his eyes. "SPEAK UP LOSER! TIME IS MONEY!" Niko exclaims. Petia jumps up in shock before replying, "Oh.. Oh.. Oh yes, Over.. By.. Um.. here..Climb on me." He then quickly sits on a bench. You can see the sweat trailing down his face.'
@@ -464,7 +466,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 							*clr & cla
 							gs'stat'
 							'<center><b><h4><font color=#9b5800><<"Petia Alkaev">></font></h4></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/47.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
 							'You continue watching Petia, twitching as he has the most powerful orgasm in his life. You can see the ecstasy on his face. The blissful pleasure he is feeling that leaves you envious. After a few seconds Niko approaches the two of you ands says, "Wow Petia, That was pathetic. You wont have any chance with a woman unless you pay for it. Now get the fuck out out of here. I need to speak with <<$pcs_nickname>>."' 
 							*nl
 							'Petia quickly collects his things while giving you a look of deep gratitude. This has clearly been the best day of his life. Petia puts his pants back on before leaving the restroom while staring at you the whole way.'
@@ -924,7 +926,8 @@ if $ARGS[0] =  'Reward 2':
 								gs'stat'
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow8.mp4"></video></center>'
 								'You quickly pull off of Niko then wrap your lips around his dick and begin sucking. Niko tilts his head back then begins cumming in your mouth as you do your best to suck every drop out of Niko''s dick. Niko''s warm seed fills your mouth as you continue swallowing and sucking his dick dry. After Niko is fully spent, he gently grabs your face then brings it to his, giving you a gentle kiss on the lips before saying, "I am so lucky to have such a beautiful and obedient girl like you." You reply, "I feel so lucky to have you in my life too, Nikolai." Niko rubs on your forehead then gets up and heads to the bathroom to get washed up.'
-								gs 'cum_call', 'mouth', $boy 
+								swallow += 1
+								gs 'cum_call', 'mouth', 'A189', 1
 								gs 'arousal', 'bj', 5
 								gs 'arousal', 'end'
 								gs'stat'	
@@ -979,6 +982,7 @@ if $ARGS[0] = 'Yurik BJ':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/bj/bj1.mp4"></video></center>'	
 					'You quicken your pace then suddenly Yurik groans as he begins pumping your mouth full of his warm cum which you do your best to swallow every drop of. After Yurik is spent, he says to you, "I''m done girl. You can go back to Niko now." You get up then start walking away when you hear Yurik say, "And good job girl." You walk back up the stairs with a smile on your face.'
+					swallow += 1
 					gs 'cum_call', 'mouth', $boy 
 					gs 'arousal', 'bj', 5
 					gs 'arousal', 'end'
@@ -1039,7 +1043,7 @@ if $ARGS[0] = 'Diner 2':
 				$NikoSlutName = $pcs_firstname
 				minut += 5
 				gs'stat'
-				'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+				'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 				*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 				'You tell them, "My name is <<$pcs_firstname>>. It''s nice to meet you." The man says, "<<$pcs_firstname>> is a very cute name, it really suits you." You give the men a friendly smile as one of them approaches Niko.'
 				
@@ -1052,7 +1056,7 @@ if $ARGS[0] = 'Diner 2':
 				if $NikoSlutName = '':$NikoSlutName = 'Violet'
 				minut += 5
 				gs'stat'
-				'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+				'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 				*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 				'You tell them, "My name is <<$NikoSlutName>>. It''s nice to meet you." The man says, "<<$NikoSlutName>> huh? That is is a pretty name." You give the men a friendly smile as one of them approaches Niko.'
 
@@ -1178,7 +1182,7 @@ if $ARGS[0] = 'Niko Search':
 	NikoEv = 22
 	minut += 5
 	gs'stat'
-	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+	'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'	
 	'As you are leaving the cafeteria, you walk toward the restroom to check up on Niko. When you arrive at the restroom you can see the boys chatting with each other before turning to you then whispering to each other before Dan grabs onto your arm. "Hey <<$pcs_firstname>> I know why you are here. You miss our dicks don''t you?" You recoil before saying, "No I was just looking for..." Dan grips your arm tighter as he unbuttons his pants. "Don''t worry, My dick is right here." Dan pushes you down to your knees then presses his dick against your lips while the other gopnik circle around you. <font color=#ff00cc>There is no point in resisting.</font>' 
 	'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
@@ -1218,7 +1222,7 @@ if $ARGS[0] =  'Niko Search 2':
 	NikoEv = 22
 	minut += 5
 	gs'stat'
-	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+	'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'	
 	'As you are leaving the cafeteria, you carefully approach the restroom. <font color=#ff00cc>Please be there Niko.</font> When you arrive at the restroom you carefully peek through the door to see that no one is there. You can''t help but feel a bit relieved that none of the boys are there, but soon you hear some boys chatting from the hallway behind you, so you quickly run into one of the stalls while hoping that they don''t enter. To your dismay, they enter the restroom while continuing their conversation.'	
 	'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
@@ -1261,7 +1265,7 @@ if $ARGS[0] =  'Niko Search 2':
 				*clr & cla
 				minut += 5
 				gs'stat'
-				'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+				'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 				*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 				'You wait for a few seconds after the boys leave then quietly exit the stall then peek out of the restroom door to see no one around. You have a quick sigh of relief as you walk toward the girl''s restroom to wait out recess when you suddenly hear, "Hey <<$pcs_nickname>>, just the girl we''re looking for." You freeze in your tracks as you realize that the boys found you. Dan grabs your hand then says, "Let''s have some fun <<$pcs_nickname>>." You try to say something but your mind is racing too fast. Dan pulls you toward the restroom as the other boys follow closely behind.'
 				'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
@@ -1279,7 +1283,7 @@ if $ARGS[0] =  'Niko Search 2':
 						*clr & cla
 						minut += 5
 						gs'stat'
-						'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+						'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 						*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 						''
 						
@@ -1287,7 +1291,7 @@ if $ARGS[0] =  'Niko Search 2':
 							*clr & cla
 							minut += 5
 							gs'stat'
-							'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+							'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 							*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 							''
 							

locations/NikoMeyHome.qsrc

@@ -500,7 +500,7 @@ end
 if $ARGS[0] = 'Leaving':
 	*clr & cla
 	gs'stat'
-	'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+	'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 	'As you approach the door, you think to yourself, <font color=#FF00FF>I haven''t spoken to all the girls yet. Should I leave without saying goodbye?</font>'
 	
@@ -542,7 +542,7 @@ if $ARGS[0] = 'Katja Chat':
 			*clr & cla
 			VKKatjaChat = 1
 			gs'stat'
-			'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+			'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 			*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 			if VKNatChat = 0:
 				'You sarcastically reply, "Tell me about it." Katja lightly squeezes your shoulders, "No one can change who you are beside you. Remember that. Anyway you should take a bath before Vicky decides to gussy herself in there because trust me when I say, you wont be able to use bathroom anytime this century." You poke Katja in her arm as you reply, "Oh stop. I''m sure she''s not that bad." She giggles as she pulls out her tweezers then begins plucking her eyebrows while telling you, "Oh, by the way, Natalia wanted to speak to you, she seems very worried about you. She is such a sweet girl. It''s a shame that she isn''t more talkative in school." You reply, "I agree. I will go speak with her." You then give Katja a nod before stepping away.'

locations/NikoPayback.qsrc

@@ -69,7 +69,12 @@ if $ARGS[0] = 'Payback':
 						gs'stat'
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/facial1.mp4"></video></center>'
 						'You increase your pace as you look up at Niko, noticing how much he is enjoying your performance. You stare him in the eyes as you hear him begin groaning. You suddenly feel Niko''s warm seed filling your mouth, one squirt at a time. You look up to Niko with his cum slowly leaking out of your mouth, Niko then looks down to you and says, "What are you waiting for? Swallow my cum bitch!" You give Niko a meek nod then begin swallowing his cum and after you finish, Niko pulls your head to the ground and says, "You missed a few drops, Lick it off the floor!" not wanting to anger Niko further, you obediently begin licking the last drops of cum off the floor. "Now that''s better, I''ll see you tomorrow. Remember what I said and don''t ever try to avoid me."'	
-
+						swallow += 1
+						gs 'cum_call', 'mouth', 'A189', 1
+						gs 'arousal', 'bj', 5
+						gs 'arousal', 'end'
+						gs'stat'
+					
 						act 'Stand up':gt 'FedorMisc', 'Restroom'
 					end	
 				end				
@@ -170,8 +175,9 @@ if $ARGS[0] =  'Payback 3':
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/bj2.mp4"></video></center>'
 			'After a few more seconds, Niko begins moaning as he runs his fingers through your hair before grabbing your head with both hands and pushes his penis down your throat as he begin spraying his warm seed down your throat. You try your best not to gag as Niko continues to pump his warm cum down your throat while you swallow every drop of it. After Niko finishes, he looks down to you then says, "You are really good at that. I will see you again soon. Niko buttons his pants then walks out of the restroom."'
 			*nl
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow8.mp4"></video></center>'			
-			gs 'cum_call', 'face', $boy
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow8.mp4"></video></center>'	
+			swallow += 1
+			gs 'cum_call', 'mouth', $boy
 			gs 'arousal', 'bj', 5, 'sub'
 			gs 'arousal', 'end'
 			gs 'stat'	
@@ -335,6 +341,7 @@ if $ARGS[0] =  'Payback 4':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/cum/throat6.mp4"></video></center>'
 				'Niko grabs the back of your head then begins fucking your throat. You try to relax your throut as NIko continues fucking it. Niko says to you, "Remember <<$pcs_firstname>> this is your place. You are my fucking bitch and nothing more." You are too focused on not gagging to respond. After a few more seconds, Niko groans, filling your throat with his warm seed which you swallow as much of it as you can, knowing that you have no choice. Niko then buttons his pants and walks out of the restroom, without saying another word.'
+				swallow += 1
 				gs 'cum_call', 'mouth', $boy
 				gs 'arousal', 'bj', 5, 'rough', 'sub'
 				gs 'arousal', 'end'
@@ -351,11 +358,13 @@ if $ARGS[0] =  'Payback 4':
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/rough/piss1.mp4"></video></center>'
 			'You open your mouth and close your eyes, waiting for Niko to start. A few seconds later you feel warm liquid spraying in your face, filling your mouth and getting in your nose. Niko shouts, "SWALLOW IT ALL BITCH!" You try your best not to gag as you attempt to swallow all of him bitter tasting urine. You can''t keep your self from gagging as Niko continues shooting his urine down your throat. Niko suddenly rubs his penis against your lips before shoving it into your mouth.'			
 			gs 'arousal', 'pee', -5, 'sub', 'humiliation'
+			
 			act 'Suck Niko''s dick':	
 				*clr & cla
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow3.mp4"></video></center>'
 				'You know exactly what he want and begin sucking Niko''s dick, trying your best to get him off as quickly as possible, knowing that the sooner he finishes, the sooner you can wash up and leave. You lick and suck Niko''s dick while trying your best to ignore the rotten taste in your mouth and the mildly burning of Niko''s urine on your face. Niko looks down to you then says, "There you go <<$pcs_firstname>>. Keep behaving like this and we will get along just fine." He then tilts his head back and begins moaning. Niko suddenly grabs the back of your head and begin filling your throat with his warm cum as you try your best to swallow every drop of it. After Niko finishes, he turn to you and says, "You are learning, Good keep it up." Niko then buttons his pants before leaving the restroom.'
+				swallow += 1
 				gs 'cum_call', 'mouth', $boy
 				gs 'arousal', 'bj', 5, 'rough', 'sub'
 				gs 'arousal', 'end'
@@ -642,7 +651,7 @@ if $ARGS[0] = 'Vitek Help':
 		*clr & cla
 		minut += 1
 		gs'stat'
-		'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+		'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 		*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 		'You suddenly scream, "NIKO RAPED ME!!!" The guys freeze in place before Vitek says, "He did what?" Niko suddenly stands up then begins sprinting toward the door when Vasily shoulder tackles him into the wall, slamming him against it. Roman tries to help Niko when Dan stands in front of him, blocking him from interfering. Roman punches Dan in the face, sending him recoiling back before Vasily returns the punch, staggering Roman as Dan tackle him to the ground.' 
 		

locations/NikoSlut.qsrc

@@ -87,6 +87,7 @@ if $ARGS[0] = 'Customer 1':
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/1/bjcum2.jpg"></center>'
 				'You continue sucking his dick as he groans then begins cumming in your mouth. You begin swallowing every drop of the man''s cum, not wanting to disappoint hi while enjoying the creamy texture and wamth of his cum as it slides down your throat. After the man is finished, he looks down to you and says, "Wow you actually swallowed it. Thank you girl, that was really sexy." He then puts his pants back on and leaves the restroom.'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Biker'
 				gs 'arousal', 'anal', 5, 'dom'
 				gs 'arousal', 'end'
@@ -217,6 +218,7 @@ if $ARGS[0] = 'Customer 2':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow7.mp4"></video></center>'
 				'He begins squirming almost immediately then groans as he fills you mouth with his cum. <font color=#FF00FF>Wow, he came so quickly. Touching on my body must have really turned him on.</font> The man fully milks his dick in your mouth before pulling up his pants then saying, "Damn girl, you really got me off quickly. Great work." He then walks back into the diner as Niko approaches you. "Are you ready for another customer, or would you like to clean up first?"'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Trucker'
 				gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 				gs 'arousal', 'end'
@@ -460,6 +462,7 @@ if $ARGS[0] = 'Customer 4':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow7.mp4"></video></center>'
 				'You start rapidly licking and sucking his dick when you hear him moan as he begins filling your mouth with his warm seed which you swallow every drop of, knowing that it will please him. The man looks down to you and says, "You are a good little slut. I will definitely be having you again." The man then pulls his pants up then walks back into the diner. Niko approaches you then says, "Are you ready, for another customer, or would you like to wash up first?"'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Biker'
 				gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 				gs 'arousal', 'end'
@@ -559,6 +562,7 @@ if $ARGS[0] = 'Customer 5':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow6.mp4"></video></center>'
 				'You begin stroking the shaft of his penis while continuing to suck until you hear the moan lean back as his penis begins throbbing in your mouth, filling your mouth with his warm seed. You spend a few seconds using your tongue to play with his cum before finally swallowing it. The trucker looks down to you and says, "You are great at that. Thank you young lady. I really enjoyed that." He then buttons his pants before heading back inside. Niko then walks up to you and says, "Are you ready for another customer, or would you like to clean up first?"'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Keith'
 				gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 				gs 'arousal', 'end'
@@ -705,6 +709,8 @@ if $ARGS[0] = 'Customer 6':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/throat/3.mp4"></video></center>'
 					'The man shoves his penis in your mouth then forces you to gag on his dick while he fucks your throat as you try your best to relax your throat and let him fuck it. You can see in the corner of your eyes Niko approaching the man with an angry look on his face. You wave at him to let him know that you are okay and he relaxes.' 
+					gs 'arousal', 'bj', 5, 'sub'
+					gs 'stat'
 					
 					act 'Make him cum':	
 						*clr & cla
@@ -759,12 +765,16 @@ if $ARGS[0] = 'Customer 6':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/throat/3.mp4"></video></center>'
 					'The man shoves his penis in your mouth then forces you to gag on his dick while he fucks your throat as you try your best to relax your throat and let him fuck it. You can see in the corner of your eyes Niko approaching the man with an angry look on his face. You wave at him to let him know that you are okay and he relaxes.' 
-
+					gs 'arousal', 'bj', 5, 'sub'
+					gs 'arousal', 'end'				
+					gs 'stat'							
+					
 					act 'Make him cum':	
 						*clr & cla
 						gs'stat'					
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/cum/throat6.mp4"></video></center>'
 						'Suddenly the man groans then begins filling your throat with his warm seed, causing his cum to shoot down your throat. The man takes a second to catch his breath before saying, "You are really good at swallowing cum. I might use you again soon." He then pulls up his pants then walks away. Niko then approaches you and says, "Are you alright? That looked rough." You nod with a smile on your face. Niko then replies, "Good, I hope you are ready for another customer, or would you like to wash up first?"'			
+						swallow += 1
 						gs 'cum_call', 'mouth', 'Trucker'
 						gs 'arousal', 'bj', 5, 'sub'
 						gs 'arousal', 'end'				
@@ -827,6 +837,7 @@ if $ARGS[0] = 'Customer 7':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow3.mp4"></video></center>'
 				'You begin sucking his dick at an increased pace, causing the man to let out occasional grunts. After a few more seconds, the man groans as his hard cock begins throbbing in your mouth, filling your throat with his warm seed which you do your best to swallow every drop of. After the man finishes, he buttons his pants then reaches into his pocket, pulling out his wallet then placing some money in your pocket. "Here is a little tip for you. Buy yourself something nice." You give him a smile as you respond, "Thank you so much." He gives you a wink before escorting you out of the back room.'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Trucker'
 				gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 				gs 'arousal', 'end'
@@ -968,7 +979,7 @@ if $ARGS[0] = 'Customer 8':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow4.mp4"></video></center>'
 					'After a few more seconds, the man groans as his penis begins throbbing in your mouth, filling it with his warm seed which you let slide down your throat and into your belly. The man takes a few seconds to catch his breath before saying, "You were outstanding <<$NikoSlutName>>. I look forward to seeing you again soon." He then buttons his pants before leaving the restroom.'
-
+					swallow += 1
 					gs 'cum_call', 'mouth', 'Trucker'
 					gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 					gs 'arousal', 'end'
@@ -1099,6 +1110,7 @@ if $ARGS[0] = 'Customer 9':
 				gs'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum1.mp4"></video></center>'
 				'You wrap you lips around the truckers dick, evoking a moan from him. You begin sucking his dick while massaging his cock with your tongue, enjoying the warmth of his penis in your mouth. After a minute, the trucker groans as he begin pumping his seed into your mouth which you lets slide down your throat, feeling the sting as it goes down into your belly. The trucker catches his breath then says, "You are a really good cocksucker. I will definitely be calling for your services again." He then buttons his pants before leaving the restroom.'
+				swallow += 1
 				gs 'cum_call', 'mouth', 'Trucker'
 				gs 'arousal', 'bj', 5, 'sub', 'prostitution'
 				gs 'arousal', 'end'
@@ -1232,7 +1244,7 @@ if $ARGS[0] = 'Biker Attack':
 		*clr & cla
 		minut += 5
 		gs'stat'
-		'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+		'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 		*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 		'You punch the biker as hard as you can, but he barely reacts before turning to you and smacking you with the back of his hand. You look in horror as Niko''s squirming is ceasing. You scream out, "STOP IT! YOU''RE KILLING HIM!!!" The biker turns to you then smirks as he replies, "Am I?" He then shrugs, obviously not caring if he kills Niko. You charge at the biker again, trying one last time to save Niko when you are suddenly grabbed from behind then pulled back as the one who grabbed you, charges past, ramming his fist into the bikers face, sending him falling onto the floor. The man then climbs on top of the biker and begins repeatedly punching the biker while shouting. "HOW DARE YOU TOUCH MY BROTHER! YOU WORTHLESS SACK OF SHIT! I WILL FUCKING TEAR YOU APART!"'
 

locations/NikoWhore.qsrc

@@ -39,6 +39,7 @@ if $ARGS[0] = 'Locker Room':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/swallow3.mp4"></video></center>'
 					'Niko begins lightly moaning before grabbing onto your hair then pushing his cock down your throat, filling your throat with his warm cum. You enjoy the warm feeling of his cum entering your throat and the rapid throbbing of his penis as it pumps your throat with his seed.' 
+					swallow += 1
 					gs 'cum_call', 'mouth', 'A189', 1
 					gs 'arousal', 'bj', 5, 'sub'
 					gs 'arousal', 'end'
@@ -55,7 +56,7 @@ if $ARGS[0] = 'Locker Room':
 						act 'Try to remove cuffs':
 							*clr & cla
 							gs'stat'
-							'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+							'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 							*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 							'You squirm for a few seconds, attempting to free yourself from the cuffs. <font color=#FF00FF>Where did Niko go? Did he forget to uncuff me? Maybe he just left to wash his hands before untying me. He wouldn''t forget about me. I just need to wait patiently, for him to return.</font> You spend the next few minutes trying to get comfortable until you hear the locker room door open. You quickly look up in excitement. <font color=#FF00FF>I knew that Niko wouldn''t forget me.</font> but as you look up...'
 							gs 'arousal', 'flash', 2, 'sub', 'humiliation'
@@ -160,6 +161,7 @@ if $ARGS[0] = 'Locker Room':
 																'Vitek: That sounds like a great idea. <<$pcs_firstname>> looks like a overgrown pig, but we can always fuck her from behind. Alright let''s do it. Hey <<$pcs_firstname>>, you''re coming with us.'
 															end
 														end	
+														swallow += 1
 														gs 'cum_call', 'mouth', 'A9', 1
 														gs 'arousal', 'bj', 5, 'sub'
 														gs 'boyStat', 'A11'
@@ -180,7 +182,7 @@ if $ARGS[0] = 'Locker Room':
 																*clr & cla
 																inhib_exp += 2
 																gs'stat'
-																'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+																'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 																*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'										
 																'Your heart is pounding and you can feel tears streaming down your eyes. <font color=#FF00FF>I''m going to lose everything. My life will never be the same again. Please let this be a bad dream. PLEEEEEEASE!</font> You close your eyes, trying to wake up when you hear the sounds of chatting and laughter, informing you that you are passing the cafeteria.'
 																*nl
@@ -339,7 +341,7 @@ if $ARGS[0] = 'Exposed':
 		inhib_exp += 5
 		gs 'boyStat', 'A154'
 		gs'stat'
-		'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+		'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 		*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 		'You reach the stairwell and Vitek shouts out, "Hey boys! Look who has decided to join Sonia as the school whore! <<$pcs_firstname>> <<$pcs_lastname>>!" The gopniks get noticeably excited as they begin talking to each other.'
 		if hotcat >= 6:
@@ -617,6 +619,7 @@ if $ARGS[0] = 'Locker Room 2':
 												gs'stat'					
 												'<center><video autoplay loop src="images\shared\sex\cum\mouth\cum1,3.mp4"></video></center>'
 												'You obediently  open you mouth as Valentin grabs you head then holds it to his dick before jerking off then shooting his load onto your tongue. You keep your mouth open accepting his cum inside as you swallow it as quickly as you can to make room for more. The taste is horrible but you know that you have no choice. After Valentin fully drains his cock into your mouth he then brushes your cheek and says, "That''s how you do it <<$pcs_nickname>>." He then zips up his pants and walks out of the locker room, leaving you on the floor.'
+												swallow += 1
 												gs 'cum_call', 'mouth', 'A158', 1
 												gs 'arousal', 'bj', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 												gs 'stat'	
@@ -645,7 +648,7 @@ if $ARGS[0] = 'Locker Room 2':
 															*clr & cla
 															minut -= 5
 															gs'stat'
-															'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+															'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 															*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 															'You can feel all of your energy sapped, your will... Broken as you lay there in silence with the boys moving closer. You take this moment of silence to think to yourself, <font color=#FF00FF>So this is my life now. What did I do to deserve this? Why is this happening to me? This can''t be real.</font> Tears begin streaming down your cheeks as you hear footsteps. You look up to see Artem, Petka and Petia standing over you.'
 															*nl
@@ -692,7 +695,7 @@ if $ARGS[0] = 'Locker Room 2':
 																		act '...':
 																			*clr & cla
 																			gs'stat'
-																			'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+																			'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 																			*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 																			'You can feel your consciousness fading in and out. You can hear some words but they too seem to fade in and out... "You''ll be a star <<$pcs_nickname>>. An even bigger whore than Sonia."... "Well you look all tuckered out. Had a good time?"... "I think we broke our new toy."... "It looks like she passed out... Too much fun maybe."...'
 																			'Then you hear footsteps as they leave the room and everything starts to fade until you hear... "How could they do this to her?"..."Aww wow, she looks... Sticky."..."It''s not the time for jokes Vicky! We need to do something! We can''t just leave her like this!"...'
@@ -740,7 +743,7 @@ if $ARGS[0] = 'Walk Of Shame':
 			*clr & cla
 			minut += 5
 			gs'stat'
-			'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+			'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 			*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 			'<font color=#FF00FF>Maybe Roman can help me out, he is being nice to me when he doesn''t have to.</font> You meekly nod to the boy and his eyes light up as he replies, "Great! let''s get going." He then grabs your arm and guides you to the restroom.'
 
@@ -842,6 +845,7 @@ if $ARGS[0] = 'Walk Of Shame':
 															gs'stat'
 															'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1.11.mp4"></video></center>'
 															'You continue sucking Niko''s dick firmly while staring into his eyes, enjoying the pleased look that he is giving you which shows you that you are doing a good job. Suddenly Niko''s eyes squint as he groans, filling your mouth with his warm seed which you swallow eagerly, enjoying the warmth of it sliding down your throat and even the sting as it goes down. Niko places his hand on your cheek, gently stroking it with his thumb as he says, "You are so perfect <<$pcs_firstname>>. I am so lucky to have you and don''t worry, I will find a way to fix what happened yesterday. Meet me after school and we will go out on a nice walk. We''ll discuss what to do next then." Niko kisses you on your forehead before zipping his pants then leaving the restroom.'
+															swallow += 1
 															gs 'cum_call', 'mouth', 'A189', 1
 															gs 'arousal', 'bj', 5, 'sub'
 															gs 'arousal', 'end'
@@ -938,7 +942,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 		NikoEv = 11
 		minut += 5
 		gs'stat'
-		'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
+		'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 		*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 		'You let out your tears, submitting to your own sorrow while answering your own question in your head. <font color=#FF00FF>No matter what happens, Nikolai will be here for me, He is the only one who cares for me. I need you Niko. Please don''t leave me...Please!</font>' 
 

locations/Nudelake.qsrc

@@ -98,7 +98,7 @@ if $clothingworntype = 'nude':
 		gs 'underwear', 'wear'
 	end
 else
-	act 'Return to the main beach':gt 'lake', 'start'
+	act 'Return to the main beach':gt 'city_lake', 'start'
 end
 
 if katday ! daystart and npc_rel['A219'] >= 1 and temper >= 15:

locations/ParChurch.qsrc

@@ -209,11 +209,11 @@ if $ARGS[0] = 'vigil':
 	PLAY 'sound/church/Blessing.mp3',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(1,5) +'.jpg"></center>'
 	'You attend the vigil and reflect on the recent events in your life. The harmonies as the hymns and psalms are sung sweep aside some of the worries in your heart, although you know they will return once you leave this holy place, you still enjoy the rest. The sweet scent of incense tickles your nose and reminds you of the scent of' + iif(rex_love = 1, 'Rex', 'your step-father') + '''s cologne.'
-	if pav_slut >= 125:
+	if pav_slut >= 250:
 		'Most of the parishioners seem upset that you are here. You notice that parents are making sure their children don''t go near you. Even a couple of the acolytes glare at you angrily.'
-	elseif pav_slut >= 100:
+	elseif pav_slut >= 200:
 		'A number of poeple give you dirty looks and intentionally turn away from you whenever you make eye contact.'
-	elseif pav_slut >= 75:
+	elseif pav_slut >= 150:
 		'You notice some of the old women looking at you with disapproval and one or two of the old men looking at you with interest.'
 	end
 	gs 'stat'
@@ -249,12 +249,12 @@ if $ARGS[0] = 'liturgy':
 	gs 'themes', 'indoors'
 	PLAY 'sound/church/t' + rand(1,19) + '.mp3',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(1,8) +'.jpg"></center>'
-	if pav_slut < 75 and Conf_Kirill <= 1:
+	if pav_slut < 150 and Conf_Kirill <= 1:
 		pcs_mood += 20
 		church_moral += 2
 		pcs_sleep += 5
 		'You join the congregation for the Divine Liturgy. You see mostly older people, but there are some youngsters. You participate in the singing but that is about all. Your presence seems to go largely unnoticed, but you have the chance to rest a bit. You feel a lot better.'
-	elseif pav_slut < 75 and Conf_Kirill >= 2:
+	elseif pav_slut < 150 and Conf_Kirill >= 2:
 		Kirill += 1
 		pcs_mood += 20
 		church_moral += 2

locations/Peterroom.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start_door':
 	act 'Leave':
 		cla
 		minut += 5
-		gt 'down'
+		gt 'city_center'
 	end
 
 	act 'Ring the doorbell':
@@ -35,7 +35,7 @@ if $ARGS[0] = 'start_door':
 			act 'Leave':
 				cla
 				minut += 5
-				gt 'down'
+				gt 'city_center'
 			end
 		end
 	end
@@ -127,7 +127,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		act 'Leave':gt 'down'
+		act 'Leave':gt 'city_center'
 	end
 end
 
@@ -201,11 +201,11 @@ if $ARGS[0] = 'end':
 			
 		act 'To the center':
 			gs 'arousal', 'end'
-			gt 'down'
+			gt 'city_center'
 		end
 		act 'The house':
 			gs 'arousal', 'end'
-			gt 'street'
+			gt 'city_residential'
 		end
 	end
 end

locations/Prostitute.qsrc

@@ -196,7 +196,7 @@ if $ARGS[0] = 'start':
 	act 'Go back to the park':
 		cla
 		minut += 5
-		gt 'park', 'start'
+		gt 'city_park', 'start'
 	end
 end
 

locations/RynokHoz.qsrc

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

locations/Snpc.qsrc

@@ -38,7 +38,7 @@ gs 'cumreaction'
 if grupTipe[numnpc] = 5 and grupTipe ! 5:
 	gs 'willpower', 'humiliation', 'force', 'easy'
 	if will_cost <= pcs_willpwr:
-		if pav_slut < 50:
+		if pav_slut < 100:
 			act 'Mock (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'force'
 				cls
@@ -95,7 +95,7 @@ end
 !!!!!!!!!!!!!
 if npc_grupTipe['A<<numnpc>>'] = 4:
 	if $loc = 'gdkin':
-		if pav_slut < 150:
+		if pav_slut < 300:
 			if numnpc ! 9:
 				if npc_gender['A<<numnpc>>'] = 0:
 					'<<$npc_firstname[''A<<numnpc>>'']>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
@@ -116,7 +116,7 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 					act 'Move away':gt $loc, $metka
 				end
 			end
-		elseif pav_slut >= 150:
+		elseif pav_slut >= 300:
 			if npc_gender['A<<numnpc>>'] = 0:
 				'<<$npc_firstname[''A<<numnpc>>'']>> looks at you wearily: "What do you want? Looking for a dick to suck on or something?"'
 			else
@@ -205,7 +205,7 @@ if numnpc = 23:
 	if albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0:
 		'Albina offers you a friendly smile and says: "<<$pcs_nickname>>, you''re progressing very well in your training. Don''t forget to keep attending!"'
 
-		if pav_slut >= 125:'By the way, some people are telling some pretty disgusting rumours about you.'
+		if pav_slut >= 250:'By the way, some people are telling some pretty disgusting rumours about you.'
 	end
 
 	if artemIzdev = 1:
@@ -307,14 +307,14 @@ if numnpc = 2:
 
 			npc_rel['A<<numnpc>>'] += 5
 
-			if pav_slut < 125: artemLernQW = 1
+			if pav_slut < 250: artemLernQW = 1
 
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 125:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
-			if pav_slut >= 125:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged: "Bah... the school whore needs my help? I don''t think so."'
+			if pav_slut < 250:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
+			if pav_slut >= 250:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged: "Bah... the school whore needs my help? I don''t think so."'
 
 			if $loc ! 'gdkin':
 				act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -352,8 +352,8 @@ if numnpc = 12:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
-			if pav_slut >= 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
+			if pav_slut < 250:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
+			if pav_slut >= 250:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
 			if $loc ! 'gdkin':
 				act' Leave': xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -533,8 +533,8 @@ if numnpc = 16:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 125:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
-			if pav_slut >= 125:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
+			if pav_slut < 250:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
+			if pav_slut >= 250:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else

locations/Vika.qsrc

@@ -3,7 +3,7 @@
 vikaAge = age + 1
 gs'stat'
 '<center><B><font color=maroon>Vika Kirilova</font></B></center>'
-'<center><img <<$set_imgh>> src="images/characters/city/university/head/vika.jpg" ></center>'
+'<center><img <<$set_imgh>> src="images/pc/npc_headshots/vika.jpg" ></center>'
 'Your university roommate is Vika Kirilova. She is <<vikaAge>> years old. She came to from a town much further away than you did, like you Vika comes from a poor family. You don''t really know much more about her yet.'
 if vikaslut = 1: 'You know Vika works as a whore in a brothel in the city central area.'
 

locations/Voltrener.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'talk':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
 				gs 'stat'
-				if pav_slut <= 25:
+				if pav_slut <= 50:
 					if trenerSex = 1:
 						volleysostav = 1
 						'You ask the coach about joining the team, he smiles and says, "<<$pcs_nickname>>, honey. I can do that, but you''ll have to start as a sub or people might be suspicious."'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'talk':
 							act 'Leave':gt 'gdksport', 'start'
 						end
 					end
-				elseif pav_slut > 75:
+				elseif pav_slut > 150:
 					'You ask the coach about joining the team. The coach thinks for a minute, "Hey <<$pcs_lastname>>, I hear loads of rumours about you. Such as you being a <<$gnikname>>. Is this true?"'
 					act 'It''s all lies':
 						*clr & cla
@@ -336,7 +336,7 @@ if $ARGS[0] = 'trener_speak':
 	elseif npc_rel['A69'] >= 0 and trener_Speak = 0:
 		trener_Speak += 1
 		'You decided to talk to the coach about how he is rumored to have played on the European championship winning team. But the coach responded painfully to your inquiries and begged you, "<<$pcs_lastname>>, I don''t want to talk about that just to satisfy your curiosity".'
-		if pcs_horny > 80 or pav_slut > 25:
+		if pcs_horny > 80 or pav_slut > 50:
 			npc_rel['A69'] += 2
 			trenerlust += 2
 			'"You don''t want to satisfy my curiosity? How about just satisfying me?" you whispered suggestively. Coach looked uncertainly at you as if he were about to say something but turned away instead.'
@@ -344,14 +344,14 @@ if $ARGS[0] = 'trener_speak':
 	elseif npc_rel['A69'] > 10 and trener_Speak = 1:
 		trener_Speak = 2
 		'Seeing that the subject upset Mikhail, you made attempts to cheer him up. Chirping all sorts of nonsense, you eventually asked if he has a girlfriend or wife. Coach said, "<<$pcs_lastname>> do you have nothing better to do than ask about stuff that doesn''t concern you?" You continued to pester him and say that you are very interested. Coach finally gave up and said, "Yes, I have a wife. She is, of course, beautiful and jealous. So if she sees you hanging around me, she''ll try to kill you."'
-		if pcs_horny > 80 or pav_slut > 25:
+		if pcs_horny > 80 or pav_slut > 50:
 			npc_rel['A69'] += 2
 			'"I''m not afraid, and I doubt she is prettier than me." you retort and the coach just smiled at your words.'
 		end
 	elseif npc_rel['A69'] > 20  and trener_Speak = 2:
 		trener_Speak = 3
 		'Studiously avoiding all mention of the European championship, you asked the coach to talk about volleyball. He told you that being a competitive player means being focused. Responsible players do not go to dances and guzzle booze right before competitions. You were hoping to hear something more interesting, and instead got a lecture about the grass was greener and the trees above, yada yada.'
-		if pcs_horny > 80 or pav_slut > 25:
+		if pcs_horny > 80 or pav_slut > 50:
 			npc_rel['A69'] += 3
 			'Quickly bored, you decided to interrupt his monologue with a bit of provocative action.'
 		end

locations/VoltrenerSexShower.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = '1':
 		act 'Finish shower': gt 'gdksport', 'start'
 	end
 	gs 'willpower', 'exhib', 'self', 'easy'
- 	if (pcs_horny >= 60 or pav_slut > 25) and will_cost <= pcs_willpwr:
+ 	if (pcs_horny >= 60 or pav_slut > 50) and will_cost <= pcs_willpwr:
 		act 'Carry on (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'self'
 			npc_rel['A69'] += 2
@@ -55,7 +55,7 @@ if $ARGS[0] = '1':
 				act 'Finish shower': gt 'gdksport', 'start'
 			end
 		end
-	elseif (pcs_horny >= 60 or pav_slut > 25) and will_cost > pcs_willpwr:
+	elseif (pcs_horny >= 60 or pav_slut > 50) and will_cost > pcs_willpwr:
 		act 'Carry on (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
@@ -71,7 +71,7 @@ if $ARGS[0] = '2':
 		act 'Leave':gt 'gdksport', 'start'
 	end
 	gs 'willpower', 'exhib', 'self'
-	if (pcs_horny >= 70 or pav_slut > 25) and will_cost <= pcs_willpwr:
+	if (pcs_horny >= 70 or pav_slut > 50) and will_cost <= pcs_willpwr:
 		act 'Masturbate (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'self'
 			if IvanShowerYes = 2: VoltrenerVoyeur += 1
@@ -95,7 +95,7 @@ if $ARGS[0] = '2':
 				act 'Finish shower': gt 'gdksport', 'start'
 			end
 		end
-	elseif (pcs_horny >= 70 or pav_slut > 25) and will_cost > pcs_willpwr:
+	elseif (pcs_horny >= 70 or pav_slut > 50) and will_cost > pcs_willpwr:
 		act 'Masturbate (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end

locations/Voltrenersex.qsrc

@@ -58,9 +58,9 @@ if $ARGS[0] = 'talk':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex2.jpg"></center>'
 		'Vigorously shaking his head, Mikhail Nikolaevich closes the door. The coach turns to you and doesn''t say a word, grabs you and begins to lift up your shirt. He starts to paw at your <<$titsize>> breasts.'
-		if guy < 3 and pav_slut <= 25: 'You squeaked indignantly and pulled your shirt back down and ran out of the office. Although you can not say that the actions of the coach were so unpleasant. But you are not ready for such things.'	
-		if (guy >= 3 and guy < 7) or pav_slut > 25: 'You stand and wait until the coach is done playing with your breasts.'
-		if guy >= 7  or pav_slut > 50:
+		if guy < 3 and pav_slut <= 50: 'You squeaked indignantly and pulled your shirt back down and ran out of the office. Although you can not say that the actions of the coach were so unpleasant. But you are not ready for such things.'	
+		if (guy >= 3 and guy < 7) or pav_slut > 50: 'You stand and wait until the coach is done playing with your breasts.'
+		if guy >= 7  or pav_slut > 100:
 			killvar 'volleytanga'
 			'Knowing what the coach wants from you, you pull up your shirt exposing your bare breasts and drawing his strong hands to them. Coach inspired by your actions with obvious pleasure kneads your breasts with his hands. "I go to shower, and here is how boring", - You say you are looking at the challenge of the coach.'
 			!! volleytanga cleared to end the coach without panties gdksport events

locations/WorkHosp.qsrc

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

locations/_attrib_shoe_trainers.qsrc

@@ -116,6 +116,10 @@ elseif ARGS[1] = 29:
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+elseif ARGS[1] = 30:
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 1
 end
 
 --- $attrib_shoe_trainers ---------------------------------

locations/_attributes_average.qsrc

@@ -3362,6 +3362,66 @@ elseif ARGS[1] = 529:
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 2
+elseif ARGS[1] = 530:
+	CloQuality = 4
+	CloThinness = 1
+	CloTopCut = 1
+	CloSkirtShortness = 3
+elseif ARGS[1] = 531:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 3
+elseif ARGS[1] = 532:
+	CloQuality = 3
+	CloThinness = 1
+	CloTopCut = 1
+	CloSkirtShortness = 3
+elseif ARGS[1] = 533:
+	CloQuality = 4
+	CloThinness = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 534:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 4
+	CloPantsShortness = 1
+elseif ARGS[1] = 535:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 2
+	CloSkirtShortness = 4
+elseif ARGS[1] = 536:
+	CloQuality = 4
+	CloThinness = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 537:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 3
+elseif ARGS[1] = 538:
+	CloQuality = 3
+	CloThinness = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 539:
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 3
+elseif ARGS[1] = 540:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 541:
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloPantsShortness = 1
 end
 
 --- $attributes_average ---------------------------------

locations/_attributes_cheap.qsrc

@@ -2567,6 +2567,26 @@ elseif ARGS[1] = 415:
 	CloTopCut = 4
 	CloSkirtShortness = 3
 	CloExhibit = 15
+elseif ARGS[1] = 416:
+	CloQuality = 2
+	CloThinness = 4
+	CloTopCut = 2
+	CloPantsShortness = 4
+elseif ARGS[1] = 417:
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloPantsShortness = 1
+elseif ARGS[1] = 418:
+	CloQuality = 2
+	CloThinness = 5
+	CloTopCut = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 419:
+	CloQuality = 2
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 5
 end
 
 --- $attributes_cheap ---------------------------------

locations/_attributes_coat.qsrc

@@ -2,42 +2,64 @@
 
 if ARGS[1] = 1:
 	CloQuality = 5
+	CloWarm = 1
 elseif ARGS[1] = 2:
 	CloQuality = 2
+	CloWarm = 1
 elseif ARGS[1] = 3:
 	CloQuality = 5
+	CloWarm = 1
 elseif ARGS[1] = 4:
 	CloQuality = 6
+	CloWarm = 2
 elseif ARGS[1] = 5:
 	CloQuality = 1
+	CloWarm = 2
 elseif ARGS[1] = 6:
 	CloQuality = 4
+	CloWarm = 3
 elseif ARGS[1] = 7:
 	CloQuality = 3
+	CloWarm = 3
 elseif ARGS[1] = 8:
 	CloQuality = 4
+	CloWarm = 2
 elseif ARGS[1] = 9:
 	CloQuality = 5 
+	CloWarm = 3
 elseif ARGS[1] = 10:
 	CloQuality = 5
+	CloWarm = 2
 elseif ARGS[1] = 11:
 	CloQuality = 6
+	CloWarm = 3
 elseif ARGS[1] = 12:
 	CloQuality = 6
+	CloWarm = 2
 elseif ARGS[1] = 13:
 	CloQuality = 5
+	CloWarm = 2
 elseif ARGS[1] = 14:
 	CloQuality = 5
+	CloWarm = 2
 elseif ARGS[1] = 15:
 	CloQuality = 6
+	CloWarm = 3
 elseif ARGS[1] = 16:
 	CloQuality = 4
+	CloWarm = 2
 elseif ARGS[1] = 17:
 	CloQuality = 5
+	CloWarm = 2
 elseif ARGS[1] = 18:
 	CloQuality = 6
+	CloWarm = 2
 elseif ARGS[1] = 19:
 	CloQuality = 4
+	CloWarm = 2
+elseif ARGS[1] = 20:
+	CloQuality = 3
+	CloWarm = 2
 end
 
 --- $attributes_coat ---------------------------------

locations/_attributes_exercise.qsrc

@@ -577,7 +577,166 @@ elseif ARGS[1] = 113:
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 1
-
+elseif ARGS[1] = 114:
+	CloQuality = 3
+	CloThinness = 5
+	CloBra = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 115:
+	CloQuality = 3
+	CloThinness = 5	
+	CloBra = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 116:
+	CloQuality = 3
+	CloThinness = 5
+	CloBra = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 117:
+	CloQuality = 2
+	CloThinness = 5
+	CloBra = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 118:
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 119:
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 120:
+	CloQuality = 2
+	CloThinness = 5	
+	CloBra = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 121:
+	CloQuality = 4
+	CloThinness = 4
+	CloBra = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 122:
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 123:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 124:
+	CloQuality = 3
+	CloThinness = 3	
+	CloBra = 1
+	CloPantsShortness = 4
+elseif ARGS[1] = 125:
+	CloQuality = 3
+	CloThinness = 3
+	CloBra = 1
+	CloPantsShortness = 3
+elseif ARGS[1] = 126:
+	CloQuality = 3
+	CloThinness = 3
+	CloBra = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 127:
+	CloQuality = 4
+	CloThinness = 3
+	CloBra = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 128:
+	CloQuality = 4
+	CloThinness = 3
+	CloBra = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 129:
+	CloQuality = 2
+	CloThinness = 4
+	CloBra = 1
+	CloPantsShortness = 3
+elseif ARGS[1] = 130:
+	CloQuality = 4
+	CloThinness = 3
+	CloBra = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 131:
+	CloQuality = 5
+	CloThinness = 3
+	CloBra = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 132:
+	CloQuality = 3
+	CloThinness = 3
+	CloBra = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 133:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 134:
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 3
+	CloPantsShortness = 1
+elseif ARGS[1] = 135:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 2
+	CloPantsShortness = 5
+elseif ARGS[1] = 136:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 2
+	CloPantsShortness = 1
+elseif ARGS[1] = 137:
+	CloQuality = 3
+	CloThinness = 2
+	CloBra = 1
+	CloSkirtShortness = 4
+elseif ARGS[1] = 138:
+	CloQuality = 3
+	CloThinness = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 139:
+	CloQuality = 3	
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 140:
+	CloQuality = 2
+	CloThinness = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 141:
+	CloQuality = 2
+	CloThinness = 1
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 142:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 143:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 144:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 145:
+	CloQuality = 3
+	CloThinness = 1	
+	CloTopCut = 1
+	CloPantsShortness = 1
 end
 
 --- $attributes_exercise ---------------------------------

locations/_attributes_expensive.qsrc

@@ -2448,6 +2448,99 @@ elseif ARGS[1] = 425:
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
+elseif ARGS[1] = 426:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 3
+elseif ARGS[1] = 427:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 3
+elseif ARGS[1] = 428:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 3
+elseif ARGS[1] = 429:
+	CloQuality = 5
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 430:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 1
+	CloSkirtShortness = 3
+elseif ARGS[1] = 431:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 4
+elseif ARGS[1] = 432:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 4
+elseif ARGS[1] = 433:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloPantsShortness = 4
+elseif ARGS[1] = 434:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 3
+	CloPantsShortness = 4
+	CloOnePiece = 1
+elseif ARGS[1] = 435:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 436:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 437:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 438:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloPantsShortness = 4
+elseif ARGS[1] = 439:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+elseif ARGS[1] = 440:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 3
+	CloDress = 1
+elseif ARGS[1] = 441:
+	CloQuality = 5
+	CloThinness = 3
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+elseif ARGS[1] = 442:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 1
+	CloDress = 1
 end
 
 --- $attributes_expensive ---------------------------------

locations/_attributes_office.qsrc

@@ -532,6 +532,141 @@ elseif ARGS[1] = 101:
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
+elseif ARGS[1] = 102:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 103:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 104:
+	CloQuality = 4
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 1
+elseif ARGS[1] = 105:
+	CloQuality = 5
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 106:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 107:
+	CloQuality = 2
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 108:
+	CloQuality = 5
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 109:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 110:
+	CloQuality = 5
+	CloThinness = 2	
+	CloTopCut = 1	
+	CloSkirtShortness = 2
+elseif ARGS[1] = 111:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 1
+elseif ARGS[1] = 112:
+	CloQuality = 2
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 113:
+	CloQuality = 2
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 114:
+	CloQuality = 4
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 115:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 116:
+	CloQuality = 4
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 2
+elseif ARGS[1] = 117:
+	CloQuality = 4
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 118:
+	CloQuality = 4
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 119:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 120:
+	CloQuality = 2
+	CloThinness = 2
+	CloTopCut = 1
+	CloPantsShortness = 2
+elseif ARGS[1] = 121:
+	CloQuality = 3
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 122:
+	CloQuality = 3
+	CloThinness = 1
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 123:
+	CloQuality = 3
+	CloThinness = 1
+	CloTopCut = 1
+	CloPantsShortness = 2
+elseif ARGS[1] = 124:
+	CloQuality = 4
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 125:
+	CloQuality = 5
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 126:
+	CloQuality = 5
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 127:
+	CloQuality = 5
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
+elseif ARGS[1] = 128:
+	CloQuality = 4
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 2
 end
 
 --- $attributes_office ---------------------------------

locations/_attributes_swimwear.qsrc

@@ -1072,6 +1072,297 @@ elseif ARGS[1] = 158:
 	CloPanties = 1
 	CloInhibit = 20
 	CloTopCut = 3
+elseif ARGS[1] = 159:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 160:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 161:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 162:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 163:
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 164:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3	
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 165:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 166:
+	CloOnePiece = 1
+	CloInhibit = 20
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 167:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 168:
+	CloOnePiece = 1
+	CloInhibit = 10
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 169:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 170:
+	CloOnePiece = 1
+	CloInhibit = 10
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 171:
+	CloOnePiece = 1
+	CloInhibit = 10
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 172:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 173:
+	CloOnePiece = 1
+	CloInhibit = 25
+	CloQuality = 2
+	CloThinness = 3	
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 174:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 1
+	CloPantsShortness = 5
+elseif ARGS[1] = 175:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 176:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloTopCut = 3
+elseif ARGS[1] = 177:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 178:
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 179:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 180:
+	CloOnePiece = 1
+	CloInhibit = 30
+	CloQuality = 2
+	CloThinness = 4
+	CloTopCut = 1
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 181:
+	CloOnePiece = 1
+	CloInhibit = 30
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 182:
+	CloOnePiece = 1
+	CloInhibit = 30
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 183:
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 184:
+	CloOnePiece = 1
+	CloInhibit = 10	
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 185:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 186:
+	CloOnePiece = 1
+	CloInhibit = 30
+	CloQuality = 1
+	CloThinness = 3
+	CloTopCut = 4
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 187:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3	
+	CloTopCut = 1
+	CloPanties = 1
+elseif ARGS[1] = 188:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3	
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 189:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 190:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 191:
+	CloOnePiece = 1	
+	CloInhibit = 5
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 192:
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloPanties = 1
+elseif ARGS[1] = 193:
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 194:
+	CloOnePiece = 1
+	CloInhibit = 20
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloBimbo = 1
+	CloPanties = 1
+elseif ARGS[1] = 195:
+	CloOnePiece = 1
+	CloInhibit = 25
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 4
+	CloPanties = 1
+elseif ARGS[1] = 196:
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 197:
+	CloOnePiece = 1
+	CloInhibit = 20
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 198:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 4
+	CloThinness = 1	
+	CloTopCut = 1
+elseif ARGS[1] = 199:
+	CloBra = 1
+	CloPanties = 1
+	CloInhibit = 35
+	CloQuality = 2
+	CloThinness = 5
 end
 
 --- $attributes_swimwear ---------------------------------

locations/_clothing_name.qsrc

@@ -74,7 +74,7 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 68:$RESULT = 'A pink patterned bikini with white strings.'
 	if ARGS[1] = 69:$RESULT = 'A modest black-blue one-piece swimsuit, cut so the fabric shows off nearly all of the thighs in a seductive manner.'
 	if ARGS[1] = 70:$RESULT = 'A very daring light-blue bikini, which fabric is too thin or revealing to cover any private parts.'
-	if ARGS[1] = 71:$RESULT = 'This blue bikini is perfect for any slut and whore out there. Zippers are conveniently placer or the private parts to allow easy access.'
+	if ARGS[1] = 71:$RESULT = 'This blue bikini is perfect for any slut and whore out there. Zippers are conveniently placed over the private parts to allow easy access.'
 	if ARGS[1] = 72:$RESULT = 'Made for all the unashamed whores out there, this bikini is nothing more than a few purple straps and doesn''t even try to cover the private parts.'
 	if ARGS[1] = 73:$RESULT = 'This slutty pink and black monokini just about covers your private parts.'
 	if ARGS[1] = 74:$RESULT = 'Made from a shiny blue material, this monokini barely covers your private parts. Somehow it''s always a tad too small, forcing the fabric, which should cover your vagina, between your labia.'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 108:$RESULT = 'An orange bikini, with yellow straps and a tie strapped thong.'
 	if ARGS[1] = 109:$RESULT = 'A classic light-blue bikini.'
 	if ARGS[1] = 110:$RESULT = 'Made from a shiny pink fabric, this daring bikini is perfect for any aspiring bimbo.'
-	if ARGS[1] = 111:$RESULT = 'A strapless dark blue swimsuit, with white decor around the fabric covering the breast.'
+	if ARGS[1] = 111:$RESULT = 'A strapless dark blue swimsuit, with white décor around the fabric covering the breast.'
 	if ARGS[1] = 112:$RESULT = 'This classic gold-black bikini is made from a shiny fabric, which briefs are held together by two metal rings.'
 	if ARGS[1] = 113:$RESULT = 'A classic black-white patterned bikini, with light green straps. Its thong is held together by tie strings.'
 	if ARGS[1] = 114:$RESULT = 'A silver bikini made from a shiny material, has its thong held together by tie straps.'
@@ -126,7 +126,7 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 120:$RESULT = 'A classic colourful bikini, with tie strapped briefs.'
 	if ARGS[1] = 121:$RESULT = 'A classic colourful bikini.'
 	if ARGS[1] = 122:$RESULT = 'This blue swimsuit got a copper-brown zipper in the front, making it possible to show off quite a cleavage. Additionally the swimsuit shows off the wearers hips, as the sides are open.'
-	if ARGS[1] = 123:$RESULT = 'Black plastic rings hold together is classic all-black bikini.'
+	if ARGS[1] = 123:$RESULT = 'Black plastic rings hold together this classic all-black bikini.'
 	if ARGS[1] = 124:$RESULT = 'This bright pink bikini is perfect for any aspiring bimbo.'
 	if ARGS[1] = 125:$RESULT = 'A classic orange bikini.'
 	if ARGS[1] = 126:$RESULT = 'This dark-blue swimsuits bottom part is cut so, that is shows off the wearers thighs seductively. The fabric covering the breasts is decorated with a white pattern.'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 142:$RESULT = 'A dark green bikini with multiple string sides to the bottoms.'
 	if ARGS[1] = 143:$RESULT = 'A pink string outline of a bikini that shows everything and is pretty much pointless.'
 	if ARGS[1] = 144:$RESULT = 'A blue and white hooped one piece, very nautical.'
-	if ARGS[1] = 145:$RESULT = 'A A cyan, melon and fuschia tie string bikini.'
+	if ARGS[1] = 145:$RESULT = 'A cyan, melon and fuschia tie string bikini.'
 	if ARGS[1] = 146:$RESULT = 'A blue and white short tankini with red detail on the bottoms.'
 	if ARGS[1] = 147:$RESULT = 'A very minimal black bikini that just about covers your dignity.'
 	if ARGS[1] = 148:$RESULT = 'A shiny gold swimsuit with zipper on the front so you can show off your cleavage.'
@@ -162,6 +162,47 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 156:$RESULT = 'A well made choral and black tankini.'
 	if ARGS[1] = 157:$RESULT = 'A basic white bikini.'
 	if ARGS[1] = 158:$RESULT = 'A pale turquoise bikini with an almost tube top and tie string bottoms.'
+	if ARGS[1] = 159:$RESULT = 'A Maillot style, one-piece swimsuit, its simplistic design is balanced out by fashionable print patterns.'
+	if ARGS[1] = 160:$RESULT = 'A blue one-piece swimsuit, it mixes one-shoulder design with transparent meshes on various parts of the body.'
+	if ARGS[1] = 161:$RESULT = 'One-piece, sporty swimsuit with two yellow stripes that emphasize your figure a little.'
+	if ARGS[1] = 162:$RESULT = 'A classic, one-piece black swimsuit, it might not be flirty enough for some.'
+	if ARGS[1] = 163:$RESULT = 'A deep V one-piece black swimsuit with floral print, it shows and entices.'
+	if ARGS[1] = 164:$RESULT = 'A one-piece, cold asymmetrical black swimsuit with cut on the opposite side of the shoulder strap, it''s a rather showy swimsuit.'
+	if ARGS[1] = 165:$RESULT = 'A pink one-piece swimsuit, it shows modest amount of your cleavage.'
+	if ARGS[1] = 166:$RESULT = 'A black one-piece high cut swimsuit with an inviting deep plunge, the design is quite flirty .'
+	if ARGS[1] = 167:$RESULT = 'A one-piece, cold asymmetrical black swimsuit with cut on the strap side, it''s a rather showy swimsuit.'
+	if ARGS[1] = 168:$RESULT = 'A black one-piece swimsuit with jagged-cut and decorated with little gold tubes.'
+	if ARGS[1] = 169:$RESULT = 'An orange one-piece swimsuit, it has a plunge but still overs you very modestly.'
+	if ARGS[1] = 170:$RESULT = 'A blue one-piece swimsuit with a plunge, it shows decent amount of your cleavage.'
+	if ARGS[1] = 171:$RESULT = 'A blue one-piece lacy swimsuit, it''s more for showy display than practical usage.'
+	if ARGS[1] = 172:$RESULT = 'One-piece swimsuit in black, it''s very simple except the modest spacing that tastefully shows your skin.'
+	if ARGS[1] = 173:$RESULT = 'A black bikini with cross strap that resemble one-piece swimsuit, it''s more for show than being practical.'
+	if ARGS[1] = 174:$RESULT = 'An one-piece sporty swimsuit with boyleg-cut, unassuming and highly practical.'
+	if ARGS[1] = 175:$RESULT = 'A peanut coloured one-piece swimsuit, it has a very simplistic, practical design.'
+	if ARGS[1] = 176:$RESULT = 'An one-piece swimsuit in light blue, it has a very simplistic, practical design.'
+	if ARGS[1] = 177:$RESULT = 'A modest one-piece swimsuit with white floral prints.'
+	if ARGS[1] = 178:$RESULT = 'An one-piece swimsuit in iris color, it has a plunge that shows off your cleavage quite nicely.'
+	if ARGS[1] = 179:$RESULT = 'A fashionable one-piece swimsuit in Egyptian blue, it teases yet remain some what functional.'
+	if ARGS[1] = 180:$RESULT = 'Open-piece swimsuit that is actually just lacy & crochet lingerie that can be worn underwater, it shows off your body quite nicely.'
+	if ARGS[1] = 181:$RESULT = 'A high-neck monokini in midnight blue and it is connected tastefully by a strap. More for show, less for actual swimming.'
+	if ARGS[1] = 182:$RESULT = 'A pink cross-strap monokini, it is rather showy and highly impractical, might just be the perfect thing for you?'
+	if ARGS[1] = 183:$RESULT = 'A belted, one-piece, denim colored swimsuit, it looks pretty good despite its price tag.'
+	if ARGS[1] = 184:$RESULT = 'A navy one-piece swimsuit, it has a light and flirty plunge and looks pretty good despite its price tag.'
+	if ARGS[1] = 185:$RESULT = 'A white one-piece swimsuit, it has very simple design and practical. Solid white never goes out of style!'
+	if ARGS[1] = 186:$RESULT = 'A black monokini with deep v plunge, the hallow cuts help to emphasize your body, it''s a conspicuous swimsuit!'
+	if ARGS[1] = 187:$RESULT = 'One-piece swimsuit with boat-neck cut and paradise print, it is fashionable despite its rather conservative.'
+	if ARGS[1] = 188:$RESULT = 'One-piece black swimsuit that looks like 2 pieces, the middle is crochet together, highly showy and not practical at all.'
+	if ARGS[1] = 189:$RESULT = 'A coffee coloured one-piece swimsuit'
+	if ARGS[1] = 190:$RESULT = 'One-piece ruffled swimsuit with a scoop cut in cream, it has some innocent appeal to them...'
+	if ARGS[1] = 191:$RESULT = 'one-piece swimsuit with tasselled halter neckline and lace up front in taupe, it''s stylish and fashionable.'
+	if ARGS[1] = 192:$RESULT = 'A white one-piece swimsuit, it has colorful side-stripes that gives a retro feel to it.'
+	if ARGS[1] = 193:$RESULT = 'A strapless monokini with side-strings in fuscia, it''s very flirty and conspicuous.'
+	if ARGS[1] = 194:$RESULT = 'A crepe coloured, crocheted one-piece swimsuit, its deep plunge shows off your body like you mean business!.'
+	if ARGS[1] = 195:$RESULT = 'A black monokini, it has a very fun and flirty design, it emphasizes your curves a deal.'
+	if ARGS[1] = 196:$RESULT = 'One-piece swimsuit in black, it has scoop neckline and thin shoulder straps to create a curve hugging silhouette.'
+	if ARGS[1] = 197:$RESULT = 'Backless one-piece swimsuit with a deep v plunge, eggplant in color, it''s both practical and fashionable.'
+	if ARGS[1] = 198:$RESULT = 'A chlorine-resistant, training swimsuit, high-leg-height and still manage to look somewhat fashionable!'
+	if ARGS[1] = 199:$RESULT = 'A bikini in the color of the Russian flag, it has a deep v plunge, who says patriotism cannot be sexy?'
 
 elseif $ARGS[0] = 'coat':
 	if ARGS[1] = 1:$RESULT = 'A light jacket offering very little protection from the weather.'
@@ -183,6 +224,7 @@ elseif $ARGS[0] = 'coat':
 	if ARGS[1] = 17:$RESULT = 'A coat with Dalmatian lining (not real fur) offering moderate protection from the weather.'
 	if ARGS[1] = 18:$RESULT = 'A dark red steam-punk classic offering moderate protection from the weather.'
 	if ARGS[1] = 19:$RESULT = 'A bomber jacket offering moderate protection from the weather.'
+	if ARGS[1] = 20:$RESULT = 'A blue puffer jacket with high-neck, it offers moderate protection in the cold months.'
 end
 
 --- $clothing_name ---------------------------------

locations/abduction.qsrc

@@ -564,9 +564,9 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	deodorant = deodorant_bak
 
 	act 'Turn and run the opposite direction':gt 'road'
-	act 'Run left':gt 'Nord'
+	act 'Run left':gt 'city_industrial'
 	act 'Run right':gt 'pavCommercial'
-	act 'Run forward':gt 'lake', 'start'
+	act 'Run forward':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'abdFood':

locations/agentned.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'start':
 		'We are at your service if you decide to <a href="exec:gt ''agentned'',''sell''">sell</a>.'
 	end
 
-	act 'Leave': minut += 5 & gt'down'
+	act 'Leave': minut += 5 & gt 'city_center'
 	
 	act 'View rentals': gt 'agentned', 'rent'
 	act 'View properties for sale': gt 'agentned', 'buy'

locations/anushapt.qsrc

@@ -1272,7 +1272,7 @@ if $ARGS[0] = 'livingroom':
 					'You smile to Eduard. "Hello Mr Konstantinov is Anushka around?"'
 					'A agitated Eduard calls you over. "Call me Ed, but come here <<$pcs_nickname>> I need to ask you about something?"'
 					'You freeze in your tracks as you cautiously reply, "Sure what''s up?"'
-					if pav_slut >= 100:
+					if pav_slut >= 200:
 						'Eduard grunts as he starts to speak, "I''ve heard you and Nush are starting to get quite the reputation around town. Do I need to be worried about the two of you?"'
 						'You squirm a little as he expects an answer...'
 						act 'Tell the truth':

locations/artemEv.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'learn':
 	gs 'stat'
 	!act 'Take a break from studying':gt 'artemhome', 'artemroom'
 	!act 'Talk instead': gt 'artemhome', 'chat'
-	if pav_slut > 100:
+	if pav_slut > 200:
 !!this triggers instead of the two above if pav slut is high enough
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'

locations/artemhome.qsrc

@@ -111,7 +111,7 @@ if $ARGS[0] = 'home':
 				metArtemMom = 1
 				'You stand outside the Chebotarev household, knocking on the door. The door is quickly answered by Artem''s mother, who has a big friendly smile on her face. "Hello can I help you?" She asks.'
 				'You return her smile. "Yes, is Artem home?"'
-				if pav_slut >= 100 or grupTipe = 4:
+				if pav_slut >= 200 or grupTipe = 4:
 					'Her smile falters a bit. "Oh? Are you one of his school friends?"'
 					'You nod. "Yes we go to school together."'
 					'"I am Glinina, Artem''s mom. What''s your name?"'
@@ -144,7 +144,7 @@ if $ARGS[0] = 'home':
 				if artlie = 2 or artembrokenheart = 1 or artemblok = 1:
 					'You stand outside the Chebotarev household, knocking on the door. The door is quickly answered by Artem''s mother, who has a big friendly smile on her face, until she recognizes you then it turn to a frown, you have never seen her frown before. "Oh, it''s you. I don''t know what you did to my sweet Artem but he says he never wants to see you again. I thought you was such a sweet girl, but he says your not, so please leave." With that she closes the door in your face.'
 					act 'Leave': gt'pod_ezd','etaj_1'
-				elseif pav_slut >= 100 or grupTipe = 4:
+				elseif pav_slut >= 200 or grupTipe = 4:
 					'You stand outside the Chebotarev household, knocking on the door. The door is quickly answered by Artem''s mother, who has a big friendly smile on her face, that falters when she sees you. "Oh, Hello again <<$pcs_firstname>>, can I help you?" She asks.'
 					'You return her smile. "Yes, I''m here to see Artem."'
 					'She doesn''t seem pleased to see you again. "Oh, Well come in then." Then she turns to face down the hall. "Artem dear, ''that girl'' is here to see you again." You can just hear the judgment in her voice when she said that girl, Before turning back to you. "Go on back he is in his room."'
@@ -614,7 +614,7 @@ if $ARGS[0] = 'livingroom':
 			gs 'stat'
 			*clr & cla
 			'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-			if pav_slut >= 100 or grupTipe = 4:
+			if pav_slut >= 200 or grupTipe = 4:
 				'As the two of you walk into the living room he turns towards you, looking a bit appalled at you, "So <<$pcs_firstname>> how did you and my boy become friends?"'
 				'Stretching out your clothes so they cover you up a little, "I don'' really remember. We kinda just connected and started hanging out... It doesn''t hurt that Artem is really hot so that made it much easier." Artem blushes at the comment.'
 				'Masharin squirms a little by your answer, clears his throat and asks, "My boy is very ambitious and we''re very proud of him, we want him to succeed in school. I really hope that he will be able to continue to pursue that because you know, he''s not used to girls like you..."'
@@ -666,7 +666,7 @@ if $ARGS[0] = 'livingroom':
 					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-					if pav_slut >= 100 or grupTipe = 4:
+					if pav_slut >= 200 or grupTipe = 4:
 						'"Didn''t think Artem would still be socializing with you after our talk..." Masharin reacts to seeing you once again...'
 						'"Yeah, well you know how it goes." you nonchalantly answer.'
 						'All of a sudden his posture changes and he slouches back in his chair, "<<$pcs_firstname>>, can''t you find some other boy to toy with, other than my son?"'
@@ -744,7 +744,7 @@ if $ARGS[0] = 'livingroom':
 					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
-					if pav_slut >= 100 or grupTipe = 4:
+					if pav_slut >= 200 or grupTipe = 4:
 						'You barge in without paying any respect to them, "What are the two of you watching?" you ask.'
 						'Startled, they jump to as they turn their attention towards you, "We''re watching the news..." Masharin annoyingly replies.'
 						'"I see, the news is boring as hell to watch, always something depressing on there." you answer back.'
@@ -891,7 +891,7 @@ if $ARGS[0] = 'kitchen':
 			'As you start to enter the kitchen you see Artems mom Glinina busy working away.'
 			act 'Leave':gt 'artemhome','hallway'
 			act 'Talk to her':
-				if pav_slut >= 100 or grupTipe = 4:
+				if pav_slut >= 200 or grupTipe = 4:
 					*clr & cla
 					'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/glinina.jpg"></center>'
 					if metArtemMom = 0:
@@ -1244,7 +1244,7 @@ if $ARGS[0] = 'chat':
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
 !! If Sveta has fallen because of her slut reputation in Pavlovsk
-	elseif artemslutlove = 0 and artsveslut = 0 and artemlove = 1 and pav_slut >= 125 and grupTipe = 5:
+	elseif artemslutlove = 0 and artsveslut = 0 and artemlove = 1 and pav_slut >= 250 and grupTipe = 5:
 !!need code if Sveta is a slut outcast, not sure how to do it since different groups kick Sveta out at different levels of pav slut rep
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk1.jpg"></center>'
 		'You quietly walk past Artem and enter his room. You sit down on the couch, without saying a word.'
@@ -1291,7 +1291,7 @@ if $ARGS[0] = 'chat':
 			'After you gather your things you leave his apartment, ignoring his pleas.'
 			act 'Leave Artem''s apartment':minut += 5 & artemblok = 1 & gt 'pod_ezd','etaj_1'
 		end
-	elseif artdate = 0 and artfall >= 10 and pav_slut < 75 and artemQW['dateask'] ! daystart:
+	elseif artdate = 0 and artfall >= 10 and pav_slut < 150 and artemQW['dateask'] ! daystart:
 		*clr & cla
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
@@ -1315,7 +1315,7 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him, heading for the park.'
 			act 'Walk in the park': gt 'artemdate','firstdate'
 		end
-	elseif artdate > 0 and artdate <= 3 and pav_slut < 75 and artemQW['dateask'] ! daystart:
+	elseif artdate > 0 and artdate <= 3 and pav_slut < 150 and artemQW['dateask'] ! daystart:
 		*clr & cla
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
@@ -1338,7 +1338,7 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him.'
 			act 'Go on a date': gt 'artemdate','artem_date'
 		end
-	elseif artdate = 4 and pav_slut < 100 and artemQW['dateask'] ! daystart:
+	elseif artdate = 4 and pav_slut < 200 and artemQW['dateask'] ! daystart:
 		*clr & cla
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
@@ -1349,7 +1349,7 @@ if $ARGS[0] = 'chat':
 			'"I enjoyed seeing your naked last time, I want you to strip for me again but can you make a bit more of a show of it this time?"'
 		end
 		gs 'artemhome', 'askedstrip'
-	elseif artdate = 5 and pav_slut < 100 and artemQW['dateask'] ! daystart:
+	elseif artdate = 5 and pav_slut < 200 and artemQW['dateask'] ! daystart:
 		artemQW['dateask'] = daystart
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/flowers.jpg"></center>'
@@ -1423,7 +1423,7 @@ if $ARGS[0] = 'chat':
 				act 'Just talk': gt 'artemhome', 'chat'
 			end
 		end
-	elseif artdate >= 6 and artdate <= 8 and pav_slut < 100 and artemQW['dateask'] ! daystart:
+	elseif artdate >= 6 and artdate <= 8 and pav_slut < 200 and artemQW['dateask'] ! daystart:
 		*clr & cla
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
@@ -1456,7 +1456,7 @@ if $ARGS[0] = 'chat':
 		'He smiles at you as he says: "Well, we''ve spent a lot of time dating, I figured it would be nice to make it official."'
 		'You''re still not sold on the idea, and question him further: "Make what official? And where did you get that wine from?"'
 		*nl
-		if pav_slut >= 100 or grupTipe = 4:
+		if pav_slut >= 200 or grupTipe = 4:
 			'Artem reassures you: "Relax, <<$pcs_nickname>>... my parents are leaving to see a friend, I got the wine from my uncle. So please... let''s just sit down and chat?"'
 		else
 			'Artem reassures you: "Relax, <<$pcs_nickname>>... my parents are leaving to see a friend, to give us some privacy. And my mom gave me that wine, to share with you! My parents are very happy I met you, and my mother picked the wine. So please... let''s just sit down and chat?"'

locations/arturQW.qsrc

@@ -1,7 +1,7 @@
 # arturQW
 if $ARGS[0] = 'arturQW_1':
 	menu_off = 1
-	if arturTimes >= 5 and pav_slut >= 25 and pcs_apprnc >= 120:
+	if arturTimes >= 5 and pav_slut >= 50 and pcs_apprnc >= 120:
 		*clr & cla
 		minut += 2
 		gs 'stat'

locations/autosalonF.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'manager1':
 	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, on your bank account.' 
 	'"With how the economy is right now, we can''t accept payment by installments at this time, I''m afraid", he apologizes, "and a few new laws have been passed, too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
 
-	act 'Leave':gt 'Nord'
+	act 'Leave':gt 'city_industrial'
 
 	if karta + bankDebtLimit >= 400000:
 		act 'Buy a Kalina VAZ (400 th.RUB)':
@@ -80,7 +80,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -101,7 +101,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -122,7 +122,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -143,7 +143,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -164,7 +164,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -185,7 +185,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -206,7 +206,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -227,7 +227,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -248,7 +248,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -269,7 +269,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -290,7 +290,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -332,7 +332,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -353,7 +353,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -374,7 +374,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -395,7 +395,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -416,7 +416,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -437,7 +437,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -458,7 +458,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -479,7 +479,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -500,7 +500,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -521,7 +521,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -542,7 +542,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -563,7 +563,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 end

locations/autoservisF.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/carservicesta/autoservis2.jpg"></center>'
 						'Since he tells you that it''s not gonna take long, you go into a waiting or recreation room, with couches and a TV. After about an our of flipping through channels, the car is ready and you pay <<normrem>> <b>₽</b>.'
 
-						act 'Leave': minut += 5 & gt 'Nord'
+						act 'Leave': minut += 5 & gt 'city_industrial'
 					end
 				end
 			end
@@ -59,7 +59,7 @@ if $ARGS[0] = 'start':
 					'The car looks brandnew! Not a single dent, not one scratch, and when you start the engine to make sure it''s working, it sounds better than ever before. You ask the foreman how he and his crew managed to repair the car, and that quickly, but his only response is a shrug.'
 					'Before he sends you back into the office to pay the <<normrem>> <b>₽</b>, he asks you to not bring them cars in this pitiable state anymore - you''re not sure whether he was joking or not.'
 
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -86,7 +86,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave': minut += 5 & gt 'Nord'
+	act 'Leave': minut += 5 & gt 'city_industrial'
 end
 
 --- autoservisF ---------------------------------

locations/autotraidF.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	'- We only sell to people with valid driver''s licenses.'
 	'- New State law: No sale if you already own a car.'
 
-	act 'Leave': minut += 5 & gt 'Nord'
+	act 'Leave': minut += 5 & gt 'city_industrial'
 	
 	if hour <= 17:
 		if car > 0:act 'Ask about selling your car':gt 'autotraidF', 'manager1'
@@ -37,12 +37,12 @@ if $ARGS[0] = 'manager1':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
 	gs 'avb'
 
-	act 'Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
+	act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 	
 	if cardrive = 9 and car > 0:
 		'The shifty-looking salesman circles around your car a couple of times, making exaggerated displeased noises all the while and pointing out practically every speck of dust as if it was a huge damage. When he turns to you, he states that the best he can do is <<bupay>> <b>₽</b> - while he claims that he''s taking a risk with that price, you''re pretty sure he''s ripping you off.'
 
-		act 'No way, not at that price - Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
+		act 'No way, not at that price - Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 		
 		act 'Sell ​your car (<<bupay>> <b>₽</b>) (1:00)':
 			cla
@@ -54,7 +54,7 @@ if $ARGS[0] = 'manager1':
 			'So, as much as you hate it, you give your car one last look before you shake hands with him and follow him into the tiny shed he calls his "office" to sign the papers. He hands you the money in cash and, with a nasty grin, suggests that you look around the yard.' 
 			'"Maybe you see something you like."'
 
-			act 'Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
+			act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 		end
 	elseif cardrive ! 9:
 		'The salesman tells you, his smile sneering rather than friendly, that he needs to look at you car before he can tell you how much it''s worth. "But if you want, I can have somebody tow it here. It only costs 3000 <b>₽</b>. Very cheap!"'
@@ -120,7 +120,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -151,7 +151,7 @@ if $ARGS[0] = 'car':
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
 					'If you want to get the car to a garage, you''ll have to go there and have it towed.'
 					killvar 'bupay'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -182,7 +182,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -213,7 +213,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -244,7 +244,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -275,7 +275,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -307,7 +307,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -339,7 +339,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end

locations/bank.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'start':
 	act 'Leave':
 		minut += 2
 		if bankloc = 1:
-			gt 'down'
+			gt 'city_center'
 		else
 			gt 'pavCommercial'
 		end
@@ -49,7 +49,7 @@ if $ARGS[0] = 'start':
 			act 'Leave':
 				minut += 5
 				if bankloc = 1:
-					gt 'down'
+					gt 'city_center'
 				else
 					gt 'pavCommercial'
 				end

locations/bed2.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = '':
 	end
 
 	if sisterHere = 0 or (sisterHere = 1 and hour < 7):
-		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and pav_slut >= 75) or (pcs_horny > 50 and pav_slut >= 25 and pcs_inhib >= 60):
+		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and pav_slut >= 150) or (pcs_horny > 50 and pav_slut >= 50 and pcs_inhib >= 60):
 			act 'Masturbate':
 				InSleep = 0
 				gt 'selfplay', 'start'

locations/beg1.qsrc

@@ -239,7 +239,7 @@ if $ARGS[0] = '2':
 		bronzebeg += 1 & money += 750 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 750 <b>₽</b>'
 	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 4
-		silverbeg += 1 & money += 1500 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 1,5000 <b>₽</b>'
+		silverbeg += 1 & money += 1500 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 1,500 <b>₽</b>'
 	else
 		gs 'fame', 'city', 'running', 5
 		razradbeg = 3 & goldbeg += 1 & money += 2500 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 2,500 <b>₽</b> and became the "Track Champion of the City of Saint Petersburg", which qualifies you for the next oblast championship!'
@@ -297,7 +297,7 @@ if $ARGS[0] = '1':
 		'You fought hard, but only managed to take 4th place.'
 	elseif begresult < 55:
 		gs 'fame', 'city', 'running', 5
-		bronzebeg += 1 & money += 1500 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 1,5000 <b>₽</b>'
+		bronzebeg += 1 & money += 1500 & 'You fought hard and managed to take 3rd place, earning a prize: You get a bronze medal and a prize of 1,500 <b>₽</b>'
 	elseif begresult < 60:
 		gs 'fame', 'city', 'running', 5
 		silverbeg += 1 & money += 2000 & 'You fought hard and managed to take 2nd place, earning a prize: You get a silver medal and a prize of 2,000 <b>₽</b>'

locations/begin.qsrc

@@ -40,6 +40,8 @@ if $ARGS[0] = 'start':
 		settingmode = 0
 		showstat 0
 		MagikDostup = 1
+		!!blocks the save update for group standings
+		gruptipe[9000] = 1
 		gt 'preSYS', 'SGStart'
 		
 	end

locations/bobka.qsrc

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

locations/body.qsrc

@@ -1337,15 +1337,13 @@ elseif pcs_lip = 3:
 	$lip1 = 'pouting'
 else
 	pcs_lip = 4
-	rand_lips = rand(0,3)
+	rand_lips = rand(0,2)
 	if rand_lips = 0:
-		$pcdesc_lipsrandom = 'plump'
+		$pcdesc_lipsrandom = 'fat'
 	elseif rand_lips = 1:
 		$pcdesc_lipsrandom = 'pillowy'
 	elseif rand_lips = 2:
 		$pcdesc_lipsrandom = 'plush'
-	elseif rand_lips = 3:
-		$pcdesc_lipsrandom = 'fat'
 	end
 	$pcdesc_lips = 'pillowy'
 	$pcdesc_lipswordy = 'plush, pillowy and inviting'

locations/body_shape.qsrc

@@ -63,7 +63,42 @@ if $ARGS[0] = '':
 
 	killvar 'wrtemp'
 
-!!Setting the pcs_apprnc bonus based on wratio
+!!Setting the pcs_apprnc bonus based on fat and strength
+
+bmi_calc = 10000 * (30 + salo / 2 + (pcs_hgt - 170) * 7 / 10) / (pcs_hgt * pcs_hgt)
+
+	if bmi_calc < 16:
+		bodykoef = 35
+    elseif bmi_calc < 19:
+		bodykoef = 70
+    elseif bmi_calc < 25:
+		bodykoef = 90
+    elseif bmi_calc < 30:
+		bodykoef = 80
+    elseif bmi_calc < 35:
+		bodykoef = 50
+    elseif bmi_calc < 40:
+		bodykoef = 30
+    elseif bmi_calc < 45:
+		bodykoef = 10
+    else
+		bodykoef = 0
+    end
+	
+	if strenbuf >= 80:
+		bodykoef += 8
+	elseif strenbuf >= 60:
+		bodykoef += 10
+	elseif strenbuf >= 40:
+		bodykoef += 8
+	elseif strenbuf >= 20:
+		bodykoef += 5
+	else
+		bodykoef += 2
+	end
+
+!!{
+put this in comment as old calculation so I don''t find out I need it later
 	if wratio >= 85:
 		bodykoef = 0
 	elseif wratio >= 80:
@@ -74,7 +109,7 @@ if $ARGS[0] = '':
 		bodykoef = 8
 	else
 		bodykoef = 4
-	end
+	end}
 
 !!For band to waist ratio
 	brtemp = (2 * strenbuf + vitalbuf + agilbuf) /4
@@ -117,7 +152,7 @@ if $ARGS[0] = '':
 	end
 
 !!This is the salo cap for the weight approximation
-	if salo > 150: salo = 150
+	if salo > 250: salo = 250
 	
 !!This calculates the current salo category; ranges are 20 points, seemed to balance best if the range is x10 the hip devisor
 	:salocatloop

locations/bordel.qsrc

@@ -10,11 +10,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if pcs_apprnc < 0:
 		'"You look half dead, get yourself treated."'
 
-		act 'Leave':gt 'Nord', 'redlight'
+		act 'Leave':gt 'city_industrial', 'redlight'
 	elseif pcs_apprnc < 100:
 		'"Look at you, no one will pay for such a product, get cleaned up and come back."'
 
-		act 'Leave':gt 'Nord', 'redlight'
+		act 'Leave':gt 'city_industrial', 'redlight'
 	else
 		act 'In the room':gt 'bordel', 'brothel'
 	end
@@ -39,7 +39,7 @@ if $ARGS[0] = 'brothel':
 
 	act 'Leave':
 		if $clothingworntype ! 'nude':
-			gt 'Nord', 'redlight'
+			gt 'city_industrial', 'redlight'
 		else
 			cla
 			'You can''t go outside naked.'

locations/bordelv.qsrc

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

locations/brother.qsrc

@@ -122,7 +122,7 @@ if $ARGS[0] = 'start':
 			'Kolka looks at your clothes, "You''re dirty. Go change your clothes or at least get <<$npc_nickname[''A29'']>> to wash them."'
 		end
 		if spanked > 1 and $clothingworntype = 'nude' and $pantyworntype = 'none':
-			'Your brother grins and stares at your backside, "Got a sure bum? Did someone punish you? You bad girl."'
+			'Your brother grins and stares at your backside, "Got a sore bum? Did someone punish you? You bad girl."'
 		end
 
 		if $clothingworntype = 'nude' and towel = 1 and $pantyworntype = 'none':
@@ -152,7 +152,7 @@ if $ARGS[0] = 'start':
 			act 'Leave':gt $loc, $metka
 			exit
 		else
-			if evgenQW >= 4 and pav_slut >= 75 and kolkaseepornday ! daystart:
+			if evgenQW >= 4 and pav_slut >= 150 and kolkaseepornday ! daystart:
 				'Your brother grins, "Hey, sis! We''re done playing for now. Let''s go watch some porn."'
 
 				act 'Go with the boys':minut += 5 & gt 'seeporn'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'start':
 			if hour = 23 and brotherSex > 4 and brotherNightSex ! daystart and momloc ! 19:
 				'As you approach your sleeping brother, he suddenly opens his eyes and looks at you.'
 				!!sub/dom dialog needs fixing
-				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
+				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 150):
 				!!	'"<<$pcs_nickname>>, help me sleep," he begs while throwing back the blanket, revealing his erection.'
 				!!	gs 'boyStat', 'A34'
 				!!	brotherSexCount -= 1
@@ -327,7 +327,7 @@ if $ARGS[0] = 'start':
 			if father_go = 1 and hour >= 18 and hour < 23 and brotherSex > 4 and brotherEvSex ! daystart and momloc ! 19:
 				'When you get close, Kolka turns to you.'
 				!!sub/dom dialog needs fixing
-				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
+				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 150):
 					!!gs 'boyStat', 'A34'
 					!!'"Come on, <<$pcs_nickname>>, you have work to do!" Your brother drops his pants, exposing his hard <<npc_dick[''A34'']>> cm dick. "And be quiet, you don''t want to wake up <<$npc_nickname[''A29'']>> and dad."'
 					!!brotherSexCount -= 1
@@ -861,7 +861,7 @@ if $ARGS[0] = 'brotherSexEnd':
 	gs 'arousal', 'end'
 	gs 'stat'
 	!!sub/dom dialog needs fixing
-	!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
+	!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 150):
 		!!if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
 			!!'Panting, Kolka looks at you and says, "That was great, <<$pcs_nickname>>!" He puts his softening cock back in his pants, "Just remember, this is our little secret!" He quickly turns his attention to something else.'
 			!!act 'Leave': gt 'sitrPar'

locations/brother_lessons.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'homework':
 				ivrand = RAND(1,3)
 				if ivrand = 1 and brotherEvSex ! daystart:
 					cla
-					if (sub > 0 and brotherknowslut = 1) or pav_slut >= 75 or brotherknowslut = 2:
+					if (sub > 0 and brotherknowslut = 1) or pav_slut >= 150 or brotherknowslut = 2:
 						'Kolka boldly slides his hands further upwards, continuing to stroke the insides of your leg, while he tells you:'
 						'"<<$pcs_nickname>>, help me with another matter now!"'
 						if pcs_horny > 90:

locations/budgetclothes.qsrc

@@ -133,7 +133,7 @@ if $ARGS[0] = 'clothes':
 		if i = 45: i = 57
 		if i = 80:i = 86
 		if i = 414:i = 415
-	if i <= 414:jump 'loopcheap'
+	if i <= 419:jump 'loopcheap'
 end
 
 if $ARGS[0] = 'cheapclo':
@@ -182,7 +182,7 @@ if $ARGS[0] = 'office':
 			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''officeclo''"><img src="images/pc/clothing/5office/<<i>>.jpg" 	height="250" /></a>'
 		end
 		i += 3
-	if i <= 101:jump 'loopoffice'
+	if i <= 128:jump 'loopoffice'
 end
 
 if $ARGS[0] = 'officeclo':
@@ -352,7 +352,7 @@ if $ARGS[0] = 'trainers':
 		if strainers[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''training_shoes''"><img src="images/pc/shoes/trainers/<<i>>.jpg" height="250" /></a>'
 		i += 2
 		if i = 21:i = 23
-	if i <= 29:jump 'looptrainers_shoes'
+	if i <= 30:jump 'looptrainers_shoes'
 end
 
 if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'trainers',i, 800
@@ -379,7 +379,7 @@ if $ARGS[0] = 'coats':
 		if i = 5:i = 6
 		if i = 9:i = 10
 		if i = 11:i = 12
-	if i <= 19:jump 'loopcoats'
+	if i <= 20:jump 'loopcoats'
 end
 
 if $ARGS[0] = 'coatsclo':

locations/burger.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 
 	if BistroBoss > 0:'<a href="exec:gt ''burger'', ''boss''">The Office of the Director</a> Anatoly Borisovich'
 
-	act 'Leave the diner': minut += 1 & gt 'down'
+	act 'Leave the diner': minut += 1 & gt 'city_center'
 
 	act 'Order from the menu (0:05)':gs 'food_menu'
 	if money >= 315: act 'Order take-out (0:20) (315<b>₽</b>)':money -= 315 & gt 'food', 'f_food'
@@ -215,7 +215,7 @@ if $ARGS[0] = 'dishes':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Out of the car':gt 'street'
+							act 'Out of the car':gt 'city_residential'
 						end
 					end
 
@@ -300,7 +300,7 @@ if $ARGS[0] = 'dishes':
 													gs 'arousal', 'end'
 													gs 'stat'
 
-													act 'Out of the car':gt 'street'
+													act 'Out of the car':gt 'city_residential'
 												end
 											end
 										end
@@ -324,7 +324,7 @@ if $ARGS[0] = 'dishes':
 
 							act 'Leave':
 								minut += 1
-								gt 'down'
+								gt 'city_center'
 							end
 						end
 					else

locations/burgerWork.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'start':
 					gs 'stat'
 					'You write a statement of resignation and quickly get it signed by your boss. He writes out a paycheck of <<pay>> <b>₽</b> to you says, "It''s over <<$pcs_nickname>>, get out of here."'
 
-					act 'Leave':gt 'down'
+					act 'Leave':gt 'city_center'
 				end
 
 				exit
@@ -103,7 +103,7 @@ if $ARGS[0] = 'work2':
 				gs 'arousal', 'end'
 				gs 'stat'
 		
-				act 'Leave':gt 'down'
+				act 'Leave':gt 'city_center'
 			end
 			gs 'willpower', 'bj', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
@@ -135,7 +135,7 @@ if $ARGS[0] = 'work2':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Leave':gt 'down'
+				act 'Leave':gt 'city_center'
 			end
 			gs 'willpower', 'bj', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:

locations/cafe2.qsrc

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

locations/cafe3.qsrc

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

locations/cafe_parco.qsrc

@@ -64,7 +64,7 @@ if $args[0]= 'inner':
 							cla
 							'You''re pretty much broke, and you don''t want to be impudent by asking them to pay for you, so you decide to thank them for the invite but that you have a thing elsewhere that you need to attend...'
 
-							act 'Leave': gt 'park'
+							act 'Leave': gt 'city_park'
 						end
 					end
 					act 'Agree':

locations/carF.qsrc

@@ -1,15 +1,15 @@
 # carF
 
 $enddrive = {
-	if cardrive = 1:gt 'street'
-	if cardrive = 2:gt 'down'
-	if cardrive = 3:gt 'Nord'
-	if cardrive = 4:gt 'lake', 'start'
-	if cardrive = 5:gt 'park', 'start'
+	if cardrive = 1:gt 'city_residential'
+	if cardrive = 2:gt 'city_center'
+	if cardrive = 3:gt 'city_industrial'
+	if cardrive = 4:gt 'city_lake', 'start'
+	if cardrive = 5:gt 'city_park', 'start'
 	if cardrive = 6:gt 'zaprF', 'start'
 	if cardrive = 7:gt 'autoservisF', 'start'
 	if cardrive = 9:gt 'autotraidF', 'start'
-	if cardrive = 10:gt 'park', 'whore'
+	if cardrive = 10:gt 'city_park', 'whore'
 	if cardrive = 11:gt 'sauna'
 	if cardrive = 12:gt 'obekt'
 	if cardrive = 13:gt 'dachi'	
@@ -21,7 +21,7 @@ $enddrive = {
 	if cardrive = 22:gt 'road'
 	if cardrive = 23:gt 'gadukino'
 	if cardrive = 24:gt 'pavCommercial'
-	if cardrive = 25:gt 'island'
+	if cardrive = 25:gt 'city_island'
 	if cardrive = 26:gt 'pavIndustrial'
 }
 

locations/cardgame_durak.qsrc

@@ -74,9 +74,9 @@ if $ARGS[0] = 'card_game_durak_play':
 		'Winner: <b><<$boydesc>>.</b>'
 		'You will have to carry out his wish.'
 		
-		if pav_slut < 75 or kotovLoveQW > 0: 
+		if pav_slut < 150 or kotovLoveQW > 0: 
 			act 'Continue': gt 'cardgame_durak', 'card_game_nosex'
-		elseif pav_slut >= 75 and cg_clother_cum < 5:
+		elseif pav_slut >= 150 and cg_clother_cum < 5:
 			if rand(1,100) <= 90:
 				if rand(1,100) <= 33: 
 					act 'Continue': gt 'cardgame_durak', 'card_game_gsex'
@@ -86,7 +86,7 @@ if $ARGS[0] = 'card_game_durak_play':
 			else
 				act 'Continue': gt 'cardgame_durak', 'card_game_nosex'
 			end
-		elseif pav_slut >= 75 and cg_clother_cum >= 5:
+		elseif pav_slut >= 150 and cg_clother_cum >= 5:
 			if rand(1,100) <= 70:
 				if rand(1,100) <= 33: 
 					act 'Continue': gt 'cardgame_durak', 'card_game_gsex'
@@ -120,7 +120,7 @@ if $ARGS[0] = 'card_game_durak_play':
 		end
 		$loss_npc_name = $boydesc
 		*nl '<b>The game is over! <<$npc_usedname[$cgd_name_npc]>> has no clothes left and loses!</b>.'
-		if pav_slut < 75:
+		if pav_slut < 150:
 			gs 'willpower', 'exhib', 'force', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Make <<$loss_npc_name>> expose himself to a random girl (<<will_cost>> Willpower)':
@@ -135,7 +135,7 @@ if $ARGS[0] = 'card_game_durak_play':
 
 			act 'Make <<$loss_npc_name>> expose a random girl': gt 'cardgame_durak', 'card_game_ggwin_clother'
 
-		elseif pav_slut >= 75:
+		elseif pav_slut >= 150:
 			gs 'willpower', 'anal', 'force', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Make <<$loss_npc_name>> fuck your ass (<<will_cost>> Willpower)':
@@ -238,7 +238,7 @@ end
 !--------------------------!
 !when years lost cards!
 !==========================!
-!fulfillment of desire NPC (turnip pav_slut < 75, then a small show)
+!fulfillment of desire NPC (turnip pav_slut < 150, then a small show)
 if $ARGS[0] = 'card_game_nosex_dance':
 	minut +=5
 	inhib_exp += rand(2,3)
@@ -248,7 +248,7 @@ if $ARGS[0] = 'card_game_nosex_dance':
 	'They all watch you intently, cheering you on and high-fiving their friend who made this possible.'
 	act 'Finish and put your clothes back on': gt 'shulga_room', 'start'
 end
-!making wishes NPC (turnip pav_slut < 75)
+!making wishes NPC (turnip pav_slut < 150)
 if $ARGS[0] = 'card_game_nosex':
 	minut +=5
 	gs 'stat'
@@ -290,7 +290,7 @@ if $ARGS[0] = 'card_game_nosex':
 	act 'Dance for them': gt 'cardgame_durak', 'card_game_nosex_dance'
 	killvar 'card_game_texta'
 end
-!when years lost cards (turnip pav_slut >= 75), sex
+!when years lost cards (turnip pav_slut >= 150), sex
 if $ARGS[0] = 'card_game_gsex':
 	minut +=2
 	pcs_horny += 10
@@ -383,7 +383,7 @@ if $ARGS[0] = 'card_game_gsex':
 		end
 	end
 end
-!when years lost cards (turnip pav_slut >= 75), rough sex
+!when years lost cards (turnip pav_slut >= 150), rough sex
 if $ARGS[0] = 'card_game_rough_sex':
 	gs 'arousal','bj',5,'deepthroat','sub'
 	gs 'stat'
@@ -508,7 +508,7 @@ end
 !-------------------!
 !gg won cards!
 !===================!
-!When the years won, make a wish (turnip pav_slut < 75) (clothing stall)
+!When the years won, make a wish (turnip pav_slut < 150) (clothing stall)
 if $ARGS[0] = 'card_game_ggwin_clother':
 	minut +=3
 	gs 'stat'
@@ -533,7 +533,7 @@ if $ARGS[0] = 'card_game_ggwin_clother':
 		act 'Finish': gt 'shulga_room', 'start'
 	end
 end
-!When the years won, make a wish (turnip pav_slut < 75) (shake genitals)
+!When the years won, make a wish (turnip pav_slut < 150) (shake genitals)
 if $ARGS[0] = 'card_game_ggwin_penis':
 	minut +=5
 	gs 'stat'
@@ -557,7 +557,7 @@ if $ARGS[0] = 'card_game_ggwin_penis':
 		act 'Finish': gt 'shulga_room', 'start'
 	end
 end
-!When the years won, make a wish (turnip pav_slut >= 75) (cum on the victim)
+!When the years won, make a wish (turnip pav_slut >= 150) (cum on the victim)
 if $ARGS[0] = 'card_game_ggwin_clothercum':
 	minut +=5
 	cg_clother_cum +=1 
@@ -592,7 +592,7 @@ if $ARGS[0] = 'card_game_ggwin_clothercum':
 		end
 	end
 end
-!When the years won, make a wish (turnip pav_slut >= 75), lick
+!When the years won, make a wish (turnip pav_slut >= 150), lick
 if $ARGS[0] = 'card_game_gg_lick':
 	minut +=1
 	npc_sex[$boy] += 1
@@ -630,7 +630,7 @@ if $ARGS[0] = 'card_game_gg_lick':
 		act 'Finish': gt 'shulga_room', 'start'
 	end
 end
-!When the years won, make a wish (turnip pav_slut >= 75), sex
+!When the years won, make a wish (turnip pav_slut >= 150), sex
 if $ARGS[0] = 'card_game_gg_sex':
 	minut +=1
 	npc_sex[$boy] += 1

locations/cikl.qsrc

@@ -1452,10 +1452,10 @@ if storyline = 1:
 				if old_grupvalue[4] + 8 < grupvalue[4]: grupvalue[4] = old_grupvalue[4] + 8
 			end
 			!!Limit to max school group values
-			if grupvalue[1] > 100: grupvalue[1] = 100
-			if grupvalue[2] > 100: grupvalue[2] = 100
-			if grupvalue[3] > 100: grupvalue[3] = 100
-			if grupvalue[4] > 100: grupvalue[4] = 100
+			if grupvalue[1] > 1000: grupvalue[1] = 1000
+			if grupvalue[2] > 1000: grupvalue[2] = 1000
+			if grupvalue[3] > 1000: grupvalue[3] = 1000
+			if grupvalue[4] > 1000: grupvalue[4] = 1000
 			!!Decay for the school groups
 			if grupvalue[1] > 0:
 				grupvalue[1] -= rand(0,1)

locations/cityTrain.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 		'In the parking lot is <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'
 	end
 
-	act 'Go to the city center':minut += 5 & gt 'down'
+	act 'Go to the city center':minut += 5 & gt 'city_center'
 	act 'Enter the station building': minut += 1 & gt 'cityTrain', 'inside'
 end
 

locations/down.qsrc → locations/city_center.qsrc

@@ -1,8 +1,8 @@
-# down
+# city_center
 
 $metka = $ARGS[0]
-$loc = 'down'
-$menu_loc = 'down'
+$loc = 'city_center'
+$menu_loc = 'city_center'
 $menu_arg = ''
 menu_off = 0
 $location_type = 'public_outdoors'
@@ -32,7 +32,7 @@ bankloc = 1
 gs 'stat'
 
 !call random events from [street_events], and display them before show location.
-if streetevent_hour ! hour:gt 'street_event','down', 'main'
+if streetevent_hour ! hour:gt 'street_event','city_center', 'main'
 
 '<center><h2>St. Petersburg</h2></center>'
 '<center><b>City Center</b></center>'
@@ -54,7 +54,7 @@ end
 'Day or night the city center is alive and bustling. Whether You''re looking to shop, hit the gym or get some cheap food, you''ll find it hard not to have your needs satisfied.'
 *nl
 
-gs'street_event','down', 'extras'
+gs'street_event','city_center', 'extras'
 
 if nichWork = 2:act '<b>GO HOME</b> (Nicholas'' apartment)':gt 'nichApartment'
 
@@ -113,7 +113,7 @@ else
 	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at 4:00''">the metro</a>'
 end
 
-'You have easy access to the <a href="exec: minut += 5 & gs ''cityTrain'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St Petersburg and the subway is great if you are tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''park'', ''start''">central park</a> is a thirty minute walk from here and provides a more scenic route to the other city districts.'
+'You have easy access to the <a href="exec: minut += 5 & gs ''cityTrain'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St Petersburg and the subway is great if you are tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a thirty minute walk from here and provides a more scenic route to the other city districts.'
 *nl
 if hour >= 8 and hour <= 22:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''kiosk'', ''start''">kiosk</a>'
@@ -241,9 +241,9 @@ end
 if hour >= 20 or hour <= 4:
 	*nl
 	'There are prostitutes working in places near here.'
-	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 50):
+	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 100):
 		act 'Prostitute yourself': gt 'street_walker', 'work'
-	elseif pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 50):  
+	elseif pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 100):  
 		*nl
 		'You could work as a prostitute, but you need to wear appropriate clothes and more than a little bit of makeup.'
 	else
@@ -258,5 +258,5 @@ if tanwork ! 0:
 	gt 'nichUtil','updateNotice'
 end
 
---- down ---------------------------------
+--- city_center ---------------------------------
 

locations/Nord.qsrc → locations/city_industrial.qsrc

@@ -1,12 +1,12 @@
-# Nord
+# city_industrial
 
 if $ARGS[0] = '':
 	$metka = ''
-	$loc = 'Nord'
+	$loc = 'city_industrial'
 	$metkaStreet = ''
-	$locStreet = 'Nord'
+	$locStreet = 'city_industrial'
 	$location_type = 'public_outdoors'
-	$menu_loc = 'Nord'
+	$menu_loc = 'city_industrial'
 	$menu_arg = ''
 	menu_off = 0
 	CLOSE ALL
@@ -23,7 +23,7 @@ if $ARGS[0] = '':
 	gs 'stat'
 
 	!call random events from [street_events], and display them before show location.
-	if streetevent_hour + 2 < hour: gt 'street_event','Nord', 'main'
+	if streetevent_hour + 2 < hour: gt 'street_event','city_industrial', 'main'
 
 	'<center><h2>St. Petersburg</h2></center>'
 	'<center><b>Industrial Region</b></center>'
@@ -41,10 +41,10 @@ if $ARGS[0] = '':
 		end
 	end
 
-	gs'street_event','Nord', 'extras'
+	gs'street_event','city_industrial', 'extras'
 
 	act 'Walk to the main road to Pavlovsk (0:15)': minut += 15 & nroad = 0 & gt'road'
-	act 'Visit the Red Light District (0:05)': minut += 5 & gt 'Nord', 'redlight'
+	act 'Visit the Red Light District (0:05)': minut += 5 & gt 'city_industrial', 'redlight'
 
 	act 'Wait':gs 'obj_din', 'wait'
 
@@ -52,10 +52,10 @@ if $ARGS[0] = '':
 
 	if car > 0 and cardrive = 3 or (cardrive >= 6 and cardrive <= 9):'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
-	'The towns <a href="exec:minut += 60 & gt ''park'', ''start''">central park</a> is an hours walk from here.'
+	'The towns <a href="exec:minut += 60 & gt ''city_park'', ''start''">central park</a> is an hours walk from here.'
 
 	if hour > 7 and hour < 23:
-		'You can see the <a href="exec:$locM = ''Nord'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+		'You can see the <a href="exec:$locM = ''city_industrial'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 	else
 		'The kiosk is closed between 23:00 and 07:00.'
 	end
@@ -125,11 +125,11 @@ end
 
 if $ARGS[0] = 'redlight':
 	$metka = 'redlight'
-	$loc = 'Nord'
+	$loc = 'city_industrial'
 	$metkaStreet = 'redlight'
-	$locStreet = 'Nord'
+	$locStreet = 'city_industrial'
 	$location_type = 'public_outdoors'
-	$menu_loc = 'Nord'
+	$menu_loc = 'city_industrial'
 	$menu_arg = 'redlight'
 	menu_off = 0
 	CLOSE ALL
@@ -164,7 +164,7 @@ if $ARGS[0] = 'redlight':
 	end
 	if bordel > 0 and (hour >= 20 or hour <= 3):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 
-	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'Nord'
+	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
 
 	act 'Wait':gs 'obj_din', 'wait'
 	
@@ -186,5 +186,5 @@ if $ARGS[0] = 'redlight':
 end
 
 
---- Nord ---------------------------------
+--- city_industrial ---------------------------------
 

locations/island.qsrc → locations/city_island.qsrc

@@ -1,9 +1,9 @@
-# island
-!!new island main page
+# city_island
+
 $metka = ''
-$loc = 'island'
+$loc = 'city_island'
 $location_type = 'public_outdoors'
-$menu_loc = 'island'
+$menu_loc = 'city_island'
 $menu_arg = ''
 menu_off = 0
 CLOSE ALL
@@ -37,7 +37,7 @@ end
 'The University area of the city, the University, shops, clubs and the like that cater to the college kids dominate this area of the city. There is only three bridges onto and off the island, plus the metro line.'
 
 !call random events from [street_events], and display them before show location.
-gs'street_event','island' & if streetrand = -1:exit
+gs'street_event','city_island' & if streetrand = -1:exit
 if student > 0:act '<b>GO HOME</b> (University dorm)':gt 'dorm', 'start'
 
 if car > 0 and cardrive = 25:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
@@ -47,12 +47,12 @@ act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
 
-if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:gt ''dolls'', ''start''">Patch Work Dolls</a> is a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like.'
 if hour >= 4 and hour <= 23:'The <a href="exec:minut += 5 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 if week < 6 and hour >= 7:'At the <a href="exec:gt ''univer'', ''start''">University</a> where you can earn your bachelors degree.'
 if student > 0 or (hour >= 6 and hour <= 23):'The <a href="exec:gt ''dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
 
 
---- island ---------------------------------
+--- city_island ---------------------------------
 

locations/lake.qsrc → locations/city_lake.qsrc

@@ -1,9 +1,9 @@
-# lake
+# city_lake
 
 if $ARGS[0] = 'start':
-	$loc = 'lake'
+	$loc = 'city_lake'
 	$metka = 'start'
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'start'
 	menu_off = 0
 	$location_type = 'public_outdoors'
@@ -50,16 +50,16 @@ if $ARGS[0] = 'start':
 		if $clothingworntype = 'swimwear':
 			cla
 			'You need to get dressed in regular clothing first.'
-			act'Return':gt 'lake','start'
+			act'Return':gt 'city_lake','start'
 		else
 			minut += 40
-			gt 'street'
+			gt 'city_residential'
 		end
 	end
 
 	if hour >= 6 and hour <= 20:
-		'Nearby are various '+iif($clothingworntype = 'swimwear','<a href="exec:gt ''lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
-		'You can go for a ride on a <a href="exec:gt ''lake'', ''horse''">horse</a> along the beach.'
+		'Nearby are various '+iif($clothingworntype = 'swimwear','<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
+		'You can go for a ride on a <a href="exec:gt ''city_lake'', ''horse''">horse</a> along the beach.'
 		'And a short walk from here there is even a '+iif(pcs_inhib >= 30 or (exhibitionist_lvl > 1 and pcs_horny > 60),'<a href="exec:gt ''Nudelake''">nudist beach</a>','nudist beach, but you are''t confident enough to go in that direction.')+''
 		if temper >= 15 and $clothingworntype = 'swimwear':
 			'Also you can sunbathe or swim.'
@@ -74,10 +74,10 @@ if $ARGS[0] = 'start':
 				'You walk along the shore.'
 				walkrand = rand(0, 100)
 
-				if walkrand >= 50 and walkrand < 60:gt 'lake', 'walklake1'
-				if walkrand >= 60 and walkrand < 70:gt 'lake', 'walklake2'
+				if walkrand >= 50 and walkrand < 60:gt 'city_lake', 'walklake1'
+				if walkrand >= 60 and walkrand < 70:gt 'city_lake', 'walklake2'
 
-				act 'Finish':gt 'lake', 'start'
+				act 'Finish':gt 'city_lake', 'start'
 			end
 
 			act 'Swim (1:00)':
@@ -95,7 +95,7 @@ if $ARGS[0] = 'start':
 				'You swim in the lake, the water refreshes and invigorates.'
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-				act 'Get out of the water':gt 'lake', 'start'
+				act 'Get out of the water':gt 'city_lake', 'start'
 			end
 			if sunWeather = 1:
 				act 'Sunbathe (1:00)':
@@ -124,9 +124,9 @@ if $ARGS[0] = 'start':
 					evrand = rand(0, 100)
 
 					if evrand > 50:
-						act 'Rise from the beach':gt 'lake', 'start'
+						act 'Rise from the beach':gt 'city_lake', 'start'
 					elseif evrand <= 30 and andrei > 0:
-						act 'Rise from the beach':gt 'lake', 'start'
+						act 'Rise from the beach':gt 'city_lake', 'start'
 					elseif evrand <= 30 and andrei = 0:
 						anreirape = 1
 						'You fall asleep on the beach while sunbathing. You dream that someone is caressing your chest. Your nipples harden, your breasts rise from deep breaths. It feels like something wet glides across your breast, and you moan sweetly.'
@@ -152,7 +152,7 @@ if $ARGS[0] = 'start':
 										gs 'stat'
 										'You very accurately knee him in the balls, he screams and lets you down.'
 
-										act 'Escape from the beach':gt 'lake', 'start'
+										act 'Escape from the beach':gt 'city_lake', 'start'
 									end
 								else
 									act 'Knee him in the balls (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -190,16 +190,16 @@ if $ARGS[0] = 'start':
 											'"<<$pcs_nickname>>" You answer.'
 											'"I see that you liked our game. Want to catch an even bigger thrill? Then come back tomorrow", Says Andrew suavely dressing. "Repeat our deeds."'
 
-											act 'Leave the beach':gt 'lake', 'start'
+											act 'Leave the beach':gt 'city_lake', 'start'
 										end
 									end
 								end
 							end
 						end
 					elseif evrand <= 40 and evrand > 30:
-						gt 'lake', 'vlake1'
+						gt 'city_lake', 'vlake1'
 					elseif evrand <= 50 and evrand > 40:
-						gt 'lake', 'vlake2'
+						gt 'city_lake', 'vlake2'
 					end
 				end
 			end
@@ -208,7 +208,7 @@ if $ARGS[0] = 'start':
 		if anreiday ! daystart and andrei = 2:
 			'You see Andrew on the beach.'
 
-			act 'Approach Andrew':gt 'lake', 'andrey1'
+			act 'Approach Andrew':gt 'city_lake', 'andrey1'
 		end
 	end
 end
@@ -217,21 +217,21 @@ if $ARGS[0] = 'aquapark':
 	cla & *clr
 	$location_type = 'public_outdoors'
 	minut += 5
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'aquapark'
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/aquapark.jpg"></center>'
 	'You go to the attractions.'
-	'There is <a href="exec:gt ''lake'', ''gidro''">Jet Skiing</a>, a <a href="exec:gt ''lake'', ''banan''">banana ride</a> and the <a href="exec:gt ''Lake'', ''gorka''">water slide</a>.'
+	'There is <a href="exec:gt ''city_lake'', ''gidro''">Jet Skiing</a>, a <a href="exec:gt ''city_lake'', ''banan''">banana ride</a> and the <a href="exec:gt ''city_lake'', ''gorka''">water slide</a>.'
 
-	act 'Leave':gt 'lake', 'start'
+	act 'Leave':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'gidro':
 	cla & *clr
 	$location_type = 'event_outdoors'
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'gidro'
 	menu_off = 0
 	minut += 1
@@ -251,19 +251,19 @@ if $ARGS[0] = 'gidro':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/gidro.jpg"></center>'
 			'You take a jet ski, and spend 30 minutes having loads of fun.'
 
-			if rand(0,4) = 0:gt 'lake', 'kater1'
+			if rand(0,4) = 0:gt 'city_lake', 'kater1'
 
-			act 'Finish':gt 'lake', 'aquapark'
+			act 'Finish':gt 'city_lake', 'aquapark'
 		end
 	end
 
-	act 'Move away':gt 'lake', 'aquapark'
+	act 'Move away':gt 'city_lake', 'aquapark'
 end
 
 if $ARGS[0] = 'banan':
 	$location_type = 'event_outdoors'
 	cla & *clr
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'banan'
 	menu_off = 0
 	gs 'stat'
@@ -285,22 +285,22 @@ if $ARGS[0] = 'banan':
 			banrand = rand(0, 100)
 
 			if banrand >= 80 and banrand < 90:
-				gt 'lake', 'kater2'
+				gt 'city_lake', 'kater2'
 			elseif banrand >= 90:
-				gt 'lake', 'kater3'
+				gt 'city_lake', 'kater3'
 			end
 
-			act 'Finish':gt 'Lake', 'aquapark'
+			act 'Finish':gt 'city_lake', 'aquapark'
 		end
 	end
 
-	act 'Move away':gt 'lake', 'aquapark'
+	act 'Move away':gt 'city_lake', 'aquapark'
 end
 
 if $ARGS[0] = 'gorka':
 	$location_type = 'event_outdoors'
 	cla & *clr
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'gorka'
 	menu_off = 0
 	minut += 1
@@ -321,17 +321,17 @@ if $ARGS[0] = 'gorka':
 			'You climb to the top, then whiz down and around, before splashing into the pool with a massive smile on your face.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-			act 'Finish':gt 'lake', 'aquapark'
+			act 'Finish':gt 'city_lake', 'aquapark'
 		end
 	end
 
-	act 'Move away':gt 'lake', 'aquapark'
+	act 'Move away':gt 'city_lake', 'aquapark'
 end
 
 if $ARGS[0] = 'horse':
 	$location_type = 'event_outdoors'
 	cla & *clr
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'horse'
 	menu_off = 0
 	minut += 1
@@ -353,16 +353,16 @@ if $ARGS[0] = 'horse':
 			horserand = rand(0, 100)
 
 			if horserand >= 60 and horserand < 80:
-				gt 'lake', 'horse1'
+				gt 'city_lake', 'horse1'
 			elseif horserand >= 80:
-				gt 'lake', 'horse2'
+				gt 'city_lake', 'horse2'
 			end
 
-			act 'Finish':gt 'lake', 'start'
+			act 'Finish':gt 'city_lake', 'start'
 		end
 	end
 
-	act 'Move away':gt 'lake', 'start'
+	act 'Move away':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'walklake1':
@@ -375,7 +375,7 @@ if $ARGS[0] = 'walklake1':
 	'Walking along the beach you hear someone calling you, "Hey beauty, come here." You turn around and see that next to the shore, between the trees, there is a hut and on the threshold sits a guy.'
 
 	if ribakSex = 0:
-		act 'Leave':gt 'lake', 'start'
+		act 'Leave':gt 'city_lake', 'start'
 
 		act 'Approach':
 			cla & *clr
@@ -384,7 +384,7 @@ if $ARGS[0] = 'walklake1':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 			'You approach the guy with a fishing rod. He looks at you from head to toe, lustfully and imposingly.'
 
-			act 'Leave':gt 'lake', 'start'
+			act 'Leave':gt 'city_lake', 'start'
 
 			if pcs_apprnc < 60:
 				'The guy smiles and begins to hum, "You look terrible, you really should look after yourself better."'
@@ -408,7 +408,7 @@ if $ARGS[0] = 'walklake1':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 						'You rebell at such brazen statements. The guy just grins more widely. "Come on. Do not worry. I love whores." After these words the man unbuttoned his pants and pulls out a hefty cock, which was clearly no less than 25 centimeters long. "Come on baby, look what papa has for your goddamned mouth." The man beckons you with a finger.'
-						gs 'lake', 'dinribak'
+						gs 'city_lake', 'dinribak'
 					end
 
 					act 'What? (Wonder)':
@@ -417,7 +417,7 @@ if $ARGS[0] = 'walklake1':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 						'You are surprised by such impudence. The guy just grins more widely. "You''ll be even hungrier after seeing this!" With these words the man unbuttoned his pants and pulls out a hefty cock, which was clearly no less than 25 centimeters long. "Come on baby, look what papa has for your goddamned mouth." The man beckons you with a finger.'
-						gs 'lake', 'dinribak'
+						gs 'city_lake', 'dinribak'
 					end
 
 					act 'Hmm (thinking)':
@@ -426,7 +426,7 @@ if $ARGS[0] = 'walklake1':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 						'You think for a second. The guy just grins more widely. "Damn, I knew it, just by looking at you, I have a nose for whores missing out on dick." With these words the man unbuttoned his pants and pulls out a hefty cock, which was clearly no less than 25 centimeters long. "Come on baby, look what papa has for your goddamned mouth." The man beckons you with a finger.'
-						gs 'lake', 'dinribak'
+						gs 'city_lake', 'dinribak'
 					end
 				end
 			end
@@ -434,7 +434,7 @@ if $ARGS[0] = 'walklake1':
 	elseif ribakSex > 0:
 		'You go to the guy, who greets you. Hi <<$ribakName>> want more deliciousness?'
 
-		act 'Leave':gt 'lake', 'start'
+		act 'Leave':gt 'city_lake', 'start'
 
 		if $ribakName = 'whore':
 			act 'Two pieces!':
@@ -449,7 +449,7 @@ if $ARGS[0] = 'walklake1':
 					act 'Leave (<<will_cost>> Willpower)':
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'lake', 'start'
+						gt 'city_lake', '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>'
@@ -486,7 +486,7 @@ if $ARGS[0] = 'walklake1':
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/facefuck1.jpg"></center>'
 							'You are tired and haven''t got the energy to leave. The man takes your hair in his hand and wiped his cock on your hair. After that, he rudely tells you. "Whore to the core! Now get out."'
 
-							act 'Leave':gt 'lake', 'start'
+							act 'Leave':gt 'city_lake', 'start'
 						end
 					end
 				end
@@ -531,7 +531,7 @@ if $ARGS[0] = 'walklake1':
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/spit.jpg"></center>'
 							'The guy suddenly thrust the fingers of both his hands in your mouth holding your lips apart and with relish spits in your mouth. You flinch from this and feel like your cheeks blush with a flood of shame. The guy looked at you angrily, "You are a lewd, vile creature that got what she deserved. Now get out!"'
 
-							act 'Leave':gt 'lake', 'start'
+							act 'Leave':gt 'city_lake', 'start'
 						end
 					end
 				end
@@ -546,7 +546,7 @@ if $ARGS[0] = 'walklake1':
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/cum1.jpg"></center>'
 					'You try to dodge, but the guy grabs you by the hair and you get a jet of sperm on your face. Finally drying up and the guy says, "Get out of here bitch!"'
 
-					act 'Leave':gt 'lake', 'start'
+					act 'Leave':gt 'city_lake', 'start'
 				end
 			end
 		end
@@ -567,7 +567,7 @@ if $ARGS[0] = 'dinribak':
 			act 'Leave (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'lake', 'start'
+				gt 'city_lake', '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>'
@@ -586,7 +586,7 @@ if $ARGS[0] = 'dinribak':
 				act 'Change your mind and leave (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'lake', 'start'
+					gt 'city_lake', 'start'
 				end
 			else
 				act 'Change your mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -624,7 +624,7 @@ if $ARGS[0] = 'dinribak':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/facefuck1.jpg"></center>'
 						'You are tired and haven''t got the energy to leave. The man takes your hair in his hand and wiped his cock on your hair. After that, he rudely tells you. "Whore to the core! Now get out."'
-						act 'Leave':gt 'lake', 'start'
+						act 'Leave':gt 'city_lake', 'start'
 					end
 				end
 			end
@@ -643,7 +643,7 @@ if $ARGS[0] = 'dinribak':
 			act 'Faint compliance then run (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'lake', 'start'
+				gt 'city_lake', 'start'
 			end
 		else
 			act 'Faint compliance then run (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -691,7 +691,7 @@ if $ARGS[0] = 'dinribak':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/spit.jpg"></center>'
 						'The guy suddenly thrust the fingers of both his hands in your mouth holding your lips apart and with relish spits in your mouth. You flinch from this and feel like your cheeks blush with a flood of shame. The guy looked at you angrily, "You are a lewd, vile creature that got what she deserved. Now get out!"'
 
-						act 'Leave':gt 'lake', 'start'
+						act 'Leave':gt 'city_lake', 'start'
 					end
 				end
 			end
@@ -706,7 +706,7 @@ if $ARGS[0] = 'dinribak':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/cum1.jpg"></center>'
 				'You try to dodge, but the guy grabs you by the hair and you get a jet of sperm on your face. Finally drying up and the guy says, "Get out of here bitch!"'
 
-				act 'Leave':gt 'lake', 'start'
+				act 'Leave':gt 'city_lake', 'start'
 			end
 		end
 	end
@@ -725,7 +725,7 @@ if $ARGS[0] = 'walklake2':
 		'You get hot and deciding to freshen up a bit, you walk out into the water, turning you notice not far behind you, Stasik and Valera looking at you.'
 	end
 
-	act 'Leave':gt 'lake', 'start'
+	act 'Leave':gt 'city_lake', 'start'
 
 	if StasikValera = 0:
 		act 'Look at them':
@@ -735,16 +735,16 @@ if $ARGS[0] = 'walklake2':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
 			'You look at the men and notice that they are whispering to each other. Then one of the men comes up to you. He says smiling, "Hey beautiful, I am Stasik, and this is my friend Valera. What''s your name?"'
-			act '<<$pcs_nickname>>': gt 'lake', 'stasValera'
+			act '<<$pcs_nickname>>': gt 'city_lake', 'stasValera'
 
 			act 'I have to go':
 				cla & *clr
 				minut += 1
 				gs 'stat'
 				'You''re not going to get acquainted with these fellows and began to leave. Stasik tries to persuade you. "Come on, babe. Do we look like savages? We just wanted to talk, but I understand if you''re frightened. I just wanted to ask you your name."'
-				act '<<$pcs_nickname>>': gt 'lake', 'stasValera'
+				act '<<$pcs_nickname>>': gt 'city_lake', 'stasValera'
 
-				act 'Leave':gt 'lake', 'start'
+				act 'Leave':gt 'city_lake', 'start'
 			end
 		end
 	end
@@ -800,7 +800,7 @@ if $ARGS[0] = 'walklake2':
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk2/walk7.jpg"></center>'
 								'Sated the men lower you down, and begin to masturbate on your face, you open your mouth and wait patiently. They both finish, pouring a gulf of sperm in your mouth and on your face.'
 
-								act 'Leave':gt 'lake', 'start'
+								act 'Leave':gt 'city_lake', 'start'
 							end
 						end
 					end
@@ -823,8 +823,8 @@ if $ARGS[0] = 'stasValera':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/talk6.jpg"></center>'
 		'You stand aroundtalking to the men. Stasik begins to tell you that he works with Valera as sales representatives of a major company, and boasts about their seniority and importance. Throughout the conversation, both men are making lewd gestures and Stasik moves his hand to your chest.'
-		act 'Remove Stasik''s hands from you': gt 'lake', 'stasValera2a'
-		act 'Smile and pretend nothing is happening': gt 'lake', 'stasValera2b'
+		act 'Remove Stasik''s hands from you': gt 'city_lake', 'stasValera2a'
+		act 'Smile and pretend nothing is happening': gt 'city_lake', 'stasValera2b'
 	end
 end
 
@@ -845,7 +845,7 @@ if $ARGS[0] = 'stasValera2a':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/refuse3.jpg"></center>'
 			'You angrily stand up and began to leave. Stasik gets to his feet and tries to persuade you to go with the guys to the cafe.'
 
-			act 'Leave':gt 'lake', 'start'
+			act 'Leave':gt 'city_lake', 'start'
 		end
 	else
 		act 'Rebel and go (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -858,7 +858,7 @@ if $ARGS[0] = 'stasValera2a':
 		gs 'arousal', 'foreplay', 5
 		minut -= 3
 		gs 'stat'
-		act 'Further': gt 'lake', 'stasValera3'
+		act 'Further': gt 'city_lake', 'stasValera3'
 	end
 end
 
@@ -869,7 +869,7 @@ if $ARGS[0] = 'stasValera2b':
 	gs 'arousal', 'foreplay', 5
 	minut -= 3
 	gs 'stat'
-	act 'Further': gt 'lake', 'stasValera3'
+	act 'Further': gt 'city_lake', 'stasValera3'
 end
 
 if $ARGS[0] = 'stasValera3':
@@ -890,7 +890,7 @@ if $ARGS[0] = 'stasValera3':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/refuse4.jpg"></center>'
 			'You jump to your feet adjusting your bra. Stasik smiles, "Do not be afraid girl."'
 
-			act 'Leave':gt 'lake', 'start'
+			act 'Leave':gt 'city_lake', 'start'
 		end
 	else
 		act 'Hey! What are you doing? (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -907,7 +907,7 @@ if $ARGS[0] = 'stasValera3':
 			gs 'arousal', 'foreplay', 5
 			minut -= 3
 			gs 'stat'
-			act 'Relax': gt 'lake', 'stasValera4'
+			act 'Relax': gt 'city_lake', 'stasValera4'
 		end
 	else
 		act 'Feebly protest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -920,7 +920,7 @@ if $ARGS[0] = 'stasValera3':
 		gs 'arousal', 'foreplay', 5
 		minut -= 3
 		gs 'stat'
-		act 'Relax': gt 'lake', 'stasValera4'
+		act 'Relax': gt 'city_lake', 'stasValera4'
 	end
 end
 
@@ -971,7 +971,7 @@ if $ARGS[0] = 'stasValera4':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/refuse2.jpg"></center>'
 						'You refuse and Stasik shrugs, "Well, as you wish."'
 
-						act 'Leave':gt 'lake', 'start'
+						act 'Leave':gt 'city_lake', 'start'
 					end
 
 					act 'Agree':
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'vlake1':
 		act 'Leave (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', '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>'
@@ -1023,7 +1023,7 @@ if $ARGS[0] = 'vlake1':
 			act 'Leave (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'lake', 'start'
+				gt 'city_lake', '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>'
@@ -1047,7 +1047,7 @@ if $ARGS[0] = 'vlake1':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake4.jpg"></center>'
 				'One of the guys leans toward your pussy, kisses it and begins to lick it, trying to shove his fingers inside.'
 
-				act 'Remove his fingers':gt 'lake', 'vlake1cum'
+				act 'Remove his fingers':gt 'city_lake', 'vlake1cum'
 
 				act 'Relax and enjoy':
 					*clr & cla
@@ -1070,7 +1070,7 @@ if $ARGS[0] = 'vlake1':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake8.jpg"></center>'
 						'"There''s space for two" you say, and don''t even have time to finish before a dick is in your ass. The guys often spin you around, trying all kinds of different positions, but always with all your holes plugged by their members, it''s crazy but you do not want it to finish, however, eventually it seems that it will.'
 
-						act 'Finish':gt 'lake', 'vlake1cum'
+						act 'Finish':gt 'city_lake', 'vlake1cum'
 					end
 				end
 			end
@@ -1105,7 +1105,7 @@ if $ARGS[0] = 'vlake1cum':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake5.jpg"></center>'
 	'Boys begin to cum on your face and mouth. You lick the cum off their dicks and swallow it. Finally satisfied the guys, dress and go, you''re left unsatisfied.'
 
-	act 'Leave': gs 'arousal', 'end' & gt 'lake', 'start'
+	act 'Leave': gs 'arousal', 'end' & gt 'city_lake', 'start'
 
 	act 'Masturbate':
 		*clr & cla
@@ -1115,7 +1115,7 @@ if $ARGS[0] = 'vlake1cum':
 		$orgasm_or = 'yes'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':gt 'lake', 'start'
+		act 'Leave':gt 'city_lake', 'start'
 	end
 end
 
@@ -1130,7 +1130,7 @@ if $ARGS[0] = 'vlake2':
 		act 'Disregard (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		end
 	else
 		act 'Disregard (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1146,7 +1146,7 @@ if $ARGS[0] = 'vlake2':
 			act 'And push them away (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'lake', 'start'
+				gt 'city_lake', '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>'
@@ -1188,7 +1188,7 @@ if $ARGS[0] = 'vlake2':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake2/vlake6.jpg"></center>'
 						'Changing position, you plant your anus on the man lying down. The second man comes up to you and holding your head with one hand begin to fuck your mouth, penetrating his cock deeper and deeper. After a while you feel hot cum fill your anus and finished with him, the second man gets ready to cum in your mouth.'
 
-						act 'Continue to suck':gt 'lake', 'vlake2cum'
+						act 'Continue to suck':gt 'city_lake', 'vlake2cum'
 
 						act 'Pull':
 							*clr & cla
@@ -1201,7 +1201,7 @@ if $ARGS[0] = 'vlake2':
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake2/vlake7.jpg"></center>'
 							'You remove the member from your mouth and the man finishes all over your face.'
 
-							act 'Leave':gt 'lake', 'start'
+							act 'Leave':gt 'city_lake', 'start'
 						end
 					end
 				end
@@ -1218,7 +1218,7 @@ if $ARGS[0] = 'vlake2cum':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake2/vlake8.jpg"></center>'
 	'You continued to suck and soon your mouth is filled with streams of semen, you swallow it and carefully lick his cock, leaving not even a drop of sperm.'
 
-	act 'Leave':gt 'lake', 'start'
+	act 'Leave':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'andrey1':
@@ -1232,7 +1232,7 @@ if $ARGS[0] = 'andrey1':
 		act 'Refuse (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', '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>'
@@ -1279,7 +1279,7 @@ if $ARGS[0] = 'andrey1':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey3.jpg"></center>'
 				'The shy young man comes up to you. "Well, what are you waiting for, briefs off and get against the girl." Andrew shouts at him, turning you over and pulling apart your buttocks with his hands. The young man comes from behind and puts his penis in your anus. Now two members move in you as pistons delivering incredible pleasure. Moaning you ride on the two cocks, until the young man finishes on your ass, and Andrew gets up and cums in your mouth.'
 
-				act 'Rise from the beach':gt 'lake', 'start'
+				act 'Rise from the beach':gt 'city_lake', 'start'
 			end
 
 			act 'Deeper! Stronger!':
@@ -1291,7 +1291,7 @@ if $ARGS[0] = 'andrey1':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey4.jpg"></center>'
 				'"Deeper, Stronger!" You shout, you do not hesitate to enthusiastically absorb the whole man. He answers you with an inarticulate growl escaping to the beat of his ragged breathing. Even before the two of you finish off, the boy has run away.'
 
-				act 'Rise from the beach':gt 'lake', 'start'
+				act 'Rise from the beach':gt 'city_lake', 'start'
 			end
 		end
 	end
@@ -1311,7 +1311,7 @@ if $ARGS[0] = 'kater1':
 		act 'Take the Jet ski and leave (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		end
 	else
 		act 'Take the Jet ski and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1332,7 +1332,7 @@ if $ARGS[0] = 'kater1':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater3.jpg"></center>'
 			'You sit the guy down and lick his cock, then open your lips and start sucking selflessly, in a few minutes you feel like the dick in your mouth is ready to finish.'
 
-			act 'Continue to suck':gt 'lake', 'kater1cum'
+			act 'Continue to suck':gt 'city_lake', 'kater1cum'
 
 			act 'Stay':
 				*clr & cla
@@ -1364,7 +1364,7 @@ if $ARGS[0] = 'kater1':
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater8.jpg"></center>'
 								'Then he stands up, lifting you with him, he rises one of your legs and forcefully inserts his penis into your vagina, you are satisfied and tired but hang on waiting for him to finish. After a few thrusts he pulls out his dick and lets you fall to your knees and the guy puts his dick to your mouth.'
 
-								act 'Suck':gt 'lake', 'kater1cum'
+								act 'Suck':gt 'city_lake', 'kater1cum'
 							end
 						end
 					end
@@ -1392,7 +1392,7 @@ if $ARGS[0] = 'kater1cum':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater10.jpg"></center>'
 		'When the stream dries up, you are covered in sperm and begin to lick the remnants off his cock, savoring every drop.'
 
-		act 'Leave':gt 'lake', 'start'
+		act 'Leave':gt 'city_lake', 'start'
 	end
 end
 
@@ -1412,7 +1412,7 @@ if $ARGS[0] = 'kater2':
 		act 'Pretend to be asleep until docked (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		end
 	else
 		act 'Pretend to be asleep until docked (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1475,7 +1475,7 @@ if $ARGS[0] = 'kater2':
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater2/kater8.jpg"></center>'
 								'Soon the second one groans, you turn to him, but even though you opened your mouth, the guy completely covers your face.'
 
-								act 'Leave':gt 'lake', 'start'
+								act 'Leave':gt 'city_lake', 'start'
 							end
 						end
 					end
@@ -1502,7 +1502,7 @@ if $ARGS[0] = 'kater3':
 		act 'Take the Jet ski and leave (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		end
 	else
 		act 'Take the Jet ski and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1552,7 +1552,7 @@ if $ARGS[0] = 'kater3':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater3/11.jpg"></center>'
 						'Sated they kneel you down and end in your mouth.'
 
-						act 'Leave':gt 'lake', 'start'
+						act 'Leave':gt 'city_lake', 'start'
 					end
 				end
 			end
@@ -1572,7 +1572,7 @@ if $ARGS[0] = 'horse1':
 
 	gs 'willpower', 'misc', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
-		act 'Refuse (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'lake', 'start'
+		act 'Refuse (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_lake', 'start'
 	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>'
 	end
@@ -1592,7 +1592,7 @@ if $ARGS[0] = 'horse1':
 
 			gs 'willpower', 'group', 'resist'
 			if will_cost <= pcs_willpwr:
-				act 'Push them away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'lake', 'start'
+				act 'Push them away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_lake', 'start'
 			else
 				act 'Push them away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
@@ -1648,7 +1648,7 @@ if $ARGS[0] = 'horse1':
 									'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse9.jpg"></center>'
 									'You kneel before the second man and lick him from his balls to the head and take him in your mouth, as you suck his dick with pleasure the man trembles. "I''m going to finish."'
 
-									act 'Continue to suck':gt 'lake', 'horse1bj'
+									act 'Continue to suck':gt 'city_lake', 'horse1bj'
 
 									act 'Pull':
 										*clr & cla
@@ -1658,7 +1658,7 @@ if $ARGS[0] = 'horse1':
 										'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse10.jpg"></center>'
 										'You remove his member from your mouth and the man had finishes on your face, with the words, "Here''s a babys face cream." You gladly licked the remnants of sperm from his penis.'
 
-										act 'Leave':gt 'lake', 'start'
+										act 'Leave':gt 'city_lake', 'start'
 									end
 								end
 							end
@@ -1678,7 +1678,7 @@ if $ARGS[0] = 'horse1bj':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse11.jpg"></center>'
 	'The flow of sperm gushes into your mouth, you swallow it purring with pleasure, lick the remnants of his cock and swallow again.'
 
-	act 'Leave':gt 'lake', 'start'
+	act 'Leave':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'horse2':
@@ -1694,7 +1694,7 @@ if $ARGS[0] = 'horse2':
 		act 'Refuse (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', '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>'
@@ -1705,7 +1705,7 @@ if $ARGS[0] = 'horse2':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse2/horse2.jpg"></center>'
 		'You get down from your horses and start walking along the beach talking about any old nonsense.'
 
-		act 'Finish the walk':gt 'lake', 'start'
+		act 'Finish the walk':gt 'city_lake', 'start'
 
 		act 'Touch their pants':
 			*clr & cla
@@ -1764,7 +1764,7 @@ if $ARGS[0] = 'horse2':
 									'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse2/horse9.jpg"></center>'
 									'You remove the cock from your mouth and open wide, ready to catch the stream of sperm, the man does not keep you waiting and sperm splatters into your mouth, painting your tongue and throat.'
 
-									act 'Leave':gt 'lake', 'start'
+									act 'Leave':gt 'city_lake', 'start'
 								end
 							end
 						end
@@ -1775,5 +1775,5 @@ if $ARGS[0] = 'horse2':
 	end
 end
 
---- lake ---------------------------------
+--- city_lake ---------------------------------
 

locations/park.qsrc → locations/city_park.qsrc

@@ -1,14 +1,15 @@
-# park
+# city_park
+
 $location_type = 'public_outdoors'
 
 if $ARGS[0] = 'start':
 	CLOSE ALL
 
 	$metka = 'start'
-	$loc = 'park'
-	$menu_loc = 'park'
+	$loc = 'city_park'
+	$menu_loc = 'city_park'
 	$menu_arg = 'start'
-	$locclass = 'park'
+	$locclass = 'city_park'
 	menu_off = 0
 	if sound = 0:
 		if month >=11 and month <= 12 or month >=1 and month <=3:
@@ -20,7 +21,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	$sexloc = 'park'
+	$sexloc = 'city_park'
 
 	if WalkInsidePark = 0:WalkInsidePark = 1
 	*clr & cla
@@ -36,10 +37,10 @@ if $ARGS[0] = 'start':
 	*nl
 	if hour >= 10 and hour <= 22:'The small café in the park is open, you could sit there and have some food.'
 
-	if SNarkPriton = 0:'Near the cafe the <a href="exec: gt ''park'', ''junkies''">junkies</a> hang out.'
+	if SNarkPriton = 0:'Near the cafe the <a href="exec: gt ''city_park'', ''junkies''">junkies</a> hang out.'
 
 	if hour >= 9 or hour <= 20:
-		'There is an all year <a href="exec:gt ''park'', ''luna''">fair</a> at the park which you can visit.'
+		'There is an all year <a href="exec:gt ''city_park'', ''luna''">fair</a> at the park which you can visit.'
 	else
 		'There is an all year fair at the park but it is closed. Opening hours from 9:00 to 21:00.'
 	end
@@ -66,7 +67,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave': gt 'park', 'exit'
+	act 'Leave': gt 'city_park', 'exit'
 
 	act 'Walk around the park (1:00)': gt 'parkdin'
 
@@ -108,7 +109,7 @@ if $ARGS[0] = 'start':
 					'You get out your purse and pay him quickly, hoping nobody else saw you giving him money. Then he passes you the doses you''ve paid for and you can savely sniff the stuff at home.'
 				end
 
-				act 'Casually walk away':gt 'park', 'start'
+				act 'Casually walk away':gt 'city_park', 'start'
 			end
 		else
 			'You do not have enough money, not even for one dose.'
@@ -158,7 +159,7 @@ if $ARGS[0] = 'start':
 			act 'Finish your run':
 				cla & *nl
 				'You feel great after your run. A bit sweaty, but also that you''ve managed to improve your stamina as you even feel a bit slimmer.'
-				act 'Continue': gt 'park', 'start'
+				act 'Continue': gt 'city_park', 'start'
 			end
 			
 			if pcs_inhib >= 35  or exhibitionist_lvl > 0:
@@ -189,7 +190,7 @@ if $ARGS[0] = 'start':
 					pcs_mood -= 5
 					*nl
 					'No luck! After searching for half an hour, you find no one. For such a large city you would have thought there would be suitable prey around, your needs remain so maybe another search will be required?'
-					act 'Continue': gt 'park', 'start'
+					act 'Continue': gt 'city_park', 'start'
 				else
 					suchunt = 1 & gt 'parkivent', '1'
 				end
@@ -212,7 +213,7 @@ if $ARGS[0] = 'start':
 			gs 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
 
-			act 'Continue': gt 'park', 'start'
+			act 'Continue': gt 'city_park', 'start'
 		end
 	end
 
@@ -225,31 +226,31 @@ if $ARGS[0] = 'start':
 			gs 'flash', 'pussy', 'outdoors', 5
 			gs 'stat'
 
-			act 'Continue': gt 'park', 'start'
+			act 'Continue': gt 'city_park', 'start'
 		end
 	end
 end
 
 if $ARGS[0] = 'exit':
 	cla
-	$loc = 'park'
+	$loc = 'city_park'
 	$metka = 'exit'
-	$menu_loc = 'park'
+	$menu_loc = 'city_park'
 	$menu_arg = 'exit'
 	menu_off = 0
 	'<center><b><font color="maroon">Park</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/park.jpg"></center>'
-	act 'Don''t leave': gt 'park', 'start'
+	act 'Don''t leave': gt 'city_park', 'start'
 	!!this leads to the old street walker content, blocked until it''s fixed up or moved into the new street walker content (julzor)
-	!!act 'Go to the highway near the park (0:05)':minut += 5 & gt 'park', 'whore'
-	act 'Go to the Residential Area (0:20)':minut += 20 & gt 'street'
-	act 'Go to the City Center (0:35)':minut += 35 & gt 'down'
-	act 'Go to the City Industrial Region (1:00)':minut += 60 & gt 'Nord'
+	!!act 'Go to the highway near the park (0:05)':minut += 5 & gt 'city_park', 'whore'
+	act 'Go to the Residential Area (0:20)':minut += 20 & gt 'city_residential'
+	act 'Go to the City Center (0:35)':minut += 35 & gt 'city_center'
+	act 'Go to the City Industrial Region (1:00)':minut += 60 & gt 'city_industrial'
 end
 
 if $ARGS[0] = 'luna':
 	*clr & cla
-	$menu_loc = 'park'
+	$menu_loc = 'city_park'
 	$menu_arg = 'luna'
 	menu_off = 0
 	minut += 5
@@ -263,7 +264,7 @@ if $ARGS[0] = 'luna':
 
 	if vladimirQW = 0 and hour >= 9 and hour <= 20 and week > 5 and pcs_apprnc > 40:'<a href="exec:gt ''qwloc''">There''s a strong looking man staring at you from the fences.</a>.'
 
-	act 'Go back to the park':gt 'park', 'start'
+	act 'Go back to the park':gt 'city_park', 'start'
 	
 	if hour >= 9 and hour <= 20:
 		act 'Distribute flyers to earn money (50 <b>₽</b>) (1:00)':
@@ -275,7 +276,7 @@ if $ARGS[0] = 'luna':
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/flaer.jpg"></center>'
 			'For an hour straight, you walked through the park and the fun fair, chatting up random visitors and trying to give them one of your flyers. After that you are being paid 50 <b>₽</b> for your effort.'
 
-			act 'Move away':gt 'park', 'luna'
+			act 'Move away':gt 'city_park', 'luna'
 		end
 
 		if money >= 50:
@@ -294,7 +295,7 @@ if $ARGS[0] = 'luna':
 				'<center><img <<$set_imgh>> src="images/locations/city/centralpark/luna1.jpg"></center>'
 				'You enjoy the shawarma.'
 
-				act 'Move away':gt 'park', 'luna'
+				act 'Move away':gt 'city_park', 'luna'
 			end
 
 			act 'Drink Lemonade (50 <b>₽</b>)':
@@ -312,7 +313,7 @@ if $ARGS[0] = 'luna':
 				'<center><img <<$set_imgh>> src="images/locations/city/centralpark/luna1.jpg"></center>'
 				'You happily drink the refreshing lemonade.'
 
-				act 'Move away':gt 'park', 'luna'
+				act 'Move away':gt 'city_park', 'luna'
 			end
 
 			act 'Ride on the carousel (50 <b>₽</b>)':
@@ -328,7 +329,7 @@ if $ARGS[0] = 'luna':
 				'You paid 50 <b>₽</b> and sat in the carousel.'
 				'You have a great ride, already dazzled.'
 
-				act 'Move away':gt 'park','luna'
+				act 'Move away':gt 'city_park','luna'
 			end
 		end
 
@@ -375,7 +376,7 @@ if $ARGS[0] = 'luna':
 
 					shoot_lvl += 1
 
-					act 'Move away':gt 'park', 'luna'
+					act 'Move away':gt 'city_park', 'luna'
 				end
 			end
 		end
@@ -403,12 +404,12 @@ if $ARGS[0] = 'luna':
 						'You swung the hammer as hard as you could, but it wasn''t enough for a new record.'
 					end
 
-					act 'Move away':gt 'park', 'luna'
+					act 'Move away':gt 'city_park', 'luna'
 				end
 			end
 		end
 
-		act 'One-Armed Bandit':gt 'park', 'avtomat'
+		act 'One-Armed Bandit':gt 'city_park', 'avtomat'
 	else
 		'The fair is now closed.'
 	end
@@ -423,10 +424,10 @@ if $ARGS[0] = 'avtomat':
 	'The rules of the game are very simple, throw 5 <b>₽</b> into the slot, pull the lever and with a bit of luck you can win the jackpot of 1.000 <b>₽</b>.'
 
 	if money >= 5 and hour <= 20:
-		act 'Throw in 5 <b>₽</b> and pull the lever':gt 'park', 'avtomat2'
+		act 'Throw in 5 <b>₽</b> and pull the lever':gt 'city_park', 'avtomat2'
 	end
 
-	act 'Move away from the slot machine':gt 'park', 'luna'
+	act 'Move away from the slot machine':gt 'city_park', 'luna'
 end
 
 if $ARGS[0] = 'avtomat2':
@@ -454,13 +455,13 @@ if $ARGS[0] = 'avtomat2':
 		'Unfortunately, you weren''t able to win anything this time.'
 	end
 
-	act 'Try your luck once more':gt 'park', 'avtomat'
+	act 'Try your luck once more':gt 'city_park', 'avtomat'
 end
 
 if $ARGS[0] = 'whore':
     $location_type = 'event_outdoors'
 	*clr & cla
-	$menu_loc = 'park'
+	$menu_loc = 'city_park'
 	$menu_arg = 'whore'
 	menu_off = 0
 	gs 'stat'
@@ -479,7 +480,7 @@ if $ARGS[0] = 'whore':
 
 	temp = rand(1, 10)
 
-	act 'Go back to the park (0:05)': minut += 5 & gt 'park', 'start'
+	act 'Go back to the park (0:05)': minut += 5 & gt 'city_park', 'start'
 	
 	if pcs_inhib > 35:
 		act 'Flash breasts':
@@ -488,7 +489,7 @@ if $ARGS[0] = 'whore':
 			inhib_exp += 2
 			gs 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
-			act 'Go back to the park':gt 'park', 'start'
+			act 'Go back to the park':gt 'city_park', 'start'
 		end
 	end
 end
@@ -510,7 +511,7 @@ if $ARGS[0] = 'prost':
 			whoreQW = 2
 			'You went to a prostitute and asked her how things are done here at all. She began to explain. "We are free, do not work on anyone, but because of this many problems. Svimi Stella with her friends sometimes beat us and rob and sometimes come petty thugs and rob us of the money. If you want to work here, you have to pay and Stella and Bandyuk . course you cool, you can try to besiege Stella and her friends, but the bandits do not advise contact. And yet, you do not peck on customers, if you nebudesh dressed like a slut, you can buy some clothes in a sex shop. "'
 
-			act 'Move away':gt 'park', 'prost'
+			act 'Move away':gt 'city_park', 'prost'
 		end
 	elseif whoreQW = 0:
 		'Hey, you''re not one of us, would valyl from our point, and that the teeth will not collect.'
@@ -542,7 +543,7 @@ if $ARGS[0] = 'prost':
 						money -= 1000
 						'You gave the money big man in the jeep. He put them in his pocket and left.'
 
-						act 'Move away':gt 'park', 'prost'
+						act 'Move away':gt 'city_park', 'prost'
 					end
 				end
 
@@ -584,12 +585,12 @@ if $ARGS[0] = 'prost':
 
 				'After the client has finished you off immediately dropped out of the car.'
 
-				act 'Go to the panel':gt 'park', 'prost'
+				act 'Go to the panel':gt 'city_park', 'prost'
 			elseif whrand > 60 and whrand <= 90:
 				minut += 15
 				'You were walking along the sidewalk showing off their charms completely in vain, no you are not interested.'
 
-				act 'Go to the panel':gt 'park', 'prost'
+				act 'Go to the panel':gt 'city_park', 'prost'
 			elseif whrand > 90:
 				'To you approached a prostitute. "I hear you, slut, if you do not want problems, you have to pay Stella. Pyatihatnik Come here and get out on work."'
 
@@ -599,7 +600,7 @@ if $ARGS[0] = 'prost':
 						money -= 500
 						'You gave the money to the prostitute, she turned and walked away.'
 
-						act 'Move away':gt 'park', 'prost'
+						act 'Move away':gt 'city_park', 'prost'
 					end
 				end
 
@@ -618,7 +619,7 @@ if $ARGS[0] = 'prost':
 		end
 	end
 
-	act 'Move away':gt 'park', 'start'
+	act 'Move away':gt 'city_park', 'start'
 end
 
 if $ARGS[0] = 'rape1':
@@ -642,7 +643,7 @@ if $ARGS[0] = 'rape1':
 		gs 'arousal', 15, 'vaginal', 'rape', 'rough'
 		gs 'arousal', 'end'
 
-		act 'Leave':gt 'park', 'start'
+		act 'Leave':gt 'city_park', 'start'
 	end
 
 	act 'Try to relax and enjoy it':
@@ -668,7 +669,7 @@ if $ARGS[0] = 'rape1':
 			'It doesn''t take long for him to groan out in pleasure, "You better swallow it all, slut!" Shortly after that you can taste his hot cum inside your mouth and you swallow every drip of it, somehow enjoying the taste. Then he stand up, buttons up his pants and takes your money. While you were still liking your fingers clean from any drips of cum, he smiles and says to you, "Have a nice day slut."'
 			gs 'arousal', 'end'
 
-			act 'Stand up and leave':gt 'park', 'start'
+			act 'Stand up and leave':gt 'city_park', 'start'
 		end
 	end
 end
@@ -679,9 +680,9 @@ if $ARGS[0] = 'junkies':
 	SNarkPriton = 1
 	'The junkies look at you with a daunted gaze. They probably thought you are a police officer. Then one of them said, "We don''t sell no drugs. Go to the Drug House, ye can get zome there."'
 
-	act 'Walk away from them':gt 'park', 'start'
+	act 'Walk away from them':gt 'city_park', 'start'
 end
 
 
---- park ---------------------------------
+--- city_park ---------------------------------
 

locations/street.qsrc → locations/city_residential.qsrc

@@ -1,11 +1,11 @@
-# street
+# city_residential
 
 music_loop = 0
 CLOSE ALL
 $metka = ''
-$loc = 'street'
+$loc = 'city_residential'
 $location_type = 'public_outdoors'
-$menu_loc = 'street'
+$menu_loc = 'city_residential'
 $menu_arg = ''
 menu_off = 0
 killvar '$locclass'
@@ -21,7 +21,7 @@ if sound = 0:
 end
 
 !all random events move to [street_events], and display them before show location. by illume
-if streetevent_hour + 2 < hour:gt'street_event','street', 'main'
+if streetevent_hour + 2 < hour:gt'street_event','city_residential', 'main'
 
 '<center><h2>St. Petersburg</h2></center>'
 '<center><b>Residential Area</b></center>'
@@ -39,7 +39,7 @@ else
 	end
 end
 
-gs'street_event','street', 'extras'
+gs'street_event','city_residential', 'extras'
 
 if opusk > 0 or gnewQW = 5:
 	if rand(0,9) = 0:gt 'gopnew', 'start5'
@@ -89,7 +89,7 @@ act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
 
-if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''street'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''city_residential'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 if Enable_tablemap = 0:
 	if katkey = 1:'<a href="exec:gt ''katspalnya'', ''start''">Kats</a> apartment'
 	if IrinaQW >= 1:'<a href="exec:gt ''IrinaRoom'', ''start''">Irenes</a> apartment is not far away from yours.'
@@ -102,7 +102,7 @@ else
 	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 hour >= 10 and hour < 22 and lesbiQW = 1:
-		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Natalia Petrovnas</a> apartment.'
+		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Natalya Petrovnas</a> apartment.'
 	elseif lesbiday ! daystart and subdom = 2:
 		gs'show_table','<a href="exec:gt ''lesbisubhouse'', ''start''">Your slaves</a> apartment.','3'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 2 and lesbiQW < 13:
@@ -124,13 +124,13 @@ if hour >= 12 and hour <= 22 and week ! 1:'In a side alley, next to the uniquely
 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.'
 
-'The city''s large <a href="exec:minut += 20 & gt ''park'', ''start''">central park</a> is about a 20-minute walk away.'
-'The city''s only <a href="exec:minut += 40 & gt ''lake'', ''start''">lake</a> is just a 40-minute walk away.'
-'24 Hour <a href="exec:$loc = ''street'' & gt ''pharmacy'', ''start''">Pharmacy</a>.'
+'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>.'
 
 if Enable_tablemap = 0:
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
-		'<a href="exec:gt ''lesbidomhouse'', ''start''">Natalia Petrovna''s</a> apartment.'
+		'<a href="exec:gt ''lesbidomhouse'', ''start''">Natalya Petrovna''s</a> apartment.'
 	elseif lesbiday ! daystart and subdom = 2:
 		'<a href="exec:gt ''lesbisubhouse'', ''start''">Your slave''s</a> apartment.'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 2 and lesbiQW < 13:
@@ -152,9 +152,9 @@ if hour >= 8 and hour <= 23 or saunaWorkWhore > 0 or workDisk = 2:'<a href="exec
 if hour >= 20 or hour <= 4:
 	*nl
 	'There are prostitutes working in places near here.'
-	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 50):
+	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 100):
 		act 'Prostitute yourself': gt 'street_walker', 'work'
-	elseif pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 50):  
+	elseif pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 100):  
 		*nl
 		'You could work as a prostitute, but you need to wear appropriate clothes and more than a little bit of makeup.'
 	else
@@ -163,5 +163,5 @@ if hour >= 20 or hour <= 4:
 	end
 end
 
---- street ---------------------------------
+--- city_residential ---------------------------------
 

locations/clener.qsrc

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

locations/cloakroom.qsrc

@@ -92,6 +92,7 @@ if $ARGS[0] = 'view_coat_list':
 	if defaultcoat ! 0:
 		act 'Remove coat':
 			defaultcoat_warmth = 0
+			defaultcoat_quality = 0
 			defaultcoat = 0
 			gt 'cloakroom', 'view_coat_list'
 		end
@@ -130,13 +131,8 @@ if $ARGS[0] = 'view_coat_item':
 	if defaultcoat ! '<<ARGS[1]>>':
 		act 'Wear this coat':
 			defaultcoat = '<<ARGS[1]>>'
-			if defaultcoat < 4:
-				defaultcoat_warmth = 1
-			elseif defaultcoat = 4 or defaultcoat = 5 or defaultcoat = 8 or defaultcoat = 10 or defaultcoat = 12 or defaultcoat = 13 or defaultcoat = 14 or defaultcoat = 16 or defaultcoat = 17 or defaultcoat = 18 or defaultcoat = 19:
-				defaultcoat_warmth = 2
-			elseif defaultcoat = 6 or defaultcoat = 7 or defaultcoat = 9 or defaultcoat = 11 or defaultcoat = 15:
-				defaultcoat_warmth = 3
-			end
+			defaultcoat_warmth = CloWarm
+			defaultcoat_quality = CloQuality
 			gt 'wardrobe', 'start'
 		end
 	end

locations/clothing.qsrc

@@ -836,15 +836,15 @@ if $ARGS[0] = 'wear':
 !Calculations for clothing beauty, multiplied by natural beauty
 	if PCloThinness > 0:
 		if PCloThinness = 1:
-			PXCloThinness = 25
+			PXCloThinness = 150
 		elseif PCloThinness = 2:
-			PXCloThinness = 50
+			PXCloThinness = 200
 		elseif PCloThinness = 3:
-			PXCloThinness = 100
+			PXCloThinness = 250
 		elseif PCloThinness = 4:
-			PXCloThinness = 200
-		elseif PCloThinness = 5:
 			PXCloThinness = 300
+		elseif PCloThinness = 5:
+			PXCloThinness = 350
 		elseif PCloThinness = 6:
 			PXCloThinness = 400
 		end
@@ -852,17 +852,17 @@ if $ARGS[0] = 'wear':
 
 	if PCloTopCut > 0:
 		if PCloTopCut = 1:
-			PXCloTopCut = 25
+			PXCloTopCut = 100
 		elseif PCloTopCut = 2:
-			PXCloTopCut = 50
+			PXCloTopCut = 150
 		elseif PCloTopCut = 3:
-			PXCloTopCut = 100
+			PXCloTopCut = 200
 		elseif PCloTopCut = 4:
-			PXCloTopCut = 150
+			PXCloTopCut = 250
 		elseif PCloTopCut = 5:
-			PXCloTopCut = 200
-		elseif PCloTopCut = 6:
 			PXCloTopCut = 300
+		elseif PCloTopCut = 6:
+			PXCloTopCut = 350
 		elseif PCloTopCut >= 7:
 			PXCloTopCut = 400
 		end
@@ -877,17 +877,17 @@ if $ARGS[0] = 'wear':
 
 	if PCloSkirt > 0:
 		if PCloSkirt = 1:
-			PXCloBottomShortness = 25
+			PXCloBottomShortness = 100
 		elseif PCloSkirt = 2:
-			PXCloBottomShortness = 50
+			PXCloBottomShortness = 150
 		elseif PCloSkirt = 3:
-			PXCloBottomShortness = 100
+			PXCloBottomShortness = 200
 		elseif PCloSkirt = 4:
-			PXCloBottomShortness = 150
+			PXCloBottomShortness = 250
 		elseif PCloSkirt = 5:
-			PXCloBottomShortness = 200
-		elseif PCloSkirt = 6:
 			PXCloBottomShortness = 300
+		elseif PCloSkirt = 6:
+			PXCloBottomShortness = 350
 		elseif PCloSkirt >= 7:
 			PXCloBottomShortness = 400
 		end
@@ -895,17 +895,17 @@ if $ARGS[0] = 'wear':
 
 	if PCloPants > 0:
 		if PCloPants = 1:
-			PXCloBottomShortness = 25
+			PXCloBottomShortness = 100
 		elseif PCloPants = 2:
-			PXCloBottomShortness = 50
+			PXCloBottomShortness = 150
 		elseif PCloPants = 3:
-			PXCloBottomShortness = 100
+			PXCloBottomShortness = 200
 		elseif PCloPants = 4:
-			PXCloBottomShortness = 150
+			PXCloBottomShortness = 250
 		elseif PCloPants = 5:
-			PXCloBottomShortness = 200
-		elseif PCloPants = 6:
 			PXCloBottomShortness = 300
+		elseif PCloPants = 6:
+			PXCloBottomShortness = 350
 		elseif PCloPants >= 7:
 			PXCloBottomShortness = 400
 		end

locations/club.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club.jpg"></center>'
 	'The entrance area of the club is full of young people. The entrance itself is guarded by a very large man wearing a shirt that says security, who checks everyones and makes sure they pay to enter. The entry fee costs 250 <b>₽</b>.'
 
-	act 'Return to the city center': minut += 5 & gt 'down'
+	act 'Return to the city center': minut += 5 & gt 'city_center'
 
 	if clubwork = 1:
 		act 'Meet Erik for work':
@@ -124,7 +124,7 @@ if $ARGS[0] = 'inside':
 		cla
 		drunk = 0
 		minut += 5
-		gt 'down'
+		gt 'city_center'
 	end
 	
 	if hour >= 18 and clubwork = 0 and clubno = 1:
@@ -439,7 +439,7 @@ if $ARGS[0] = 'bar':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club1.jpg"></center>'
 			'You''re so drunk, you can barely remember where you live.'
 
-			act 'Try to go home':gt 'street'
+			act 'Try to go home':gt 'city_residential'
 			killvar 'temp'
 			exit
 		elseif temp = 6:
@@ -457,7 +457,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 7:
@@ -474,7 +474,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 8:
@@ -484,7 +484,7 @@ if $ARGS[0] = 'bar':
 			'The last thing you remember, is how you tried to pose as a waitress.'
 			'You''re too drunk to continue partying here. The security has to escort you out.'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 9:
@@ -497,7 +497,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 10:
@@ -510,7 +510,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 11:
@@ -523,7 +523,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 12:
@@ -536,7 +536,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 13:
@@ -549,7 +549,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 14:
@@ -562,7 +562,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 15:
@@ -575,7 +575,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 16:
@@ -588,7 +588,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 17:
@@ -601,7 +601,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 18:
@@ -614,7 +614,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 19:
@@ -627,7 +627,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 20:
@@ -640,7 +640,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 21:
@@ -653,7 +653,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 22:
@@ -666,7 +666,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 23:
@@ -679,7 +679,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp = 24:
@@ -692,7 +692,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		elseif temp > 24:
@@ -705,7 +705,7 @@ if $ARGS[0] = 'bar':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'down'
+			act 'Leave':gt 'city_center'
 			killvar 'temp'
 			exit
 		end

locations/dateM.qsrc

@@ -271,7 +271,7 @@ if $args[0] = 'date_choice':
 		!!if good weather, day/night, go to park is an option
 		act '"Let''s go to the park."':gt 'dateM', 'datepark'
 	end
-	if $loc = 'pavResidential' or $loc = 'pavCommercial' or $loc = 'down':
+	if $loc = 'pavResidential' or $loc = 'pavCommercial' or $loc = 'city_center':
 		!!if in pav or city center this is an option
 		act '"Let''s go to the movie theater."':gt 'dateM', 'datecinema'
 	end

locations/dima.qsrc

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

locations/din_bad.qsrc

@@ -190,6 +190,15 @@ if $ARGS[0] = 'd_bag':
 	else
 		'You are out of birth control pills.'
 	end
+	if morning_after_pill > 0:
+		if morning_after_pill = 1:
+			'You have one <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pill</a>.'
+		else
+			'You have <b><<birth_control[''morning_after'']>></b> <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pills</a>.'
+		end
+	else
+		'You have no morning after pills.'
+	end
 	if mentats_have > 0 and mentats_dose < 3:
 		'<a href="exec: gs ''drugs'', ''mentats'' & gs ''din_bad'', ''d_bag'' & *pl ''<font color = green><br>You swallow the neurobooster pill.</font>''">Use a neurobooster pill in your purse.</a> There are <b><<mentats_have>></b> pills left. The warning label says not to take more than one per day.'
 	elseif mentats_have > 0:

locations/din_npc.qsrc

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

locations/dina.qsrc

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

locations/dinfather.qsrc

@@ -596,7 +596,7 @@ if $ARGS[0] = 'gardrunkchat':
     elseif fatherTalk = 3:
         'You sit down and join the older men for a drink. You can tell your stepfather and your uncle are good friends.'
     end
-    if pav_slut >= 75 and dyadyamishaevent = 1 and dmishaday ! daystart and fatherandmisha!1:
+    if pav_slut >= 150 and dyadyamishaevent = 1 and dmishaday ! daystart and fatherandmisha!1:
         *clr & cla
         '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
         'Uncle Misha kept staring at you. Suddenly he turns to your stepfather.'

locations/dinsexgivi.qsrc

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

locations/dolls.qsrc

@@ -56,7 +56,7 @@ if $ARGS[0] = 'start':
 
 		act 'Go to the counter': gt 'dolls', 'viola'
 	end
-	act 'Leave': minut += 2 & gt 'island'
+	act 'Leave': minut += 2 & gt 'city_island'
 end
 
 if $ARGS[0] = 'clothing':

locations/dorm.qsrc

@@ -1,7 +1,7 @@
 # dorm
+
 if $ARGS[0] = 'start':
-	cla
-	*clr
+	*clr & cla
 	minut += 5
 	$menu_loc = 'dorm'
 	$menu_arg = 'start'
@@ -12,64 +12,42 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
 
 	act 'Leave':
-		cla
+		*clr & cla
 		minut += 5
 		reccoldorm = 0
-		gt 'island'
+		gt 'city_island'
 	end
 	
 	if student = 0:
 		menu_off = 1
-		'Since you''re not attending the University you are not allowed to enter unless you''re visiting someone you know.'
-
-		act 'Leave': minut += 5 & gt 'island'
-
-		if afra > 0 and hour < 22 and hour >= 7:
+		'Since you''re not attending the University, you''re not allowed to enter unless you''re visiting someone you know.'
+		act 'Leave': minut += 5 & gt 'city_island'
+		if meet_djibril = 1 and hour < 22 and hour >= 7:
 			act 'I''m here to visit Djibril':
-				cla
-				'You say that you are here to visit the african students. The janitor remarks, "Look at this whore... What, your own kind not good enough for you? Go ahead and take care of those black cocks."'
-				reccoldorm = 1
-				demarcusflag = 1
-
+				*clr & cla
+				'You say that you are here to visit Djibril. The janitor remarks "Look at this whore... What, your own kind not good enough for you? Go ahead and take care of those black cocks."'
 				act 'Enter':gt 'dorm', 'korr'
 			end
 		end
-
 		if gosh > 0 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Gosha':
-				cla
-				'You say that you''re here to visit Gosha. The janitor chuckles, "Gosha''s new bitch? What you sluts see in that scrawny bastard, I''ll never understand. He''s already been through the half of the dorm already. Heh, go to your stud, bitch."'
+				*clr & cla
+				'You say that you''re here to visit Gosha. The janitor chuckles and says "Gosha''s new bitch? What you sluts see in that scrawny bastard, I''ll never understand. He''s already been through half of the dorm already. Heh, go to your stud, bitch."'
 				reccoldorm = 1
 				goshiflag = 1
-
 				act 'Enter':gt 'dorm', 'korr'
 			end
 		end
-
-		if afra > 20 and afragang = 1 and kendra > 0 and hour >= 8 and hour < 22:
+		if meet_kendra = 1 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Kendra':
-				cla
-				'You say that you''re here to visit Kendra. The janitor chuckles, "Go on, have fun!"'
-				reccoldorm = 1
-				kendraflag = 1
-
-				act 'Enter':gt 'dorm', 'korr'
-			end
-		end
-
-		if afra > 10 and afragang = 1 and hour >= 8 and hour < 22:
-			act 'I''m here to visit the african students':
-				cla
-				'You say that you are here to visit the african students. The janitor remarks, "Look at this whore... What, your own kind not good enough for you? Go ahead and take care of those black cocks."'
-				reccoldorm = 1
-				afraflag = 1
-
+				*clr & cla
+				'You say that you''re here to visit Kendra. The janitor chuckles and says "Go on then, have fun!"'
 				act 'Enter':gt 'dorm', 'korr'
 			end
 		end
 	else
 		act 'Enter':
-			cla
+			*clr & cla
 			minut += 5
 			reccoldorm = 1
 			gt 'dorm', 'korr'
@@ -88,13 +66,17 @@ if $ARGS[0] = 'korr':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obkorr.jpg"></center>'
-	'Before you is the usual hostel hallway with dilapidated walls, you can hear music and loud talking from drunk students escaping from some rooms.'
-
+	'Before you is the usual dorm hallway with dilapidated walls. You can hear music and loud talking from drunk students escaping from some rooms.'
 	act 'Leave':
-		cla
+		*clr & cla
 		minut += 5
 		reccoldorm = 0
-		gt 'island'
+		gt 'city_island'
+	end
+	act 'Go to the shared bathroom':
+		minut += 5
+		obdysh = 1
+		gt 'vann', 'start'
 	end
 
 	if student > 0:
@@ -102,423 +84,171 @@ if $ARGS[0] = 'korr':
 			gt 'sentence', 'letter'
 		end
 		act 'Your room':gt 'obroom', 'start'
-
 		act 'Go to the shared kitchen':
 			minut += 5
 			gt 'obkitchen'
 		end
-
-		act 'Go to the shared bathroom':
-			minut += 5
-			obdysh = 1
-			gt 'vann', 'start'
-		end
-
 		if week = 5 and hour > 18 and hour < 23:
-			'You can hear the music blasting in the corridor, it seems the friday party is in full swing.'
+			'You can hear music blasting in the corridor. It seems the Friday party is in full swing.'
 
 			act 'The party':gt 'vecher', 'start'
 		end
 	end
 
-	if afra > 0 and hour < 22 and hour >= 7:
+	if meet_djibril = 1 and hour < 22 and hour >= 7:
 		act 'Djibril'' room':
-			cla
+			*clr & cla
 			afrand = rand(1, 2)
-
 			if afrand = 1:
 				minut += 5
 				gs 'stat'
 				'You knock on the door, but he is not there.'
-
 				act 'Leave':gt 'dorm', 'korr'
 			elseif afrand = 2:
-				gt 'dorm', 'demarcusfuck'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big82.jpg"></center>'
+				'You knock on the door. After a couple of seconds, Djibril opens the door. He smiles as he notices it''s you, and invites you in.'
+				act 'Enter': gt 'dorm', 'djibrilroom'
 			end
 		end
 	end
 
-	if afra > 10 and hour >= 8 and hour < 22:
-		act 'African students'' room':
-			cls
-			minut += 5
-			gs 'stat'
-			afrand = rand(1, 2)
-
-			if afrand = 1:
-				'You knock on the door, but there is no answer.'
-				act 'Leave':minut += 5 & gt 'dorm', 'korr'
-			elseif afrand = 2:
-				minut += 120
-				if afragang = 0:afragang = 1 & guy += 6
-				gt 'dorm', 'afragangfuck'
-			end
-		end
-	end
-
-	if afra > 20 and afragang = 1 and hour >= 8 and hour < 22:
+	if meet_kendra = 1 and hour >= 8 and hour < 22:
 		act 'Kendra''s room':
-			cls
-			gt 'dorm', 'kendrafuck'
-			minut += 15
+			*clr & cla
 			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big84.jpg"></center>'
+			'You knock on the door. After a couple of seconds, Kendra opens the door and invites you in.'
+			act 'Enter': gt 'dorm', 'kendraroom'
 		end
 	end
 
 	if gosh > 0 and hour >= 8 and hour < 22:
 		act 'Gosha''s room':
-			cla
+			*clr & cla
 			menu_off = 1
 			minut += 15
 			gs 'stat'
 			'Gosha opens the door and invites you inside.'
-
 			act 'Walk into Gosha''s Room':
-				cla
-				gt 'dorm', 'goshifuck'
+				*clr & cla
+				gt 'dorm', 'gophiroom'
 			end
-
 			act 'Go for a walk with Gosha':
-				cla
+				*clr & cla
 				gosh += 1
 				minut += 120
 				gs 'stat'
 				'You go for a walk with Gosha. You have a great time, he''s a great conversationalist and a true gentleman.'
-
 				act 'Leave':gt 'dorm', 'korr'
 			end
 		end
 	end
-
-	if reccoldorm = 1:
-		if demarcusflag = 1:demarcusflag = 0 & gt 'dorm', 'demarcusfuck'
-		if goshiflag = 1:goshiflag = 0 & gt 'dorm', 'goshifuck'
-		if afraflag = 1:afraflag = 0 & gt 'dorm', 'afragangfuck'
-		if kendraflag = 1:kendraflag = 0 & gt 'dorm', 'kendrafuck'
-	end
 end
 
-if $ARGS[0] = 'demarcusfuck':
-	cla
-	menu_off = 1
+if $ARGS[0] = 'djibrilroom':
+	*clr & cla
 	$location_type = 'event'
 	reccoldorm = 0
-	demarcusflag = 0
+	djibrilflag = 0
 	gs 'boyStat', 'A82'
-	*clr
-	'You knocked on the door. After a couple of seconds a large black guy opens the door. He smiles as he notices it''s you, and invites you in. He quickly cleans the quite luxurious room for a student and tells you to take a seat.'
-	if afra < 17:
-		afrand1 = rand(1,afra)
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/djibrilroom/room.jpg"></center>'
+	'His room is bigger than you expected. There is just one bed over by the windows, and next to that is a desk and a laptop. Closer to the door is a couch and a recliner, with a small tv and playstation across from them. It is clean and tastefully decorated.'
+	!!if meet_djibril = 1 and hotcat >= 5:
+		!!do stuff
+	!!elseif djibril_sex >= 1:
+		!!do stuff
+		!!will add the above two later, just wanted to get the visiting him in his dorm room after the cafe event and to make the gangbang repeatable by just going to his room. More will come later.
+	!!elseif
+	if african_gangbang >= 1:
+		'As you enter, he looks you over hungrily and asks you "Would you like me to invite my friends over?" You know he is talking about inviting his friends over to gangbang you again.'
+		act 'No, let''s just talk': gt 'dorm', 'djibril_chat'
+		act 'Yes':
+			*clr & cla
+			minut += 10
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big82.jpg"></center>'
+			'He grins at that and grabs his phone. He starts sending out text messages. Once he finishes, he sits down in the reclining chair. "They should be here shortly" he tells you, and sure enough within a few minutes the first one arrives. Not long after the other two do as well. They take a seat on the couch with you.'
+			act 'Continue': gt 'dormev1', 'djibrilgb'
+		end
 	else
-		afrand1 = rand(1,17)
-	end
-	gs 'stat'
-	act 'Drink with Djibril':
-		cla
-		cls
-		minut += 120
-		if pcs_hydra >= 100:
-			pcs_hydra -= 5
-		else
-			pcs_hydra -= 10
+		'As you enter, he asks you "So... what do you want to do? We can play some games, or just talk." He points to the Playstation and the couch.'
+		act 'Let''s talk': gt 'dorm', 'djibril_chat'
+		act 'Let''s play':
+			*clr & cla
+			gaming_exp += rand(1, 2)
+			minut += 60
+			npc_rel['A82'] += 1
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big82.jpg"></center>'
+			'You walk over and take a seat on the couch, picking up one of the controllers. "Sure, let''s play." He grins and turns the playstation on. He joins you on the couch, after grabbing the other controller. It is some sports game about football, you have played it before but not too often. He is a much better player than you are, he must play it a lot. You don''t mind, the two of you laugh and talk as you play. After an hour he finally turns it off. "I had fun, but I need to get some studying done. Maybe you can come by again some other day?"'
+			'You nod and put the controller down as you gather up your stuff. "Sure, I''d love to. Well, have fun studying." He laughs at that and then escorts you to the door.'
+			act 'Leave':gt 'dorm', 'korr'
 		end
-		'He hands over a glass of wine which you happily accept. The two of you drink wine and talk for a moment and as you feel loose, he leans and begins to grope you by the chest.'
-		'As he notices you not resisting takes off your T-shirt, he begins sucking on your nipples and playing with your breasts, you feel yourself becoming very wet very quickly.'
-		if demarkus = 0:guy += 1 & demarkus = 1
-		sexpartkno = 1
-		if afrand1 = 1:
-			gs 'cum_manage'
-			afra += 1
-			pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra.jpg"></center>'
-			'Djibril lays you on the bed, and pulls out his huge black cock. Before you''re able to speak up he spreads your legs apart to easily enter your pussy.'
-			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
-			$orgasm_or = 'yes'
-			gs 'arousal', 'vaginal', 20, 'rough'
-		elseif afrand1 = 2:
-			gs 'cum_manage'
-			afra += 1
-			pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra1.jpg"></center>'
-			'Djibril lays you on the floor, and pulls out his huge black cock. Before you''re able to speak up he spreads your legs apart to easily enter your pussy.'
-			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
-			$orgasm_or = 'yes'
-			gs 'arousal', 'vaginal', 20, 'rough'
-		elseif afrand1 = 3:
-			gs 'cum_manage'
-			afra += 1
-			pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra2.jpg"></center>'
-			'Djibril pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before penetrating your pussy.'
-			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
-			$orgasm_or = 'yes'
-			gs 'arousal', 'vaginal', 20, 'rough'
-		elseif afrand1 = 4:
-			spafinloc = 3
-			gs 'cum_manage'
-			afra += 1
-			pcs_ass += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra4.jpg"></center>'
-			'Djibril pushes you on all fours on the bed, he pulls out his huge black cock and spreads apart your ass cheeks before thrusting his thick cock into your asshole.'
-			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
-			anal_slip += 4
-			$orgasm_or = 'yes'
-			gs 'arousal', 'anal', 20, 'rough'
-		elseif afrand1 = 5:
-			gs 'cum_manage'
-			afra += 1
-			pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra24.jpg"></center>'
-			'Djibril pushes you on all fours on the bed, he pulls out his huge black cock and salms into your pussy, stretching it to the limit.'
-			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
-			$orgasm_or = 'yes'
-			gs 'arousal', 'vaginal', 20, 'rough'
-		elseif afrand1 = 6:
-			spafinloc = 3
-			gs 'cum_manage'
-			afra += 1
-			pcs_ass += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra16.jpg"></center>'
-			'Djibril pushes you face down ass up on the bed and pulls out his huge black cock. He makes you spread wide apart and before you know it he enters your asshole.'
-			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
-			anal_slip += 4
-			$orgasm_or = 'yes'
-			gs 'arousal', 'anal', 20, 'rough'
-		elseif afrand1 = 7:
-			spafinloc = 3
-			gs 'cum_manage'
-			afra += 1
-			pcs_ass += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra13.jpg"></center>'
-			'Djibril throws you on the bed and easily picks your back part up as he penetrates your asshole with his huge black cock.'
-			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
-			anal_slip += 4
-			$orgasm_or = 'yes'
-			gs 'arousal', 'anal', 20, 'rough'
-		elseif afrand1 = 8:
-			spafinloc = 3
-			gs 'cum_manage'
-			afra += 1
-			pcs_ass += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra20.jpg"></center>'
-			'Djibril lays on the bed, you stradle him and force your asshole down on his huge black cock.'
-			'You ride his thick cock until you orgasm a few times. He cums inside you and passes out.'
-			anal_slip += 4
-			$orgasm_or = 'yes'
-			gs 'arousal', 'anal', 20, 'rough'
-		elseif afrand1 = 9:
-			gs 'cum_manage'
-			afra += 1
-			pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra11.jpg"></center>'
-			'Djibril throws you on the bed and easily picks your back part up as he penetrates your pussy with his huge black cock.'
-			'He furiously pounds you with his huge cock, you orgasm a few times on his cock. He cums inside you and collapses out on top of you.'
-			$orgasm_or = 'yes'
-			gs 'arousal', 'vaginal', 20, 'rough'
-		elseif afrand1 = 10 or afrand1 = 11:
-			afrand2 = rand(1,9)
-			if afrand2 = 1:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra3.jpg"></center>'
-			if afrand2 = 2:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra18.jpg"></center>'
-			if afrand2 = 3:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra23.jpg"></center>'
-			if afrand2 = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra31.jpg"></center>'
-			if afrand2 = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra33.jpg"></center>'
-			if afrand2 = 6:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra35.jpg"></center>'
-			if afrand2 = 7:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra37.jpg"></center>'
-			if afrand2 = 8:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra38.jpg"></center>'
-			if afrand2 = 9:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra40.jpg"></center>'
-			pcs_throat += 1
-			spafinloc = 11
-			gs 'cum_manage'
-			afra += 1
-			'Djibril has you drop on your knees, revealing his huge cock and before you know it, your lips are wrapped around his cock as he pushes his huge black cock down your throat.'
-			'While Djibril is fucking your mouth, you carefully massage and finger your pussy. Djibril takes out his cock and as cums all over your face, you orgasm.'
-			$orgasm_or = 'yes'
-			gs 'arousal', 'vaginal', 20, 'rough'
-			gs 'arousal', 'bj', 20
-			minut -= 20
-
-		elseif afrand1 = 12 or afrand1 = 13:
-			afrand2 = rand(0,6)
-			if afrand2 = 0:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra10.jpg"></center>'
-			if afrand2 = 1:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra14.jpg"></center>'
-			if afrand2 = 2:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra32.jpg"></center>'
-			if afrand2 = 3:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra34.jpg"></center>'
-			if afrand2 = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra36.jpg"></center>'
-			if afrand2 = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra39.jpg"></center>'
-			if afrand2 = 6:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra41.jpg"></center>'
-			pcs_throat += 1
-			spafinloc = 11
-			gs 'cum_manage'
-			afra += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra10.jpg"></center>'
-			'Djibril has you drop on your knees, revealing his huge cock and before you know it, your lips are wrapped around his cock as he pushes his huge black cock down your throat.'
-			'While Djibril is fucking your mouth, you carefully massage and finger your pussy. Djibril takes out his cock and as cums all over your face, you orgasm.'
-			$orgasm_or = 'yes'
-			gs 'arousal', 'vaginal', 20, 'rough'
-			gs 'arousal', 'bj', 20
-			minut -= 20
-		else
-			spafinloc = 1
-			gs 'cum_manage'
-			afra += 1
-			pcs_vag += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra42.jpg"></center>'
-			'Djibril lays you on the bed, and pulls out his huge black cock. He spreads your legs apart as he slams into your pussy.'
-			'While Djibril furiously pounds you, you orgasm a few times on his cock. Just as he''s about to cum he pulls out and cums on you sore clit.'
-			$orgasm_or = 'yes'
-			gs 'arousal', 'vaginal', 20, 'rough'
+		act 'I should get going':
+			*clr & cla
+			npc_rel['A82'] -= 1
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big82.jpg"></center>'
+			'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
+			act 'Leave':gt 'dorm', 'korr'
 		end
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Leave':gt 'dorm', 'korr'
 	end
 end
 
-if $ARGS[0] = 'afragangfuck':
-	afrdormgangbang += 1
-	menu_off = 1
+if $ARGS[0] = 'djibril_chat':
+	*clr & cla
 	$location_type = 'event'
 	reccoldorm = 0
-	afraflag = 0
-	minut += 120
-	'You knock on door and are greeted by a huge black guy. He grabs you by the arm and drags you into the room, in where you see five Africans. They surround you and immediately begin grabbing your breasts and ass.'
-	'They speak a lot in their native language but there are some words you''re able to pick up, cumdump, whore, white trash, bimbo slut.'
-	afrand = rand(1, afra)
-
-	if afrand = 1:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra5.jpg"></center>'
-	elseif afrand = 2:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra6.jpg"></center>'
-	elseif afrand = 3:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra7.jpg"></center>'
-	elseif afrand = 4:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra8.jpg"></center>'
-	elseif afrand = 5:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra9.jpg"></center>'
-	elseif afrand = 6:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra12.jpg"></center>'
-	elseif afrand = 7:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra17.jpg"></center>'
-	elseif afrand = 8:
-	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra19.jpg"></center>'
-	elseif afrand = 9:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra21.jpg"></center>'
-	elseif afrand = 10:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra22.jpg"></center>'
-	elseif afrand = 11:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra25.jpg"></center>'
-	elseif afrand = 12:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra26.jpg"></center>'
-	elseif afrand >= 13:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra27.jpg"></center>'
-	end
-
-	gs 'stat'
-	afraboy = 6
-	:afraboys
-	gs 'npcgeneratec', 0, 'african student', rand(18,22)
-	gs 'npcgenext', 'dick', 3
-	$npc_thdick[$npclastgenerated] = $npctempgn[4]
-	npc_dick[$npclastgenerated] = npctempgn[5]
-	npc_Malen[$npclastgenerated] = rand(10,15)
-	gs 'boyStat', $npclastgenerated
-		fucloc = rand(0,2)
-		if fucloc = 0:
-			sexpartkno = 1
-			cumprecheck = 1
-			gs 'arousal', 'vaginal', 20
-			gs 'stat'
-			gs 'cum_manage'
-		elseif fucloc = 1:
-			gs 'arousal', 'anal', 20
-			gs 'stat'
-		else
-			gs 'arousal', 'bj', 20
-			gs 'stat'
-			end
-		!random finishes, 17 and 18 default to spafinloc = 0
-		fucloc = rand(0,18)
-		if fucloc < 3:
-			spafinloc = 1
-		elseif fucloc < 6:
-			spafinloc = 3
-		elseif fucloc < 8:
-			spafinloc = 4
-		elseif fucloc < 10:
-			spafinloc = 12
-		elseif fucloc < 12:
-			spafinloc = 11
-		elseif fucloc = 12:
-			spafinloc = 8
-		elseif fucloc = 13:
-			spafinloc = 13
-		elseif fucloc = 14:
-			spafinloc = 14
-		elseif fucloc = 15:
-			spafinloc = 15
-		elseif fucloc = 16:
-			spafinloc = 16
-		end
-		gs 'cum_manage'
-		afraboy -= 1
-	if afraboy > 0: jump 'afraboys'
-	gang += 1
-	afra += 1
-
-	'The africans have ripped all the clothes off and started to play with your body like a toy, having you in all sorts of poses and fucking you relentlessly abusing all your holes.'
-	'While they fuck you in all your holes you orgasm a few times and as they finish up one after one they make sure they''ve covered your entire body in african cum.'
-
-	$orgasm_or = 'yes'
-	gs 'arousal', 'vaginal', 20
-	gs 'arousal', 'anal', 20
-	gs 'arousal', 'bj', 20
-	gs 'arousal', 'hj', 20
-	gs 'arousal', 'end'
-	minut -= 20
-	gs 'stat'
-
+	djibrilflag = 0
+	gs 'boyStat', 'A82'
+	*clr & cla
+	chrsm_exp += rand(1,2)
+	minut += 5
+	npc_rel['A82'] += 1
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big82.jpg"></center>'
+	'You walk over and take a seat on the couch. "Sure, let''s talk." He smiles and joins you on the couch. "What do you want to talk about?" he asks.'
 	act 'Leave':gt 'dorm', 'korr'
+	act 'Make small talk':
+		*clr & cla
+		minut += 30
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big82.jpg"></center>'
+		'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He asks you about similar stuff, asking about your school, friends, home life etc. Overall, it is a pleasant conversation.'
+		act 'Leave':gt 'dorm', 'korr'
+		act 'Keep talking': gt 'dorm', 'djibril_chat'
+	end
 end
 
-if $ARGS[0] = 'kendrafuck':
+if $ARGS[0] = 'kendraroom':
 	menu_off = 1
 	$location_type = 'event'
 	reccoldorm = 0
 	kendraflag = 0
 	gs 'stat'
-	if kendra = 5:
-		'Kendra opens the door and invites you in. It doesn''t take long before you both are naked and are exctingly touching eachother.'
-
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/kendraroom/room.jpg"></center>'
+	'There are two beds, one on each side of the window. There are various pictures and posters hanging on both sides of the room. One side also has a string of large lights hanging up as well. Just down from the beds on each side are two desks, against each wall. Both are decorated with slight differences. Near the door is a small couch and two wardrobes.'
+	if kendraslave = 6:
+		'Kendra opens the door and invites you in. It doesn''t take long before you are both naked and excitedly touching each other.'
 		act 'Have sex':
-			cla
+			*clr & cla
 			lesb += 1
 			gs 'stat'
 			picrand = rand(1, 5)
 			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/kendrastrap<<picrand>>.jpg"></center>'
-			'Kendra smiles as she takes out the strap-on and locks herself in it. She has you spread your legs wide as she fucks you hard until she has you orgasm.'
-
+			'Kendra smiles as she takes out the strap-on and locks herself into it. She has you spread your legs wide as she fucks you hard, until she brings you to orgasm.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal_strap', 20, 'sub'
 			gs 'stat'
-
 			act 'Leave':gt 'dorm', 'korr'
 		end
-	elseif kendra = 4:
-		'The lovely ebony Kendra opens the door. She observes you for a while and suggests that you get another tattoo, and only then and not before will she allow you to taste her once again.'
-
+	elseif kendraslave = 5:
+		'The lovely ebony woman Kendra opens the door. She observes you for a while, and suggests that you get another tattoo. Only then, and not before, will she allow you to taste her once again.'
 		act 'Leave':gt 'dorm', 'korr'
-
 		act 'Get a tattoo':
-			cla
+			*clr & cla
 			minut += 60
 			kendra = 5
 			tat = 5
 			gs 'stat'
-
 			if tatlip = 1 or tatlip = 3:
-				'"So you went and got a tattoo? Took you some time, but I got to say you''re a quite obidiant. Now get to work!"'
+				'"So, you went and got yourself a tattoo? Took you some time, but I''ve got to say, you''re a quite obedient. Now get to work!"'
 			else
-
 				if rand(1, 2) = 1:
 					tatlip = 1
 					'<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip1.jpg"></center>'
@@ -526,45 +256,37 @@ if $ARGS[0] = 'kendrafuck':
 					tatlip = 3
 					'<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip3.jpg"></center>'
 				end
-
 				if tatlip > 1 and tatlip ! 3:
-					'Kendra sees that you already have tattooed your lip, "Don''t you want to cover that up?" she asks, "A whore should have something else tattooed there, cocksucker seems fitting." She does it so masterfully that the old tattoo is not noticeable anymore.'
+					'Kendra sees that you have already tattooed your lip. "Don''t you want to cover that up?" she asks. "A whore should have something else tattooed there. Cocksucker seems fitting." She does it so masterfully that the old tattoo is not noticeable anymore.'
 				else
 					tattCount += 1
-					'Kendra tattoo''s cocksucker on your lip.'
+					'Kendra tattoos cocksucker on your lip.'
 				end
 			end
-
 			act 'Give yourself to Kendra':
-				cla
+				*clr & cla
 				lesb += 1
 				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/kendrastrap1.jpg"></center>'
-				'Kendra undresses you and puts you on all fours, she puts on a strap-on and pushes it deep inside your pussy. Her thrusts are magical and it doesn''t take long before you orgasm. After a while she decides you had enough.'
-
+				'Kendra undresses you and places you on all fours. She puts on a strap-on, and pushes it deep inside your pussy. Her thrusts are magical, and it doesn''t take long before you orgasm. After a while she decides you''ve had enough.'
 				$orgasm_or = 'yes'
 				gs 'arousal', 'vaginal_strap', 20, 'sub'
 				gs 'stat'
-
 				act 'Leave':gt 'dorm', 'korr'
 			end
 		end
-	elseif kendra = 3:
-		'The lovely African Kendra comes out of her room, and suggests you get another tattoo, after which she will allow you to lick her.'
-
+	elseif kendraslave = 4:
+		'The lovely African woman Kendra comes out of her room, and suggests you get another tattoo. After which, she will allow you to lick her.'
 		act 'Leave':gt 'dorm', 'korr'
-
 		act 'Get a tattoo':
-			cla
+			*clr & cla
 			minut += 60
 			kendra = 4
 			tat = 4
 			gs 'stat'
-
 			if tatvag = 3 or tatvag = 18:
 				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/pubic/tatvag3.jpg"></center>'
-				'Kendra says that you already have such a stigma, a predatory smile and savory otveschshivaem you slap on the vagina.'
+				'Kendra sees that you already have such a tattoo. A predatory smile spreads across her face, and she gives you a light tap on the vagina.'
 			else
-
 				if rand(1, 2) = 1:
 					tatvag = 3
 					'<center><img <<$set_imgh>> src="images/pc/body/tattoos/pubic/tatvag3.jpg"></center>'
@@ -572,41 +294,36 @@ if $ARGS[0] = 'kendrafuck':
 					tatvag = 18
 					'<center><img <<$set_imgh>> src="images/pc/body/tattoos/pubic/tatvag18.jpg"></center>'
 				end
-
 				if tatvag ! 18 and tatvag ! 3:
-					'Kendra sees that you already have a tattoo above your pussy. "Nothing, it''s a quick fix." - she says, and tattoos you above the pussy with the whore for blacks tattoo over the old one. She does it so masterfully that old tattoo is not noticeable.'
+					'Kendra sees that you already have a tattoo above your pussy. "Ah, this''ll be a quick fix" she says, and tattoos you above the pussy with the ''Whore for Blacks'' tattoo over the old one. She does it so masterfully that old tattoo is not noticeable.'
 				else
 					tattCount += 1
-					'Kendra tattoos you above the pussy with the whore for blacks tattoo.'
+					'Kendra tattoos you above the pussy with the ''Whore for Blacks'' tattoo.'
 				end
 			end
-
 			act 'Lick Kendra':
-				cla
+				*clr & cla
 				*clr
 				lesb += 1
 				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/kendra3.jpg"></center>'
-				'Kendra undresses and pushes your face to start licking her pussy. You skillfully run your tongue in her juicy pussy and Kendra orgasms violently.'
+				'Kendra undresses and pushes your face between her legs to get you to start licking her pussy. You skillfully run your tongue up along and inside her juicy pussy, and Kendra orgasms violently.'
 				gs 'arousal', 'cuni_give', 20, 'sub'
 				gs 'stat'
 				act 'Leave':gt 'dorm', 'korr'
 			end
 		end
-	elseif kendra = 2:
-		'The lovely ebony Kendra opens the door. She observes you for a while and suggests that you get another tattoo, and only then and not before will she allow you to taste her once again.'
-
+	elseif kendraslave = 3:
+		'The lovely ebony lady Kendra opens the door. She observes you for a while, and suggests that you get another tattoo. Only then, and not before, will she allow you to taste her once again.'
 		act 'Leave':gt 'dorm', 'korr'
-
 		act 'Get a tattoo':
-			cla
+			*clr & cla
 			minut += 60
 			kendra = 3
 			tat = 3
 			gs 'stat'
-
 			if tatlech = 4:
 				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/shoulder/tatshldr4.jpg"></center>'
-				'Kendra sees your tattoo on the shoulder showing that you''re a black cock loving whore, she grins and closes the door.'
+				'Kendra sees your tattoo on your shoulder, stating that you''re a black cock loving whore. She grins, and closes the door.'
 			elseif tatlech = 0:
 				tatlech = 4
 				tattCount += 1
@@ -615,107 +332,90 @@ if $ARGS[0] = 'kendrafuck':
 			elseif tatlech > 0 and tatlech ! 4:
 				tatlech = 4
 				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/shoulder/tatshldr4.jpg"></center>'
-				'Kendra sees that you already have a tattoo on your shoulder, "That''s nothing, I''ll fix it up quickly." she says, and tattoos your shoulder with the symbol of a black cock loving whore over the old tattoo. She does it so masterfully that old tattoo is not noticeable.'
+				'Kendra sees that you already have a tattoo on your shoulder. "That''s not right, I''ll fix it up" she says, and tattoos your shoulder with the symbol of a black cock loving whore, over the old tattoo. She does it so masterfully that old tattoo is not noticeable.'
 			end
-
 			act 'Eat Kendra out':
-				cls
+				*clr & cla
 				lesb += 1
 				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/kendra2.jpg"></center>'
-				'Kendra undresses and grabs your head and forces it towards her pussy, "Now''s your turn to impress me!" You skillfully run your tongue in her juicy pussy and Kendra orgasms violently...'
+				'Kendra undresses and grabs your head, then forces it towards her pussy. "Now''s your turn to impress me!" she exclaims. You skillfully run your tongue along and inside her juicy pussy, and Kendra orgasms violently.'
 				gs 'arousal', 'cuni_give', 20, 'sub'
 				gs 'stat'
-
 				act 'Leave':gt 'dorm', 'korr'
 			end
 		end
-	elseif kendra = 1:
-		'The lovely ebony Kendra opens the door. She observes you for a while and suggests that you get another tattoo, and only then and not before will she allow you to taste her once again.'
-
+	elseif kendraslave = 2:
+		'The lovely ebony woman Kendra opens the door. She observes you for a while and suggests that you get another tattoo. Only then, and not before, will she allow you to taste her once again.'
 		act 'Leave':gt 'dorm', 'korr'
-
 		act 'Get a tattoo':
-			cls
+			*clr & cla
 			minut += 60
 			kendra = 2
 			tat = 2
 			gs 'stat'
-
 			if tatankle = 1 or tatankle = 2:
 				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle2.jpg"></center>'
-				'"Oh, look at this, what an independent girl, you''ve already got one. Now you can get what you came for."'
+				'"Oh, look at this! What an independent girl, you''ve already got one. Now you can get what you came for."'
 			elseif tatankle = 0:
 				tatankle = 2
 				tattCount += 1
 				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle2.jpg"></center>'
-				'Kendra tattoos your ankle with the symbol of black cock loving whore.'
+				'Kendra tattoos your ankle with the symbol of a black cock loving whore.'
 			elseif tatankle > 2:
 				tatankle = 2
 				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle2.jpg"></center>'
-				'Kendra notices you already have a tattoo on your ankle. "Nothing I can''t fix." she says, as she starts tattooing your ankle with the symbol of black cock loving whore over the old tattoo. She does it so masterfully that the old tattoo is not noticeable.'
+				'Kendra notices you already have a tattoo on your ankle. "Nothing I can''t fix" she says, as she starts tattooing your ankle with the symbol of a black cock loving whore, over the old tattoo. She does it so masterfully that the old tattoo is not noticeable.'
 			end
-
 			act 'Eat Kendra out':
-				cls
+				*clr & cla
 				repa = 9
 				lesb += 1
-
 				if kendrasex = 0:kendrasex = 1 & girl = girl + 1
 				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/kendra.jpg"></center>'
-				'Kendra undresses and grabs your head and forces it towards her pussy, "Now''s your turn to impress me!" You skillfully run your tongue in her juicy pussy and Kendra orgasms violently...'
+				'Kendra undresses and grabs your head, then forces it towards her pussy. "Now''s your turn to impress me!" she exclaims. You skillfully run your tongue along and inside her juicy pussy, and Kendra orgasms violently.'
 				gs 'arousal', 'cuni_give', 20, 'sub'
 				gs 'stat'
-
 				act 'Leave':gt 'dorm', 'korr'
 			end
 		end
-	elseif kendra = 0:
+	elseif kendraslave = 1:
 		'A pretty ebony woman opens the door, she introduces herself as Kendra and says that she knows you love black cocks. She tells you to get a proper tattoo if you want to get it on with her.'
-
 		act 'Leave':gt 'dorm', 'korr'
-
 		act 'Get a tattoo':
-			cla
+			*clr & cla
 			minut += 60
 			kendra = 1
 			tat = 1
 			gs 'stat'
-
 			if tatupb = 4 or tatupb = 29:
 				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/trampstamp/tatlowbck<<tatupb>>.jpg"></center>'
-				'"Oh, so you already have tattooed a tramp stamp? No need to waste time here then! Come in and eat my pussy, whore."'
+				'"Oh, so you already have a tramp stamp tattooed? No need to waste time here, then! Come in and eat my pussy, whore."'
 			elseif tatupb = 0:
 				tatupb = 4
 				tattCount += 1
 				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/trampstamp/tatlowbck4.jpg"></center>'
-				'Kendra tattoos a tramp stamp with the word, Slut!'
+				'Kendra tattoos a tramp stamp with the word ''Slut'' on you'
 			elseif tatupb > 0 and tatupb ! 4:
 				tatupb = 4
 				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/trampstamp/tatlowbck4.jpg"></center>'
-				'Kendra sees that you already have a tramp stamp. "Nothing that can''t be easily fixed." she says, as she tattoo''s a tramp stamp with the word Slut over the old tattoo. She does it so masterfully that the old tattoo is not noticeable.'
+				'Kendra sees that you already have a tramp stamp. "Nothing that can''t be fixed" she says, as she tattoos a tramp stamp with the word ''Slut'' over the old tattoo. She does it so masterfully that the old tattoo is not noticeable.'
 			end
-
 			act 'Eat Kendra out':
-				cla
-				*clr
-
+				*clr & cla
 				if kendrasex = 0:kendrasex = 1 & girl += 1
-
 				lesb += 1
 				gs 'arousal', 'cuni_give', 20, 'sub'
 				gs 'arousal', 'end'
 				gs 'stat'
-
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra30.jpg"></center>'
-				'Kendra undresses and grabs your head and forces it towards her pussy, "Now''s your turn to impress me!" You skillfully run your tongue in her juicy pussy and Kendra orgasms violently...'
-
+				'Kendra undresses and grabs your head, then forces it towards her pussy. "Now''s your turn to impress me!" she exclaims. You skillfully run your tongue along and inside her juicy pussy, and Kendra orgasms violently.'
 				act 'Leave':gt 'dorm', 'korr'
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'goshifuck':
+if $ARGS[0] = 'gophiroom':
 	menu_off = 1
 	$location_type = 'event'
 	reccoldorm = 0
@@ -724,7 +424,7 @@ if $ARGS[0] = 'goshifuck':
 	sexpartkno = 1
 	if goshsex = 0:goshsex = 1 & guy += 1
 
-	'As soon as you walk into Gosha''s room he begins fondling your breasts, and slowly undressing you.'
+	'As soon as you walk into Gosha''s room, he begins fondling your breasts and slowly undressing you.'
 	gs 'arousal', 'foreplay', 30
 	gs 'stat'
 
@@ -740,8 +440,8 @@ if $ARGS[0] = 'goshifuck':
 		if picrand = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh14.jpg"></center>'
 		if picrand = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh15.jpg"></center>'
 
-		'Seeing that you''re not resisting Gosha quickly removes his pants, revealing his cock and guides it into your pussy. While he fucks you, you orgasm.'
-		'As you''re still trying to come to your senses Gosha cums inside you.'
+		'Seeing that you''re not resisting, Gosha quickly removes his pants, revealing his cock. He guides it into your pussy. While he fucks you, you orgasm.'
+		'As you''re still trying to come to your senses, Gosha cums inside of you.'
 		$orgasm_or = 'yes'
 		gs 'arousal', 'vaginal', 20
 
@@ -755,7 +455,7 @@ if $ARGS[0] = 'goshifuck':
 		if picrand = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh5.jpg"></center>'
 		if picrand = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh7.jpg"></center>'
 
-		'Gosha pushes you down on your knees and fucks you hard in the mouth. It doesn''t take long before his cock starts twitching and he quickly pulls out and cums all over your face.'
+		'Gosha pushes you down on your knees, and fucks you hard in the mouth. It doesn''t take long before his cock starts twitching and he quickly pulls out and cums all over your face.'
 		gs 'arousal', 'bj', 10, 'deepthroat', 'rough'
 
 	elseif srand = 3:
@@ -771,7 +471,7 @@ if $ARGS[0] = 'goshifuck':
 		if picrand = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh10.jpg"></center>'
 		if picrand = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh12.jpg"></center>'
 
-		'Gosha lubricates your asshole and starts pushing his fingers in. After a while he deems you ready, he takes out his cock and thrusts deeply into your ass. He fucks you for some time and ends by cumming inside of you.'
+		'Gosha lubricates your asshole, and starts pushing his fingers in. After a while he deems you ready. He takes out his cock and thrusts it deeply into your ass. He fucks you for some time and ends by cumming inside of your ass.'
 		anal_slip += 4
 		$orgasm_or = 'yes'
 		gs 'arousal', 'anal_finger', 10

locations/dormev1.qsrc

@@ -0,0 +1,267 @@
+# dormev1
+
+if $ARGS[0] = 'djibrilgb':
+	menu_off = 1
+	*clr & cla
+	minut += 10
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang1.jpg"></center>'
+	if african_gangbang = 0:
+		'The dorm room is fairly small, with a large chair and a couch. Two beds are on the other side of the room. You take a seat on the couch with three of the guys, while Djibril takes a seat on the chair. They all talk to you, they ask you about where you are from, tell you about how great the university is and how much they love Russia and, in particular, Russian girls. They also compliment you, telling you how pretty you are, or how sexy you are. Things like that. The longer you talk with them, the more they compliment your looks. Their looks leave little doubt that they would all like to have sex with you.'
+	else
+		'The dorm room is fairly small, with a large chair and a couch. Two beds are on the other side of the room. You take a seat on the couch with three of the guys, while Djibril takes a seat on the chair. You remember what happened the other time you were here, and so do they. They are a lot less smooth-talking and complimentary, and a lot more sexual and aggressive with their comments. You are sure all they want to do is gangbang you again.'
+	end
+	gs 'willpower', 'gangbang', 'resist', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'Change your mind and leave (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			minut += 10
+			npc_rel['A82'] -= 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang1.jpg"></center>'
+			if african_gangbang = 0:
+				'There are too many of them, you start to feel a little scared and worried about so many men lusting after you. You get up, apologise, and quickly head for the door. They try to talk you into staying, but you tell them you don''t have time and make your way out.'
+			else
+				'You thought you were in the mood for another gangbang, but now that you are here again, you are having second thoughts. You check your phone and tell them you have to go. They try and talk you into staying, but you tell them maybe some other time and make your way out of the door.'
+			end
+			act 'Leave': minut += 5 & gt 'city_island'
+		end
+	else
+		act 'Change you mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	act 'Keep talking':
+		*clr & cla
+		minut += 10
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang2.jpg"></center>'
+		if african_gangbang = 0:
+			'The guys on either side of you move over, closer, so that their legs are touching yours on both sides. You feel them closing in around you, you can sense the lust from them. From the way they act, the tone of their voice, how they look at you, and how their hands constantly graze your legs and brush against you body. Just then, Djibril gets up and walks over. He stands in front of you and offers you his hand. "Stand up" he says.'
+		else
+			'The guys on either side of you move over, closer, and their hands begin to paw at you. Squeezing your thigh, brushing your hair back, or running a finger across your cheek. One of them even cups your breast and gives it a squeeze. Just then, Djibril gets up and walks over. He stands in front of you and offers you his hand. "Stand up" he says. You remember from last time where this leads.'
+		end	
+		act 'Standup':
+			*clr & cla
+			minut += 2
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang3.jpg"></center>'
+			if african_gangbang = 0:
+				'You take his hand and he pulls you up. "You are very pretty, like all Russian girls. Now you will you make us feel good, like the other Russian girls do." As he states that, you feel one of his hands on top of your head. He pushes down on the top of your head, his other hand moving to your shoulder and adding pressure, pushing you down. As you lower from him pushing you down, you finally end up sinking to your knees. Only then does he stop pushing you down. As you look around, now that you are on your knees, you notice they have all stood up and surrounded you with their dicks out. One of them says "Go on, grab it. You know you want to."'
+			else
+				'You take his hand and he pulls you up. "You ready to make us all feel good again?" He asks, as you feel one of his hands on top of your head. He pushes down on the top of your head, his other hand moving to your shoulder and adding pressure, pushing you down. You quickly get down onto your knees, just like last time. And just like that time, they are all standing up and surrounding you with their dicks out again. One speaks up. "Come on, slut, what are you waiting for? Start stroking our cocks."'
+			end	
+			gs 'willpower', 'gangbang', 'resist', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Change your mind and leave (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					minut += 10
+					npc_rel['A82'] -= 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbangno.jpg"></center>'
+					if african_gangbang = 0:
+						'You shake your head and then stand up quickly. You push out from between them. "Sorry, I can''t do this." You say and then rush for the door. You can hear them grumbling, but none of them try and stop you as you leave.'
+					else
+						'You shake your head and then stand up quickly. You push out from between them. "Sorry, I can''t do this right now - maybe some other time." You say and then hurriedly head for the door. You hear Djibril say "Come on, you can''t leave us like this!" You mutter another "Sorry." You can hear the rest grumbling, but none of them try and stop you as you leave.'
+					end	
+					act 'Leave': minut += 5 & gt 'city_island'
+				end
+			else
+				act 'Change you mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+			act 'Start stroking them':
+				*clr & cla
+				npc_rel['A82'] += 1
+				gs 'fame', 'city', 'sex', 3
+				djibril_sex += 1
+				african_gangbang += 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang4.jpg"></center>'
+				'You reach up, wrapping your fingers around the dick of the one that spoke up with your left hand, while your reach over and grab Djibril''s massive cock with your right hand. You start stroking them both, while looking up at them. After a couple of minutes, the other two get tired of waiting and you have to switch which dicks you are stroking. Djibril places his hand on your head and pulls you over to his dick, and he starts rubbing the tip of it on your lips. You can feel his precum smearing on your lips.'
+				gs 'arousal', 'hj', 5, 'gangbang', 'sub'
+				gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+				gs 'stat'
+				act 'Start sucking':
+					*clr & cla
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang5.jpg"></center>'
+					'You open your mouth as wide as you can and start sucking Djibril''s monster cock. You also stroke it for a bit, before you start stroking two of the other three cocks with your hands while you keep sucking on Djibril''s massive dick. "Come on, Djibril, don''t hog her mouth all to yourself!" you hear one of them say.'
+					gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+					gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+					gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+					gs 'stat'
+					act 'Switch':
+						*clr & cla
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang6.jpg"></center>'
+						'You stop sucking off Djibril and switch to sucking one of the other guys'' dicks, while jerking off two more. They keep encouraging you to switch, and soon you lose track of whose dick you are sucking at the moment. As one of them is not occupied, whoever it is removes some of your clothes. As you switch again to give him attention, the guy no longer getting your attention takes over and continues removing your clothes. One of them says "Hurry and get her naked, I want to fuck her."'
+						gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+						gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+						gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+						gs 'stat'
+						act 'Just suck them off':
+							*clr & cla
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang7.jpg"></center>'
+							'You take the dick out of your mouth long enough to say "Sorry, I don''t want to have sex. But I will suck you all off." You hear them muttering a bit, and then one of them says "Then hurry up and get on with it." You redouble your efforts with your mouth and your hands, trying to make sure none of them are left unattended for too long. Soon, one of them starts moaning and you can tell he is close - so you focus on the rest. Before long, you have all four of them about ready to cum.'
+							gs 'arousal', 'bj', 15, 'gangbang', 'sub'
+							gs 'arousal', 'hj', -15, 'gangbang', 'sub'
+							gs 'arousal', 'hj', -15, 'gangbang', 'sub'
+							gs 'stat'
+							act 'They start cumming': gt 'dormev1', 'gangbang_cum'
+						end
+						act 'Just anal':
+							*clr & cla
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang10.jpg"></center>'
+							'You take the dick out of your mouth long enough to say "Sorry, I don''t want to have sex. But you can fuck my butt, if you want." They laugh at that, and seem pleased with the idea. "I get first crack at her ass!" You hear Djibril loudly exclaim. They pull you up, and one of them sits on the couch while another kneels on it. You get on your hands and knees, joining them on the couch. You start stroking the one sitting on the couch, while sucking the one kneeling on it.'
+							*nl
+							'You feel someone applying lube to your ass, and moments later you feel the head of someone''s dick pressed against your butthole. The pressure builds, until it pops into you ass - stretching it. It must be Djibril, judging by how huge the cock feels in your ass. He starts fucking you anally, slow at first, but as things progress, he starts fucking you harder and faster. The others switch whose dick you are sucking, so they all get a turn.'
+							gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+							gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+							gs 'arousal', 'anal', -5, 'gangbang', 'sub', 'lube'
+							gs 'stat'
+							act 'More butt fucking': gt 'dormev1', 'gangbang_anal'
+						end
+						if pcs_vag ! 0:
+							act 'Get fucked':
+								*clr & cla
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang8.jpg"></center>'
+								'You decide not to say anything, and they take your silence as consent. They pull you up, as Djibril sits on the couch. You get you on your hands and knees, on the couch with Djibril. You start stroking Djibril''s massive cock again, as another man kneels behind you. You feel him rubbing the head of his dick against your slit, getting his cock nice and wet with your juices.'
+								*nl
+								'Moments later, you feel the head pushing inside of your twat - filling it up with his warm meat. He starts fucking your pussy, slow at first, but as things progress, he starts fucking your harder and faster, slapping your ass with his hand. And then he starts fucking you balls deep.'
+								gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+								gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
+								gs 'stat'
+								act 'Tag team fuck':
+									*clr & cla
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang9.jpg"></center>'
+									'You keep sucking Djibril''s monster cock, as you are getting fucked balls deep by another, when you hear one of them say "My turn." The one inside of you pulls out, but your pussy doesn''t stay empty for long. Another cock is shoved inside of you moments later. The other three take turns fucking your twat as you keep sucking off Djibril. You notice that they give each other fist bumps when they switch, like they are some kind of tag team.'
+									gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+									gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
+									gs 'stat'
+									act 'Use your hands too':
+										*clr & cla
+										gs 'stat'
+										'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang10.jpg"></center>'
+										'Djibril pulls your mouth off of his dick and he stands up. "Alright, you guys have had enough fun. It''s my turn." He barely makes it a step away, when another guy sits down right where he was. You start jerking him off, as one of the others kneels on the couch and shoves his dick in your mouth. You feel a dick pull out of your pussy, only to be replaced straight after. You are sure, by the larger size, that it is now Djibril fucking you.'
+										*nl
+										'Several minutes go by as you get fucked, you alternate between the other three. Sucking one, while jerking another one off. Djibril pulls out of you, and you feel the head of his dick rubbing against your asshole, just as he says "I''m going to fuck your ass."'
+										gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+										gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+										gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
+										gs 'stat'
+										act 'Get butt fucked':
+											*clr & cla
+											gs 'stat'
+											'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang10.jpg"></center>'
+											'You say nothing, and keep sucking their dicks and jerking them off. They take your silence as consent. You feel someone applying lube to your ass, and moments later you feel the head of someone''s dick pressed against your asshole again. The pressure builds, until it pops into you ass - stretching it. Djibril''s massive dick stretches your ass to its limits. He starts fucking your ass, slow at first, but as things progress, he starts fucking you harder and faster. The others switch whose dick you are sucking, so they all get a turn.'
+											gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+											gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+											gs 'arousal', 'anal', -5, 'gangbang', 'sub', 'lube'
+											gs 'stat'
+											act 'More butt fucking': gt 'dormev1', 'gangbang_anal'
+										end
+										act 'Just suck them off':
+											*clr & cla
+											gs 'stat'
+											'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang7.jpg"></center>'
+											'You take the dick out of your mouth long enough to say "Sorry, I don''t want to be fucked in the butt." You hear them muttering a bit and then one of them says "Fine." You get off the couch back onto you knees as they all crowd around you again. You redouble your efforts with your mouth and your hands, trying to make sure none of them are left unattended for too long. Soon, one of them starts moaning and you can tell he is close, so you focus on the rest. Before long you have all four of them about ready to cum.'
+											gs 'arousal', 'bj', 15, 'gangbang', 'sub'
+											gs 'arousal', 'hj', -15, 'gangbang', 'sub'
+											gs 'arousal', 'hj', -15, 'gangbang', 'sub'
+											gs 'stat'
+											act 'They start cumming': gt 'dormev1', 'gangbang_cum'
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+	
+if $ARGS[0] = 'gangbang_anal':
+	menu_off = 1
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang11.jpg"></center>'
+	'You feel Djibril pull out of your butthole, but it is immediately filled by another dick. This one is a little smaller, so it slides in fairly easily. You keep sucking off one guy and jerking off another, as the one behind you fucks your lubed up backside, occasionally smacking your ass cheeks with his hands as he does.'
+	gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+	gs 'arousal', 'anal', -5, 'gangbang', 'sub', 'lube'
+	gs 'stat'
+	act 'Next cock in the ass':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang12.jpg"></center>'
+		'They switch, and a third one is now fucking your stretched out asshole. You start sucking the cock of the last guy that has not stuck it up your ass. The other two jerk off while watching you get railed up the ass by one of their friends, as you suck off another one. This one is going balls deep up inside of you, you can feel his balls smacking against your slit with each thrust.'
+		gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+		gs 'arousal', 'anal', -5, 'gangbang', 'sub', 'lube'
+		gs 'stat'
+		act 'Just anal':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang13.jpg"></center>'
+			'Finally, the last guy gets his turn, and shoves it up your greased-up butthole. It slides in easily, and he starts fucking you hard and fast straight away. At this point you are stretched out enough, so it is really starting to feel good. A few minutes later, they start taking turns. Every couple of minutes a new dick is shoved back up your butt, and before long one of the guys starts moaning like he is close. The others soon follow suit. They pull you off the couch and onto the floor, on your knees.'
+			gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'lube'
+			gs 'stat'
+			act 'They start cumming': gt 'dormev1', 'gangbang_cum'
+		end
+	end
+end
+
+if $ARGS[0] = 'gangbang_cum':
+	menu_off = 1
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbangcum.jpg"></center>'	
+	'While kneeling the middle of them, you jerk two of them off at a time, switching cocks every few seconds. Soon, one of them starts cumming - his sperm hitting you in the face. With your mouth open, some of it goes into your mouth as well. The rest soon start cumming also, and most of it ends up covering your face and neck. Some of it ends up on your breasts, and some ends up in your mouth - which you quickly swallow, once they have all finished.'
+	gs 'arousal', 'hj', 5, 'gangbang', 'sub'
+	gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+	gs 'cum_call', 'face', 'A82', 1
+	gs 'cum_call', 'face', 'gangbanger #1', 0
+	gs 'cum_call', 'face', 'gangbanger #2', 0
+	gs 'cum_call', 'face', 'gangbanger #3', 0
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Get dressed': gt 'dormev1', 'gangbang_dress'
+	act 'Take a selfie': gt 'dormev1', 'gangbang_selfie'
+end
+
+if $ARGS[0] = 'gangbang_selfie':
+	menu_off = 1
+	*clr & cla
+	djibrilphoto[2] = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/pc/pictures/djibril/2.jpg"></center>'
+	'Once they are done cumming all over you, they start to get cleaned up and get dressed. You reach over to your purse and pull out your phone, and you hold it up and take a selfie of your face covered in their cum. You take a couple of them until you find one you like, which you then save. You notice a couple of them looking at you smiling, as you take your selfies. With that done you start to get dressed yourself.'
+	act 'Get dressed': gt 'dormev1', 'gangbang_dress'
+end
+!!will this args below allow Sveta to access her purse and clean herself up if she wants, since it is a new args and no menu block. If not can you make sure she can. I want to leave it for the player to do, so there can be different reactions below.
+if $ARGS[0] = 'gangbang_dress':
+	*clr & cla
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang_leave_cum.jpg"></center>'
+	'You gather up your clothes and start getting dressed. Djibril says to you "This was fun, <<$pcs_nickname>>. I hope we can do this again sometime. Feel free to stop by anytime. Anyway, I need to go to the library and get some studying done tonight, so talk to you later." You wave to him as he leaves, one of his friends follows him out the door as well. A third one also leaves without saying a word, and the last one starts playing a game on his console. You guess this is his room. By the time you finish dressing, they are all gone, except the one playing games. You can feel their cum starting to dry on your face. You suppose you should really leave.'
+	act 'Leave Room':
+		*clr & cla
+		minut += 5
+		gs 'stat'
+		if cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1):
+			gs 'fame', 'city', 'sex', 5
+			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang_leave_cum.jpg"></center>'
+			'You take a final look around to make sure you didn''t leave anything behind, and you think about what just happened in here. You can''t help but smile at it, then you head out the door. As you make your way down the dorm hallway, you notice people looking at you. Some laugh, others look on with lost expressions, and some give you looks of utter disgust. You make it nearly to the ground floor, when you finally notice your reflection on some glass and see your face is still covered in their cum. You quickly exit the dorm and run across the quad to the street.'
+		else
+			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang_leave.jpg"></center>'
+			'With your face all cleaned up of their cum, you take a final look around to make sure you didn''t leave anything behind and you think about what just happened in here. You can''t help but smile at it, then you head out the door. You make your way out of the dorms, and across the quad back to street.'
+		end	
+		act 'Leave': minut += 5 & gt 'city_island'
+	end
+end
+
+--- dormev1 ---------------------------------
+

locations/dort.qsrc

@@ -17,7 +17,7 @@ gs'stat'
 !'<a href="exec:gt ''nowostreet'',''start''">Buildings</a> '
 
 act 'Head to the station':gt 'nordtrain', 'inside'
-act 'Walk to the lake':gt 'lake', 'start'
+act 'Walk to the lake':gt 'city_lake', 'start'
 
 --- dort ---------------------------------
 

locations/downlibrary.qsrc

@@ -45,7 +45,7 @@ $downlibrary['BookStudy'] = {
 '<center><img <<$set_imgh>> src="images/locations/city/citycenter/library/downlibint.jpg"></center>'
 'A huge library with thousands upon thousands of books. You could spend years here and you probably still wouldn''t be able to read it all.'
 
-act 'Leave the library': minut += 5 & gt 'down'
+act 'Leave the library': minut += 5 & gt 'city_center'
 
 if hour >= 8 and hour <= 18:
 	act 'Read a science book (1:00)':

locations/ender.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'loss':
 		'<center><img <<$set_imgh>> src="images/shared/sex/dom/spit.jpg"></center>'
 		'You fall to the ground. The prostitute kicks you around a couple of times. She grabs hold of your purse and takes all your money. As she''s done she leans over you and spits in your face.'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 5:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -65,7 +65,7 @@ if $ARGS[0] = 'loss':
 		'You fall to the ground. As you''re laying down the pimp lites a cigarette while rummaging through your stuff. He finally finds what he''s been looking for, all of your money, then orders, "Open your mouth slut".'
 		'You obey and open your mouth. He sighs as taps ash into your mouth, "I hope you''ve learned a valuable lesson slut, next time I won''t be this kind to you."'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 6:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -85,7 +85,7 @@ if $ARGS[0] = 'loss':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 7:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -113,7 +113,7 @@ if $ARGS[0] = 'loss':
 		act 'Dress and escape from the gym':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-			gt'street'
+			gt'city_residential'
 		end
 		exit
 	elseif fightEnding = 8:
@@ -294,7 +294,7 @@ if $ARGS[0] = 'win':
 		'<center><img src="images/locations/city/shared/streetwalker/defeat.jpg"></center>'
 		'The prostitute falls to the ground and starts pleading with you not to beat her again.'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 5:
 		fightEnding = 0
@@ -305,7 +305,7 @@ if $ARGS[0] = 'win':
 
 		'The pimp fell to the ground letting out a groan, You took his wallet and kicked him around before moving away.'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 6:
 		fightEnding = 0
@@ -316,7 +316,7 @@ if $ARGS[0] = 'win':
 
 		'Tattered prostitute fell to the ground, you crash it again in the ribs and it took all his money and gave it to you, Only you did not beat her anymore.'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 7:
 		KisameDead = 1
@@ -330,7 +330,7 @@ if $ARGS[0] = 'win':
 		act 'Dress and leave':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-			gt'street'
+			gt'city_residential'
 		end
 		exit
 	elseif fightEnding = 8 or fightEnding = 9:
@@ -381,7 +381,7 @@ if $ARGS[0] = 'win':
 			elseif curr_home = 2:
 				gt 'gadukino'
 			elseif curr_home = 3:
-				gt 'street'
+				gt 'city_residential'
 			end
 		end
 	elseif fightEnding = 12:
@@ -483,7 +483,7 @@ if $ARGS[0] = 'surrender':
 		end
 
 		if pcs_health < 100: pcs_health = 100
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 5:
 		if pcs_health < 100: pcs_health = 100
@@ -497,7 +497,7 @@ if $ARGS[0] = 'surrender':
 		'The pimp lites a cigarette while rummaging through your stuff. He finally finds what he''s been looking for, all of your money, then orders, "Open your mouth slut".'
 		'You obey and open your mouth. He sighs as taps ash into your mouth, "I hope you''ve learned a valuable lesson slut, next time I won''t be this kind to you."'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 6:
 		killvar 'autocombat_surrender'
@@ -524,7 +524,7 @@ if $ARGS[0] = 'surrender':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 7:
 		if pcs_health < 100: pcs_health = 100
@@ -554,7 +554,7 @@ if $ARGS[0] = 'surrender':
 		act 'Dress and flee the gym':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-			gt'street'
+			gt'city_residential'
 		end
 		exit
 	elseif fightEnding = 8:

locations/etoexhib.qsrc

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

locations/event.qsrc

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

locations/events.qsrc

@@ -329,12 +329,12 @@ if $ARGS[0] = 'snkayf1':
 	gs 'underwear', 'remove'
 	if snkz = 1:
 		minut += 120
-		gt'park','start'
+		gt'city_park','start'
 	end
 
 	if snkz = 2:
 		minut += 120
-		gt'down'
+		gt'city_center'
 	end
 
 	if snkz = 3:
@@ -344,7 +344,7 @@ if $ARGS[0] = 'snkayf1':
 
 	if snkz = 4:
 		minut += 120
-		gt'street'
+		gt'city_residential'
 	end
 
 	if snkz = 5:
@@ -354,7 +354,7 @@ if $ARGS[0] = 'snkayf1':
 
 	if snkz = 6:
 		minut += 120
-		gt'lake','start'
+		gt'city_lake','start'
 	end
 end
 

locations/exercise.qsrc

@@ -385,7 +385,7 @@ if $ARGS[0] = 'yoga':
 	elseif $pantyworntype ! 'none':
 		'<center><video autoplay loop src="images/pc/activities/yoga_underwear.mp4"></video></center>'
 	else
-		'<center><video autoplay loop src="images/pc/activities/yoga_naked.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/pc/activities/yoga_naked.jpg"></center>'
 	end
 
 	'You spend <<$timestring>> minutes stretching and straining your muscles in various poses, improving your will and flexibility.'

locations/fame.qsrc

@@ -164,19 +164,29 @@ else
 	
 	$gnikname = ''
 	if pav_slut > 25:
-		if pav_slut < 50:
-			$gnikname = 'flirt'
-		elseif pav_slut < 75:
-			$gnikname = 'cocksucker'
-		elseif pav_slut < 100:
-			$gnikname = 'boy toy'
-		elseif pav_slut < 125:
-			$gnikname = 'sex addict'
-		elseif pav_slut < 150:
-			$gnikname = 'slut'
-		else
-			$gnikname = 'whore'
-		end
+        $gnikname = 'flirt'
+    elseif pav_slut > 50:
+        $gnikname = 'tease'
+    elseif pav_slut > 75:
+        $gnikname = 'minx'
+    elseif pav_slut > 100:
+        $gnikname = 'vixen'
+    elseif pav_slut > 125:
+        $gnikname = 'tempress'
+    elseif pav_slut > 150:
+        $gnikname = 'cocklover'
+    elseif pav_slut > 175:
+        $gnikname = 'boytoy'
+    elseif pav_slut > 200:
+        $gnikname = 'slut'
+    elseif pav_slut > 225:
+        $gnikname = 'nympho'
+    elseif pav_slut > 250:
+        $gnikname = 'whore'
+    elseif pav_slut > 275:
+        $gnikname = 'town bicycle'
+    elseif pav_slut > 300:
+        $gnikname = 'cum dumpster'
 	end
 end