assorted control flow improvements, minor enhancements, and bug fixes

locations/nastja.qsrc

@@ -664,7 +664,7 @@ if $ARGS[0] = 'pos31':
 	*clr
 	minut += 10
 	pcs_mood += 50
-	npc_QW['A192'] = 7
+	npc_QW['A192'] = 5
 	gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'","hour >= 8 and hour <= 20","",""
 	gs 'stat'
 

locations/natbelapt.qsrc

@@ -276,7 +276,7 @@ if $ARGS[0] = 'hallway':
 		act 'Kitchen': gt 'natbelapt', 'kitchen'
 		act 'Mother''s Room': gt 'natbelapt', 'natmother'
 		act 'Natasha''s Room': gt 'natbelapt', 'natroom'
-		if hour => 18 and NatbelQW['vaginal'] > 0 and NatbelQW['KolkaSex'] > 20 and rand(1,4+(NatbelQW['KolkaSex']/20)) <= NatbelQW['KolkaSex']/20:
+		if hour => 18 and NatbelQW['vaginal'] > 0 and NatbelQW['KolkaSex'] > 5 and rand(1,4+(NatbelQW['KolkaSex']/5)) <= NatbelQW['KolkaSex']/5:
 		  act 'Go spy on Natasha': gt 'natkolEv', 'showerspy'
 		else
 		  act 'Go spy on Natasha': gt 'natbelEv', 'showerspy'
@@ -1608,15 +1608,15 @@ if $ARGS[0] = 'livingroom':
 				else
 					! Randomly determine if it''s a porno featuring Sveta
 					if fame['city_porn'] > 250 and film > 0:
-						YourPorn = rand(0,9)
+						YourPorn = 1
 					elseif fame['city_porn'] > 200 and film > 0:
-						YourPorn = rand(0,19)
+						YourPorn = rand(0,1)
 					elseif fame['city_porn'] > 150 and film > 0:
-						YourPorn = rand(0,29)
+						YourPorn = rand(0,2)
 					elseif fame['city_porn'] > 100 and film > 0:
-						YourPorn = rand(0,39)
+						YourPorn = rand(0,4)
 					elseif fame['city_porn'] > 50 and film > 0:
-						YourPorn = rand(0,49)
+						YourPorn = rand(0,8)
 					else
 						YourPorn = 0
 					end

locations/nichTaras.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'abdIntro':
 		act 'Call for help':
 			'You scream for help as loud as you possibly can. Nothing happens. Did anybody hear you at all?'
 		end
-		if pcs_sleep <= 40:
+		if pcs_sleep <= 40 or cheatNoSleep ! 0:
 			act 'Try to sleep':
 				nichAbdStage = 20
 				gt 'nichTaras','abdIntro'
@@ -307,7 +307,7 @@ elseif $ARGS[0] = 'dungeon':
 		if $ARGS[2] = '':
 			'<center><img <<$set_imgh>> src="images/characters/city/taras/dungeonBed.jpg"></center>'
 			'You crawl over to the bed. Being tied up you have a hard time climbing on the mattress. It isn''t very comfortable but still better than the cold ground.'
-			if pcs_sleep < 80:
+			if pcs_sleep < 80 or cheatNoSleep ! 0:
 				act 'Sleep':
 					gt 'nichTaras','dungeon', 'bed', 'sleep'
 				end
@@ -337,7 +337,7 @@ elseif $ARGS[0] = 'dungeon':
 				minut += 240
 				pcs_sleep = min(100 , pcs_sleep + 60)
 				gs 'stat'
-				if pcs_sleep < 80:
+				if pcs_sleep < 80 or cheatNoSleep ! 0:
 					act 'Sleep':
 						gt 'nichTaras','dungeon', 'bed', 'sleep'
 					end
@@ -477,7 +477,7 @@ elseif $ARGS[0] = 'session':
 				minut += 60
 				gs 'stat'
 			end
-			if pcs_sleep < 80:
+			if pcs_sleep < 80 or cheatNoSleep ! 0:
 				act 'Sleep':
 					nichTarasSessionStage = 11
 					gt 'nichTaras','session'
@@ -546,7 +546,7 @@ elseif $ARGS[0] = 'session':
 						minut += 60
 						gs 'stat'
 					end
-					if pcs_sleep < 80:
+					if pcs_sleep < 80 or cheatNoSleep ! 0:
 						act 'Sleep':
 							nichTarasSessionStage = 21
 							gt 'nichTaras','session'
@@ -758,4 +758,4 @@ elseif $ARGS[0] = 'vanAbduct':
 	end
 end
 
---- nichTaras ---------------------------------
+--- nichTaras ---------------------------------

locations/obj_din.qsrc

@@ -1672,102 +1672,104 @@ if $ARGS[0] = 'tattoos':
 	gs 'obj_din','bodytabs'
 	'<center><h1>Tattoos</h1></center>'
 	tatcounter = 0
-	'<center>'
-	*pl
+	'<center><table><tr>'
 	if tatfce > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattooface''">Face</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattooface''"><img height="120" src="images/pc/body/tattoos/face/tatfce<<tatfce>>.jpg"></a></center></td>'
 	else
-		*p 'Face | '
+		*p '<td><center>Face</center></td>'
 	end
 	if tatlip > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattoolip''">Lip</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattoolip''"><img height="120" src="images/pc/body/tattoos/lip/tatlip<<tatlip>>.jpg"></a></center></td>'
 	else
-		*p 'Lip | '
+		*p '<td><center>Lip</center></td>'
 	end
 	if tatneck > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattooneck''">Neck</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattooneck''"><img height="120" src="images/pc/body/tattoos/neck/tatnck<<tatneck>>.jpg"></a></center></td>'
 	else
-		*p 'Neck | '
+		*p '<td><center>Neck</center></td>'
 	end
 
 	if tatback > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattooback''">Back</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattooback''"><img height="120" src="images/pc/body/tattoos/back/tatback<<tatback>>.jpg"></a></center></td>'
 	else
-		*p 'Back | '
+		*p '<td><center>Back</center></td>'
 	end
 	if tatlech > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattooshoulder''">Shoulder</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattooshoulder''"><img height="120" src="images/pc/body/tattoos/shoulder/tatshldr<<tatlech>>.jpg"></a></center></td>'
 	else
-		*p 'Shoulder | '
+		*p '<td><center>Shoulder</center></td>'
 	end
 	if tatbrst > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattoobreast''">Breast</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattoobreast''"><img height="120" src="images/pc/body/tattoos/breasts/tatbrst<<tatbrst>>.jpg"></a></center></td>'
 	else
-		*p 'Breast | '
+		*p '<td><center>Breast</center></td>'
 	end
+  '</tr>'
+  *p '<tr>'
 	if tatunder > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattoounder''">Under Breast</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattoounder''"><img height="120" src="images/pc/body/tattoos/underbreast/tatundbreast<<tatunder>>.jpg"></a></center></td>'
 	else
-		*p 'Under Breast | '
+		*p '<td><center>Under Breast</center></td>'
 	end
 	if tatchst > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattoochest''">Chest</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattoochest''"><img height="120" src="images/pc/body/tattoos/chest/tatchst<<tatchst>>.jpg"></a></center></td>'
 	else
-		*p 'Chest | '
+		*p '<td><center>Chest</center></td>'
 	end
 	if tatside > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattooside''">Side</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattooside''"><img height="120" src="images/pc/body/tattoos/side/tatside<<tatside>>.jpg"></a></center></td>'
 	else
-		*p 'Side | '
+		*p '<td><center>Side</center></td>'
 	end
 	if tatblly > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattoobelly''">Belly</a>'
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattoobelly''"><img height="120" src="images/pc/body/tattoos/belly/tatblly<<tatblly>>.jpg"></a></center></td>'
 	else
-		*p 'Belly'
+		*p '<td><center>Belly</center></td>'
 	end
-	*pl
 	if tatarm > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattooarm''">Arm</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattooarm''"><img height="120" src="images/pc/body/tattoos/arms/tatarm<<tatarm>>.jpg"></a></center></td>'
 	else
-		*p 'Arm | '
+		*p '<td><center>Arm</center></td>'
 	end
 	if tatwrist > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattoowrist''">Wrist</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattoowrist''"><img height="120" src="images/pc/body/tattoos/wrists/tatwrst<<tatwrist>>.jpg"></a></center></td>'
 	else
-		*p 'Wrist | '
+		*p '<td><center>Wrist</center></td>'
 	end
+  *p '</tr>'
+  '<tr>'
 	if tathand > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattoohand''">Hand</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattoohand''"><img height="120" src="images/pc/body/tattoos/hand/tathnd<<tathand>>.jpg"></a></center></td>'
 	else
-		*p 'Hand | '
+		*p '<td><center>Hand</center></td>'
 	end
 	if tatleg > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattooleg''">Leg</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattooleg''"><img height="120" src="images/pc/body/tattoos/legs/tatleg<<tatleg>>.jpg"></a></center></td>'
 	else
-		*p 'Leg | '
+		*p '<td><center>Leg</center></td>'
 	end
 	if tatankle > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattoofoot''">Foot</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattoofoot''"><img height="120" src="images/pc/body/tattoos/foot/tatankle<<tatankle>>.jpg"></a></center></td>'
 	else
-		*p 'Foot | '
+		*p '<td><center>Foot</center></td>'
 	end
 
 	if tatupb > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattootramp''">"Tramp Stamp"</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattootramp''"><img height="120" src="images/pc/body/tattoos/trampstamp/tatlowbck<<tatupb>>.jpg"></a></center></td>'
 	else
-		*p 'Tramp Stamp | '
+		*p '<td><center>Tramp Stamp</center></td>'
 	end
 	if tatass > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattooass''">Butt</a> | '
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattooass''"><img height="120" src="images/pc/body/tattoos/ass/tatass<<tatass>>.jpg"></a></center></td>'
 	else
-		*p 'Butt | '
+		*p '<td><center>Butt</center></td>'
 	end
 	if tatvag > 0:
-		tatcounter = 1 & *p '<a href="exec: gs ''obj_din'', ''tattoovag''">Groin</a>'
+		tatcounter = 1 & *p '<td><center><a href="exec: gs ''obj_din'', ''tattoovag''"><img height="120" src="images/pc/body/tattoos/pubic/tatvag<<tatvag>>.jpg"></a></center></td>'
 	else
-		*p 'Groin'
+		*p '<td><center>Groin</center></td>'
 	end
-	'</center>'
+	'</tr></table></center>'
 	if tatcounter = 0:
 		'You have a pristine body. Not in terms of debauchery, but in terms of tattoos.'
 	end
@@ -1910,48 +1912,51 @@ if $ARGS[0] = 'piercing':
 	elseif (pirsA = 10000 or pirsA = 0) and (pirsB = 10000 or pirsB = 0) and (pirsC = 10000 or pirsC = 0) and (pirsD = 10000 or pirsD = 0) and (pirsE = 10000 or pirsE = 0) and (pirsF = 10000 or pirsF = 0) and (pirsN = 10000 or pirsN = 0) and (pirsG = 10000 or pirsG = 0) and (pirsGL = 10000 or pirsGL = 0):
 		'You are not wearing any piercings'
 	else
-		*pl
+    *p '<table><tr>'
 		if pirsA > 0 and pirsA < 10000:
-			*p '<a href="exec:gs ''obj_din'', ''pirsA''">Tongue</a> | '
+			*p '<td><center><a href="exec:gs ''obj_din'', ''pirsA''"><img height="120" src="images/pc/body/piercings/a<<pirsA>>.jpg"></a></center></td>'
 		else
-			*p 'Tongue | '
+			*p '<td><center>Tongue</center></td>'
 		end
 		if pirsB > 0 and pirsB < 10000:
-			*p '<a href="exec:gs ''obj_din'', ''pirsB''">Lips</a> | '
+			*p '<td><center><a href="exec:gs ''obj_din'', ''pirsB''"><img height="120" src="images/pc/body/piercings/b<<pirsB>>.jpg"></a></center></td>'
 		else
-			*p 'lips | '
+			*p '<td><center>lips</center></td>'
 		end
 		if pirsC > 0 and pirsC < 10000:
-			*p '<a href="exec:gs ''obj_din'', ''pirsC''">Ears</a> | '
+			*p '<td><center><a href="exec:gs ''obj_din'', ''pirsC''"><img height="120" src="images/pc/body/piercings/c<<pirsC>>.jpg"></a></center></td>'
 		else
-			*p 'Ears | '
+			*p '<td><center>Ears</center></td>'
 		end
 		if pirsD > 0 and pirsD < 10000:
-			*p '<a href="exec:gs ''obj_din'', ''pirsD''">Nose</a> | '
+			*p '<td><center><a href="exec:gs ''obj_din'', ''pirsD''"><img height="120" src="images/pc/body/piercings/d<<pirsD>>.jpg"></a></center></td>'
 		else
-			*p 'Nose | '
+			*p '<td><center>Nose</center></td>'
 		end
+    *p '</tr>'
+    '<tr>'
 		if pirsE > 0 and pirsE < 10000:
-			*p '<a href="exec:gs ''obj_din'', ''pirsE''">Eyebrows</a> | '
+			*p '<td><center><a href="exec:gs ''obj_din'', ''pirsE''"><img height="120" src="images/pc/body/piercings/e<<pirsE>>.jpg"></a></center></td>'
 		else
-			*p 'Eyebrows | '
+			*p '<td><center>Eyebrows</center></td>'
 		end
 		if pirsF > 0 and pirsF < 10000:
-			*p '<a href="exec:gs ''obj_din'', ''pirsF''">Nipples</a> | '
+			*p '<td><center><a href="exec:gs ''obj_din'', ''pirsF''"><img height="120" src="images/pc/body/piercings/f<<pirsF>>.jpg"></a></center></td>'
 		else
-			*p 'Nipples | '
+			*p '<td><center>Nipples</center></td>'
 		end
 		if pirsN > 0 and pirsN < 10000:
-			*p '<a href="exec:gs ''obj_din'', ''pirsN''">Navel</a> | '
+			*p '<td><center><a href="exec:gs ''obj_din'', ''pirsN''"><img height="120" src="images/pc/body/piercings/n<<pirsN>>.jpg"></a></center></td>'
 		else
-			*p 'Navel | '
+			*p '<td><center>Navel</center></td>'
 		end
 		if pirsG > 0 and pirsG < 10000:
-			*p '<a href="exec:gs ''obj_din'', ''pirsG''">Pussy</a>'
+			*p '<td><center><a href="exec:gs ''obj_din'', ''pirsG''"><img height="120" src="images/pc/body/piercings/g<<pirsG>>.jpg"></a></center></td>'
 		else
-			*p 'Pussy'
+			*p '<td><center>Pussy</center></td>'
 		end
 	end
+  *p '</tr></table>'
 	'</center>'
 end
 

locations/office.qsrc

@@ -23,13 +23,18 @@ if $ARGS[0] = 'start':
 	$sexloc = 'office'
 	$menu_loc = 'office'
 	$menu_arg = 'start'
+	$loc = 'office'
+	$loc_arg = 'start'
 	menu_off = 0
 	minut += 5
 	gs 'stat'
-	'<center><b><font color="maroon">Engineering company offices</font></b></center>'
+	'<center><b><font color="maroon">Titran-Express Engineering</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/lobby.jpg"></center>'
+	
+	if PCloStyle3 ! 4 or PCLoSkirt <= 0: act 'Use restroom to change into secretary attire': gt 'wardrobe', 'start'
+
 	if workSec = 1:
-		if CloStyle3 = 4 and PCLoSkirt > 0:
+		if PCloStyle3 = 4 and PCLoSkirt > 0:
 			'You walk into the building, you give a wave to the receptionist, who smiles back to you as you head for for the elevators.'
 			act 'Go to your floor': gt 'office', 'work_floor'
 			act 'Leave': minut += 5 & gt 'city_center'
@@ -97,6 +102,8 @@ if $ARGS[0] = 'work_floor':
 	$sexloc = 'office'
 	$menu_loc = 'office'
 	$menu_arg = 'work_floor'
+	$loc_arg = 'work_floor'
+	$loc = 'office'
 	menu_off = 0
 	if sound = 0 and hour >= 8 and hour < 17:PLAY 'sound/office.mp3',30 & PLAY 'sound/office2.mp3',30
 	minut += 5
@@ -105,18 +112,19 @@ if $ARGS[0] = 'work_floor':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/lobby.jpg"></center>'
 	'This is the main hall for your work floor. It is nicely decorated and you can hear other people working in the office.'
 	if workSec = 1:
-		if sek['atwork'] = daystart and hour = 12:
+		if sek['atwork'] = daystart and (hour = 12 or hour = 13):
 			act 'Go back to work station':
 				sekDay += 1
 				if hour = 12: minut += 60 - minut
 				gs 'stat'
 				gt 'office', 'work'
 			end
-		elseif hour >= 8 and hour < 17:
-			if hour = 8:
+		elseif hour >= 7 and hour < 17:
+			if hour < 9:
 				act 'Go to work':
 					sek['atwork'] = daystart
-					minut = 60 - minut
+					minut = 60*(9-hour) + (60-minut)
+					gs 'stat'
 					gt 'office', 'secretary_office'
 				end
 			else
@@ -125,10 +133,10 @@ if $ARGS[0] = 'work_floor':
 			act 'Go to the breakroom':gt 'office', 'work_floor'
 			act 'Go to restrooms':gt 'office', 'restrooms'
 		end
-		if CloStyle3 ! 4:
+		if PCloStyle3 ! 4:
 			'You are not dressed according to the corporate dress code.'
 		else
-			if hour >= 8 and hour < 17:
+			if hour >= 7 and hour < 17:
 				act 'Resign':
 					*clr & cla
 					menu_off = 1
@@ -746,7 +754,7 @@ if $ARGS[0] = 'interview':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/npc/torbica_office.jpg"></center>'
-		if hotcat >= 6 and CloStyle3 = 4:
+		if hotcat >= 6 and PCloStyle3 = 4:
 			if PCLoSkirt > 0:
 				'As you walk in she looks you over and gives you a pleasant smile. "Please take a seat so we can get started."'
 				'She spends the next several minutes reading your resume and looking over your certification. Once she finishes that she talks to you and asks you a lot of questions. That is followed by a quiz you have to fill out, it seems to mostly be a morality test. Once you have finally finished it all, you glance up at the clock and notice that a hour has passed.'
@@ -776,11 +784,11 @@ if $ARGS[0] = 'interview':
 				'As soon as you walk in the woman takes one look at you and frowns. "What are you wearing?"'
 				'You start to respond that it is an office suit, not sure what her problem is, but before you can respond she keeps talking. "We expect our ladies to dress as ladies and that means office wear with a skirt or dress, I am afraid I can''t offer you the job dressed like that. If you acquire the appropriate attire, feel free to come back later for a interview. For now though I have no positions open for you. If you don''t mind I am rather busy." She says indicating towards the door behind you, crestfallen and knowing there is nothing you can say you turn to leave, it seems that you should have worn a suit with a skirt or dress.'
 			end
-		elseif hotcat >= 6 and CloStyle3 ! 4:
+		elseif hotcat >= 6 and PCloStyle3 ! 4:
 			'As soon as you walk in the woman takes one look at you and frowns. "What are you wearing?"'
 			'You start to respond that it is just your clothes, not sure what she meant by that, but before you can respond she keeps talking. "That is not appropriate attire, I am afraid I can''t offer you the job dressed like that. If you acquire the appropriate attire, which is a womens'' business suit with a skirt, feel free to come back later for a interview. For now though I have no positions open for you. If you don''t mind I am rather busy." She says indicating towards the door behind you, crestfallen and knowing there is nothing you can say you turn to leave, you should have really wore a womans'' suit.'
 			act 'Leave': minut += 15 & gt 'office', 'start'
-		elseif hotcat <= 5 and CloStyle3 = 4 and PCLoSkirt > 0:
+		elseif hotcat <= 5 and PCloStyle3 = 4 and PCLoSkirt > 0:
 			'As soon as you walk in the woman takes one look at you and frowns. "I am afraid you are just not what we are looking for, you are dressed the part at least."'
 			'You start to respond to ask just what she means you don''t look the part, but before you can respond she keeps talking. "I am afraid I can''t offer you the job. Perhaps you should put more effort in how you look, our employees represent us and we only hire the best. If you don''t mind I am rather busy." She says indicating towards the door behind you, is she really saying she isn''t going to hire you because you are not pretty enough? You feel angry that you are being judge on your looks and not how well you could do the job, but you know it is pointless to try and argue, so you get up and leave.'
 			act 'Leave': minut += 15 & gt 'city_center'

locations/parks.qsrc

@@ -19,8 +19,8 @@ if $ARGS[0] = 'start':
 	'Wander deeper into the <a href="exec:gt ''lug'',''start''">park</a>.'
 
 
+  act 'Deeper into the park': gt 'lug','start'
 	act 'Go to Okhlopkov Square (0:05)': minut += 5 &  gt 'liames'
-
 	act 'Go to Town Center (0:10)': minut += 10 & gt 'liam'
 
 	act 'Walk around the park (1 hour)':

locations/pav_church.qsrc

@@ -468,7 +468,15 @@ if $ARGS[0] = 'pray':
 		if fame['pav_sex'] > 10: gs 'fame', 'pav', 'sex', -1
 		if fame['pav_prostitute'] > 10: gs 'fame', 'pav', 'prostitute', -1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_praying.jpg"></center>'
-		if hour > 6 and hour < 20 and church_moral < 30:
+    if godslut = 1:
+			pcs_horny = 50
+			orgasm += 1
+			pcs_mood = 100
+			church_moral += 1
+			if nark > 1: nark = ((nark/4)*3)
+			minut += rand(30,60)
+			'The Nave is lit only with small candles, leaving your surroundings in darkness, but it''s comforting, like being in the womb of God. You get the urge to pray very intensely. You lose yourself in the presence of God and are overcome by religious ecstasy. You fight back a sob as your body trembles with an uncontrollable orgasm. You wipe the tears from your eyes and gaze with adoration at the face of Christ, your lover.'
+    elseif hour > 6 and hour < 20 and church_moral < 30:
 			pcs_horny -= 10
 			pcs_mood += 20
 			church_moral += 1
@@ -653,7 +661,13 @@ if $ARGS[0] = 'tease':
 		'You look the priest right in the eyes when his attention is on you, slowly leaning forward and allowing your breasts to be exposed. To your delight, you see his eyes dart to your breasts and stay there.'
 		if kirillsex ! 0:
 			'"Very nice, <<$pcs_firstname>>." Father Kirill whispers as he reaches out and caresses your breasts before pulling your top back into place, covering you once again. "Follow me."'
-			act 'Follow him': gt 'pav_church2', 'sex'
+			act 'Follow him':
+        if rand(0,1) = 0:  
+          gt 'pav_church2', 'sex'
+        else
+			    gt 'pav_church', 'spank'
+        end
+      end
 			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Leave the church (<<will_cost>> Willpower)':
@@ -664,12 +678,15 @@ if $ARGS[0] = 'tease':
 			else
 				act 'Leave the church (<br><font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
+		elseif rand(0,1) = 0:
 			'"Very nice, <<$pcs_firstname>>." Father Kirill whispers with a smile as he reaches out and softly caresses your breasts before pulling your top back into place, covering you up once again.'
 			'"No temptation has overtaken you except what is common to mankind. And God is faithful; he will not let you be tempted beyond what you can bear. But when you are tempted, he will also provide a way out so that you can endure it," he murmurs as he fastens your buttons and sighs.'
 			'"Thus it is written, and thus it behooved Christ to suffer, and to rise from the dead the third day," you reply looking at the telltale lump in Father Kirill''s crotch, "It seems that Jesus is not the only one to rise from the dead," you add with a playful giggle.'
 			'Father Kirill looks at you and opens his mouth to speak but no words come out. With a laugh, you jump up and skip out of the church with a final glance back at the dumbfounded cleric.'
 			act 'Leave the church': gt 'pav_church' , 'start'
+    else
+			'"Very nice, <<$pcs_nickname>>." Father Kirill whispers as he reaches out and caresses your firm breasts before pulling your top back into place, covering you once again. "Follow me."'
+			act 'Follow him': gt 'pav_church', 'spank'
 		end
 	else
 		Kirill -= 2

locations/pav_clinic.qsrc

@@ -4,6 +4,7 @@ if $ARGS[0] = '':
 	CLOSE ALL
 	clr
 	$loc = 'pav_clinic'
+	$loc_arg = ''
 	$location_type = 'indoors'
 	$menu_loc = 'pav_clinic'
 	$menu_arg = ''
@@ -19,6 +20,9 @@ if $ARGS[0] = '':
 	if pcs_ask_mward_help >= 1 and pcs_know_mward <= 0: '<br><br><a href="exec: minut += 5 & gt ''pav_clinic'', ''reception''">Ask</a> at the reception for help with your breasts.'
 
 	act 'Leave':minut += 5 & gt 'pav_commercial'
+	
+	if therapistday ! daystart: act 'Visit the therapist (1:00)': gt 'therapist'
+
 
 	if preg = 2:
 		act 'Give birth':
@@ -311,8 +315,6 @@ if $ARGS[0] = '':
 
 		if pcs_know_mward > 0: act 'Visit the maternity ward (0:05)': gt 'pav_clinic', 'maternity_ward'
 
-		gs 'medical_din', 'birth_control'
-
 		act 'Go to the sexual health clinic': gt 'pav_clinic', 'sexual_health'
 
 		if sick >= 1:
@@ -328,6 +330,8 @@ if $ARGS[0] = '':
 			end
 		end
 
+		gs 'medical_din', 'birth_control'
+
 		if (fame['pav_slut'] >= 250 or fame['pav_prostitute'] >= 125 or guy > 10 or unprotfilm or whoreQW > 1 or bordelslutty > 0 or cumcondslip_aware > 0 or (daystart - daylastperiod > 42) or Triper > 2 or Gerpes >= 3 or Sifilis >= 21 or Kandidoz > 30) and gynodaystart ! daystart:
 			act 'Visit your gynaecologist (1,000 <b>₽</b>)':
 				*clr & cla
@@ -479,7 +483,6 @@ if $ARGS[0] = '':
 
 									act 'Have sex with him':
 										*clr & cla
-										pcs_vag += 1
 										gs 'boyStat', 'A68'
 										cumprecheck = 1
 										gs 'cum_manage'
@@ -512,7 +515,6 @@ if $ARGS[0] = '':
 
 											act 'Anal sex':
 												*clr & cla
-												pcs_ass += 1
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/gpoli_11.jpg"></center>'
 												'You want to pull away from him, but you''re trapped between Dr. Petrovich and a wall. He slowly moves his hips, letting you get used to the size of his thick rod inside your tight little butt. It still stings a lot. Despite your best efforts you can''t relax your anus, only slowly getting used to the size of him.'
@@ -818,7 +820,7 @@ end
 
 if $ARGS[0] = 'referral':
 	menu_off = 1
-	if pcs_vag = 0 and stat['hidden_vaginal'] = 0:
+	if stat['vaginal'] = 0 and stat['hidden_vaginal'] = 0 and pcs_vag = 0:
 		*clr & cla
 		minut = minut + 15
 		gs 'stat'
@@ -836,7 +838,7 @@ if $ARGS[0] = 'referral':
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/gpoli_1.jpg"></center>'
-		if pcs_vag = 0 and stat['hidden_vaginal'] > 0:
+		if (stat['vaginal'] = 0 and pcs_vag = 0) and stat['hidden_vaginal'] > 0:
 			'You quickly undress and climb into the chair, spreading your legs and resting them in the stirrups. The leather-like surface feels strangely warm on your bottom, and it takes you a moment to realize that it is heated. The gynaecologist examines your vagina carefully with a speculum, and silently mumbles something to himself.'
 			act 'Have the check-up': gt 'pav_clinic', 'referral2'
 		else
@@ -1090,7 +1092,6 @@ if $ARGS[0] = 'spravka_arrange':
 
 				act 'Let him fuck you':
 					*clr & cla
-					pcs_vag += 1
 					gs 'boyStat', 'A68'
 					cumprecheck = 1
 					gs 'cum_manage'
@@ -1123,7 +1124,6 @@ if $ARGS[0] = 'spravka_arrange':
 
 						act 'He fucks your ass':
 							*clr & cla
-							pcs_ass += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/gpoli_11.jpg"></center>'
 							'You want to pull away, but you''re trapped between him and a wall. He slowly moves his hips, letting you get used to the size of his thick rod inside your tight little butt. It still stings a lot. Despite your best efforts you can''t relax your anus, only slowly getting used to the size of him.'
@@ -1396,7 +1396,6 @@ if $ARGS[0] = 'spravka_arrange_pale':
 
 				act 'Let him fuck you':
 					*clr & cla
-					pcs_vag += 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/gpoli_9.jpg"></center>'
 					'Your body begins to get hotter and hotter, beads of sweat forming on your forehead and upper lip. With every thrust Dr. Petrovich fucks you faster and harder, and you can feel your excitement growing too. Involuntarily you start to moan and gasp for air. You groan louder and louder as you become more aroused. His hard hot member penetrates you ever deeper, without giving you any pause.'
@@ -1427,7 +1426,6 @@ if $ARGS[0] = 'spravka_arrange_pale':
 
 						act 'He fucks your ass':
 							*clr & cla
-							pcs_ass += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/gpoli_11.jpg"></center>'
 							'You want to pull away, but you''re trapped between him and a wall. He slowly moves his hips, letting you get used to the size of his thick rod inside your tight little butt. It still stings a lot. Despite your best efforts you can''t relax your anus, only slowly getting used to the size of him.'
@@ -1982,7 +1980,7 @@ if $ARGS[0] = 'maternity_ward_donation':
 		end
 		act 'Continue':
 			*clr & cla
-			lact_ev['gpoli_milkedvolume'] = func('lact_lib','$get_breastmilk', 4, 15)
+			lact_ev['gpoli_milkedvolume'] = func('lact_lib','$get_breastmilk', 6, func('lact_lib','$get_breastmilk_time', 6, lactation['breastmv']/1000))
 			lactation['breastpumped'] = 1
 			'After 15 minutes, the nurse detaches the pumps from your breasts.'
 			if lact_ev['gpoli_milkedvolume'] => 50000:
@@ -2032,7 +2030,7 @@ if $ARGS[0] = 'maternity_ward_donation':
 				'The nurse looks at your breasts'
 				'Nurse: Looks like you could go for another pumping... shall we?'
 				act 'Have your breasts pumped again': gt 'pav_clinic', 'maternity_ward_donation'
-			else
+			elseif lactation['breastmv'] > 0:
 				act 'Ask to donate more': gt 'pav_clinic', 'maternity_ward_donation'
 			end
 			act 'Enough for today':

locations/pav_commercial.qsrc

@@ -179,7 +179,7 @@ if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitar['c
 	else
 		act 'Start busking (<<ml_buskingtime>> minutes)':
 			gs 'music_buskingevents', 'busking', 'pav'
-			if rand(0,100) > 80 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5:
+			if ml_delparcoQW = 0 and (rand(0,100) > 80 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5):
 				gt 'music_gigstarts', 'delparco_start', 'pav_commercial'
 			end		
 		end

locations/pav_disco.qsrc

@@ -108,6 +108,7 @@ if $ARGS[0] = '':
 				frost = 0
 				gs 'stat'
 				if alko = 0:
+					*clr
 					'<center><b><font color="maroon">Disco</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/dance.jpg"></center>'
 					if $pantyworntype = 'none' and PCloSkirt > 2:
@@ -356,6 +357,7 @@ if $ARGS[0] = '':
 				if pcs_makeup = 2:verodance += 1
 				if pcs_makeup = 3:verodance += 2
 				if pcs_makeup = 4:verodance += 3
+				if pcs_makeup = 5:verodance += 5
 				verodance += alko
 				verodance += 5
 				verprigrand = rand(0, 20)

locations/pav_disco_classmates.qsrc

@@ -34,10 +34,10 @@ if $ARGS[0] = 'classmates':
 	i2 = 0
 	:discopop_loop
 		if (npc_grupTipe['A<<i>>'] = 1 or $npc_nickname['A<<i>>'] = 'Natasha') and discoenable['A<<i>>'] = 1 and discobloc['A<<i>>'] ! daystart:
-			if i2 = 0: '<tr>'
+			if i2 = 0: *p '<tr>'
 			i2 += 1
-			'<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''cool_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A<<i>>'']>></td></tr></table></td>'
-			if i2 mod 8 = 0: i2 = 0 & '</tr>'
+			*p '<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''cool_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A<<i>>'']>></td></tr></table></td>'
+			if i2 mod 8 = 0: i2 = 0 & *p '</tr>'
 		end
 		i += 1
 	if i <= aarraynumber:jump 'discopop_loop'
@@ -45,9 +45,9 @@ if $ARGS[0] = 'classmates':
 	i = 1
 	:discojock_loop
 		if npc_grupTipe['A<<i>>'] = 2 and discoenable['A<<i>>'] = 1 and discobloc['A<<i>>'] ! daystart:
-			if i2 = 0: '<tr>'
+			if i2 = 0: *p '<tr>'
 			i2 += 1
-			'<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''jocks_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A<<i>>'']>></td></tr></table></td>'
+			*p '<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''jocks_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A<<i>>'']>></td></tr></table></td>'
 			if i2 mod 8 = 0: i2 = 0 & '</tr>'
 		end
 		i += 1
@@ -55,35 +55,35 @@ if $ARGS[0] = 'classmates':
 	if i2 mod 8 <> 0:
 		:disco_loopi21
 		i2 += 1
-		'<td></td>'
+		*p '<td></td>'
 		if i2 mod 8 = 0:
 			i2 = 0
-			'</tr>'
+			*p '</tr>'
 		else
 			jump 'disco_loopi21'
 		end
 	end
 
-	'<tr><td colspan=8>The gopniks are lounging in the darkest corner of the hall. They''re mostly keeping to themselves, but a few of them are out dancing.</td></tr>'
+	*p '<tr><td colspan=8>The gopniks are lounging in the darkest corner of the hall. They''re mostly keeping to themselves, but a few of them are out dancing.</td></tr>'
 
 	i = 1
 	:discogop_loop
 		if npc_grupTipe['A<<i>>'] = 4 and discoenable['A<<i>>'] = 1 and discobloc['A<<i>>'] ! daystart:
 			$loopname = $npc_nickname['A<<i>>']
 			$loopname = $lcase($loopname)
-			if i2 = 0: '<tr>'
+			if i2 = 0: *p '<tr>'
 			i2 += 1
-			'<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''gop_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A<<i>>'']>></td></tr></table></td>'
+			*p '<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''gop_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A<<i>>'']>></td></tr></table></td>'
 			if i2 mod 8 = 0: i2 = 0 & '</tr>'
 		end
 		if i = 144:
 			if i2 mod 8 <> 0:
 				:disco_loopi22
 				i2 += 1
-				'<td></td>'
+				*p '<td></td>'
 				if i2 mod 8 = 0:
 					i2 = 0
-					'</tr>'
+					*p '</tr>'
 				else
 					jump 'disco_loopi22'
 				end
@@ -94,22 +94,22 @@ if $ARGS[0] = 'classmates':
 	if i2 mod 8 <> 0:
 		:disco_loopi23
 		i2 += 1
-		'<td></td>'
+		*p '<td></td>'
 		if i2 mod 8 = 0:
 			i2 = 0
-			'</tr>'
+			*p '</tr>'
 		else
 			jump 'disco_loopi23'
 		end
 	end
 
 	if soniaPS > 0 and discoenable['A25'] = 1 and discobloc['A25'] ! daystart:
-		'<tr><td><table bgcolor=#FFF8DC><tr><td align=center><a href="exec:gt ''pav_disco_coolkids'', ''sonia_outcast'' "><img  height="100" src="images/characters/shared/headshots_main/25.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A25'']>></td></tr></table></td><td colspan=7></td></tr>'
+		*p '<tr><td><table bgcolor=#FFF8DC><tr><td align=center><a href="exec:gt ''pav_disco_coolkids'', ''sonia_outcast'' "><img  height="100" src="images/characters/shared/headshots_main/25.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A25'']>></td></tr></table></td><td colspan=7></td></tr>'
 	end
 	if hour >= 21 and hour < 23 and week=5:
-		'<tr><td bgcolor=#FFF8DC align=left width=12.5%><a href="exec: gt ''VolleyTrenerSpeak''"><img  height="100" src="images/characters/shared/headshots_main/69.jpg"></a></td><td valign=bottom align=left bgcolor=white colspan=7>Coach Mikhail Nikolayevich stands at the enterance of the hall.</td></tr>'
+		*p '<tr><td bgcolor=#FFF8DC align=left width=12.5%><a href="exec: gt ''VolleyTrenerSpeak''"><img  height="100" src="images/characters/shared/headshots_main/69.jpg"></a></td><td valign=bottom align=left bgcolor=white colspan=7>Coach Mikhail Nikolayevich stands at the enterance of the hall.</td></tr>'
 	end
-	'</table></center>'
+	*p '</table></center>'
 	*nl
 
 	!!display of their headshots in a table like the above $args has.

locations/pav_disco_gopniks.qsrc

@@ -1533,100 +1533,100 @@ if $ARGS[0] = 'anushka_dance':
 						gt 'pav_disco_gopniks', 'anushka_dance'
 					end
 				end
-				!!act 'Dry hump her':
-				!!	*clr & cla
-				!!	gs 'stat'
-				!!	if npc_rel['A144'] >= 50 and hotcat >= 6:
-				!!		gs 'fame', 'pav', 'sex', 1
-				!!		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'
-				!!		'As the two of you grind against each other, you grab her hips with your hands and disentangle your legs. With your legs now free of each other, you give her body a twist with your hands, keeping your hands on her hips until she''s facing away from you. She leans back to dance against you, with her back rubbing against your breasts. You slide your hands around towards the front of her hips as you take a step back before pulling her hips towards you.'
-				!!		'She bends forward slightly as you start bouncing your hips against her ass. She loudly giggles at your antics and bucks her ass against you. This gets a lot of hoots and hollers from the boys watching, and by her movements you can tell she''s getting turned on. Maybe she would be up for bit of the real thing?'
-				!!		if strapon = 1:
-				!!			'You have your strapon in your purse. Maybe she would be up for getting one of her holes pounded?'
-				!!		end
-				!!		gs 'arousal', 'foreplay', 5, 'inhibition'
-				!!		gs 'stat'
-				!!		act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
-				!!		act 'Want to go fuck?':
-				!1			*clr & cla
-				!!			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'
-				!!			'She starts to giggle as you hump her, obviously finding the whole situation amusing. The boys on the other hand seem to be fascinated by what they''re watching. You lean forward to see if she wants to take this somewhere private. "So, want to go somewhere more... private?"'
-				!!			gs 'arousal', 'foreplay', 5, 'inhibition'
-				!!			gs 'arousal', 'end'
-				!!			gs 'stat'
-				!!			act 'Make out':
-				!!				*clr & cla
-				!!				gs 'fame', 'pav', 'sex', 1
-				!!				gs 'stat'
-				!!				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance5.jpg"></center>'
-				!!				'She turns and starts kissing you passionately, wrapping her arms around your neck as she does. You return the kiss in full and let your hands roam around her body. The two of you stand on the dance floor passionately making out, the hoots and hollers from the guys sounding far away as you get lost in the moment.'
-				!!				*nl
-				!!				'You don''t know how long you kiss for, but once you break the kiss, you give her a smile. "So is that a yes?"'
-				!!				'She grins. "Yeah, let''s get out of here."'
-				!!				gs 'arousal', 'kiss', 5, 'inhibition'
-				!!				gs 'arousal', 'end'
-				!!				gs 'stat'
-				!!				act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
-				!!				act 'Take her home': gt 'pav_discoev1', 'anushka'
-				!!			end
-				!!		end
-				!!		if strapon = 1:
-				!!			act 'You want to fuck her':
-				!!				*clr & cla
-				!!				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'
-				!!				'She starts to giggle as you hump her, obviously finding the whole situation amusing. The boys on the other hand seem to be fascinated by what they''re watching. You lean forward to see if she wants to take this somewhere private. "I want to strap one on and fuck you <i>hard</i> and <i>fast</i>."'
-				!!				gs 'arousal', 'foreplay', 5, 'inhibition'
-				!!				gs 'arousal', 'end'
-				!!				gs 'stat'
-				!!				act 'Make out':
-				!!					*clr & cla
-				!!					gs 'fame', 'pav', 'sex', 1
-				!!					gs 'stat'
-				!!					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance5.jpg"></center>'
-				!!					'She turns and starts kissing you passionately, wrapping her arms around your neck as she does. You return the kiss in full and let your hands roam around her body. The two of you stand on the dance floor passionately making out, the hoots and hollers from the guys sounding far away as you get lost in the moment.'
-				!!				    *nl
-				!!				    'You don''t know how long you kiss for, but once you break the kiss, you give her a smile. "So is that a yes?"'
-				!!				    'She grins. "Yeah, let''s get out of here."'
-				!!					gs 'arousal', 'kiss', 5, 'inhibition'
-				!!					gs 'arousal', 'end'
-				!!					gs 'stat'
-				!!					act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
-				!!					act 'Take her home': gt 'pav_discoev1', 'anushka'
-				!!				end
-				!!			end
-				!!			act 'You want to butt fuck her':
-				!!				*clr & cla
-				!!				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'
-				!!				'She starts to giggle as you hump her, obviously finding the whole situation amusing. The boys on the other hand seem to be fascinated by what they''re watching. "I want to strap one on and fuck your tight little ass with it until we both cum."'
-				!!				gs 'arousal', 'foreplay', 5, 'inhibition'
-				!!				gs 'arousal', 'end'
-				!!				gs 'stat'
-				!!				act 'Make out':
-				!!					*clr & cla
-				!!					gs 'fame', 'pav', 'sex', 1
-				!!					gs 'stat'
-				!!					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance5.jpg"></center>'
-				!!					'She turns and starts kissing you passionately, wrapping her arms around your neck as she does. You return the kiss in full and let your hands roam around her body. The two of you stand on the dance floor passionately making out, the hoots and hollers from the guys sounding far away as you get lost in the moment.'
-				!!				    *nl
-				!!				    'You don''t know how long you kiss for, but once you break the kiss, you give her a smile. "So is that a yes?"'
-				!!				    'She grins. "Yeah, let''s get out of here."'
-				!!					gs 'arousal', 'kiss', 5, 'inhibition'
-				!!					gs 'arousal', 'end'
-				!!					gs 'stat'
-				!!					act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
-				!!					act 'Take her home': gt 'pav_discoev1', 'anushka'
-				!!				end
-				!!			end
-				!!		end
-				!!	else
-				!!		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance2.jpg"></center>'
-				!!		'As the two of you grind against each other, you grab her hips with your hands and disentangle your legs. With your legs now free of each other, you give her body a twist with your hands, keeping your hands on her hips until she''s facing away from you. She leans back to dance against you, with her back rubbing against your breasts. You slide your hands around towards the front of her hips as you take a step back before pulling her hips towards you.'
-				!!		'She bends forward slightly as you start bouncing your hips against her ass. She loudly giggles at your antics and bucks her ass against you. After the song ends, she reaches down to pull your hands off her hips and steps away from you and starts dancing with a bit of a gap between you.'
-				!!		gs 'arousal', 'foreplay', 5, 'inhibition'
-				!!		gs 'stat'
-				!!		act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
-				!!	end
-				!!end
+				act 'Dry hump her':
+					*clr & cla
+					gs 'stat'
+					if npc_rel['A144'] >= 50 and hotcat >= 6:
+						gs 'fame', 'pav', 'sex', 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'
+						'As the two of you grind against each other, you grab her hips with your hands and disentangle your legs. With your legs now free of each other, you give her body a twist with your hands, keeping your hands on her hips until she''s facing away from you. She leans back to dance against you, with her back rubbing against your breasts. You slide your hands around towards the front of her hips as you take a step back before pulling her hips towards you.'
+						'She bends forward slightly as you start bouncing your hips against her ass. She loudly giggles at your antics and bucks her ass against you. This gets a lot of hoots and hollers from the boys watching, and by her movements you can tell she''s getting turned on. Maybe she would be up for bit of the real thing?'
+						if strapon = 1:
+							'You have your strapon in your purse. Maybe she would be up for getting one of her holes pounded?'
+						end
+						gs 'arousal', 'foreplay', 5, 'inhibition'
+						gs 'stat'
+						act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
+						act 'Want to go fuck?':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'
+							'She starts to giggle as you hump her, obviously finding the whole situation amusing. The boys on the other hand seem to be fascinated by what they''re watching. You lean forward to see if she wants to take this somewhere private. "So, want to go somewhere more... private?"'
+							gs 'arousal', 'foreplay', 5, 'inhibition'
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Make out':
+								*clr & cla
+								gs 'fame', 'pav', 'sex', 1
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance5.jpg"></center>'
+								'She turns and starts kissing you passionately, wrapping her arms around your neck as she does. You return the kiss in full and let your hands roam around her body. The two of you stand on the dance floor passionately making out, the hoots and hollers from the guys sounding far away as you get lost in the moment.'
+								*nl
+								'You don''t know how long you kiss for, but once you break the kiss, you give her a smile. "So is that a yes?"'
+								'She grins. "Yeah, let''s get out of here."'
+								gs 'arousal', 'kiss', 5, 'inhibition'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
+								act 'Take her home': gt 'pav_discoev1', 'anushka'
+							end
+						end
+						if strapon = 1:
+							act 'You want to fuck her':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'
+								'She starts to giggle as you hump her, obviously finding the whole situation amusing. The boys on the other hand seem to be fascinated by what they''re watching. You lean forward to see if she wants to take this somewhere private. "I want to strap one on and fuck you <i>hard</i> and <i>fast</i>."'
+								gs 'arousal', 'foreplay', 5, 'inhibition'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'Make out':
+									*clr & cla
+									gs 'fame', 'pav', 'sex', 1
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance5.jpg"></center>'
+									'She turns and starts kissing you passionately, wrapping her arms around your neck as she does. You return the kiss in full and let your hands roam around her body. The two of you stand on the dance floor passionately making out, the hoots and hollers from the guys sounding far away as you get lost in the moment.'
+								    *nl
+								    'You don''t know how long you kiss for, but once you break the kiss, you give her a smile. "So is that a yes?"'
+								    'She grins. "Yeah, let''s get out of here."'
+									gs 'arousal', 'kiss', 5, 'inhibition'
+									gs 'arousal', 'end'
+									gs 'stat'
+									act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
+									act 'Take her home': gt 'pav_discoev1', 'anushka'
+								end
+							end
+							act 'You want to butt fuck her':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance4.jpg"></center>'
+								'She starts to giggle as you hump her, obviously finding the whole situation amusing. The boys on the other hand seem to be fascinated by what they''re watching. "I want to strap one on and fuck your tight little ass with it until we both cum."'
+								gs 'arousal', 'foreplay', 5, 'inhibition'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'Make out':
+									*clr & cla
+									gs 'fame', 'pav', 'sex', 1
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance5.jpg"></center>'
+									'She turns and starts kissing you passionately, wrapping her arms around your neck as she does. You return the kiss in full and let your hands roam around her body. The two of you stand on the dance floor passionately making out, the hoots and hollers from the guys sounding far away as you get lost in the moment.'
+								    *nl
+								    'You don''t know how long you kiss for, but once you break the kiss, you give her a smile. "So is that a yes?"'
+								    'She grins. "Yeah, let''s get out of here."'
+									gs 'arousal', 'kiss', 5, 'inhibition'
+									gs 'arousal', 'end'
+									gs 'stat'
+									act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
+									act 'Take her home': gt 'pav_discoev1', 'anushka'
+								end
+							end
+						end
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance2.jpg"></center>'
+						'As the two of you grind against each other, you grab her hips with your hands and disentangle your legs. With your legs now free of each other, you give her body a twist with your hands, keeping your hands on her hips until she''s facing away from you. She leans back to dance against you, with her back rubbing against your breasts. You slide your hands around towards the front of her hips as you take a step back before pulling her hips towards you.'
+						'She bends forward slightly as you start bouncing your hips against her ass. She loudly giggles at your antics and bucks her ass against you. After the song ends, she reaches down to pull your hands off her hips and steps away from you and starts dancing with a bit of a gap between you.'
+						gs 'arousal', 'foreplay', 5, 'inhibition'
+						gs 'stat'
+						act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
+					end
+				end
 			else
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance2.jpg"></center>'
 	            'You join in and start grinding back against her. The boys are loving the show as your movements go along with the beat of the music. Your hips are pressed together and your breasts mash into each others while your legs are tangled, causing you to grind your respective crotches on each other''s thighs. After a few songs have played, she breaks away from you and starts dancing further apart again. She wiggles her ass to tease the boys that are clustered around you.'

locations/pav_hotel.qsrc

@@ -187,6 +187,7 @@ if hotelRoom['pav_hotel'] > 0:
 		$hotel = 'pav_hotel'
 		if hotelRoom['pav_hotel'] = 1:gt'hotelroom','normal'
 		if hotelRoom['pav_hotel'] = 2:gt'hotelroom','better'
+		if hotelRoom['pav_hotel'] = 3:gt'hotelroom','best'
 	end
 end
 

locations/pav_hotelReception.qsrc

@@ -33,8 +33,13 @@ if $ARGS[0] = '':
 		act 'Collect your money':
 			cla
 			hotelcollect = 0
-			money += maidtime * 375
-			'She quickly checks the computer and then gives you <<maidtime*375>> <b>₽</b> for all the shifts you worked in the hotel.'
+      if bankAccount > 0:
+			  'She quickly checks the computer and then gives you a check for <<maidtime*375>> <b>₽</b> for all the shifts you worked in the hotel. You use your phone to deposit it in your bank account.'
+			  karta += maidtime * 375
+      else
+			  'She quickly checks the computer and then gives you <<maidtime*375>> <b>₽</b> for all the shifts you worked in the hotel.'
+			  money += maidtime * 375
+      end
 			maidtime=0
 
 			if maidHotelCount >= rand(8,10) and nichHotelReferral = 0:
@@ -366,7 +371,7 @@ if $ARGS[0] = 'pavlbarcont':
 		exit
 	end
 
-	if npc_rel['A217'] = 6 and pavlevent = 0:
+	if npc_rel['A217'] >= 6 and pavlevent = 0:
 		'You are sure the money he received from the customer was more than double this amount'
 		'You bring up the issue: "Actually <<$npc_nickname[''A217'']>>, I believe I should get more money, I am doing all the work here and I know these guys pay you much more than this."'
 		' Where <<$npc_nickname[''A217'']>> was still sitting there with a big smile a moment before, the moment you mentioned the money a gloom came over his face. This only lasted a few moments and then his smile reappeared.'

locations/pav_market.qsrc

@@ -284,11 +284,10 @@ end
 
 gs 'family'
 
-act 'Go to the train station (0:03)': minut += 3 & gt 'pav_train_hall'
 if Trainpass_day > daystart:
-	'You have <<Trainpass_day - daystart>> days left on your train pass.'
-	act 'Go direct to train station platforms': gt 'pav_train_hall', 'platform'
+	act 'Board a train (0:15)':minut += 15 & gt 'pav_train_hall', 'platform'
 end
+act 'Go to the train station (0:03)': minut += 3 & gt 'pav_train_hall'
 act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pav_commercial'
 act 'Walk to the Residential area (0:15)':minut += 15 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'

locations/pav_park.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = 'start':
 		else
 			act 'Start busking (<<ml_buskingtime>> minutes)':
 				gs 'music_buskingevents', 'busking', 'pav'
-				if rand(0,100) > 75 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5:
+				if ml_delparcoQW = 0 and (rand(0,100) > 75 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5):
 					gt 'music_gigstarts', 'delparco_start', 'pav_park'
 				end
 			end
@@ -288,7 +288,7 @@ if $ARGS[0] = 'start':
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
-	if (hour >= 20 or hour < 6) and pcs_sleep <= 40:
+	if (hour >= 20 or hour < 6) and (pcs_sleep <= 40 or cheatNoSleep ! 0):
 		if home_owned[2] = 0 and workPTU <= 2 and HotelRoom < 1:
 			!nowhere to live in town
 			'It''s quite dark now, and you have no where to stay nearby. Maybe you should try to sleep on a bench?'

locations/pav_pharmacy.qsrc

@@ -146,7 +146,7 @@ if $ARGS[0] = 'buy_condoms':
 				'She just laughs. "Just teasing, <<$pcs_nickname>>. I''ll show you what we have." She takes you by the hand and leads you to the counter holding the condoms. "We also have birth control pills if you prefer bareback."'
 			end
 			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
-			if momslut = 1:
+			if momslut ! 0:
 				'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
 				'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
 				'Luda nods and hands over the package. "Here you go <<$pcs_nickname>>. Don''t use them all at once!" She adds with a wink, you just take your purchase.'
@@ -219,7 +219,7 @@ if $ARGS[0] = 'buy_birth_control':
 				'She just laughs: "Just teasing, <<$pcs_nickname>>. I''ll show you what we have." She takes you by the hand and leads you to the counter holding the birth control pills. "We also have condoms if you are worried about STD''s. You can never tell who''s clean and who isn''t these days."'
 			end
 			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
-			if momslut = 1:
+			if momslut ! 0:
 				'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
 				'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
 				'Luda nods and hands over the package. "Here you go <<$pcs_nickname>>. Don''t use it all at once!" She adds with a wink, you just take your purchase.'
@@ -299,7 +299,7 @@ if $ARGS[0] = 'buy_preg_test':
 			'She looks a little shocked. "<<$pcs_nickname>> oh my god." Then she shakes her head. "If you are going to be sexual active you really need to use birth control or carry some condoms with you. But let me show you what we have in the way of tests." She takes you by the hand and takes you to the family planning counter that holds the pregnancy tests as well as birth control pills and condoms. "You should really buy some of each for protection against this and STD''s."'
 			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
 		end
-		if momslut = 1:
+		if momslut ! 0:
 			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
 			'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
 			'Luda nods and hands over the package. "It''s our secret for now, though if that test is positive there''s nothing that will stop her from noticing when your belly starts to round out. Whether it is or it isn''t, I threw in a box of condoms so this doesn''t happen again, okay?"'
@@ -356,7 +356,7 @@ if $ARGS[0] = 'buy_lube':
 			'"Trying to get around your mothers tests?" She laughs. "Just teasing, <<$pcs_nickname>>. I''ll show you what we have." She takes you by the hand and leads you to the counter holding the lube, "We also have birth control pills and condoms if you want them to fuck your pussy, instead of your butt."'
 			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
 		end
-		if momslut = 1:
+		if momslut ! 0:
 			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
 			'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
 			'Luda nods and hands over the package. "Here you go <<$pcs_nickname>>. Don''t use it all at once!" She adds with a wink, you just take your purchase.'
@@ -414,7 +414,7 @@ if $ARGS[0] = 'buy_morning_after':
 				'"Take this as soon as possible. It''s most effective the sooner you take it. And maybe you should also buy some birth control pills <<$pcs_nickname>> while you''re here? Then this just has to be a one time thing."'
 			end
 			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
-			if momslut = 1:
+			if momslut ! 0:
 				'Your aunt gives you a odd look. "You might be surprised dear."'
 				'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
 				'Luda nods. "Well, even so, I''m sure she''d prefer hearing that you''re taking this than to find out you''re not. But I promise, this will be our little secret."'

locations/pav_residential.qsrc

@@ -105,7 +105,13 @@ gs 'stat'
 
 if car > 0 and cardrive = 20: 'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked in the street.'
 
-if fedorKozlovQW >= 20 and FedorKozHome = 1 or fedorKozlovQW = -15 and FedorKozHome = 1: '<br><a href="exec: minut += 5 & gt ''FedorEv4'', ''Home Entrance''">Fedor</a> lives in a house nearby.'
+if StoryLine > 0: act 'Go to the local school': gt 'gschool_grounds','main'
+act 'Go to the community center':gt 'pav_commcenter'
+
+if (fedorKozlovQW >= 20 or fedorKozlovQW = -15) and FedorKozHome = 1:
+	'<br><a href="exec: minut += 5 & gt ''FedorEv4'', ''Home Entrance''">Fedor</a> lives in a house nearby.'
+	act 'Go to Fedor''s home': minut += 5 & gt 'FedorEv4',''
+end
 
 if hour >= 8 and hour <= 22:'<br>At the end of the street, there''s a small <a href="exec:$loc = ''pav_residential'' & gt ''kiosk'', ''start''">kiosk</a> selling a variety of items such as cigarettes, magazines, snacks, drinks and even themes for your phone.'
 
@@ -147,6 +153,8 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 end
 
 act 'Walk to the Five Eight estate (0:02)':minut += 2 & gt 'pav_complex', 'start'
+act 'Walk to the Pavlovsk park (0:05)':minut += 5 & gt 'pav_park','start'
+act 'Walk to the lake (0:05)':minut += 5 & gt 'pav_lake'
 act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 act 'Walk to the Market (0:05)':minut += 5 & gt 'pav_market'

locations/pav_shared_gp.qsrc

@@ -289,15 +289,7 @@ end
 
 if $ARGS[0] = 'gpHandjob':
 	'<b><font color=#<<$gp_font>>><<$gp_name>> - handjob</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
-		if step > 0 and cockHard = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/cockflaccid.jpg"></center>'
-		if step > 0 and cockHard = 1:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/cockerect.jpg"></center>'
-	else
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
-		if step > 0 and cockHard = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/cockflaccid.jpg"></center>'
-		if step > 0 and cockHard = 1:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/cockerect.jpg"></center>'
-	end
+  if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
 	''
 	$loc_arg = 'gpHandjob'
 	price = price_handjob
@@ -458,15 +450,7 @@ end
 
 if $ARGS[0] = 'gpSuck':
 	'<b><font color=#<<$gp_font>>><<$gp_name>> - blowjob</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
-		if step > 0 and cockHard = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/cockflaccid.jpg"></center>'
-		if step > 0 and cockHard = 1:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/cockerect.jpg"></center>'
-	else
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
-		if step > 0 and cockHard = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/cockflaccid.jpg"></center>'
-		if step > 0 and cockHard = 1:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/cockerect.jpg"></center>'
-	end
+  if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
 	''
 	$loc_arg = 'gpSuck'
 	price = price_blowjob
@@ -694,15 +678,7 @@ end
 
 if $ARGS[0] = 'gpSexVaginal':
 	'<b><font color=#<<$gp_font>>><<$gp_name>> - vaginal sex</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
-		if step > 0 and step < 6:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/cockerect.jpg"></center>'
-		if step = 6:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/cockerectvacuum.jpg"></center>'
-	else
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
-		if step > 0 and step < 6:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/cockerect.jpg"></center>'
-		if step = 6:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/cockerectvacuum.jpg"></center>'
-	end
+	if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
 	''
 	$loc_arg = 'gpSexVaginal'
 	price = price_vaginal
@@ -1051,15 +1027,7 @@ end
 
 if $ARGS[0] = 'gpSexAnal':
 	'<b><font color=#<<$gp_font>>><<$gp_name>> - anal sex</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
-		if step > 0 and step < 6:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/cockerect.jpg"></center>'
-		if step = 6:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/gp/cockerectvacuum.jpg"></center>'
-	else
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
-		if step > 0 and step < 6:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/cockerect.jpg"></center>'
-		if step = 6:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/cockerectvacuum.jpg"></center>'
-	end
+	if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"></center>'
 	''
 	$loc_arg = 'gpSexAnal'
 	price = price_anal

locations/pav_shared_nd.qsrc

@@ -337,15 +337,7 @@ end
 
 if $ARGS[0] = 'ndSuckBellowTable':
 	'<b><font color=#<<$nd_font>>><<$nd_name>> - blowjob under table</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
-		if step > 0 and cockHard = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/cockflaccid.jpg"></center>'
-		if step > 0 and cockHard = 1:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/cockerect.jpg"></center>'
-	else
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
-		if step > 0 and cockHard = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/cockflaccid.jpg"></center>'
-		if step > 0 and cockHard = 1:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/cockerect.jpg"></center>'
-	end
+	if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
 	''
 	$loc_arg = 'ndSuckBellowTable'
 	price = price_blowjob
@@ -553,15 +545,7 @@ end
 
 if $ARGS[0] = 'ndSuck':
 	'<b><font color=#<<$nd_font>>><<$nd_name>> - blowjob</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
-		if step > 0 and cockHard = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/cockflaccid.jpg"></center>'
-		if step > 0 and cockHard = 1:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/cockerect.jpg"></center>'
-	else
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
-		if step > 0 and cockHard = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/cockflaccid.jpg"></center>'
-		if step > 0 and cockHard = 1:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/cockerect.jpg"></center>'
-	end
+	if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
 	''
 	$loc_arg = 'ndSuck'
 	price = price_blowjob
@@ -788,13 +772,7 @@ end
 
 if $ARGS[0] = 'ndSexVaginal':
 	'<b><font color=#<<$nd_font>>><<$nd_name>> - vaginal sex</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
-		if step > 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/cockerect.jpg"></center>'
-	else
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
-		if step > 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/cockerect.jpg"></center>'
-	end
+	if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
 	''
 	$loc_arg = 'ndSexVaginal'
 	price = price_vaginal
@@ -1099,13 +1077,7 @@ end
 
 if $ARGS[0] = 'ndSexAnal':
 	'<b><font color=#<<$nd_font>>><<$nd_name>> - anal sex</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
-		if step > 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/nd/cockerect.jpg"></center>'
-	else
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
-		if step > 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/cockerect.jpg"></center>'
-	end
+	if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
 	''
 	$loc_arg = 'ndSexAnal'
 	price = price_anal

locations/pav_shared_sp.qsrc

@@ -298,15 +298,7 @@ end
 
 if $ARGS[0] = 'spSuck':
 	'<b><font color=#<<$sp_font>>><<$sp_name>> - blowjob</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"></center>'
-		if step > 0 and cockHard = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/cockflaccid.jpg"></center>'
-		if step > 0 and cockHard = 1:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/cockerect.jpg"></center>'
-	else
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"></center>'
-		if step > 0 and cockHard = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/cockflaccid.jpg"></center>'
-		if step > 0 and cockHard = 1:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/cockerect.jpg"></center>'
-	end
+	if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"></center>'
 	$loc_arg = 'spSuck'
 	price = price_blowjob
 	if step > 0:'<<$sp_name>> orgasm build-up: '+orgB+'/100'
@@ -533,13 +525,7 @@ end
 
 if $ARGS[0] = 'spSexVaginal':
 	'<b><font color=#<<$sp_font>>><<$sp_name>> - vaginal sex</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"></center>'
-		if step > 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/cockerect.jpg"></center>'
-	else
 		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"></center>'
-		if step > 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/cockerect.jpg"></center>'
-	end
 	''
 	$loc_arg = 'spSexVaginal'
 	price = price_vaginal
@@ -785,13 +771,7 @@ end
 
 if $ARGS[0] = 'spSexAnal':
 	'<b><font color=#<<$sp_font>>><<$sp_name>> - anal sex</font></b>'
-	if set_imgh < 250:
-		if step = 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"></center>'
-		if step > 0:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/sp/cockerect.jpg"></center>'
-	else
-		if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"></center>'
-		if step > 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/cockerect.jpg"></center>'
-	end
+	if step = 0:'<center><img height="250" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"></center>'
 	''
 	$loc_arg = 'spSexAnal'
 	price = price_anal

locations/pav_train_hall.qsrc

@@ -121,7 +121,7 @@ if $ARGS[0] = '':
 	if poezddalsled = 1:
 		'The platform is bustling with passengers that are entering or leaving the currently waiting train, carrying their heavy bags with them. Several police officers are patrolling the platforms while the train is here, keeping an eye out for any unruly activities.'
 
-		if tovarL > 0:act 'Sell your goods to passengers':gt 'pav_train_hall_events', 'trinkets'
+		if tovarL > 0:act 'Sell your goods to passengers (<<tovarL>>)':gt 'pav_train_hall_events', 'trinkets'
 	end
 
 	act 'Wait':gs 'obj_din', 'wait'
@@ -165,7 +165,13 @@ if $ARGS[0] = 'platform':
 
 		act 'Take the train to city industrial area': gt 'pav_train_hall', 'ind'
 
-		act 'Take the train to city center': gt 'pav_train_hall', 'centre'
+		act 'Take the train to city center':
+			if rand(0,10) = 0:
+				gt 'train', 'weed'
+			else
+				gt 'pav_train_hall', 'centre'
+			end
+		end
 	end
 end
 
@@ -329,7 +335,7 @@ end
 
 if $ARGS[0] = 'ind':
 	$loc = 'city_industrial_train'
-	$loc_arg = 'platform'
+	$loc_arg = 'inside'
 	menu_off = 1
 	minut += 35
 	if rand(1, 100) < 15: gt 'train', 'private'

locations/pav_train_market.qsrc

@@ -32,8 +32,16 @@ if $ARGS[0] = 'start':
 	*nl
 	'On one of the stalls has a sign "Cash paid for secondhand clothes", here you can sell <a href="exec:gs ''portnoi''">all of your unwanted clothes</a>.'
 	
+  if arturQW >= 1 and (week = 6 or week = 7) and hour < 12: act 'Wait until Arthur needs you to work the counter': minut += 60*(12 - (hour+1)) + (60-minut) & gt 'pav_train_market', 'start'
+  if arturQW >= 2 and (((week = 6 or week = 7) and hour = 14) or (week <= 5 and hour < 15)) : act 'Wait for Arthur to give you his receipts for the day': minut += 60*(15 - (hour+1)) + (60-minut) & gt 'pav_train_market', 'start'
+  if arturQW >= 1 and (week = 6 or week = 7) and (hour = 12 or hour = 13): 
+    act 'Work the counter for Arthur': gt 'arturRinok', 'work_1'
+  elseif arturQW = 2 and (hour = 15 or hour = 16): 
+    act 'Tabulate Arthur''s books': gt 'arturRinok', 'work_2'
+  elseif arturKnow = 1:
+    act 'Look for Arthur':gt 'arturRinok', 'start'
+  end
 	
-	if arturQW = 1 and (week = 6 or week = 7) and hour < 12: act 'Wait for Arthur to arrive':hour = 12 & gt 'pav_train_market', 'start'
 	*nl
 	if hour >= 8 and hour <= 18:
 		'The market stalls are buzzing with shoppers. Everyone seems to be in a good mood and you can hear back and forth bargaining as you pass by.'
@@ -53,22 +61,10 @@ if $ARGS[0] = 'start':
 		
 		act 'Go back to the market entrance': minut += 3 & gt 'pav_market'
 		act 'Wander through the market': gt 'pav_train_market','events'
-		if pavtrain_book = 1: act 'Go to the book stall': minut += 5 & gt 'pav_train_market', 3
-		if pavmarket_porn = 1: act 'Go to the porn stall': minut += 5 & gt 'pav_train_market', 4
-
-		if arturKnow = 1 and arturQW = 0:
-			act 'Look for Arthur':gt 'arturRinok', 'start'
-		elseif arturQW = 1 and (week = 6 or week = 7):
-			if hour = 12 or hour = 13:
-				act 'Look for Arthur':gt 'arturRinok', 'work_1'
-			end
-		elseif arturQW = 2:
-			if hour = 16 and minut <= 30:
-				act 'Look for Arthur':gt 'arturRinok', 'work_2'
-			elseif hour < 16:
-				act 'Wait for Arthur to arrive':hour = 16 & minut = 0 & gt 'pav_train_market', 'start'
-			end
-		end
+		act 'Browse market for books': minut += 30 & gt 'pav_train_market', 3
+		act 'Search market for porn': minut += 30 & gt 'pav_train_market', 4
+		act 'Look for cheat birth control': minut += 30 & gt 'pav_train_market', 19
+		act 'Find cheat condoms': minut += 30 & gt 'pav_train_market', 9
 
 		if gobelen > 0 and gobQW = 0:
 			act'Sell ​​tapestry':
@@ -298,6 +294,7 @@ if $ARGS[0] = 'events':
 		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	
+	if arturKnow = 0 and rand(0,1) = 0: gt 'pav_train_market', 11
 	if rand(0,3) = 0: gt 'pav_train_market', rand(1,19)
 end
 
@@ -772,7 +769,7 @@ if ARGS[0] = 9:
 			prezik += 5
 			i = 5
 			:cndmlp
-			if rand(0,49)-6*(8-tovpay/10) <= 0:badprezik += 1
+			if rand(0,10) < 4: badprezik += 1
 			if i > 0: i-= 1 & jump 'cndmlp'
 			killvar 'i'
 			money -= tovpay
@@ -830,7 +827,7 @@ if ARGS[0] = 12:
 	if hour >= 8 and hour <= 18:
 		act 'Wander around the market': gt 'pav_train_market','events'
 	end
-	if pcs_energy <= 80:
+	if pcs_energy <= 80 or cheatNoEat ! 0:
 		act 'Buy a pie for 20 <b>₽</b>':
 			*clr & cla
 			fat+=3

locations/paysex.qsrc

@@ -208,7 +208,7 @@ if $ARGS[0] = 'end':
 		killvar '$paysextext'
 		firstact = 0
 		if picrand = 16 or picrand = 17:
-			gt 'office', 'work'
+			gt 'office_old', 'work'
 		elseif picrand = 18:
 			gt 'husbSex', 'dolgend'
 		else

locations/pirsingsalon.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'pirsyaz':
 
 	i = 1
 	:looptongue_pir
-		*p '<a href="exec:gt ''pirsingsalon'', ''tongue_pir'', <<i>>"><img src="images/pc/body/piercings/a<<i>>.jpg" 	height="250" /></a>'
+		if dyneval('RESULT = PirsA<<i>>_owned') = 0:*p '<a href="exec:gt ''pirsingsalon'', ''tongue_pir'', <<i>>"><img src="images/pc/body/piercings/a<<i>>.jpg" 	height="250" /></a>'
 		i += 1
 	if i <= 4:jump 'looptongue_pir'
 
@@ -122,7 +122,8 @@ if $ARGS[0] = 'tongue_pir':
 					cla
 					money -= 3000
 					dynamic 'pirsA<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsyaz'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -133,7 +134,8 @@ if $ARGS[0] = 'tongue_pir':
 					cla
 					karta -= 3000
 					dynamic 'pirsA<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsyaz'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
@@ -153,7 +155,7 @@ if $ARGS[0] = 'tongue_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your tongue and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsyaz'
 			end
 		end
 		if karta + bankDebtLimit >= 5000:
@@ -169,7 +171,7 @@ if $ARGS[0] = 'tongue_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your tongue and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsyaz'
 			end
 		end
 	else
@@ -185,7 +187,7 @@ if $ARGS[0] = 'pirsgub':
 
 	i = 1
 	:looplip_pir
-		*p '<a href="exec:gt ''pirsingsalon'', ''lip_pir'', <<i>>"><img src="images/pc/body/piercings/b<<i>>.jpg" 	height="250" /></a>'
+		if dyneval('RESULT = PirsB<<i>>_owned') = 0: *p '<a href="exec:gt ''pirsingsalon'', ''lip_pir'', <<i>>"><img src="images/pc/body/piercings/b<<i>>.jpg" 	height="250" /></a>'
 		i += 1
 	if i <= 7:jump 'looplip_pir'
 
@@ -209,7 +211,8 @@ if $ARGS[0] = 'lip_pir':
 					cla
 					money -= 4000
 					dynamic 'pirsB<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsgub'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsgub'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -220,7 +223,8 @@ if $ARGS[0] = 'lip_pir':
 					cla
 					karta -= 4000
 					dynamic 'pirsB<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsgub'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsgub'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
@@ -240,7 +244,7 @@ if $ARGS[0] = 'lip_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your lip and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsgub'
 			end
 		end
 		if karta + bankDebtLimit >= 6000:
@@ -256,7 +260,7 @@ if $ARGS[0] = 'lip_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your lip and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsgub'
 			end
 		end
 	else
@@ -272,7 +276,7 @@ if $ARGS[0] = 'pirsysh':
 
 	i = 1
 	:loopears_pir
-		*p '<a href="exec:gt ''pirsingsalon'', ''ears_pir'', <<i>>"><img src="images/pc/body/piercings/c<<i>>.jpg" 	height="250" /></a>'
+		if dyneval('RESULT = PirsC<<i>>_owned') = 0: *p '<a href="exec:gt ''pirsingsalon'', ''ears_pir'', <<i>>"><img src="images/pc/body/piercings/c<<i>>.jpg" 	height="250" /></a>'
 		i += 1
 	if i <= 24:jump 'loopears_pir'
 
@@ -296,7 +300,8 @@ if $ARGS[0] = 'ears_pir':
 					cla
 					money -= 1000
 					dynamic 'pirsC<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsysh'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsysh'
 				end
 			else
 				'You don''t have enough cash for these earrings.'
@@ -307,7 +312,8 @@ if $ARGS[0] = 'ears_pir':
 					cla
 					karta -= 1000
 					dynamic 'pirsC<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsysh'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsysh'
 				end
 			else
 				'You don''t have enough money in your bank for these earrings.'
@@ -327,7 +333,7 @@ if $ARGS[0] = 'ears_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your ears and inserts your chosen earrings.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsysh'
 			end
 		end
 		if karta + bankDebtLimit >= 3000:
@@ -343,7 +349,7 @@ if $ARGS[0] = 'ears_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your ears and inserts your chosen earrings.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsysh'
 			end
 		end
 	else
@@ -359,7 +365,7 @@ if $ARGS[0] = 'pirsnos':
 
 	i = 1
 	:loopnose_pir
-		*p '<a href="exec:gt ''pirsingsalon'', ''nose_pir'', <<i>>"><img src="images/pc/body/piercings/d<<i>>.jpg" 	height="250" /></a>'
+		if dyneval('RESULT = PirsD<<i>>_owned') = 0: *p '<a href="exec:gt ''pirsingsalon'', ''nose_pir'', <<i>>"><img src="images/pc/body/piercings/d<<i>>.jpg" 	height="250" /></a>'
 		i += 1
 	if i <= 7:jump 'loopnose_pir'
 
@@ -383,7 +389,8 @@ if $ARGS[0] = 'nose_pir':
 					cla
 					money -= 2000
 					dynamic 'pirsD<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsnos'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsnos'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -394,7 +401,8 @@ if $ARGS[0] = 'nose_pir':
 					cla
 					karta -= 2000
 					dynamic 'pirsD<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsnos'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsnos'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
@@ -414,7 +422,7 @@ if $ARGS[0] = 'nose_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your nose and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsnos'
 			end
 		end
 		if karta + bankDebtLimit >= 5000:
@@ -430,7 +438,7 @@ if $ARGS[0] = 'nose_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your nose and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsnos'
 			end
 		end
 	else
@@ -446,7 +454,7 @@ if $ARGS[0] = 'pirsbro':
 
 	i = 1
 	:loopbrow_pir
-		*p '<a href="exec:gt ''pirsingsalon'', ''brow_pir'', <<i>>"><img src="images/pc/body/piercings/e<<i>>.jpg" 	height="250" /></a>'
+		if dyneval('RESULT = PirsE<<i>>_owned') = 0: *p '<a href="exec:gt ''pirsingsalon'', ''brow_pir'', <<i>>"><img src="images/pc/body/piercings/e<<i>>.jpg" 	height="250" /></a>'
 		i += 1
 	if i <= 2:jump 'loopbrow_pir'
 
@@ -470,7 +478,8 @@ if $ARGS[0] = 'brow_pir':
 					cla
 					money -= 2000
 					dynamic 'PirsE<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsbro'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsbro'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -481,7 +490,8 @@ if $ARGS[0] = 'brow_pir':
 					cla
 					karta -= 2000
 					dynamic 'PirsE<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsbro'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsbro'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
@@ -501,7 +511,7 @@ if $ARGS[0] = 'brow_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your brow and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsbro'
 			end
 		end
 		if karta + bankDebtLimit >= 5000:
@@ -517,7 +527,7 @@ if $ARGS[0] = 'brow_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your brow and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsbro'
 			end
 		end
 	else
@@ -533,7 +543,7 @@ if $ARGS[0] = 'pirssos':
 
 	i = 1
 	:loopnip_pir
-		*p '<a href="exec:gt ''pirsingsalon'', ''nip_pir'', <<i>>"><img src="images/pc/body/piercings/f<<i>>.jpg" 	height="250" /></a>'
+		if dyneval('RESULT = PirsF<<i>>_owned') = 0: *p '<a href="exec:gt ''pirsingsalon'', ''nip_pir'', <<i>>"><img src="images/pc/body/piercings/f<<i>>.jpg" 	height="250" /></a>'
 		i += 1
 	if i <= 7:jump 'loopnip_pir'
 
@@ -557,7 +567,8 @@ if $ARGS[0] = 'nip_pir':
 					cla
 					money -= 6000
 					dynamic 'pirsF<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirssos'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirssos'
 				end
 			else
 				'You don''t have enough cash for these piercings.'
@@ -568,7 +579,8 @@ if $ARGS[0] = 'nip_pir':
 					cla
 					karta -= 6000
 					dynamic 'pirsF<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirssos'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirssos'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
@@ -588,7 +600,7 @@ if $ARGS[0] = 'nip_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your nipples and inserts your chosen piercings.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirssos'
 			end
 		end
 		if karta + bankDebtLimit >= 10000:
@@ -604,7 +616,7 @@ if $ARGS[0] = 'nip_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your nipples and inserts your chosen piercings.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirssos'
 			end
 		end
 	else
@@ -620,7 +632,7 @@ if $ARGS[0] = 'pirspyp':
 
 	i = 1
 	:loopbelly_pir
-		*p '<a href="exec:gt ''pirsingsalon'', ''belly_pir'', <<i>>"><img src="images/pc/body/piercings/n<<i>>.jpg" 	height="250" /></a>'
+		if dyneval('RESULT = PirsN<<i>>_owned') = 0: *p '<a href="exec:gt ''pirsingsalon'', ''belly_pir'', <<i>>"><img src="images/pc/body/piercings/n<<i>>.jpg" 	height="250" /></a>'
 		i += 1
 	if i <= 4:jump 'loopbelly_pir'
 
@@ -644,7 +656,8 @@ if $ARGS[0] = 'belly_pir':
 					cla
 					money -= 7000
 					dynamic 'PirsN<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirspyp'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirspyp'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -655,7 +668,8 @@ if $ARGS[0] = 'belly_pir':
 					cla
 					karta -= 7000
 					dynamic 'PirsN<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirspyp'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirspyp'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
@@ -675,7 +689,7 @@ if $ARGS[0] = 'belly_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your belly button and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirspyp'
 			end
 		end
 		if karta + bankDebtLimit >= 10000:
@@ -691,7 +705,7 @@ if $ARGS[0] = 'belly_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your belly button and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirspyp'
 			end
 		end
 	else
@@ -707,7 +721,7 @@ if $ARGS[0] = 'pirsvla':
 
 	i = 1
 	:looppubic_pir
-		*p '<a href="exec:gt ''pirsingsalon'', ''pubic_pir'', <<i>>"><img src="images/pc/body/piercings/g<<i>>.jpg" 	height="250" /></a>'
+		if dyneval('RESULT = PirsG<<i>>_owned') = 0: *p '<a href="exec:gt ''pirsingsalon'', ''pubic_pir'', <<i>>"><img src="images/pc/body/piercings/g<<i>>.jpg" 	height="250" /></a>'
 		i += 1
 	if i <= 10:jump 'looppubic_pir'
 
@@ -731,7 +745,8 @@ if $ARGS[0] = 'pubic_pir':
 					cla
 					money -= 10000
 					dynamic 'pirsG<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsvla'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsvla'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -742,7 +757,8 @@ if $ARGS[0] = 'pubic_pir':
 					cla
 					karta -= 10000
 					dynamic 'pirsG<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsvla'
+          gs 'stat'
+					gt 'pirsingsalon', 'pirsvla'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
@@ -762,7 +778,7 @@ if $ARGS[0] = 'pubic_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your pussy and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsvla'
 			end
 		end
 		if karta + bankDebtLimit >= 25000:
@@ -778,7 +794,7 @@ if $ARGS[0] = 'pubic_pir':
 				gs 'stat'
 				'The tattooist disinfects the area, pierces your pussy and inserts your chosen piercing.'
 
-				act 'Leave':gt 'pirsingsalon', 'start'
+				act 'Leave':gt 'pirsingsalon', 'pirsvla'
 			end
 		end
 	else

locations/podrsex.qsrc

@@ -221,8 +221,10 @@ if $ARGS[0] = 'end':
 	gs 'stat'
 
 	act 'Leave':
-		if picrand = 26 or picrand = 27 or picrand = 29:gt 'office', 'work'
-		if picrand >= 30 and picrand <= 32:gt 'city_center'
+		if picrand = 26 or picrand = 27 or picrand = 29:gt 'office_old', 'work'
+		if picrand = 30:gt 'liam'
+		if picrand = 31:gt 'city_industrial'
+		if picrand = 32:gt 'liames'
 		if picrand = 19:gt 'nichLivingroom'
 
 		if kazsexdva = 1:

locations/pornhist.qsrc

@@ -18,11 +18,7 @@ if $ARGS[0] = 'short':
 		if $porntitle[i] = '':
 			$pfilmhistory += '● <b><<i>>. Movie</b><br><font size=2></font><br>'
 		else
-			if i = 1:
-				$pfilmhistory += '● <b>'+$porntitle[i]+'<<$pfname>></b><br><font size=2>'+$pfilmtext+'</font><br>'
-			else
-				$pfilmhistory += '● <b>'+$porntitle[i]+'</b><br><font size=2>'+$pfilmtext+'</font><br>'
-			end
+			$pfilmhistory += '● <b>'+$porntitle[i]+'</b><br>'
 		end
 	if i < film: i += 1 & jump 'pornhistloop'
 end

locations/pornstudio.qsrc

@@ -400,10 +400,10 @@ if $ARGS[0] = 'manager':
 	! Your first ever movie offer
 		if firstoffer = 0:
 			firstoffer = 1
-			'"So you''re the new girl? As luck would have it, we''re looking for someone fresh for our next shoot. It''s called ''Girls Jerk Guys #36''."'
+			'"So you''re the new girl? As luck would have it, we''re looking for someone fresh for our next shoot. It''s called ''Finsih Him #1''."'
 			'"For 500 <b>₽</b>, you have to jerk a guy off and have him cum on your tits."'
 		else
-			'"Hello. Since you''re brand new, all I can offer you is an introductory movie called ''Girls Jerk Guys #36''."'
+			'"Hello. Since you''re brand new, all I can offer you is an introductory movie called ''Finish Them #1''."'
 			'"For 500 <b>₽</b>, you have to jerk a guy off and have him cum on your tits."'
 		end
 
@@ -856,7 +856,7 @@ if $ARGS[0] = 'yes':
 									firstkasting = 1
 									$pfname = input ("What will your porn name be?")
 
-									if $pfname <= 0:$pfname = '<<$pcs_nickname>> BimboStar'
+									if $pfname = '':$pfname = 'Lotta Cox'
 
 									'"<<$pfname>>, wonderful name. Now listen. Before shooting starts, you have to pass a medical examination. If we find any sign of a sexually transmitted disease, you''re out, no exceptions."'
 									'"There we go, you''re now registered. We''re quite big in the industry, shooting about four films a day, so you can choose what you to be in. Anal or gangbang, it''s your choice, just remember to take care of your health. If you get sick or something, just cancel the shoot. You can do this up to the day of the shooting."'
@@ -949,16 +949,13 @@ if $ARGS[0] = 'postvideo':
 
 	film += 1
 	if film = 1:
-		$porntitle[film] = 'Girls Jerk Guys #36 - <<$pfname>>'
+		$porntitle[film] = 'Finish Them #1'
 		$pornfilmstory[film] = '<<$pfname>>''s debut into the world of porn. Watch as she jerks off <<$pakter[1]>> and lets him cum all over her tits.'
 	else
-		if $pstory = '' and editpornname = 1:
-			$pornfilmstory[film] = input('You can enter the story of the porn movie. This action can be done only once, but you can choose to do it later! (Just hit Enter/Esc when blank)<br>Tags of the current movie: <font color=#541717 size=2><<$pfilmtags>></font>')
-		else
-			$pornfilmstory[film] = $pstory
-		end
+		$pornfilmstory[film] = $pstory
 		if editpornname = 1:
 			$porntitle[film] = input("Enter the name of the porn movie. <i>This action can be done only once, but you can choose to do it later! (Just hit Enter/Esc when blank)</i>")
+			if $porntitle[film] ! '': $porntitle[film] = $porntitle[film] + ' #<<film>>'
 		end
 	end
 

locations/post_deliveries.qsrc

@@ -1260,7 +1260,7 @@ if $ARGS[0] = 'bandsex':
 					'After a few minutes of uncomfortable throat fucking he finally shoots his load down your throat, and grins at you: "You''re even better than the last Postslut! I''m already looking forward to next week..."'
 					gs 'arousal', 'bj', 10, 'sub'
 					gs 'arousal', 'end'
-					gs 'cum_call', 'mouth', $boy
+					gs 'cum_call', 'mouth_swallow', $boy
 					gs 'stat'
 					'While you get dressed again, you overhear the two guys talking. One voice says: "Wha- she did what!? She refused to blow me, and only gave me a handjob! That bitch... is she still here?"'
 					act 'Leave quickly':
@@ -1288,7 +1288,7 @@ if $ARGS[0] = 'bandsex':
 			'You kneel down before him and begin to suck the head of his cock. Within the minute, you feel several jets of his bittery sperm landing in your mouth. He didn''t give you any warning, and you recoil a bit from the sudden sharp taste in your mouth.'
 			gs 'arousal', 'bj', 10, 'sub'
 			gs 'arousal', 'end'
-			gs 'cum_call', 'mouth', $boy
+			gs 'cum_call', 'mouth_swallow', $boy
 			gs 'stat'
 			'"Hah, you''re a natural!" he groans, slowly recovering from his orgasm. "Quick and efficient. Not bad! Could be better, but... we''ll work on that next time."'
 			'He waves you off, his attention focused on the TV now. As far as he''s concerned, you''re no longer there.'
@@ -1367,7 +1367,7 @@ if $ARGS[0] = 'bandsex':
 			'You flick your tongue over the head of his cock and close your lips around it, blowing to an orgasm as quickly as you can. He doesn''t last long, and unloads inside your mouth within minutes.'
 			gs 'arousal', 'bj', 10
 			gs 'arousal', 'end'
-			gs 'cum_call', 'mouth', $boy
+			gs 'cum_call', 'mouth_swallow', $boy
 			gs 'stat'
 		elseif postbj > 4 and postbj <= 7:
 			gs 'boyStat', 'A'+str(rand(104, 105))
@@ -1377,7 +1377,7 @@ if $ARGS[0] = 'bandsex':
 			'You automatically get rid of your clothes before kneeling down in front of him and begin to suck the guy off eagerly, teasing him by licking his balls before you take his cock in your mouth again. The man orgasms in no time at all, and you swallow his load without giving it another thought.'
 			gs 'arousal', 'bj', 10
 			gs 'arousal', 'end'
-			gs 'cum_call', 'mouth', $boy
+			gs 'cum_call', 'mouth_swallow', $boy
 			gs 'stat'
 			'The guy still lies on the bed in post-orgasmic bliss while you put your clothes back on and resume your round, with only the tangy taste of his cum in your mouth as a reminder of what you just did.'
 		else

locations/post_events.qsrc

@@ -413,9 +413,9 @@ if $ARGS[0] = '2-2':
 					act 'Let Arsen cum in your mouth':
 						*clr & cla
 						minut += 5
-						gs 'cum_call', 'mouth', $boy
+						gs 'cum_call', 'mouth_swallow', $boy
 						gs 'boyStat', 'A164'
-						gs 'cum_call', 'mouth', $boy
+						gs 'cum_call', 'mouth_swallow', $boy
 	!!!!cum management: you have the loads of both Maksim and Arsen in your mouth and swallow them
 						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-16.jpg"></center>'
 						'"I''m going to cum!" Arsen groans, and you feel the first jets of his sperm landing on your tongue. Jenya immediately gets down next to you, and eagerly watches how her boyfriend shoots his load in your mouth. Arsen''s load isn''t very big, but that''s no surprise - how many times did Jenya make him cum already today?'
@@ -491,9 +491,9 @@ if $ARGS[0] = '2-2':
 					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent2-16.jpg"></center>'
 					'"I''m going to cum!" Arsen groans, mere seconds after you take his cock in your mouth. You feel the first jets of his sperm landing on your tongue. Jenya immediately gets down next to you, and eagerly watches how her boyfriend shoots his load in your mouth. Arsen''s load isn''t very big, but that''s no surprise - how many times did Jenya make him cum already today?'
 					gs 'arousal', 'bj', 5
-					gs 'cum_call', 'mouth', $boy
+					gs 'cum_call', 'mouth_swallow', $boy
 					gs 'boyStat', 'A164'
-					gs 'cum_call', 'mouth', $boy
+					gs 'cum_call', 'mouth_swallow', $boy
 					gs 'stat'
 					'When Arsen pulls back, she grins proudly at you and locks her lips on yours. Suddenly your mouth is filled with much more sperm! Jenya must''ve gotten Maksim off while you were busy, and kept his sperm in her mouth when he came...'
 					'After a passionate kiss, she orders you: "Show the load to the camera and swallow it, cutie! Enjoy your tasty treat..."'
@@ -593,7 +593,7 @@ if $ARGS[0] = '3-1':
 		'You''ve sucked cock many times before, and pull out every trick you know to best please him. He seems thoroughly impressed with your performance. Despite the thick head you manage to take his cock all the way down your throat too, which impresses him even more!'
 		'Finally, he grabs a firm hold of your head to keep it in place. Several splurts of his sperm land on your tongue, after which he finally lets you go.'
 		gs 'arousal', 'bj', 15, 'deepthroat', 'prostitution'
-		gs 'cum_call', 'mouth', $boy
+		gs 'cum_call', 'mouth_swallow', $boy
 		gs 'stat'
 		'"That was amazing!" he grins. "Even better than the last girl I had, and that was after months of training! You''re definitely paying me a visit more often..."'
 		
@@ -604,7 +604,7 @@ if $ARGS[0] = '3-1':
 		'You do the best you can, but struggle when he tries to push more of his length down your throat. The thick head makes it very difficult.'
 		'"Time''s up!" he grunts, and he grabs a firm hold of your head. He begins to fuck your mouth, roaring as he shoots his cum directly down your throat.'
 		gs 'arousal', 'bj', 15, 'sub', 'prostitution'
-		gs 'cum_call', 'mouth', $boy
+		gs 'cum_call', 'mouth_swallow', $boy
 		gs 'stat'
 		'"That... was decent," he says. "I''ve had better, but we can make a good cocksucker out of you yet."'
 		
@@ -629,7 +629,7 @@ if $ARGS[0] = '3-1':
 				'You do as he says and take the head of his cock back into your mouth, making sure to be careful with your teeth.'
 				'Luckily the man lets you control the pace. Occasionally you try to take a bit more of his shaft in your mouth, but you decide to play it safe and mostly just focus on the head, gently sucking on it and teasing it with your tongue.'
 				gs 'arousal', 'bj', 15, 'prostitution'
-				gs 'cum_call', 'mouth', $boy
+				gs 'cum_call', 'mouth_swallow', $boy
 				gs 'stat'
 				'"Look at me!" he groans, and a warm load of his tangy sperm fills your mouth seconds later. "That was better I guess, but rather half-hearted. Swallow," he orders you, while he strokes your hair with his hand. With him so obviously waiting for you to swallow his sperm, you decide to just do it without hesitation. He seemed unhappy enough with your performance already!'
 				'"You have a lot to learn, but... it''ll be worth it!" he sighs contently. "You could become a good little slut for me, with some training."'
@@ -646,7 +646,7 @@ if $ARGS[0] = '3-1':
 			'When he guides his erection back towards your wide open mouth, you realize how little control you have now. You cough and splutter several times when he shoves his cock inside your mouth further than you can handle. He usually backs off just enough to give you a moment to recover, and then continues to fuck your unexperienced throat.'
 			'You''ve come so far, though... you''re not stopping now! You make the most of it and feel relieved when you feel the man''s cum splurting down your throat a few minutes later.'
 			gs 'arousal', 'bj', 15, 'sub', 'bound', 'prostitution'
-			gs 'cum_call', 'mouth', $boy
+			gs 'cum_call', 'mouth_swallow', $boy
 			gs 'stat'
 			'"Don''t feel bad, you did good!" he pants, while he undoes the gag. "Not the blowjob itself, obviously. That was terrible. But you''re not afraid to get a little kinky, and continued to try and please me even when you were having a rough time. You''re exactly the kind of girl I''m looking for!"'
 
@@ -771,7 +771,7 @@ if $ARGS[0] = '4':
 		act 'Make him cum in your mouth':
 			*clr & cla
 !!!!cum in mouth
-			gs 'cum_call', 'mouth', $boy
+			gs 'cum_call', 'mouth_swallow', $boy
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/postevent4-9.jpg"></center>'
 			'You don''t want his cum on your face, or on your clothes! How would you explain that?'
 			'Closing your lips tightly around the head, you flick your tongue over his cock a few times and feel his warm, tangy sperm spurt against the back of your mouth. The taste is really not that bad!'

locations/pregriskeval.qsrc

@@ -14,12 +14,12 @@ if knowpreg = 1 or thinkpreg = 1:
 	RESULT = -4
 elseif eff_contra = 2 or pilldays > 14:
 	RESULT = -1
-elseif tabletkishot ! 0:
+elseif tabletkishot ! 0 or birth_control['implant_status'] > 1:
 	RESULT = -2
 elseif mesec > 0:
 	RESULT = -3
 elseif eff_contra = 0 or eff_contra = 4 or eff_contra = 5:
-	if ((preziktype = 1 and ((preziksabo + prezikcount) > 0)) or preziktype = 2) and tabletkicheck = 0 and tabletki > 0:
+	if ((preziktype = 1 and ((preziksabo + prezikcount) > 0)) or preziktype = 2) and tabletkicheck = 0 and tabletki > 0 and shotdays = 0 and birth_control['implant_status'] = 0:
 		RESULT = 1
 	else
 		RESULT = 0