locations/FedorEv2.qsrc

@@ -288,7 +288,7 @@ if $ARGS[0] = 'Movie 4':
 	minut += 10
 	gs'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	'Fedor quietly walks up to you and takes you by the hand then you both walk out of the cinema and as Fedor walks you home you both discuss what you liked best about the movie. When you both get to your door, Fedor smiles "<<$pcs_firstname>> I hope you had as much fun as I have." as he stares into your <<$pcs_eyecol>> eyes for a few seconds, then slowly moves his face closer to yours inching closer to your lips...'
 	
 	act 'Kiss Fedor':
@@ -324,7 +324,7 @@ if $ARGS[0] = 'Home':
 	$location_type = 'private'
 	gs'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	'You and Fedor both walk to his house and he unlocks the door then holds it open for you and as you enter, Fedor gives you a firm hug from bedind and kisses your cheek. You feel the warmth of both his embrace and his heater which is obviously of high quality. Fedor asks "Are you up for some movies or what?" he smiles as he removes your coat and hangs it on the rack as you take off you shoes.'
 	
 	act 'Sure thing':
@@ -586,7 +586,7 @@ if $ARGS[0] = 'Wash Up':
 		*clr & cla
 		gs'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'Fedor walks you out of the bathroom then takes out his phone and asks you to strike a pose. You happily comply, Fedor takes a picture and says, "Thank you <<$pcs_firstname>>, I needed some beautiful wallpaper for my phone." you reply with a smirk "Flatterer." Fedor chuckles then leads you to the front door, where he helps you into your coat then kisses you on the cheek. "<<$pcs_nickname>> are you ready to head home?" you turn to him, smile, nod then grab his hand and start walking home with Fedor.'
 		'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 		*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'		
@@ -612,7 +612,7 @@ if $ARGS[0] = 'Skate':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	'When you and Fedor enter the skating ring, Fedor approaches the counter and pays for the skates then hands you a pair then puts a pair on himself. When both of you have your skates on, Fedor reaches out for your hand.'
 
 	act 'Take his hand':	
@@ -775,7 +775,7 @@ if $ARGS[0] = 'Park 2':
 				if fedorKozlovQW = -15:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 				else
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 				end	
 				'You take Fedor''s hand and he helps you off the swing and onto your feet. Fedor gives you a smile as he asks "Did you enjoy yourself?" You respond, "It was very relaxing. Thanks Fedor." Fedor responds, "Anytime <<$pcs_firstname>>. So would you like me to take you home? or would you like to stay here?"'
 				

locations/FedorEv3.qsrc

@@ -90,7 +90,7 @@ if $ARGS[0] = 'Front':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end		
 	'You point to the front seats. "Let''s sit up front, so that we can get the best view in the theater." And Fedor responds, "Just seeing you is the best view I could ask for"' 
 	'You lightly flick his nose with your finger as you reply. "Oh stop, you''re going to make me blush"'
@@ -180,7 +180,7 @@ if $ARGS[0] = 'Middle':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end		
 	'You point to the middle seats. "I hear the middle is the warmest." and Fedor responds, "It may be warm but you''re the only hot one here."' 
 	'You lightly flick his nose with your finger as you reply, "Oh stop, you''re going to make me blush '
@@ -237,7 +237,7 @@ if $ARGS[0] = 'Back':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end		
 	'You point to the back seats. "Let''s sit in the back where we can get some privacy." and Fedor responds, "Like it in the back huh?"' 
 	'You lightly flick his nose with your finger as you reply, "Oh stop, you''re going to make me blush'
@@ -344,7 +344,7 @@ if $ARGS[0] = 'Back Preg':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end		
 	'Fedor leans forward and whispers in your ear. "Would you like to try for a baby here or would you like me to pull out?"'		
 	
@@ -387,7 +387,7 @@ if $ARGS[0] = 'Movies 2':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end		
 	'The movie ends and the crowd gets up and starts leaving the theater. Fedor collects the popcorn, drinks and candy bags and throws them in the trash then returns to you. Fedor kisses you on the cheek and asks "Are you ready to go home?"'
 				
@@ -407,7 +407,7 @@ if $ARGS[0] = 'Restroom Break':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end		
 	'You turn to Fedor. "I need to use the restroom, I''ll be back soon." as you lean over and give Fedor a quick kiss. Fedor then asks "Will you be alright on your own or would you like me walk you to the restroom?"'
 	
@@ -509,7 +509,7 @@ if $ARGS[0] = 'Restroom Fedor':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end		
 	'You and Fedor head toward the restroom while chatting about the movie on the way there. When you both arrive, Fedor tells you "Go on <<$pcs_nickname>>, I''ll wait for you here."'
 				
@@ -531,7 +531,7 @@ if $ARGS[0] = 'Fedor Restroom':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end	
 	'You grab Fedor by the hand and pull him into the restroom with you. Fedor is surprised at first then starts to fondle your breasts as you pull down his pants then kneel in front of him.'
 				
@@ -1225,7 +1225,7 @@ if $ARGS[0] = 'Restroom Rescue':
 		if fedorKozlovQW = -15:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		end		
 		'You cry for help then suddenly, the door bursts open and Fedor storms into the room and punches the guy in the face knocking him into the wall. The guy grabed his face in pain as Fedor approached him then drove his knee into the guy''s face, breaking his nose. Fedor grabed the guy then dragged him into one of the stalls where he dipped the guy''s head into the toilet and began drowning him while shouting "How dare you touch my girl! <b>I WILL FUCKING KILL YOU!</b>"'
 
@@ -1244,7 +1244,7 @@ if $ARGS[0] = 'Restroom Rescue':
 			if fedorKozlovQW = -15:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 			end		
 			'You wrap your arms around Fedor''s chest and lightly pull him off the guy as you tell him "Hey Fedor, It''s over now. I''m safe, thanks to you." as you give him an innocent smile. Fedor closes his eyes as he tilts his head back trying to collect his thoughts and then responds, "You''re right <<$pcs_nickname>>, I don''t know what came over me." You hug him as you tell him "I''m so lucky to have you." Fedor kisses you then stays with you as you wash up. After you finish Fedor walks you out of the restroom.'
 				
@@ -1356,7 +1356,7 @@ if $ARGS[0] = 'Movies 3':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end		
 	'Fedor walks you home and you both spend the whole time talking about the movie and some future films you both want to see. After a few minutes you are right in front of your building and Fedor gives your ass a grab as he says, to you "<<$pcs_firstname>> I hope you had as much fun as I had. I can''t wait to see you again." You respond, "Don''t worry Fedor, You won''t have to wait long." as you kiss him and then walk away with a confident smile.'
 	*nl	

locations/FedorEv4.qsrc

@@ -243,7 +243,7 @@ if $ARGS[0] = '3Way':
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 			'You scold Fedor and as you state "I''m not that kind of girl Fedor!"'
 			'He stammers as he responds, "I didn''t mean to imply that you... I''m sorry <<$pcs_firstname>>."'
 			'Ivan then responds, "Don''t worry <<$pcs_firstname>>. It was just a joke. I wouldn''t want to come in between you...Or would I?" he then laughs as he walks away.'
@@ -1117,7 +1117,7 @@ if $ARGS[0] = 'Bathroom 1':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 	'You pull off of Fedor then tell him "I have to use the bathroom real quick. I''ll be right back." You then get up, turn away and walk to the bathroom.'
 
@@ -1615,7 +1615,7 @@ if $ARGS[0] = 'Bedroom Cam':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 	'As you both enter the bedroom, Fedor walks up to his desk then opens a drawer and pulls out a camera. He turns to you. "Hey <<$pcs_nickname>>, how about we make a little video, just for us?"'
 
@@ -1791,7 +1791,7 @@ if $ARGS[0] = 'Bedroom Cam':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 		else
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		end
 		'"Sorry Fedor but I can''t risk a video like that getting out." Fedor gives you a smile as he replies, "Don''t worry <<$pcs_firstname>>, I understand."'
 		'Fedor then puts the camera away then walks up to you and gives you a soft kiss.'
@@ -2805,7 +2805,7 @@ if $ARGS[0] = 'End Date 2':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 	'Fedor fetches your coat then hands it to you as he puts on his coat. Fedor opens the front door and holds it for you while guiding you out. You and Fedor begin walking back to your apartment while chatting about all of the latest trends on television. When you reach the door to your house, Fedor spins you around then gives you a passionate kiss as he presses you against the wall. After a few seconds, Fedor pulls off you then gives you a wink as he turns away and walks off.'
 	*nl
@@ -3240,7 +3240,7 @@ if $ARGS[0] = 'Fedor Bedroom 2':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
 	end
 	*nl
 	'Fedor is watching videos on his computer. As you approach, Fedor turns to you and asks "Hey <<$pcs_nickname>>, wanna check out some videos?"'
@@ -3572,7 +3572,7 @@ if $ARGS[0] = 'Home Entrance 3':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
 	end
 	'You knock on the door until Fedor opens it and invites you inside.'
 

locations/FedorMisc.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'Fedor Intro':
 		npc_rel['A5'] += 5
 		gs'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'You turn to see Fedor Kozlov smiling at you. You return the smile and say, "I am now, thanks to you." Fedor responds, "Well I couldn''t let such a pretty girl like you get hurt." you lower your head; trying to hide your flushing cheeks, as you reply, "I bet you say that to all the girls." Fedor chuckles, "I not going to lie, if all the girls looked like you then I would." a few members of the school faculty begin breaking up the fight, as Fedor says, "It seems that everything has been taken care of. If you would like to chat then feel free to stop by the hallway, and you can usually catch me at the sports center, after school. Hopefully I will see you again soon." Fedor then walks away while waving at you.'
 
 		act 'Wave back':gt 'gschool_lessons', 'short_break'
@@ -36,7 +36,7 @@ if $ARGS[0] = 'Fedor Chat':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 
 	*nl
@@ -85,7 +85,7 @@ if $ARGS[0] = 'Fedor Chat':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
 		else
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></left>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
 		end
 
 		*nl
@@ -162,7 +162,7 @@ if $ARGS[0] = 'Comb':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 
 	'Fedor combs your hair for you as you watch him, admiring how handsome he is. After Fedor finishes combing your hair, he says, "There is my beautiful girlfriend. Your hair is too pretty to be all knotted up like that." you give Fedor a kiss on the cheek as he puts his comb away.'
@@ -179,7 +179,7 @@ if $ARGS[0] = 'Locker Room':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	'Fedor grabs your hand then leads you through the hallways, to the locker room. Fedor then releases your hand and carefully scopes out the area, both inside the locker room and out, checking if it''s empty and as soon as he realizes that the coast is clear, he grabs your ass and kisses your lips as he pulls you in the locker room.'
 
 	act 'Continue.':
@@ -686,7 +686,7 @@ if $ARGS[0] = 'Strength':
 			minut += 2
 			gs'stat'
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 			'You take a well needed stretch before turning back to see Fedor collecting his things, and placing them in his gym bag before he looks to you and says, "Hey <<$pcs_nickname>> would you like to come back to my place to hang out, maybe watch some tv?"'
 
 			act 'Sure i would love too':
@@ -730,7 +730,7 @@ if $ARGS[0] = 'Agility':
 			minut += 2
 			gs'stat'
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 			'You take a well needed stretch before turning back to see Fedor collecting his things, and placing them in his gym bag before he looks to you and says, "Hey <<$pcs_nickname>> would you like to come back to my place to hang out, maybe watch some tv?"'
 
 			act 'Sure i would love too':
@@ -774,7 +774,7 @@ if $ARGS[0] = 'Endurance':
 			minut += 2
 			gs'stat'
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 			'You take a well needed stretch before turning back to see Fedor collecting his things, and placing them in his gym bag before he looks to you and says, "Hey <<$pcs_nickname>> would you like to come back to my place to hang out, maybe watch some tv?"'
 
 			act 'Sure i would love too':
@@ -802,7 +802,7 @@ if $ARGS[0] = 'Vitek Event':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 	'As you and Fedor begin your warm ups, you hear someone shout "YOU FUCKING PUNK!" you both turn to see Vitek walking very quickly toward you.'
 	'Fedor quickly begins running as Vitek gives chase, quickly catching up to Fedor. Vitek grabs Fedor''s arm then pulls him onto the ground then climbs on top of him lifting his fist but before he could get a punch off he is grabbed from behind by Ivan who has wrapped his arms around Vitek''s shoulders, dragging him back by his arms. Fedor quickly rises to his feet then runs off as Vitek bellows "YOU WORTHLESS SACK OF SHIT! <<$pcs_firstname>> IS MINE! YOU HEAR ME FUCKER!? <<$pcs_firstname>> IS MIIIIIIINE!" as others rush in to help Ivan restain Vitek.'
 	'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
@@ -979,7 +979,7 @@ if $ARGS[0] = 'Fedor Vs Dimka':
 	if fedorKozlovQW = -15:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 	'Fedor walks up to you then gives you a kiss on your cheek then whispers in your ear. "Are you ready to deal with that punk Dimka?"'
 
@@ -991,7 +991,7 @@ if $ARGS[0] = 'Fedor Vs Dimka':
 		if fedorKozlovQW = -15:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		end
 		'Fedor nods then tells you "You lure him to the other side of school and I will wait for you there." you give Fedor a kiss before responding "I will..and thank you again Fedor. This means a great deal to me." Fedor gives you a wink as he walks off.'
 
@@ -1000,7 +1000,7 @@ if $ARGS[0] = 'Fedor Vs Dimka':
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color="maroon"><<"Dmitriy [Dimka] Nosov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 			'You can feel you body shaking as you approach Dimka. When Dimka notces you, he waves you over and says, "Good, you''re here. Now let''s head back to my place."'
 			'You walk up to him and whisper in his ear. "Actually I was thinking that maybe you and I could have some fun behind the school."'
 			'Dimka looks at you with a puzzled look. "Why should we fuck around behind the school? Stop wasting time and come back to my place already!"'
@@ -1013,7 +1013,7 @@ if $ARGS[0] = 'Fedor Vs Dimka':
 				minut += 5
 				gs 'boyStat', 'A5'
 				'<center><b><h4><font color="maroon"><<"Dmitriy [Dimka] Nosov">></font></h4></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 				'When you reach a secluded area behind the school Dimka barks "<b>TAKE OFF YOUR CLOTHES WHORE!</b>" as he pulls out his phone and begins recording. You look around to find Fedor but he isn''t in sight. Dimka grabs you by your hair as he shouts. "I said take off your clothes and stop fucking around whore!" you feel your heart pounding and decide to do as he says. You completely strip down in front of Dimka as he touches your body and shoves his fingers roughly inside your holes. You begin to feel tears forming in your eyes as you wonder why Fedor is not here. Dimka shoves you against the wall then begins roughly smacking you between your legs then grabs onto your clitoris and pulls on it, causing you to shriek in pain.'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/events/dimka/nude.jpg"></center>'
 				gs 'clothing', 'strip'
@@ -1035,7 +1035,7 @@ if $ARGS[0] = 'Fedor Vs Dimka':
 					if fedorKozlovQW = -15:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 					else
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 					end
 					gs 'arousal', 'anal', 5, 'sub', 'rough'
 					gs 'arousal', 'end'
@@ -1049,7 +1049,7 @@ if $ARGS[0] = 'Fedor Vs Dimka':
 						if fedorKozlovQW = -15:
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 						else
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 						end
 						'You quickly rush to Fedor''s side then wrap your hands around his waist. You begin pulling Fedor off of Dimka. Fedor looks to you then his rage turns to sorrow as he sees you naked, realizing that he was too late. "<<$pcs_firstname>> I am so sorry. I thought that you were heading to the other side of the school."'
 						'You give Fedor a firm hug as you reply, "It''s ok Fedor. The important thing is that you came for me." You flash Fedor an innocent smile as you continue hugging him.'
@@ -1066,7 +1066,7 @@ if $ARGS[0] = 'Fedor Vs Dimka':
 							if fedorKozlovQW = -15:
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 							else
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 							end
 							'You run up to Dimka then snatch the phone from his hand and begin deleting the video. Dimka gets up to snatch it back when Fedor drives his fist into Dimka''s throat causing him to begin couching erratically while squirming on the ground in pain. Fedor then checks Dimka''s pockets and takes his house keys as he says, "I''m gonna check his computer to make sure that he isn''t keeping any other copies of your video there. In the meantime get somewhere safe and please try to avoid making anymore "Videos"." Fedor gives you a smirk as he hands you your clothes then walks away.'
 
@@ -1089,7 +1089,7 @@ if $ARGS[0] = 'Dimka Party':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color="maroon"><<"Dimka Nosov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	'You push Dimka away from you while shouting "Hey! Beat it! Are you crazy or something?" suddenly Fedor comes stumbling into the room, obviously a little drunk then quickly approaches Dimka.'
 	'Dimka quickly released you then backs away, saying "Whoa, take it easy, I was just helping her to the door." Fedor gently grabs you by the arm and walks you out of the house while keeping his eyes trained on Dimka.'
 	*nl
@@ -1105,7 +1105,7 @@ if $ARGS[0] = 'Dimka Party 2':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color="maroon"><<"Dimka Nosov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	'You push Dimka away from you while shouting "hey! Beat it! Are you crazy or something?" but he doesn''t let go and begins dragging you into the next room when you both hear "Take your hands off her!"'
 	'You both turn to the corner of the room to see Fedor in the shadows. Dimka laughs as he says, "Well look who it is... the cocksucker Masha. If you want to suck my dick then you better get lost because I have <$pcs_firstname>> for that." after 2 seconds of silence Fedor charges Dimka and begins punching him repeatedly.'
 	'You rush over to Fedor to pull him away and he looks back at you and asks "Are you alright? He didn''t hurt you, did he?"'
@@ -1166,7 +1166,7 @@ if $ARGS[0] = 'Workout Time':
 	menu_off = 1
 	gs'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	'As you are walking around, Fedor approaches you then says, "Hey <<$pcs_nickname>>, I''m heading to the sports center to do some workouts. Would you like to join me, or would you prefer that I take you home?"'
 
 	act 'I could use a good workout':

locations/IgorEv.qsrc

@@ -1132,7 +1132,7 @@ if $ARGS[0] = 'Dimka':
 		act 'Turn around':
 			*clr & cla
 			'<center><B><font color=maroon>Dimka Nosov</font></B></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg" ></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg" ></center>'
 			'You turn around and see Dimka rapidly approaching the two of you.'
 			'"Hi, <<$pcs_nickname>>!" he greets you both.'
 			'"Hi." you woodenly reply to him and look at Igor, whose confidence immediately diminished, as one of his best friends checks you both excitedly.'
@@ -1236,7 +1236,7 @@ if $ARGS[0] = 'Dimka':
 		act 'Turn around':
 			*clr & cla
 			'<center><B><font color=maroon>Dimka Nosov</font></B></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 			'You turn around and see Dimka catching up to you.'
 			'"<<$pcs_nickname>>, you''ve set me up!" Igor whispers angrily.'
 			'"Come on, don''t worry, everything will be fine." you quietly reassure him.'
@@ -1279,7 +1279,7 @@ if $ARGS[0] = 'Dimka':
 						act'Return to Igor''s house':
 							*clr & cla
 							'<center><b><font color = maroon>Entrance hall</font></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 							'You return to Igor''s home. He immediately takes off the blonde wig and tosses it in the corner. Underneath you see his hair plastered to his head. Sweat dripping into his eyes. He then strips out of the entire outfit and drops the clothes to the floor. You weakly smile as you keep watching him "You two are..."'
 							'"Please, just shut up." Igor''s face turned red and his eyes go wild.'
 							'"Come on, relax," you reply. "don''t be so dramatic... So... a-are you going to go on a date with him on Friday?"'
@@ -1547,7 +1547,7 @@ if $ARGS[0] = 'kruglov_desc':
 	*clr & cla
 	$ren_str  = '<center><font size=4><table cellspacing=0 cellpadding=0>'
 	$ren_str += '<tr><td align=center><b><font size=5> Igor Kruglov </font></b></td></tr>'
-	$ren_str += '<tr><td align=center><img <<$set_imgh>> src="/images/characters/pavlovsk/school/head/4.jpg"></td></tr>'
+	$ren_str += '<tr><td align=center><img <<$set_imgh>> src="/images/pc/npc_headshots/big4.jpg"></td></tr>'
 	$ren_str += '</table></font></center>'
 	*pl $ren_str
 end

locations/KatjaHomeTalk.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = '':
 	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 
 	if pcs_sweat >= 20:
 		'Katja wrinkles her nose "<<$pcs_nickname>>, you''re all sweaty. Do you want to use my shower?"'
@@ -125,11 +125,11 @@ if $ARGS[0] = '':
 				cls
 				KatjaHorny += 1
 				!KatjaLust += 1
-				!if npcSex[14] = 1:
+				!if npc_sex['A14'] = 1:
 				minut += 15
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 	!			if flag_KissEV >= 3:
 	!				Act 'To continue the dispute':
 	!					cla
@@ -184,7 +184,7 @@ if $ARGS[0] = '':
 				act 'Further':gt 'KatjaHomeTalk'
 			end
 			
-			if npcSex[14] = 1 and pcs_dom >= KatjaDom:
+			if npc_sex['A14'] = 1 and pcs_dom >= KatjaDom:
 				act 'Offer to take a walk in the Park':
 					pcs_dom-=1
 					minut += 15
@@ -208,7 +208,7 @@ if $ARGS[0] = '':
 				cls
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				gs 'KatjaHomeTalk', 'hornykiss'
 			end
 
@@ -237,7 +237,7 @@ if $ARGS[0] = '':
 			act 'Tell her you''re pregnant':
 				cls
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				'"What? That''s so exiting! You didn''t get pregnant just to be like me, did you?" she asks playfully.'
 				*nl
 				act 'Next':gt 'KatjaHomeTalk', 'katjaknows'
@@ -255,7 +255,7 @@ if $ARGS[0] = '':
 			act 'Tell her you''re pregnant':
 				cls
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				'"What? That''s so exiting!'
 				*nl
 				act 'Next':gt 'KatjaHomeTalk', 'katjaknows'
@@ -277,7 +277,7 @@ if $ARGS[0] = '':
 				cls
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				'Katja’s face lights up. "Congratulations! This is even more exciting than last time! Every time you tell me you’re pregnant, I feel even better about my own teen pregnancy. Hell, that''s probably the reason you keep getting pregnant, isn''t it?" She giggles while looking at you affectionately.'
 				*nl
 				act 'Next':gt 'KatjaHomeTalk', 'katjaknows1'
@@ -495,7 +495,7 @@ if $ARGS[0] = 'shower_kiss_home':
 		KatjaLust += 1
 		KatjaSlut += 1
 
-		if npcSex[14] = 0:npcSex[14] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+		if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
 		
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/showersex.jpg"></center>'
@@ -523,7 +523,7 @@ if $ARGS[0] = 'shower_kiss_home':
 		KatjaHorny -= 10
 		KatjaLust += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 		'You remove her hands and smile at her. Then you dismiss Katja, who shyly looks to the floor and leaves the bathroom.'
 
 		act 'Get out of the shower':
@@ -551,7 +551,7 @@ if $ARGS[0] = 'Sextalk':
 				KatjaHorny += 10
 				KatjaKnowBJ = 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				'You tell Katja how you sucked dick and what it felt like. Katja blushes and bites her lip.'
 
 				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
@@ -571,7 +571,7 @@ if $ARGS[0] = 'Sextalk':
 				KatjaHorny += 10
 				KatjaKnowSex = 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				'You tell Katja about the times you have had sex and how it felt. Katja blushes and bites her lip.'
 
 				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
@@ -592,7 +592,7 @@ if $ARGS[0] = 'Sextalk':
 				KatjaHorny += 10
 				KatjaKnowAnal = 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				'You told Katja about the times you have had anal sex and what it felt like. Katja blushes and bites her lip.'
 
 				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
@@ -612,7 +612,7 @@ if $ARGS[0] = 'Sextalk':
 				KatjaHorny += 10
 				KatjaKnowKuni = 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				'You tell Katja about the times you have had gone down on another girl and how it felt. Katja blushes and bites her lip.'
 
 				if (pcs_dom - sub + 20) < KatjaDom:
@@ -661,7 +661,7 @@ if $ARGS[0] = 'Sextalk':
 				! WD: Uninitialised ~ 'KatjaKnowMastr'
 				KatjaKnowMastr = 1
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				'You tell Katja how you masturbate in the bathroom. Katja blushes and bites her lip.'
 
 				if KatjaMastr = 0:
@@ -689,7 +689,7 @@ if $ARGS[0] = 'Sextalk':
 					if SelfFistingKnow = 0:SelfFistingKnow = 1
 
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 					'You told Katja how you masturbate your ass and even managed to stretch it so much, that you can shove a fist into it.'
 					'Katja blushes and bites her lip.'
 
@@ -716,7 +716,7 @@ if $ARGS[0] = 'hornykiss':
 	act 'Bring your face close to hers':
 		cls
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 		'You move even closer to Katja''s face.'
 
 		if KatjaHorny < 50:

locations/Katja_Tanga.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'secretroom':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_10.jpg"></center>'
 			'After a few minutes of teasing her nipples you kiss your way down to her stomach, pulling off her skirt as you do. Your lips descend down her body and you begin kissing and teasing her clit with your tongue. You pull her down and gentle lay her down on her back, once she is laying down you slide two of your fingers into her wet pussy and begin to finger fuck her. She moans in pleasure, as her hands run all over her own body, as squeezes her own breasts.'
 			if (middildo = 1 or dildo = 1 or largedildo = 1 ) and pcs_vag > 15:
-				Act 'Get dildo':
+				act 'Get dildo':
 					pcs_horny += 10
 					gs'stat'
 					*clr & cla
@@ -80,7 +80,7 @@ end
 if $ARGS[0] = 'start':
 	gs'stat'
 	CLOSE ALL
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 	'You did a quick turn, causing your skirt to twirl up. For a brief moment exposing your lack of panties. Katja''s eyes widened in surprise. "You''re not wearing panties?" She whispers to you.'
 	act 'Show her you are not wearing panties.':
 		*clr & cla
@@ -151,7 +151,7 @@ if $ARGS[0] = 'school3':
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga4_2.jpg"></center>'
 		'Katja looks around to make sure that no one is watching the two of you. Then she unbuttons her shirt and pulls it open to reveal her bare breasts. With a smile you reach up and grab both her breasts in your hands and tease her nipples with your fingers, eliciting a moan of pleasure from her.'
-		if pcs_horny >= 50 and KatjaHorny >= 50 and npcSex[14] = 1 and mesec <= 0:
+		if pcs_horny >= 50 and KatjaHorny >= 50 and npc_sex['A14'] > 0 and mesec <= 0:
 			'Blushing Katja pulls away from your touch and buttons her shirt back up, but looks at you slyly and says. "I have a key to a storage closet, we can go there for a bit more privacy if you want." Giving you a hopeful look that you will agree.'
 			Act 'Go': gt 'Katja_tanga', 'secretroom'
 		else

locations/LariskaStart.qsrc

@@ -3,10 +3,12 @@
 !!Lariska = A13
 
 if $ARGS[0] = 'start':
+	*clr & cla
 	numnpc = 13
 	minut += 5
 	$static_num = 'A13'
 	menu_off = 1
+	lariskaQwestDay = daystart + 1
 	gs'stat'
 
 	'<center><b><font color = maroon><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></font></b></center>'
@@ -31,8 +33,8 @@ if $ARGS[0] = 'start':
 	'As you leave the sports section, you notice Lariska Gruzdev, she looks nervous and is looking for someone. Her gaze stops on you and she waves her hand, calling you over to her.'
 	'Well this is interesting, she had never shown that much interest in you before, always stuck in Christina''s stranglehold she had always been distant and you could barely get a full sentence from her.'
 	'Now that you have beaten Christina, she suddenly wants to talk. She does look more confident, happier and more active. Maybe she wants to thank you for beating up the bully?'
-	lariskaQwestDay = daystart + 1
-
+	
+	act 'Leave':gt'gdk'
 	act 'Follow Lariska':
 		cls
 		minut += 5
@@ -60,7 +62,6 @@ if $ARGS[0] = 'start':
 				'You are totally numb now. "What junkies?"'
 				'"Well, she didn''t only give blow jobs to the trainer, but she also blew the junkies, who are selling drugs here. She also bought some super steroids and she wants to contaminate you with them! Tomorrow after the section, they want to catch and rape you!"'
 				'As soon as she said it, she runs away.'
-				lariskaHelp = 1
 
 				if kotovLoveQW > 0:
 					act 'Call Kotov':
@@ -156,8 +157,6 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-
-	act 'Leave':gt'gdk'
 end
 
 if $ARGS[0] = 'end':

locations/Miroslava.qsrc

@@ -806,7 +806,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 
-		if npc_QW['A60'] >= 30 and hour < 19 and month >= 5 and month <= 9 and MiraLoc ! 3:
+		if npc_QW['A60'] = 20 and hour < 19 and month >= 5 and month <= 9 and MiraLoc ! 3:
 			act '<b>Make your third wish</b>':
 				menu_off = 1
 				*clr & cla
@@ -860,7 +860,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 									pcs_horny += RAND(5,10)
 									Mira_no += rand(10,30)
 									miraday = daystart
-									npc_QW['A60'] = 33
+									npc_QW['A60'] = 21
 									npc_rel['A60'] = 1
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_nude3.jpg"></center>'
@@ -877,7 +877,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 							*clr & cla
 							minut += 5
 							npc_rel['A60'] += 5
-							npc_QW['A60'] = 31
+							npc_QW['A60'] = 22
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/mira_leaves.jpg"></center>'
 							'"Well Mira, fuck you. I had a good day planned. You can consider yourself forgiven," - you said, after a pause.'

locations/NatBelGo.qsrc

@@ -8,7 +8,7 @@ gs 'stat'
 'You go up to Natasha and she asks you, "Will you come to my house to do our homework?"'
 
 act 'Go with Natasha':
-	cls
+	*clr & cla
 	minut += 15
 	BeInNatBelHome = 1
 	gs 'stat'
@@ -16,7 +16,12 @@ act 'Go with Natasha':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'
 	'It takes you 15 minutes to walk to Natasha''s home. You discuss all the small stuff in your lives that amuse you.'
 
-	act 'Go into the apartment': gt 'natbelapt', 'study_together'
+	if NatashaQW < 2:
+		act 'Go into the apartment': gt 'natbelapt', 'study_together'
+	else
+		act 'Study together': gt 'natbelapt', 'study_together'
+		act 'Make her do your homework': gt 'natbelapt', 'make_her_do_homework'
+	end
 end
 
 --- NatBelGo ---------------------------------

locations/NikoDates.qsrc

@@ -1004,7 +1004,7 @@ if $ARGS[0] = 'After School':
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/exhibition/clothed3.mp4"></video></center>'
 						'You drop down to your hands, and knees, and begin crawling. You can see many more people staring at you now, as you crawl behind Niko, like a pet. The hard gravel pressed against your hands, and knees is increasing your discomfort, but the thought of becoming more confident, daring, and making Niko happy drive you to continue crawling, for him. After a few more seconds, you suddenly hear someone say, "Now what do we have here? A cute little puppy, and her owner?" You quickly turn to see Denis Ryzhov leaning over you. Niko laughs as he replies, "I''m just taking my girl, for a walk." Dan smirks, as he looks down at you, "Is that <<$pcs_firstname>>? Any chance I could buy this pet of yours?"'
 						'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big10.jpg"></center>'
 
 						act 'Listen':
 							cls
@@ -1114,7 +1114,7 @@ if $ARGS[0] = 'Disco':
 								minut += 5
 								gs'stat'
 								'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big10.jpg"></center>'
 								'You turn around, and wrap your arms around the man behind you then quickly recoil in shock when you realize that Niko wasn''t the one touching you, it was Dan Ryzhov. You quickly exclaim, "What the fuck are you doing Dan?" He chuckles, as he replies, "I was just giving you what you wanted, I didn''t hear you complaining between the moans," You push Dan away. Dan begins cackling, as he walks away.'
 
 								act 'Look for Niko':
@@ -1304,7 +1304,7 @@ if $ARGS[0] = 'Locker Room':
 					minut += 2
 					gs'stat'
 					'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big10.jpg"></center>'
 					'You see Dan Ryzhov standing in front of you with a wolfish grin on his face, "Well well, I never thought that you were into this kind of stuff." He begins pinching your nipples. You then exclaim, "Dan stop! What are you doing here?" He replies, "Ever since I saw Niko walking you around then I''ve been keeping an eye on you, and saw you doing some pretty naughty things, and I like naughty things." He then lifts you to your feet, as you bellow, "Let go of me, or I''ll scream!"'
 					*nl
 					'Dan''s grin grows even wider, and who would hear you? Everyone is in the cafeteria, laughing, and shouting over each other. Even if someone heard you, would you like them to see you chained up naked, like this? Maybe I should just walk you into the cafeteria where you can scream all you want." <font color=#FF00FF>I''m completely naked. If he walks me into the cafeteria then I will be completely humiliated.</font>'
@@ -1337,7 +1337,7 @@ if $ARGS[0] = 'Locker Room':
 								minut -= 2
 								gs'stat'
 								'<center><b><font color="maroon"><<"Vasily [Shulga] Shulgin">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big10.jpg"></center>'
 								if kotovloveQW > 0:
 									kotovloveQW = -1
 									'Vitek and Vasily enter the room then Vitek begins shouting at Dan, "What the fuck do you think you''re doing Dan? <<$pcs_firstname>> is mine!" Dan suddenly rams his dick far in your ass, causing you to scream, as he fills your ass with his cum. You feel his dick throbbing inside you, as his warm cum fills your ass. Vitek suddenly wraps his hand around Dan''s throat, "Answer my fucking question! What are you doing, fucking my girl?" Dan chocks on his words as he tries to explain, "<<$pcs_firstname>> is a...whore, and I can...Grr...prove it. Check this out," Dan reaches into his pocket then pulls out his phone, and taps the screen a few times. After a few more taps, he lift the phone up to Vitek''s face. A video plays where you hear sucking sounds followed by a groan then shortly after hear yourself saying,'
@@ -1349,7 +1349,7 @@ if $ARGS[0] = 'Locker Room':
 									'You plead, "Please don''t. I need to get back to..." Vitek wraps his hand around your throat. "That can wait, now get sucking." Dan pulls out of you, causing you to feel a rush of pressure, as it evokes a moan to escape your mouth. Vitek immediately takes advantage of this, and shoves his dick into your mouth.'
 								end
 								'<center><b><font color="red"><<"Viktor [Vitek] Kotov">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 								gs 'cum_call', 'anus', $boy
 								gs 'arousal', 'bj', 5, 'sub'
 								gs 'arousal', 'end'
@@ -1405,7 +1405,7 @@ if $ARGS[0] = 'Locker Room':
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 											else
 												'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+												'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 											end
 										end
 
@@ -1427,7 +1427,7 @@ if $ARGS[0] = 'Locker Room':
 													minut += 5
 													gs'stat'
 													'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+													'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 													if fedorkozlovQW < -10:
 														'Fedor leans over then whispers in your ear, "Run." You quickly begin running, as Fedor runs to the nearby trash can then tosses it at Vitek. Vitek blocks it as Fedor charges him, tackling him to the ground. You continue running, as Vitek and Dan, beat up on Fedor. You look back to see Dan climb off of Fedor then start to run to you before Vasily pretends to trip, and falls on Dan, causing them both to fall to the ground, long enough for you to make you way to the locker room where you find the bag with your clothes in it. You spent a minute getting dressed before walking to the hallway, just outside of your classroom.'
 													else
@@ -1555,7 +1555,7 @@ if $ARGS[0] = 'Exposed':
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color="red"><<"Bella Artamonov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/22.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big22.jpg"></center>'
 			'Bella Artamonov suddenly begins shouting at the boys, "That''s enough! Get the fuck out of here before I call the principle!" Dan replies, "You heard the girl. Let''s take <<$pcs_firstname>> back to the locker room. Everyone who wants to join can tag along." Dan, and Dan grab your arms then lead you toward the locker room, as many of the boys, and even a few girls follow.'
 			*nl
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/wos.jpg"></center>'
@@ -1711,7 +1711,7 @@ if $ARGS[0] = 'Walk Of Shame':
 			gs 'boyStat', 'A154'
 			gs'stat'
 			'<center><b><h4><font color="green"><<"Radomir Popov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 			'You both arrive at the restroom, and the boy pulls you to a mirror then stands behind you, as he says, "Hello <<$pcs_firstname>>, my name is Radomir, and I can''t stop thinking about your rockin'' bod, and cute face. I want another round, and don''t worry, I''ll be gentle." He begins undressing you, as he runs his hands down your body. You can feel you shirt being removed, followed by your pants. Radomir finishes undressing you then begins sliding his hand up your leg arrivning at you vagina which he begins finering, as you close your eyes, letting him do, as he want to your body. After a few seconds Radomir begins taking off his shirt then pulling down his pants. Radomir whispers in your ear, "I''ve never had a girl suck my balls before. I want you to be the first." He then lightly pushes down on your shoulders.'
 			*nl
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/1.jpg"></center>'

locations/NikoDreams.qsrc

@@ -397,7 +397,7 @@ if $ARGS[0] =  'Friends':
 			'Radomir: I know right? Her pussy is probably all stretched out by now. It''s like ground zero.'
 			'Lesko: It may be used up but I might as well try it. Lesko then grabs you by your hair then pulls out his dick then shoves it in your mouth.'
 			'<center><b><h4><font color=#ffa200><<"Lesco Tsarev">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/7.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big7.jpg"></center>'
 
 			act 'Suck Lesco''s dick':
 				cls

locations/NikoEv2.qsrc

@@ -243,7 +243,7 @@ if $ARGS[0] =  'Lunch Chat':
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color="maroon"><<"Lavrenti Romanov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/40.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
 			'As soon, as you enter the locker room, you see Lavrenti Romanov waiting, for you. Niko says, "Here she is." Lavrenti responds, "I heard some things about you <<$pcs_nickname>>. Are they true?" You lower your head then ask, "What have you heard?" Lavrenti replies, "I heard that you are Niko''s whore, and that you do anything Niko tells you too. At least that is what Niko said." You look to Niko, who has a wide smile on his face. Niko nods to you, "No need to be shy <<$pcs_nickname>>, tell him." You lower your head again then say, "Yes it''s true." Niko responds, "What''s true?" with a confident smile on his face.'
 			*nl
 			'You reply, "I am Niko''s whore." Lavrenti smiles, as he responds, "Good, well should we get started?" In your heart, you know what he wants, but you ask Niko anyway, "What do I need to do?" Niko replies, "Just suck his dick. It should be easy, for you." You know that you''ve come too far to go back now, so you approach Lavrenti then drop to your knees in front of him, as he unbuttons his pants."'
@@ -266,7 +266,7 @@ if $ARGS[0] =  'Lunch Chat':
 					*nl
 					'Niko responds, "If you have the cash then I have the girl for you. Speaking of cash..." Niko extends his hand. Lavrenti nods then says, "<<$pcs_nickname>> was worth every ruble." He then hands Niko some money then buttons his pant, and rubs your cheek before leaving the locker room.'
 					'<center><b><h4><font color="maroon"><<"Lavrenti Romanov">></font></h4></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/40.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
 					gs 'cum_call', 'mouth', $boy
 					gs 'arousal', 'bj', 5
 					gs 'arousal', 'end'
@@ -384,7 +384,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color="maroon"><<"Lavrenti Romanov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/40.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
 			'As you enter the locker room you see Lavrenti waiting for you. You immediately know what he wants, and you turn to Niko then ask, "Do you want me to suck his dick again?" But you say it with a smile. Niko looks at you with a surprised, but pleased look on his face, "You really seem to be getting into this, good, but no he want to fuck you this time. Don''t worry, he will pay a lot more this time. so take off your clothes." You obediently nod then remove your clothes. Lavrenti watches you undress while removing his pants then stroking his penis.'
 			*nl
 			'After fully undressing, you walk up to Lavrenti then ask him, "How do you want me?" He points to the wall then says, "Face against the wall." You do as he says then feel his penis rubbing against your vagina, and you quickly brace yourself against the wall, as his penis rams inside of your vagina.'
@@ -407,7 +407,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 					*nl
 					'Lavrenti backs off. "Whoa take it easy, I''ll pay double the amount we agreed on, okay?" Niko calms himself as he replies, "Alright fine, let''s just not do this again, alright?" Niko wraps his arm around Lavrenti''s neck then they both begin laughing it off. Lavrenti gives Niko the money he owes him then puts his pants back on before leaving the restroom.'
 					'<center><b><h4><font color="maroon"><<"Lavrenti Romanov">></font></h4></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/40.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
 					gs 'cum_call', 'butt', $boy
 					gs 'arousal', 'vaginal', 5
 					gs'stat'

locations/NikoPayback.qsrc

@@ -552,7 +552,7 @@ if $ARGS[0] = 'Fedor Help 2':
 		minut += 1
 		gs'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'After turning the corner, Niko suddenly recoils back, as Fedor''s fist makes contact, causing Niko to drop to the ground, holding his face. Fedor shouts, "HOW DARE YOU TOUCH <<$pcs_firstname>>! I WILL SHOW YOU WHAT HAPPENS WITH SHITHEADS LIKE YOU." Fedor begins punching Niko as he tries to block the blows. Suddenly Fedor gets tackled.'		
 
 		act 'Turn to Fedor':	
@@ -560,7 +560,7 @@ if $ARGS[0] = 'Fedor Help 2':
 			minut += 1
 			gs'stat'
 			'<center><b><h4><font color="red"><<"Lavrenti Romanov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/40.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
 			'You turn to see Lavrenti Romanov trying to hold Fedor down while Niko holds his face in pain, still unable to recover. Lavrenti punches Fedor before Fedor returns the blow, knocking Lavrenti off of him before Niko finally recovers then kicks Fedor in the face, knocking him to the ground then Lavrenti grabs onto Fedor''s arms then holds him down while Niko begins kicking him in the ribs. You grab Niko by his shirt then pull him away before he slaps you across the face. Niko winds up to kick Fedor again when someone''s fist rams into his face.'
 
 			act 'See who it was':	
@@ -568,7 +568,7 @@ if $ARGS[0] = 'Fedor Help 2':
 				minut += 1
 				gs'stat'
 				'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
 				'You turn to see Ivan Prokhorov standing over Niko. Ivan immediately rushes toward Lavrenti, grabbing him by his arms then lifting him up before slamming him onto the ground. "Teaming up on my friend, and his girl? Not on my watch." Ivan then helps Fedor up before lifting up his foot then driving it into Lavrenti''s face. Fedor takes a second to recover before immediately climbing on Niko then repeatedly punching him. After a few punches, Ivan pulls Fedor off then says, "Come on man, it''s done."'
 				
 				act 'Place your hand on Fedor''s shoulder':
@@ -600,7 +600,7 @@ if $ARGS[0] = 'Fyodor Help':
 		minut += 2
 		gs'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'As you reach the restroom, Niko tosses you to the ground then approaches you when suddenly, Fedor quickly walks into the room, and punches Niko in his face, knocking him to the ground before climbing on him, and punching him repeatedly. After a few punches Niko says, "Whoa chill out man, <<$pcs_firstname>> and I were just playing a game. Do you see? She is laughing right now." Fedor turns to you just as Niko winds up his fist, ramming it into Fedor''s face before quickly pushing Fedor off of him then running to the door. <font color=#FF00FF>Niko''s running away?...No! I''m finished with this shit!</font> You quickly grab Niko''s shirt turning him to you before scratching him in his face then pushing him onto the ground, giving Fedor enough time to recover then climb on top of Niko again, punching him in the face.'	
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'
@@ -652,7 +652,7 @@ if $ARGS[0] = 'Ivan Help 2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'	
 	'You approach Niko, and a confident grin covers his face, as he says, "You showed up? Goo..." Niko quickly pauses when he notices Ivan approaching. Ivan drives his fist into Niko''s stomach then says, "I hear that you have been giving <<$pcs_firstname>> a hard time. Allow me to return the favor." Ivan then begins chocking Niko, as Niko tries to squirm out of Ivan steel grasp. After a few seconds, Ivan releases Niko, causing Niko to drop to the ground. Ivan stands over Niko and says, "That was a warning. Give <<$pcs_firstname>> a hard time again, and I won''t hold back."'
 	'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
 	
 	act 'Continue':
 		cls
@@ -661,7 +661,7 @@ if $ARGS[0] = 'Ivan Help 2':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/hug1.jpg"></center>'
 		'Niko quickly nods, obviously frightened of Ivan. Ivan then gives you a hug as he says, "You''ll be fine now. If he bothers you again then let me know, and I will set him straight." You gratefully nod, as Ivan turns around then walks away. You turn around to leave when you notice Vitek walking up to Niko then lightly places his foot on his back, as he says, "I always told you that your big mouth would get you into trouble." Vitek then steps off of Niko then laughs, as he walks away.'		
 		'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 
 		act 'Go to class':gt 'gschool_lunch', 'break'
 	end
@@ -675,14 +675,14 @@ if $ARGS[0] = 'Vitek Help':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 	'You say to Vitek, "Um Viktor I need..." Dan unintentionally cuts you off, "Oh yeah, have you guys seen that big breasted bitch handing out freebies by..." Vitek says, "Hold that thought. <<$pcs_nickname>> we''re having guy talk right now, you and I can chat later." You try add, "But I really need..." Vasily suddenly intentionally falls to the ground then says, "You need to cheer up, you look so glum. Here, I will tell you a joke rated everyone..." Dan adds, "You mean rated immature, right?" The guys begin laughing, as you get more agitated at them ignoring you.'
 	
 	act 'Scream out':	
 		cls
 		gs'stat'
 		'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 		'You suddenly scream, "NIKO RAPED ME!!!" The guys freeze in place before Vitek says, "He did what?" Niko suddenly stands up then begins sprinting toward the door when Vasily shoulder tackles him into the wall, knocking slamming him against it. Lavrenti tries to help Niko when Dan stands in front of him, blocking him from interfering. Vitek suddenly lunges forward then drives his foot into Niko''s face, slamming his head against the wall before shouting, "YOU FUCKING WORTHLESS SACK OF SHIT!!! HOW DARE YOU TOUCH MY GIRL!!!"'	
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised1.jpg"></center>'
@@ -692,7 +692,7 @@ if $ARGS[0] = 'Vitek Help':
 			minut += 5
 			gs'stat'
 			'<center><b><h4><font color="maroon"><<"Vasily [Shulga] Shulgin">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/11.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
 			'Vitek continuously kicks Niko in the ribs, as Vasily joins him while saying, "We''ll show you what happens to those who fuck with <<$pcs_firstname>>." After a few minutes, Vitek takes a few seconds to catch his breath before approaching you, wrapping his arms around you, and saying, "I''m sorry that I didn''t listen to you, but don''t worry, I will make this sack of shit pay for touching you. You shouldn''t stick around for this. Go on, and I''ll see you later." You lean forward, and give Vitek a passionate kiss before saying, "Thank you Viktor. I always feel so safe with you." Vitek gives you ass a light smack before responding, "You know it <<$pcs_nickname>>. Now get going, I have some business to finish here." You happily nod before leaving the restroom.'	
 			*nl
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss3.mp4"></video></center>'
@@ -710,7 +710,7 @@ if $ARGS[0] = 'Vitek Help 2':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 	'You approach Vitek and he says, "Hey <<$pcs_nickname>>, want a drink?" You reply, "I need to ask for your help, Niko has been raping me at lunch and..." Vitek''s eyes widen as he says, "He did what?" You remain quite, as you feel tears dripping down your cheek. Vitek tosses his bottle to the ground, causing a loud shatter which draws everyone in the discos attention. Vitek angrily walks over the broken glass, as he approaches Niko. Niko suddenly asks, "Whoa what''s going on?" Vitek replies, "You have been fucking with my girl?"'
 	*nl
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad2.jpg"></center>'
@@ -719,7 +719,7 @@ if $ARGS[0] = 'Vitek Help 2':
 		cls
 		gs'stat'
 		'<center><b><h4><font color="maroon"><<"Vasily [Shulga] Shulgin">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/11.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
 		'Niko immediately tries to run away when Vasily drives his fist into Niko''s face before saying, "You don''t fuck with <<$pcs_nickname>> without dealing with us." You can feel your heart warming up, as you realize how safe you are with Vitek, and Vasily around. Niko continuously tries to crawl away, but is grabbed by Vitek, who lifts him up then slams him onto the ground before climbing on top of him then repeatedly punching him in the face. Vasily approaches you then says, "You are safe now <<$pcs_firstname>>. We will make sure that Niko never touches you again."' 
 		*nl
 		'You give Vasily a hug as you respond, "Thank you all so much for your help. You''re the best." Vasily gives you a pat on the back before saying, "You don''t need to thank us. It''s a mans job to keep girls safe. Here have a drink on me." Vasily hands you a bottle of beer then turns back around to join Vitek, and Dan in beating Niko.'		

locations/ParChurch.qsrc

@@ -20,6 +20,7 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	$location_type = 'public_indoors'
 	menu_off = 0
+	gs 'themes', 'outdoors'
 	gs 'stat'
 	'<center><b><font color="maroon">Church of Saint Nikolas</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/st-nikolas.jpg"></center>'
@@ -29,28 +30,28 @@ if $ARGS[0] = 'start':
 	'Vigil is held Saturdays at 19h.'
 	'The Divine Liturgy is on Sundays between 9h and 12h.'
 
-	if Churchbad = 3 and Churchbadtime > daystart:
-		cla
-		'The priest is probably still mad at you. You decide to avoid him for now.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
-!!	exit
-
-	elseif Churchbad = 3 and Churchbadtime <= daystart:
-		Churchbad = 2
-		'"You figure that the priest has probably calmed down enough by now that you could talk to him."'
-	end
+	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
+	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
 		act 'Attend vigil': gt 'ParChurch', 'vigil'
 	elseif week = 7 and hour >= 9 and hour < 12 and churchday ! daystart:
 		act 'Attend Divine Liturgy': gt 'ParChurch' , 'liturgy'
 	else
-		act 'Enter the church': gt 'ParChurch' , 'Narthex'
-		!!act 'Go to the cemetery': gt 'ParChurch' , 'cemetery'
+		if Churchbad = 3 and Churchbadtime > daystart:
+			cla & nl
+			'The priest is probably still mad at you. You decide to avoid him for now.'
+			act 'Go to the residential area':minut += 5 & gt 'pavResidential'
+			act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		elseif Churchbad = 3 and Churchbadtime <= daystart:
+			Churchbad = 2
+			*nl
+			'"You figure that the priest has probably calmed down enough by now that you could talk to him."'
+			act 'Enter the church': gt 'ParChurch' , 'Narthex'
+		else
+			act 'Enter the church': gt 'ParChurch' , 'Narthex'
+		end
 	end
-	
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
 end
 
 if $ARGS[0] = 'vigil':
@@ -68,6 +69,7 @@ if $ARGS[0] = 'vigil':
 	moral += 1
 	Churchbad -= 1
 	minut += 30
+	gs 'themes', 'indoors'
 	PLAY 'sound/church/Blessing.mp3',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(1,5) +'.jpg"></center>'
 	'You attend the vigil and reflect on the recent events in your life. The harmonies as the hymns and psalms are sung sweep aside some of the worries in your heart, although you know they will return once you leave this holy place, you still enjoy the rest. The sweet scent of incense tickles your nose and reminds you of the scent of' + iif(rex_love = 1, 'Rex', 'your step-father') + '''s cologne.'  
@@ -104,6 +106,7 @@ if $ARGS[0] = 'liturgy':
 	menu_off = 1
 	minut += 60
 	Churchbad -= 1
+	gs 'themes', 'indoors'
 	PLAY 'sound/church/t' + rand(1,19) + '.mp3',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(1,8) +'.jpg"></center>'
 	if pav_slut < 75 and Conf_Kirill <= 1: 
@@ -156,6 +159,7 @@ if $ARGS[0] = 'Narthex':
 	$menu_arg = 'Narthex'
 	menu_off = 0
 	*clr & cla
+	gs 'themes', 'indoors'
 	gs 'stat'
 	PLAY 'sound/church/76139__dkustic__090227-01-people-church-concert.wav',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/enterchurch.jpg"></center>'
@@ -174,6 +178,7 @@ if $ARGS[0] = 'candle':
 	minut += 10
 	menu_off = 1
 	Churchbad -= 1
+	gs 'themes', 'indoors'
 	gs 'stat'
 	gs 'ParChurch', 'reducepavrep', 25, -1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_candle.jpg"></center>'
@@ -209,6 +214,8 @@ if $ARGS[0] = 'pray':
 	*clr & cla
 	menu_off = 1
 	minut += 1
+	gs 'themes', 'indoors'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_praying.jpg"></center>'
 	'You approach the prayer bench and kneel down to pray.'
 	act 'Pray':
@@ -277,13 +284,11 @@ if $ARGS[0] = 'pray':
 			*clr & cla
 			menu_off = 1
 			Churchbad += 2
-			gs 'fame', 'pav', 'sex', 1
-			gs 'fame', 'pav', 'prostitute', 1
+			gs 'fame', 'pav', 'sex', 2
+			gs 'exhibitionism', 2
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_prayingflash.jpg"></center>'
 			'While you''re praying, you get a devious idea. With a sly smile, you expose your butt, giving anyone that looks your way the perfect view of your ass. Finally, you lower your head and pray in silence. Occasionally you can hear some whispers behind you but it only makes you smile.'
-			gs 'arousal', 'flash', 10, 'exhibitionism'
-			gs 'arousal', 'end'
-			gs 'stat'
 			act 'Return to Narthex': gt 'ParChurch', 'Narthex'
 		end
 	end
@@ -293,6 +298,7 @@ if $ARGS[0] = 'talk_priest':
 	*clr & cla
 	menu_off = 1
 	minut += 15
+	gs 'themes', 'indoors'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_talk.jpg"></center>'
 	'As you approach the priest, you recall your previous behavior, your sins, your transgressions, and the daily temptations you face.'

locations/ParChurch2.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = 'confession':
 			moral -= 3
 			Kirill -= 2
 			Churchbad += 1
-			Churchbadtime = daystart + badrand
+			Churchbadtime = daystart + rand(1,7)
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
 			'You stare at the priest defiantly, daring him to do something.'
 			'"You should leave here," the priest says sternly, "But think long and hard about your path in life."'
@@ -215,12 +215,13 @@ if $ARGS[0] = 'confession':
 				'"Such experimentation is to be expected, child. Do not fear that your soul has been stained by your actions, however you must be sure to inform me of such acts lest they lead to greater sins in the future." the priest scolded you as he draped his stole over your head and began the Prayer of Absolution.'
 			else
 				'"Hmmm." Father Kirill answered eagerly, "Such experimentation is to be expected, child. But I fear that your soul will become stained by your actions, if we do not purge this sin from you body at once."'
-				'You feel yourself grow concerned maybe their is something to this after all. "How can we do that father?"'
+				'You feel yourself grow concerned maybe there is something to this after all. "How can we do that father?"'
 				'He licks his lips a moment. "I will give of myself and absorb your lust, so that you have no desire to lay your hands upon others."'
 				act 'Let the father slake your lust with his body': gt 'ParChurch2', 'hj'
 				gs 'willpower', 'hj'
 				if will_cost <= pcs_willpwr:
 					act 'Refuse to give the father a hand job (<<will_cost>> Willpower)':
+						*clr & cla
 						gs 'willpower', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
@@ -731,12 +732,12 @@ if $ARGS[0] = 'secrets':
 								else
 									'"Hmmm." Father Kirill almost sounds like he is moaning, "What a naughty thing to do. And did he cum, I mean, did he ejaculate in your mouth?"'
 									'"No, he pulled out and squirted his stuff all over my face," you say recalling the feel of his hot semen splashing on you.'
-									act 'Finish':
-										*clr & cla
-										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
-										'After confessing, Father Kirill kneels next to you and drapes the end of his stole over your head. Together, you chant the prayer of absolution. Father Kirill admonishes you to be a good girl and tells you to come back to see him anytime you feel the need.'
-										act 'Return to Narthex': gt 'ParChurch', 'Narthex'
-									end
+								end
+								act 'Finish':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
+									'After confessing, Father Kirill kneels next to you and drapes the end of his stole over your head. Together, you chant the prayer of absolution. Father Kirill admonishes you to be a good girl and tells you to come back to see him anytime you feel the need.'
+									act 'Return to Narthex': gt 'ParChurch', 'Narthex'
 								end
 							end
 						else

locations/Snpc.qsrc

@@ -153,7 +153,7 @@ if $ARGS[0] = 'kissback':
 		gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
 		minut -= 5
 		gs 'stat'
-		act 'Go somewhere private':  gt 'gschool_sex', 'Anush_private'
+		act 'Go somewhere private': gt 'gschool_sex', 'Anush_private'
 	end
 end
 
@@ -379,7 +379,7 @@ if numnpc = 14:
 			end
 		end
 	end
-	if rand(1,3) = 1 and npcSex[14] = 1 and $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart:  gt 'Katja_tanga', 'start'
+	if rand(1,3) = 1 and npc_sex['A14'] = 1 and $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart: gt 'Katja_tanga', 'start'
 	if rand(1,2) = 1 and katschoolsex = 1 and pcs_horny > 40:
 		*clr
 		if $loc = 'gdkin':
@@ -612,7 +612,7 @@ if numnpc = 231:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 			'"Hi <<$npc_nickname[''<<''A<<numnpc>>''>>'']>>! I just finished my last book at home and I''m not sure what I should read next. Can I join you at the library this afternoon so that you can help me find another good one to read?"'
-			'<<$npc_firstname[''<<''A<<numnpc>>''>>'']>>''s face quickly shifts from a smile to confusion. You can tell she''s not sure how to respond and there is a long pause as a result.  Finally after about 30 seconds of thought she responds "Sure, that should be alright.  Do you mind going home with me first so that I can change out of our uniform?"'
+			'<<$npc_firstname[''<<''A<<numnpc>>''>>'']>>''s face quickly shifts from a smile to confusion. You can tell she''s not sure how to respond and there is a long pause as a result. Finally after about 30 seconds of thought she responds "Sure, that should be alright. Do you mind going home with me first so that I can change out of our uniform?"'
 			'"That is no problem at all" you reply. "I''ll meet you outside of school after our last period, and then we can head to your house together."'
 			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> replies as she heads off.'
 			if $loc ! 'gdkin':
@@ -630,7 +630,7 @@ if numnpc = 231:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 			'"Hi <<$npc_nickname[''<<''A<<numnpc>>''>>'']>>! I ended up missing school the other day because I was sick. Would it be alright with you if we went to your house after school so that you can help me catch up?"'
-			'<<$npc_firstname[''<<''A<<numnpc>>''>>'']>> replies "Sure <<$pcs_nickname>>, just as long as you aren''t sick anymore.  I don''t want to get sick with whatever you had and miss school as well."'
+			'<<$npc_firstname[''<<''A<<numnpc>>''>>'']>> replies "Sure <<$pcs_nickname>>, just as long as you aren''t sick anymore. I don''t want to get sick with whatever you had and miss school as well."'
 			'You giggle a little bit and reply "Nah, I got over my sickness so you should be fine. I''ll meet you outside of school after our last period, and then we can head to your house together."'
 			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> replies as she heads off.'
 			if $loc ! 'gdkin':
@@ -651,7 +651,7 @@ if numnpc = 231:
 			'After about a minute or so of eye contact, you finally develop enough courage to speak first.'
 			'"Hi <<$npc_nickname[''<<''A<<numnpc>>''>>'']>>...." You say in a nervous and defeated voice.'
 			'"Hi <<$pcs_nickname>>...." she replies in an equally nervous voice.'
-			'After taking a couple more seconds to fully collect your thoughs, you say "Look, I think we need to talk about what happened last time at your house. Given the subject, it would be best to do so privately.  Can we meet after school to talk about it?"'
+			'After taking a couple more seconds to fully collect your thoughs, you say "Look, I think we need to talk about what happened last time at your house. Given the subject, it would be best to do so privately. Can we meet after school to talk about it?"'
 			'<<$npc_nickname[''<<''A<<numnpc>>''>>'']>> doesn''t respond, and almost looks like she''s about to start crying. She finally wimpers "Are you mad at me or are you sickened by me?"'
 			'Not completely surprised by what she said, you hold firm in making sure to wait until the two of you are alone. "I don''t wan''t to discuss things here. Meet me after school so we can talk about this more. I promise I''m not going to hurt you if that is what you''re afraid of."'
 			'Looking a little releaved, <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> nods her head in a slow manner and sheds a couple of tears. You walk away without either of you saying another word."'

locations/SoniaHome.qsrc

@@ -457,7 +457,7 @@ if $ARGS[0] = 'Julia Park':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/12.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'
 	'You, and Julia walk through the park while having small talk until you sit down on a bench, and Julia sits down next to you. Julia smiles, as she asks, "What do you plan to do with Niko?" You reply, "I don''t know yet. I need to sleep on it." Julia nods slowly, "I guess that''s fair, I''m just worried about you. No one can go through what you did, and be unphased." You nod, as you reply, "Nothing will be the same, I know that, but I can still choose where I go from here." Julia places her hand on your knee. "You don''t need to be alone in this. If you ever need anything then you can always talk to me." You give Julia a warm smile as you reply, "That''s so sweet of you, but why do you care so much about what happens to me? I''m no one special."'
 	*nl
 	if SexTalkJulia = 4 or JuliaMilovQW >= 10:
@@ -475,7 +475,7 @@ if $ARGS[0] = 'Julia Park 2':
 	minut += 15
 	gs'stat'
 	'<center><b><h4><font color=#00eaff><<"Julia Milov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/12.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'
 	'You, and Julia continue chatting for a few minutes before Julia looks at her phone then says, "Wow, I can''t believe it gotten so late. We should really get home." You both walk home.  When you reach your door Julia says, "Stay safe <<$pcs_firstname>>, and remember to follow your heart. Have a good night." You then wave goodbye to Julia, as she walks away.'
 
 	act 'Enter your apartment':gt 'korrPar'

locations/Terminal.qsrc

@@ -169,8 +169,8 @@ if trfatherQW = 2:
 			end
 		end
 	end
-elseif trfatherQW = 3 and week = 6 and hour = 12:
-	act 'Search for father':
+elseif (trfatherQW >= 3 or trfatherQW < 0) and week = 6 and hour = 12:
+	act ''+iif(trfatherQW = 3, 'Search for father', 'Approach the men')+'':
 		cls
 		minut += 5
 		gs'stat'
@@ -237,10 +237,10 @@ elseif trfatherQW = 3 and week = 6 and hour = 12:
 					act 'Leave':minut += 5 & gt $curloc
 				end
 			end
-			dynamic $askfather
+			if trfatherQW = 3:dynamic $askfather
 			act 'Leave':minut += 5 & gt $curloc
 		end
-		dynamic $askfather
+		if trfatherQW = 3:dynamic $askfather
 		act 'Leave':minut += 5 & gt $curloc
 	end
 end

locations/anushapt.qsrc

@@ -110,7 +110,7 @@ if $ARGS[0] = 'home':
 		elseif nushdoor <= 9:
 			*clr & cla
 			AnushkaLoc = 1
-			'<center><img src="images/characters/pavlovsk/school/head/45.jpg"></center>'
+			'<center><img src="images/pc/npc_headshots/big144.jpg"></center>'
 			'You stand outside the Konstantinov household, hoping that Anushka will be the one to come open the door.'
 			'Anushka opens the door smiling, "Hi <<$pcs_nickname>>. Come in."'
 			act 'Leave': gt 'pavComplex','start'
@@ -118,7 +118,7 @@ if $ARGS[0] = 'home':
 		elseif nushdoor <= 12:
 			*clr & cla
 			AnushkaLoc = 5
-			'<center><img src="images/characters/pavlovsk/school/head/45.jpg"></center>'
+			'<center><img src="images/pc/npc_headshots/big144.jpg"></center>'
 			'You stand outside the Konstantinov household, hoping that Anushka will be the one to come open the door.'
 			'Anushka opens the door smiling, "Hi <<$pcs_nickname>>. Come in, I was just watching some tv." As you go inside she closes the door and heads for the living room, where some action movie is playing on the tv. She practically falls down on the couch as she takes a seat.'
 			act 'Take a seat next to her': gt 'anushapt','nushlivroom'
@@ -134,7 +134,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
-				'<center><img src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+				'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
 				'You ignore his comments and step around, to enter the apartment. Just then you see Radomir walking up the hall towards the door, buckling his belt back in place. He gives you a huge grin and a wink. "Hey <<$pcs_nickname>> bad timing, you just missed out. Nush is in her room recovering from the ass fucking I just gave her."'
 				'Then he reaches over and ruffles Maksim''s hair with his hand. "You sister has a real nice tight ass, or at least it was, doubt it is anymore." With that he walks past both of you and leaves the apartment.'
 				'Maksim gives you a <i>I told you so</i> look. "See." Is all he says and then walks back to his room'
@@ -176,7 +176,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
-				'<center><img src="images/characters/pavlovsk/school/head/43.jpg"></center>'
+				'<center><img src="images/pc/npc_headshots/big154158.jpg"></center>'
 				'You ignore his comments and step around, to enter the apartment. Just then you see Valentin walking up the hall towards the door, zipping his pants up. He gives you a huge grin and a wink. "Hey <<$pcs_nickname>> what''s up?"'
 				'You look at him and say. "What where you two doing?"'
 				'He grins a bit, that kind of grin guys get after getting laid. "Oh you know just hanging out and having fun." Then he says to Maksim. "You going to go by later and help me work on my bike?"'
@@ -219,7 +219,7 @@ if $ARGS[0] = 'home':
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
-				'<center><img src="images/characters/pavlovsk/school/head/27.jpg"></center>'
+				'<center><img src="images/pc/npc_headshots/big154146.jpg"></center>'
 				'You ignore his comments and step around, to enter the apartment. Just then you see Marcus walking up the hall towards the door, freezes in place looking obviously embarrassed. He looks down not meeting your eyes. "Hey <<$pcs_nickname>> I was just hanging out... anyways I need to get going, see you at school yeah?" Then with out waiting for a reply he hurries out of the apartment.'
 				'Maksim gives him a disgusted look at he walks by and then looks to you with a <i>I told you so</i> look. "See." Is all he says and then walks back to his room'
 				

locations/anushka.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'plan':
 	gs 'stat'
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
-	'<center><img src="images/characters/pavlovsk/school/head/45.jpg"></center>'
+	'<center><img src="images/pc/npc_headshots/big144.jpg"></center>'
 	'Valentin sits across from you and Anushka takes the seat next to you, sliding her arm around your shoulders and pulling you close to her. "<<$pcs_nickname>>, we need your help with a plan."' 
 	*nl
 	'"What plan?", you ask, looking from her to Valentin and back. Anushka''s answer comes so fast that you are certain she was waiting for that exact question: "We want to drug Mr <<$rand_teacher>>, you know, so we can go have fun." You are almost certain you misheard her but she casually ignores your shocked expression and explains what part she expects you to play in this: "I will go up and distract him and when I do, we need you to drop these in his drink." She places several pills in your hand.'
@@ -286,7 +286,7 @@ if $ARGS[0] = 'wedgie fight':
 	act 'In trouble':
 		*clr & cla
 		'<center><b><font color="maroon">Principal''s Office</font></b></center>'
-		'<center><img src="images/characters/pavlovsk/school/head/50.jpg"></center>'
+		'<center><img src="images/pc/npc_headshots/big134.jpg"></center>'
 		'He knocks, waiting until he hears "Enter" from inside and then proceeds to drags you both in. Once inside he releases the two of you and addresses the school principal. "These two where trying to pull each others clothes off in the middle of the library."'
 		'The principal doesn''t seem remotely surprised by this. "Miss Konstantinov, I have come to expect this kind of behavior from you, but <b>you</b> miss <<$pcs_lastname>>, I had hoped you would know better. It seems that hope was in vain." she nods to the teacher. "I will deal with them." With that he leaves the office and closes the door.'
 		act 'Punishment':
@@ -355,7 +355,7 @@ if $ARGS[0] = 'temptation':
 	act 'Might be fun':
 		*clr & cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
-		'<center><img src="images/characters/pavlovsk/school/head/45.jpg"></center>'
+		'<center><img src="images/pc/npc_headshots/big144.jpg"></center>'
 		'You look around and when you''re sure that there is no one watching, you get up and quickly slip in behind one of the shelves. You make your way over to where you saw Anushka, as you get close you spot her much further back in the library waving you on. You follow her to near the very back of the library, far away from where everyone else is. She gives you a grin that you are all too aware means she''s cooking up trouble. "<<$pcs_nickname>> lets have some fun."'
 		act 'What kind of fun?':
 			*clr & cla

locations/anushkaev1.qsrc

@@ -360,18 +360,18 @@ if $ARGS[0] = 'watch_nushrad':
 								act 'Leave apartment': gt 'pavComplex','start'
 								act 'Wait for him to leave':
 									*clr & cla
-									'<center><img src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+									'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
 									if hotcat >= 6:
 										'You only take a couple of steps from the door when it opens. You turn like you was just heading to the room. He gives you a knowing smirk. "Hey <<$pcs_nickname>>, next time why don''t you join us? I wouldn''t mind giving you the fucking of your life. I''m sure Nush wouldn''t mind, hell her ass could likely use a break, she finds me a bit to big, but what can a guy do." He asks rhetorically, with a laugh.'
 										act 'Say nothing':
 											*clr & cla
-											'<center><img src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+											'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
 											'Before you can think of a reply he walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
 											act 'Go in her room': gt 'anushapt','anushroom'
 										end
 										act 'He doesn''t have to be so rough':
 											*clr & cla
-											'<center><img src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+											'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
 											'"Well you could not be so rough with her." You tell him.'
 											'He snorts and shakes his head. "Please she is like all you bitches, she loves every moment of it. I could come back her later tonight, she would just roll over and spread those ass cheeks for me, and let me fuck her ass again. No matter how much she whines and cries about it she is always ready for another good ass fucking."'
 											*nl
@@ -382,13 +382,13 @@ if $ARGS[0] = 'watch_nushrad':
 										'You only take a couple of steps from the door when it opens. You turn like you was just heading to the room. He gives you a slight frown of disgust. "You know <<$pcs_nickname>> if you took better care of yourself, I might giving you the fucking of your life too. But I got standards, you know. Now Nush she is a fine peace of ass." He says indicating back towards her room.'
 										act 'Say nothing':
 											*clr & cla
-											'<center><img src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+											'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
 											'Before you can think of a reply he walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
 											act 'Go in her room': gt 'anushapt','anushroom'
 										end
 										act 'He doesn''t have to be so rough':
 											*clr & cla
-											'<center><img src="images/characters/pavlovsk/school/head/39.jpg"></center>'
+											'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
 											'"Well you don''t have to be so rough with her." You tell him.'
 											'He snorts and shakes his head. "Please she is like all you bitches, she loves every moment of it. I could come back her later tonight, she would just roll over and spread those ass cheeks for me, and let me fuck her ass again. No matter how much she whines and cries she is always ready for another good ass fucking." Then pauses a moment. "Well you will understand if you ever find a guy willing to fuck you at least." He says as if the meer thought of it disgusts him.'
 											*nl
@@ -464,7 +464,7 @@ if $ARGS[0] = 'watch_nushval':
 						act 'Leave apartment': gt 'pavComplex','start'
 						act 'Wait for him to leave':
 							*clr & cla
-							'<center><img src="images/characters/pavlovsk/school/head/43.jpg"></center>'
+							'<center><img src="images/pc/npc_headshots/big158.jpg"></center>'
 							'You only take a couple of steps from the door when it opens. You turn like you was just heading to the room. He looks a bit surprised to see you but he smiles. "Hey <<$pcs_nickname>>, Anushka is in her room if you are looking for her. I need to get going, got to go get this part for my bike." He explains as he walks past you. "See''ya around" And with that he walks towards the front door and out. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
 							act 'Go in her room': gt 'anushapt','anushroom'
 						end
@@ -527,7 +527,7 @@ if $ARGS[0] = 'watch_nushmar':
 						act 'Leave apartment': gt 'pavComplex','start'
 						act 'Wait for him to leave':
 							*clr & cla
-							'<center><img src="images/characters/pavlovsk/school/head/27.jpg"></center>'
+							'<center><img src="images/pc/npc_headshots/big146.jpg"></center>'
 							'You only take a couple of steps from the door when it opens. You turn like you was just heading to the room. He looks a bit surprised to see you and then blushes, obviously wondering if you heard. "Hey <<$pcs_nickname>>, I was just... I mean we was just..." He trails off obviously trying to think of a a reason other than the truth he is there.'
 							'You can''t help but smile, about him trying to save Anushka''s rep and blushing at the same time. "I know what you guys was doing, hope you two had fun." You say to him with a wink. Which makes him blush even more.'
 							'"Um yeah, uh we did... I need to go, see you at school <<$pcs_nickname>>." With that he hurries past you and out of the apartment. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'

locations/artemEv.qsrc

@@ -90,7 +90,7 @@ end
 
 if $ARGS[0] = 'learn':
 	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	'You spend an hour doing your homework together with Artem. He''s a very smart guy, and explains several things to you. At the end of the hour, you feel like you had a very productive homework session, and that you learned a lot from Artem''s tutoring.'
 	minut += 60
 	if artQW ! 5: npc_rel['A2'] += 10
@@ -221,7 +221,7 @@ if $ARGS[0] = 'learn':
 			end
 		elseif artemStripSee = 2 and artemsex = 0:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'When you finish your homework, you can see Artem think for a second. He then asks, with a blush on his cheeks: "Listen... I''ve thought about this for a long time. I want to touch you, down there. I have 500 <b>₽</b>, it''s my lunch money. Maybe you can help your sister with that?"'
 			'You smirk at him: "Are you sure? You''d be starving for a week!"'
 			'Artem is very serious, and gives you the money without any doubts.'
@@ -273,7 +273,7 @@ if $ARGS[0] = 'learn':
 			end
 		elseif artemStripSee = 3 and artemsex = 0 and artemTouch <= daystart:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'During a break in your study session, you have a chat with Artem. You end up talking about sex.'
 			artemStripSee = 4
 			if artemHorny = 1:
@@ -299,7 +299,7 @@ if $ARGS[0] = 'learn':
 			act 'Leave Artem''s apartment': gt 'artemhome','leave',5
 		elseif artemStripSee = 4 and artemAndPetja = 0:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'After you finish your homework, Artem suggests: "<<$pcs_nickname>>, I''ve been thinking. How about we meet up with a friend of mine next time after homework? He wants to touch you too... we will give you 500 <b>₽</b> each, so you get the 1000 <b>₽</b> you wanted."'
 			'You indignantly respond: "Artem! Are you out of your mind? I did those things with you in confidence, and you tell all your friends and invite them to a gangbang!?"'
 			'Artem quickly reponds: "No, nothing like group sex or anything! Let me explain."'
@@ -332,7 +332,7 @@ if $ARGS[0] = 'learn':
 			end
 		elseif artemAndPetja = 1:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'After class Artem leads you to the his parents'' garage. It''s not far from where you live.'
 			'As you walk, he explains: "My parents might walk in, at home. I figured we''d be safer in the garage, no one will bother us there. My friend is Petka Klyuyev by the way... he''s in our class. You remember him, right?"'
 			'When you enter the garage with Artem, you find Peter already waiting there. He looks at you eagerly, but you can tell he''s quite nervous.'
@@ -374,7 +374,7 @@ if $ARGS[0] = 'learn':
 
 					act 'Collect your money':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 						'As you get dressed again, Artem tells you: "Petka liked it. He would like to join us for your lessons more regularly. He''s willing to keep paying, and so am I. 1000 <b>₽</b> per session in total, just like today. We do want to see and do more, though. Your lessons should be more... interactive."'
 						'You see the greedy grin on his face, and realize: they want to fuck you. Together.'
 						'"I don''t know, Artem", you sigh. "I appreciate you helping me with my homework, and I could definitely use the money. But if word of this comes out... I''ll think about it, okay?"'
@@ -485,7 +485,7 @@ if $ARGS[0] = 'learn':
 
 			act 'Finish the lesson':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 				'The three of you sit down for a minute and catch your breath. You smile at them: "That was nice, boys. Next time we''ll be trying cunnilingus, do you know what that is?"'
 				'Artem''s nose wrinkles, and he says: "Eww! I don''t know <<$pcs_nickname>>, I don''t want to lick a pussy! That sounds disgusting!"'
 				'You look at him with disbelief... you''ve taken his cock in your mouth many times already, and he refuses to reciprocate? You sternly say: "You asked me to teach you about the female body, and that''s what I''m doing. If you find a nice girl some day, you''ll need to know how to satisfy her! You already know how to please a girl with your cock, but you also need to know how to do it with your tongue."'
@@ -541,7 +541,7 @@ if $ARGS[0] = 'learn':
 			end
 		elseif artemAndPetja = 13:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'When you finish your homework session with Artem, he takes you by the hand and guides you to his parents'' garage again. Peter is already waiting there, eager to get started.'
 			'Artem smiles shyly as he asks: "You know, <<$pcs_nickname>>... me and Petka have been wanting to fuck your ass. It would only make sense, as the next step in our anatomy class... what do you say?"'
 			'You laugh: "You both have assholes... why don''t you practise on each other, and I''ll just watch today?"'
@@ -797,7 +797,7 @@ if $ARGS[0] = 'kiss':
 					elseif artemsex >= 10 and artemanal = 0:
 						act 'Tell him you''re on your period':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 							'You smile at him a bit apologetically and say: "Sorry, Artem. I''d love to, but it''s that time of the month, you know? I bet I could still make you feel good with my mouth."'
 							'Artem blushes, but presses on and asks: "Maybe I can try your ass then? I heard it would feel really good, for both of us..."'
 							minut += 5
@@ -897,7 +897,7 @@ if $ARGS[0] = 'kiss':
 	if pav_slut >= 125 and artemblag = 0:
 		*clr & cla
 		menu_off = 1
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'Artem stops you when you try to kiss him: "I don''t think so <<$pcs_nickname>>, I''ve heard way too many stories about where that mouth has been. You can still use it on me, though..."'
 		'He lets those words linger in the air for a second, and then unbuttons his pants and pulls out his erect cock.'
 		act 'Suck him off': gt 'artemEv','bj'
@@ -1209,7 +1209,7 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	menu_off = 1
 	'<center><b><font color="maroon"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	if kotovLoveQW > 0 and artemVitokQW = 0:
 		'You walk across the school courtyard to meet up with Artem. He gives you a friendly nod as you approach, and asks: "You ready to go?"'
 		'Just when you leave the courtyard with Artem to go study at his house, you run into Vitek Kotov. He doesn''t look pleased.'

locations/artemEv3.qsrc

@@ -54,7 +54,7 @@ end
 if $ARGS[0] = 'home_start':
 	menu_off = 1
 	'<center><b><font color="maroon"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	*nl
 	'Well, it seems that this part of story is unfinished, I''ve no idea what should be here so I give you a chance to escape'
 	gs 'stat'

locations/artemev2.qsrc

@@ -3,12 +3,12 @@
 gs 'boyStat','A2'
 if artQW = 1:
 	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	'Out of nowhere, Artem suddenly produces a bouquet of flowers and offers it to you.'
 
 	act 'Accept the flowers':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'What a nice gesture! You smile at him and mutter: "Awww, they''re beautiful! You shouldn''t have!"'
 		'You move in and give him a kiss. When you reach out for him you accidentally run your hand over his groin, and feel quite the bulge down there.'
 		'Artem blushes when he tells you: "Not as beautiful as you..."'
@@ -18,7 +18,7 @@ if artQW = 1:
 
 		act 'Tell him to stop it':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'You push his hands away: "Wait... you''re going too fast, please stop!"'
 			'Artem does as you ask and pulls his hands back as he apologizes: "Sorry..."'
 			minut += 5
@@ -50,7 +50,7 @@ if artQW = 1:
 
 	act 'Reject the flowers':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'You look at Artem compassionately, but don''t take the flowers: "Thank you... they''re very nice, but we''re just friends... I don''t want to give you the wrong idea by accepting them, you know?"'
 		'Artem sighs, and disappointedly throws flowers into the trash.'
 		minut += 5
@@ -58,7 +58,7 @@ if artQW = 1:
 
 		act 'Run and pick them up from the trash':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'You try to stop him: "No! What are you doing, they''re so beautiful!"'
 			'You take the flowers from the trash and burst into tears. Artem kneels down next to you and hugs you: "I''m sorry, please don''t cry! I didn''t think you wanted them... I... you''re so..."'
 			'You don''t object when he kisses you. You kiss him back, and a few seconds later you feel his hands on your boobs.'
@@ -67,7 +67,7 @@ if artQW = 1:
 
 			act 'Push his hands away':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 				'You push his hands away: "Wait... you''re going too fast, please stop!"'
 				'Artem does as you ask and pulls his hands back while he apologizes: "Sorry..."'
 				minut += 5
@@ -100,7 +100,7 @@ if artQW = 1:
 
 		act 'Leave them in the trash and study':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'You quietly walk past him and say: "Come on, let''s study?"'
 			'You can tell he''s unhappy, and he mutters: "Fine..."'
 			'You really hurt his feelings.'
@@ -132,7 +132,7 @@ elseif artQW = 10:
 
 	act 'Tell him to stop it':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'You smile at him as you push his hands away: "Artem, wait! All in good time, okay? We''ll get there, just please... slow down a little."'
 		'Artem does as you ask and pulls his hands back as he apologizes: "Sorry..."'
 		'You finish the bottle of wine with Artem, and thank him for a nice time before you gather your things and leave.'

locations/artemhome.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = '':
 			'You go to Artem Chebotarev''s apartment and ring the door bell.'
 			'No one answers the door. Artem is probably not home.'
 		elseif hour >= 14 and hour < 20:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'You go to Artem Chebotarev''s apartment and ring the door bell.'
 			'Artem opens the door and invites you in: "Hi <<$pcs_nickname>>, come on in."'
 
@@ -28,7 +28,7 @@ if $ARGS[0] = '':
 		if hour < 10:
 			'It''s too early in the day to go visit Artem.'
 		elseif hour >= 10 and hour < 20:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'You go to Artem Chebotarev''s apartment and ring the door bell.'
 			'Artem opens the door and invites you in: "Hi <<$pcs_nickname>>, come on in."'
 
@@ -55,7 +55,7 @@ if $ARGS[0] = 'inside':
 
 	if ArtemBeInHome = 0:ArtemBeInHome = 1
 	'<center><b><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	
 	act 'Leave Artem''s apartment': gt 'artemhome','leave', 1
 	
@@ -132,7 +132,7 @@ if $ARGS[0] = 'inside':
 		act 'Chat with Artem':
 			*clr & cla
 			menu_off = 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'You talk with Artem for an hour, about various topics. Or rather: you''re doing most of the talking, and Artem is mostly listening to you talk. Occasionally he pitches in though, and you can tell he''s a very smart guy. You even learn a thing or two.'
 			artemtimes += 1
 			talkartemday = daystart
@@ -154,7 +154,7 @@ if $ARGS[0] = 'inside':
 			*clr & cla
 			menu_off = 1
 			dimaRevenge = 1
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 			'You''re not sure how to start this conversation, and take a deep breath. You carefully suggest: "Artem... we''re good friends, right?"'
 			'Artem nods, unsure why you look so distraught: "Of course! Why, what''s wrong?"'
 			'You continue: "And you''re good with computers? I could really use your help."'
@@ -166,7 +166,7 @@ if $ARGS[0] = 'inside':
 
 			act 'Lie to him':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 				'You lie to him: "I got very drunk in the disco, a few nights ago. He made a video of it and threatened to tell my <<$npc_nickname[''A29'']>>. My <<$npc_nickname[''A29'']>> would kill me!"'
 				'Artem nods: "Alright, I''ll see what I can do."'
 				minut += 5
@@ -181,7 +181,7 @@ if $ARGS[0] = 'inside':
 
 			act 'Tell him the truth':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 				'You have to gather some courage to tell him the truth, and remain silent for a second.'
 				'You stare at your feet, afraid to look him in the eye when you tell him: "I thought I loved him. He made a video of me giving him a blowjob... he''s blackmailing me with it now, forcing me to do all sorts of nasty things. Please, it would mean the world to me if you could make that video disappear.'
 				'Artem nods: "That sounds horrible! Okay, I''ll see what I can do."'
@@ -207,7 +207,7 @@ if $ARGS[0] = 'liar':
 	artQW = 5
 	npc_rel['A2'] = 0
 	'<center><b><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	'Artem looks away from you, with a blank stare in his eyes. He mutters: "You know... I watched that video you wanted me to delete from Dimka''s computer. I can''t believe it... I was willing to do anything for you. Anything!"'
 	'He continues: "Ever since I''ve seen that video... our relationship will be different. I saved a copy of it by the way, so I fucking own you now."'
 	'He looks at you, and his gaze hardens. You can see the hatred in his eyes. His voice remains surprisingly calm, as he orders you: "And now... get down on your fucking knees, bitch! You''re going to have to earn my silence, the hard way."'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'liar':
 
 			act 'Do what he wants':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 				'You hang your head in shame and nod. He grins at you and mocks: "What''s that, <<$pcs_nickname>>? I can''t hear you."'
 				'You softly say: "I''ll... I''ll be your bitch, Artem."'
 				'He smiles benevolently at you and says: "I knew you would. Now come with me."'

locations/artgar.qsrc

@@ -353,7 +353,7 @@ elseif apmeet = 4:
 	minut += 30
 	sub += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	'When you leave school, Artem is waiting for you by the entrance like he said he would. Without saying a word, he takes you by the hand and guides you to his parents'' garage. Peter said he would be a bit late this week, so you take your time walking there. While you walk, you ask Artem: "Did you ask Petka about my suggestion for this week?"'
 	'Artem nods: "Oh yea. He was delighted... and a bit surprised you would suggest that. What''s the matter, <<$pcs_nickname>>... are our regular sessions too boring for you now?"'
 	'You smile mysteriously at him, happy to just let him think that for now. You fake being embarrassed and say: "Well... yea. Just know that I want you guys to really get into it, okay? I will resist and fight you off. The fantasy kinda falls apart if I just do what you guys tell me to."'

locations/bed2.qsrc

@@ -5,6 +5,7 @@ if $ARGS[0] = '':
 	$menu_loc = 'bed2'
 	$menu_arg = ''
 	menu_off = 0
+	$alarmloc = 'bed2'
 	gs 'stat'
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/shared/home/bed.jpg"></center>'
@@ -14,22 +15,55 @@ if $ARGS[0] = '':
 	*nl
 
 	if budilnikOn = 0:
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''bed2''">off</a>.'
 	else
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''bed2''">on</a>.'
 	end
+	*nl
+
+	if bedPanty = 0:
+		'Will you wear your underwear to bed? Currently - <a href="exec:bedPanty = 1 & gs ''stat'' & & gt ''bed2''">as is</a>.'
+	elseif bedPanty = 1:
+		'Will you wear your underwear to bed? Currently - <a href="exec:bedPanty = 2 & gs ''stat'' & gt ''bed2''">yes</a>.'
+	elseif bedPanty = 2:
+		'Will you wear your underwear to bed? Currently - <a href="exec:bedPanty = 0 & gs ''stat'' & gt ''bed2''">no</a>.'
+	end
+	*nl
 
-	if pcs_makeup ! 1:'<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
+	if analplug = 1:
+		if bedAnal = 0:
+			'Should you remove your anal plug before bed? Currently - <a href="exec:bedAnal = 1 & gs ''stat'' & gt ''bed2''">no</a>.'
+		elseif bedAnal = 1:
+			'Should you remove your anal plug before bed? Currently - <a href="exec:bedAnal = 0 & gs ''stat'' & gt ''bed2''">yes</a>.'
+		end
+	end
+
+	if vibrator = 1 and cheatVib = 1:
+		if bedVibrator = 0:
+			'Should you remove your vibrator before bed? Currently - <a href="exec:bedVibrator = 1 & gs ''stat'' & gt ''bed2''">no</a>.'
+		elseif bedVibrator = 1:
+			'Should you remove your vibrator before bed? Currently - <a href="exec:bedVibrator = 0 & gs ''stat'' & gt ''bed2''">yes</a>.'
+		end
+	end
+
+	if pcs_makeup ! 1:*nl '<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
 
 	if pcs_sleep <= 80:
 		if $clothingworntype = 'nude':
-			$sleep_txt = 'Go to sleep'
+			$sleep_txt = 'Go to bed'
 		else
-			$sleep_txt = 'Undress and go to sleep'
+			$sleep_txt = 'Undress and go to bed'
 		end
 		if succubusQW = 2:
 			act '<<$sleep_txt>>':
 				menu_off = 1
+				if bedPanty = 2:
+					gs 'underwear', 'remove'
+				elseif bedPanty = 1:
+					gs 'underwear', 'wear'
+				end
+				if analplugIN = 1 and bedAnal = 1:analplugIN = 0
+				if vibratorIN = 1 and bedVibrator = 1: vibratorIN = 0
 				if $clothingworntype ! 'nude':
 					strip_here = 1
 					gs 'clothing', 'strip'
@@ -39,6 +73,13 @@ if $ARGS[0] = '':
 		else
 			act '<<$sleep_txt>>':
 				menu_off = 1
+				if bedPanty = 2:
+					gs 'underwear', 'remove'
+				elseif bedPanty = 1:
+					gs 'underwear', 'wear'
+				end
+				if analplugIN = 1 and bedAnal = 1:analplugIN = 0
+				if vibratorIN = 1 and bedVibrator = 1: vibratorIN = 0
 				if disable_autosave = 0:
 					if StoryLine = 0:
 						savegame 'autosave.sav'
@@ -109,12 +150,12 @@ if $ARGS[0] = '':
 				gt 'selfplay', 'start'
 			end
 		end
-	end	
-	act 'Sleep options':gt 'bed2', 'options'
+	end
 end
 
 if $ARGS[0] = 'sleep':
 	cls
+	*clr & cla
 	menu_off = 1
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/shared/home/bed.jpg"></center>'
@@ -122,6 +163,12 @@ if $ARGS[0] = 'sleep':
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
 	end
 	gs 'stat'
+	*nl
+	if budilnikOn = 1:
+		'You run through your regular nightly routine, seting your alarm for '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+', you undress, and prepare for sleep:'
+	else
+		'You run through your regular nightly routine, not bothering to setting your alarm, you undress, and prepare for sleep:'
+	end
 	pcs_hairbsh = 0
 	InSleep = 1
 	cloth_vid = 0
@@ -131,7 +178,7 @@ if $ARGS[0] = 'sleep':
 	else
 		notathomesleep = 0
 	end
-	
+
 	if $loc = 'nichBedroomServant':
 		gs 'nichBedroomServant', 'sleepEvents'
 	end
@@ -139,22 +186,91 @@ if $ARGS[0] = 'sleep':
 	if succubusflag = 1 and sucwalkday <= daystart:
 		If succublvl <= rand(1,20) or pcs_willpwr < ((succublvl * willpowermax) / 10) or sucpowzeroed >= 3: gs 'succubus', 'sucwalkinginit'
 	end
+	if analplug = 1 and vibrator = 1:
+		if bedAnal = 1 and bedVibrator = 1:
+			*nl
+			'You remove your butt plug and your vibrator.'
+		elseif bedAnal = 0 and bedVibrator = 0:
+			*nl
+			'You decide to leave your butt plug and vibrator in.'
+		end
+	elseif analplug = 1 or vibrator = 1:
+		if analplug = 1:
+			if bedAnal = 1:
+				*nl
+				'You remove your butt plug.'
+			elseif bedAnal = 0:
+				*nl
+				'You decide to leave your butt plug in.'
+			end
+		end
+		if vibrator = 1:
+			if bedVibrator = 1:
+				*nl
+				'You remove your vibrator.'
+			elseif bedVibrator = 0:
+				*nl
+				'You decide to leave your vibrator in.'
+			end
+		end
+	end
+	if bedPanty = 1 and $pantyworntype = 'none' and $braworntype = 'none':
+		*nl
+		'You put on your bra and panties.'
+	elseif bedPanty = 1 and $pantyworntype ! 'none' and $braworntype = 'none':
+		*nl
+		'You put on your bra.'
+	elseif bedPanty = 1 and $pantyworntype ! 'none' and $braworntype ! 'none':
+		*nl
+		'You put on your panties.'
+	elseif bedPanty = 1:
+		*nl
+		'You change your bra and panties.'
+	elseif bedPanty = 2:
+		*nl
+		'You remove your bra and panties.'
+	else
+		*nl
+		'You were too tired to worry about your underwear, so for tonight you left it as is.'
+	end
+	if hscrunchw = 1:
+		*nl
+		'<<$hscrunch>>.'
+	elseif hscrunchw = 2:
+		*nl
+		'<<$hpigtail>>'
+	elseif hpingripw > 0:
+		*nl
+		'<<$hpingrip>>'
+	elseif hbraids > 0:
+		*nl
+		'<<$hbraids>>'
+	else
+		*nl
+		'Your hair is loose and free.'
+	end
+	if pcs_makeup > 1:
+		pcs_makeup = 0
+		vidageday -= 1
+		*nl
+		'You went to bed wearing your makeup, which will smear your face as you sleep; your skin will age faster from this!'
+	end
+	if fat > 5 and stringimplant = 1: silicone += 1 & fat -= 5
+	act 'Sleep...': gt 'bed2', 'dream'
+end
 
-	if analplugIN = 1 and bedanal = 0:analplugIN = 0 & 'Before going to bed you remove your butt plug.'
-	if vibratorIN = 1 and bedvibrator = 0:vibratorIN = 0 & 'Before going to bed you remove your vibrator'
-	if pcs_makeup > 1:pcs_makeup = 0 & vidageday -= 1 & 'Makeup smears your face, you think that it looks bad sleeping in makeup, and your skin will age faster from this.'
-	if fat > 5 and stringimplant = 1:silicone += 1 & fat -= 5
-
-	wait 450
-	*clr
+if $ARGS[0] = 'dream':
+	*clr & cla
 	gs 'dreams', 'start'
+	*nl
+	'<<$waketext>>'
 
 	:loopson
 	minut += 1
 	stime += 1
 	if recuperation = 0:pcs_health += 5
 
-	if vibratorIn = 1:
+	if vibratorIN = 1:
 		vtime += 1
 		if vtime >= 5:
 			pcs_horny +=1
@@ -171,9 +287,8 @@ if $ARGS[0] = 'sleep':
 			'You abruptly wake up in the throes of an orgasm. As you recover, you check the time, <<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>>.'
 
 			act 'Go back to sleep':
-				*clr
-				cla
-				gt 'bed2', 'sleep'
+				*clr & cla
+				gt 'bed2', 'dream'
 			end
 
 			act 'Give up trying to sleep':
@@ -248,7 +363,7 @@ if $ARGS[0] = 'wake_horny':
 	act 'Try and go back to sleep':
 		pcs_mood -= 10
 		pcs_sleep -= 5
-		gt 'bed2', 'sleep'
+		gt 'bed2', 'dream'
 	end
 
 	act 'Masturbate': InSleep = 0 & gt 'selfplay', 'start'
@@ -278,7 +393,6 @@ end
 
 if $ARGS[0] = 'wake':
 	menu_off = 1
-	'<<$waketext>>'
 	InSleep = 1
 	gs 'stat'
 
@@ -364,7 +478,7 @@ if $ARGS[0] = 'extra':
 		minut = (100-pcs_sleep)*6
 		pcs_sleep += 100
 		gs 'stat'
-		gt 'bed2', 'sleep'
+		gt 'bed2', 'dream'
 	end
 end
 
@@ -373,13 +487,6 @@ if $ARGS[0] = 'end':
 	InSleep = 0
 	slept_in = 0
 	strip_here = 0
-	if $braworntype ! 'none': gs 'bras', 'remove'
-	if $pantyworntype ! 'none':gs 'panties', 'remove'
-	if bedpanty = 1:
-		gs 'underwear', 'remove'
-	else
-		gs 'underwear', 'wear'
-	end
 	if fullmorrout = 1 and $loc = 'bedrPar':
 		gt 'vanrPar'
 	elseif fullmorrout = 1 and $loc = 'bedr':
@@ -547,35 +654,7 @@ if $ARGS[0] = 'magbstchoice':
 		killvar 'mgf2bnocnt'
 		gt 'bed2', 'sleep'
 	end
-	act 'Eh, I don''t like them like that.': magf2bdo = 0 & mgf2bnocnt += 1 & gt 'bed2', 'sleep'
-end
-
-if $ARGS[0] = 'options':
-	cla
-	menu_off = 1
-	
-	act 'Return':gt 'bed2'
-	act 'Set Alarm Clock':gt 'budilnik', 'start'
-	if bedPanty = 0:
-		act 'Wear underwear in the morning: Currently (ON)':bedpanty = 1 & gt 'bed2', 'options'
-	else
-		act 'Wear underwear in the morning: Currently (OFF)':bedpanty = 0 & gt 'bed2', 'options'
-	end
-	if analplug = 1:
-		if bedanal = 0:
-			act 'Remove your analplug at night: Currently (ON)':bedanal = 1 & gt 'bed2', 'options'
-		else
-			act 'Remove your analplug at night: Currently (OFF)':bedanal = 0 & gt 'bed2', 'options'
-		end
-	end
-
-	if vibrator = 1 and cheatVib = 1:
-		if bedvibrator = 0:
-			act 'Remove your vibrator at night: Currently (ON)':bedvibrator = 1 & gt 'bed2', 'options'
-		else
-			act 'Remove your vibrator at night: Currently (OFF)':bedvibrator = 0 & gt 'bed2', 'options'
-		end
-	end
+	act 'Eh, I don''t like them like that.': magf2bdo = 0 & mgf2bnocnt += 1 & gt 'bed2', 'dream'
 end
 
 --- bed2 ---------------------------------

locations/bedrPar.qsrc

@@ -95,6 +95,7 @@ if popugai2 = 1:
 
 	*nl
 end
+'<table><tr><td>'
 if budilnikOn = 0:
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
 else
@@ -119,7 +120,7 @@ if komp = 1:'Your <a href="exec:gorodokKomp = 1 & gt ''Komp'',''start''">laptop<
 gorodokKomp = 0
 
 gad = 0
-gs 'subkid'
+
 if npc_QW['A33'] > 10:npc_QW['A33'] = 10
 
 gs'dinsister'
@@ -224,6 +225,10 @@ elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inbition > 30:
 end
 gs 'lact_bp', 'massage'
 
+'</td><td width = "100"></td><td>'
+gs 'subkid'
+'</td></tr></table>'
+
 act 'Relax on your bed': gt 'bed', 'start'
 
 if $ARGS[0] = 'intro':

locations/beverage.qsrc

@@ -182,7 +182,7 @@ if $ARGS[0] = 'bev_tea':
 end
 
 if $ARGS[0] = 'bev_vod':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])
@@ -205,7 +205,7 @@ if $ARGS[0] = 'bev_vod':
 end
 
 if $ARGS[0] = 'bev_bla':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		pcs_mood += 10
@@ -228,7 +228,7 @@ if $ARGS[0] = 'bev_bla':
 end
 
 if $ARGS[0] = 'bev_sco':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])
@@ -251,7 +251,7 @@ if $ARGS[0] = 'bev_sco':
 end
 
 if $ARGS[0] = 'bev_win':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])
@@ -274,7 +274,7 @@ if $ARGS[0] = 'bev_win':
 end
 
 if $ARGS[0] = 'bev_mar':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])
@@ -298,7 +298,7 @@ if $ARGS[0] = 'bev_mar':
 end
 
 if $ARGS[0] = 'bev_cha':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])
@@ -321,7 +321,7 @@ if $ARGS[0] = 'bev_cha':
 end
 
 if $ARGS[0] = 'bev_bee':
-	if pcs_health > 50:
+	if pcs_health > 20:
 		*clr & cla
 		minut += 15
 		money -= val($_drink['<<args[1]>>,price'])

locations/body.qsrc

@@ -786,7 +786,7 @@ if hscrunchw <= 0:
 	$pcdesc_hairobject = 'hair'
 	$pcdesc_hairobjectwordy = 'loose and free <<$pcs_haircol>> hair'
 elseif hscrunchw = 1:
-	$hscrunch = ' A hair-tie holds your hair in place with a ponytail.'
+	$hscrunch = 'A hair-tie holds your hair in place with a ponytail.'
 	$hpigtail = ''
 	rand_hairstyle = rand(0)
 	rand_hairobject = rand(0)
@@ -798,7 +798,7 @@ elseif hscrunchw = 1:
 else
 	!! The actual, specific setting for hscrunchw when pigtails are desired is 2, but it is better to have a catch-all. Adjust the else above into an elseif set for 2 if more styles involving scrunchies are added.
 	$hscrunch = ''
-	$hpigtail = ' Two scrunchies hold your hair up into two cute, playful twin tails.'
+	$hpigtail = 'Two scrunchies hold your hair up into two cute, playful twin tails.'
 	rand_hairstyle = rand(0)
 	rand_hairobject = rand(0)
 	if rand_hairstyle = 0:$pcdesc_hairstylerandom = 'pigtailed'
@@ -818,7 +818,7 @@ if hpingripw <= 0:
 	$pcdesc_hairobject = 'hair'
 	$pcdesc_hairobjectwordy = 'loose and free <<$pcs_haircol>> hair'
 else
-	$hpingrip = ' Hair-pins hold your hair in place in a stylish updo.'
+	$hpingrip = 'Hair-pins hold your hair in place in a stylish updo.'
 	rand_hairstyle = rand(0,1)
 	rand_hairobject = rand(0)
 	if rand_hairstyle = 0:$pcdesc_hairstylerandom = 'upswept'
@@ -839,7 +839,7 @@ if hbraids <= 0:
 	$pcdesc_hairobject = 'hair'
 	$pcdesc_hairobjectwordy = 'loose and free <<$pcs_haircol>> hair'
 else	
-	$hbraids = ' Your hair is beautifully braided.'
+	$hbraids = 'Your hair is beautifully braided.'
 	rand_hairstyle = rand(0,1)
 	rand_hairobject = rand(0,1)
 	if rand_hairstyle = 0:$pcdesc_hairstylerandom = 'braided'

locations/brothel.qsrc

@@ -42,15 +42,10 @@ if dbg = 1:
 	'caneFeetCount '+caneFeetCount
 end
 
-if orgasmMeter > 100:
-	orgasmMeter = 100
-end
-
-if rageMeter > 100:
-	rageMeter = 100
-end
+if orgasmMeter > 100: orgasmMeter = 100
+if rageMeter > 100: rageMeter = 100
 
-payRate = 2000
+payRate = 1000
 
 if $ARGS[0] = 'lobby':
 	$menu_loc = 'brothel'
@@ -67,7 +62,7 @@ if $ARGS[0] = 'lobby':
 	'Alongside the windows are tables, each for about four to six people.'
 	nroad = 20
 	act 'Leave the hotel':gt 'road'
-	act 'Visit the Hotel bar': gt 'brothel', 'bar'
+	act 'Visit the hotel bar': gt 'brothel', 'bar'
 	act 'Visit the bathroom': gt 'brothel', 'lobby:toilet'
 end
 
@@ -141,7 +136,7 @@ if $ARGS[0] = 'bar:sit':
 	*nl
 	minut += 15
 	gs 'stat'
-	if alko > 6 and abdCh <= prob_abdCh and hotelWhore = 0:
+	if alko >= 6 and abdCh <= prob_abdCh and hotelWhore = 0:
 		'You take a seat behind the bar, looking around at the few guests sitting around the dining room.'
 		'You are too drunk to sit up straight, instead, you rest your head on the bar, mumbling incoherently'
 		'The barman was obviously waiting for this moment.'
@@ -175,7 +170,7 @@ if $ARGS[0] = 'bar:order':
 	*nl
 	'You signal to the barman that you want something.'
 	'"What would you like miss?"'
-	if alko > 6 and abdCh <= prob_abdCh and hotelWhore = 0:
+	if alko >= 6 and abdCh <= prob_abdCh and hotelWhore = 0:
 		*nl
 		'You try to order another drink, but as you faint all that gets out of your mouth is some drunken babble..'
 		'The barman was obviously waiting for this moment.'
@@ -183,9 +178,6 @@ if $ARGS[0] = 'bar:order':
 		'On the way you briefly regain consciousness from time to time, realizing that you are carried somewhere upstairs to what seems as one of the hotel rooms.'
 		act 'Continue':gt 'brothel', 'abducted'
 	else
-		! if hotelWhore = 1:
-			! act 'Order a Blue-blooded Russian.':gt 'brothel','bar:order:password'
-		! end
 		act 'Cancel order':gt 'brothel', 'bar'
 		act 'Order from the menu (0:05)': gs 'food_menu'
 	end
@@ -467,11 +459,11 @@ if $ARGS[0] = 'brothel:getPaid':
 	menu_off = 1
 	hours = custTime / 60
 	pay = custTime * payRate / 60
-	money += pay / 2
+	money += pay
 	gs 'stat'
 	'<h3>Brothel Reception</h3>'
 	'The Receptionist checks something in his book. Probably counting the time you spent working.'
-	'He looks up, smiles at you and says <font color=#<<$rec_font>>>"So <<$pcs_firstname>> you have whored for <<custTime>> minutes, that makes <<pay>> RUB."</font>'
+	'He looks up, smiles at you and says <font color=#<<$rec_font>>>"So <<$pcs_firstname>> you have whored for <<custTime>> minutes, that makes <<pay>> <b>₽</b>."</font>'
 	custTime = 0
 	act 'Thank him and leave': gt 'brothel', 'brothel:reception'
 end
@@ -531,7 +523,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	' 3) The Slave will not be injured in such way that requires hospitalisation or leaves a lasting injury, unless the Slave agrees to such practice voluntarily.'
 	' 4) Each session is for safety purposes recorded on a camera. The record is ownership of the Organization.'
 	' 5) The Master can hide his/her identity by wearing a mask.'
-	' 6) The Slave earns a pay of '+payRate+' RUB for every started hour of a session. The house takes 50% for expenses.'
+	' 6) The Slave earns a pay of '+payRate+' <b>₽</b> for every started hour of a session.'
 	*nl
 	'To begin your work, clean yourself, put on at least vibrant makeup, lip balm, brush your hair and strip of all clothes, then go to the lobby and lock yourself in a cage.'
 	*nl

locations/brother_voyeur.qsrc

@@ -2737,11 +2737,10 @@ if $ARGS[0] = 'shave':
 	if pcs_pubes < 4 or pcs_leghair < 4:gt'brother_voyeur','dryoff'
 	cla & *clr
 	if brothershowerlook = 1:
-		if pcs_leghair > 0 or pcs_pubes > 0:
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk4.jpg"></center>'
 		'	You''re rinsing off when you notice Kolka staring at your legs and what''s between them.'
 		'	"Excuse me?" you ask him pointedly. "Can I help you with something?"'
-		elseif pcs_pubes < 11 and pcs_leghair > 3:
+		if pcs_pubes < 11 and pcs_leghair > 3:
 			'	His lips twisted in thought, he says, "You''re looking kind of stubbly down there." You follow his gaze to Continue and pussy. "Aren''t you going to shave?"'
 		elseif pcs_pubes >= 11 and pcs_pubes < 21 and pcs_leghair > 3:
 			'	His lips twisted in thought, he says, "You''re growing a bit of a bush down there." You follow his gaze to look at your <<$pcdesc_legs>> legs and your trimmed pussy hair. "Looks like your legs are growing grass to match. Aren''t you going to shave?"'

locations/casino.qsrc

@@ -1028,11 +1028,11 @@ if $ARGS[0] = 'blackjack_view':
 		end
 		i += 1
 		if dealerHand[i] ! 0: jump 'loop7'
-		:loop2
+		:loop8
 		if dealerPoints > 21 and numAces > 0:
 			dealerPoints -= 10
 			numAces -= 1
-			jump 'loop2'
+			jump 'loop8'
 		end
 		if dealerPoints > 21:
 			*p '<br>BUST!'
@@ -1045,12 +1045,12 @@ if $ARGS[0] = 'blackjack_view':
 
 	*pl '<br><br><u>Player</u>'
 	i = 0
-	:loop3
+	:loop9
 	numAces = 0
 	playerPoints[i] = 0
 	if numHands > 1: *pl 'Hand #<<i + 1>>:'
 	j = 0
-	:loop4
+	:loop10
 	if playerHand[i * 16 + j] ! 0:
 		*p '<img <<$set_imgh>> src="<<$deckImg[playerHand[i * 16 + j]]>>">'
 		if deckFace[playerHand[i * 16 + j]] = 1:
@@ -1062,13 +1062,13 @@ if $ARGS[0] = 'blackjack_view':
 			playerPoints[i] += deckFace[playerHand[i * 16 + j]]
 		end
 		j += 1
-		jump 'loop4'
+		jump 'loop10'
 	end
-	:loop8
+	:loop11
 	if playerPoints[i] > 21 and numAces > 0:
 		playerPoints[i] -= 10
 		numAces -= 1
-		jump 'loop8'
+		jump 'loop11'
 	end
 	if playerPoints[i] > 21:
 		*p '<br>BUST!'
@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'blackjack_view':
 	end
 	*p ' Bet = <<playerBets[i]>> <b>₽</b><br><br>'
 	i += 1
-	if i < numHands: jump 'loop3'
+	if i < numHands: jump 'loop9'
 	*pl '</td><td valign="top"><div align="right"><img <<$set_imgh>> src="images/locations/city/industrial/casino/cartbd.jpg"></div></td></tr></table>'
 end
 

locations/dimaEv.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'after_school':
 	if dimarudorient = 1: gt 'dimaHome', 'dimkaroom'
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	'Dimka seeing you, walks up and says quietly, "Come here slut, we''re going to go have some fun at my place." Your cheeks redden at the gross nickname'
 !!can me make the above have a 1 in 5 chance of trigging even if the player doesn''t click Dimka''s name after school?
 	if fedorKozlovQW >= 10 and dimaFilm = 1 and FedorvsDimka = 1 or fedorKozlovQW = -15 and dimaFilm = 1 and FedorvsDimka = 1:
@@ -30,7 +30,7 @@ if $ARGS[0] = 'after_school':
 			minut += 5
 			gs 'stat'
 			'<center><b><h4><font color="maroon"><<"Dimka Nosov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 			'You say to Dimka "I have no interest in being with you." Dimka with a malicious grin on his face, turns to the Fedor and says, "Fedor, why are you dating this cocksucker anyways? The only reason I spend time with her is because she sucks my cock whenever I want her to do." Fedor scowls and clenches his fists, "Are you looking for an ass kicking? You better explain yourself quickly." Your heart jumps a beat fearing what can happen next'
 			*nl
 			if dimaFilm = 1:
@@ -82,7 +82,7 @@ if $ARGS[0] = 'drugged':
 	gs 'drugs', 'cocaine'
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	'You take several sips as you talk with Dimka. Again he doesn''t seem to want to chat, and appears to be waiting for something. After a while you start to feel funny. For a moment you just feel numb, then you feel yourself get aroused. The heat coming from your pussy intensifying as it soaks itself. You gasp. It is almost too much to take. You desperately need someone to fuck you. "Oh, fuck". You don''t think this is normal. He must have laced it with something. You blink a few times trying to clear your head, but soon your thoughts grow murky.'
 	act 'Continue': gt 'dimaEv', 'firstvisitsex'
 end
@@ -287,7 +287,7 @@ if $ARGS[0] = 'blackmail':
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	if dimkawarn = 1:
 		*clr & cla
 		minut += 5
@@ -578,7 +578,7 @@ end
 if $ARGS[0] = 'dimkaabuse10':
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	'Dimka closed the door to his room and turned to you, "Take off your clothes."'
 	'He smirks indifferently as he examines your body, then goes to the closet and rummages around in it before taking something out. He walks up to you and turns you around roughly, pulling your hands behind your back. You hear the click of handcuffs locking and you feel the cold steel on your wrists. He walks up to you and pushes a ring into your mouth before buckling the attached straps behind your head, holding it firmly in place.'
 	act 'Further':
@@ -614,7 +614,7 @@ if $ARGS[0] = 'Dimka_warning':
 		dimkawarn += 1
 		minut += 5
 		gs 'stat'
-	   '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/7.jpg"></center>'
+	   '<center><img <<$set_imgh>> src="images/pc/npc_headshots/big7.jpg"></center>'
 	   'There is a knock at your door. You open the door and are shocked to see Lesco Tsarev.'
 	   '"What do you want?" you ask rather more sharply than you intended.'
 	   '"I was told to bring this to you." Lesco replies, never taking his gaze off your chest and he hands you an envelope.'

locations/dimaRevenge.qsrc

@@ -71,9 +71,9 @@ if ARGS[0] = 3:
 					dimaRevChoice = 1
 					'Dimka isn''t the only one who can spread rumors. You head into the hallway and get to work.
 					You talk to many people, but you can tell most of them don''t believe you. This is harder than you thought. You need a master of gossip.'
-					act 'enlist Lizaveta':
+					act 'Enlist Lizaveta':
 						*clr & cla
-						'<center><img src="images/characters/pavlovsk/school/head/31.jpg"></center>'
+						'<center><img src="images/pc/npc_headshots/big140.jpg"></center>'
 						'Lizaveta is the one to go to for all things gossip. You find her standing by a classroom door, looking inside. She is startled when you greet her. "Oh, you scared me, <<$pcs_nickname>>."'
 						'"What are you doing," you ask her, "what are you looking at in there?"'
 						'"Nothing," she answers unconvincingly.'
@@ -156,7 +156,7 @@ if ARGS[0] = 3:
 						act 'Talk to Gerasim':
 							*clr & cla
 							'<center><b><font color="maroon">Classroom</font></b></center>'
-							'<center><img src="images/characters/pavlovsk/school/head/37.jpg"></center>'
+							'<center><img src="images/pc/npc_headshots/big153.jpg"></center>'
 							'After class you sit next to Gerasim and try to convince him to hack Dimka''s computer. "I wish I could help, <<$pcs_nickname>>, but that isn''t really something I know how to do. Have you tried asking Artem?"'
 							'"I really don''t want to involve him in this," you reply.'
 							'"Well he would be the one to go to for this kind of thing, but I guess you have a good reason for not telling him. I won''t pry."'
@@ -170,7 +170,7 @@ if ARGS[0] = 3:
 								act 'Talk to Feofan':
 									*clr & cla
 									'<center><b><font color="maroon">School Hallway</font></b></center>'
-									'<center><img src="images/characters/pavlovsk/school/head/36.jpg"></center>'
+									'<center><img src="images/pc/npc_headshots/big152.jpg"></center>'
 									'"She turn you down again?" you ask him. "How many times is that?"'
 									'"Who''s keeping count?" he answers. "I don''t let that keep me down. I can always try again or ask out other girls. Speaking of which... What are you doing later?"'
 									'Any other time and you might consider it, but right now you can''t think about that kind of thing. "I can''t right now, sorry. I actually came to ask for your help. I need you to hack someone''s computer. Can you do that?"'
@@ -181,7 +181,7 @@ if ARGS[0] = 3:
 									act 'Look for Zinaida':
 										*clr & cla
 										'<center><b><font color="maroon">School Hallway</font></b></center>'
-										'<center><img src="images/characters/pavlovsk/school/head/38.jpg"></center>'
+										'<center><img src="images/pc/npc_headshots/big142.jpg"></center>'
 										'You catch up to Zinaida as she leaves the school building. She''s glued to her phone as always. You tap her on the shoulder and say, "Hey, Zinaida. You''re looking nice today."'
 										'Without looking away from her screen she says, "You''re lying, trying to be nice to me, so you must want something out of me, so what do you want, <<$pcs_nickname>>?"'
 										'"Oh...well...uh I think you should go out with Feofan."'
@@ -202,7 +202,7 @@ if ARGS[0] = 3:
 											'"What are you doing in here, pig?"'
 											act 'Face the door':
 												*clr & cla
-												'<center><img src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+												'<center><img src="images/pc/npc_headshots/big1.jpg"></center>'
 												'You turn to face the door and see Dimka staring at you. "What are you up to, <<$pcs_nickname>>?" he asks you as he slowly walks towards you.'
 												'"None of your business," you tell him trying to sound tough.'
 												'"Really because it looks like you were doing something back there. Something you shouldn''t be doing." He''s getting closer now and you start to back away from him as he continues talking.'
@@ -352,14 +352,14 @@ if ARGS[0] = 3:
 					Moments later a teacher is pulling you away by the arm and sending you to the principals office.'
 					act 'Face the music':
 						*clr & cla
-						'<center><img src="images/characters/pavlovsk/school/head/50.jpg"></center>'
+						'<center><img src="images/pc/npc_headshots/big134.jpg"></center>'
 						'Miss. Volkov looks at you. "Hitting girls is not an appropriate behaviour miss <<$pcs_lastname>> it''s better you think on what you have done"'
 						!!sent to principal''s office and earn 20 demerits. Once you leave it goes to this scene below.
 						demerit += 20
 						act 'Oh no! It''s Petia':
 							*clr & cla
 							'<center><b><font color="maroon">School Hall</font></b></center>'
-							'<center><img src="images/characters/pavlovsk/school/head/47.jpg"></center>'
+							'<center><img src="images/pc/npc_headshots/big159.jpg"></center>'
 							'As you leave the principals office you are thinking what you might be able to do about your situation. You are distracted from your angry thoughts by an awful smell.'
 							'"Hey there, <<$pcs_nickname>>," he says while looking at your breasts, "You''re looking nice today."'
 							'Uggh. He just creeps you out so much. "It''s <<$pcs_firstname>>," you tell him, not even trying to hide the contempt in your voice, "or better yet, don''t talk to me at all.
@@ -406,7 +406,7 @@ if ARGS[0] = 3:
 					npc_rel['A2'] += 5
 					dimaRevChoice = 6
 					'<center><b><font color="maroon">School Hallway</font></b></center>'
-					'<center><img src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+					'<center><img src="images/pc/npc_headshots/big2.jpg"></center>'
 					'You decide to talk to Artem. You have a few minutes left during your break and you really need someone to talk to right now. You talk to Artem about Dimka.
 					"It might be my fault," he says with a hint of guilt after listening to you. "Thinking about that video made me so mad so I erased his whole hardrive instead of just releasing a virus and corrupting the video."'
 					'You are upset to hear this, but you remember how understanding he was when you went to him for help before and can''t be too mad at him now. Before you can say anything, he says, "I''ll fix this, <<$pcs_nickname>>."
@@ -521,7 +521,7 @@ if dimaRevChoice = 1:
 		'"I heard <<$pcs_firstname>> gave Lesco a blowjob just because he told her she''s pretty. She is so self conscious that she''ll have sex with anyone if they tell her she''s pretty." You turn red. None of that is true! Not a bit! So that''s how it''s going to be. You change your mind and go for Lizaveta.'
 		act 'Find Lizaveta':
 			*clr & cla
-			'<center><img src="images/characters/pavlovsk/school/head/31.jpg"></center>'
+			'<center><img src="images/pc/npc_headshots/big140.jpg"></center>'
 			'You head back into the school building to look for Lizaveta. You see her talking to Dimka, probably about some sort of secret he has about you. He leaves her and walks toward the school entrance you just came through. "Hey pig," he says mockingly.'
 			'"Kill yourself," you reply. You don''t have the patience to deal with him right now. He laughs as he leaves the school. You talk to Lizaveta about some more secrets you have about Dimka, making sure to be real creative about what you tell her. You also make sure that she knows Dimka is lying about everything he says.
 			She listens with great interest. She doesn''t seem to suspect that most of what you are telling her is an outright lie. When you are satisfied, you head home.'
@@ -572,7 +572,7 @@ if dimaRevChoice = 1:
 			'Soon the two of you get into an argument, which turns into a screaming match. You are both screaming at the top of your lungs when the principal comes to break things up. "Miss <<$pcs_lastname>>, Mr Nosov, in my office now!"'
 			act 'Go to the principal''s office':
 				*clr & cla
-				'<center><img src="images/characters/pavlovsk/school/head/50.jpg"></center>'
+				'<center><img src="images/pc/npc_headshots/big134.jpg"></center>'
 				'You and Dimka sit as Miss. Volkov scolds you. "I don''t know why you two were arguing about and I don''t care. I won''t have it in my school, do you understand?" She gives you both a stern look. "Now I want you to look me in the eye and tell me this won''t happen again."'
 				'You look her in the eye. "I''m sorry," you say.'
 				'"Very good," she says. "Dimka?"'
@@ -717,7 +717,7 @@ if dimaRevChoice = 3:
 		pav_sex += 60
 		npc_rel['A152'] += 10
 		'<center><b><font color="maroon">Cafeteria</font></b></center>'
-		'<center><img src="images/characters/pavlovsk/school/head/38.jpg"></center>'
+		'<center><img src="images/pc/npc_headshots/big142.jpg"></center>'
 		'You sit down at a table and eat your lunch, looking over your shoulder occasionally. Zinaida sits down next to you. "You did a good job," she says.'
 		'"Thanks," you say. "What did you have me do, anyway?"'
 		'"Don''t worry. You''re safe."'
@@ -814,7 +814,7 @@ if dimaRevChoice = 4:
 			'"Okay let''s do it. Follow me."'
 			act 'Follow Lavrenti':
 				*clr & cla
-				'<center><img src="images/characters/pavlovsk/school/head/40.jpg"></center>'
+				'<center><img src="images/pc/npc_headshots/big155.jpg"></center>'
 				'You follow Lavrenti to an unused room. "Me and Dimka used to hang out here. We stole the key and made a couple of copies before returning it."'
 				'He pulls out a key and slips it into the lock. You get ready as he unlocks the door. When he opens it, you run inside to confront Dimka, but the room is empty. "Shit," you say, "He isn''t here."'
 				*nl
@@ -932,7 +932,7 @@ if dimaRevChoice = 4:
 			!dimaRevenge = 8!
 			!!fifth day before class!!
 			pav_sex -= 40
-			'<center><img src="images/characters/pavlovsk/school/head/44.jpg"></center>'
+			'<center><img src="images/pc/npc_headshots/big144.jpg"></center>'
 			'The first thing you hear when you enter the school is how Dimka was caught jacking off in the girls restroom at the disco.
 			Only three people know the truth, but they aren''t going to tell anyone. You feel someone tap your shoulder and you turn around to see Anuska. "Forty," she says.'
 			'"Uhh, Forty what?"'
@@ -1074,7 +1074,7 @@ if dimaRevChoice = 5:
 				!!Fifth day before class!!
 				pav_sex -= 80
 				npc_rel['A1'] -= 20
-				'<center><img src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+				'<center><img src="images/pc/npc_headshots/big1.jpg"></center>'
 				'The first thing you do when you enter the school is look for Dimka. You find him by his locker, checking his phone. Years of pent up anger gives you courage and you confront him. "Hey, asshole," you say to get his attention.'
 				'"Watch what you say, pig," he says, "before I do something awful to that slutty mouth of yours."'
 				'"No you watch what you say. I''m not taking your shit. Now watch this." You show him the video. His eyes widen in fear.'
@@ -1125,7 +1125,7 @@ if dimaRevChoice = 5:
 					act 'In trouble':
 						*clr & cla
 						demerit += 40
-						'<center><img src="images/characters/pavlovsk/school/head/50.jpg"></center>'
+						'<center><img src="images/pc/npc_headshots/big134.jpg"></center>'
 						'Miss. Volkov looks at you. "I don''t know what''s on your mind miss <<$pcs_lastname>> but what have you done will have serious consequences...now go"'
 						!!sent to princeipal''s office and earn 20 demerits, afterwards it goes to this scene.
 						!!Office doesn''t exist yet according to gschool_grounds.

locations/dina.qsrc

@@ -4,43 +4,43 @@ $brodila = {
 	sexpartkno = 0
 	if home_owned[1] > 0:
 		gt'korr','start'
-	elseif home_owned[4] = 1:    
+	elseif home_owned[4] = 1:
 		gt'korr2x','start'
 	else
 		gt'street', 'start'
-    end
+	end
 }
 
 $brodilr = {
 	if StoryLine = 1 and home_owned[2] = 1:
 		gt 'pavResidential'
-    elseif home_owned[4] = 1:
-        gt'liames'
-    else
-        gt'street','start'
+	elseif home_owned[4] = 1:
+		gt'liames'
+	else
+		gt'street','start'
 	end
 }
 
 $brodilk = {
-    if home_owned[1] > 0:
-        gt'kuhr','start'
-    elseif home_owned[4] = 1:
-        gt'kuhr2x','start'
-    else
+	if home_owned[1] > 0:
+		gt'kuhr','start'
+	elseif home_owned[4] = 1:
+		gt'kuhr2x','start'
+	else
 		gt'street', 'start'
-    end
+	end
 }
 
 $brodils = {
-    if home_owned[1] > 0:
-        gt'sitr','start'
-    elseif home_owned[4] = 1:
-        gt'sitr2x','start'
+	if home_owned[1] > 0:
+		gt'sitr','start'
+	elseif home_owned[4] = 1:
+		gt'sitr2x','start'
 	elseif StoryLine = 1 and home_owned[2] = 1:
 		gt 'sitrPar'
 	else
 		gt'street', 'start'
-    end
+	end
 }
 
 !!This sets the default descriptors and folder names for each default image set
@@ -111,12 +111,12 @@ $rexpot = {
 	gs 'boyStat', 'A166'
 }
 
-$hypnoDaychange = {	
+$hypnoDaychange = {
 	!!if for some reason hypnoTime is too high
 	if hypnoTime > 15:hypnoTime = 15
 	timeTresh = 76 - 4*hypnoType
 	!!Withdrawal effect begings if too strong influence and no visitation
-	if daystart-hypnoDay > 7: 
+	if daystart-hypnoDay > 7:
 		if hypnoAddict = 1:
 			hypnoWithdrawal = 1
 		elseif hypnoAddict = 2:
@@ -136,7 +136,7 @@ $hypnoDaychange = {
 				if hypnoTime < 7:hypnoAddict = 0 & hypnoWithdrawal = 0
 			end
 		else
-			if rand(0,4) = 0: 
+			if rand(0,4) = 0:
 				hypnoStrength = 19
 				hypnoTime -= 1
 				if hypnoTime < 10:hypnoAddict = 1 & hypnoBlock = 0 & hypnoWithdrawal = 1
@@ -156,7 +156,7 @@ $hypnoAddiction = {
 	else
 		missCum += 1
 	end
-	
+
 	if missCum > timeTresh:
 		if hypnoAddict = 1:
 			pcs_mood -= 5
@@ -166,7 +166,7 @@ $hypnoAddiction = {
 			pcs_horny += 20
 		end
 	end
-	
+
 	if hypnoWithdrawal > 0:
 		if hypnoWithdrawal = 1:
 			if missCum >= timeTresh:
@@ -190,7 +190,7 @@ $prezik = {
 			noprotect = 0
 		end
 		prezik -= 1
-	elseif prezik < 0: 
+	elseif prezik < 0:
 		prezik = 0
 	end
 }

locations/ender.qsrc

@@ -308,6 +308,7 @@ if $ARGS[0] = 'win':
 		act 'Further':gt'street'
 		exit
 	elseif RapistFight = 1 or ThiefFight = 1:
+		ThiefFight = 0
 		if succubusQW >= 4 and scpopt < 2:
 			$sclocrt = 'ender'
 			$scargrt = 'win'
@@ -315,6 +316,7 @@ if $ARGS[0] = 'win':
 			scpopt = 1
 			gt 'succubus', 'RapistFight'
 		end
+		RapistFight = 0
 		scpopt = 0
 		if rikudo > 10:rikudo += 100
 		pcs_dom += 1
@@ -322,10 +324,7 @@ if $ARGS[0] = 'win':
 		money += rand(500,2000)
 
 		'You fought back the '+iif(RapistFight = 1, 'rapist', 'thief')+' and took his wallet.'
-		
-		RapistFight = 0
-		ThiefFight = 0
-
+						
 		act 'Leave': gt $loc, $metka
 		exit
 	elseif DimaFight = 1:

locations/etoexhib.qsrc

@@ -1615,7 +1615,7 @@ if $ARGS[0] = 'pos52':
 end
 
 if $ARGS[0] = 'pos53':
-	$metka = 'pos54'
+	$metka = 'pos53'
 	$loc = 'etoexhib'
 	$menu_loc = 'etoexhib'
 	$menu_arg = 'pos53'

locations/events.qsrc

@@ -278,14 +278,13 @@ if $ARGS[0] = 'snarkozaka':
 	'Amphetamine: 600 <b>₽</b>'
 	'Weed: 300 <b>₽</b>'
 	
-	act 'Leave': gt 'events', 'snarkozaka'
+	act 'Leave': gt 'pavtrainhall'
 	
 	if money >= 560:
 		act 'Buy and use heroin (560 <b>₽</b>)':
 			money -= 560
 			gs 'drugs', 'heroin'
-			'You buy the drugs and without thinking twice you shoot up.'
-			gt 'events', 'snkayf'
+			gt 'events', 'snarkozaka'
 		end
 	else
 		'You don''t have enough money to buy heroin.'
@@ -296,7 +295,7 @@ if $ARGS[0] = 'snarkozaka':
 			money -= 2100
 			dur += 5
 			minut += 5
-			gt 'narkopriton', 'cocaine'
+			gt 'events', 'snarkozaka'
 		end
 	else
 		'You don''t have enough money to buy cocaine.'

locations/gKristinaZv.qsrc

@@ -1,22 +1,60 @@
 # gKristinaZv
 
-menu_off = 1
-gs 'stat'
-'After your gym class you go to the locker room with the rest of the girls. Christina theatrically moves over to you, and the eyes of all the girls in the locker room are on you now.'
-
-if zverhumiliation < 9:
-    randhumiliation = rand(0,zverhumiliation)
-else
-    randhumiliation = rand(2, min(16,zverhumiliation))
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+	gs 'stat'
+	menu_off = 1
+	'After your gym class you go to the locker room with the rest of the girls. Christina theatrically moves over to you, and the eyes of all the girls in the locker room are on you now.'
+
+	if zverhumiliation < 9:
+		gKristinaZvtemp = rand(0,zverhumiliation)
+	else
+		gKristinaZvtemp = min(rand(2, 16),zverhumiliation)
+	end
+
+	if gKristinaZvtemp = 0:
+		gt 'gKristinaZv','0'
+	elseif gKristinaZvtemp = 1:
+		gt 'gKristinaZv','1'
+	elseif gKristinaZvtemp = 2:
+		gt 'gKristinaZv','2'
+	elseif gKristinaZvtemp = 3:
+		gt 'gKristinaZv','3'
+	elseif gKristinaZvtemp = 4:
+		gt 'gKristinaZv','4'
+	elseif gKristinaZvtemp = 5:
+		gt 'gKristinaZv','5'
+	elseif gKristinaZvtemp = 6:
+		gt 'gKristinaZv','6'
+	elseif gKristinaZvtemp = 7 and pcs_vag > 0:
+		gt 'gKristinaZv','7'
+	elseif gKristinaZvtemp = 8 and pcs_vag > 0:
+		gt 'gKristinaZv','8'
+	elseif gKristinaZvtemp = 9 and pcs_vag > 0:
+		gt 'gKristinaZv','9'
+	elseif gKristinaZvtemp = 10 and pcs_vag > 0:
+		gt 'gKristinaZv','10'
+	elseif gKristinaZvtemp = 11 and pcs_vag > 0:
+		gt 'gKristinaZv','11'
+	elseif gKristinaZvtemp = 12 and pcs_vag > 0:
+		gt 'gKristinaZv','12'
+	elseif gKristinaZvtemp = 13:
+		gt 'gKristinaZv','13'
+	elseif gKristinaZvtemp = 14:
+		gt 'gKristinaZv','14'
+	elseif gKristinaZvtemp = 15:
+		gt 'gKristinaZv','15'
+	else
+		gt 'gKristinaZv','default'
+	end
 end
 
-if randhumiliation = 0:
+if $ARGS[0] = '0':
 	'"Well, bitch. Since you get into trouble with your mouth so much, I brought you a present to keep it occupied. You can thank me later."'
 	'Christina pulls a dildo out of her sports bag, and sticks it on the shower wall at groin level. "Start sucking, <<$pcs_nickname>>, if you do a good job I''ll maybe forgive you. Or do you want me to kick your face in again?"'
 
 	act 'Suck on the dildo':
 		*clr & cla
-		if zverhumiliation < 6:zverhumiliation += 1
+		if zverhumiliation < 6: zverhumiliation += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj.jpg"></center>'
 		'You nod obediently, not wanting Christina to beat you up again. You squat down in front of the dildo, and take it in your hands before carefully licking it and closing your lips around it. You expected an awful rubber taste, but it''s actually not that bad. You give the dildo a blowjob as all the girls in your class watch you, while Christina laughs. After a few minutes, she has seen enough and allows you to change.'
@@ -27,7 +65,9 @@ if randhumiliation = 0:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 1:
+end
+	
+if $ARGS[0] = '1':
 	'"Bitch, it''s no wonder I kicked your ass so easily. Your body looks like you only do girly sports, you should bulk up a bit."'
 	'Christina pulls a dildo out of her sports bag, puts a stone on the floor and sticks the dildo on top of it. "Get down there, <<$pcs_nickname>>. Do some push-ups while you suck on it, you look like you could use the workout."'
 
@@ -44,7 +84,9 @@ elseif randhumiliation = 1:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 2:
+end
+
+if $ARGS[0] = '2':
 	'Christina takes the by now familiar dildo out of her sports bag again, and tells you to squat. Afraid to stand up against her after what happened last time, you do as she says. She sticks the dildo right in front of you, and says: "Don''t move your feet, bitch. Those stay where they are. I don''t care how you do it, but I want to see your lips around that dildo. Someone, help her out."'
 
 	act 'Suck on the dildo':
@@ -61,7 +103,9 @@ elseif randhumiliation = 2:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 3:
+end
+
+if $ARGS[0] = '3':
 	'Christina smiles at you when she reaches into her bag. "You''ve been doing such a good job, bitch. I feel like you need a bigger challenge."'
 	'She pulls out not one, but three dildos and sticks them all on a large mirror at groin level. "Go ahead <<$pcs_nickname>>, get to work. Make sure none would feel left out."'
 
@@ -77,9 +121,11 @@ elseif randhumiliation = 3:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue':gt 'gschool_lessons2','postphys2'
 	end
-elseif randhumiliation = 4:
+end
+
+if $ARGS[0] = '4':
 	'Christina laughs at you: "I see that worried look in your eyes! Don''t worry bitch, I didn''t forget about your big friend."'
 	'She pulls the by now familiar dildo out of her bag, and sticks it against the large mirror in the locker room with an evil grin.'
 	'She taunts you: "Do you even know how big of a slut you are, <<$pcs_nickname>>? Of course you don''t... so I will show you. I want you to look yourself in the eye as you suck it off. Get to it."'
@@ -88,17 +134,18 @@ elseif randhumiliation = 4:
 		*clr & cla
 		if zverhumiliation < 6:zverhumiliation += 1
 		gs'stat'
-
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj5.jpg"></center>'
-		'You get down on your haunches, and obediently lick the dildo before taking it in your mouth. You look yourself in the eye the whole time as instructed, and are rather fascinated by the look... this must be what you look like when you suck a guy off. Rather fascinated by the concept, you try to do some different things with your lips, and test out a few facial expressions. Hearing the whispers of your classmates suddenly make you realize that you''re not alone here, there are a dozen girls watching you! Your face turns crimson red, and when Christina tells you can stop you feel deeply embarrassed.'
+		'You get down on your haunches, and obediently lick the dildo before taking it in your mouth. You look yourself in the eye the whole time as instructed, and are rather fascinated by the look... this must be what you look like when you suck a guy off. Rather fascinated by the concept, you try to do some different things with your lips, and test out a few facial expressions.'
+		'Hearing the whispers of your classmates suddenly make you realize that you''re not alone here, there are a dozen girls watching you! Your face turns crimson red, and when Christina tells you can stop you feel deeply embarrassed.'
 
 		gs 'arousal', 'bj', 10, 'sub', 'humilation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
-	end	
-elseif randhumiliation = 5:
+	end
+end
+
+if $ARGS[0] = '5':
 	'Christina stands in the middle of the locker room and says: "Bitch, come over here."'
 	'Expecting her to stick a dildo on a wall or mirror or something, you''re confused. As you walk over to her, she gives you a larger dildo than before. "Take it and start sucking." Christina steps back as you take the dildo from her hands, while all the girls look at you expectantly.'
 
@@ -116,7 +163,9 @@ elseif randhumiliation = 5:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 6:
+end
+
+if $ARGS[0] = '6':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj7.jpg"></center>'
 	'Christina stops right in front of you. You notice she doesn''t have her sports bag in her hands like usual.'
@@ -153,14 +202,14 @@ elseif randhumiliation = 6:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj10.jpg"></center>'
 				'Christina looks surprised: "Still a virgin? How unexpected. Alright, I''m nothing if not flexible. We''ll work on you ass skills instead then."'
 				'She grabs her bag and throws a dildo your way. You''re relieved to see it''s not the huge one, this one should fit okay.'
-				'You lean backwards and after you spit on the dildo a few times, move it against your backside. All of the girls from your class watch you attentively as you slowly work the head in, and then begin to fuck your ass with it. Christina smiles: "You''re quite good at taking stuff up your butt, <<$pcs_nickname>>. How is this so easy for you? Do you practise on a daily basis or something?"'
+				'You lean backwards and after you spit on the dildo a few times, move it against your backside. All of the girls from your class watch you attentively as you slowly work the head in, and then begin to f*** your ass with it. Christina smiles: "You''re quite good at taking stuff up your butt, <<$pcs_nickname>>. How is this so easy for you? Do you practise on a daily basis or something?"'
 				'After a while Christina has seen enough, and allows you to change.'
 			
 				gs 'arousal', 'anal_dildo', 10, 'sub', 'humilation'
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-			elseif pcs_ass >= 25:
+			else
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj11.jpg"></center>'
 				'Christina looks surprised: "Still a virgin? How unexpected. Alright, I''m nothing if not flexible. We''ll work on you ass skills instead then."'
@@ -207,10 +256,12 @@ elseif randhumiliation = 6:
 			act 'Continue': gt 'gschool_lessons2', 'postphys2'
 		end
 	end
-elseif randhumiliation = 7 and pcs_vag > 0:
+end
+	
+if $ARGS[0] = '7':
 	'Christina walks towards the showers, and sticks a dildo to the wall at groin level. When you automatically walk up to it and move to kneel, she stops you: "No no, bitch. No mouth today, you ride it." You can tell your classmates are getting antsy, today''s show should be good.'
 
-	act 'Fuck your pussy with it':
+	act 'f*** your pussy with it':
 		*clr & cla
 		if zverhumiliation < 14:zverhumiliation += 1
 		if pcs_vag < 10:vgape = 2 & pcs_horny = rand(5,15)
@@ -241,7 +292,9 @@ elseif randhumiliation = 7 and pcs_vag > 0:
 			
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 8 and pcs_vag > 0:
+end
+	
+if $ARGS[0] = '8':
 	'Christina grabs your face with her hand, squishing your cheeks together: "What''s that, bitch? You''re scared I forgot about your best rubber buddy? Don''t worry, it''s right here!"'
 	'She pulls the dildo out of her bag and sticks it onto the floor. With an evil grin she says: "Go ahead bitch, hop on. I know you want to."'
 
@@ -275,7 +328,9 @@ elseif randhumiliation = 8 and pcs_vag > 0:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 9 and pcs_vag > 0:
+end
+	
+if $ARGS[0] = '9':
 	'Christina grabs your face with her hand, squishing your cheeks together: "What''s that, bitch? You''re scared I forgot about your best rubber buddy? Don''t worry, it''s right here!"'
 	'She pulls the dildo out of her bag and sticks it onto the floor. With an evil grin she says: "Go on bitch, hop on. You know you want to."'
 
@@ -309,7 +364,9 @@ elseif randhumiliation = 9 and pcs_vag > 0:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 10 and pcs_vag > 0:
+end
+	
+if $ARGS[0] = '10':
 	'Christina smiles at you: "You''ve been doing such a good job, bitch... it''s about time I reward you."'
 	'She pulls an extra large dildo out of her back and grins: "Oh yes, I can see that greedy look in your eyes. It''s all yours today. Girls, you can help her out if you want" as she sticks it on the floor.'
 
@@ -343,7 +400,9 @@ elseif randhumiliation = 10 and pcs_vag > 0:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 11 and pcs_vag > 0:
+end
+	
+if $ARGS[0] = '11':
 	'Christina fakes sympathy as she says: "Oh no! Bad news, bitch... I forgot your rubber friend! Let''s see what else I have for you..."'
 	'She digs through her purse, and pulls out her hairbrush: "Here you go, bitch. You can use this today... I expect you to clean it properly before you give it back, I don''t want your pussy stinking up my purse."'
 
@@ -376,7 +435,9 @@ elseif randhumiliation = 11 and pcs_vag > 0:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 12 and pcs_vag > 0:
+end
+	
+if $ARGS[0] = '12':
 	'You notice all the girls from your class gathering around, wondering what Christina has in store for you today. Christina looks through her sports bag and shrugs: "Bad news bitch, I forgot to pack your friends this morning. Use your own hands today."'
 
 	act 'Masturbate in front of them':
@@ -388,7 +449,7 @@ elseif randhumiliation = 12 and pcs_vag > 0:
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj18.jpg"></center>'
-		'Knowing she expects a show, you lean back against the wall with your legs spread wide. You rub your fingers over your pussy lips, and then begin to slide your fingers in one by one with a questioning look in your eyes. At three, Christina tells you: "Stop. Three will do for today, bitch. Start fucking yourself with them."'
+		'Knowing she expects a show, you lean back against the wall with your legs spread wide. You rub your fingers over your pussy lips, and then begin to slide your fingers in one by one with a questioning look in your eyes. At three, Christina tells you: "Stop. Three will do for today, bitch. Start f***ing yourself with them."'
 		'You slowly move your hand, and can''t help but moan when you feel your pussy grasping around your fingers.'
 		
 		gs 'arousal', 'masturbate', 10, 'sub', 'humilation'
@@ -410,7 +471,9 @@ elseif randhumiliation = 12 and pcs_vag > 0:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 13 and pcs_vag > 0:
+end
+	
+if $ARGS[0] = '13':
 	'After you take your clothes off, Christina whips your ass with her towel: "We''re doing something a bit more interactive today, bitch. But first, you''re fisting yourself today. I want to see your whole hand disappear between those stinking folds. Girls, spit."'
 
 	act 'Fist yourself':
@@ -448,7 +511,9 @@ elseif randhumiliation = 13 and pcs_vag > 0:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 14:
+end
+	
+if $ARGS[0] = '14':
 	'Christina laughs haughtily as she takes off her clothes: "You know what, bitch? I just realized... I do so many nice things for you, and you never do anything for me in return. So rude. Today, you''re pleasing me. Get on your knees and crawl over to me, you''re going to lick me to orgasm today."'
 
 	act 'Lick her pussy':
@@ -479,7 +544,9 @@ elseif randhumiliation = 14:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-elseif randhumiliation = 15:
+end
+	
+if $ARGS[0] = '15':
 	'Christina mutters about having to go to the bathroom, but then an idea strikes her when she sees you: "Excellent, just when I thought there was no toilet nearby. Bitch, come here. Get on your knees and open your mouth... and make it quick, I''m ready to burst!"'
 
 	act 'Obey and open your mouth':
@@ -500,8 +567,9 @@ elseif randhumiliation = 15:
 		
 		act 'Continue': gt 'gschool_lessons2', 'postphys2'
 	end
-	
-else
+end
+
+if $ARGS[0] = 'default':
 	'Christina grins as you walk up to her meekly, expecting your punishment: "Sorry bitch, I''m busy today. You''ll have to do without punishment today."'
 	'She quickly gets dressed and leaves the locker room, and for a second you feel unsure as to what to do. The other girls of your class smirk at your behaviour; you''d gotten so used to Christina''s abuse, that you have no idea how to posture yourself when she''s not here. You''re deeply embarrassed when you try to imagine what they must think of you, and you do your best to ignore them.'
 

locations/gLakeNude.qsrc

@@ -293,7 +293,7 @@ if $ARGS[0] = 'sauna':
 	'You walk up the small trail from the beach to the sauna, it is newly built. They say it was built for the tourist, but if that is true, you wonder why they put it on the secluded beach and even then a little ways back from the beach. Surely no tourist would ever find it, either way you and many others are glad they built it. It is well built and nice inside and out, there is three areas to the sauna. The mens section, womens section, and a co-ed section, to use the sauna you need a bikini or some people use it naked.'
 	
 	act 'Go back to the beach': 
-		if pcs_inhib > 30:
+		if pcs_inhib > 30 or $clothingworntype ! 'nude':
 			gt 'gLakeNude'
 		else
 			*clr & cla
@@ -360,8 +360,7 @@ if $ARGS[0] = 'sauna':
 			act 'Use the sauna':
 				*clr & cla
 				minut +=30
-				pcs_mood += 5
-				pcs_willpwr += 5
+				pcs_mood += 10
 				if $clothingworntype = 'swimwear':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 					if pcs_inhib < 40: inhib_exp += rand(0,1)
@@ -387,8 +386,7 @@ if $ARGS[0] = 'sauna':
 			act 'Use the sauna':
 				*clr & cla
 				minut += 30
-				pcs_mood += 5
-				pcs_willpwr += 5
+				pcs_mood += 10
 				if $clothingworntype = 'swimwear':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 					if pcs_inhib < 40: inhib_exp += rand(0,1)
@@ -428,8 +426,7 @@ if $ARGS[0] = 'sauna':
 			act 'Use the sauna':
 				*clr & cla
 				minut +=30
-				pcs_mood += 5
-				pcs_willpwr += 5
+				pcs_mood += 10
 				if $clothingworntype = 'swimwear':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 					if pcs_inhib < 40: inhib_exp += rand(0,1)
@@ -454,9 +451,9 @@ end
 if $ARGS[0] = 'ice_plunge':
 	act 'Take a ice plunge':
 		*clr & cla
-		minut +=10
-		pcs_mood += 5
-		pcs_willpwr += 5
+		minut += 10
+		pcs_mood += 10
+		if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
 		if $clothingworntype = 'swimwear':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/icedipbikini.jpg"></center>'
 			if pcs_inhib < 50:inhib_exp += rand(0,1)

locations/gaptek.qsrc

@@ -27,15 +27,9 @@ if $ARGS[0] = 'start' or $message ! '':
 
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'
 	if gaptek_aunt_hours = 1:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
 	else
-		if hour >= 8 and hour < 14 and week < 3:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_2.jpg"></center>'
-		elseif hour >= 8 and hour < 14 and week >= 3 and week < 5:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_3.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_4.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_'+rand(1,4)+'.jpg"></center>'
 	end
 	*nl
 	
@@ -125,7 +119,7 @@ if $ARGS[0] = 'start' or $message ! '':
 		if pcs_knows_nipplecream = 1:
 			*P FUNC ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', 'gaptek', 'start')
 		end
-		*P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', 'gaptek', 'start', StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''gaptek'', ''buy_antifungal''">buy</a>','')+'')
+		if KandidNapr = 1: *P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', 'gaptek', 'start', StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''gaptek'', ''buy_antifungal''">buy</a>','')+'')
 		*P '</table></center>'
 
 		if npc_QW['A29'] >= 2:
@@ -143,7 +137,7 @@ if $ARGS[0] = 'garden':
 	*clr & cla
 	gs 'stat'
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
 	*nl
 
 	if npc_QW['A29'] = 2 and gaogorod < 40:
@@ -366,12 +360,14 @@ if $ARGS[0] = 'buy_bottle_med':
 end
 
 if $ARGS[0] = 'buy_antifungal':
-	if KandidNapr = 1:
+	if Kandidoz >= 30:
 		money -= 1050
 		Kandidoz = 0
 		gs 'stat'
 		$gardmess = '<center><font color="green">You bought 1 <b>Antifungal medication</b>.</font></center><br>You put the money on the counter and immediately open the package and swallow the tablet. A while later, you feel better.'
 		gt 'gaptek', 'start'
+	elseif Kandidoz < 30 and KandidozOnce > 0:
+		'You don''t need the medication right now. Your thrush is currently in remission, taking vitamins will ensure that it stays that way.'
 	else
 		msg '<center>You don''t need any antifungal medication right now.</center>'
 		*nl

locations/gdksport.qsrc

@@ -39,10 +39,11 @@ if $ARGS[0] = 'start':
 		if $clothingworntype = 'nude':
 			msg'<b><font color = red>You need to get dressed before leaving.</font></b>'
 			gt 'gdksport', 'start'
-		elseif lariskaQwestStart <= daystart and lariskaQwestStart ! 0 and lariskaHelp ! 1:
+		elseif lariskaQwestStart <= daystart and lariskaQwestStart ! 0 and lariskaHelp = 0:
+			lariskaHelp = 1
 			gt 'LariskaStart', 'start'
-		elseif zverSlutQW ! 0 and lariskaQwestDay >= daystart and AlbZverHelp = 0 and AlbEnemy = 0 and AlbinaInPrison = 0:
-			!ask Albina for help, and she or her father is still in charge
+		elseif lariskaHelp = 1 and lariskaHelp_end = 0 and lariskaQwestDay <= daystart and AlbZverHelp = 0 and AlbEnemy = 0 and AlbinaInPrison = 0:
+			lariskaHelp_end = 1
 			gt 'LariskaStart', 'end'
 		else
 			gt 'gdk'
@@ -53,9 +54,11 @@ if $ARGS[0] = 'start':
 		if $clothingworntype = 'nude':
 			msg'<b><font color = red>You need to get dressed before leaving.</font></b>'
 			gt 'gdksport', 'start'
-		elseif lariskaQwestStart <= daystart and lariskaQwestStart ! 0 and lariskaHelp ! 1:
+		elseif lariskaQwestStart <= daystart and lariskaQwestStart ! 0 and lariskaHelp = 0:
+			lariskaHelp = 1
 			gt 'LariskaStart', 'start'
-		elseif lariskaQwestDay = daystart:
+		elseif lariskaHelp = 1 and lariskaHelp_end = 0 and lariskaQwestDay <= daystart and AlbZverHelp = 0 and AlbEnemy = 0 and AlbinaInPrison = 0:
+			lariskaHelp_end = 1
 			gt 'LariskaStart', 'end'
 		else
 			gt 'gdktoilet', 'start'

locations/gdktoilet.qsrc

@@ -48,22 +48,14 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if hour >= 8 and hour <= 18:
-		act 'Go to the library': gt 'gdkbibl'
-	end
-
-	if hour >= 12 and hour <= 20:
-		act 'Go upstairs to the hobby clubs': gt 'gdkkru'
-	end
-
-	if hour >= 14 and hour <= 20:
-		act 'Go to the gym': gt 'gdksport', 'start'
-	end
+	if hour >= 8 and hour <= 18: act 'Go to the library': gt 'gdkbibl'
+	if hour >= 12 and hour <= 20: act 'Go upstairs to the hobby clubs': gt 'gdkkru'
+	if hour >= 14 and hour <= 20: act 'Go to the gym': gt 'gdksport', 'start'
 end
 
 if $ARGS[0] = 'mens_entrance_events':
 	menu_off = 1
-	temp = RAND(1,100)
+	temp = rand(1,100)
 !!Gloryhole1
 	if temp >= 80:
 		'<center><b><font color="maroon">Men''s Room</font></b></center>'
@@ -115,7 +107,6 @@ if $ARGS[0] = 'mens_entrance_events':
 						*clr & cla
 						gs 'stat'
 						pcs_mood += 15
-						pcs_willpwr += 15
 						pcs_vag += 1
 						'<center><b><font color="maroon">Men''s Room</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/masturbate.jpg"></center>'
@@ -134,6 +125,7 @@ if $ARGS[0] = 'mens_entrance_events':
 								act 'Give In': gt'gdktoilet', 'mensglory'
 							else
 								*clr & cla
+								gs 'arousal', 'end'
 								gs 'stat'
 								'<center><b><font color="maroon">Men''s Room</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/pc/fuckoff2.jpg"></center>'
@@ -141,13 +133,14 @@ if $ARGS[0] = 'mens_entrance_events':
 								act 'Leave': gt'gdktoilet', 'start'
 							end
 						else
-							act 'Leave': gt'gdktoilet', 'start'
+							act 'Leave': gs 'arousal', 'end' & gt'gdktoilet', 'start'
 						end
 					end
 				else
 					gs 'stat'
 					'You look at his naked body and you wonder who''s on the other side. You feel a little turned on by the man''s naked body. You decide to leave.'
 					gs 'arousal', 'voyeur', 10
+					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Leave': gt'gdktoilet', 'start'
 				end
@@ -158,7 +151,6 @@ if $ARGS[0] = 'mens_entrance_events':
 				act 'Leave': gt'gdktoilet', 'start'
 			end
 		end
-!!Sonia
 	elseif temp >= 50 and temp <=79 and soniaPS >= 1 and hour >= 20 and hour <=23:
 		pcs_horny += 5
 		minut += 5
@@ -171,13 +163,13 @@ if $ARGS[0] = 'mens_entrance_events':
 			gs 'stat'
 			'You feel excited as you watch Sonia. You decide to leave before you are noticed.'
 			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave': gt'gdktoilet', 'start'
 		else
 			'You decide to leave before you are noticed.'
 			act 'Leave': gt'gdktoilet', 'start'
 		end
-!!Ivan and Vicky
 	elseif temp >= 40 and temp <= 45 and hour >= 20 and hour <=23:
 		*clr & cla
 		pcs_horny += 10
@@ -187,23 +179,23 @@ if $ARGS[0] = 'mens_entrance_events':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/bathroom_mens.jpg"></center>'
 		'You look inside the men''s restroom and hear a couple having sex in one of the stalls. You wonder who''s inside and then decide to leave. While you turn away you hear them stop and the stall slams open moments later hearing giggling from some women. While you''re outside you see Ivan and Vicky leave the men''s restroom and walk out into the crowd.'
 		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt'gdktoilet', 'start'
-!!Gopnik''s:
 	elseif temp >= 30 and temp <= 39 and hour >= 20 and hour <=23:
 		*clr & cla
 		gs 'stat'
 		'<center><b><font color="maroon">Men''s Room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/gangbangbath.jpg"></center>'
 		'You look inside the men''s restroom and see Vitek, Dan, Vasily, and one other you don''t recongnize and someone else under some woman getting pounded.'
-		gs 'arousal', 'voyeur', 5
-		gs 'stat'
 		if pcs_vag > 0 and pcs_ass > 0:
 			pcs_horny += 30
 			'Your pussy starts to itch. You wish you were that woman in between all those horny men taking it in all your holes. The feeling of excitement is enough to make you want to masturbate in the hallway but you decide to leave before your feelings become too much.'
 		end
+		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'end'
+		gs 'stat'
 		act 'Leave': gt'gdktoilet', 'start'
-!!Dimka:
 	elseif temp >= 20 and temp <= 29 and hour >= 20 and hour <=23:
 		*clr & cla
 		minut += 5
@@ -246,18 +238,19 @@ if $ARGS[0] = 'mens_entrance_events':
 						act 'Continue':
 							*clr & cla
 							pcs_mood += 15
-							pcs_willpwr += 15
 							sub += 5
-							spafinloc = 3
-							guy += 1
+							if npc_sex['A1'] = 0: npc_sex['A1'] = 1 & guy += 1
 							girl += 1
 							minut += 10
-							gs 'cum_manage'
+							gs 'cum_call', 'anus', 'A1', 1
 							gs 'stat'
 							'<center><b><font color="maroon">Men''s Room</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/threesomeanalcum.jpg"></center>'
 							'Starting to pound your ass harder, Dimka starts to grunt as he shoots his load in your ass. Pulling out his warm liquid flows out your ass spilling onto the girls face. He takes his dick and puts it in her mouth saying, "Clean the rest of this up slut and don''t forget to clean my bitch too." The girl starts to lick your ass clean. She is really good at it and you begin to have another orgasm. You finish and decide to get up and get dressed. Dimka pleased with your behaviour tells you, "You should come by my house more often, slave."'
 							$orgasm_or = 'yes'
+							cumspclnt = 15
+							gs 'cum_cleanup'
+							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Leave': gt'gdktoilet', 'start'
 						end
@@ -267,12 +260,9 @@ if $ARGS[0] = 'mens_entrance_events':
 		else
 			act 'Leave': gt'gdktoilet', 'start'
 		end
-!!No Event/With Gloryhole2:
 	else
-		*clr & cla
 		minut += 1
-		temp = RAND(1,2)
-		gs 'stat'
+		temp = rand(1,2)
 		gt 'gdktoilet', 'mens'
 	end
 end
@@ -317,6 +307,7 @@ if $ARGS[0] = 'mens':
 		'You look at the hole and see a girl fingering her pussy. You feel your pussy moisten and start to itch.'
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
+		act 'Move away': minut += 1 & gt'gdktoilet', 'mens'
 		if pcs_horny >=50:
 			act 'Masturbate':
 				cla
@@ -327,12 +318,6 @@ if $ARGS[0] = 'mens':
 				act 'start': gt 'gdktoilet', 'mensmast'
 			end
 		end
-		act 'Move away':
-			*clr & cla
-			minut += 1
-			gs 'stat'
-			gt'gdktoilet', 'mens'
-		end
 	end
 	
 	dynamic $tampon
@@ -342,18 +327,15 @@ if $ARGS[0] = 'mens':
 end
 
 if $ARGS[0] = 'mensmast':
+	*clr & cla
 	minut += 2
 	pcs_horny += 5
 	pcs_mood += 5
 	menu_off = 1
 	gs 'stat'
 	if picrand = 1:
-		*clr & cla
-		gs 'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/caress1.mp4"></video></center>'
 	else
-		*clr & cla
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/mastr.jpg"></center>'
 	end
 	if pcs_horny <= 60:
@@ -369,7 +351,6 @@ if $ARGS[0] = 'mensmast':
 		act 'Climax':
 			*clr & cla
 			pcs_mood += 15
-			pcs_willpwr += 15
 			minut += 5
 			if pcs_inhib < 30: inhib_exp += rand(1,3)
 			gs 'stat'
@@ -386,7 +367,7 @@ if $ARGS[0] = 'mensmast':
 				'You grab some toilet paper and clean off your now wet clit. You think to yourself, "I hope nobody heard that."'
 				if rand(1, 100) >= 80:
 					gs 'npcgeneratec', 0, 'guy from the men''s bathroom', rand(19,45)
-					npc_dick[$npclastgenerated] = RAND(10,24)
+					npc_dick[$npclastgenerated] = rand(10,24)
 					gs 'boyStat', $npclastgenerated
 					'You look up and notice the stall door opens. Right then a man in an orange jumpsuit walks in. He tells you, "Do you know where you are?" Unable to respond after your intense orgasm the man unzips his jumpsuit and takes out his <<npc_dick[$npclastgenerated]>>cm dick and places it near your mouth.'
 					if pcs_dom >= 20:
@@ -420,7 +401,6 @@ if $ARGS[0] = 'mensmast':
 							act 'Climax again':
 								*clr & cla
 								pcs_mood += 15
-								pcs_willpwr += 15
 								minut += 5
 								spafinloc = 11
 								facial += 1
@@ -482,9 +462,8 @@ if $ARGS[0] = 'mensglory':
 			gs 'arousal', 'vaginal_finger', 5, 'sub', 'rough'
 			gs 'stat'
 			act 'Turn Around':
-				pcs_mood += 15
-				pcs_willpwr += 15
 				*clr & cla
+				pcs_mood += 15
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/4standmiss.mp4"></video></center>'
 				'He suddenly pulls out of you and roughly turns you back around, and picks you up. You spread your legs and he lowers you back down, till you feel his <<$dick_girth>> dick slide back inside of your pussy. He carries you, fucking you the whole time, you are impressed by his strength, as he manages to not only carry you, but fuck you at the same time. He slams your back roughly but not painfully onto an open stall door and presses your body against it, then he starts fucking you in harder. It seems he is nowhere near ready to cum.'
@@ -492,61 +471,52 @@ if $ARGS[0] = 'mensglory':
 				gs 'arousal', 'vaginal', 5, 'sub', 'rough'
 				gs 'stat'
 				act 'Suck':
-					pcs_throat += 1
 					*clr & cla
 					gs 'stat'
 					'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/5blowjob.mp4"></video></center>'
 					'After some time, he pulls out of you and lets you down, you think he is getting a bit tired from holding you up. He leans back on the counter as you bend over and start to suck his dick. He puts his hand on your head and grabs and handful of hair, he pushes your head down while you suck his <<npc_dick[$npclastgenerated]>>cm dick. His hands hold onto your hair, keeping your from pulling away. Not that you would, you are excited and love sucking his dick.'
 					gs 'arousal', 'bj', 5, 'sub', 'rough', 'deepthroat'
 					gs 'stat'
-					if rand(1, 2) = 1:
+					if rand(1,2) = 1:
 						act 'Pull away':
-							minut +=5
-							gs 'stat'
 							*clr & cla
+							minut +=5
+							gs 'cum_call', 'mouth', 'guy from the men''s bathroom'
+							gs 'arousal', 'end'
+							gs 'stat'							
 							'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,1.mp4"></video></center>'
 							'You pull away right before he cums. You start to stroke his dick and you open your mouth. His hot load fills your mouth, it tastes salty and warm.'
 							act 'Swallow':
-								minut +=5
-								swallow += 1
-								spafinloc = 12
 								*clr & cla
-								gs 'cum_manage'
+								minut += 5
+								swallow += 1
 								gs 'stat'
 								'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1,1.mp4"></video></center>'
 								'You decide to swallow his cum. The man says, "You are much better than that hole in the wall." You smile and nod to him and get dressed. You leave the bathroom feeling satisfied and relaxed.'
 								act 'Leave': gt'gdktoilet', 'start'
 							end
 							act 'Spit':
-								minut +=5
-								spafinloc = 10
-								gs 'cum_manage'
-								spafinloc = 14
-								gs 'cum_manage'
 								*clr & cla
+								minut +=5								
 								gs 'stat'
 								'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/cumspit.mp4"></video></center>'
-								'You spit out his cum which spills all over your body. The man says, "You don''t like the taste of cum?" You don''t respond and get up to get dressed and leave.'
+								'You spit out his cum which. The man says, "You don''t like the taste of cum?" You don''t respond and get up to get dressed and leave.'
 								act 'Leave': gt'gdktoilet', 'start'
 							end
 						end
 					else
 						act 'Keep sucking':
+							*clr & cla
+							minut += 5
+							swallow += 1
+							gs 'cum_call', 'mouth', 'guy from the men''s bathroom'
+							gs 'arousal', 'end'
+							gs 'stat'
 							if pcs_throat <= 25:
-								minut +=5
-								spafinloc = 12
-								gs 'cum_manage'
-								gs 'stat'
-								*clr & cla
 								'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj91.mp4"></video></center>'
 								'You keep sucking taking in his entire dick. You stop when you feel his hard penis throbbing as a warm liquid fills your throat. You pull out his penis from your mouth making sure to not let any get spilled. The man says, "You are much better than that hole in the wall." You smile and nod to him and get dressed. You leave the bathroom feeling satisfied and relaxed.'
 								act 'Leave': gt'gdktoilet', 'start'
 							else
-								minut +=5
-								spafinloc = 12
-								gs 'cum_manage'
-								gs 'stat'
-								*clr & cla
 								'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj26.mp4"></video></center>'
 								'Unable to continue to fit his entire penis inside your mouth you keep sucking the tip of his dick until you feel his hard penis throbbing as a warm liquid fills the back of your mouth. You pull out his penis from your mouth making sure to not let any get spilled. The man says, "You are much better than that hole in the wall." You smile and nod to him and get dressed. You leave the bathroom feeling satisfied and relaxed.'
 								act 'Leave': gt'gdktoilet', 'start'
@@ -557,17 +527,14 @@ if $ARGS[0] = 'mensglory':
 							'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/6cowgirl.mp4"></video></center>'
 							'He yanks your head away, as he turns and lays down on the floor, on his back. He pulls you down on top of him, you straddle him and take his dick back into your pussy and you start to ride him. With out warning you feel him thrusting hard as he groaned. You feel warmth deep inside your pussy.'
 							gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+							gs 'arousal', 'end'
 							gs 'stat'
-							if pcs_vag < dick: pcs_vag += 1
-							gs 'stat'
-							if prezik >= 1:
+							if prezik > 0:
 								if sexcontra = 4:
 									act 'Get up':
 										*clr & cla
-										spafinloc = 0
-										if pcs_vag < dick: pcs_vag += 1
 										gs 'fame', 'pav', 'sex', 5
-										gs 'cum_manage'
+										gs 'cum_call', 'vaginal', 'guy from the men''s bathroom'
 										gs 'stat'
 										'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/misscream.mp4"></video></center>'
 										'You pull off him, getting up and looking down at him. That is when you noticed your pussy dripping cum all over his penis. The man unable to move breathing heavily. The man replies, "I thought it felt better then it should''ve been." '
@@ -578,10 +545,7 @@ if $ARGS[0] = 'mensglory':
 								else
 									act 'Get up':
 										*clr & cla
-										spafinloc = 17
-										if pcs_vag < dick: pcs_vag += 1
 										gs 'fame', 'pav', 'sex', 5
-										gs 'cum_manage'
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
 										'You pull off him, getting up and looking down at him. The man unable to move breathing heavily. He continues to breath heavily and says, "You were great, perhaps we''ll meet again." He gets up and gets dressed, that is when you finally notice the other men watching. You quickly get dressed and feel embarrassed you didn''t notice them before, leaving while your blushing.'
@@ -592,11 +556,9 @@ if $ARGS[0] = 'mensglory':
 								if sexcontra = 2:
 									act 'Complain':
 										*clr & cla
-										spafinloc = 0
-										if pcs_vag < dick: pcs_vag += 1
-										gs 'cum_manage'
-										gs 'stat'
 										gs 'fame', 'pav', 'sex', 5
+										gs 'cum_call', 'vaginal', 'guy from the men''s bathroom'
+										gs 'stat'
 										'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/misscream.mp4"></video></center>'
 										'You pull off him, getting up and looking down at him and say, "Why didn''t you tell me you were going to cum?" The man replies, "Sorry I was trying to hold back and thought I could, didn''t you say you were on the pill?" You reply, "Yeah, but still you could''ve told me. Now I will have to clean up." He continues to breath heavily and says, "Was it really that bad?" He smirks at you, "You were great, perhaps we''ll meet again and next time use no condoms again." He gets up and gets dressed, that is when you finally notice the other men watching. You stop trying to clean yourself and quickly get dressed. You feel embarrassed you didn''t notice them before, leaving while you''re blushing.'
 										act 'Leave': gt'gdktoilet', 'start'
@@ -604,11 +566,8 @@ if $ARGS[0] = 'mensglory':
 								else
 									act 'Complain':
 										*clr & cla
-										spafinloc = 0
-										if pcs_vag < dick: pcs_vag += 1
-										gs 'cum_manage'
-										gs 'stat'
 										gs 'fame', 'pav', 'sex', 5
+										gs 'cum_call', 'vaginal', 'guy from the men''s bathroom'
 										'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/misscream.mp4"></video></center>'
 										'You pull off him, getting up and looking down at him and say, "Why didn''t you tell me you were going to cum?" The man replies, "Sorry I was trying to hold back and thought I could, didn''t you say you were on the pill?" You reply, "No. What am I going to do if I get pregnent?" He continues to breath heavily and says, "Don''t worry, I''m sure you won''t get pregnant from just this one time. You were great, perhaps we''ll meet again and maybe use some protection." He gets up and gets dressed, that is when you finally notice the other men watching. You quickly get dressed and feel embarrassed you didn''t notice them before, leaving while you''re blushing.'
 										act 'Leave': gt'gdktoilet', 'start'
@@ -666,7 +625,7 @@ if $ARGS[0] = 'emptystall':
 			if pcs_inhib < 40:inhib_exp += rand(1,3)
 			*clr & cla
 			gs 'stat'
-			picrand = RAND(1,2)
+			picrand = rand(1,2)
 			if picrand = 1:
 				*clr & cla
 				gs 'stat'
@@ -689,41 +648,32 @@ if $ARGS[0] = 'emptystall':
 	act 'Look at the Hole': gt 'gdktoilet', 'hole'
 	act 'Get Up':
 		cla
-		gs 'stat'
 		'You decide not to look in the hole and leave.'
 		act 'Leave': gt'gdktoilet', 'womens'
 	end
 end
 
 if $ARGS[0] = 'contmast':
+	*clr & cla
 	pcs_mood += 5
 	menu_off = 1
-	gs 'stat'
 	if picrand = 1:
-		*clr & cla
-		gs 'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/caress1.mp4"></video></center>'
 	else
-		*clr & cla
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/mast/mastr.jpg"></center>'
 	end
 	if pcs_horny <= 60:
-		'You are starting to feel warm and you insert your finger in your pussy.'
-		gs 'arousal', 'masturbate', 5
-		gs 'stat'
+		'You are starting to feel warm and you insert your finger in your pussy.'	
 	else
 		'You are starting to feel warm and you insert your finger in your pussy. You keep fingering your pussy and before long you are breathing heavily and start to moan.'
-		gs 'arousal', 'masturbate', 5
-		gs 'stat'
 	end
+	gs 'arousal', 'masturbate', 5
+	gs 'stat'
 	if pcs_horny >= 90:
 		act 'Climax':
 			*clr & cla
 			pcs_mood += 15
-			pcs_willpwr += 15
-			if pcs_inhib < 40:inhib_exp += rand(1,3)
-			gs 'stat'
+			if pcs_inhib < 40: inhib_exp += rand(1,3)
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/orgasm.mp4"></video></center>'
 			$orgasm_or = 'custom'
 			$orgasm_txt = 'As your pussy gets wet you pulls you panties down and slip your fingers inside of yourself. You start finger fucking yourself, with in a few minutes a powerful orgasm rocks your body. Leaving you gasping and trembling as you recover.'
@@ -774,6 +724,11 @@ if $ARGS[0] = 'hole':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/ghseemen.jpg"></center>'
 		'You look through the hole and see several men with their backs to you, using the urinals.'
+		act 'Don''t do it':
+			cla
+			'You move away from the hole reconsidering what you were about to do and quickly leave the stall.'
+			act 'Leave':gt 'gdktoilet', 'womens'
+		end
 		act 'Stick your finger in the hole':
 			*clr & cla
 			money += 100
@@ -784,8 +739,7 @@ if $ARGS[0] = 'hole':
 				'You put your finger in the hole hoping to entice a man to come over...'
 				'The man slips 100 <b>₽</b> into the hole, and then puts his erect cock through the hole.'
 				act 'Blow Him': gt 'gdktoilet', 'blowjob'
-			end
-			if gloryhole > 0:
+			elseif gloryhole > 0:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/ready.jpg"></center>'
 				'You poke your finger in the hole showing that you are ready to serve a man. Then you put your face close to the hole and open your mouth.'
 				'The stranger slips 100 <b>₽</b> into the hole, and then his erect cock pokes out of the hole.'
@@ -795,29 +749,21 @@ if $ARGS[0] = 'hole':
 				*clr & cla
 				'Seeing the dick poke through, you reconsider what you are about to do, do you really want to suck some strange man''s dick, through a hole in the bathroom for money?'
 				act 'Take his money and Leave':gt 'gdktoilet', 'rape'
-				act 'Give back the money and Leave':
-					money -= 100
-					gt 'gdktoilet', 'womens'
-				end
+				act 'Give back the money and Leave': money -= 100 & gt 'gdktoilet', 'womens'
 				act 'Blow Him': gt 'gdktoilet', 'blowjob'
 			end
 		end
-		act 'Move away':
-			cla
-			'You move away from the hole reconsidering what you were about to do and quickly leave the stall.'
-			act 'Leave':gt 'gdktoilet', 'womens'
-		end
 	else
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/ghseenomen.jpg"></center>'
 		'Looking through the hole, you can see a row of urinals on the other side. The hole must be to the men''s room next door. You don''t see any men currently in there.'
+		act 'Leave': gt 'gdktoilet', 'womens'
 		act 'Wait':
 			cla
 			'You decide stay and wait for someone to come.'
 			act 'Keep looking': gs 'gdktoilet', 'hole'
 		end
-		act 'Leave': gt 'gdktoilet', 'womens'
 	end
 end
 
@@ -829,14 +775,23 @@ if $ARGS[0] = 'virgin':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
 		'You shudder in disgust at the thought that you were just touching some stranger''s dick. You get up and quickly leave.'
-			act'Leave':gt 'gdktoilet', 'womens'
-		end
+		act'Leave':gt 'gdktoilet', 'womens'
+	end
+	
 	act 'Grab it':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghfeeling.mp4"></video></center>'
 		'Biting your lip and deciding you want to feel it some more, you reach over again and grab it. You caress it with your hand, it is harder than you expected and warm to the touch, it almost feels like it is throbbing in your hand. Unexplained feelings of excitement run through your body. You hear through the wall the guy saying, "Stop playing with it and stroke it." "Huh?" You reply, not knowing why he wants you to stroke it. He replies, "Really, you don''t know? Just grab it with your hand and slide it up and down."'
 		gs 'arousal', 'foreplay', 5, 'unknown'
 		gs 'stat'
+		act 'Stop':
+			*clr & cla
+			gs 'arousal', 'end'
+			gs 'stat'
+			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
+			'You let go of him, wondering what possessed you to grab some stranger''s dick in the first place. You quickly leave the stall, you can hear the guy. "Hey why did you stop?... Hello? Are you still there? What the fuck!"'
+			act 'Quickly get out': gt 'gdktoilet', 'womens'
+		end
 		act 'Slide your hand on his penis':
 			*clr & cla
 			gs 'stat'
@@ -846,10 +801,9 @@ if $ARGS[0] = 'virgin':
 			gs 'stat'
 			act 'Continue Stroking':
 				*clr & cla
-				spafinloc = 13
 				minut +=5
 				gs 'arousal', 'end'
-				gs 'cum_manage'
+				gs 'cum_call', 'hands', 'an unknown guy from the gloryhole'
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghmastcum.mp4"></video></center>'
 				'Without any warning, hot white liquid spurts out the tip of his penis. You look at your hands, watching the sperm run down the back of your hand and down onto your arm. The man panting says, "That was," he takes another breath, "That was great."'
@@ -857,34 +811,22 @@ if $ARGS[0] = 'virgin':
 				act 'Continue': gt 'gdktoilet', 'emptystall'
 			end
 		end
-		act 'Stop':
-			*clr & cla
-			gs 'arousal', 'end'
-			gs 'stat'
-			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/eww.mp4"></video></center>'
-			'You let go of him, wondering what possessed you to grab some stranger''s dick in the first place. You quickly leave the stall, you can hear the guy. "Hey why did you stop?... Hello? Are you still there? What the fuck!"'
-			act 'Quickly get out': gt 'gdktoilet', 'womens'
-		end
 	end
 end
 
 if $ARGS[0] = 'blowjob':
-	cla
-	*clr
+	*clr & cla
 	guy += 1
 	ghnow += 1
 	gloryhole += 1
-	pcs_throat += 1
-	sexcontra = 0
-	temp = rand(1, 3)
+	temp = rand(1,3)
 	'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghbj<<temp>>.mp4"></video></center>'
 	'You wrap your lips around his dick and take his <<npc_dick[$npclastgenerated]>>cm long <<$npc_thdick[$npclastgenerated]>> cock in your mouth and start to suck it, you suck the cock enthusiastically.'
 	gs 'arousal', 'bj', 5, 'unknown', 'sub'
 	gs 'stat'
 	if stat['vaginal'] > 0 or stat['anal'] > 0:act 'Undress':gt 'gdktoilet', 'ghsex'
 	act 'Continue to Suck':
-		cla
-		*clr
+		*clr & cla
 		temp = rand(1, 3)
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghbj<<temp>>.mp4"></video></center>'
 		'You suck on his dick, bobbing your head, sometimes using your hands to stroke his shaft at the same time, other times your hands massage his balls. Before to long you hear the guy moan in pleasure, "I''m cuming."'
@@ -892,10 +834,9 @@ if $ARGS[0] = 'blowjob':
 		gs 'stat'
 		act 'Swallow':
 			*clr & cla
-			gs 'arousal', 'end'
 			swallow += 1
-			spafinloc = 12
-			gs 'cum_manage'
+			gs 'cum_call', 'mouth', 'an unknown guy from the gloryhole'
+			gs 'arousal', 'end'
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghswallow.mp4"></video></center>'
 			'Despite what he says you keep sucking his dick, you are looking forward to him filling your mouth up with his tasty sperm. Moments later hot spurts of cum fill your mouth, you savor the taste of it in your mouth, before you swallow it all down.'
@@ -903,10 +844,9 @@ if $ARGS[0] = 'blowjob':
 		end
 		act 'Step back':
 			*clr & cla
-			gs 'arousal', 'end'
-			spafinloc = 11
 			facial += 1
-			gs 'cum_manage'
+			gs 'cum_call', 'face', 'an unknown guy from the gloryhole'
+			gs 'arousal', 'end'
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghfacial.mp4"></video></center>'
 			'You pull your mouth off his dick but keep jerking him off, shortly later, hot spurts of cum start flying and covering your face.'
@@ -923,17 +863,12 @@ if $ARGS[0] = 'ghsex':
 	'You let go of him and quickly undress, once you are naked you start stroking him again while you line yourself up with his dick. You badly want to fuck him.'
 	gs 'arousal', 'hj', 5, 'unknown', 'sub'
 	gs 'stat'
-	if stat['anal'] > 0:
-		act 'Ass':gt 'gdktoilet', 'anal'
-	end
-	if stat['vaginal'] > 0:
-		act 'Pussy':gt 'gdktoilet', 'pussy2'
-	end
+	if stat['anal'] > 0: act 'Ass':gt 'gdktoilet', 'anal'
+	if stat['vaginal'] > 0: act 'Pussy':gt 'gdktoilet', 'pussy2'
 end
 
 if $ARGS[0] = 'anal':
-	cla
-	*clr
+	*clr & cla
 	'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghintoass.mp4"></video></center>'
 	'You rub your wet pussy and get your fingers nice and wet and then rub it on your asshole, you do the same to his dick, then you guide his <<npc_dick[$npclastgenerated]>>cm <<$npc_thdick[$npclastgenerated]>> cock into your ass. You feel his dick enter your tight ass, feelings of pain and pleasure rush through you.'
 	gs 'arousal', 'masturbate', 5, 'unknown', 'sub'
@@ -946,28 +881,31 @@ if $ARGS[0] = 'anal':
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghanal.mp4"></video></center>'
 
 		if pcs_ass < 10:
-			pcs_ass += 2
-			agape = 2
 			'The pain doesn''t fade and instead it starts to hurt worse after a while and the pleasure starts to fade. You fuck his dick with your ass, at first taking him deeper and deeper, as you get faster and faster. As the pleasure fades and the pain gets worse you slow down and don''t take him as deep. you start to rub your clit to help with the sensation of pleasure. You consider stopping as the pain gets worse, but you can tell by the throbbing of his dick and ragged breathing he is about to cum and decided to keep it up so he can finish.'
 		elseif pcs_ass < 20:
-			pcs_ass += 1
-			agape = 1
 			'The pain fades slowly and soon all you feel pleasure. You fuck his dick with your ass, taking him deeper and deeper, as you get faster and faster, you start to rub your clit as you feel yourself getting close to climax. You can tell by the throbbing of his dick and ragged breathing he is about to cum.'
 		else
-			pcs_ass += 1
 			'The pain fades quickly and soon all you feel pleasure. You fuck his dick with your ass, taking him deeper and deeper, as you get faster and faster, you start to rub your clit as you feel yourself getting close to climax. You can tell by the throbbing of his dick and ragged breathing he is about to cum.'
-			gs 'arousal', 'anal', 5, 'unknown', 'sub'
+		end
+		gs 'arousal', 'anal', 5, 'unknown', 'sub'
+		gs 'stat'
+		
+		act 'Stop':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/analpain.jpg"></center>'
+			'The pain gets to be to much and you can''t take it anymore, on the verge of tears you stop and pull your ass off his dick. You quickly get dressed and leave, you wonder if it was supposed to hurt that much. You can hear the guy yelling at you for having stopped before he finished.'
 			gs 'arousal', 'end'
 			gs 'stat'
-		end
 
+			act 'Leave': gt'gdktoilet', 'womens'
+		end
 		act 'Let him cum in your ass':
 			*clr & cla
-			spafinloc = 3
-			gs 'cum_manage'
+			gs 'cum_call', 'anus', 'an unknown guy from the gloryhole'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghanalcream1.mp4"></video></center>'
 			'You feel his dick throb as he shoots his load of sperm deep in your ass, filling it up. When you pull your ass off his dick, you feel the hot sperm spilling out of your gaping asshole.'
 			gs 'arousal', 'anal', 10, 'unknown', 'sub'
+			minut -= 9
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -975,11 +913,11 @@ if $ARGS[0] = 'anal':
 		end
 		act 'Let him cum all over your ass':
 			*clr & cla
-			spafinloc = 4
-			gs 'cum_manage'
+			gs 'cum_call', 'butt', 'an unknown guy from the gloryhole'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/ghcumonass.jpg"></center>'
 			'You pull your ass away, feeling his cock slip out of your asshole, just as you feel hot splashing of cum landing on your butt, coating your cheeks and running down the crack of your ass.'
 			gs 'arousal', 'anal', 10, 'unknown', 'sub'
+			minut -= 9
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -987,12 +925,12 @@ if $ARGS[0] = 'anal':
 		end
 		act 'Turn around, kneel and let him cum in your mouth':
 			*clr & cla
-			spafinloc = 12
 			swallow += 1
-			gs 'cum_manage'
+			gs 'cum_call', 'mouth', 'an unknown guy from the gloryhole'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghswallow.mp4"></video></center>'
 			'Once down on your knees you take his dick into your mouth and start sucking him, tasting your own ass on his dick. But you are looking forward to him filling your mouth up with his tasty sperm. Moments later hot spurts of cum fill your mouth, you savor the taste of it in your mouth, before you swallow it all down.'
 			gs 'arousal', 'bj', 10, 'unknown', 'sub'
+			minut -= 9
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -1000,27 +938,17 @@ if $ARGS[0] = 'anal':
 		end
 		act 'Turn around, kneel and let him cum on your face':
 			*clr & cla
-			spafinloc = 11
 			facial += 1
-			gs 'cum_manage'
+			gs 'cum_call', 'face', 'an unknown guy from the gloryhole'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghfacial.mp4"></video></center>'
 			'You put your face near his dick and start jerking him off, shortly later, hot spurts of cum start flying and covering your face.'
 			gs 'arousal', 'hj', 10, 'unknown', 'sub'
+			minut -= 9
 			gs 'arousal', 'end'
 			gs 'stat'
 
 			act 'Get up': gt'gdktoilet', 'emptystall'
 		end
-		act 'Stop':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/womens/sex/analpain.jpg"></center>'
-			'The pain gets to be to much and you can''t take it anymore, on the verge of tears you stop and pull your ass off his dick. You quickly get dressed and leave, you wonder if it was supposed to hurt that much. You can hear the guy yelling at you for having stopped before he finished.'
-			gs 'arousal', 'end'
-			gs 'stat'
-
-			act 'Leave': gt'gdktoilet', 'womens'
-		end
 	end
 end
 
@@ -1055,12 +983,12 @@ if $ARGS[0] = 'pussy2':
 	if protect ! 1:
 		act 'Allow him to cum inside':
 			*clr & cla
-			spafinloc = 0
-			gs 'cum_manage'
+			gs 'cum_call', 'vaginal', 'an unknown guy from the gloryhole'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghcreampie.mp4"></video></center>'
 			'Instead of pulling away, you moan "Inside me, please," and push yourself hard against the opening in the wall. You feel his hot sperm fill your pussy in spurt after spurt. When you finally pull yourself off him, you can feel the sperm leaking out of your pussy.'
 			gs 'cuminsidereact', 'an unknown guy from the gloryhole'
 			gs 'arousal', 'vaginal', 10, 'unknown', 'sub'
+			minut -= 9
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -1070,24 +998,24 @@ if $ARGS[0] = 'pussy2':
 			*clr & cla
 			act 'Let him cum in your mouth':
 				*clr & cla
-				spafinloc = 12
 				swallow += 1
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth', 'an unknown guy from the gloryhole'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghswallow.mp4"></video></center>'
 				'Once down on your knees you take his dick into your mouth and start sucking him. You are looking forward to him filling your mouth up with his tasty sperm. Moments later hot spurts of cum fill your mouth, you savor the taste of it in your mouth, before you swallow it all down.'
 				gs 'arousal', 'bj', 10, 'unknown', 'sub'
+				minut -= 9
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Get dressed': gt'gdktoilet', 'emptystall'
 			end
 			act 'Let him cum on your face':
 				*clr & cla
-				spafinloc = 11
 				facial += 1
-				gs 'cum_manage'
+				gs 'cum_call', 'face', 'an unknown guy from the gloryhole'
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghfacial.mp4"></video></center>'
 				'You put your face near his dick and start jerking him off, shortly later, hot spurts of cum start flying and covering your face.'
 				gs 'arousal', 'hj', 10, 'unknown', 'sub'
+				minut -= 9
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Get dressed': gt'gdktoilet', 'emptystall'
@@ -1123,6 +1051,7 @@ if $ARGS[0] = 'rape':
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/mensrape4.mp4"></video></center>'
 			'You bite down his dick, which makes him pull his dick out of your mouth. "Fine you little fucking cunt, we''ll do this the hard way." He lifts you up and forces you between two urinals with your face up against the wall. He roughly shoves his cock in your ass, the only lubrication is the bit of your saliva still on his dick. It feels like he is ripping your ass open, you cry and scream. He just jackhammers your ass balls deep, while holding you by the throat.'
 			gs 'arousal', 'anal', 10, 'unknown', 'sub', 'rough'
+			minut -= 5
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
@@ -1130,22 +1059,16 @@ if $ARGS[0] = 'rape':
 				'As you scream he reaches up and clamps a hand over your mouth to muffle your screams, he continues you pound your ass balls deep with his dick. Not relenting no matter how much you struggle or cry. "You think it''s funny bitch to steal a man''s hard earned money, well you won''t think it is so funny after I am done with you. I''m going to fuck your ass till it bleeds like your cunt."'
 				'He keeps ripping your ass up with his dick, the pain is unbearable, but there is nothing you can do about it. You really wish you hadn''t taken his money and kept it.'
 				gs 'arousal', 'anal', 10, 'unknown', 'sub', 'rough'
+				minut -= 5
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
-					spafinloc = 12
 					rape += 1
-					gs 'cum_manage'
-					if pcs_ass < 10:
-						pcs_ass += 3 & agape = 3
-					elseif pcs_ass < 20:
-						pcs_ass += 2 & agape = 3
-					else
-						pcs_ass += 2 & agape = 2 & pcs_horny += RAND(20,40)
-					end
+					gs 'cum_call', 'mouth', 'an unknown guy from the gloryhole'
 					'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/mens/sex/cumspit.mp4"></video></center>'
 					'Finally he pulls the dick out of your ass and forces you back to your knees, he shoves his dick back in your mouth and you can taste your own ass on his dick. He says to you. "You fucking bite me again bitch and I will call everyone I know and we will train fuck your ass for days." Afraid he is serious you suck his dick until he finally shoots his load in your mouth.'
 					gs 'arousal', 'bj', 10, 'unknown', 'sub', 'rough'
+					minut -= 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					'With that he lets go of you and walks off in disgust.'
@@ -1179,10 +1102,7 @@ if $ARGS[0] = 'rape':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
 		'You run from the community center and don''t stop until you are back in the residential area'
-		act 'Catch your breath':
-			minut += 5
-			gt 'pavResidential'
-		end
+		act 'Catch your breath': minut += 5 & gt 'pavResidential'
 	end
 end
 

locations/gopskver.qsrc

@@ -44,7 +44,7 @@ if kotovLoveQW > 0:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'
 			'The guys pour out a beer for you, and you enjoy a nice cold beer in their company.'
-			
+
 			act 'Continue':
 				if $prevloc = 'gkafe':
 					gt 'gkafe'
@@ -52,7 +52,7 @@ if kotovLoveQW > 0:
 					gt 'gskver', 'start'
 				end
 			end
-			
+
 			if hour = 20:
 				*nl
 				if week = 5 or week = 6:
@@ -73,7 +73,7 @@ if kotovLoveQW > 0:
 				*clr & cla
 				minut += 15
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 				'You take Vitek by the hand and almost feel like he''s showing you off, ' + iif($prevloc='gkafe','when he walks you to the exit of the cafe. You take a little walk','when you walk across the park square towards the exit.  You leave the park') + ' and Vitek guides you to where he lives. It''s a rather worn-down house from the outside, and the inside doesn''t look much better. Crumpled heaps of clothes lie everywhere, and the floor is littered with empty bottles.'
 
 				act 'Continue':gt 'kotovSex'
@@ -204,7 +204,7 @@ else
 						gt 'gskver', 'start'
 					end
 				end
-				
+
 				act 'Drink beer with the guys':
 					*clr & cla
 					minut += 15
@@ -212,7 +212,7 @@ else
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'
 					'The guys cheer and pour out a beer for you. Vasily gives you ' + iif($prevloc = 'gkafe','a glass','the cup') +' while the others propose a toast, already having beers in their hands. You happily join them in their toast, and spend the next 15 minutes chatting with them and having sips of your cold beer.'
-							
+
 					act 'Continue':
 						if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
 							gt $prevloc
@@ -228,18 +228,18 @@ else
 						else
 							'It''s evening, and the boys are getting ready to go to Vasily''s home. You could call it a night and leave them alone, or tag along.'
 							act 'Go with the boys': minut += 15 & gt 'shulgahall'
-						end	
+						end
 					end
 				end
 			elseif alko >= 6:
 				'You''re already not exactly sober any more, and feel a bit looser while you chat with the guys.'
-				
+
 				if pav_slut < 50:
 					act 'Drink beer with the guys':
 						*clr & cla
 						minut += 5
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/11.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
 						'Vasily puts his hand on your shoulder and tells you that his friends aren''t the kind of guys a nice girl should be getting drunk with and sends you on your way.'
 
 						act 'Continue':
@@ -252,12 +252,12 @@ else
 					end
 				elseif pav_slut < 75:
 					if $prevloc = 'gkafe':
-						'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'			
+						'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
 					elseif $prevloc = 'pavtrainhall':
-						'Vasily suggests to the guys to leave the train station and continue drinking in the park. You are too drunk to resist so you just follow them to the park'	
+						'Vasily suggests to the guys to leave the train station and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
 					end
 					'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you''re a huge tease, is that true?"'
-					
+
 					act '"Yes that''s true"':
 						*clr & cla
 						gs 'stat'
@@ -311,7 +311,7 @@ else
 									fingal += 1
 									body_write = 1
 									sub += 1
-									pcs_mood -= 5	
+									pcs_mood -= 5
 									*clr & cla
 									gs 'stat'
 
@@ -366,7 +366,7 @@ else
 			if shultextrand = 2:$shultextrand = 'Looking for something to suck on?'
 
 			'Vasily grins and shouts as he sees you walk by: "Look guys, it''s our favourite slut! <<$shultextrand>>" His friends laugh loudly at your expense.'
-			
+
 			if $prevloc = 'gkafe':
 				act 'Blush and quickly leave the cafe': gt $prevloc
 			elseif $prevloc = 'pavtrainhall':
@@ -376,12 +376,12 @@ else
 				if BjBeerQW >= 5:
 					act 'Approach the guys': gt'zsoft_gopskverGorSlut','1'
 				elseif BjBeerQW < 5:
-					act 'Ask for a beer': 
+					act 'Ask for a beer':
 						if BjBeerDay = daystart:
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/11.jpg"></center>'
-							'Vasily smirks and slaps your hand away: "Go beg somewhere else, whore. You''ve had enough for today, the open bar is closed for sluts like you. Come back tomorrow."' 
-							act 'Leave them and walk away':gt 'gskver', 'start' 
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
+							'Vasily smirks and slaps your hand away: "Go beg somewhere else, whore. You''ve had enough for today, the open bar is closed for sluts like you. Come back tomorrow."'
+							act 'Leave them and walk away':gt 'gskver', 'start'
 
 						else
 							gt 'gopskver', 'BjBeerStart'
@@ -396,28 +396,28 @@ end
 if $ARGS[0] = 'BjBeerStart':
 	*clr & cla
 	'You could really use a cold beer right now! You try to get on the boys'' good side and ask in a playful tone: "Come on guys, you know that''s no way to talk to a lady! How about you offer me a nice cold beer instead?"'
-	'You get into a seductive pose and give them your most enchanting smile. The guys look and whisper some things at each other, but Vasily quickly grins and beckons you to come closer.' 
-	'You shake your hips and teasingly lick your parched <<$liptalk3>>, and for a second you wonder if you''re laying it on too thick as you approach the three guys. You can feel your mouth water when you see the cold beer they''re reaching out to you though. Just when you reach out to take it from him, he suddenly pulls it away from you.' 
+	'You get into a seductive pose and give them your most enchanting smile. The guys look and whisper some things at each other, but Vasily quickly grins and beckons you to come closer.'
+	'You shake your hips and teasingly lick your parched <<$liptalk3>>, and for a second you wonder if you''re laying it on too thick as you approach the three guys. You can feel your mouth water when you see the cold beer they''re reaching out to you though. Just when you reach out to take it from him, he suddenly pulls it away from you.'
 	act 'Act surprised':
 		cla
-		'<center><video autoplay loop src="images/locations/pavlovsk/park/sex/gop/bjbeer.mp4" ></video></center>'	
+		'<center><video autoplay loop src="images/locations/pavlovsk/park/sex/gop/bjbeer.mp4" ></video></center>'
 		'Before you can ask why he did that, Dan speaks up: "Didn''t you forget your place, slut? You have to earn your beer first, before you get to drink it."'
 		'With those words he pulls his hard cock out of his pants, and his friends soon follow his lead. They grin greedily at you and Vasily says: "Just sit down over there and open your mouth, whore. We''ll feed you."'
-		
+
 		act 'Suck them off for a beer': gt 'gopskver','BjBeerYes'
-		
+
 		if BjBeerQW >= 5:
 			act 'Open your legs for a beer': gt 'gopskver','BjBeerVag'
 			act 'Take it in the ass for beer': gt 'gopskver','BjBeerAnal'
 		end
- 
+
 		if pcs_dom > 0 and pcs_stren + pcs_agil + pcs_run < 180: act 'Refuse and run': gt 'gopskver', 'BjBeerBeaten'
- 
+
 		if pcs_dom > 0 and razradKik >= 3 or pcs_stren + pcs_agil + pcs_run >= 180:
 			act 'Refuse and run':
 				cla
 				cls
-				'The Gopniks don''t take your refusal very well, and try to force you anyway when they realize you''re not going to do what they want. However, your athletic training pays off and you manage to outrun them. Once you''re certain they''re no longer following you, you stop for a moment to catch your breath.' 
+				'The Gopniks don''t take your refusal very well, and try to force you anyway when they realize you''re not going to do what they want. However, your athletic training pays off and you manage to outrun them. Once you''re certain they''re no longer following you, you stop for a moment to catch your breath.'
 				act 'Return to the park': gt 'gskver', 'start'
 			end
 		end
@@ -429,7 +429,7 @@ if $ARGS[0] = 'BjBeerBeaten':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeerbeaten.jpg" ></center>'
 	pcs_hairbsh = 0
 	minut += 10
-	spank += 1 
+	spank += 1
 	sub += 3
 	spanked = 1
 	spankedtime = totminut
@@ -440,20 +440,20 @@ if $ARGS[0] = 'BjBeerBeaten':
 	gs 'stat'
 
 	'You refuse to have sex with them in any shape or form, just for a can of beer! The guys are furious now, especially Dan: "What!? We''ll teach you, whore!"'
-	'When you get up and try to run away from them, Dan slaps you hard enough to knock you off-balance, and you fall to the ground. Tears form in your eyes and you struggle to get away from the boys, but they are way too strong for you and keep you pinned to the ground.' 
+	'When you get up and try to run away from them, Dan slaps you hard enough to knock you off-balance, and you fall to the ground. Tears form in your eyes and you struggle to get away from the boys, but they are way too strong for you and keep you pinned to the ground.'
 	'You beg and plead them to let you go, but they ignore your pleas and pull you further into the woods after gagging you with a piece of cloth. Once they arrive at a bench that you didn''t even know was in the park, they''re satisfied they won''t be disturbed and push you onto the ground. You try to plead again, but all that escapes from your mouth is a low muffled moan.'
 	'The other two guys hold you firmly, while Dan slaps your ass hard. "You will teach you your place, whore. We have all day."'
 	'Tears stream from your eyes now, and your earlier protests have turned into little more than quiet whimpers when Dan''s hand strikes your ass again. Vasily grins: "I think she''s ready to cooperate now. Aren''t you, little slut of ours?"'
-	'You just want the torture to stop, and nod meekly. The guys pull you towards the bench, and pull you over it so your knees rest on the seat. Vasily takes place behind the bench and pulls the gag from your mouth, replacing it with his cock.' 
+	'You just want the torture to stop, and nod meekly. The guys pull you towards the bench, and pull you over it so your knees rest on the seat. Vasily takes place behind the bench and pulls the gag from your mouth, replacing it with his cock.'
 	'With your spirit broken from the rough treatment, you don''t know any better but to just open your mouth and let him in. Vasily gladly accepts your unspoken invitation, and immediately shoves his cock deeper down your throat and begins to facefuck you. It''s a little hard to breathe at first, but after a while you get into the rhythm and just let him fuck your throat while your saliva runs down your chin. Then he pulls his cock from your mouth and sits down on the bench, next to his friends and tells you: "Alright... that was fun, but there''s no reason why we should do all the work. Your turn now, <<$pcs_nickname>>. Make it good."'
-	
+
 	if BjBeerQW = 3:
 		'You quickly drop to your knees and suck the guys off diligently, looking up at them fearfully. As long as you do a good job, they''ll let you control the pace... right?'
-		*pl 
+		*pl
 		'Dan is not unhappy with your efforts, but feels bored after you move away from his cock again. He offers: "She''s got more than one hole, guys... why are we all sharing just the one?"'
 		'The thought barely registers in your mind at first, but finally it does: they''re going to fuck you too!?'
 		if pcs_dom>10 and pcs_vag = 0 and pcs_ass >5 and pcs_horny < 75:
-			act 'Offer your ass instead': 
+			act 'Offer your ass instead':
 				'You plead to the guys: "Please guys, I''m still a virgin! My <<$npc_nickname[''A29'']>> would kill me if I lost my virginity, she has me checked every month! Maybe... maybe there''s something else I could do to please you, if you leave my pussy alone?"'
 				act 'Take it in the ass':gt 'gopskver','BjBeerAnal'
 			end
@@ -485,15 +485,15 @@ if $ARGS[0] = 'BjBeerYes':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Bjrand>>.jpg" ></center>'
 	'You take a deep sigh... guess that''s the way it''s going to be, now. At least these guys will take care of you if you get in trouble, and they''ll give you beer... that''s not so bad, right?'
 	'You squat down without objections, and obediently open your mouth while you stare at the guys. They quickly undo their pants, and Vasily is the first to reach your mouth. You dutifully suck him off, ignoring the rather foul taste that comes from his dick. After a bit of sucking, it''s mostly gone anyway.'
-	'The other guys also want you to please them, and you put your hands on their hard cocks while you give Vasily a blowjob. After a while you switch, trying to give them all a blowjob at the same time.' 
+	'The other guys also want you to please them, and you put your hands on their hard cocks while you give Vasily a blowjob. After a while you switch, trying to give them all a blowjob at the same time.'
 	*pl
 	if BjBeerQW = 3:
 		*pl
-		'You obediently drop to your knees and lick your lips, looking up at the guys with your <<$glaza3>>.' 
+		'You obediently drop to your knees and lick your lips, looking up at the guys with your <<$glaza3>>.'
 		'Pleased with your eagerness, Vasily says: "I bet we could get more out of her than just a blowjob. Let''s go find a quiet place and put her other holes to work too!"'
 		'You meekly object, but it gets drowned out by the enthusiastic shouts of the others. They pull you up and guide you to a place where no one ever comes.'
 		if pcs_dom>10 and pcs_vag = 0 and pcs_ass >5 and pcs_horny < 75:
-			act 'Offer your ass instead': 
+			act 'Offer your ass instead':
 				'You plead to the guys: "Please guys, I''m still a virgin! My <<$npc_nickname[''A29'']>> would kill me if I lost my virginity, she has me checked every month! Maybe... maybe there''s something else I could do to please you, if you leave my pussy alone? Please?"'
 				act 'Take it in the ass':gt 'gopskver','BjBeerAnal'
 			end
@@ -537,15 +537,15 @@ if $ARGS[0] = 'BjBeerAct':
 	else
 		'Your tongue tightly hugs his penis as he pushed it all the way past your <<$liptalk>>, you successfully managed to take his cock all the way down your throat. Eventually, your lower lip is resting on his scrotum.'
 	end
- 
+
 	act 'Lick his balls':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/pavlovsk/park/sex/gop/bjbeer<<throatrand>>.mp4"></video></center>'
-		'While you work their cocks with your throat, you don''t forget to use your tongue and enthusiastically lick their hairy balls whenever your tongue can reach them.' 
+		'While you work their cocks with your throat, you don''t forget to use your tongue and enthusiastically lick their hairy balls whenever your tongue can reach them.'
 		'Unable to withstand such a powerful stimulation, the guy grabs onto the back of your head and pushes his cock all the way down your throat, not giving you any room to breathe. Fortunately, he orgasms right away.'
 		'Thick gobs of his semen enter your throat as he moans loudly, and you automatically swallow every drop in a reflex. Finally, the dick is pulled away from your face and you can breathe again. Vasily grins at your reddened face and says: "Enjoy your meal, slut!" and walks away.'
 		'Vitek immediately takes his place and presses his 18cm cock against your lips: "You''re not done yet, whore. Keep sucking!"'
-		if BjBeerQW = 1: 
+		if BjBeerQW = 1:
 			act 'Serve the others': gt 'gopskver','BjBeerPhone'
 		elseif BjBeerQW = 2:
 			act 'Serve the others': gt 'gopskver','BjBeerPalevo'
@@ -568,9 +568,9 @@ if $ARGS[0] = 'BjBeerPas':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer4.jpg" ></center>'
-	'You lazily take the cock in your mouth. You make a token effort of using your tongue a little, but all in all just aren''t feeling it today. The guys sit back and have another beer while you passively suck their cocks, but a half hour later they''re not much closer to being satisfied than when you started.' 
+	'You lazily take the cock in your mouth. You make a token effort of using your tongue a little, but all in all just aren''t feeling it today. The guys sit back and have another beer while you passively suck their cocks, but a half hour later they''re not much closer to being satisfied than when you started.'
 	'Finally, Dan pulls his dick away from you and complains: "That has to be by far the worst blowjob I have ever gotten. It''s been half an hour already... are you even trying?"'
-	'You promise you''ll do better, and obediently open your mouth again.' 
+	'You promise you''ll do better, and obediently open your mouth again.'
 
 	act 'Open your mouth':
 		*clr & cla
@@ -579,8 +579,8 @@ if $ARGS[0] = 'BjBeerPas':
 		'Vasily already jerked him off to near completion while you weren''t looking, and when you open your mouth he immediately shoots several hot jets of sperm into it. You''re too scared of the guys to pull away, and just wait with your mouth open. Once he finishes, Vasily puts his hand over your mouth and pinces your nose shut, forcing you to swallow his load.'
 		'You wince at the horrible taste, but try to hide your disgust as you swallow it.'
 		'Vasily doesn''t care and just grins: "Get used to it, slut. You''ll be getting that taste in your mouth a lot more often. You meekly nod, not wanting to argue with the guy, and obediently lick the last bits of his sperm from his cock.'
-		'Vitek immediately takes his place and presses his 17cm cock against your lips: "You''re not done yet, whore. Keep sucking! And put some effort into it this time, my patience is wearing thin."'	
-		if BjBeerQW = 1: 
+		'Vitek immediately takes his place and presses his 17cm cock against your lips: "You''re not done yet, whore. Keep sucking! And put some effort into it this time, my patience is wearing thin."'
+		if BjBeerQW = 1:
 			act 'Serve the others': gt 'gopskver','BjBeerPhone'
 		elseif BjBeerQW = 2:
 			act 'Serve the others': gt 'gopskver','BjBeerPalevo'
@@ -606,16 +606,16 @@ if $ARGS[0] = 'BjBeerDouble':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Doublerand>>.jpg" ></center>'
-	'You spread your <<$liptalk>> and wrap them around Vitek''s cock. At that moment, Dan grunts: "Open wider, slut" and begins to unceremoniously cram his dick into your mouth as well, stretching it to the limit. You try to protest, but the guys just laugh at the comical sounds you make with two cocks in your mouth. Once Dan gets settled in, the guys slowly begin to move, fucking your mouth at the same time.' 
+	'You spread your <<$liptalk>> and wrap them around Vitek''s cock. At that moment, Dan grunts: "Open wider, slut" and begins to unceremoniously cram his dick into your mouth as well, stretching it to the limit. You try to protest, but the guys just laugh at the comical sounds you make with two cocks in your mouth. Once Dan gets settled in, the guys slowly begin to move, fucking your mouth at the same time.'
 
 	if pcs_throat > 15:
 		'Even though it''s difficult, you manage to take both of their erections deep inside your mouth. You sometimes tease them with your tongue.'
 	else
-		'The cocks in your mouth are making it difficult for you to breathe, and you can feel tears forming in the corners of your eyes while you do your best to not anger the guys. Choking and gasping, you do your best to service them both, but most of your efforts are focused on keeping down the compulsion to retch. It''s becoming more and more difficult.' 
+		'The cocks in your mouth are making it difficult for you to breathe, and you can feel tears forming in the corners of your eyes while you do your best to not anger the guys. Choking and gasping, you do your best to service them both, but most of your efforts are focused on keeping down the compulsion to retch. It''s becoming more and more difficult.'
 	end
 
-	'The Gopniks don''t care about your troubles, and continue to play with your mouth. They rub their own cocks against the inside of your cheeks, and constantly give you degrading talk.' 
-	'Luckily the guys don''t last long, and finish fairly quickly. They both pull out and drop their loads on your face, and wipe their dicks on your <<$pcs_haircol>> <<$curly>> hair before finally letting go of your head.' 
+	'The Gopniks don''t care about your troubles, and continue to play with your mouth. They rub their own cocks against the inside of your cheeks, and constantly give you degrading talk.'
+	'Luckily the guys don''t last long, and finish fairly quickly. They both pull out and drop their loads on your face, and wipe their dicks on your <<$pcs_haircol>> <<$curly>> hair before finally letting go of your head.'
 	act 'Try to clean yourself up a little': gt'gopskver','BjBeerFace'
 end
 
@@ -624,7 +624,7 @@ if $ARGS[0] = 'BjBeerFace':
 	if pcs_makeup = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer6.jpg" ></center>'
 		'You fall back onto the ground, feeling completely exhausted. Your face is a complete mess. The tears, saliva and semen smeared your make-up everywhere, and you look like a lost panda bear. A very slutty panda bear with cum all over her face.'
-	else 
+	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer5.jpg" ></center>'
 		'You fall back onto the ground, feeling completely exhausted. Your face is a complete mess. Your tears and saliva are everywhere, mixed with the boys'' semen.'
 	end
@@ -638,7 +638,7 @@ if $ARGS[0] = 'BjBeerFace':
 		'Dan softly says to his friends: "We should make a video next time... maybe a video of her choking on a cock?" The boys laugh loudly.'
 	elseif BjBeerQW = 1:
 		'The boys are whispering amongst themselves, thinking you can''t hear them. You pick up a few snippets of the conversation: "<<$pcs_nickname>>? My dad told me her mother was a huge whore in her days... he said she has a mouth like a vacuum cleaner! I guess the apple doesn''t fall far from the family tree eh? I should thank him for that tip..."'
-		'The boys laugh, and you hide your face from them so they don''t see your red cheeks.' 
+		'The boys laugh, and you hide your face from them so they don''t see your red cheeks.'
 	elseif BjBeerQW = 2:
 		'The boys are whispering amongst themselves: "She''s got a good mouth on her, sure. But what about her other holes? Next time, we have to give that a try..."'
 	end
@@ -646,27 +646,27 @@ if $ARGS[0] = 'BjBeerFace':
 		*clr & cla
 		if BjBeerActiv = 1:
 			Beerrand=rand(11,12)
-			BjBeerQW += 1 
+			BjBeerQW += 1
 			gs 'drugs', 'alcohol', 'beer', 1
 			gs 'stat'
-	
+
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Beerrand>>.jpg"></center>'
 			'Dan grins at you and offers you his unfinished bottle, and smiles when you drink it eagerly. Your mood improves slightly.'
 			act 'Return to the park': BjBeerActiv = 0 & gt 'gskver', 'start'
-	
+
 		elseif BjBeerActiv = 0:
 			pcs_mood = 0
 			BjBeerQW += 1
 			gs 'stat'
-	
+
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer13.jpg"></center>'
 			'Dan shrugs: "It took you way too long to finish us off, we drank all the beer in the meantime."'
 			'He grins as he shows you the empty bottle. You bite your lip in frustration and disappointment when you mutter: "But... but I... how..."'
 			'Maybe you should try harder, next time.'
 			act 'Return to the park': gt 'gskver', 'start'
 		end
-	end  
-end	
+	end
+end
 
 if $ARGS[0] = 'BjBeerPhone':
 	*clr & cla
@@ -681,14 +681,14 @@ if $ARGS[0] = 'BjBeerPhone':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeerphone.jpg"></center>'
-	'You spread your <<$liptalk>> and wrap them around Vitek''s cock. At that moment, Dan grunts: "Open wider, slut" and begins to unceremoniously cram his dick into your mouth as well, stretching it to the limit. You try to protest, but the guys just laugh at the comical sounds you make with two cocks in your mouth.' 
+	'You spread your <<$liptalk>> and wrap them around Vitek''s cock. At that moment, Dan grunts: "Open wider, slut" and begins to unceremoniously cram his dick into your mouth as well, stretching it to the limit. You try to protest, but the guys just laugh at the comical sounds you make with two cocks in your mouth.'
 	'Suddenly Vasily pulls out his phone and begins to record a video, while he comments on what is happening: "Hello everyone, and welcome to Pavlovsk News! Our special guest today is the one and only <<$gnikname>>, <<$pcs_nickname>>! Say hi to our viewers, <<$pcs_nickname>>!"'
-	'"Mvhr ... mflm ..." you try to say something, but the cocks in your mouth prevent you from talking. The boys firmly hold your head in place, and continue to fuck your mouth with their two cocks.' 
+	'"Mvhr ... mflm ..." you try to say something, but the cocks in your mouth prevent you from talking. The boys firmly hold your head in place, and continue to fuck your mouth with their two cocks.'
 	'Vasily continues: "<<$pcs_nickname>>, I''ve been told that you''re doing this, for a beer! Do you really like beer, or do you just like sucking cocks so much?"'
-	'Dan grabs your <<$pcs_haircol>> <<$curly>> hair in his fist, and moves your head so it looks like you''re nodding yes.' 
+	'Dan grabs your <<$pcs_haircol>> <<$curly>> hair in his fist, and moves your head so it looks like you''re nodding yes.'
 	'Vasily piles it on some more: "There you have it, dear viewers! <<$pcs_nickname>> <<$pcs_lastname>> is happily sucking three cocks, for the low low price of one beer! Where else can you find such a cheap slut?"'
 	'You try to protest and turn away from the camera, but Dan''s firm grip on your hair makes it so you cannot move.'
-	'You can only imagine how incredibly foolish and humiliating you must look in the video: on your knees, with two thick cocks in your cute little mouth. The cocks are wedged in so tightly that they make your cheeks bulge and stretch your lips.' 
+	'You can only imagine how incredibly foolish and humiliating you must look in the video: on your knees, with two thick cocks in your cute little mouth. The cocks are wedged in so tightly that they make your cheeks bulge and stretch your lips.'
 
 	if pcs_makeup = 0:
 		'Your cosmetics got smeared from the tears in your eyes, and by now it is smeared all the way down your cheeks. You have strands of saliva hanging out of your mouth, attaching your chin to your boobs.'
@@ -696,7 +696,7 @@ if $ARGS[0] = 'BjBeerPhone':
 		'Your eyes got all teary from the rough treatment, and there are strands of saliva hanging out of your mouth, attaching your chin to your boobs.'
 	end
 
-	'Luckily the guys don''t last long, and finish fairly quickly. They both pull out and drop their loads on your face, and wipe their dicks on your <<$pcs_haircol>> <<$curly>> hair. They make you lick their cocks clean, but don''t let go of your hair just yet.' 
+	'Luckily the guys don''t last long, and finish fairly quickly. They both pull out and drop their loads on your face, and wipe their dicks on your <<$pcs_haircol>> <<$curly>> hair. They make you lick their cocks clean, but don''t let go of your hair just yet.'
 	'Vasily grins as he tells the camera: "And that was the premiere presentation of <<$pcs_nickname>> <<$pcs_lastname>> in her very first production called "Gagging Whore"! You delivered an excellent performance <<$pcs_nickname>>, say hi to your <<$npc_nickname[''A29'']>>!" He zooms in on your face, and continues to film.'
 	act 'Do as he says':
 		cla
@@ -723,16 +723,16 @@ if $ARGS[0] = 'BjBeerPalevo':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Doublerand>>.jpg" ></center>'
-	'By now you know what they want, and humbly open your mouth as wide as possible. Vitek immediately guides his cock towards your mouth, and impatiently pushes it down your <<$throattipe>> throat.' 
-	'At that moment, Dan grunts: "Open wider, slut" and begins to unceremoniously cram his dick into your mouth as well, stretching it to the limit.' 
-	'You know protesting would be pointless and don''t resist, allowing the boys to use your mouth as they please. With some grunts they try to force their cocks further down your throat, and eventually they manage to get both about two thirds of the way in.' 
-	'The Gopniks continue to stare you down, as if you are nothing to them. Vasily jokes from the side: "I see she''s already used to two cocks in that whore mouth of hers... I wonder if she can take a third?"' 
+	'By now you know what they want, and humbly open your mouth as wide as possible. Vitek immediately guides his cock towards your mouth, and impatiently pushes it down your <<$throattipe>> throat.'
+	'At that moment, Dan grunts: "Open wider, slut" and begins to unceremoniously cram his dick into your mouth as well, stretching it to the limit.'
+	'You know protesting would be pointless and don''t resist, allowing the boys to use your mouth as they please. With some grunts they try to force their cocks further down your throat, and eventually they manage to get both about two thirds of the way in.'
+	'The Gopniks continue to stare you down, as if you are nothing to them. Vasily jokes from the side: "I see she''s already used to two cocks in that whore mouth of hers... I wonder if she can take a third?"'
 	*pl
 	'Suddenly, you feel like someone''s watching you. You open your eyes and try to look past the boys, and you see... Kolka, your brother!'
 	'From the look on his eyes, he is just as amazed at how good you are with your mouth as you are yourself. Judging from his posture, he''s not just watching... he''s slowly fondling himself as he watch his sister get fucked in her mouth by two guys at once. What a pervert!'
 	'You can''t reprimand him right now though, as you feel a hand at the back of your head and your focus is redirected to the erections you''re supposed to be servicing with your mouth.'
 	'You feel deeply embarrassed, being exposed to your brother like this... as if the shame of that video was not enough!'
-	'The guys, oblivious to your train of thought, simultaneously reach orgasm, and you have to do your best to swallow their sperm as it hits the back of your throat. You cough and recoil, having a rough time swallowing it all.' 
+	'The guys, oblivious to your train of thought, simultaneously reach orgasm, and you have to do your best to swallow their sperm as it hits the back of your throat. You cough and recoil, having a rough time swallowing it all.'
 	'Several thoughts race through your head... what if he tells your mother or stepfather? What would he think of you now?'
 	'You look around trying to find him again, but he is gone. You obediently suck their cocks clean, and lick the last bits of sperm off them like you always do for the guys. When they''re finally satisfied with your performance, Dan lets go of your hair.'
 	act 'Try to clean yourself up': gt'gopskver','BjBeerFace'
@@ -775,10 +775,10 @@ if $ARGS[0] = 'BjBeerVag':
 		gs 'boyStat', 'A9'
 		minut += 10
 		gs 'stat'
-	
+
 		'<center><video autoplay loop src="images/locations/pavlovsk/park/sex/gop/bjbeervag1.mp4" ></video></center>'
 		'Vitek is their leader, so it only makes sense he gets to go first. The other Gopniks pull you onto the ground, and restrain your body while Vitek moves his hard cock to your pussy and rams it in.'
-	
+
 		gs 'dinsex', 'boy_puts_condom'
 		gs 'dinsex','vaginal_sex',10
 		if protect ! 1:
@@ -801,7 +801,7 @@ if $ARGS[0] = 'BjBeerVag':
 			sexcontra = 0
 		end
 		'You''re still lying on your back, moaning weakly. Knowing you have no permission to get up yet, you just wait for the next guy to fuck you. Dan immediately takes Vitek''s place, and lies down on top of you.'
-	
+
 		act 'Try to relax':
 			*clr & cla
 			Vagrand = rand (2,3)
@@ -813,17 +813,17 @@ if $ARGS[0] = 'BjBeerVag':
 			spafinloc = 14
 			gs 'cum_manage'
 			minut += 10
-			gs 'stat'  
-			
+			gs 'stat'
+
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeervag<<Vagrand>>.jpg" ></center>'
-			'Dan firmly grabs you by the hips, and roughly shoves his cock inside you without any concern for your feelings. His hips vigorously bash against yours, and you can only hope he''s finished soon.'   
-			
+			'Dan firmly grabs you by the hips, and roughly shoves his cock inside you without any concern for your feelings. His hips vigorously bash against yours, and you can only hope he''s finished soon.'
+
 			gs 'dinsex','vaginal_sex',10
-			
+
 			'When he orgasms, he pulls out of you and shoots his load onto your stomach. When he''s finished, he gets up from you and makes room for Vasily.'
 			*pl
 			'Vasily winces when he sees Dan''s cum on your stomach, and mutters: "Dude, you soiled the whore... I don''t want to touch that!"'
-		
+
 			act 'Turn around for Vasily':
 				*clr & cla
 				gs 'boyStat', 'A11'
@@ -833,23 +833,23 @@ if $ARGS[0] = 'BjBeerVag':
 				spafinloc = 4
 				gs 'cum_manage'
 				minut += 10
-				gs 'stat' 
-				
+				gs 'stat'
+
 				'<center><video autoplay loop src="images/shared/sex/public/publ1,1.mp4" ></video></center>'
 				'Your body is aching and tired, but you know you''re not getting away until Vasily had a turn too. Vasily is still unhappy, trying to figure out what to do with you: "Damn, this slut is disgusting... not cool, Dan. Not cool at all!"'
 				'You sigh and turn around, exposing your holes to Vasily. He won''t have to touch Dan''s mess from behind, and Vasily nods at you appreciatively as he guides his cock to your already overworked pussy. "Very nice, whore! Already going the extra mile... and you thought you wouldn''t be good at being a slut!"'
-				
+
 				gs 'dinsex','vaginal_sex',10
 
 				'Vasily firmly holds your hips as he roughly pounds your pussy from behind, making your boobs sway every time he thrusts his hips against yours. Even though his cock is not as big as the other guys'', you''ve already had two before him and your overworked cunt is begging for mercy.'
 				'After a few minutes, he pulls out and shoots his hot jets of cum on your buttocks. You feel exhausted, and fall down onto the grass below you.'
-				
-				act 'Recover':				
+
+				act 'Recover':
 					*clr & cla
 					Beerrand=rand(11,12)
 					gs 'drugs', 'alcohol', 'beer', 1
 					gs 'stat'
-	
+
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Beerrand>>.jpg"></center>'
 					'After resting for a few minutes, you slowly push yourself up and softly mutter a "Hello" to the boys.'
 					'They grin at the way your legs tremble awkwardly, and their sperm slowly runs down your legs. Your belly and buttocks are still covered in it, but you just adjust your clothes without giving it any more thought.'
@@ -858,10 +858,10 @@ if $ARGS[0] = 'BjBeerVag':
 					'Dan grins and gives you his unfinished bottle of beer: "Here you go, slut. You''ve earned it."'
 					'You eagerly drink the beer with a content smile on your lips. Your mood improves slightly.'
 					act 'Return to the park': gt 'gskver', 'start'
-				end   
+				end
 			end
 		end
-	end 		
+	end
 end
 
 if $ARGS[0] = 'BjBeerAnal':
@@ -880,11 +880,11 @@ if $ARGS[0] = 'BjBeerAnal':
 	if sub > 20: 'However, at the same time, the humiliation and helplessness from your current position make you feel a tinge excited.'
 	if pcs_ass <= 5: 'You hear a frantic discussion behind you, the guys are trying to figure out who gets to fuck your tight unexperienced ass first. Vasily ends up being the lucky one.'
 	if pcs_ass > 5: 'You hear a frantic discussion behind you, the guys are trying to figure out who gets to fuck your ass first. Vasily ends up being the lucky one.'
-	if tatupb > 0: 'When he sees the tattoo on your lower back, Vasily pats your ass approvingly: "Nice tramp stamp, whore."'  
+	if tatupb > 0: 'When he sees the tattoo on your lower back, Vasily pats your ass approvingly: "Nice tramp stamp, whore."'
 	if tatupb = 0: 'Seeing your bare back, Vasily mutters irritably: "A slut such as yourself should really get a tattoo back there... that way, people can recognize you for what you really are."'
 	if analplugin = 1: analplugin = 0 & '"You won''t be needing this!" Vasily grins, and he pulls out your butt plug with a loud pop. He''s quite rough with it, and you grimace at the sudden extrusion.'
 	'Once he thinks you''re ready, Vasily roughly pulls your buttocks to the sides with a grin on his face and looks at your sphincter, before spitting on it.'
-	
+
 	act 'Try to relax your anus':
 		*clr & cla
 		dick = 15
@@ -894,15 +894,15 @@ if $ARGS[0] = 'BjBeerAnal':
 		gs 'cum_manage'
 		minut += 10
 		gs 'stat'
-   
+
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeeranal2.jpg" ></center>'
-   
+
 		gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
-		
-		'You groan loudly and try to slow him down with your hands while you try to relax and get used to the size. He misunderstands, though. Your moaning and struggling only turn Vasily on even more, and he redoubles his efforts and fucks your ass even harder. His balls are slapping against you with every thrust, and within minutes you feel Vasily''s thrusts get more and more erratic. Then, he finishes deep inside you... you can actually feel his dick twitch inside your asshole, as the cum spurts out. The warm liquid slowly spreads inside you.' 
+
+		'You groan loudly and try to slow him down with your hands while you try to relax and get used to the size. He misunderstands, though. Your moaning and struggling only turn Vasily on even more, and he redoubles his efforts and fucks your ass even harder. His balls are slapping against you with every thrust, and within minutes you feel Vasily''s thrusts get more and more erratic. Then, he finishes deep inside you... you can actually feel his dick twitch inside your asshole, as the cum spurts out. The warm liquid slowly spreads inside you.'
 		'He catches his breath for a second, and then slowly pulls out.'
-	
-		if klismaday ! daystart: 
+
+		if klismaday ! daystart:
 			'For some reason he''s upset, and when you look around you see why. You didn''t give yourself an enema, and his dick is all dirty! He thrusts his groin towards your face expectantly: "Clean that up, whore! That''s disgusting!"'
 			'You wrinkle your nose at his dirty and smelly erection... ugh!'
 
@@ -914,19 +914,19 @@ if $ARGS[0] = 'BjBeerAnal':
 			minut +=5
 			pcs_mood = pcs_mood - 3
 			gs 'stat'
-		
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeerdirtyanal<<Suckrand>>.jpg" ></center>'		
-			'You hesitate for a second, but you realize that he''s not giving you a choice. You obediently fall to your knees before him and take his cock in your mouth, looking to correct your mistake.' 
+
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeerdirtyanal<<Suckrand>>.jpg" ></center>'
+			'You hesitate for a second, but you realize that he''s not giving you a choice. You obediently fall to your knees before him and take his cock in your mouth, looking to correct your mistake.'
 			'The taste is horrible, and you have great difficulty suppressing your gag reflex as you carefully lick and suck his dick, humbly looking into his eyes in the hope of avoiding punishment.'
-			'You have an awful taste in your mouth, and you quietly berate yourself for not giving yourself an enema today. You don''t have much time to mull it over though, as Dan says: "That''s good enough. Now get back into position and spread your ass, slut."'	
+			'You have an awful taste in your mouth, and you quietly berate yourself for not giving yourself an enema today. You don''t have much time to mull it over though, as Dan says: "That''s good enough. Now get back into position and spread your ass, slut."'
 			act 'Spread your ass cheeks': gt 'gopskver','BjBeerAnal2'
-		end	
+		end
 
 		elseif klismaday = daystart:
 			'Fortunately, you gave yourself an enema earlier today and Vasily''s cock comes out clean. You don''t have much time to think about the assfucking he gave you though, as Dan says: "Not bad. Now get back into position and spread your ass, slut. You still have two more to go."'
 			act 'Spread your ass cheeks': gt 'gopskver','BjBeerAnal2'
-		end 		
-	end 			
+		end
+	end
 end
 
 if $ARGS[0] = 'BjBeerAnal2':
@@ -940,22 +940,22 @@ if $ARGS[0] = 'BjBeerAnal2':
 	minut += 10
 
 	if pcs_makeup > 1: pcs_makeup = 0
-	gs 'stat'  
-   
+	gs 'stat'
+
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeeranal<<Analrand>>.jpg" ></center>'
 	'You nod and let him move you around, so he can position you the way he likes. He puts you in a similar position that Vasily had you in, and spits on your sphincter. It''s not fully closing yet after the fucking Vasily gave you, and you slowly feel his saliva run down your hole while a cold gust of air blows past.'
 
 	gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
-	
+
 	'Dan silently slides his cock inside your ass, and asks with a lewd grin on his face: "You want this... don''t you, <<$pcs_nickname>>?"'
-	'You know what he wants to hear, and meekly nod and whisper: "Yes..."' 
+	'You know what he wants to hear, and meekly nod and whisper: "Yes..."'
 	'"Louder, slut! I can''t hear you!" Dan firmly grabs you by the hair and pulls your head backwards, rougher than you had anticipated. You let out an involuntary cry and feel tears forming in your eyes, but Dan ignores it and asks: "Why are you with us?"'
 	'You don''t want him to pull your hair again, and quickly blurt out: "I love the way you fuck my ass! All of you! You take such good care of me... I''m an anal slut... please keep fucking me!"'
 	'The boys laugh: "Look at her... she seems like such a sweet and innocent girl, but she''s nothing more than an ordinary butt slut!"'
 	'Your ''confession'' seems to have done it for Dan, and his movements are almost immediately speeding up. A few seconds later, he drives his cock deep inside your ass one final time and pumps his seed into you.'
 	if klismaday ! daystart: 'Luckily, his cock is not quite as dirty as Vasily''s. You obediently guide his cock to your mouth and quickly lick it clean, without him even having to ask. Dan compliments your diligence: "Very good, slut. I''m impressed."'
 	'You''re still on your hands and knees on the bench, sperm slowly dribbling from your now well-used asshole. You still have the biggest cock of the lot to please though, and Vitek walks around you in a circle. His impressive cock is gently bobbing with every step, and he grins as he notices your look is fixated on it.'
-	
+
 	act 'Substitute the ass':
 		*clr & cla
 		gs 'boyStat', 'A9'
@@ -964,19 +964,19 @@ if $ARGS[0] = 'BjBeerAnal2':
 		spafinloc = 4
 		gs 'cum_manage'
 		minut += 10
-		gs 'stat' 
-		
+		gs 'stat'
+
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeeranal5.jpg" ></center>'
-		'Looking at your tear-stained face, Vitek says with a grin: "Get used to it, slut. That''s all you''re good for now. After we work you in a bit more, you''ll be able to handle even more cocks at once."'   
-			
+		'Looking at your tear-stained face, Vitek says with a grin: "Get used to it, slut. That''s all you''re good for now. After we work you in a bit more, you''ll be able to handle even more cocks at once."'
+
 		gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
-			
+
 		'He holds you firmly by the hips and guides his cock to your stretched sphincter, before slapping the entire length in with one firm stroke. You groan loudly, and have to steady yourself on the bench. Meanwhile Vitek slowly pulls out and laughs when he sees you make vain attempts to close your sphincter, and then slams his cock back in again. He slowly grins to thrust his cock inside you, and you hear a squishing sound every time he pushes his cock in deeper. You''re deeply embarrassed when you realize that squishy sound is probably the sound of Vasily and Dan''s sperm, lubricating this third fucking.'
 		'He fucks your ass for a good few minutes, and then pulls out his erection to shoot his white viscous liquid all over your buttocks. Then he offers his cock to you, and tells you to lick it clean thoroughly. A shiver runs down your spine when you think of what you''re doing: licking the cum of three guys off a cock, that was just in your ass not even one minute before.'
 		*pl
 		if BjBeerQW = 4: 'When all the guys are satisfied, you tiredly lie down on the grass for a moment. Vasily comes over with a grin on his face and asks: "Well, <<$pcs_nickname>>, would you say you know how to get fucked in the ass now?"' & 'You quietly answer: "Yes, I do", blushing and hiding your face. Vasily happily nods, and continues: "I''d say so too. So, you''ll be offering us your ass more often from now on, understood?"' & 'You obediently nod and mechanically respond: "I will, you guys can fuck my ass more often if you want."' & 'Vasily grins while the other boys laugh: "Excellent... just what we wanted to hear."'
 		'Then Vitek orders: "Now turn around and show us that used ass of yours."'
-		
+
 		act 'Show them':
 			*clr & cla
 			minut +=5
@@ -984,7 +984,7 @@ if $ARGS[0] = 'BjBeerAnal2':
 			gs 'stat'
 
 			if pcs_ass <= 10:
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeeranal6.jpg" ></center>' 
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeeranal6.jpg" ></center>'
 				'You obediently turn around and spread your ass cheeks, showing them your red and sore hole.'
 			elseif pcs_ass < 25:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeeranal7.jpg" ></center>'
@@ -997,17 +997,17 @@ if $ARGS[0] = 'BjBeerAnal2':
 			if agape = 3: 'Your anus tore a little from the treatment today, and there is some blood mixed with the sperm leaking from it.'
 			if agape < 3: 'After the cocks you took today, your ass feels a bit sore. It won''t fully close yet, and sperm leaks slowly from it.'
 			'The Gopniks slap each other on the back while they admire their handiwork: "We have a real buttslut on our hands here, boys!"'
-				
-			act '"How about that beer?"':				
+
+			act '"How about that beer?"':
 				*clr & cla
 				Beerrand=rand(11,12)
 				gs 'drugs', 'alcohol', 'beer', 1
 				gs 'stat'
-	
+
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Beerrand>>.jpg"></center>'
 				'Dan grins and gives you his unfinished bottle of beer: "Here you go, slut. You''ve earned it."'
 				'You eagerly drink the beer with a content smile on your lips. Your mood improves slightly.'
-				act 'Return to the park': gt 'gskver', 'start'				
+				act 'Return to the park': gt 'gskver', 'start'
 			end
 		end
 	end
@@ -1037,7 +1037,7 @@ if $ARGS[0] = 'dan_blowjob':
 
 		act 'Go home': gt 'pavComplex', 'start'
 	end
-	
+
 	act'Bend over for Dan':
 		*clr & cla
 		minut += 20
@@ -1054,6 +1054,7 @@ if $ARGS[0] = 'dan_blowjob':
 end
 
 if $ARGS[0] = 'triple_blow':
+	cla
 	act 'Suck Dan''s cock':
 		*clr & cla
 		pav_sex += 15

locations/gpoli.qsrc

@@ -1760,8 +1760,8 @@ if $ARGS[0] = 'reception':
 	'You walk up to the reception and ask for help with your problem'
 	'The receptionist looks you up and down and tells you to visit the maternity ward. Someone over there would be able to help you.'
 	pcs_know_mward = 1
-	act 'Go to maternity ward (0:05)': gt 'gpoli', 'maternity_ward'
 	act 'Leave': gt 'gpoli'
+	act 'Go to maternity ward (0:05)': gt 'gpoli', 'maternity_ward'
 end
 
 if $ARGS[0] = 'maternity_ward_donation':
@@ -1876,8 +1876,11 @@ if $ARGS[0] = 'std_check':
 		'He continues: "You have genital herpes. Unfortunately, the complete cure for this disease is very expensive and we can''t cure it here. On the upside, herpes is dormant most of the time and is quite manageable, if you take good care of your body. When it is dormant, taking vitamins regularly will make sure it won''t show itself."'
 				
 		if Gerpes >= 3:
-			if GerpesNapr = 0:GerpesNapr = 3 & '"Your herpes is currently active. I''m going to put you on a course of herpes shots, in order to suppress it into its dormant state. You''ll need a total of 3 injections (no more than 1 a day), each injection will cost 450 <b>₽</b>."'
-			if GerpesNapr > 0:'You need to see the nurse for your herpes drug injection.'
+			if GerpesNapr = 0:
+				GerpesNapr = 3 & '"Your herpes is currently active. I''m going to put you on a course of herpes shots, in order to suppress it into its dormant state. You''ll need a total of 3 injections (no more than 1 a day), each injection will cost 450 <b>₽</b>."'
+			elseif GerpesNapr > 0:
+				'You need to see the nurse for your herpes drug injection.'
+			end
 		else
 			'Your herpes is currently in a dormant state.'
 		end
@@ -1891,8 +1894,11 @@ if $ARGS[0] = 'std_check':
 
 	if TriperOnce = 1:
 		'He continues: "We found gonorrhea. Fortunately, we can cure this disease."'
-		if TriperNapr = 0:TriperNapr = 5 & '"I''m going to put you on a course of gonorrhea injections. You''ll need a total of 5 injections (no more than 1 a day), each injection will cost 750 <b>₽</b>."'
-		if TriperNapr > 0:'You need to see the nurse for your gonorrhea injections.'
+		if TriperNapr = 0:
+			TriperNapr = 5 & '"I''m going to put you on a course of gonorrhea injections. You''ll need a total of 5 injections (no more than 1 a day), each injection will cost 750 <b>₽</b>."'
+		elseif TriperNapr > 0:
+			'You need to see the nurse for your gonorrhea injections.'
+		end
 	end
 
 	if KandidozOnce = 1:

locations/gschool_break.qsrc

@@ -498,6 +498,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			end
 			if grupTipe = 1 or grupTipe = 2 or grupTipe = 4:
 				act 'Say "What a fucking slut!"':
+					*clr & cla
 					npc_rel['A25'] -= 5
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/soniabj.mp4"></video></center>'
 					'Undaunted in the face of such shameless debauchery, you continue with your business and go straight to the sink. While you lather your hands in soap you turn to face the two of them and say: "God you are such a fucking slut, do your knee''s have calluses on them from all the kneeling you do?"'
@@ -513,6 +514,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			end
 			
 			act 'Say "Hi"':
+				*clr & cla
 				npc_rel['A25'] += 3
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/soniabj.mp4"></video></center>'
 				'Undaunted in the face of such shameless debauchery, you continue with your business and go straight to the sink. While you lather your hands in soap you turn to face the two of them and say: "Hi Sonia! Having fun on your ''date?''"'

locations/gschool_chats.qsrc

@@ -3,7 +3,8 @@
 if $ARGS[0] = 'nerds':
 	*clr & cla
 	minut += 5
-	if rand(1,6) = 1 and pcs_vag > 12 and mesec <= 0 and gschool_ignore = 0:
+	if rand(1,6) = 1 and pcs_vag > 12 and mesec <= 0 and gschool_ignore = 0 and gschool_gropeday ! daystart:
+		gschool_gropeday = daystart
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boysex_tualet.jpg"></center>'
 		*nl
 		'When you enter the class, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.'

locations/gschool_chats1.qsrc

@@ -227,7 +227,7 @@ if $ARGS[0] = 'igor':
 			act 'Help with homework':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
-				'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you.'
+				'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
 		end
@@ -338,16 +338,7 @@ if $ARGS[0] = 'katja':
 			'Katja is as red as a lobster, and her chest is heaving from her heavy breaths. She''s idly rubbing her thighs against one another while you talk.'
 		end
 	end
-	
-	if rand(1,3) = 1 and npcSex[14] = 1 and $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart:  gt 'Katja_tanga', 'start'
-	
-	if rand(1,2) = 1 and katschoolsex = 1 and pcs_horny > 40:
-		*clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
-		'Katja slowly leans in towards you, almost closing her eyes and slowly opening her mouth. Unable to resist, you lean in and meet her with a kiss.'
-		gs 'katjaEv', 'kiss_events'
-	end
-	
+			
 	if npc_rel['A14'] >= 50 and pav_slut < 125:
 		npc_rel['A14'] += 1
 		if grupTipe = 1:
@@ -359,7 +350,7 @@ if $ARGS[0] = 'katja':
 	elseif npc_rel['A14'] <= 20 and pav_slut < 125:
 		npc_rel['A14'] += 1
 		if grupTipe = 1:
-			'"Hey, Kat, trying a new lipstick out? That color looks pretty on you," You compliment her and she smiles sheepishly."'
+			'"Hey, Kat, trying a new lipstick out? That color looks pretty on you," you compliment her and she smiles sheepishly.'
 			'"Yeah... yeah, just wanted to try something a little different..." she answers quietly. The conversation doesn''t really go anywhere as she keeps her answers short or just doesn''t say anything at all. At least she''s willing to stick around.'
 		else
 			'You''re in the middle of trying to keep a conversation going with a very disinterested Katja when she pulls out her phone and sighs. "Sorry but Vicky just texted me and she, uh, well, she needs me! For... something." She smiles nervously before shuffling off in the opposite direction.'
@@ -454,6 +445,15 @@ if $ARGS[0] = 'katja':
 			end
 		end
 	end
+	
+	if rand(1,3) = 1 and npc_sex['A14'] > 0 and $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart:  gt 'Katja_tanga', 'start'
+	
+	if rand(1,2) = 1 and katschoolsex = 1 and pcs_horny > 40:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
+		'Katja slowly leans in towards you, almost closing her eyes and slowly opening her mouth. Unable to resist, you lean in and meet her with a kiss.'
+		gs 'katjaEv', 'kiss_events'
+	end	
 end
 
 if $ARGS[0] = 'albina':
@@ -786,7 +786,7 @@ if $ARGS[0] = 'sonia':
 		'Unlike most people, Sonia isn''t calling you a slut or whore. Instead she asks you about some of the best sex you''ve had lately and some of your favorite positions. The conversation continues like this and you end up enjoying hanging out with her as you talk about all kinds of naughty things.'
 	else 
 		npc_rel['A25'] += 1
-		'Hey, Sonia," you greet her with a smile and gives you a friendly little wave.'
+		'"Hey, Sonia," you greet her with a smile and gives you a friendly little wave.'
 		'"What''s up, <<$pcs_nickname>>?" she asks and you tell her you just wanted to hang out for a bit. "Sure, I got a little bit of time."'
 		'With Sonia being so friendly, you slip into an easygoing banter with her for the rest of break.'
 	end
@@ -938,11 +938,11 @@ if $ARGS[0] = 'erast':
 	if npc_rel['A150'] >= 50 and pav_slut < 125:
 		npc_rel['A150'] += 1
 		if grupTipe = 2:
-			'"Oh, hi <<$pcs_nickname>>..." Erast gently says, "What can I help you with?""'
+			'"Oh, hi <<$pcs_nickname>>..." Erast gently says, "What can I help you with?"'
 			'"Hi Erast! So I saw you skating and needed some pointers..." you ask him.'
 			'"No worries, <<$pcs_nickname>>. I''ll gladly share my secrets with you." he winks and continues on talking about different skating techniques.'
 		else
-			'"Oh, hi <<$pcs_nickname>>..." Erast gently says, "What can I help you with?""'
+			'"Oh, hi <<$pcs_nickname>>..." Erast gently says, "What can I help you with?"'
 			'"Hi Erast! Well, I was thinking about starting working out and wanted to ask you about some pointers, if you have the time?" you politely ask.'
 			'"Of course <<$pcs_nickname>>." Erast brightens up as he starts asking you about what you want to achieve with your training.'
 		end
@@ -953,7 +953,7 @@ if $ARGS[0] = 'erast':
 			'"Just a quick thing, Erast. I promise..." you plead with him.'
 			'"Sorry, I don''t have any time right now. Later, okay?" he politely replies.'
 		else
-			'"Oh, hi <<$pcs_nickname>>..." Erast gently says, "What can I help you with?""'
+			'"Oh, hi <<$pcs_nickname>>..." Erast gently says, "What can I help you with?"'
 			'"Hi Erast! Well, I was thinking about starting working out and wanted to ask you about some pointers, if you have the time?" you politely ask.'
 			'"Oh... I''m sorry <<$pcs_nickname>> but I don''t have time right now... I got to head to class... Maybe another time..." Erast avoids looking you in the eyes.'
 		end
@@ -1065,7 +1065,7 @@ if $ARGS[0] = 'bella':
 	else 
 		npc_rel['A22'] += 1
 		'"Well well, make it quick <<$pcs_nickname>> I don''t really have the time to stand here and chat..." Bella hurries you on.'
-		'I was thinking we could maybe hang after school one day," you cheerfully ask.'
+		'"I was thinking we could maybe hang after school one day," you cheerfully ask.'
 		'"You and I?" she looks around, "Is this a prank? Where have you hidden the cameras?" she keeps on looking around, "Don''t be silly, run along now," as she scoffs you aside.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -1085,7 +1085,7 @@ if $ARGS[0] = 'veronika':
 			'You squeal, "Of course I would love to see that, I bet it''s amazing." you give her a hug while Veronika remains stiff as usual.'
 		else
 			'"Hi <<$pcs_nickname>>..." Veronika speaks quietly.'
-			'Hi Veronika! Glad I ran into you," you cheerfully greet her.'
+			'"Hi Veronika! Glad I ran into you," you cheerfully greet her.'
 			'"Oh?" she surprisingly replies.'
 			'"Yeah, just wanted to tell you that I''ll be cheering you on as you compete." you say.'
 			'"Thank you." Veronika politely replies.'
@@ -1276,7 +1276,7 @@ if $ARGS[0] = 'ivan':
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	elseif pav_slut >= 125:
 		'"So hold up Ivan. I need to talk to you..." you step in front of him.'
-		'Ivan stops and gives you a confused look, Why are you talking to me? I don''t really have anything to say to you."'
+		'Ivan stops and gives you a confused look, "Why are you talking to me? I don''t really have anything to say to you."'
 		'"Come on, don''t be like that... I thought we could have some fun..." you give him a wink.'
 		'Ivan looks apathetically at you without any response making the whole situation a bit awkward and after what feels like an eternity he just walks off.'
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'

locations/gschool_chats2.qsrc

@@ -1,5 +1,5 @@
 # gschool_chats2
-	
+
 if $ARGS[0] = 'artem':
 	*clr & cla
 	menu_off = 1
@@ -35,15 +35,15 @@ if $ARGS[0] = 'artem':
 			'"Sorry, <<$Pcs_nickname>>, but why are you talking to me? We’re not exactly friends, y’know…." Artem asks weakly. He’s careful not to offend you, but it’s clear he’s hesitant to talk to you.'
 		end
 	elseif pav_slut >= 125:
-		'When he see''s you walking over he gives you a disgusted look. "Get anyway from me you disgusting slut." With that he moves away from you.'
-	else 
+		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
+	else
 		npc_rel['A2'] += 1
 		'You strike up a conversation with Artem, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
 	end
-	
+
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-	
-	if artemLernQW = 0 and npc_rel['A2'] >= 60:
+
+	if artemLernQW = 0 and npc_rel['A2'] > 20:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 			artemLernQW = 1
@@ -81,8 +81,8 @@ if $ARGS[0] = 'petka':
 			'You try talking to Petka, bit it’s a very one-sided with you doing all of the talking until they finally speak up. "I don’t want to sound rude but… we’re not really friends so I’m not sure why you’d want to talk to me." He says quietly. "Anyways, I’ve got to finish this worksheet for class, so if you don’t mind…"'
 		end
 	elseif pav_slut >= 125:
-		'When he see''s you walking over he gives you a disgusted look. "Get anyway from me you disgusting slut." With that he moves away from you.'
-	else 
+		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
+	else
 		npc_rel['A6'] += 1
 		'You strike up a conversation with Petka, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
 	end
@@ -109,14 +109,14 @@ if $ARGS[0] = 'julia':
 			'You try talking to Julia, but it’s a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don’t want to sound rude but… we’re not really friends so I’m not sure why you’d want to talk to me." She says quietly. "Anyways, I’ve got to finish this worksheet for class, so if you don’t mind…"'
 		end
 	elseif pav_slut >= 125:
-		'When she see''s you walking over she gives you a disgusted look. "Get anyway from me you disgusting slut." With that she moves away from you.'
-	else 
+		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
+	else
 		npc_rel['A12'] += 1
 		'You strike up a conversation with Julia, she seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
 	end
-	
+
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-	
+
 	if JuliaMilLernQW = 0 and npc_rel['A12'] >= 60:
 		*clr & cla
 		JuliaMilLernQW = 1
@@ -136,8 +136,8 @@ if $ARGS[0] = 'natasha':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'
-		
-	if npc_rel['A16'] >= 50 and pav_slut < 125: 
+
+	if npc_rel['A16'] >= 50 and pav_slut < 125:
 		npc_rel['A16'] += 1
 		if grupTipe = 3:
 			'"Hey, have you seen this new makeup line coming out? It’s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can’t afford nice things like this, and it ends up bringing her down, but you quickly change the subject and start complimenting her on her sense of style and grades, reminding her she’s a top student in school which brings a smile to her face.'
@@ -152,12 +152,12 @@ if $ARGS[0] = 'natasha':
 			'"Why are you even talking to me? It’s not like we’re in the same social circle or something." Natasha says with a suspicious look. "So, if you could just…" She drags the last part out, expecting you to catch her drift and leave.'
 		end
 	elseif pav_slut >= 125:
-		'When she see''s you walking over she gives you a disgusted look. "Get anyway from me you disgusting slut." With that she moves away from you.'
-	else 
+		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
+	else
 		npc_rel['A16'] += 1
 		'You strike up a conversation with Natasha, she seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
 	end
-	
+
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
 	if NatashaQW = 0 and npc_rel['A16'] >= 60 and pav_slut < 125:
@@ -166,16 +166,11 @@ if $ARGS[0] = 'natasha':
 			minut += 5
 			NatashaQW = 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'
-			if pav_slut >= 125:
-				'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
-			else
-				
-				'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
-			end
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'	
+			'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
-	elseif NatashaQW > 0 and natotrab > 0 and NatDolg > 0 and NatashaQW > 6:
+	elseif NatashaQW > 6 and natotrab > 0 and NatDolg > 0:
 		act 'Come to the bathroom with me':
 			*clr & cla
 			minut += 5
@@ -221,7 +216,7 @@ if $ARGS[0] = 'evgeny':
 		else
 			'"Oh, hello." Evgeny says with a curt nod towards you. He doesn’t even bother to look up from his chessboard, but you don’t take it as an insult. He’s always been socially awkward, some going as far as to say he’s autistic, so you don’t take offense, and instead sit down across from him and make small talk while he plays against himself.'
 		end
-    elseif npc_rel['A151'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A151'] <= 20 and pav_slut < 125:
 		npc_rel['A151'] += 1
 		if grupTipe = 3:
 			'You try talking to Evgeny, but it’s a very one-sided with you doing all of the talking until he finally speak up. "I don’t want to sound rude but… we’re not really friends so I’m not sure why you’d want to talk to me." He says quietly. "Anyways, I’ve got to finish this worksheet for class, so if you don’t mind…"'
@@ -229,8 +224,8 @@ if $ARGS[0] = 'evgeny':
 			'"I really don’t want to talk right now." Evgeny says abruptly. You’re a bit shocked at how straightforward he is, but he refuses to look up from his chessboard, leaving you with no other option but to walk away.'
 		end
 	elseif pav_slut >= 125:
-		'When he see''s you walking over he gives you a disgusted look. "Get anyway from me you disgusting slut." With that he moves away from you.'
-	else 
+		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
+	else
 		npc_rel['A151'] += 1
 		'You strike up a conversation with Evgeny, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
 	end
@@ -257,8 +252,8 @@ if $ARGS[0] = 'feofan':
 			'"Sorry if this sounds rude, but why are you talking to me, of all people? It’s not like we’re in the same social circle or something." Feofan says with a suspicious look. "Listen… I’m just kinda busy at the moment, so…" He remains polite and tries to stay lighthearted, but he obviously doesn’t want to talk.'
 		end
 	elseif pav_slut >= 125:
-		'When he see''s you walking over he gives you a disgusted look. "Get anyway from me you disgusting slut." With that he moves away from you.'
-	else 
+		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
+	else
 		npc_rel['A152'] += 1
 		'You strike up a conversation with Feofan, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
 	end
@@ -285,8 +280,8 @@ if $ARGS[0] = 'gerasim':
 			'You try talking to Gerasim, but it’s a very one-sided conversation with you doing all of the talking until they finally speak up. "I don’t want to sound rude but… we’re not really friends so I’m not sure why you’d want to talk to me." He says quietly. "Anyways, I’ve got to finish this worksheet for class, so if you don’t mind…"'
 		end
 	elseif pav_slut >= 125:
-		'When he see''s you walking over he gives you a disgusted look. "Get anyway from me you disgusting slut." With that he moves away from you.'
-	else 
+		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
+	else
 		npc_rel['A153'] += 1
 		'You strike up a conversation with Gerasim, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
 	end
@@ -313,20 +308,20 @@ if $ARGS[0] = 'zinaida':
 			'You try talking to Zinaida, but it’s a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don’t want to sound rude but… we’re not really friends so I’m not sure why you’d want to talk to me." She says quietly. "Anyways, I’ve got to finish this worksheet for class, so if you don’t mind…"'
 		end
 	elseif pav_slut >= 125:
-		'When she see''s you walking over she gives you a disgusted look. "Get anyway from me you disgusting slut." With that she moves away from you.'
-	else 
+		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
+	else
 		npc_rel['A142'] += 1
 		'You strike up a conversation with Zinaida, she seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
-	
+
 if $ARGS[0] = 'petia':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/47.jpg"></center>'
-		
+
 	if hotcat >= 6:
 		'As you enter the classroom you are immediately swarmed by Petia. He gets really close to you, invading your personal space without a care, and a raunchy smell hits your nostrils. "Hey, <<$pcs_nickname>>, I think you''re good-looking enough to date me. So how about it? Wanna date?" he inquires.'
 		act 'Let him down gently':
@@ -416,15 +411,15 @@ if $ARGS[0] = 'petia':
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif pav_slut >= 125:
-		'When he see''s you walking over he gives you a disgusted look. "Get anyway from me you disgusting slut." With that he moves away from you. But stops a moment later, then turns back looking around a bit. Then he steps back and says. "Unless you want to give me a blowjob that is." He asks hopeful, but even you have standards and walk off instead.'
+		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you. But stops a moment later, then turns back looking around a bit. Then he steps back and says. "Unless you want to give me a blowjob that is." He asks hopeful, but even you have standards and walk off instead.'
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-	else 
+	else
 		npc_rel['A159'] += 1
 		'You strike up a conversation with Petia, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
 end
-	
+
 if $ARGS[0] = 'lesco':
 	*clr & cla
 	menu_off = 1
@@ -457,14 +452,14 @@ if $ARGS[0] = 'lesco':
 			'You shrug your shoulders saying you just wanted to hang out for a bit. He seems unsure a bit but as you talk, he relaxes a little and you end up talking with him about living at the Tsarev residence and as you suspected he Lena makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		end
 	elseif pav_slut >= 125:
-		'When he see''s you walking over he gives you a disgusted look. "Get anyway from me you disgusting slut, I have enough problems with out being seen with the likes of you." With that he moves away from you.'
-	else 
+		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut, I have enough problems with out being seen with the likes of you." With that he moves away from you.'
+	else
 		npc_rel['A7'] += 1
 		'You strike up a conversation with Lesco, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-end	
-	
+end
+
 if $ARGS[0] = 'sonia':
 	*clr & cla
 	menu_off = 1
@@ -487,7 +482,7 @@ if $ARGS[0] = 'sonia':
 	elseif pav_slut >= 125:
 		npc_rel['A25'] += 1
 		'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "What''s up slut?" You laugh sit down next to her telling her about your day. The two of you banter back and forth about who''s breath smells like cum and discuss each of your latest sexcapades.'
-	else 
+	else
 		npc_rel['A25'] += 1
 		'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and stiffens slightly at your approach. "Do you need something <<$pcs_nickname>>?" You sit down next to her and the two of you engage in a conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
 	end

locations/gschool_detention.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'start':
 	menu_off = 1
 	gs 'stat'
 	detention_set = 0
-	if PCloThinness = 6 or PCloSkirt = 6 or PCloPants = 6 or (PCloTopCut = 6 and tits < 2) or (PCloTopCut = 7 and tits > 1 and tits < 4) or (PCloTopCut = 8 and tits > 4 and tits < 6) or (PCloTopCut = 9 and tits >= 6): gt 'gschool_detention', 'inappropriate_clothes'
+!!ToDo: The $ARGS in gschool_office is missing	if PCloThinness = 6 or PCloSkirt = 6 or PCloPants = 6 or (PCloTopCut = 6 and tits < 2) or (PCloTopCut = 7 and tits > 1 and tits < 4) or (PCloTopCut = 8 and tits > 4 and tits < 6) or (PCloTopCut = 9 and tits >= 6): gt 'gschool_detention', 'inappropriate_clothes'
 	i = rand(1,100)
 	if ((gruptipe = 3 and i <= 20) or (gruptipe = 5 and i <= 30) or i <= 10) and $pantyworntype ! 'none':
 		killvar 'i' & gt 'gschool_detention', 'wedgie'
@@ -54,14 +54,15 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'wedgie':
+	wedgie_counter = 0
 	:wedgie_girl
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
-	if grupTipe = 4:
-		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona': jump 'wedgie_girl'
-	elseif grupTipe = 2:
-		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona' and $rand_girl ! 'Christina': jump 'wedgie_girl'
-	else
-		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona' and $rand_girl ! 'Christina' and $rand_girl ! 'Lina' and $rand_girl ! 'Lariska' and $rand_girl ! 'Stasya': jump 'wedgie_girl'
+	if grupTipe = 4 and wedgie_counter < 1000:
+		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona': wedgie_counter += 1 & jump 'wedgie_girl'
+	elseif grupTipe = 2 and wedgie_counter < 1000:
+		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona' and $rand_girl ! 'Christina': wedgie_counter += 1 & jump 'wedgie_girl'
+	elseif wedgie_counter < 1000:
+		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona' and $rand_girl ! 'Christina' and $rand_girl ! 'Lina' and $rand_girl ! 'Lariska' and $rand_girl ! 'Stasya': wedgie_counter += 1 & jump 'wedgie_girl'
 	end
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/wedgie.jpg"></center>'
@@ -223,7 +224,7 @@ if $ARGS[0] = 'sitting_events':
 		'You briefly - very briefly - consider doing homework but the thought alone is enough to bore you. You look around and see no one is looking, so you get up and sneak back into the rows of book shelves.'
 		act 'Look around': gt 'gschool_detention', 'roam_around'
 	end
-	act 'bored':
+	act 'Sit around bored':
 		*clr & cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detention.jpg"></center>'
@@ -274,7 +275,7 @@ if $ARGS[0] = 'upskirt1':
 	minut += 60
 	:newupskirtgirl1
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
-	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina' or $rand_girl = 'Anushka' and jump_counter < 1000: jump_counter += 1 & jump'newupskirtgirl1'
+	if ($rand_girl = 'Veronika' or $rand_girl = 'Ekaterina' or $rand_girl = 'Anushka') and jump_counter < 1000: jump_counter += 1 & jump'newupskirtgirl1'
 	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
@@ -292,7 +293,7 @@ if $ARGS[0] = 'upskirt1':
 	end
 	act 'Get her attention and let her know.':
 		*clr & cla
-		npc_rel['A<<i>>'] += 1
+		npc_rel['A<<r>>'] += 1
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
 		'You have to let her know, maybe she is doing it on purpose and maybe not. It takes a bit before you finally get her attention and then mimic closing together with your hands as if they was legs and then gesture towards her. It takes her a moment to realize what you mean, then she blushes slightly and closes her legs, followed by her mouthing thank you to you. You smile and nod back to her. Feeling pretty good about helping a fellow girl out the rest of detention doesn''t seem as bad.'
@@ -305,7 +306,7 @@ if $ARGS[0] = 'upskirt2':
 	minut += 60
 	:newupskirtgirl2
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
-	if $rand_girl = 'Veronika' or $rand_girl = 'Anushka' and jump_counter < 1000: jump_counter += 1 & jump'newupskirtgirl2'
+	if ($rand_girl = 'Veronika' or $rand_girl = 'Anushka') and jump_counter < 1000: jump_counter += 1 & jump'newupskirtgirl2'
 	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/upskirt.jpg"></center>'
@@ -321,7 +322,7 @@ if $ARGS[0] = 'flashing girl':
 	minut += 60
 	:newflashinggirl
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
-	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina' and jump_counter < 1000: jump_counter += 1 & jump 'newflashinggirl'
+	if ($rand_girl = 'Veronika' or $rand_girl = 'Ekaterina') and jump_counter < 1000: jump_counter += 1 & jump 'newflashinggirl'
 	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/detflash1.mp4"></video></center>'
@@ -337,7 +338,7 @@ if $ARGS[0] = 'teasing girl':
 	minut += 60
 	:newteasinggirl
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
-	if $rand_girl = 'Veronika' or $rand_girl = 'Ekaterina' and jump_counter < 1000: jump_counter += 1 & jump'newteasinggirl'
+	if ($rand_girl = 'Veronika' or $rand_girl = 'Ekaterina') and jump_counter < 1000: jump_counter += 1 & jump'newteasinggirl'
 	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/tease.jpg"></center>'
@@ -375,9 +376,9 @@ if $ARGS[0] = 'Chat with <<$rand_girl>>':
 	*clr & cla
 	:rand_girlrel_jump
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
-	if npc_rel['A<<i>>'] < 50 and counter_girl < 1000: counter_girl += 1 & jump 'rand_girlrel_jump'
+	if npc_rel['A<<r>>'] < 50 and counter_girl < 1000: counter_girl += 1 & jump 'rand_girlrel_jump'
 	counter_girl = 0
-	npc_rel['A<<i>>'] += 3
+	npc_rel['A<<r>>'] += 3
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detgchat.jpg"></center>'
@@ -391,9 +392,9 @@ if $ARGS[0] = 'Chat with <<$rand_boy>>':
 	*clr & cla
 	:rand_boyrel_jump
 	gs 'gschool_events', 'rand_boy_arg', 1, 1, 1, 1, 1, 0
-	if npc_rel['A<<i>>'] < 50 and counter_boy < 1000: counter_boy += 1 & jump 'rand_boyrel_jump'
+	if npc_rel['A<<r>>'] < 50 and counter_boy < 1000: counter_boy += 1 & jump 'rand_boyrel_jump'
 	counter_boy = 0
-	npc_rel['A<<i>>'] += 3
+	npc_rel['A<<r>>'] += 3
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detbchat.jpg"></center>'
@@ -405,19 +406,11 @@ end
 
 if $ARGS[0] = 'Help Friends in need':
 	*clr & cla
-	gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
-	:detention_grupmatch
-	i = rand(0,47)
- 	if grupTipe[r] ! grupTipe[i] and jump_counter_1 < 1000: jump_counter_1 += 1 & jump 'detention_grupmatch'
- 	if npcPol[i] = 1 and jump_counter_2:
-		jump_counter_2 += 1
- 		jump 'detention_grupmatch'
- 	else
- 		$rand_boy = dyneval('$result = $npc_usedname[$school_static_num[<<i>>]]')
-	end
 	gs 'gschool_events', 'rand_teacher_arg'
 	if $rand_teacher = 'Ivanov': $rand_teacher = 'Tsarev'
-			gs 'stat'
+	gs 'gschool_events', 'rand_boy_arg', 1, 1, 1, 1, 1, 0
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
+	gs 'stat'
 !!replacement for random boy/girl
 !!Viktoriya and Vanya
 !!Ivan and Lariska
@@ -448,7 +441,7 @@ if $ARGS[0] = 'Help Friends in need':
 			gs 'stat'
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detflirt.jpg"></center>'
-			npc_rel['A<<i>>'] -= 2
+			npc_rel['A<<r>>'] -= 2
 			'You shake your head no, you don''t want to risk getting in more trouble by helping them. "Sorry I can''t"'
 			'They give you a disgusted look and move off to look for someone else to help them, you think you hear her call you a bitch.'
 			act 'Go home': gt 'gschool_detention', 'end'
@@ -460,7 +453,7 @@ if $ARGS[0] = 'Help Friends in need':
 		cla & *clr
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/detflirt.jpg"></center>'
-		npc_rel['A<<i>>'] += 1
+		npc_rel['A<<r>>'] += 1
 		'Thinking about it you feel that helping out friends in need is probably the best use of your time here, so you nod and smile. "Of coure I will help you guys out." You get up and approach the teacher asking him some questions about his last lesson. He is a bit reluctant at first but you manage to make the right inquiries and he cannot resist engaging you in a discussion on his subject.'
 		*nl
 		'You see the two of them slip away successfully and after a bit, you thank your teacher and head back to your table. You think you can faintly hear soft feminine moans of pleasure, but nobody else seems to even notice it. You don''t see them again until detention is over and everyone is leaving the building.'
@@ -634,7 +627,7 @@ if $ARGS[0] = 'company':
 		act 'Enjoy some company': gt 'gschool_detention', 'company2'
 	end
 	*clr & cla
-	minut += 180
+	minut += 120
 	gs 'stat'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/27.jpg"></center>'

locations/gschool_girls_bathroom.qsrc

@@ -88,8 +88,10 @@ end
 if $ARGS[0] = 'girl1':
 	*clr & cla
 	menu_off = 1
+	:girl1_jump
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 0, 0
-!!ToDo: Check the gs and exclude Lena or Lera and no Sonia
+	if ($rand_girl = 'Sonia' or $rand_girl = 'Lena' or $rand_girl = 'Lera') and jump_counter < 1000: jump_counter += 1 & jump 'girl1_jump'
+	jump_counter = 0
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
 	'After a couple of minutes, you hear the bathroom door open - someone else is in the bathroom with you! Carefully, you peek out, half-expecting to see a teacher... and see <<$girl>>. Relieved and smiling, you exit the stall and greet her. She turns around, slightly startled at first but then breaking into a smile when she see you. Within seconds, the two of you are chatting away about school, boys, clothes, makeup and anything else that strikes your fancy, having all but forgotten about the fact that you are sitting in the school bathroom. Before you know it, the class bell rings. You both stop and look up out of reflex, then bid each other later and head to your next class.'		

locations/gschool_grounds.qsrc

@@ -35,6 +35,16 @@ if $ARGS[0] = 'main':
 		act 'Follow Dimka to his home at the New Year party':  minut += 30 & gt 'sny', '3'
 	end
 	
+	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:		
+		afterschool_day = daystart
+		if rand(0,3) = 0:
+			$eventtype = 'after_school'
+			gt 'gschool_events', 'break_events'
+		else
+			gt 'gschool_events', 'afterschool_events'
+		end
+	end
+	
 	if hour <= 8 and kanikuli = 6:
 		'Today is graduation day! The school prom is tonight as well.'
 
@@ -72,8 +82,8 @@ if $ARGS[0] = 'main':
 				pcs_energy += 70
 				gs 'drugs', 'alcohol', 'vodka', rand(2,3)
 				gs 'underwear', 'remove'
-				gs 'stat'
 				gs 'clothing', 'strip'
+				gs 'stat'
 				'After the official graduation, everyone gets hammered at the prom party. You don''t remember much of what happened, only recalling a few flashbacks of going skinny dipping in the town fountain with a group of friends. Your mouth is dry and you can taste beer and what might be a kebab, you are somewhere in the town center, all of your clothes are missing and you are completely naked.'
 				'You make your way back home, you think you are discrete and stick to poorly lit areas but you really don''t remember and somehow have bits of someone''s hedge in your hair.'
 
@@ -272,7 +282,7 @@ if $ARGS[0] = 'main':
 		if albinaCarday ! daystart and AlbFrend >= 1 and albrideday ! daystart:'<a href="exec:minut += 15 & gt ''albinaRide''">Albina Barlovskaya</a> is waiting behind the wheel of a large black SUV, parked near the school.'
 		
 		! meynold`s events
-		if minut >= 0 and minut <= 30 and vicky_afterschool ! daystart: gs 'mey_vika_events', 'near_school'
+		if hour = 14 and vicky_afterschool ! daystart: gs 'mey_vika_events', 'near_school'
 		if mey_vika['mey_vika_qw'] = 35 or mey_vika['mey_vika_qw'] = 36 and minut < 45:
 			act 'Study with Tamara Mikhailovna':
 				if mey_vika['mey_vika_qw'] = 36: gt 'mey_tamara_events', 'rebuke'
@@ -289,16 +299,6 @@ if $ARGS[0] = 'main':
 		act 'Go and see what Fedor needs':gt 'strela'
 		exit
 	end
-	
-	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:		
-		afterschool_day = daystart
-		if rand(0,3) = 0:
-			$eventtype = 'after_school'
-			gt 'gschool_events', 'break_events'
-		else
-			gt 'gschool_events', 'afterschool_events'
-		end
-	end
 end
 
 !Outside school sports field
@@ -615,10 +615,10 @@ if $ARGS[0] = 'SchoolRun2':
 			npc_rel['A18'] = 0
 			zverevaQW = 1
             if razradbeg < 2:
-                'You have won the competition three more times and mr. Pavlovich awards you the second tier sports trophy in running.'
+                'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
                 razradbeg = 2
             else
-                'You have won the competition three more times and mr. Pavlovich awards you another trophy.'
+                'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
             end
             'Christina Zvereva stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
 		elseif swinbeggor = 2 and begresult >= 130:

locations/gschool_lessons.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'morning':
 		
 		if detention_set = 1 and week = 1:
 			detention_set = 2
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/50.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big134.jpg"></center>'
 			'The principal is waiting for you in the hall, and with a simple curl of a finger, she summons you to follow her to her office.'
 			*nl
 			gs 'gschool_lessons', 'uniform_check'

locations/gschool_lessons1.qsrc

@@ -8,19 +8,19 @@ if $ARGS[0] = 'math':
 	VK = rand(1,3)
 	gs 'stat'
 	'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 	if VK = 1:
 		VKrand = rand(1,2)
 		'You sit down in your seat just as Mr. Anatoly stands up to begin his lesson. Mr. Anatoly casually leans against the desk then crosses his arms, as he begins the lesson. "Today we will be learning about problem solving. The most important thing about solving a problem is to know what answer you are looking for, especially with word problems. You will need to know the question that you need to answer for. Here is an example: If Anna had four bottle caps and Dina had two pebbles then how many bottle caps do they have in total? Anyone?"'
 		*nl
 		if VKrand = 1:
-			'A few students raise their hands and Anatoly points to <a href="exec:gs ''shortgs'',''img msg'',''images/characters/pavlovsk/school/head/41.jpg''">Arkadi Fyodorov</a>, who answers, "They have six of course because four plus two equals six." Anatoly chuckles as he replies, "But of course. Four plus two is six, but are those the number of BOTTLE CAPS they have? The correct answer is no. Anna has four bottle caps and Dina has two PEBBLES, not bottle caps. You need to pay better attention to the actual question." Some of the other boys begin laughing at Arkadi while some of the girls giggle.'
+			'A few students raise their hands and Anatoly points to <a href="exec:gs ''shortgs'',''img msg'',''images/pc/npc_headshots/big156.jpg''">Arkadi Fyodorov</a>, who answers, "They have six of course because four plus two equals six." Anatoly chuckles as he replies, "But of course. Four plus two is six, but are those the number of BOTTLE CAPS they have? The correct answer is no. Anna has four bottle caps and Dina has two PEBBLES, not bottle caps. You need to pay better attention to the actual question." Some of the other boys begin laughing at Arkadi while some of the girls giggle.'
 			*nl
 			'Anatoly continues, "Do not let the numbers fool you. Understanding the question is the most important part of answering it. Now I''m going to hand out some sheets with multiple choice questions and all of you will have 10 minutes to answer each one." Anatoly reaches for some papers then begins handing them out while the boy crosses his arms trying to ignore some of the others laughing at him.'
 		else
 			'A few students raise their hands and Anatoly points to <a href="exec:gs ''shortgs'',''img msg'',''images/characters/pavlovsk/school/girl/julia/love/sad1.jpg''">Julia Milov</a>, who answers, "The answer is four because Anna is the only one with bottle caps. Dina only has pebbles which might as well not be mentioned, as it does not pertain to the answer needed." Anatoly tilts his head in surprise at Julia''s answer while Christina whispers to one of the other girls, "Wow she is really smart. Is she studying to be a teacher or something?"'
 			*nl
-			'Anatoly nods his head then says, responding, "Precisely. The involvement of Dina was only to deceive the one answering the question, which is why it is referred to, as a trick question. Now I would like to see who was paying attention and who was dozing off. I will be handing out some sheets with multiple choice questions and all of you will have 10 minutes to answer each one." Anatoly reaches for some papers on his desk then begins handing them out."'
+			'Anatoly nods his head then says, responding, "Precisely. The involvement of Dina was only to deceive the one answering the question, which is why it is referred to, as a trick question. Now I would like to see who was paying attention and who was dozing off. I will be handing out some sheets with multiple choice questions and all of you will have 10 minutes to answer each one." Anatoly reaches for some papers on his desk then begins handing them out.'
 		end
 	elseif VK = 2:
 		VK = rand(1,3)
@@ -58,7 +58,7 @@ if $ARGS[0] = 'math':
 		else
 			'Dimka scoffs as he says, "Why would they do that? That sounds stupid to me." Anatoly responds, "Ahh Dmitriy, it is nice of you to raise your hand and volunteer to answer my next question." Dimka facepalms as Anatoly continues, "if the current time is 4am and you have a dentist appointment at 2pm then how long do you have to wait until your dentist appointment begins? Remember that you need to calculate the numbers while keeping the 12 hour timezones in mind."'
 			*nl
-			'<a href="exec:gs ''shortgs'',''img msg'',''images/characters/pavlovsk/school/head/1.jpg''">Dimka</a> responds, "If it is really 4am then I would probably go to sleep and figure it out in the morning." Many of the students along with Anatoly, begin laughing. "That was not exactly the answer I was looking for, but I can forgive it. The answer for that question was ten hours." Anatoly grabs a piece of chalk then begins writing on the chalkboard; "A simple way of figuring it out is by looking at the arrive time. The time for arriving is 2pm which mean that it is two hours after twelve.'
+			'<a href="exec:gs ''shortgs'',''img msg'',''images/pc/npc_headshots/big1.jpg''">Dimka</a> responds, "If it is really 4am then I would probably go to sleep and figure it out in the morning." Many of the students along with Anatoly, begin laughing. "That was not exactly the answer I was looking for, but I can forgive it. The answer for that question was ten hours." Anatoly grabs a piece of chalk then begins writing on the chalkboard; "A simple way of figuring it out is by looking at the arrive time. The time for arriving is 2pm which mean that it is two hours after twelve.'
 			*nl
 			'Those added together equals fourteen. Lastly we need to subtract the current time from this to eliminate the time already passed. fourteen minus four equals ten, giving us our answer." Dimka sarcastically responds, "Yeah that''s...Real simple." Igor laughs, as Anatoly responds with a smirk on his face, "With practice it will be, speaking of which, I will begin handing out some simple problems for you to solve." Anatoly then reaches for some papers on his desk then begins handing them out.'
 		end
@@ -67,11 +67,11 @@ if $ARGS[0] = 'math':
 		'You walk into the classroom then sit down at your seat just as Mr. Tsarev gets up from his seat to begin today''s lesson. "Alright I would like to know how much you all know of numbers. Can anyone tell me what is the smallest number in existence?"'
 		*nl
 		if VKrand = 1:
-			'Christina raises her hand and Mr. Tsarev points to her then says, "Miss Zvereva." <a href="exec:gs ''shortgs'',''img msg'',''images/characters/pavlovsk/school/head/18.jpg''">Christina</a> answers, "Isn''t the smallest number, the size of Igor''s penis?" Igor recoils in shock as Mr. Tsarev; with a stern look on his face, responds, "No that is not the answer and I would appreciate if you would take this question seriously.'
+			'Christina raises her hand and Mr. Tsarev points to her then says, "Miss Zvereva." <a href="exec:gs ''shortgs'',''img msg'',''images/pc/npc_headshots/big18.jpg''">Christina</a> answers, "Isn''t the smallest number, the size of Igor''s penis?" Igor recoils in shock as Mr. Tsarev; with a stern look on his face, responds, "No that is not the answer and I would appreciate if you would take this question seriously.'
 		elseif VKrand = 2:
-			'<a href="exec:gs ''shortgs'',''img msg'',''images/characters/pavlovsk/school/head/16.jpg''">Natasha Belova</a> raises her hand then says, "Isn''t that a trick question? Numbers have no ending point, so finding the lowest number, shouldn''t be possible." Mr. Tsarev nods his head approvingly before responding, "That is correct. Numbers are without end so finding a lowest point is impossible, so to answer the question at hand,'
+			'<a href="exec:gs ''shortgs'',''img msg'',''images/pc/npc_headshots/big16.jpg''">Natasha Belova</a> raises her hand then says, "Isn''t that a trick question? Numbers have no ending point, so finding the lowest number, shouldn''t be possible." Mr. Tsarev nods his head approvingly before responding, "That is correct. Numbers are without end so finding a lowest point is impossible, so to answer the question at hand,'
 		else
-			'No one raises their hand, so Mr. Tsarev points out <a href="exec:gs ''shortgs'',''img msg'',''images/characters/pavlovsk/school/head/4.jpg''">Igor</a>, who looks around the room in confusion before saying, "Uhh, it''s negative infinity right?" Mr. Tsarev shakes his head before responding, "Is infinity a number?" Igor says, "Um I guess so...Right?" Mr. Tsarev replies, "No it is not. Infinity is a never ending stream sequence of numbers. Not a singular number, so to answer the question,'
+			'No one raises their hand, so Mr. Tsarev points out <a href="exec:gs ''shortgs'',''img msg'',''images/pc/npc_headshots/big4.jpg''">Igor</a>, who looks around the room in confusion before saying, "Uhh, it''s negative infinity right?" Mr. Tsarev shakes his head before responding, "Is infinity a number?" Igor says, "Um I guess so...Right?" Mr. Tsarev replies, "No it is not. Infinity is a never ending stream sequence of numbers. Not a singular number, so to answer the question,'
 		end
 		*nl
 		'The smallest number in existence is...Nothing. There is no smallest number. Numbers can go beyond negative in an infinite cycle and infinity has no bottom point, so finding the smallest number is an impossibility during an infinite cycle. I will be handing out some worksheet with negative and positive number problems. Try to answer as many as possible in the next 15 minutes." Mr. Tsarev begins handing out worksheets to the class.'
@@ -130,7 +130,7 @@ if $ARGS[0] = 'math':
 				if VKrand = 1 and npc_rel['A2'] >= 80 or VKrand = 1 and grupTipe = 3:
 					'You nervously look around the room, not knowing what the question was when you faintly hear, "Psst!" You look toward Artem to see him holding up a paper scrap behind his seat which has the answer written out. You confidently look toward Mr. Anatoly before telling him the correct answer, resulting in a surprised look on his face before he says, "Hmm, very good, but do try to keep your head up during class, okay?" You give him a nod before he continues his lesson.'
 					'<center><b><font color=#0080FF><<"Artyom [Artem] Chebotarev">></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/2.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 				elseif VKrand = 2 and npc_rel['A12'] >= 80 or VKrand = 2 and grupTipe = 3:
 					'You nervously look around the room, not knowing what the question was when you hear Julia ask Mr. Tsarev, "Why was the problem structured like that? I thought that finding X came after finding Y" Mr. Tsarev turns to Julia then says, "There is no order in which one we find first. I just used the one earlier in the equation. You can always choose the one that you solve as long as you end up solving both before reaching the second half of the problem."'
 					*nl
@@ -143,7 +143,7 @@ if $ARGS[0] = 'math':
 				elseif pcs_grades >= 80:
 					'You nervously look around the room, not knowing what the question was. You pretend to clear your throat while you quickly study the equation on the board then quickly solve the problem in your head before answering the question correctly. Mr. Tsarev gives you a satisfied nod before responding, "Very good, but try and keep your head up during class, if you don''t mind."'
 					'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 				else
 					*clr & cla
 					gs'stat'
@@ -172,7 +172,7 @@ if $ARGS[0] = 'math':
 					*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 					'You straighten up in your chair then say, "I wasn''t paying attention, I''m sorry." Anatoly shrugs as he says, "Could you at least try to pay attention. Many things that we need in life require some effort from us all. It''s not always fun but some of the things we learn making life easier in the future, leading to even more pleasant times." You nod as Anatoly turns around to continue his lesson. You sit through the rest of the lesson in silence, trying your best to take in as much as you can.'
 					'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 					act 'Wait for the end of the lesson': gt 'gschool_lessonsev2', 'math'
 				end
 				act 'Reluctantly pay attention':
@@ -210,7 +210,7 @@ if $ARGS[0] = 'math':
 								grupvalue[3] -=2
 								gs'stat'
 								'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 								'"What good would that do? Would you rather I begin smoking to pass the time? I''m not interrupting your classes, just leave me alone. I''m having some... girl problems." You answer brashly, not having any intentions of getting up. Anatoly sighs then shakes his head, "If you are having some personal issues then I won''t punish you for that, but do try to pay attention if you can. I am only trying to prepare you all for the future."'
 								*nl
 								'You remain silent as Anatoly turns around and continues his lesson. You obviously have no interest in learning anything today. You can hear one of the boys behind you mutter, "It must be that time of the month." Then giggle to each other as you turn around to flip him off.'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'math':
 				if npc_rel['A18'] > 30:npc_rel['A18'] = 30
 				'As you are browsing the web, you receive a text message from Christina Zvereva, reading; "Hey there piggy, are you looking up discounts on Peremech, so that you can shove them down your throat? Why don''t you lose some weight before the teachers decide to add bovine etiquette to the curriculum? because they may feel it necessary to teach the students, how to talk to a cow like you." You can feel your face growing flushed in embarrassment while reading Christina''s hurtful comments. You quickly turn off your phone then try not to make eye contact with Christina for the rest of the lesson.'
 				'<center><b><font color=#0090FF><<"Christina Zvereva">></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			elseif VK = 1 and npc_rel['A18'] >= 80 and zverRageQW = 0 or VK = 1 and grupTipe = 2 and zverRageQW = 0:
 				VKrand = rand(1,3)
@@ -260,7 +260,7 @@ if $ARGS[0] = 'math':
 					'You giggle as you reply, "Sure sounds like fun." While sticking your tongue out at her, causing you both to giggle before turning back to your phones.'
 				end
 				'<center><b><font color=#0090FF><<"Christina Zvereva">></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			elseif VK = 2 and JuliaMiLoveQW >= 10:
 				'You continue browsing the web, when you suddenly receive a text message from Julia Milov; depicting your name, and her''s, inside of a heart together. You turn to Julia to see a big smile on her face as she gazes into your eyes. You return the smile before replying with, "You are so precious to me, Julia." Julia quickly replies, "I am so happy that I have you in my life." You reply to Julia, "Ohhh you are just so cute. Muah." Julia giggles before turning back to Mr. Tsarev while occasionally turning back toward you and smiling.'
@@ -282,7 +282,7 @@ if $ARGS[0] = 'math':
 			else
 				*clr & cla
 				'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 				'As you are browsing the web, you notice Mr. Tsarev giving you a stern look. He seems to have noticed that you''re not paying attention to his lesson.'
 				act 'Put your phone away':
 					*clr & cla
@@ -291,7 +291,7 @@ if $ARGS[0] = 'math':
 					grupvalue[4] -=1
 					gs'stat'
 					'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 					'You turn off your phone then put it away. Mr. Tsarev give you an approving nod before continuing with today''s lesson.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'math'
 				end
@@ -306,7 +306,7 @@ if $ARGS[0] = 'math':
 						demerit += 5
 						gs'stat'
 						'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 						'You decide to try your luck and continue browsing the internet despite Mr. Tsarev watching you. Mr. Tsarev pauses the lesson then begin walking toward your desk.'
 						act 'Hand over the phone':
 							*clr & cla
@@ -314,7 +314,7 @@ if $ARGS[0] = 'math':
 							grupvalue[3] += 1
 							gs'stat'
 							'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 							'Anatoly extends his hand then says, "What is so important on there that you need to disrupt my lesson? Hand it over." You realize that Anatoly is not messing around and decide that it''s not worth the conflict, so you silently hand your phone to Mr. Tsarev. As Anatoly walks back to the front of the class, he says, "I''m holding onto your phone for now, Miss <<$pcs_lastname>>. You can have it back after class."'
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -338,7 +338,7 @@ if $ARGS[0] = 'math':
 								*nl
 								'Mr. Tsarev puts your phone in his pocket before returning to teaching his lesson. You occasionally see Anatoly turn the phone on and peek at the screen when he believes that no one is watching.'
 								'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 								act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 							end
 						else
@@ -357,7 +357,7 @@ if $ARGS[0] = 'math':
 								*nl
 								'Mr. Tsarev seems flabbergasted by your actions, he remains silent for a few seconds before shaking his head then turning around and walking back to the front of the class. It seems that Anatoly realized that it''s not worth the effort to take your phone away from you, without causing all sorts of awkward situations, You pull your phone back out of your bra then continue browsing the web, as the lesson goes on.'
 								'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 								act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 							end
 						elseif $braworntype ! 'none' and will_cost > pcs_willpwr:
@@ -654,7 +654,7 @@ if $ARGS[0] = 'literature':
 				grupvalue[1] -=1
 				grupvalue[4] -=1
 				grupvalue[3] +=1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/54.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big137.jpg"></center>'
 				'"Sorry, Ms. Braakman." You mumble quietly as you sit up straight and refocus on the lesson. Satisfied, Ms. Braakman returns to teaching with a small smile.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
@@ -941,7 +941,7 @@ if $ARGS[0] = 'english':
 					grupvalue[1] -=1
 					grupvalue[4] -=1
 					grupvalue[3] +=1
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/54.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big137.jpg"></center>'
 					*nl
 					'"Sorry, Ms. Braakman." You mumble quietly as you sit up straight and refocus on the lesson. Satisfied, Ms. Braakman returns to teaching with a small smile.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1626,7 +1626,7 @@ if $ARGS[0] = 'biology':
 							grupvalue[4] += 1
 							grupvalue[3] -= 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bitchflip.jpg"></center>'
-							'"What good would that do? Are you trying to get me to start smoking to pass the time? I''m not interrupting your classes, just leave me alone.'
+							'"What good would that do? Are you trying to get me to start smoking to pass the time? I''m not interrupting your classes, just leave me alone."'
 							'Your teacher doesn''t know what to say, and after a while just decides to continue her classes. Obviously, you don''t learn anything today. You hear one of the boys behind you mutter your being a bitch, you turn around and flip him off.'
 							act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 						end
@@ -1709,7 +1709,7 @@ if $ARGS[0] = 'biology':
 						grupvalue[4] -=1
 						grupvalue[3] += 1
 						gs'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 						'Miss Orlov extends his hand then says, "What is so important on there that you need to disrupt my lesson? Hand it over." You realize that Miss Orlov is not messing around and decide that it''s not worth the conflict, so you silently hand your phone to Miss Orlov. As he walks back to the front of the class, he says, "I''m holding onto your phone for now, Miss <<$pcs_lastname>>. You can have it back after class."'
 						act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 					end
@@ -1775,7 +1775,7 @@ if $ARGS[0] = 'math_late':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem1.jpg"></center>'
 		'When you open the door and walk in Mr Tsarev stops talking and everyone turns their eyes towards you. "So good of you to join us Miss <<$pcs_lastname>>." Several of the kids smirk, a few look annoyed you interrupted class or that you are getting away with being late.'
-		act 'Say your sorry':
+		act 'Say you''re sorry':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem2.jpg"></center>'
@@ -1942,7 +1942,7 @@ if $ARGS[0] = 'literature_late':
 			end
 		else
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late Miss <<$pcs_lastname>>, I will not tolerate students being late to my class." Several of the kids smirk, a few look annoyed you interrupted class.'
-			act 'Say your sorry':
+			act 'Say you''re sorry':
 				*clr & cla
 				demerit += 5
 				gs 'stat'

locations/gschool_lessonsev1.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'fiz_rand':
 		gs 'exhibitionism', 1
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand1.jpg"></center>'
-		'You''re not wearing panties, and while you''re doing your pullups your shorts slide down a little. Now, the top of your pubes are on display for the whole class to see. It''s met with mixed responses: the guys are whistling and whooping appreciatively, while most of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
+		'You''re not wearing panties, and while you''re doing your pullups your shorts slide down a little. Now, the top of your '+iif(pcs_pubes < 3, 'pubic area', 'pubes')+' are on display for the whole class to see. It''s met with mixed responses: the guys are whistling and whooping appreciatively, while most of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
 	elseif fizperand = 2 and hotcat >= 6:
 		*clr & cla
 		pcs_horny += 10
@@ -58,20 +58,42 @@ if $ARGS[0] = 'fiz_rand':
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/wedgie.jpg"></center>'
 		'During a break in gym class, you are chatting with several other girls when you feel someone''s hands reach down the back of your shorts, grabbing a hold of your panties and sharply yanking them up. Dan yanks your panties up so hard that your feet actually lift off the ground for a moment. You cry out in pain, quickly turn around and see Dan laughing while several others are watching and laughing as well.'
-		act 'Kick him':
-			cla
-			grupvalue[2] +=1
-			'He starts to back up but you manage to kick him hard in the shin, causing him to hop around on one leg while holding his shin in pain, which just got the others laughing harder. A couple of the other girls move over to give you moral support and give the guys dirty looks. Plus they use their bodies to shield you from the rest of the class so you can peel your panties out of your ass and twat, putting everything back in it''s proper place.'
-			act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+
+		act 'Don''t retaliate': grupvalue[4] -= 2 & gt 'gschool_lessons2', 'postphys'
+		
+		gs 'willpower', 'misc'
+		if will_cost <= pcs_willpwr:
+			act 'Kick him (<<will_cost>> Willpower)':
+				cla & *nl
+				gs 'willpower', 'misc'
+				gs 'willpower', 'force', 'self'
+				gs 'stat'
+				grupvalue[2] +=1
+				'He starts to back up but you manage to kick him hard in the shin, causing him to hop around on one leg while holding his shin in pain, which just got the others laughing harder. A couple of the other girls move over to give you moral support and give the guys dirty looks. Plus they use their bodies to shield you from the rest of the class so you can peel your panties out of your ass and twat, putting everything back in it''s proper place.'
+				act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+			end
+		else
+			'<br>You don''t have enough willpower to kick him.'
 		end
-		act 'Beat his ass':
-			cla
-			grupvalue[4] +=1
-			demerit += 20
-			'You your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more his attention wanders and he doesn''t see you charging him. You run into him and knock him to the floor, where you''re quickly on top of him, sitting on his chest and starting to punch him straight in the face.'
-			*nl
-			'He is a bit stunned by this sudden attack and at first he just covers up to try and block some of your punches, before he finally starts to fight back. For him, the coach arrives just in time. The coach grabs you by the back of the neck and with one powerful yank, pulls you off Dan and nearly tosses you on your back. He steps between the two of you, stopping Dan and you from going at it again. He turns to you and says, "Go to the principal''s office, NOW!" You try and protest but he doesn''t want to hear it and points at the door.'
-			act 'Go to the principals offices': gt 'gschool_office', 'principal'
+		
+		gs 'willpower', 'misc'
+		will_cost = will_cost * 3/2
+		if will_cost <= pcs_willpwr:
+			act 'Beat his ass (<<will_cost>> Willpower)':
+				cla & *nl
+				gs 'willpower', 'misc'
+				will_cost = will_cost * 3/2
+				gs 'willpower', 'force', 'self'
+				gs 'stat'
+				grupvalue[4] +=1
+				demerit += 20
+				'You your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more his attention wanders and he doesn''t see you charging him. You run into him and knock him to the floor, where you''re quickly on top of him, sitting on his chest and starting to punch him straight in the face.'
+				*nl
+				'He is a bit stunned by this sudden attack and at first he just covers up to try and block some of your punches, before he finally starts to fight back. For him, the coach arrives just in time. The coach grabs you by the back of the neck and with one powerful yank, pulls you off Dan and nearly tosses you on your back. He steps between the two of you, stopping Dan and you from going at it again. He turns to you and says, "Go to the principal''s office, NOW!" You try and protest but he doesn''t want to hear it and points at the door.'
+				act 'Go to the principals offices': gt 'gschool_office', 'principal'
+			end
+		else
+			'<br>You don''t have enough willpower to beat him up.'
 		end
 	elseif fizperand = 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hanging.jpg"></center>'
@@ -94,13 +116,19 @@ if $ARGS[0] = 'fiz_rand':
 			'Once you have the equipment you duck out of the room as quickly as you can, not looking back at him.'
 			act 'End of lesson':gt 'gschool_lessons2', 'postphys'
 		end
-		act 'Tease him':
-			cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand6.jpg"></center>'
-			'You decide to have a little fun of your own. You ''accidentally'' drop something, while he is keeping you steady. You bend over at the waist, pushing your ass back against his crotch. You grind yourself against him and you can feel him getting hard. Then you pick up the item and quickly stand up, before heading out of the room. You glance back and flash him a sweet smile, noticing he''s trying to hide the erection in his shorts. You add a bit of a extra sway to your hips as you walk away.'
-			gs 'arousal', 'foreplay', 5, 'sub'
-			gs 'arousal', 'end'
-			act 'End of lesson': gt 'gschool_lessons2', 'postphys'
+		gs 'willpower', 'exhib'
+		if will_cost <= pcs_willpwr:
+			act 'Tease him (<<will_cost>> Willpower)':
+				cla
+				gs 'willpower', 'force', 'self'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand6.jpg"></center>'
+				'You decide to have a little fun of your own. You ''accidentally'' drop something, while he is keeping you steady. You bend over at the waist, pushing your ass back against his crotch. You grind yourself against him and you can feel him getting hard. Then you pick up the item and quickly stand up, before heading out of the room. You glance back and flash him a sweet smile, noticing he''s trying to hide the erection in his shorts. You add a bit of a extra sway to your hips as you walk away.'
+				gs 'arousal', 'foreplay', 5, 'sub'
+				gs 'arousal', 'end'
+				act 'End of lesson': gt 'gschool_lessons2', 'postphys'
+			end
+		else
+			'<br>You don''t have enough willpower to tease him.'
 		end
 	elseif fizperand = 13:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bendoverff.jpg"></center>'
@@ -154,12 +182,12 @@ if $ARGS[0] = 'biology':
 			gs'stat'
 			if $pantyworntype = 'none' and analplugin = 0:
 				gs 'exhibitionism', 2
-				gs 'fame', 'pav', 'sex', 3
+				gs 'fame', 'pav', 'sex', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Miss Orlov comes over to help you back up and block the view of your ass, as best she can. Once you are back on your feet she says softly. "This is why you should wear panties to school, I won''t report you over it, but I suggest you wear them in the future."'
 			elseif $pantyworntype = 'none' and analplugin = 1:
-				gs 'exhibitionism', 2
-				gs 'fame', 'pav', 'sex', 5
+				gs 'exhibitionism', 3
+				gs 'fame', 'pav', 'sex', 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 				'You''ve been called up to answer the question written on the blackboard, but while solving it. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties and your ass is currently stuffed full with a butt plug. When you bend over you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy currently filling your ass. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where your teacher sits, they can''t see what everyone is fussing over, so they start to move to get a better look, but you quickly snap back up and adjust your skirt and start wiping away at the board as if nothing ever happened.'	
 			else
@@ -420,23 +448,24 @@ if $ARGS[0] = 'science':
 		elseif scooltiperand = 3:
 			pcs_mood -= 10
 			gs'stat'
-			if $pantyworntype ! 'none':
-				gs 'exhibitionism', 1
-				gs 'fame', 'pav', 'sex', 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
-				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. Miss Orlov comes over to help you back up and block the view of your ass, as best she can. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
-			else
+			if $pantyworntype = 'none' and analplugin = 0:
 				gs 'exhibitionism', 2
 				gs 'fame', 'pav', 'sex', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Miss Orlov comes over to help you back up and block the view of your ass, as best she can. Once you are back on your feet she says softly. "This is why you should wear panties to school, I won''t report you, but I suggest in the future you wear them."'
-				
-				!!if wearing no panties and wearing buttplug
+			elseif $pantyworntype = 'none' and analplugin = 1:
+				gs 'exhibitionism', 3
+				gs 'fame', 'pav', 'sex', 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. On accident, you drop the cloth needed to wipe the board clean. You hesitate to pick it up as you think about the fact that you''re not wearing any panties while your ass is currently stuffed full with a butt plug.'
 				*nl
 				'"Well?" Your teacher prods impatiently. You''re teacher is right, might as well get on with it.'
 				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy currently filling your ass. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where your teacher sits, they can''t see what everyone is fussing over, so they start to move to get a better look, but you quickly snap back up and adjust your skirt. With a devious smile and cloth in hand, you start wiping away at the board as if nothing ever happened.'
+			else
+				gs 'exhibitionism', 1
+				gs 'fame', 'pav', 'sex', 1
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
+				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. Miss Orlov comes over to help you back up and block the view of your ass, as best she can. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			end
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 4:
@@ -594,23 +623,24 @@ if $ARGS[0] = 'computer':
 		elseif scooltiperand = 2:
 			pcs_mood -= 10
 			gs'stat'
-			if $pantyworntype ! 'none':
-				gs 'exhibitionism', 1
-				gs 'fame', 'pav', 'sex', 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
-				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
-			else
+			if $pantyworntype = 'none' and analplugin = 0:	
 				gs 'exhibitionism', 2
 				gs 'fame', 'pav', 'sex', 2
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
-				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
-				
-				!!if wearing no panties and wearing buttplug
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
+				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
+			elseif $pantyworntype = 'none' and analplugin = 1:	
+				gs 'exhibitionism', 3
+				gs 'fame', 'pav', 'sex', 3			
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. On accident, you drop the cloth needed to wipe the board clean. You hesitate to pick it up as you think about the fact that you''re not wearing any panties while your ass is currently stuffed full with a butt plug.'
 				*nl
 				'"Well?" Your teacher prods impatiently. You''re teacher is right, might as well get on with it.'
 				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy currently filling your ass. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where your teacher sits, they can''t see what everyone is fussing over, so they start to move to get a better look, but you quickly snap back up and adjust your skirt. With a devious smile and cloth in hand, you start wiping away at the board as if nothing ever happened.'
+			else				
+				gs 'exhibitionism', 1
+				gs 'fame', 'pav', 'sex', 1
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
+				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
 			end
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 3:
@@ -968,23 +998,24 @@ if $ARGS[0] = 'russian':
 		elseif scooltiperand = 2:
 			pcs_mood -= 10
 			gs'stat'
-			if $pantyworntype ! 'none':
-				gs 'exhibitionism', 1
-				gs 'fame', 'pav', 'sex', 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
-				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
-			else
+			if $pantyworntype = 'none' and analplugin = 0:
 				gs 'exhibitionism', 2
 				gs 'fame', 'pav', 'sex', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
-				
-				!!if wearing no panties and wearing buttplug
+			elseif $pantyworntype = 'none' and analplugin = 1:
+				gs 'exhibitionism', 3
+				gs 'fame', 'pav', 'sex', 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. On accident, you drop the cloth needed to wipe the board clean. You hesitate to pick it up as you think about the fact that you''re not wearing any panties while your ass is currently stuffed full with a butt plug.'
 				*nl
 				'"Well?" Your teacher prods impatiently. You''re teacher is right, might as well get on with it.'
 				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy currently filling your ass. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where your teacher sits, they can''t see what everyone is fussing over, so they start to move to get a better look, but you quickly snap back up and adjust your skirt. With a devious smile and cloth in hand, you start wiping away at the board as if nothing ever happened.'
+			else
+				gs 'exhibitionism', 1
+				gs 'fame', 'pav', 'sex', 1
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
+				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			end
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 3:

locations/gschool_lessonsev2.qsrc

@@ -324,14 +324,14 @@ if $ARGS[0] = 'math':
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 1
 				'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 				'Mr. Tsarev calls you up to the blackboard to answer a question. As you are approach the front of the class, you trip and fall, landing on your chest with your skirt on your back, giving the whole class a good view up your skirt. You quickly get up and straighten your clothes while trying to hide how red your face is while the boys begin hollering. It is quite obvious that most of the guys and even a few of the girls, appreciate the show, even if it was involuntarily.'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 			else
 				gs 'exhibitionism', 2
 				gs 'fame', 'pav', 'sex', 2
 				'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big26.jpg"></center>'
 				'Mr. Tsarev calls you up to the blackboard to answer a question. As you begin solving the problem, you drop the chalk on the floor. You quickly bend over to pick it up, having forgot that you are not wearing any panties and giving everyone in the class a clear view of both of your holes. The boys begin whistling and hollering while many of the girls begin whispering to each other.'
 				*nl
 				'Dimka: "Damn <<$pcs_nickname>>, you certainly know how how to put on a show."'
@@ -361,7 +361,7 @@ if $ARGS[0] = 'math':
 			'During class there is a loud crashing sound from the back of the class, you along with everyone else in the class turn to look, in the back Evgeny is on the floor with his desk on top of him. The whole class bursts into laughter.'
 			'You can tell that Evgeny is blushing as he quickly gets up and corrects his desk before sitting back down. After making sure he is okay, Mr. Tsarev gets the class back under control and finishes the lesson.'
 			'<center><b><font color=#90FF00><<"Evgeny Kuznetsov">></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/35.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big151.jpg"></center>'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 4:
 			VK = rand(1,3)
@@ -397,7 +397,7 @@ if $ARGS[0] = 'math':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 8:
 			'<center><b><font color=#FFC600><<"Igor Kruglov">></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 			'The lesson takes a brief pause as Natasha asks Mr. Tsarev a question about her paper. With nothing to do for the moment, you doodle a few drawing in your notebook. When you look back up, you notice Igor turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your direction?'
 			*nl
 			'Even Mr. Tsarev walks by and pauses next to your desk for a moment before continuing with his lesson. Class resumes, and things return to normal, but part-way through the lesson, you look to Igor again, and find him staring at you. He''s clearly not trying to make eye contact, however, or he would have noticed you looking back at him.'
@@ -411,7 +411,7 @@ if $ARGS[0] = 'math':
 				*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 				'You quickly grasp both sides of your blouse and pull them tightly together. Igor''s face turns red when he realizes he''s been caught, and he immediately turns back to face the blackboard.'
 				'<center><b><font color=#FFC600><<"Igor Kruglov">></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			gs 'willpower', 'exhib'
@@ -425,7 +425,7 @@ if $ARGS[0] = 'math':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 					'You let Igor continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
 					'<center><b><font color=#FFC600><<"Igor Kruglov">></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
@@ -978,7 +978,7 @@ if $ARGS[0] = 'shop':
 			gs 'gschool_events', 'rand_boy_arg', 1, 1, 0, 1, 1, 0
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/brasnap.jpg"></center>'
 			'During class, you feel a hand grab and pull your bra strap away from your body and before you can turn or protest they let go, causing it to snap back painfully. You let out a little yelp and turn to glare at <<$rand_boy>> behind you.'
-			'Then you hear Mr. Kuznetsov. "Is there a problem miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, <<$rand_boy>> behind you is snickering. The teacher looks at you accusingly.'
+			'Then you hear Mr. Kuznetsov. "Is there a problem Miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, <<$rand_boy>> behind you is snickering. The teacher looks at you accusingly.'
 			act 'Nothing is wrong':
 				cla
 				'You shake your head no to the teacher and desperately want to turn around and strangle <<$rand_boy>>, but you don''t dare with the teacher now keeping a eye on you.'

locations/gschool_lunch.qsrc

@@ -119,6 +119,8 @@ if $ARGS[0] = 'break':
 	'During break many of the kids split up to hang out with those in their same social groups. The nerds and outcast hangout in the classrooms, while the cool kids and jocks hang out in the hallway near the lockers, and the gopniks hangout in the stairwell, near the classrooms that are not used.'
 	cla
 	
+	$eventtype = 'long_break'
+	
 	if $breaktype ! 'long':	
 		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat did you happen to see Dimka?" "Hi <<$pcs_nickname>>, he was here before speaking with Lena and Lera.'
 	
@@ -160,7 +162,6 @@ if $ARGS[0] = 'break':
 		else
 			if breakevent_break_day ! daystart:
 				breakevent_break_day = daystart
-				$eventtype = 'long_break'
 				gt 'gschool_events', 'break_events'
 			end
 			
@@ -328,7 +329,7 @@ end
 
 if $ARGS[0] = 'events':
 	menu_off = 1
-	if npcSex[14] = 1 and KatjaLust >= 50 and Katjahorny + KatjaSlut >= 100 and KatjaHorny > 50:
+	if npc_sex['A14'] = 1 and KatjaLust >= 50 and Katjahorny + KatjaSlut >= 100 and KatjaHorny > 50:
 		cla
 		'During the break Katja Meynold approaches you, her face flushed in a mixture of shame and what seems to be arousal. After a few seconds, she gathers enough courage to ask if you want go somewhere quiet with her.'
 		act 'Refuse': KatjaDom -= 1 & gt 'gschool_lunch', 'break'
@@ -447,7 +448,7 @@ if $ARGS[0] = 'events':
 				*nl
 				'A few minutes later, Vitek is about to cum and tells you, "Good job, cocksucker. I''m going to drop my load in your mouth now and when I do, you ''re going to swallow it all and lick me clean. If you spill anything, you''re going to lick it up from the floor. Got that?" You nod up at him and as soon as his cum hits your tongue, you diligently swallow his load, making sure not to let a single drop escape. When you''re sure he''s finished, you lick and suck his slowly softening dick clean, before tucking it back into his pants for him.'
 				*nl
-				'"That was great, <<$pcs_firstname>>, I see you''ve certainly earned your reputation. We''ll definitely be doing this more often, maybe next time I''ll make sure the other boys can have a turn as well. We''ll come find you when we want you. Understood?"'
+				'"That was great, <<$pcs_nickname>>, I see you''ve certainly earned your reputation. We''ll definitely be doing this more often, maybe next time I''ll make sure the other boys can have a turn as well. We''ll come find you when we want you. Understood?"'
 				*nl
 				'You''re not looking forward to the perspective, but not knowing what else to do you just nod. After the guys leave the bathroom you quickly have a drink, trying to wash the nasty taste of his cum out of your mouth.'
 				act 'Continue': gt 'gschool_lessons', 'short_break'

locations/gschool_sex.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = 'suck':
 				elseif lpp = 3:
 					'"I think I might have tonsillitis... Throat hurts." feigning a hoarse voice, you say.'
 				elseif lpp = 4:
-					gs 'gschool_events', 'rand_girl_arg2'
+					gs 'gschool_events', 'rand_girl_arg'
 
 					'"I told <<$rand_girl>>, I would go home with her and study."'
 				elseif lpp = 5:
@@ -418,6 +418,7 @@ if $ARGS[0] = 'Anush_kiss':
 			gs 'arousal', 'bj', 10, 'group'
 			gs 'boystat', 'A156'
 			gs 'arousal', 'bj', 10, 'group'
+			minut -= 10
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
@@ -425,6 +426,7 @@ if $ARGS[0] = 'Anush_kiss':
 				'Anushka stops and pulls you up as she stands up. "Ok boys it''s our turn." The boys waste no time in taking off your clothes as you and Anushka start making out again, once your both naked the buys kneel down and start eating you out. The even return the favor of switching, which pussy they are licking.'
 				gs 'arousal', 'kiss', 10, 'lesbian'
 				gs 'arousal', 'cuni', 10, 'group'
+				minut -= 10
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
@@ -437,6 +439,7 @@ if $ARGS[0] = 'Anush_kiss':
 					gs 'arousal', 'vaginal', 10, 'group'
 					gs 'boystat', 'A158'
 					gs 'arousal', 'vaginal', 10, 'group'
+					minut -= 10
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
@@ -452,6 +455,7 @@ if $ARGS[0] = 'Anush_kiss':
 						gs 'arousal', 'anal', 10, 'group'
 						gs 'boystat', 'A156'
 						gs 'arousal', 'anal', 10, 'group'
+						minut -= 10
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
@@ -475,7 +479,7 @@ if $ARGS[0] = 'rand_bj':
 	*clr & cla
 	menu_off = 1
 	pcs_horny += 50
-	gs'stat'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet2.jpg"></center>'
 	'You can''t believe you''re doing this! Minutes ago you were just looking to relax in the classroom between lessons, and now you''re about to give this guy the best blowjob he''s ever had, in front of all your classmates that''s so hot!'
 	'You impatiently undo the button on his pants and dig your hand in, surely enough finding a hard dick waiting for you. You scoot his pants down a bit and pull it out, giving it a little kiss as you drop to your knees.'
@@ -565,7 +569,7 @@ if $ARGS[0] = 'rand_sex':
 				*nl
 				'After he admires his handiwork for a second, he notices the time, "Oh crap! <<$pcs_nickname>>, we''re going to be late for class!"'
 				'You both get dressed as quickly as you can, and run as fast as you can to make it to class on time.'
-				act 'Continue': gt 'gschool_lessons', 'short_break'
+				act 'Continue': gt 'gschool_events', 'leave_break_events2'
 			end
 		end
 		act 'He fucks your ass':
@@ -601,7 +605,7 @@ if $ARGS[0] = 'rand_sex':
 					gs 'arousal', 'anal', 10, 'unknown'
 					gs 'arousal', 'end'
 					gs'stat'
-					act 'Continue': gt 'gschool_lessons', 'short_break'
+					act 'Continue': gt 'gschool_events', 'leave_break_events2'
 				end
 			end
 		end
@@ -629,17 +633,7 @@ if $ARGS[0] = 'lunch_bj':
 			'He doesn''t last long; within a few minutes you feel his cum squirting in your mouth. You quietly swallow it all and release his cock, giving it a cute kiss before letting him tuck it back into his pants. "Oh my god! that was great <<$pcs_nickname>>, you really know how to suck cock. Thanks I really needed that, don''t worry I won''t tell anyone." He says with a wink and gives you a quick kiss, before he hurries out of the bathroom. After he leaves you take a moment to check yourself out in the mirror, making sure your hair and makeup is good. As you leave, you can''t help but feel good about giving the guy a day at school he will likely never forget.'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Continue':
-				if $eventtype = 'before_school':
-					gt 'gschool_lessons', 'morning'
-				elseif $eventtype = 'lunch':
-					gt 'gschool_lunch', 'lunch'
-				elseif $eventtype = 'long_break':
-					gt 'gschool_lunch', 'break'
-				elseif $eventtype = 'after_school':
-					gt 'gschool_lunch', 'main'
-				end
-			end
+			act 'Continue': gt 'gschool_events', 'leave_break_events2'
 		end
 	end
 end
@@ -704,17 +698,7 @@ if $ARGS[0] = 'lunch_sex2':
 	'He stands up and starts jerking his dick, you kneel in front of him and open your mouth, within a few minutes you feel his cum squirting in your mouth. You quickly swallow it all. "Oh my god! that was great <<$pcs_nickname>>, you really know how to fuck. Thanks I really needed that, don''t worry I won''t tell anyone." He says with a wink and gives you a quick kiss, before he quickly gets dressed and hurries off the roof. After he leaves you take a moment to check yourself out, after getting dressed, making sure your hair and makeup is good. As you leave, you can''t help but feel good about giving the guy a day at school he will likely never forget.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Continue':
-		if $eventtype = 'before_school':
-			gt 'gschool_lessons', 'morning'
-		elseif $eventtype = 'lunch':
-			gt 'gschool_lunch', 'lunch'
-		elseif $eventtype = 'long_break':
-			gt 'gschool_lunch', 'break'
-		elseif $eventtype = 'after_school':
-			gt 'gschool_lunch', 'main'
-		end
-	end
+	act 'Continue': gt 'gschool_events', 'leave_break_events2'
 end
 
 --- gschool_sex ---------------------------------

locations/gschool_socialchg.qsrc

@@ -2,16 +2,31 @@
 
  !!Changing social groups
 if $ARGS[0] = 'test':
-	if pav_slut > 124 and grupTipe < 4: gt 'gschool_socialchg', 'Pavlovsk slut'
-	if pav_slut > 149 and grupTipe = 4: gt 'gschool_socialchg', 'Pavlovsk slut'
-	if grupvalue[1] > 50 and grupTipe ! 1: gt 'gschool_socialchg', 'coolkid'
-	if grupvalue[2] > 50 and grupTipe ! 2: gt 'gschool_socialchg', 'jock'
-	if grupvalue[3] > 50 and grupTipe ! 3: gt 'gschool_socialchg', 'nerd'
-	if grupvalue[4] > 50 and grupTipe ! 4: gt 'gschool_socialchg', 'gopnik'
-	if grupvalue[1] < 20 and grupTipe = 1: gt 'gschool_socialchg', 'coolkid outcast'
-	if grupvalue[2] < 20 and grupTipe = 2: gt 'gschool_socialchg', 'jock outcast'
-	if grupvalue[3] < 20 and grupTipe = 3: gt 'gschool_socialchg', 'nerd outcast'
-	if grupvalue[4] < 20 and grupTipe = 4: gt 'gschool_socialchg', 'gopnik outcast'
+	if pav_slut >= 125 and grupTipe < 4: 
+		gt 'gschool_socialchg', 'Pavlovsk slut'
+	elseif pav_slut >= 150 and grupTipe = 4: 
+		gt 'gschool_socialchg', 'Pavlovsk slut'
+	elseif grupvalue[1] < 20 and grupTipe = 1: 
+		gt 'gschool_socialchg', 'coolkid outcast'
+	elseif grupvalue[2] < 20 and grupTipe = 2: 
+		gt 'gschool_socialchg', 'jock outcast'
+	elseif grupvalue[3] < 20 and grupTipe = 3: 
+		gt 'gschool_socialchg', 'nerd outcast'
+	elseif grupvalue[4] < 20 and grupTipe = 4: 
+		gt 'gschool_socialchg', 'gopnik outcast'		
+	elseif pav_slut < 100:
+		if grupvalue[1] > 50 and grupTipe ! 1: 
+			gt 'gschool_socialchg', 'coolkid'
+		elseif grupvalue[2] > 50 and grupTipe ! 2: 
+			gt 'gschool_socialchg', 'jock'
+		elseif grupvalue[3] > 50 and grupTipe ! 3: 
+			gt 'gschool_socialchg', 'nerd'
+		elseif grupvalue[4] > 50 and grupTipe ! 4: 
+			gt 'gschool_socialchg', 'gopnik'
+		end
+	elseif pav_slut < 125 and grupvalue[4] > 50 and grupTipe ! 4:
+		gt 'gschool_socialchg', 'gopnik'	
+	end
 	if nerd_night_game = 1 and nerd_night_game_day ! daystart:
 		killvar 'nerd_night_game'
 		killvar 'nerd_night_game_day'

locations/gschool_socialchg1.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'tLazar':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/32.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 	'You decide on to walk over to see what the fuss is about. As usual Lazar is showing off his skills as he has some of the younger kids challenge him 1-on-1 or even 1-on-2 and he''s still managing to beat them quite easily.'
 	'As you step on the field he waves to you to come over before he kicks the ball further away so that the younger kids go chasing after it.'
 
@@ -14,7 +14,7 @@ if $ARGS[0] = 'tLazar':
 		cla & *clr
 		minut += 10
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/32.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 		'"Hey, Lazar!" you yell out as you wave and smile.'
 		'He waves back and begins talking about how he''s showing the kids some new skills he''s picked up. The two of you talk a while with each other about sport related stuff before you suddenly feel a football hit you in the back.'
 		
@@ -23,7 +23,7 @@ if $ARGS[0] = 'tLazar':
 			npc_rel['A149'] += 1
 			minut += 10
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/32.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 			'Turning around, you hear laughter from Kolka and his friends. Your face turns red and just as you''re about to yell at him, Lazar steps in, "Hey! Why did you do that?!"'
 			'You sigh, "It''s okay... It''s my stupid little brother. He''s probably jealous that I''m talking to you."'
 			'Lazar understandingly nods and walks over to them and whispers something. A few moments later Kolka and his friends walk up to you and say they''re sorry that they hit you in the back with the football. You smile and turn to Lazar giving him a little nod as thanks.'
@@ -38,7 +38,7 @@ if $ARGS[0] = 'tLazar':
 		minut += 10
 		npc_rel['A149'] -= 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/32.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 		'You stop in your tracks as you see your brother being one of the kids chasing the ball that Lazar kicked away and you know he would do everything to embarrass you in front of him.'
 		'While blushing you quickly make a signal to Lazar that you have to run and quickly turn your back before Kolka notices you being there.'
 		'Lazar is standing there a bit dumbfounded, wondering why you suddenly had a change of heart but shrugs it off and quickly yells to the kids who''s next to challenge him.'
@@ -53,7 +53,7 @@ if $ARGS[0] = 'tIvan':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
 	'Ivan is looking victorious as he greets you between the breaths, "What are you doing out here this early?" he asks.'
 	'"Nothing much, just out on a stroll," you answer, "I wasn''t expecting to run into the two of you."'
 	'Ivan smiles, "We usually do this to gain an edge against our opponents."'
@@ -63,7 +63,7 @@ if $ARGS[0] = 'tIvan':
 		minut += 5
 		npc_rel['A3'] += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
 		'You carefully listen while Ivan keeps on rambling about it, "You should join us sometime <<$pcs_nickname>>, I''m sure you can''t be worse than Fedor over here." He winks.'
 		'Fedor makes a funny face while you smile back, "I''ll think about it."'
 		'"Great!" Ivan replies, "Well, that''s enough resting, Fedor. Time for another lap."'
@@ -79,7 +79,7 @@ if $ARGS[0] = 'tFedor':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"> <img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"> <img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	'A flustered Fedor is huffing and puffing, "You really need to take it easy. I can barely keep up with you, Ivan..."'
 	'"Come on, Fedor. Don''t sell yourself short. You''ve got potential and remember the dirtbag you wanted to get revenge on..." Ivan tries to motivate a dejected Fedor.'
 	
@@ -89,7 +89,7 @@ if $ARGS[0] = 'tFedor':
 		npc_rel['A5'] += 2
 		npc_rel['A3'] += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"> <img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"> <img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'"I don''t mind to pry but what is this about a dirtbag?" you ask.'
 		'Fedor is looking uncomfortable but Ivan gives him a little nudge, "Tell her..."'
 		'Between the deep breaths Fedor starts telling you about a boxing fight last year where he went against an opponent that beat him, badly and ever since then he''s been seeking revenge.'
@@ -107,7 +107,7 @@ if $ARGS[0] = 'tSvyatoslav':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/8.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></center>'
 	'You wait patiently until Svyatoslav ends one of his runs. "You''re improving greatly," You complement him.'
 	'Panting with sweat dripping down his face, Svyatoslav replies, "Thanks! I''ve been trying my hardest to one up Ivan for this year."'
 	
@@ -116,7 +116,7 @@ if $ARGS[0] = 'tSvyatoslav':
 		minut += 5
 		npc_rel['A8'] += 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/8.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></center>'
 		'You tilt your head as you give him some encouraging words, "If you continue working out as hard as you''re currently doing I''m sure you''ll finally be able to beat Ivan."'
 		'Still panting, Svyatoslav smiles and nods while picking up the water bottle and taking a sip.'
 		'You stand and chat with him a little further until he tells you that his break is up and once again gets ready to do some sprints.'
@@ -129,7 +129,7 @@ if $ARGS[0] = 'tSvyatoslav':
 		minut += 5
 		npc_rel['A8'] -= 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/8.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></center>'
 		'You can''t contain yourself as you hear the words uttered from Svyatoslav''s mouth, "Don''t be silly you''ll never be able to beat Ivan. You''ve tried so many times before it''s not even funny anymore."'
 		'You can clearly see that Svyatoslav is agitated by your words, "You know what, I''ll show you and the rest of the school that I''m going to be the best. I''ll beat Ivan and you''ll feel like idiots for laughing at me."'
 		'"Okay, okay, champ, take it easy now." You patronize him.'
@@ -143,7 +143,7 @@ if $ARGS[0] = 'tVanya':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/59.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big165.jpg"></center>'
 	'Seeing you he stops in his tracks, "Hey, <<$pcs_nickname>>, you''re out early today!" he gives you a subtle smile.'
 	'"The same can be said about you," You answer playfully.'
 	'"Well to be honest, I was looking for something..." he starts talking more to himself now.'
@@ -151,9 +151,9 @@ if $ARGS[0] = 'tVanya':
 	act 'Ask what he''s up to':
 		cla & *clr
 		minut += 5
-		npc_rel['A59'] += 2
+		npc_rel['A165'] += 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/59.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big165.jpg"></center>'
 		'"Now you''ve peeked my interest. What are you up to?" you impatiently ask.'
 		'As Vanya lights up in a snicker, "Since you asked...I might as well tell you." He goes silent for a few moments and then continues on, "I was looking for a secluded spot for Vicky and I..."'
 		'Looking at him you start loudly laughing, "Why am I not surprised? That''s so typical of you!"'
@@ -169,19 +169,19 @@ if $ARGS[0] = 'tErast':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/33.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big150.jpg"></center>'
 	'You walk up to him not really wanting to bother him but you feel the need to ask him how it works, "Sorry Erast, I don''t want to bother you..." you start as he puts down the weights.'
 	'"Oh, hi, <<$pcs_nickname>>. You need some help?" Erast politely replies.'
 	
 	act 'Nod your head':
 		cla & *clr
 		minut += 20
-		npc_rel['A33'] += 2
+		npc_rel['A150'] += 2
 		pcs_sweat += 10
 		stren_exp += 1
 		fat -= 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/33.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big150.jpg"></center>'
 		'Without saying anything you nod your head, "Have you seen the new machine they''ve added?"'
 		'Erast lets out a subtle smile and nods, "Yeah, what about it?"'
 		'You squirm a little as you continue on, "Well, I would like to try it out but I don''t know how to use it..."'
@@ -194,7 +194,7 @@ if $ARGS[0] = 'tErast':
 		cla & *clr
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/33.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big150.jpg"></center>'
 		'Feeling stressed and lost you quickly shake your head as your face begins turning red.'
 		'"Are you sure you don''t need any help?" he asks once more.'
 		'"N-No, I''m sorry to have bothered you..." you shyly reply and quickly move away.'
@@ -208,7 +208,7 @@ if $ARGS[0] = 'tChristina':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
 	'"What are the two of you up to?" you ask Christina ignoring Lina as you walk up to them.'
 	'"I''m trying to get this lazy ass to perform better..." Christina sourly answers. "Thanks to her we lost the last relay race. And now I''ve got to whip her into shape before the next one."'
 	
@@ -218,7 +218,7 @@ if $ARGS[0] = 'tChristina':
 		npc_rel['A18'] += 2
 		npc_rel['A19'] -= 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"> <img <<$set_imgh>> src="images/characters/pavlovsk/school/head/19.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"> <img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
 		'"But... But..." Lina tries to explain but gets interrupted by you, "No Lina, Christina is right. If you messed it up then you need to train harder and perform better next time. There''s no slacking off."'
 		'"Of course I''m correct." Christina fills in, "I''m the most prominent athlete at the school and also the captain of the track and field team. My word is law."'
 		'Dejected, Lina stares at the ground and you can hear her quietly whimper since she thought that you would have helped her out.'
@@ -235,7 +235,7 @@ if $ARGS[0] = 'tChristina':
 		npc_rel['A18'] -= 2
 		npc_rel['A19'] += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
 		'"Give her a break, Christina. Everyone can have a bad race once in a while..." you begin defending Lina.'
 		'"What do you know, <<$pcs_nickname>>? Were you there?! You have no idea how humiliated I felt." Christina replies.'
 		'"Put your ego aside. Just look at Lina, she''s totally exhausted and needs a break. What will you do if she gets injured?" you continue on.'
@@ -250,7 +250,7 @@ if $ARGS[0] = 'tLina':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
 	'"What are you two up to?" you ask Lina ignoring Christina as you walk up to them.'
 	'Lina is just about to answer but gets interrupted by Christina, "Who told you that you could speak?! You don''t deserve that after your poor performance after the last race."'
 	
@@ -259,7 +259,7 @@ if $ARGS[0] = 'tLina':
 		minut += 10
 		npc_rel['A18'] -= 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/19.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
 		'You turn around to Christina, "Did I ask you anything?" Christina is clearly fuming but you once again turn to Lina and ask "What are you doing?"'
 		'Lina carefully picks her words as Christina listens on, "I-I messed up in the last race. And..." she stops in her tracks and thinks for a short moment, "And I asked Christina for some pointers since she''s a great athlete."'
 		'Lina quickly casts a look towards Christina that has calmed down hearing Lina''s explanation...'
@@ -268,7 +268,7 @@ if $ARGS[0] = 'tLina':
 			cla & *clr
 			npc_rel['A19'] += 2
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/19.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
 			'You''re grinning hearing that, "Well good for you wanting to improve your performance. I''m sure Christina will have no issues getting you into shape. Just don''t let her take advantage of you. She can be quite excessive when it comes to these things."'
 			'Lina nods, "No, don''t worry I need the help."'
 			'"Well, if Christina gives you a hard time be sure to tell me and we''ll have a talk." you stick out your tongue teasingly and give her a wink.'
@@ -284,7 +284,7 @@ if $ARGS[0] = 'tBella':
 	menu_off = 1
 	minut += 20
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/22.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big22.jpg"></center>'
 	'You approach her and tap her on her shoulder, "Hi, Bella! You''re heading into the city?" you ask.'
 	'Sighing, Bella replies, "Yeah, I''m meeting some of my older friends in town. There''s a new gym opening so we though we might check it out."'
 	
@@ -292,7 +292,7 @@ if $ARGS[0] = 'tBella':
 		cla & *clr
 		npc_rel['A22'] += 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/22.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big22.jpg"></center>'
 		'Hearing this at first you start grinning, but then turn serious, "That sounds great, but isn''t there an age limit on those gyms though?"'
 		'"Hanging around older people does have its perks," she winks. "One of my friends can get me in, no questions asked."'
 		'You nod your head, "Must be great hanging around older people..."'
@@ -305,7 +305,7 @@ if $ARGS[0] = 'tBella':
 		cla & *clr
 		npc_rel['A22'] -= 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/22.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big22.jpg"></center>'
 		'"Why not just train here instead? We have a perfectly fine gym," you innocently ask.'
 		'Bella starts laughing loudly, "Poor little <<$pcs_nickname>>, so innocent, you still have a lot to learn..."'
 		'"Like what?" you continue on pressing.'
@@ -320,7 +320,7 @@ if $ARGS[0] = 'tVeronika':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/34.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 	'Noticing it''s Veronika, you start waving towards her trying to catch her attention. She barely bats an eye towards you as you try your hardest to get her attention.'
 	'After a while she stops practicing and starts skating towards you...'
 	
@@ -328,15 +328,15 @@ if $ARGS[0] = 'tVeronika':
 		cla & *clr
 		minut += 20
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/34.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 		'"Hi, Veronika!" you shout out, "Looking great out there!"'
 		'Ice cold with a blank expression, she stops in front of you, "What do you want? Can''t you see that I''m practicing?"'
 		
 		act 'Encourage':
 			cla & *clr
-			npc_rel['A34'] += 2
+			npc_rel['A141'] += 2
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/34.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 			'"I just wanted to say that you''re looking great out there." You smile, "I bet you''ll have no issues getting on the Russian team."'
 			'Veronika, still stone faced and rigid, replies a bit reluctantly. "Thanks, I guess. I do train a lot to succeed so I can leave this god forsaken hole..."'
 			'You awkwardly smile, "I know what you mean. It really is a dump isn''t it?"'
@@ -348,10 +348,10 @@ if $ARGS[0] = 'tVeronika':
 		
 		act 'Discourage':
 			cla & *clr
-			npc_rel['A34'] -= 2
+			npc_rel['A141'] -= 2
 			pcs_mood -= 20
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/34.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 			'"Sheesh, why are you always being such a bitch?" you''re noticeably irritated by her nonchalant greet.'
 			'Veronika rolls her eyes and lets out a sigh, "Do I really need to explain it to you...?"'
 			'"What an ungrateful bitch you are!!!" you yell out, "I just wanted to encourage you on, but since you''re behaving like this I hope you break a leg or something..."'
@@ -367,7 +367,7 @@ if $ARGS[0] = 'tLariska':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/13.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
 	'You carefully walk up to her, trying your best not the make your presence known. As you stand and observe her for a moment, you''re flabbergasted as Lariska is smashing the ball and have it effortlessly return to her hands over and over again...'
 	'You really get into seeing her keeping it up that you let out a loud-voiced gasp as the ball bounces differently. Letting yourself be known, it'' as you''ve managed the brake the spell Lariska was under as she turns towards you, "Impressed?"'
 	
@@ -376,7 +376,7 @@ if $ARGS[0] = 'tLariska':
 		minut += 20
 		npc_rel['A13'] += 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/13.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
 		'You nod your head, "Yeah, you''re amazing, Lariska. I didn''t even know that you had such control over the ball."'
 		'Lariska, breaks out in a huge smile and you even notice her cheeks blush a little, "Thanks, <<$pcs_nickname>>. I really got into the zone this time. Usually I''m not doing that good..." she humbly replies.'
 		'"No need to be humble, it was really amazing, trust me... You''re one of the best volleyball players I''ve ever seen." you genuinely respond, "I''ll let you go back to it, I didn''t want to bother." you smile.'
@@ -390,7 +390,7 @@ if $ARGS[0] = 'tLariska':
 		minut += 20
 		npc_rel['A13'] -= 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/13.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
 		'Wanting to play it off nonchalantly you shake your head, chuckle and tell her that you aren''t that impressed and that you''ve seen others pull out even more impressive moves.'
 		'Lariska smiles it off, but deep down you know that her fragile ego has been rattled, "Like you could do it better," she viciously attacks...'
 		'You begin to laugh, "Why would I need to prove myself over such a silly little thing."'

locations/gskver.qsrc

@@ -117,10 +117,9 @@ if $ARGS[0] = 'start':
 	act 'Go for a walk (0:15)':
 		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
 
-		if StoryLine = 1 and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] = 0 and rand(1,4) = 1:
+		if StoryLine = 1 and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart and ((week > 5 and hour >= 8 and hour < 20) or (week < 6 and week mod 2 = 1 and hour > 14)):
 			gs 'mey_vika_events', 'park_meet'
 			gs 'stat'
-			if mey_vika['qw_day'] = daystart: delact 'Looking for Vika'
 		else
 			*clr & cla
 			minut += 15
@@ -151,14 +150,16 @@ if $ARGS[0] = 'start':
 			act 'Continue':gt 'gskver', 'start'
 		end
 	end
-
-	! meynold`s events
+		
 	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
-		!disable after can access home
-		act 'Look for Vika (0:05)':
-			minut += 5
-			gs 'mey_vika_events', 'park_meet'
-			gs 'stat'
+		if hour >= 20 or (week > 5 and hour < 8) or (week < 6 and week mod 2 = 0 and hour < 14) or (week mod 2 = 1 and hour < 18):
+			'<br>Vicky and Vanya never are in the park at this time.'
+		else
+			act 'Look for Vicky and Vanya (0:05)':
+				minut += 5
+				gs 'mey_vika_events', 'park_meet'
+				gs 'stat'
+			end
 		end
 	end
 

locations/igorhome.qsrc

@@ -8,12 +8,12 @@ if $ARGS[0] = 'entrance':
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Igor Kruglov</font></h4></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 	if fedorKozlovQW >= 10 and $loc = 'gdkin':
 		'As you approach Igor, Fedor comes up beside you then turns to Igor. "Igor What are you doing with <<$pcs_firstname>>? You know she''s my girl right?" Igor downcasts his eyes. "Ohh Fedor, I did not know. But if you insist, then okay, I''ll just be going now." Fedor nodded, "Yeah, That will be for the best. Later Igor." and with a distraught expression, Igor takes one last look at you before turning around and walking away.'
 		*nl
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 
 		act 'Go with Fedor':IdorBlock = 1 & gt 'FedorEv', 'Start'
 		exit

locations/katjaEv.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = '':
 	gs 'stat'
 	gs 'katjaEvDin'
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 	'Katja looks at you, smiling. "<<$pcs_nickname>>, come to my house, we can help each other with our homework."'
 
 	if fedorKozlovQW >= 10 and FedorKatjaChat = 0:FedorKatjaChat = 1 & 'You and Katja run into Fedor. He waves as he asks "Hey girls, what are you two up to?" Katja downcasts her eyes, noticably embarrassed. "We are just going to do our homework together." Fedor thinks for a bit, then says, "Okay Then, I''ll see you some other time." Then turns and walks away.'
@@ -30,7 +30,7 @@ if $ARGS[0] = '1':
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 	if month=1 or month=2 or month=12 or month=11:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_home.jpg"></center>'
 		if katschoolsex = 1 and KatjaHorny > 60 and rand (1,3) = 1: *clr & '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_go_home_tanga.jpg"></center>' & 'You walk through the streets of Pavlovsk together with Kate to her house. You and chatted about all sorts of trivia and have fun. Suddenly Kate stopped and turned around looking at you, a mischievous look lifted her skirt. Showing you her panties. '
@@ -60,7 +60,7 @@ if $ARGS[0] = '2':
 	pcs_mood = 100
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 	'Katja''s room is not that clean and her things are in a circle around her bed. Katja throws her rucksack to the floor with her textbooks and notebooks falling out.'
 
 	act 'Do homework with Katja': gt 'katjaEv', '3'
@@ -75,7 +75,7 @@ if $ARGS[0] = '3':
 	intel_exp += rand(0, 1) + (mentats_dose - rand(0,mentats_dose))
 	katjaLernTimes += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 	'For half an hour you and Katja pour over your books, you fully learn the lessons and pretty well understand the materials.'
 
 	if katjaLernTimes >= 10: gs 'katjaEv', 'learning'
@@ -106,7 +106,7 @@ if $ARGS[0] = '5':
 	act 'Yes':
 		cls
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 		'You smile at Katja and say that of course you kissed boys. Katja, even more shyly, "You see <<$pcs_nickname>>, I like this guy, he''s older than me, and I am afraid that when we start to kiss, I''ll do something wrong. Could you teach me how to kiss?"'
 		act 'Kiss': gt 'katjaEv', 'kiss'
 
@@ -115,7 +115,7 @@ if $ARGS[0] = '5':
 			katjaLernQW = 0
 			katjaLernTimes = 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 			'You refuse to kiss Katja and she gets mad at you.'
 
 			act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
@@ -125,7 +125,7 @@ if $ARGS[0] = '5':
 	act 'No':
 		cls
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 		'You shake your head and say that you have never kissed a boy. Katja, even more shyly, "You see <<$pcs_nickname>>, I like this guy, he''s older than me, and I am afraid that when we start to kiss, I''ll do something wrong. Maybe we could try kissing and learn that way?"'
 		act 'Kiss': gt 'katjaEv', 'kiss'
 
@@ -134,7 +134,7 @@ if $ARGS[0] = '5':
 			katjaLernQW = 0
 			katjaLernTimes = 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 			'You refuse to kiss Katja and she gets mad at you.'
 			act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 		end
@@ -151,7 +151,7 @@ if $ARGS[0] = '6':
 
 		exit
 	elseif katjaDeystRand = 1:
-		if npcSex[14] = 1:
+		if npc_sex['A14'] = 1:
 			if KatjaSlut <= 150:
 				'Katja invites you to take a walk in the park.'
 
@@ -179,7 +179,7 @@ if $ARGS[0] = '6':
 			act 'Refuse and go home':minut += 15 & KatjaHorny -= 5 & gt 'pavResidential'
 
 			exit
-		elseif npcSex[14] = 0:
+		elseif npc_sex['A14'] = 0:
 			KatjaHorny += 5
 			KatjaLust += 1
 			'Katja starts chatting about boys, cosmetics and school with you.'
@@ -215,7 +215,7 @@ if $ARGS[0] = '6':
 					act 'Get out of the shower':
 						cls
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 						'You leave the shower and walk into the Katjas room. You chat with Katja, but she seems suddenly busy with other things.'
 
 						act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
@@ -258,7 +258,7 @@ if $ARGS[0] = '6':
 									act 'Get out of the shower':
 										cls
 										gs 'stat'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+										'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 										'You leave the shower and walk into the Katjas room. You chat with Katja, but she seems to have things to do.'
 
 										act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
@@ -287,7 +287,7 @@ if $ARGS[0] = '6':
 									act 'Get out of the shower':
 										cls
 										gs 'stat'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+										'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 										'You leave the shower and walk into the Katjas room. You chat with Katja, but she seems to have things to do.'
 
 										act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
@@ -314,7 +314,7 @@ if $ARGS[0] = '6':
 				act 'Get out of the shower':
 					cls
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 					'You leave the shower and walk into the Katjas room. You chat with Katja, but she seems to have things to do.'
 					act 'Say goodbye and go home':minut += 15 & gt 'pavResidential'
 				end
@@ -401,11 +401,11 @@ if $ARGS[0] = 'kiss':
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits_katja_get.jpg"></center>'
 								'You free Katja''s small, firm breasts from under her clothes and begin to lick them, paying special attention to her nipples. Katja closed her eyes in pleasure and bites her lip.'
 
-								if npcSex[14] = 0:
+								if npc_sex['A14'] = 0:
 									'After a while Katja moves your hands away.'
 
 									act 'Further':gt 'KatjaHomeTalk'
-								elseif npcSex[14] > 0:
+								elseif npc_sex['A14'] > 0:
 									gs 'boystat', 'A14', 'a'
 									gs 'KatjaEvDin', 'sex'
 								end
@@ -427,11 +427,11 @@ if $ARGS[0] = 'kiss':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
 					'Katja bares your breasts and touches them with her fingers, then she bows her head and begins to lick your nipple.'
 
-					if npcSex[14] = 0:
+					if npc_sex['A14'] = 0:
 						'Having licked your breasts, Katja stands up and turns to start cleaning her room.'
 
 						act 'Further':gt 'KatjaHomeTalk'
-					elseif npcSex[14] > 0:
+					elseif npc_sex['A14'] > 0:
 						gs 'boystat', 'A14', 'a'
 						gs 'KatjaEvDin', 'sex'
 					end
@@ -446,7 +446,7 @@ if $ARGS[0] = 'kiss':
 					KatjaHorny -= 10
 					KatjaLust += 1
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 					'You remove her hands and smile at Katja.'
 
 					act 'Further':gt 'KatjaHomeTalk'

locations/katjaEvDin.qsrc

@@ -214,7 +214,7 @@ if $ARGS[0] = 'shower_kiss':
 		KatjaLust += 1
 		KatjaSlut += 1
 
-		if npcSex[14] = 0:npcSex[14] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+		if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
 		
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/showersex.jpg"></center>'
@@ -242,7 +242,7 @@ if $ARGS[0] = 'shower_kiss':
 		katjahorny -= 10
 		KatjaLust += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 		'You remove her hands and smile at her. Then you send Katja away, who shyly looks to the floor and leaves the bathroom.'
 
 		act 'Say goodbye and go home':gt 'pavResidential'
@@ -319,7 +319,7 @@ if $ARGS[0] = 'kuni':
 	KatjaLust += 1
 	katjahorny = 0
 
-	if npcSex[14] = 0:npcSex[14] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'
@@ -346,7 +346,7 @@ if $ARGS[0] = 'kuni_p':
 	KatjaSlut += 1
 	KatjaLust += 1
 
-	if npcSex[14] = 0:npcSex[14] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni.jpg"></center>'
@@ -379,7 +379,7 @@ if $ARGS[0] = 'kuni_dom':
 	lesbian += 1
 	katjahorny = 0
 
-	if npcSex[14] = 0:npcSex[14] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'

locations/korrPar.qsrc

@@ -57,11 +57,6 @@ act '<b>Leave and go to the courtyard</b>':
 	end
 end
 
-!! is this vacation check correct?
-if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0:
-	act 'Go pick up Natasha before school': gt 'natbelEv', 'carrybooks'
-end
-
 if blockBedrPar = 0:
 	if sisboyday + 1 = daystart and hour = 18 and sisboytrioQW = 1:
 		act 'Go to your room':gt 'sisterQW', 'sisboytrioQW_bedroom', 'start'
@@ -94,6 +89,12 @@ if nodimkaK >= rand(7,10) and DimkaWarnedToday = 0:
 	if hour >= 9 and hour < 24 and week >=6 and DimkaWarnedToday = 0: gt 'dimaEv', 'Dimka_warning'
 end
 
+!! is this vacation check correct?
+if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0:
+	*nl
+	'Go pick up <a href="exec:gt ''natbelEv'', ''carrybooks''">Natasha</a> before school.'
+end
+
 $korrParMomHeader = '<center><h1><font color="maroon"><<$npc_nickname[''A29'']>></font></h1></center><center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center><br />'
 
 if hour >= 16 and hour <= 20 and indorf = 0:
@@ -231,7 +232,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 				SchoolBlock = 1
 				schoolprogul = 0
 				pcs_grades = 0
-				'As you enter the hallway, you find your mother there waiting for you. You have never seen her this furious. "<<$pcs_nickname>>? I just got off the phone with the school, they told me you didn''t show up yet again and expelled you. I''m exrememly disappointed with you! I''ve warned you so many times! If you want to remain living in this house, you best start pulling your weight around here!". Right now I want you out of the house, go out and find some work! After that, she pushes you out the door and slams it shut in your face.'
+				'As you enter the hallway, you find your mother there waiting for you. You have never seen her this furious. "<<$pcs_nickname>>? I just got off the phone with the school, they told me you didn''t show up yet again and expelled you. I''m exrememly disappointed with you! I''ve warned you so many times! If you want to remain living in this house, you best start pulling your weight around here! Right now I want you out of the house, go out and find some work!" After that, she pushes you out the door and slams it shut in your face.'
 
 				act 'Leave':gt 'pavResidential'
 				exit

locations/kotovEv.qsrc

@@ -1,7 +1,7 @@
 # kotovEv
 gs 'stat'
 '<center><b><font color="maroon"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></font></b></center>'
-'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 
 if kotovLoveQW > 0 and pav_slut >= 25:
 	'Vitek scowls at you and tells you: "<<$pcs_nickname>>, what is this shit I hear? I thought you were my girl, but then I hear people talking about you being a <<$gnikname>>! Apparently the whole town knows it, too... all the guys were laughing at me! What do you have to say for yourself, you bitch!?"'
@@ -48,7 +48,7 @@ if $loc = 'gdksport':
 			cls
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 			'"Oh you know... just going to my training," you tell him. "I never expected you in this place, what are you doing here?"'
 			'Vitek snickers: "Are you serious? I''ve been boxing since I was 8! Last year I got second place in the regional championships!"'
 
@@ -57,7 +57,7 @@ if $loc = 'gdksport':
 				kotovKnowSport = 1
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 				'He smirks when he sees the surprised look on your face. You ask: "But... you smoke and drink so much! How do you combine that with sports at all?"'
 				'He laughs and tells you: "Ha! Coach says I have talent. My physical build is great for a boxer, and no one hits harder than me! I can tolerate alcohol just fine, I think I have that from my dad. Sure, he died of liver cirrhosis eventually, but up until then he was great!"'
 				'"Besides, I''m already as good as I''m ever going to be," he continues. "You know, in that championship match, I actually beat the shit out of the champion. I had him down on the mat twice, but they still gave him the win! They said he won ''on points''... fucking cowards, what does that even mean? They were afraid to send a real fighter to the national championships, so they made up a bunch of rules to have that pansy win. Anyway, training is starting soon, I have to get going!"'
@@ -79,7 +79,7 @@ elseif $loc = 'gskver':
 		cls
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 		'Vitek pours some beer into a plastic cup and offers it to you: "Here, <<$pcs_nickname>>. Let''s have some beers together!"'
 
 		act 'Drink beer with him':
@@ -93,7 +93,7 @@ elseif $loc = 'gskver':
 				cls
 				pcs_horny += 5
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 				'You enjoyed your time with Vitek, but you have to get on with your day. Vitek is a bit disappointed to see you leave and hugs you tightly, while kissing you on your lips. You kiss him back, and can''t help but feel a bit more aroused when he lets you go. He smiles at you and says: "<<$pcs_nickname>>, babe... want to go to my place for a while?"'
 
 				if pcs_dom > 0:act '"No time right now, sorry!"':sub += 1 & gt $loc, $metka
@@ -102,7 +102,7 @@ elseif $loc = 'gskver':
 					cls
 					minut += 15
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 					'You agree, and you walk to his house while he tells you some more stories. After what feels like no time has passed at all, you approach a rather decripit apartment building. He opens the door and guides you to the apartment he lives in. It''s in rather poor shape, and there are lots of empty bottles littered on the floor of pretty much every room you can see. The room he guides you to has clothes lying in crumpled heaps on the floor everywhere as well.'
 
 					act 'Continue':gt 'kotovSex'

locations/kotovSex.qsrc

@@ -8,7 +8,7 @@ If $ARGS[0] = '':
 	gs 'stat'
 	npc_sex[$boy] += 1
 	if vitekvisit <= 10:
-		gs 'npc_intro',$boy,'images/characters/pavlovsk/school/head/9.jpg','',' '
+		gs 'npc_intro',$boy,'images/pc/npc_headshots/big9.jpg','',' '
 		if KotovZverHelp = 1 and lariskaQwestDay = daystart:
 			'You give Vitek a light kiss on his lips, and whisper in his ear: "It''s time my hero gets his reward..."'
 		end

locations/kseniyaQW.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'event1':
 	cls
 	minut += 5
 	exhibitionQW = 1
-	exhibitionist_lvl = 1
+	if exhibitionist_lvl < 1: exhibitionist_lvl = 1
 	menu_off = 1
 	gs 'stat'
 
@@ -53,7 +53,7 @@ if $ARGS[0] = 'event2':
 	cls
 	minut += 5
 	exhibitionQW = 2
-	exhibitionist_lvl = 2
+	if exhibitionist_lvl < 2: exhibitionist_lvl = 2
 	gs 'stat'
 
 	'<center><b><font color="maroon">Kseniya</font></b></center>'
@@ -123,7 +123,7 @@ if $ARGS[0] = 'event3':
 		cls
 		minut += 5
 		exhibitionQW = 3
-		exhibitionist_lvl = 2
+		if exhibitionist_lvl < 2: exhibitionist_lvl = 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip1.jpg"></center>'
 		'Cool, the light is not great here at this time but there''s a great spot just around the corner.'

locations/mey_vika_events.qsrc

@@ -1,7 +1,5 @@
 # mey_vika_events
 
-!variable
-!mey_vika['relation']	npc_rel['A15']
 !{
 mey_vika['bath_qw']	mey_vika['bath_qw']
 mey_vika['bath_qw_day']	mey_vika['bath_qw_day']
@@ -23,12 +21,10 @@ mey_tamara['qw_end']	mey_tamara['qw_end']
 mey_tamara['reputation_qw']	mey_tamara['reputation_qw']
 }
 
-$location_type = 'event'
-menu_off = 1
-
-if $args[0] = 'first_visit':
+if $ARGS[0] = 'first_visit':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	! for the first time - familiarity with TM
 	if mey_vika['mey_vika_qw'] = 20: gt 'mey_tamara_events', 'first_meet'
 	minut += 10
@@ -66,7 +62,9 @@ if $args[0] = 'first_visit':
 	end
 end
 
-if $args[0] = 'end_game':
+if $ARGS[0] = 'end_game':
+	menu_off = 1
+	$location_type = 'event'
 	'Noticing you, Tamara leans over, rubbing against your breasts...'
 	'<font color="maroon"><i>"You can come over and visit us any time you want, <<$pcs_nickname>>. We can sit down and have a chat over a cup of tea."</i></font>'
 	'<font color="navy"><i>"Of course, aunt Tamara! I''ll be sure to come by."</i></font>'
@@ -78,10 +76,10 @@ if $args[0] = 'end_game':
 	act 'Go home': gt 'pavResidential'
 end
 
-if $args[0] = 'play_game':
-	! the beginning of the game
+if $ARGS[0] = 'play_game':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	minut += 5
 	gs 'mey_vika_events', 'play_game_sub', 1
 	! info about the winner/loser
@@ -144,10 +142,11 @@ if $args[0] = 'play_game':
 end
 
 ! wish Ivan from girls
-if $args[0] = 'play_game_wish0':
+if $ARGS[0] = 'play_game_wish0':
 	! Ivan lost
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/vika_game0.jpg"></center>'
 	'<font color="maroon"><i>"Vanya, you’’re the athlete here, come on show off your toned body! As if you were imitating a famous ancient discus thrower!"</i></font>'
@@ -220,8 +219,10 @@ if $args[0] = 'play_game_wish0':
 end
 
 ! wish Vicky Svetka, Striptease
-if $args[0] = 'play_game_wish1':
+if $ARGS[0] = 'play_game_wish1':
 	*clr & cla
+	menu_off = 1
+	$location_type = 'event'
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
 	pcs_horny += 10
 	minut += 1
@@ -309,9 +310,10 @@ if $args[0] = 'play_game_wish1':
 end
 
 ! wish Sveta from Ivan, kiss #2
-if $args[0] = 'play_game_wish2':
+if $ARGS[0] = 'play_game_wish2':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_game_kiss2.jpg"></center>'
 	'Vanya thoughtfully rubs his chin.'
@@ -336,9 +338,10 @@ if $args[0] = 'play_game_wish2':
 end
 
 ! wish Sveta from Vicky, kiss
-if $args[0] = 'play_game_wish3':
+if $ARGS[0] = 'play_game_wish3':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
 	'<center><video autoplay loop src="'+'images/characters/pavlovsk/school/girl/vicky/event/vika_game_kiss.mp4'+'"></video></center>'
 	'<font color="maroon"><i>"You Lost! You Lost!"</i></font> sings Vicky. <font color="maroon"><i>"Now let''s see, what do I want? I want... I want... I want you to make out with Vanya! A real kiss, not a little pecker! And don''t forget using your tongue!"</i></font>'
@@ -352,7 +355,7 @@ if $args[0] = 'play_game_wish3':
 	act 'Finish': gt 'mey_vika_events', 'end_game'
 end
 
-if $args[0] = 'play_game_sub':
+if $ARGS[0] = 'play_game_sub':
 	! winner
 	! 0 - sveta
 	! 1 - vanya
@@ -367,208 +370,163 @@ if $args[0] = 'play_game_sub':
 	end
 end
 
-if $args[0] = 'near_school':
-	!*clr & cla
+if $ARGS[0] = 'near_school':
 	menu_off = 1
+	$location_type = 'event'
 	vicky_afterschool = daystart
-	!if week < 6 and hour = 14 and minut >= 0 and minut <= 15 and kanikuli = 0:
-		!check condition before gs
-		if week mod 2 = 0:
-			'You see Vicky Meynold leaving the school area holding hands with Vanya.'
 
-			! The beginning of the quest, Sveta doesn`t know anything about the relationship Vicki and Ivan
-			if mey_vika['mey_vika_qw'] = 0:
-				'"Hmm, where they are heading? Vicky''s house is on the opposite side of the city, Vanya''s too..." You think for yourself.'
+	if week mod 2 = 0:
+		'<br>You see Vicky Meynold leaving the school area holding hands with Vanya.'
 
-				! questioning Katya
-				'In the corner of your eye you see Vicky''s twin sister Katja and decided to ask her. <br><font color="navy"><i>"Katja, do you know where they''re heading?"</i></font> You ask, nodding towards the couple?'
+		if mey_vika['mey_vika_qw'] = 0:
+			cla
+			'"Hmm, where they are heading? Vicky''s house is on the opposite side of the city, Vanya''s too..." You think for yourself. In the corner of your eye you see Vicky''s twin sister Katja and decided to ask her.'
+			'"Katja, do you know where they''re heading?" You ask, nodding towards the couple?'
 				
-				! check the relationship with Katya
-				!if mey_katya['relation'] >= 60:
-				if npc_rel[14] >= 60:
-					!relation to Katja
-					'<font color="maroon"><i>"There''s not much to say, <<$pcs_nickname>>."</i></font> Says Katja smiling.'
-					'<font color="maroon"><i>"As far as I know they go for a walk in the park. Though they walk on the off-beat tracks, attempting to stay hidden, away from all the prying eyes."</i></font> Katja continues...'
-
-					mey_vika['mey_vika_qw'] = 1
-					act 'Go to the Park': gt 'gskver', 'start'
-				else
-					'<font color="maroon"><i>"I don''t really know what the two of them are doing."</i></font> Katja answers shortly and starts walking away, not wanting to keep the conversation going.'
-					
-					mey_vika['mey_vika_qw'] = 2
-					act 'Stalk them': minut += rand(5,15) & gt 'gskver', 'start'
-				end
-			else
-				if mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart:
-					gs 'mey_vika_events', 'park_qw'
-				elseif mey_vika['mey_vika_qw'] >= 20 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
-					! goto Meynolds home
-					cla
-					'Vicky won''t accept a no...'			
-					'<font color="maroon"><i>"We should hang out! You won''t bother anyone at my place."</i></font>'
-					'You don''t want to be rude so you gladly agree.'
-
-					! the first visit, the mother
-					act 'Visit Vicky': gt 'mey_vika_events','first_visit'
-				elseif mey_vika['mey_vika_qw'] = 27 and mey_vika['qw_day'] ! daystart:
-					mey_vika['qw_day'] = daystart
-					'<font color="maroon"><i>"My mother was quite intrigued by you, <<$pcs_nickname>>... That friend of yours, <<$pcs_nickname>>? Why doesn''t she visit us more often?"</i></font>'
-					'You start feeling a bit ashamed because Vicky needed to remind you and you promise that you will definitely visit in the near future.'
-
-					act 'Visit aunt Tamara': gt 'mey_tamara_events', 'next_meet'
-				elseif mey_vika['mey_vika_qw'] = 31:
-					mey_vika['mey_vika_qw'] = 32
-					mey_vika['qw_day'] = daystart
-					mey_vika['key'] = 1
-					'<font color="maroon"><i>"My mother likes you very much, <<$pcs_nickname>>, and the three of us hit it off, so here''s the key to our house. Don''t worry about anything, our house is your house. Here you go, come visit any time you like!"</i></font>'
-
-					act 'Depart': gt 'gschool_grounds', 'main'
-				else
-					'"The sweet couple are going to the park again..." you chuckle.'
+			if npc_rel['A14'] >= 60:
+				'"There''s not much to say, <<$pcs_nickname>>." Says Katja smiling.'
+				'"As far as I know they go for a walk in the park. Though they walk on the off-beat tracks, attempting to stay hidden, away from all the prying eyes." Katja continues.'
 
-				end
+				mey_vika['mey_vika_qw'] = 1
+				act 'Go to the Park': gt 'gskver', 'start'
+			else
+				'"I don''t really know what the two of them are doing." Katja answers shortly and starts walking away, not wanting to keep the conversation going.'
+					
+				mey_vika['mey_vika_qw'] = 2
+				act 'Stalk them': minut += rand(5,15) & gt 'gskver', 'start'
 			end
+		elseif mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart:
+			gs 'mey_vika_events', 'park_qw'
+		elseif mey_vika['mey_vika_qw'] >= 20 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
+			cla
+			'Vicky won''t accept a no.'			
+			'"We should hang out! You won''t bother anyone at my place."'
+			'You don''t want to be rude so you gladly agree.'
+
+			act 'Visit Vicky': gt 'mey_vika_events','first_visit'
+		elseif mey_vika['mey_vika_qw'] = 27 and mey_vika['qw_day'] ! daystart:
+			mey_vika['qw_day'] = daystart
+			'<font color="maroon"><i>"My mother was quite intrigued by you, <<$pcs_nickname>>... That friend of yours, <<$pcs_nickname>>? Why doesn''t she visit us more often?"</i></font>'
+			'You start feeling a bit ashamed because Vicky needed to remind you and you promise that you will definitely visit in the near future.'
+
+			act 'Visit aunt Tamara': gt 'mey_tamara_events', 'next_meet'
+		elseif mey_vika['mey_vika_qw'] = 31:
+			mey_vika['mey_vika_qw'] = 32
+			mey_vika['qw_day'] = daystart
+			mey_vika['key'] = 1
+			'<font color="maroon"><i>"My mother likes you very much, <<$pcs_nickname>>, and the three of us hit it off, so here''s the key to our house. Don''t worry about anything, our house is your house. Here you go, come visit any time you like!"</i></font>'
+
+			act 'Depart': gt 'gschool_grounds', 'main'
 		else
-			'Vicky Meynold leaves the school by herself.'
+			'"The sweet couple are going to the park again..." you chuckle.'
 		end
-	!end
+	else
+		'<br>Vicky Meynold leaves the school by herself.'
+	end
 end
 
-if $args[0] = 'park_meet':
+if $ARGS[0] = 'park_meet':
 	menu_off = 1
+	$location_type = 'event'
 	minut += rand(10,20)
 	gs 'stat'
-	! bad weather, nothing to walk, sent a couple of new cafe 
-	if sunWeather = 0 or temper < 5:
-		!mey_vika['qw_day'] = daystart
+	if sunWeather = 0 or temper < 5:		
 		if mey_vika['mey_vika_qw'] < 3:
 			'You wander into a distant part of the park, but you can''t see anyone, the bad weather has scared everyone away.'
 		else
 			'You wander into a distant part of the park where Vicky usually hangs out with Vanya, but you don''t come across them there, perhaps due to bad weather.'
 		end
-
 		exit
 	end
 
-	!rewrite the checking
-	if mey_vika['qw_day'] = daystart or hour >= 20 or (week > 5 and hour < 8) or (week <= 5 and week mod 2 = 0 and hour < 14):
-		!!time range: 6,0 from 8, 2,4 from 16, and disable after 20
-		'You wander into a distant part of the park. You walk for a few minutes, but don''t come across anyone there.'
-	elseif week mod 2 = 1 and hour < 18:
-		!Ivan is training on 1,3,5 so start at 18
-		'You wander into a distant part of the park where  Vicky usually hangs out with Vanya, but don''t come across them. "Perhaps Vanya is away, training." You think to yourself.'
-	else
-		*clr
-		
-		! mey_vika['mey_vika_park_action']: 0 - walk, 1 - kiss
-		if mey_vika['mey_vika_park_action'] = 0:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_park_walk.jpg"></center>'
-		end
+	mey_vika['qw_day'] = daystart
+	
+	*clr
+	if mey_vika['mey_vika_park_action'] = 0:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_park_walk.jpg"></center>'
+	elseif mey_vika['mey_vika_park_action'] = 1:
+		'<center><img <<$set_imgh>> src="'+'images/locations/pavlovsk/resident/meynolds/sex/vika_park_kiss_'+iif(month>10 or month<4,'winter','summer')+'.jpg'+'"></center>'
+	elseif mey_vika['mey_vika_park_action'] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_park_bench.jpg"></center>'
+	end
 
-		if mey_vika['mey_vika_park_action'] = 1:
-			'<center><img <<$set_imgh>> src="'+'images/locations/pavlovsk/resident/meynolds/sex/vika_park_kiss_'+iif(month>10 or month<4,'winter','summer')+'.jpg'+'"></center>'
-		end
+	if mey_vika['mey_vika_qw'] = 0:
+		'Walking around the square, dreaming yourself away, you don''t pay attention to where you''re headed. You wander to the distant side of the park, where you notice Vicky and Vanya.'
+	elseif mey_vika['mey_vika_qw'] = 1:
+		'You know exactly where to head this time, notice Vicky and Vanya, and wander into the distant part of the park.'
+	elseif mey_vika['mey_vika_qw'] = 2:
+		'You want to avoid meeting Vicky and Vanya so you quietly follow them, avoiding them as best you can, sneaking after the couple in the park.'
+	elseif mey_vika['mey_vika_qw'] >= 3:
+		'You know exactly where to head this time, notice Vicky and Vanya, and wander into the distant part of the park to "accidentally" meet the couple.'
+	end
 
-		if mey_vika['mey_vika_park_action'] = 2:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_park_bench.jpg"></center>'
+	if mey_vika['mey_vika_qw'] < 3:
+		'Nearing them, not having figured out what to do, you simply walk by.'
+	elseif mey_vika['mey_vika_qw'] < 5:
+		'Nearing them all you manage to say is a quick "Hi".'
+		if npc_rel['A15'] < 60:
+			'Vicky and Vanya only glance in your direction and turn away. Not having anything to say, you decide it''s better to go away.'
+		else
+			'Vicky and Vanya unisonally answer "Hi", but not knowing how to continue the conversation, you keep walking on.'
+		end
+	elseif mey_vika['mey_vika_qw'] >= 5:
+		if npc_rel['A15'] < 60:
+			'You approach the couple and greet them, but they don’’t pay any attention to you.'
+		else
+			'You approach the couple and greet them, right away Vicky starts gossiping, as always, Vanya mostly jokes about the things you two are talking about. You chat for a few minutes...'
 		end
 
-		mey_vika['qw_day'] = daystart
-		! accidentally stumble upon the couple in the Park, the beginning of the quest
-		if mey_vika['mey_vika_qw'] = 0:
-			'Walking around the square, dreaming yourself away, you don''t pay attention to where you''re headed. You wander to the distant side of the park, where you notice Vicky and Vanya.'
-		! Kate said - we know the couple here
-		elseif mey_vika['mey_vika_qw'] = 1:
-			'You know exactly where to head this time, notice Vicky and Vanya, and wander into the distant part of the park.'
-		! watch
-		elseif mey_vika['mey_vika_qw'] = 2:
-			'You want to avoid meeting Vicky and Vanya so you quietly follow them, avoiding them as best you can, sneaking after the couple in the park.'
-		! repeat 3 - 4
-		elseif mey_vika['mey_vika_qw'] >= 3:
-			'You know exactly where to head this time, notice Vicky and Vanya, and wander into the distant part of the park to "accidentally" meet the couple.'
+		if npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] >= 7:
+			'As you''re leaving, you notice Vicky whispering something to Vanya. You notice Vanya''s hand stroking and squeezing Vicky''s butt, as they stare at you with lust in their eyes...'
 		end
 
-		if mey_vika['mey_vika_qw'] < 3:
-			! monochromatic
-			'Nearing them, not having figured out what to do, you simply walk by.'
+		if npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] = 10:
+			cla
+			'Vicky invites you to the new trendy cafe "Del Parco".'
 
-		else
-			! stage 3-4
-			if mey_vika['mey_vika_qw'] < 5:
-				'Nearing them all you manage to say is a quick "Hi".'
-				! connected relationship and response
-				if npc_rel['A15'] < 60:
-					'Vicky and Vanya only glance in your direction and turn away. Not having anything to say, you decide it''s better to go away.'
-				else
-					'Vicky and Vanya unisonally answer "Hi", but not knowing how to continue the conversation, you keep walking on.'
-				end
-			end
-			! stage 5 and.
-			if mey_vika['mey_vika_qw'] >= 5:
-				if npc_rel['A15'] < 60:
-					'You approach the couple and greet them, but they don’’t pay any attention to you.'
-				else
-					'You approach the couple and greet them, right away Vicky starts gossiping, as always, Vanya mostly jokes about the things you two are talking about. You chat for a few minutes...'
-				end
+			if money < 300:
+				act 'Decline':
+					cla
+					'You''re pretty much broke and you don''t want to be impudent by asking Vicky to pay for you, so you decide to thank Vicky for the invite but that you have a thing elsewhere that you need to attend...'
 
-				! something`s going to happen here
-				if npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] >= 7:
-					'As you''re leaving, you notice Vicky whispering something to Vanya. You notice Vanya''s hand stroking and squeezing Vicky''s butt, as they stare at you with lust in their eyes...'
+					act 'Go': gt 'gskver', 'start'
 				end
+			end
+			act 'Visit the cafe':
+				mey_vika['mey_vika_qw'] = 15
+				gt 'mey_vika_events', 'cafe_qw'
+			end
+		end
 
-				! prigles in the cafe
-				if npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] = 10:
-					cla
-					'Vicky invites you to the new trendy cafe "Del Parco".'
-
-					if money < 300:
-						act 'Decline':
-							cla
-							'You''re pretty much broke and you don''t want to be impudent by asking Vicky to pay for you, so you decide to thank Vicky for the invite but that you have a thing elsewhere that you need to attend...'
+		if npc_rel['A15'] < 80: exit
 
-							act 'Go': gt 'park'
-						end
-					end
-					act 'Visit the cafe':
-						mey_vika['mey_vika_qw'] = 15
-						gt 'mey_vika_events', 'cafe_qw'
-					end
-				end
-				! if the relationship is not great - freeze quest
-				!if npc_rel['A15'] < 80: mey_vika['mey_vika_qw'] -= 1
-				if npc_rel['A15'] < 80: exit
-				! ---- 
-				if mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 19:
-					if sunWeather = 1 and temper >= 5 and month >= 5 and month <= 10:
-						!also in [glake]
-						cla
-						'Walking through the park, you meet Vicky and Vanya. They are going to the beach and ask you to join them.'
+		if mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 19:
+			if sunWeather = 1 and temper >= 5 and month >= 5 and month <= 10:
+				cla
+				'Walking through the park, you meet Vicky and Vanya. They are going to the beach and ask you to join them.'
 
-						act 'Decline': gt 'pavResidential'
-						if mesec = 0: act 'Go with them to the beach': gt 'mey_vika_events', 'beach_event0'
-					else
-						cla
-						'Vicky invites you to the new trendy cafe "Del Parco".'
+				act 'Decline': gt 'pavResidential'
+				if mesec = 0: act 'Go with them to the beach': gt 'mey_vika_events', 'beach_event0'
+			else
+				cla
+				'Vicky invites you to the new trendy cafe "Del Parco".'
 
-						act 'Decline': gt 'pavResidential'
-						if money > 300: act 'Visit the cafe': gt 'mey_vika_events', 'cafe_repeat_qw'
-					end
-				end
+					act 'Decline': gt 'pavResidential'
+				if money > 300: act 'Visit the cafe': gt 'mey_vika_events', 'cafe_repeat_qw'
 			end
 		end
-
-		! alternate event
-		mey_vika['mey_vika_park_action'] += 1
-		if mey_vika['mey_vika_park_action'] > 2: mey_vika['mey_vika_park_action'] = 0
-		! transfer counters
-		if mey_vika['mey_vika_qw'] < 10: mey_vika['mey_vika_qw'] += 1
-		exit
 	end
+
+	mey_vika['mey_vika_park_action'] += 1
+	if mey_vika['mey_vika_park_action'] > 2: mey_vika['mey_vika_park_action'] = 0
+	if mey_vika['mey_vika_qw'] < 10: mey_vika['mey_vika_qw'] += 1
+	exit
 end
 
-if $args[0] = 'cafe_qw':
+if $ARGS[0] = 'cafe_qw':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	money -= 150
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/cafe_qw0.jpg"></center>'
 	'You sit in the café, eating pizza and chat with Vicky. You notice Vicky is acting somewhat strange, giggling, pressing herself against Vanya. One of his hands is almost constantly under the table and you can hear Vicky purr quietly, arching her back, and lustfully looking at you, occasionally licking her lips.'
@@ -612,9 +570,10 @@ if $args[0] = 'cafe_qw':
 	end
 end
 
-if $args[0] = 'cafe_repeat_qw':
+if $ARGS[0] = 'cafe_repeat_qw':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	money -= 150
 	pcs_horny += 10
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/cafe_qw0.jpg"></center>'
@@ -631,9 +590,10 @@ if $args[0] = 'cafe_repeat_qw':
 	act 'Say goodbye and leave': gt 'cafe_parco', 'inner'
 end
 
-if $args[0] = 'park_qw':
+if $ARGS[0] = 'park_qw':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool.jpg"></center>'
 	'After school ends you meet Vicky and Vanya  outside. They once again invite you to the café, but remembering what happened the previous time you tell them that you don''t have any money. You politely decline, even in spite being sure they would put on a new show for you.<br><font color="maroon"><i>"Then let''s go for a walk together!"</i></font> Vicky offers. <br><font color="maroon"><i>"What do you say, <<$pcs_nickname>>?"</i></font>'
 	act 'Decline':
@@ -671,9 +631,10 @@ if $args[0] = 'park_qw':
 	end
 end
 
-if $args[0] = 'beach_event0':
+if $ARGS[0] = 'beach_event0':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	if args[1] < 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach1.jpg"></center>'
 		'You arrive at the beach seeing more people than usual and lots of children running around. Vicky frowns...'
@@ -838,7 +799,7 @@ if $args[0] = 'beach_event0':
 	end
 end
 
-if $args[0] = 'beach_ender':
+if $ARGS[0] = 'beach_ender':
 	act 'Go': 
 		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'): gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 		! on vsjak the fireman still wears check whether gg
@@ -847,8 +808,9 @@ if $args[0] = 'beach_ender':
 	end
 end
 
-if $args[0] = 'beach_event1':
+if $ARGS[0] = 'beach_event1':
 	menu_off = 1
+	$location_type = 'event'
 	!if temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9 and hour < 20 and mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart:
 		!if (hour >= 10 and week >= 6) or (hour >= 14 and week < 6):
 			*clr & cla
@@ -890,8 +852,9 @@ if $args[0] = 'beach_event1':
 end
 !move check condition before gs
 ! case with a gift
-if $args[0] = 'case_gift':
+if $ARGS[0] = 'case_gift':
 	menu_off = 1
+	$location_type = 'event'
 	!if mey_vika['mey_vika_qw'] = 30 and mey_vika['qw_day'] ! daystart and hour = 23:
 		zz_stage = args[1]
 		if zz_stage < 2:
@@ -1016,14 +979,15 @@ if $args[0] = 'case_gift':
 	!end
 end
 
-if $args[0] = 'case_gift_ender':
+if $ARGS[0] = 'case_gift_ender':
 	mey_vika['qw_day'] = daystart
 	killvar 'zz_stage'
 	gt 'mey_home', '3'
 end
 
-if $args[0] = 'learning0':
+if $ARGS[0] = 'learning0':
 	menu_off = 1
+	$location_type = 'event'
 	!if mey_vika['mey_vika_qw'] >= 32 and mey_vika['mey_vika_qw'] < 35 and mey_vika['qw_day'] ! daystart and hour >= 23:
 		*clr & cla
 		minut += 5
@@ -1141,8 +1105,9 @@ if $args[0] = 'learning0':
 	!end
 end
 
-if $args[0] = 'gym0':
+if $ARGS[0] = 'gym0':
 	menu_off = 1
+	$location_type = 'event'
 !!	if week mod 2 ! 0 and mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and hour = 14 and minut >= 30:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/gym0.jpg"></center>'
@@ -1254,8 +1219,9 @@ if $args[0] = 'gym0':
 	!!end
 end
 
-if $args[0] = 'gym1':
+if $ARGS[0] = 'gym1':
 	menu_off = 1
+	$location_type = 'event'
 	!if week mod 2 ! 0 and mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and hour = 17 and minut >= 30:
 		zz_stage = args[1]
 		if zz_stage < 1:
@@ -1314,9 +1280,10 @@ if $args[0] = 'gym1':
 	!end
 end
 
-if $args[0] = 'bath_qw0':
+if $ARGS[0] = 'bath_qw0':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vaccleaner.jpg"></center>'
 	'Sighing, you begin looking where the cleaning supplies are stored in the Meynold residence.'
 	'Everything that is need is found in a small closet next to the kitchen, a broom, a bucket, detergent and a floor scrubbing machine. All brand new, as if no one ever used it. All the supplies stand in a far corner, covered with dust.'
@@ -1343,9 +1310,10 @@ if $args[0] = 'bath_qw0':
 	end
 end
 
-if $args[0] = 'bath_qw1':
+if $ARGS[0] = 'bath_qw1':
 	cla
 	menu_off = 1
+	$location_type = 'event'
 	mey_vika['bath_qw_day'] = daystart
 	'Standing in the hallway in her shorts and a short top Vicky confronts you, pointing at the stairs.'
 	'<font color="maroon"><i>"<<$pcs_nickname>>! No excuses you''re taking a bath now! Come with me!"</i></font>'
@@ -1363,9 +1331,10 @@ if $args[0] = 'bath_qw1':
 	end
 end
 
-if $args[0] = 'bath_common':
+if $ARGS[0] = 'bath_common':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/bath_qw1.jpg"></center>'
 	'The bathroom looks absolutely amazing. Half of the space is occupied by a corner bath and an enormous mirror hangs there.'
 	'You and Vicky quickly take off all the clothes you''re wearing and climb into the tub.'
@@ -1439,8 +1408,9 @@ if $args[0] = 'bath_common':
 	end
 end
 
-if $args[0] = 'bang_katya':
+if $ARGS[0] = 'bang_katya':
 	menu_off = 1
+	$location_type = 'event'
 	zz_stage = args[1]
 	if zz_stage = 0:
 		cla
@@ -1453,13 +1423,6 @@ if $args[0] = 'bang_katya':
 			'<font color="maroon"><i>"We were thinking about playing a prank on my naughty sister Katja!"</i></font>'
 		end
 
-		act 'Agree':
-			cla
-			'<font color="maroon"><i>"Oh, great! I''m so glad you agree!!!"</i></font> Vicky begins to talk enthusiastically, jumping around you like a goat, while holding your hands.'
-			'Vanya grins too. They were clearly plotting some kind of prank, but knowing them, you are sure that it''s going to be something harmless.'
-
-			act 'Go to Katja''s room': gt 'mey_vika_events', 'bang_katya2'
-		end
 		act 'Decline':
 			cla
 			killvar 'zz_stage'
@@ -1468,12 +1431,20 @@ if $args[0] = 'bang_katya':
 
 			act 'Go to your room': gt 'mey_home', '3'
 		end
+		act 'Agree':
+			cla
+			'<font color="maroon"><i>"Oh, great! I''m so glad you agree!!!"</i></font> Vicky begins to talk enthusiastically, jumping around you like a goat, while holding your hands.'
+			'Vanya grins too. They were clearly plotting some kind of prank, but knowing them, you are sure that it''s going to be something harmless.'
+
+			act 'Go to Katja''s room': gt 'mey_vika_events', 'bang_katya2'
+		end
 	end
 end
 
-if $args[0] = 'bang_katya2':
+if $ARGS[0] = 'bang_katya2':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 !!Image needed	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/bang_katya3.jpg"></center>'
 	'You quietly sneak into Katja''s room. Katja is deep asleep, wearing a short tank top and panties, you lightly move her over and remove the blanket.'
 	'Vicky lays still next to her sister and winks at you. You gently lay down on the other side. Vicky starts gently kissing Katja''s tummy and softly touches her legs. You seem to understand what the plan is and you gently bite Katja''s nipple through the thin fabric.'

locations/mirror.qsrc

@@ -401,7 +401,7 @@ if $ARGS[0] = 'steam':
 		act 'Look in the mirror':gt 'mirror','start'
 	end
 	act '<b>Move away from the mirror</b>':gt 'mirror','fin'
-end &! --- steam ----
+end
 
 if $ARGS[0] = 'brush':
 	menu_off = 1
@@ -414,13 +414,12 @@ if $ARGS[0] = 'brush':
 		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 	end
 	'You brush your hair.'
-	wait 1000
 	if $mirrorloc = 'mirror':
-		gt 'mirror', 'start'
+		act 'Continue': gt 'mirror', 'start'
 	else
-		gt 'mirror', 'fin'
+		act 'Continue': gt 'mirror', 'fin'
 	end
-end &! --- brush ----
+end
 
 if $routine1 ! '' and pcs_makeup < 2:
 	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour:

locations/natbelEv.qsrc

@@ -166,8 +166,8 @@ if $ARGS[0] = 'laundry':
 	'<center><b><font color = maroon>Laundry room</font></b></center>'
 ! Needs image + description
 	
-	if NatashaLoc = 7 and HaveCucumber = 1 and NatashaQW >= 11:
-		if NatashaQW = 11: NatashaQW = 12
+	if NatashaLoc = 7 and HaveCucumber = 1 and NatashaQW >= 10:
+		if NatashaQW = 10: NatashaQW = 11
 		HaveCucumber = 0
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/sex/natashacucumber01.jpg"></center>'

locations/natbelapt.qsrc

@@ -26,10 +26,10 @@ NatashaQW = 5: You made Natasha lick your feet.
 NatashaQW = 6: You spat in Natasha''s mouth.
 NatashaQW = 7: You made Natasha lick your pussy.
 NatashaQW = 8: You made Natasha fuck your brother.
-NatashaQW = 9: You made Natasha help you seduce Julia.
-NatashaQW = 10: You made Natasha fuck you and Julia. - Enables from talking with Julia about Natasha''s habit of borrowing money
-NatashaQW = 11: You made Natasha fuck Olu.
-NatashaQW = 12: You made Natasha use a cucumber.
+NatashaQW = 9: You made Natasha fuck Olu.
+NatashaQW = 10: You made Natasha use a cucumber.
+NatashaQW = 11: You made Natasha help you seduce Julia.
+NatashaQW = 12: You made Natasha fuck you and Julia. - Enables from talking with Julia about Natasha''s habit of borrowing money
 NatashaQW = 13: You gave Natasha some money to buy something nicer to wear. - Not implemented yet
 NatashaQW = 14: You made Natasha show what she bought with your money. - Not implemented yet
 NatashaQW = 15: You told Natasha that you want to take her to the disco. - Not implemented yet
@@ -138,9 +138,9 @@ if $ARGS[0] = 'home':
 		*clr & cla
 		if natpregday = 0:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'
-		elseif (daystart-natpregday) < 200:
+		elseif  natpregday > 0 and (daystart-natpregday) < 200:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/16(2).jpg" width="356"></center>'
-		else 
+		elseif  natpregday > 0 and (daystart-natpregday) >= 200: 
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/16(3).jpg" width="356"></center>'
 		end
 		'You stand outside the Belova household, knocking on the door. After a few moments, Natasha opens the door.'
@@ -220,14 +220,14 @@ if $ARGS[0] = 'ask_state':
 		end
 	elseif NatashaMotherState = 5:
 		'"<<$NatashaMotherNickname>>... You uhm... you look a bit upset, is something wrong?"'
-		if (daystart-natpregday) > 90:
+		if natpregday > 0 and (daystart-natpregday) > 90:
 			'"Natasha''s been acting a bit strange lately." She suddenly looks at you intently. "Y-You''d tell me if something important is going on right?"'
 		else
 			'"Just one of those days <<$pcs_nickname>>. Just go on and hang out with Natasha. I''ll be fine."'
 		end
 	elseif NatashaMotherState = 6:
 		'"<<$NatashaMotherNickname>>... You uhm... don''t look very pleased to see me. Did I... Is it something I did?"'
-		if (daystart-natpregday) > 120:
+		if natpregday > 0 and (daystart-natpregday) > 120:
 			'"Well <<$pcs_nickname>>, I''m still trying to adjust to the fact that my daughter is pregnant. Excuse me if I haven''t embraced that little fact yet."'
 			if pregchem > 3600:
 				'"I don''t know what you girls were thinking. The least you could have done was use protection. Getting pregnant when you''re <<age>>, you''re not ready to raise a baby!" She says angrily, looking at your obviously swollen belly.'
@@ -453,7 +453,7 @@ if $ARGS[0] = 'natroom':
 		
 		act 'Talk with her': gt 'natbelapt', 'chat'
 		
-		if daystart-natpregday > 84:
+		if natpregday > 0 and daystart-natpregday > 84:
 			act 'Touch her belly':
 				if nataskedbaby = 1:
 					delact 'Touch her belly'
@@ -472,7 +472,7 @@ if $ARGS[0] = 'natroom':
 		if NatDolg > 0 and NatDolgDay <= daystart:
 			if NatashaQW > 1 and lernHome ! 0: act 'Make her do your homework': gs 'natbelapt', 'make_her_do_homework'
 
-			if NatashaQW > 5:
+			if NatashaQW >= 5:
 				gs 'willpower', 'exhib'
 				if will_cost <= pcs_willpwr:
 					act 'Make her lick your feet (<<will_cost>> Willpower)':
@@ -484,7 +484,7 @@ if $ARGS[0] = 'natroom':
 					'You don''t have enough willpower to make her lick your feet.'
 				end
 			end
-			if NatashaQW > 6:
+			if NatashaQW >= 6:
 				gs 'willpower', 'exhib'
 				if will_cost <= pcs_willpwr:
 					act 'Spit in face (<<will_cost>> Willpower)':
@@ -496,7 +496,7 @@ if $ARGS[0] = 'natroom':
 					'You don''t have enough willpower to spit in her face.'
 				end
 			end
-			if NatashaQW > 7:
+			if NatashaQW >= 7:
 				gs 'willpower', 'sex'
 				if will_cost <= pcs_willpwr:
 					act 'Make her lick your pussy (<<will_cost>> Willpower)':
@@ -508,7 +508,7 @@ if $ARGS[0] = 'natroom':
 					'You don''t have enough willpower to make her lick your pussy.'
 				end
 			end
-			if NatashaQW > 8 and hour >= 18 and hour < 21 and natsub >= 6 and natfuckday < daystart and kolkawantsnat = 1:
+			if NatashaQW >= 8 and hour >= 18 and hour < 21 and natsub >= 6 and natfuckday < daystart and kolkawantsnat = 1:
 				gs 'willpower', 'sex'
 				if will_cost <= pcs_willpwr:
 					act 'Make her fuck Kolka (<<will_cost>> Willpower)':
@@ -524,7 +524,7 @@ if $ARGS[0] = 'natroom':
 			!if NatashaQW > 9 and hour >= 17 and hour < 21 and natsub >= 6 and natfuckday < daystart and natsub >= 10 and pcs_dom >=20 and strapon = 1 and JuliaNatSexProposed = 1:
 			!	act 'Fuck her with Julia': gs 'natbelapt', 'Nat_Julia_3some'
 			!end
-			if NatashaQW > 10 and olufirst = 3 and oluuosegunday ! daystart:
+			if NatashaQW >= 9 and olufirst = 3 and oluuosegunday ! daystart:
 				gs 'willpower', 'anal'
                 if will_cost <= pcs_willpwr:
                     act 'Take her to see Olu (<<will_cost>> Willpower)':
@@ -563,7 +563,7 @@ if $ARGS[0] = 'natroom':
 				end
 				act 'Pull her on the bed':
 					*clr & cla
-					'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex01.jpg"></center>'
+					'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natbedroomsex01.jpg"></center>'
 					'When she''s almost done dressing, you grab her by the wrist and pull her onto the bed next to you. You grab her by the hair and keep a firm grip as you whisper in her ear: "Oh, you little tease. Is this what you wanted?"'
 					'"Y-Yes." She gasps back. "From the moment I saw you sitting there I started imagining this."'
 					'"Well then." You say in your most seductive voice. "Have you earned it?" As you teasingly lower your mouth to hers. You take your time, touching your lips together, then backing off slightly, pulling at her lower lip occasionally with your teeth before finally going in for a passionate kiss.'
@@ -573,7 +573,7 @@ if $ARGS[0] = 'natroom':
 					if NatashaQW > 7:
 						act 'Bare her breasts':
 							*clr & cla
-							'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex02.jpg"></center>'
+							'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natbedroomsex02.jpg"></center>'
 							'You let go of Natasha''s hair and roll on top of her. While she''s catching her breath from the steamy kissing, you pull down her top and start licking her nipple.'
 							'"Oh <<$pcs_nickname>>... That feels... Oooh... So nice." She moans softly.'
 							'You increase the intensity by taking hold of her nipple with your teeth and gently pulling. This makes her moan even louder, and in response, you feel yourself getting wetter and wetter.'
@@ -581,7 +581,7 @@ if $ARGS[0] = 'natroom':
 							gs 'stat'
 							act 'Get undressed':
 								*clr & cla
-								'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex03.jpg"></center>'
+								'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natbedroomsex03.jpg"></center>'
 								'"I want to feel all of your skin, take your clothes off." You tell Natasha.'
 								'Wanting your own lusts sated you pull your clothes off and lie back on the bed, opening your legs to give her easy access to your soaking pussy.'
 								*nl
@@ -596,7 +596,7 @@ if $ARGS[0] = 'natroom':
 								killvar '$orgasm_txt'
 								act 'Give back':
 									*clr & cla
-									'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex04.jpg"></center>'
+									'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natbedroomsex04.jpg"></center>'
 									'Not wanting this to end just yet you roll her onto her back and spread her legs wide. Her pussy is soaking wet as well. "Your turn." You say, still out of breath.'
 									'You start to dart your tongue around her pussy. Licking up the juices, slowly working your way towards her wet slit.'
 									'"Please <<$pcs_nickname>>, I really need it." She begs in between her moans of pleasure. Hearing this you part her pussy lips with your hand and start licking her furiously, occasionally switching from sucking her clit to tongue fucking her pussy.'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'natroom':
 									
 									act 'Rub your pussy on hers':
 										*clr & cla
-										'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex05.jpg"></center>'
+										'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natbedroomsex05.jpg"></center>'
 										'You quickly get up from between her legs and straddle her, pressing your soaked pussies together, grinding them together quickly. Natasha grabs your breasts and starts moaning "Yes <<$pcs_nickname>>... Please... Pleaaaaaah."'
 										$orgasm_txt = 'The feeling of her body writhing underneath yours as she orgasms sends you over the edge as well. You keep grinding for a few more seconds before you start bucking under the intensity of your own orgasm.'
 										$orgasm_or = 'yes'
@@ -627,7 +627,7 @@ if $ARGS[0] = 'natroom':
 								end
 								act 'Eat me':
 									*clr & cla
-									'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex06.jpg"></center>'
+									'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natbedroomsex06.jpg"></center>'
 									'The only thing you can think of is your need for more as you push her head towards your soaking pussy. She obeys immediately and starts kissing all around your pussy and playing with your tits.'
 									'Overcome with the need to feel her tongue on your pussy, you take her head in your hands and press her face down on your slit. A loud moan escapes your mouth as she starts lapping up your juices.'
 									'She keeps one hand on your breast, softly pinching and pulling on your hard nipple as she starts focusing on sucking your engorged clit. You feel one of her fingers slip inside you again, adding even more pleasure.'
@@ -636,7 +636,7 @@ if $ARGS[0] = 'natroom':
 									
 									act 'Rub your pussy on hers':
 										*clr & cla
-										'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex05.jpg"></center>'
+										'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natbedroomsex05.jpg"></center>'
 										'As you feel your orgasm near, you quickly get up from the bed and press Natasha down on her back, opening her legs wide. Her pussy is soaking wet as well. There are wet streaks on her inner thighs where her juices have been running down her legs.'
 										'After a moment of teasing her with your fingers, you straddle her, pressing your pussies wetly together as you begin quickly grinding against her. Natasha grabs your breasts and starts moaning "Yes <<$pcs_nickname>>... Please... Pleaaaaaah."'
 										$orgasm_txt = 'The feeling of her body writhing underneath yours as she orgasms sends you over the top as well. You keep grinding for a few more seconds before you start bucking under the intensity of your own orgasm.' 
@@ -691,6 +691,7 @@ if $ARGS[0] = 'study_together':
 	lernHome = 0
 	lern += rand(3, 6)
 	intel_exp += rand(1, 2)
+	if NatashaQW = 0: NatashaQW = 1
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/school/girl/natasha/study.jpg"></center>'
 	'"Let''s do our homework." You tell Natasha as you start taking your things from your bag.'
@@ -1041,6 +1042,7 @@ if $ARGS[0] = 'lick_pussy':
 				minut += 5
 				pcs_horny -= 10
 				money -= 50
+				natsub += 1
 				gs 'stat'
 !!ImageNeededPlaceholder
 				'<center><img <<$set_imgh>> src="images/shared/food/icecreem.jpg"></center>'
@@ -1126,7 +1128,7 @@ if $ARGS[0] = 'chat':
 				*nl
 				act 'Continue':gt 'natbelapt', 'natknows'
 			end
-		elseif pregchem > 0 and knowpreg = 1 and natsub = 0 and (daystart-natpregday) < 84:
+		elseif pregchem > 0 and knowpreg = 1 and natsub = 0:
 			act 'Tell her you''re pregnant':
 				cla
 				*nl
@@ -1134,7 +1136,7 @@ if $ARGS[0] = 'chat':
 				npc_pregtalk['A16'] = 1
 				act 'Continue' :gt 'natbelapt', 'natroom'
 			end
-		elseif pregchem > 0 and knowpreg = 1 and natsub > 0 and (daystart-natpregday) < 84:
+		elseif pregchem > 0 and knowpreg = 1 and natsub > 0:
 			act 'Tell her you''re pregnant':
 				cla
 				*nl
@@ -1177,7 +1179,7 @@ if $ARGS[0] = 'chat':
 				npc_pregtalk['A16'] = 1
 				act 'Continue' :gt 'natbelapt', 'natroom'
 			end
-		elseif pregchem > 0 and natsub > 0 and (daystart-natpregday) < 84 and knowpreg = 1:
+		elseif pregchem > 0 and natsub > 0 and knowpreg = 1:
 			act 'Tell her you''re pregnant':
 				*clr & cla
 				*nl
@@ -1199,6 +1201,7 @@ if $ARGS[0] = 'chat':
 			act 'Don''t give her the money': gt 'natbelapt', 'chat'
 			act 'Give her the money (2000 <b>₽</b>)':
 				*clr & cla
+				if NatashaQW = 1: NatashaQW = 2
 				if NatashaMoneyGivenTimes < 10:
 					NatDolg = 2000
 					money -= 2000
@@ -1236,6 +1239,7 @@ if $ARGS[0] = 'chat':
 			act 'Don''t give her the money': gt 'natbelapt', 'chat'
 			act 'Lend Natasha the 5000 <b>₽</b>':
 				*clr & cla
+				if NatashaQW = 1: NatashaQW = 2
 				minut += 15
 				NatDolg = 5000
 				money -= 5000

locations/natpimp.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'go_see_olu':
 		minut += 5
 		natsub += 1
 		natfuck += 1
-		if NatashaQW = 11: NatashaQW = 12
+		if NatashaQW = 9: NatashaQW = 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'
 		'You know you need to help out with Olu soon, but your ass is still too sore. Then you get a great idea, kill two birds with one stone. Have Natasha have sex with him, she owes you anyways, besides it might be fun to make the little bitch squeal.'

locations/nichApartment.qsrc

@@ -327,12 +327,12 @@ elseif $ARGS[0] = 'hiring':
 	'2. Your job is to clean the apartment, to buy groceries and to pepare breakfast. Sometimes we will have special requests which you are also required to follow.'
 	'3. You have your own bedroom and a personal bathroom. Every other room is your working place only and you will always act and be treated as a maid there.'
 	'4. You will work from Thursday to Tuesday. Once your probations is over Wednesday will be your free day.'
-	'5. Your payment is 10.000 <b>?</b> each month. I will transfer the money to your bank account at the first day of each month.'
+	'5. Your payment is 10.000 <b>₽</b> each month. I will transfer the money to your bank account at the first day of each month.'
 	if day > 24:
-		'Since only a few days of this month remain your first salary will be 2.500 <b>?</b>.'
+		'Since only a few days of this month remain your first salary will be 2.500 <b>₽</b>.'
 		nichSalaryNext = 2500
 	elseif day > 15:
-		'Since you start in the middle of the month your first salary will be 5.000 <b>?</b>.'
+		'Since you start in the middle of the month your first salary will be 5.000 <b>₽</b>.'
 		nichSalaryNext = 5000
 	else
 		nichSalaryNext = 10000

locations/nichBedroomServant.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 
 	if nichSalaryOutstanding > 0:
 		*nl
-		'On top of your desk lies your paycheck over <<nichSalaryOutstanding>> <b>?</b>(<a href="exec:gt ''nichBedroomServant'', ''redeemSalary''">redeem</a>).'
+		'On top of your desk lies your paycheck over <<nichSalaryOutstanding>> <b>₽</b>(<a href="exec:gt ''nichBedroomServant'', ''redeemSalary''">redeem</a>).'
 	end
 	
 	act 'Go to the hallway':
@@ -192,7 +192,7 @@ elseif $ARGS[0] = 'redeemSalary':
 	*clr & cla
 	karta += nichSalaryOutstanding
 	nichSalaryOutstanding = 0
-	'Your salary of <<nichSalaryOutstanding>> <b>?</b> is transferred to your bank account.'
+	'Your salary of <<nichSalaryOutstanding>> <b>₽</b> is transferred to your bank account.'
 	act 'Back': gt 'nichBedroomServant', 'return'
 
 elseif $ARGS[0] = 'sleepEvents':

locations/nichChore.qsrc

@@ -405,7 +405,7 @@ elseif $ARGS[0] = 'work':
 					!!and if Tanya is actually in the room
 					nichRand = rand(1,100)
 					if nichRand <= 30 or nichDebug = 1:
-!!Image needed						'<center><img <<$set_imgh>> src="images/characters/city/tanya/encounter/dom1.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/city/tanya/encounter/dom1.jpg"></center>'
 						'When you start cleaning Tanya approaches you from behind and smacks you on your butt.'					
 						'"Hey <<$pcs_nickname>>, don''t miss that edge over there." she points at a small mess she obviously created on purpose.'
 						act 'Comply':

locations/nichGala.qsrc

@@ -112,7 +112,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 1:
 		minut += 5
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training1.jpg"></center>'
 		'When Gala returns she wears some kind of purple fetish wear. Her legs are covered by overkness while her breasts and privates are exposed.'
 		'"Open your mouth, slut!"'
 		'You do as commanded and she pushes a black ballgag behind your lips and locks it behind your head.'
@@ -129,7 +129,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 10:
 		minut += 1
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training36.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training36.jpg"></center>'
 		'"A maids life is often full of inconveniences and even pain."'
 		'She collects a few clothes pegs from the small table.'
 		act 'Further':
@@ -138,7 +138,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 11:
 		minut += 1
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training2.jpg"></center>'
 		'"I will help you deal with this."'
 		'Stars massaging your exposed nipples.'
 		'"I will make sure you develop a tolerance for pain."'
@@ -154,7 +154,7 @@ elseif $ARGS[0] = 'training':
 		end
 	elseif nichGalaTrainStage = 12:
 		minut += 1
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training42.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/gala/training/training42.jpg"></center>'
 		'"You should be glad it''s me who is training you. Other trainers would go slow on you, but I believe in quick progress."'
 		'She attaches the other two clothes pegs to your labia and pulls them a few times, making sure they rest painfully.'
 		act 'Further':

locations/nichTanya.qsrc

@@ -326,7 +326,7 @@ elseif $ARGS[0] = 'date':
 			end
 		elseif nichDateState = 20:
 			*clr & cla 
-!!Image needed			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cinema/sex/kinoKissLesbian1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cinema/sex/kinoKissLesbian1.jpg"></center>'
 			'The light goes dark and the movie starts. You lean over to Tanya and the two of you share a deep kiss.'
 			act 'Go down on her':
 				*clr & cla
@@ -360,7 +360,7 @@ elseif $ARGS[0] = 'date':
 		if nichTanyaDateShopping = 0:
 			minut += 120
 			nichTanyaDateShopping += 1
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping1.jpg"></center>'
 			'The two of you go to a shop for young fashion. You take turns trying on clothes and posing for each other.'
 			'You notice that the clothes Tanya puts on get skimpier every time. The last outfit she puts on only consists of high heels, a blue tanga and a revealing white shirt.'
 			'"What do you think? I think you would gorgeous in this."'
@@ -396,7 +396,7 @@ elseif $ARGS[0] = 'date':
 		elseif nichTanyaDateShopping = 1:
 			minut += 60
 			nichTanyaDateShopping += 1
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping2.jpg"></center>'
 			'The two of you visit various shops in the mall. One of the shops appears to be aimed at lumberjacks and truckers.'
 			'You take a look a the shirts and wonder why you are here. Then you realize that Tanya went missing. After a quick search you figure out that she must be in one of the chaning rooms.'
 			'"Hey <<$pcs_nickname>>, come in here."'
@@ -409,7 +409,7 @@ elseif $ARGS[0] = 'date':
 		elseif nichTanyaDateShopping = 2:
 			minut += 60
 			nichTanyaDateShopping += 1
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping3a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping3a.jpg"></center>'
 			'The two of you visit various shops in the mall. The last shop is an expensive boutique.'
 			'Tanya goes straight to the lingerie department. She collects some items, then she takes you by the hand and leads you to a changing room.'
 			'She strips down and puts the bra and the panties she took on.'
@@ -425,7 +425,7 @@ elseif $ARGS[0] = 'date':
 				'She turns around and looks at you.'
 				act 'Continue':
 					*clr & cla
-!!Image needed					'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping3b.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping3b.jpg"></center>'
 					'"I think this bra could fit you. Try it out."'
 					act 'Try it':
 						*nl
@@ -527,7 +527,7 @@ elseif $ARGS[0] = 'date':
 				gt 'nichTanya','date'
 			end
 		elseif nichDateState = 20:
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/strapona.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/strapona.jpg"></center>'
 			'Once you are back at Tanyas'' bedroom she tells you to undress and lie on her bed head down.'
 			'She takes out some kind of rope of her shopping bag. One by one she connects your wrists and ankles to the posts of her bed. You are trapped, lieing in a spread position, unable to move.'
 			'The next thing Tanya takes out is a whip. She whips your back for a few minutes.'
@@ -537,7 +537,7 @@ elseif $ARGS[0] = 'date':
 				gt 'nichTanya','date'
 			end
 		elseif nichDateState = 30:
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/psovaginal/psovaginal0.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/psovaginal/psovaginal0.jpg"></center>'
 			'Tanya puts her whip aside and puts her clothes off. You can''t turn your head enough to see what she is doing exactly but it appears as if she is putting on her new strap-on. She also seems to fasten her favorite vibrator on the inner side.'
 			'"I think this is going to be our favorite toy."'
 			'She probes your holes before generously applying lube on her strap-on.'
@@ -547,7 +547,7 @@ elseif $ARGS[0] = 'date':
 				gt 'nichTanya','date'
 			end
 		elseif nichDateState = 40:	
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/psovaginal/psovaginal0.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/tanya/sexL/psovaginal/psovaginal0.jpg"></center>'
 			'Tanya mercilessly fucks you for more than ten minutes.'
 			'From your position you can''t see her. You can only feel her hands on your hips and her fake member grinding into you.'
 			dick = nichTanyaStrapon

locations/nichTaras.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'abdIntro':
 		gs 'clothing', 'strip'
 		gs 'underwear', 'remove'
 		gs 'stat'
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro1.jpg"></center>'
 		'You don''t know how much time has passed when you finally regain consciousness. Maybe minutes? Hours? A whole day?'	
 		*nl
 		'Your limbs hurt and you try to stretch them. To no avail. Your feet and wrists are chained to the floor while something in your back pushes your belly up, forcing you into an awkward backwards bent position. The worst thing is that you are apparently naked.'
@@ -35,7 +35,7 @@ if $ARGS[0] = 'abdIntro':
 		gs 'pain', 'back', 'bind' 
 		gs 'pain', 'shoulders', 'bind' 
 		gs 'stat'
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro2.jpg"></center>'
 		'You wait for what appears to be an eternity.'
 		*nl
 		'Your back starts to hurt and you try shift into a more comfortable position. You once again realize that that''s futile. You are forced into this painful position until anybody frees you.'
@@ -58,7 +58,7 @@ if $ARGS[0] = 'abdIntro':
 		pcs_sleep += 20
 		gs 'pain', 'pubic', 'spank' 
 		gs 'stat'
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro3.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro3.jpg"></center>'
 		'You are just to exhausted to stay awake any longer. You fall into an uneasy sleep.'
 		*nl
 		'You suddenly awake from a sharp pain in your pubic area. Instinctively you try to jump up, only to be painfully reminded that you can''t move at all. So the only thing you can do is letting out an agonized scream.'
@@ -83,7 +83,7 @@ if $ARGS[0] = 'abdIntro':
 		minut += 120
 		gs 'pain', 'pubic', 'spank' 
 		gs 'stat'	
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro3.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro3.jpg"></center>'
 		'Locked down like this there is nothing you can do than continue waiting.'
 		*nl
 		'After another eternity you hear heavy steps from a man comming down a stairway.'
@@ -107,7 +107,7 @@ if $ARGS[0] = 'abdIntro':
 	elseif nichAbdStage = 30:
 		gs 'pain', 'breasts', 'twist' 
 		gs 'stat'	
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro4.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro4.jpg"></center>'
 		'"I bet you''re wondering how you got here. You see, you annoyed Mistress Gala. Being the classy woman she is she can''t tolerate skanks like yourself in her household."'
 		*nl
 		'"That''s why she ordered me to get rid of you. She didn''t specify how you should vanish. At first I thought about disposing you in the wilderness. But then I thought you might make a nice addition to my collection of toys."'
@@ -130,7 +130,7 @@ if $ARGS[0] = 'abdIntro':
 	elseif nichAbdStage = 40:
 		gs 'pain', 'clitoris', 'twist' 
 		gs 'stat'	
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro5.jpg"></center>'
 		'There is no use in resistance right now. This man will punish you until you say what he wants to hear.'
 		*nl
 		'"Yes sir, I understand."'
@@ -152,7 +152,7 @@ if $ARGS[0] = 'abdIntro':
 		end
 	elseif nichAbdStage = 50:
 		nichKatinkaPresent = 1
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro6.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro6.jpg"></center>'
 		'Maybe Taras saw the distgusted look on your face. Or he just figured out what you were thinking.'
 		*nl
 		'"Don''t flatter yourself, slut. You didn''t earn the privilege to taste my cock."'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'abdIntro':
 			gt 'nichTaras','abdIntro' 
 		end
 	elseif nichAbdStage = 60:
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/hogtie1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/hogtie1.jpg"></center>'
 		'He shifts his attention back to you.'
 		'"I am sure you enjoy your current position. But you can''t hang around like this all day."'
 		'He takes a rope and connects your ankles, your ellbows your knees and your neck. Once he is finished he finally unlocks you from your metal bondage.'
@@ -198,7 +198,7 @@ if $ARGS[0] = 'abdIntro':
 elseif $ARGS[0] = 'katinka':
 	
 	if $ARGS[1] = 'desc':
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/katinka1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/katinka1.jpg"></center>'
 		act 'Talk':
 			cla
 			if nichKatinkaTopics = 0 and nichKatinkaTopic[1] = 0:
@@ -228,7 +228,7 @@ elseif $ARGS[0] = 'katinka':
 		end
 	elseif $ARGS[1] = 'wash':
 		!!or pcs_sweat >= 30
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/washing1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/washing1.jpg"></center>'
 		'<<$nichKatinkaNameUC>> takes a bottle of shower gel and covers you in it. Being all tied up there is nothing you can do to prevent it. Her touch feels soft on your skin. Then she uses a hose to clean you. The water is ice cold. She gently dries you with a towel before combing your hair.'
 		dynamic $showerdin
 		pcs_hairbsh = 1
@@ -255,7 +255,7 @@ elseif $ARGS[0] = 'dungeon':
 			end
 		else
 			'<center><b>Basement</b></center>'
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/taras/dungeon.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/taras/dungeon.jpg"></center>'
 			'You are in a basement. There are several metal objects bolted to the ground and to the walls. They are used for chaining up prisoners. There is also a hose for cleaning.'	
 			*nl
 			'In one corner of the room stands an <a href="exec:minut += 10&gt ''nichTaras'', ''dungeon'', ''bed''">old bed</a> with a dirty mattress on it.'
@@ -279,7 +279,7 @@ elseif $ARGS[0] = 'dungeon':
 	elseif $ARGS[1] = 'bed':
 		gs 'stat'
 		if $ARGS[2] = '':
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/taras/dungeonBed.jpg"></center>'
+			'<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:
 				act 'Sleep':
@@ -326,17 +326,17 @@ elseif $ARGS[0] = 'dungeon':
 		pcs_hydra = max(pcs_hydra,80)
 		pcs_energy = max(pcs_energy,80)
 		gs 'stat'
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/eat.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/eat.jpg"></center>'
 		'You force yourself to eat a little bit of the distgusting tasting food in the bucket. At least the water is tastless.'
 		act 'Return':
 			gt 'nichTaras','dungeon'
 		end
 	elseif $ARGS[1] = 'mirror':
-!!Image needed		'<center><img <<$set_imgh>> src="images/characters/city/taras/mirror.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/taras/mirror.jpg"></center>'
 		'This is a dirty old mirror standing on the ground.'
 		act 'Inspect yourself':
 			*clr
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/taras/hogtie1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/taras/hogtie1.jpg"></center>'
 			'You see the reflexion of your bound self in the mirror.'
 		end
 		if nichTarasMirror = 0:
@@ -380,7 +380,7 @@ elseif $ARGS[0] = 'session':
 			'"I will make sure you understand and accept that."'
 			act 'Further':
 				*clr & cla
-!!Image needed				'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1a.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1a.jpg"></center>'
 				'He places you back on your belly and collects some items from a chest in the back of the room.'
 				'You don''t see what happens as he steps over you. Suddenly you feel an intense pain. As you open your mouth to let out a scream you feel that something is pushed into it.'
 				'You try to struggle away from it, but there is no use. Taras pushes what appears to be a dildo gag into your mouth and secures it in position with a few straps. The dildo is long enough to cause you discomfort as it nearly reaches your throat. You are forced to breath through your nose and even then you feel like being constantly at the edge of suffocation.'
@@ -391,18 +391,18 @@ elseif $ARGS[0] = 'session':
 				'"I call this lesson ''Acceptance of your role in life''. The rules are simple: I will remove the pegs and by one. And you will watch it happen in the mirror. If you look away you get punished. If you close your eyes you get punished. If you pass you get rewarded."'
 				act 'Further':
 					*clr & cla
-!!Image needed					'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1b.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1b.jpg"></center>'
 					'He steps behind you. You hear a swishing sound in the air and one moment later you feel a burning pain on your back.'
 					'Apparently Taras wants to remove the pegs by whipping them away.'
 					act 'Further':
 						*clr & cla
-!!Image needed						'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1c.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1c.jpg"></center>'
 						'You feel the whip on your body again and again. The pain is almost too much to bare.'
 						*nl
 						'You try to keep your eyes on your reflexion. You can''t believe the girl in the mirror who gets abused so horribly is acutally you.'
 						act 'Further':
 							*clr & cla
-!!Image needed							'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1d.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1d.jpg"></center>'
 							'Focussing on the mirror gets harder with each stroke. You really want to close your eyes but what if you got punished even worse then?'
 							act 'Close eyes':
 								nichTarasSessionStage = 10
@@ -410,7 +410,7 @@ elseif $ARGS[0] = 'session':
 							end
 							act 'Focus':
 								*clr & cla
-!!Image needed								'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1e.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1e.jpg"></center>'
 								'Taras has spared your most sensitive parts for the finish. Your pussy feels like being on fire as the whip hits it mercilessly several times.'
 								act 'Close eyes':
 									nichTarasSessionStage = 10
@@ -427,7 +427,7 @@ elseif $ARGS[0] = 'session':
 			end
 		elseif nichTarasSessionStage = 10:
 			!! Sveta gets punished
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1d.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1d.jpg"></center>'
 			'The pain is too intense. You just have to close your eyes.'
 			'"What did I say, slut?! Don''t close your eyes! I will teach you to listen to my words."'
 			'Taras whips you even harder now. Your skin feels on fire and you scream as loud as you can. But the gag prevents you from making anything but muffled sounds.'
@@ -441,7 +441,7 @@ elseif $ARGS[0] = 'session':
 			act 'Wait':
 				if pcs_sleep <= 20 or (hour >= 4 and hour <= 6):
 					*clr & cla
-!!Image needed					'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1d.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1d.jpg"></center>'
 					'You are too tired to stay awake any longer.'
 					act 'Fall asleep':
 						nichTarasSessionStage = 11
@@ -459,7 +459,7 @@ elseif $ARGS[0] = 'session':
 			end
 		elseif nichTarasSessionStage = 11:
 			!! Sveta fell asleep after 10
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1d.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1d.jpg"></center>'
 			'Despite your position being very uncomfortable you finally manage to fall asleep.'
 			if hour < 6: 
 				nichSleepTime = (6 - hour) * 60 - minut 
@@ -484,14 +484,14 @@ elseif $ARGS[0] = 'session':
 			end
 		elseif nichTarasSessionStage = 20:
 			!! Sveta gets rewarded
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1e.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1e.jpg"></center>'
 			'Taras whips off the last pegs. Then he takes your chin and forces you to look him into the eyes.'
 			'"You passed this test. Of course that''s not your accomplishment. A pupil can only be as good as her teacher."'
 			'He diconnects your wrist cuffs from the ceiling. Only now you realize that your arms started to feel numb from the constant pull on them. Unabled to resist he pushes you to the ground and locks your wrists and ankles to metal rings bolted there.'
 			'"Nevertheless I promised you a reward."'
 			act 'Further':
 				*clr & cla
-!!Image needed				'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1f.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1f.jpg"></center>'
 				'He takes a vibrator and start working your clit.'
 				'It doesn''t take long before you feel an orgasm building up.'
 				'Your breath quickens while your gag still makes breathing difficult. Just as you are about to cum Taras holds your nose shut.'
@@ -502,7 +502,7 @@ elseif $ARGS[0] = 'session':
 				'Leaving you locked to the ground he leaves the basement.'
 				act 'Further':
 					*clr & cla
-!!Image needed					'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1g.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1g.jpg"></center>'
 					'You lie on the ground. Being restrained like this there is not much you can do.'
 					act 'Try to break free':
 						'You pull on your restraints the best you can, but they don''t give in. You are tightly locked.'
@@ -510,7 +510,7 @@ elseif $ARGS[0] = 'session':
 					act 'Wait':
 						if pcs_sleep <= 20 or (hour >= 4 and hour <= 6):
 							*clr & cla
-!!Image needed							'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1g.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1g.jpg"></center>'
 							'You are too tired to stay awake any longer.'
 							act 'Fall asleep':
 								nichTarasSessionStage = 21
@@ -530,7 +530,7 @@ elseif $ARGS[0] = 'session':
 			end
 		elseif nichTarasSessionStage = 21:
 			!! Sveta fell asleep after 20
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1g.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1g.jpg"></center>'
 			'Despite the hard cold floor being very uncomfortable to lie on you finally manage to fall asleep.'
 			if hour < 6: 
 				nichSleepTime = (6 - hour) * 60 - minut 
@@ -557,7 +557,7 @@ elseif $ARGS[0] = 'session':
 	elseif nichTarasSession = 1:
 		if nichTarasSessionStage = 0:
 			!! Rope 1 Event
-!!Image needed			'<center><img <<$set_imgh>> src="images/characters/city/taras/rope1a.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/city/taras/rope1a.jpg"></center>'
 			'Taras holds your nose shut until you are forced to open your mouth to breath. Then he forces a dildo gag into your mouth. The fake member is so long it almost reaches your throat, making it difficult to breath.'
 			*nl
 			'Taras lets go of you and takes out a rope with many knots in it, which he places between two poles at hip height.'
@@ -571,7 +571,7 @@ elseif $ARGS[0] = 'session':
 			'You assume that the other rope is meant for you. And you are not wrong. Before long you find yourself in exactly the same position on the other rope, less than half a meter away from <<$nichKatinkaName>>. If you were not bound you could easily touch her. But with your hands being secured behing your back there is no way you could reach her.'
 			act 'Further':
 				*clr & cla
-!!Image needed				'<center><img <<$set_imgh>> src="images/characters/city/taras/rope1a.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/city/taras/rope1a.jpg"></center>'
 				'Taras steps on the other side of the two ropes.'
 				*nl
 				'"Now that I have two sluts I want to know which one of you is more eager to please her owner."'
@@ -584,7 +584,7 @@ elseif $ARGS[0] = 'session':
 				end
 				act 'Don''t move':
 					*clr & cla
-!!Image needed					'<center><img <<$set_imgh>> src="images/characters/city/taras/rope1a.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/city/taras/rope1a.jpg"></center>'
 					'You notice that <<$nichKatinkaName>> started to move forward. But you have no interest in participating in this humiliating race.'
 					*nl
 					'<<$nichKatinkaNameUC>> has advanced two knots when Taras comes over to you.'
@@ -595,7 +595,7 @@ elseif $ARGS[0] = 'session':
 					end
 					act 'Stand still':
 						*clr & cla
-!!Image needed						'<center><img <<$set_imgh>> src="images/characters/city/taras/rope1a.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/city/taras/rope1a.jpg"></center>'
 						'You decide that you won''t let his threat impress you. You watch as <<$nichKatinkaName>> slowly approaches the end of her rope knot by knot.'
 						*nl
 						'When she reaches the end Taras pets her head. "Well done, slut. Too bad your competitor didn''t show the same ambition. Just stay here while I lecture her the importance of good sportsmanship."'
@@ -605,7 +605,7 @@ elseif $ARGS[0] = 'session':
 						'Afterwards he unties you, only to push you inside a crate which is barely big enough for you to fit in. At the end is a hole where your head fits through.'
 						act 'Further':
 							*clr & cla
-!!Image needed							'<center><img <<$set_imgh>> src="images/characters/city/taras/punishment1a.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/city/taras/punishment1a.jpg"></center>'
 							'Taras tightly ties you in the crate, then he pushes it on a small metal podium and turns it so your head faces downward.'
 							*nl
 							'Then he places the bucket under your face. You can smell the urine. It''s distgusting.'
@@ -621,7 +621,7 @@ elseif $ARGS[0] = 'session':
 							'"That''s what happens to bad sportsman. You better keep your head up while I reward this little skank here."'
 							act 'Further':
 								*clr & cla
-!!Image needed								'<center><img <<$set_imgh>> src="images/characters/city/taras/punishment1b.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/characters/city/taras/punishment1b.jpg"></center>'
 								'You try to keep your head up the best you can. But it is just too exhausting. So you limit yourself on taking a deep breath every few seconds, let your head drop into the liquid and to surface a few seconds later.'
 								*nl
 								'While you''re busy not drowning you hear the reward Taras was speaking of. It sounds like a mixture of spanking, rape and whipping. Even being in a dire situation you can''t tell for sure if <<$nichKatinkaName>> is better of right now.'
@@ -635,7 +635,7 @@ elseif $ARGS[0] = 'session':
 								'With these words he leaves you alone once again.'
 								act 'Further':
 									*clr & cla
-!!Image needed									'<center><img <<$set_imgh>> src="images/characters/city/taras/punishment1a.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/characters/city/taras/punishment1a.jpg"></center>'
 									'You can''t believe what you just heard. How can he expect you to drink this revolting smelling liquid?'
 									act 'Drink':
 										if nichTarasSessionStage < 201:
@@ -666,7 +666,7 @@ elseif $ARGS[0] = 'session':
 											'If you would fall asleep right now you would drown for sure.'
 										else
 											*clr & cla
-!!Image needed											'<center><img <<$set_imgh>> src="images/characters/city/taras/punishment1a.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/characters/city/taras/punishment1a.jpg"></center>'
 									
 											'Being placed in this crate and all most of your weight resting on your shoulders while foul smelling urine is slowly drying on your head is a bad position to sleep in. But your need for sleep is too strong and so you fall asleep soon.'
 											if hour < 6: 

locations/orgasm.qsrc

@@ -189,6 +189,8 @@ else
 	killvar '$orgasm_or'
 end
 
+if orgasm_buildup < 0: orgasm_buildup = 0
+
 killvar '$orgasm_txt'
 
 

locations/pavComplex.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 		end
 	end	
 
-	if week = 1 or week = 3 or week = 5 and hour >= 17 and hour <= 19 and Storyline > 0: 'Walking along the apartment complex you can hear a bouncing sound. Turning the corner you see <a href="exec:gt ''gschool_socialchg1'', ''tLariska''">Lariska</a> hitting a ball against the wall...'
+	if (week = 1 or week = 3 or week = 5) and hour >= 17 and hour <= 19 and Storyline > 0: 'Walking along the apartment complex you can hear a bouncing sound. Turning the corner you see <a href="exec:gt ''gschool_socialchg1'', ''tLariska''">Lariska</a> hitting a ball against the wall...'
 	
 	if car > 0 and cardrive = 20: 'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked in the street.'
 	

locations/pavComplexb2.qsrc

@@ -241,7 +241,7 @@ end
 !!new scene for going to this complex if Sveta has a friendship of 50 > and has not been to Anushka''s apartment. Once she has been once this doesn''t show up again. This is a temporary way to start Anushka''s story with out having to go to detention first.
 if $ARGS[0] = 'anushkaFirst':
 	menu_off = 1
-	'<center><img src="images\locations\pavlovsk\school\head\45.jpg"></center>'
+	'<center><img src="images\pc\npc_headshots\big144.jpg"></center>'
 	'As you walk into the building you nearly run into Anushka. "Hey <<$pcs_nickname>> whats up?"'
 	'A bit surprised to see her but not disappointed, you was just wandering around for the hell of it. "Just killing time, kinda bored you know?"'
 	'She nods a bit and finishes checking the mail. "Yeah I know how that is, hey want to come up to my place and hang out?"'

locations/pavIndustrial.qsrc

@@ -45,7 +45,7 @@ end
 'First shift - 08:00 to 16:00'
 'Second shift - 16:00 to 20:00'
 *nl
-'In a smaller building right next to the factory is the local tailor shop, a service offered by the factory. Opening hours are Monday to Saturday, between 08:00 to 15:00.'
+'In a smaller building right next to the factory is the local '+iif(week < 7 and hour >= 8 and hour < 18,'<a href="exec: gt ''Gshveyfab'', ''tailor''">tailor</a>', 'tailor')+' shop, a service offered by the factory. Opening hours are Monday to Saturday, between 08:00 to 17:00.'
 
 gs'street_event','pavIndustrial', 'extras'
 
@@ -75,8 +75,10 @@ if car > 0 and cardrive = 26:
 	'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked in the street.'
 end
 
-if week < 7 and hour >= 8 and hour < 15:
+if week < 7 and hour >= 8 and hour < 18: 
 	act 'Visit the tailor': gt 'Gshveyfab', 'tailor'
+else
+	'<br>The tailor is closed right now.'
 end
 
 if week < 6 and hour >= 8 and hour < 20:

locations/pavaptcourtev.qsrc

@@ -131,7 +131,7 @@ if $ARGS[0] = 'events1':
 		if storyline ! 1: jump 'reroll_jump1'
 		*clr & cla
 		anushka_met = daystart
-		'<center><img src="images\locations\pavlovsk\school\head\45.jpg"></center>'
+		'<center><img src="images\pc\npc_headshots\big144.jpg"></center>'
 		'As you walk into the building you nearly run into Anushka. "Hey <<$pcs_nickname>> whats up?"'
 		'A bit surprised to see her but not disappointed, you was just wandering around for the hell of it. "Just killing time, kinda bored you know?"'
 		'She nods a bit and finishes checking the mail. "Yeah I know how that is, hey want to come up to my place and hang out?"'
@@ -619,7 +619,7 @@ if $ARGS[0] = 'dealer':
 			minut += 1
 			money -= 500
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/no.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/weed.jpg"></center>'
 			'You glance around to make sure no one is watching, then you pull out five hundred from your purse and hand it over to him. He hands you a small bag of weed with some wrapping paper, with a smile and walks off. "Enjoy."'
 			act 'Move away':gt 'pavComplex', 'start'
 		end
@@ -1383,7 +1383,7 @@ if $ARGS[0] = 'homenaked':
 		act 'Go upstairs':
 			*clr & cla
 			minut += 3
-			rand(1,10)
+			nakedrand = rand(1,10)
 			if nakedrand = 1: 
 				gt 'pavaptcourtev', 'two_boys'
 			elseif nakedrand = 2: 
@@ -1471,7 +1471,7 @@ if $ARGS[0] = 'two_boys':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/aptstairsnaked.jpg"></center>'
 	'Once inside you sigh in relief, almost home finally. Taking a look around, you glance up the stairs and then slowly start creeping up them hoping no one suddenly comes out of their apartment or comes down the stairs, catching you naked. Just before you make it to your door, you hear the clomping of boots on the stairs, as you reach your door you hear someone says. "Well well, look-y what we have here. What you doing <<$pcs_nickname>>?"'
 	*nl
-	'You turn around and see <<$boydesc[1]>> and <<$boydesc[2]>>, standing behind you. One of them taking your picture with his phone, while the other walks over and leans against your apartment door, so you open it. "Please guys, I just need to get inside. Please don''t share those pictures."'
+	'You turn around and see '+iif(pavapt_boyrand = 1, 'Adrik and Petr', 'Yakov and Mikhail')+', standing behind you. One of them taking your picture with his phone, while the other walks over and leans against your apartment door, so you open it. "Please guys, I just need to get inside. Please don''t share those pictures."'
 	'The one taking the pictures laughs and keeps taking them, while his friends leers at you, looking over your whole body. "Well if you are going to run around like a whore, we should treat you like one. So how about you come over here and let us fuck you and we will keep your secret and you can be our little whore, what do you say?"'
 	gs 'stat'
 	gs 'willpower', 'gangbang'

locations/pavtrain_market.qsrc

@@ -212,8 +212,8 @@ if $ARGS[0] = 'start':
 			act 'Leave': gt 'pavtrain_market', 'start'
 		end
 	else
+		'The market stalls are empty. The market is only open between 08:00 and 19:00.'
 		act 'Go back to the station': minut += 3 & gt 'pavtrain'
-		act 'Wander through the market': gt 'pavtrain_market','events'
 	end
 end
 
@@ -462,12 +462,12 @@ if ARGS[0] = 4:
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/sextoys.jpg"></center>'
-		'He lets you step behind the counter so you can get a better look, as you do he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700 <b>₽</b> each." You also see a small selection of vibrators in various colors, mostly pink. "Only 700 <b>₽</b> each." To one side you see many butt plugs, rubber and metal. "Only 700 <b>₽</b>each." Near the bottom is several strapon harnesses. "Only 1000 <b>₽</b>each."'
+		'He lets you step behind the counter so you can get a better look, as you do he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700 <b>₽</b> each." You also see a small selection of vibrators in various colors, mostly pink. "Only 700 <b>₽</b> each." To one side you see many butt plugs, rubber and metal. "Only 700 <b>₽</b>each." Near the bottom is several strapon harnesses without a dildo. "Only 500 <b>₽</b>each."'
 		act 'Leave':gt 'pavtrain_market', 'start'
 		act 'Look for something else':gt 'pavtrain_market', 4
-		act 'Buy dildo (700 <b>₽</b>)':
-			cla
-			if money >= 700 and dildo = 0:
+		if money >= 700 and dildo = 0:
+			act 'Buy dildo (700 <b>₽</b>)':
+				cla
 				minut += 5
 				dildo = 1
 				money -= 700
@@ -478,13 +478,13 @@ if ARGS[0] = 4:
 				else
 					'You buy a dildo and calmly hide it.'
 				end
+				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Buy something else':gt 'pavtrain_market', 4
 			end
-			act 'Leave':gt 'pavtrain_market', 'start'
-			act 'Buy something else':gt 'pavtrain_market', 4
 		end
-		act 'Buy vibrator (700 <b>₽</b>)':
-			cla
-			if money >= 700 and vibrator = 0:
+		if money >= 700 and vibrator = 0:
+			act 'Buy vibrator (700 <b>₽</b>)':
+				cla
 				minut += 5
 				vibrator = 1
 				money -= 700
@@ -495,13 +495,13 @@ if ARGS[0] = 4:
 				else
 					'You buy a vibrator and calmly hide it.'
 				end
+				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Buy something else':gt 'pavtrain_market', 4
 			end
-			act 'Leave':gt 'pavtrain_market', 'start'
-			act 'Buy something else':gt 'pavtrain_market', 4
 		end
-		act 'Buy butt plug (700 <b>₽</b>)':
-			cla
-			if money >= 700 and analplug = 0:
+		if money >= 700 and analplug = 0:
+			act 'Buy butt plug (700 <b>₽</b>)':
+				cla
 				minut += 5
 				money -= 700
 				analplug = 1
@@ -512,13 +512,13 @@ if ARGS[0] = 4:
 				else
 					'You buy a butt plug and calmly hide it.'
 				end
+				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Buy something else':gt 'pavtrain_market', 4
 			end
-			act 'Leave':gt 'pavtrain_market', 'start'
-			act 'Buy something else':gt 'pavtrain_market', 4
 		end
-		act 'Buy strap-on harness (1000 <b>₽</b>)':
-			cla
-			if money >= 1000 and strapon = 0:
+		if money >= 500 and strapon = 0:
+			act 'Buy strap-on harness (500 <b>₽</b>)':
+				cla
 				minut += 5
 				strapon = 1
 				money -= 1000
@@ -529,9 +529,9 @@ if ARGS[0] = 4:
 				else
 					'You buy a strap-on harness and calmly hide it.'
 				end
+				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Buy something else':gt 'pavtrain_market', 4
 			end
-			act 'Leave':gt 'pavtrain_market', 'start'
-			act 'Buy something else':gt 'pavtrain_market', 4
 		end
 	end
 end

locations/pharmacy.qsrc

@@ -34,15 +34,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	menu_off = 0
 	gs 'stat'
 	*pl '<center><b><font color="maroon">Pharmacy</font></b></center>'
-	!*pl '<center><img <<$set_imgh>> src="images/unused/pharmacy.jpg"></center>'
-	!there are 3 pic from russian 1.2.5, Let make it 3 shift
-	if hour>22 or hour < 7:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_2.jpg"></center>'
-	elseif hour<17:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_3.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_4.jpg"></center>'
-	end
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_worker_'+rand(1,3)+'.jpg"></center>'
 	*nl
 	if $message ! '':
 		$message
@@ -79,17 +71,19 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	if pcs_knows_nipplecream > 0:
 		*P FUNC ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', $CURLOC, $ARGS[0])
 	end
-	*P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $CURLOC, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''pharmacy'', ''buy_antifungal''">buy</a>','')+'')
+	if KandidNapr = 1: *P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $CURLOC, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''pharmacy'', ''buy_antifungal''">buy</a>','')+'')
 	*P '</table></center>'
 end
 
 if $ARGS[0] = 'buy_antifungal':
-	if KandidNapr = 1:
+	if Kandidoz >= 30:
 		money -= 1050
 		Kandidoz = 0
 		gs 'stat'
 		$gardmess = '<center><font color="green">You bought 1 <b>Antifungal medication</b>.</font></center><br>You put the money on the counter and immediately open the package and swallow the tablet. A while later, you feel better.'
 		gt 'pharmacy', 'shop'
+	elseif Kandidoz < 30 and KandidozOnce > 0:
+		'You don''t need the medication right now. Your thrush is currently in remission, taking vitamins will ensure that it stays that way.'
 	else
 		msg '<center>You don''t need any antifungal medication right now.</center>'
 		*nl

locations/placer_end.qsrc

@@ -5,14 +5,20 @@ if Frend_num = 14:
 	menu_off = 1
 	KatjaHorny += 10
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 	'You walk back home with Katja.'
 	if KatjaOhrenet > 0:
-		if KatjaOhrenet = 1:'She is silent the whole way, then suddenly mutters, "Damn, I just fucked a stranger."'
-		if KatjaOhrenet = 2:'She is silent the whole way, then suddenly mutters, "Damn, I just fucked two complete strangers."'
-		if KatjaOhrenet = 3:'She is silent the whole way, then suddenly mutters, "Holy shit, we just fucked a whole pack of Gopnik."'
-		if KatjaOhrenet = 4:'She is silent the whole way, then suddenly mutters, "Oh shit, we just fucked those strangers like a pair of complete sluts."'
-		if KatjaOhrenet = 5:'She is silent the whole way, then suddenly mutters, "Shit, we just had a threesome with a stranger."'
+		if KatjaOhrenet = 1:
+			'She is silent the whole way, then suddenly mutters, "Damn, I just fucked a stranger."'
+		elseif KatjaOhrenet = 2:
+			'She is silent the whole way, then suddenly mutters, "Damn, I just fucked two complete strangers."'
+		elseif KatjaOhrenet = 3:
+			'She is silent the whole way, then suddenly mutters, "Holy shit, we just fucked a whole pack of Gopnik."'
+		elseif KatjaOhrenet = 4:
+			'She is silent the whole way, then suddenly mutters, "Oh shit, we just fucked those strangers like a pair of complete sluts."'
+		elseif KatjaOhrenet = 5:
+			'She is silent the whole way, then suddenly mutters, "Shit, we just had a threesome with a stranger."'
+		end
 
 		KatjaOhrenet = 0
 	end

locations/pod_ezd.qsrc

@@ -853,7 +853,7 @@ if $ARGS[0] = 'juliamil':
 	gs 'boyStat', 'A12'
 	minut +=5
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/12.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'
 	'Having some time to spare, you stop and chat with her. The two of you stop and sit down to have a quick chat for a few minutes, catching up on the latest events.'
 	act 'Leave': gt 'pod_ezd', 'etaj_3'
 	if JulMilBestFrend >= 50:
@@ -1173,6 +1173,7 @@ if $ARGS[0] = 'danvas_smoke_bj':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/cumface.jpg"></center>'
 					'You leave their cum on your face, which they seem to really enjoy. They put their dicks away and button up their pants. You chat with them for a bit more, with their cum dripping down your face, before they tell you they need to get going and go into Vasily''s apartment.'
+					act 'Leave': gt 'pod_ezd', 'etaj_3'
 				end
 				gs 'willpower', 'humiliation'
 				if will_cost <= pcs_willpwr:

locations/poli.qsrc

@@ -471,7 +471,7 @@ if $ARGS[0] = 'stdclinic':
 	'	Private Sexually Transmitted Disease Clinic provides the following test and treatments.'
 	'		STD test - 1,000 <b>₽</b>'
 	'		Complete cure for herpes - 45,000 <b>₽</b>.'
-	'		Complete cure of syphilis - 60,000 <b>₽</b>.'
+	'		Complete cure of syphilis - 1,000 <b>₽</b>.'
 	'		Complete cure for yeast infection - 15,000 <b>₽</b>.'
 	'	Treatment requires hospitalization on first Monday of each month.'
 	
@@ -617,41 +617,47 @@ if $ARGS[0] = 'stdcheck':
 							end
 						end
 					else
-						if venera > 0:'The doctor frowns and tells you that the test did not go well.'
-
-						if GerpesOnce = 1:
-							'You have genital herpes. The cure for this disease is very expensive but it is only active some of the time.'
-
-							if Gerpes >= 3:
-								if GerpesNapr = 0:GerpesNapr = 3 & 'I''m going to put you on a course of herpes shots. You''ll need a total of 3 injections (no more than 1 a day), each injection will cost 750 <b>₽</b>.'
-								if GerpesNapr > 0:'You need to see the nurse for your herpes injections.'
-
-							else
-								'Your herpes are in an inactive stage, take vitamins and it won''t show itself.'
+						if venera > 0:
+							'The doctor frowns and tells you that the test did not go well.'
+						
+							if GerpesOnce = 1:
+								'You have genital herpes. The cure for this disease is very expensive but it is only active some of the time.'
+								if Gerpes >= 3:
+									if GerpesNapr = 0:
+										GerpesNapr = 3 & 'I''m going to put you on a course of herpes shots. You''ll need a total of 3 injections (no more than 1 a day), each injection will cost 750 <b>₽</b>.'
+									elseif GerpesNapr > 0:
+										'You need to see the nurse for your herpes injections.'
+									end
+								else
+									'Your herpes are in an inactive stage, take vitamins and it won''t show itself.'
+								end
 							end
-						end
 
-						if SifacOnce = 1:
-							sifNapr = 1
-							'You have syphilis. The cure for this disease used to be expensive. However, this deadly disease can now be with a single shot.'
-							'The injection will cost 1,000 <b>₽</b>, you need to see the nurse for your syphilis injection.'
-						end
+							if SifacOnce = 1:
+								sifNapr = 1
+								'You have syphilis. The cure for this disease used to be expensive. However, this deadly disease can now be with a single shot.'
+								'The injection will cost 1,000 <b>₽</b>, you need to see the nurse for your syphilis injection.'
+							end
 
-						if TriperOnce = 1:
-							'We found gonorrhea. In principle, this disease is curable.'
-							if TriperNapr = 0:TriperNapr = 5 & 'I''m going to put you on a course of gonorrhea injections. You''ll need a total of 5 injections (no more than 1 a day), each injection will cost 750 <b>₽</b>'
-							if SifNapr > 0:'You need to see the nurse for your gonorrhea injections.'
-						end
+							if TriperOnce = 1:
+								'We found gonorrhea. In principle, this disease is curable.'
+								if TriperNapr = 0: 
+									TriperNapr = 5 & 'I''m going to put you on a course of gonorrhea injections. You''ll need a total of 5 injections (no more than 1 a day), each injection will cost 750 <b>₽</b>'
+								elseif TriperNapr > 0:
+									'You need to see the nurse for your gonorrhea injections.'
+								end
+							end
 
-						if KandidozOnce = 1:
-							'You have an yeast infection. The cure for this disease is very expensive, but it''s not that harmful and can easily be suppressed.'
+							if KandidozOnce = 1:
+								'You have an yeast infection. The cure for this disease is very expensive, but it''s not that harmful and can easily be suppressed.'
 
-							if KandidNapr = 0:KandidNapr = 1 & 'You can buy pills in the pharmacy.'
-							if Kandidoz < 30:'Your thrush is currently in remission, take vitamins, and it will stay that way.'
+								if KandidNapr = 0:KandidNapr = 1 & 'You can buy pills in the pharmacy.'
+								if Kandidoz < 30:'Your thrush is currently in remission, take vitamins, and it will stay that way.'
+							end
+						else
+							'Doctor is pleased that you do not have a sexually transmitted disease.'
 						end
 
-						if venera <= 0:'Doctor is pleased that you do not have a sexually transmitted disease.'
-
 						act 'Leave':gt 'poli', 'stdclinic'
 					end
 				end

locations/pornstudio.qsrc

@@ -113,18 +113,20 @@ if $ARGS[0] = 'pa':
 	'"Who are you? This office is for staff only."'
 	else
 		'<font color="#0D42C0"> "Hi <<$pfname>>, what can I do for you?"</font>'
-		act 'Change your porn name':
-			*clr & cla
-			menu_off = 1
-			gs 'stat'
-			'"I would like to change my professional name. Is it possible?"'
-			'"Of course, just give me a minute to register it in the database. So, what would you ike to be called?"'
-			act '"I want to be called..."':
-				$pfname = input("Enter the name you want to be known as.")
-				if $pfname = '':$pfname = 'Lotta Cox'
-				gt 'pornstudio', 'pa'
+		if pfilmNO = 0:
+			act 'Change your porn name':
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'"I would like to change my professional name. Is it possible?"'
+				'"Of course, just give me a minute to register it in the database. So, what would you ike to be called?"'
+				act '"I want to be called..."':
+					$pfname = input("Enter the name you want to be known as.")
+					if $pfname = '':$pfname = 'Lotta Cox'
+					gt 'pornstudio', 'pa'
+				end
+				act '"Ehh, leave it."':gt 'pornstudio', 'pa'
 			end
-			act '"Ehh, leave it."':gt 'pornstudio', 'pa'
 		end
 		if pfilmSTOP = 0:
 			act 'What''s the rating of my videos?':
@@ -869,11 +871,6 @@ if $ARGS[0] = 'medical':
 		if venera > 0:
 			pfilmNO = 1
 			pfilmNoVenera = 1
-			killvar 'prodcosttrue'
-			killvar 'pfilmday'
-			killvar 'pornplan'
-			killvar 'porntaken'
-			killvar 'pornnow'
 			'Your analysis showed an STD. The doctor tells you and calls Peter. Peter looks at the test results.'
 			'"Sorry, but as long as you have an STD you cannot make films."'
 			act 'Leave':gt 'pornstudio', 'start'

locations/postdeliveries.qsrc

@@ -554,7 +554,7 @@ if $ARGS[0] = '12':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/16(3).jpg" width="356"></center>'
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
 	end
 	'Your next address is a familiar one: it''s Natasha Belova''s, one of your classmates. It looks like you have bad news for her, it''s not one but two final notices! Damn, how much debt is this girl in!?'
 	'Natasha''s face saddens when she sees the envelopes in your hand as she opens the door: "Oh no, not again... hi <<$pcs_nickname>>."'

locations/salon.qsrc

@@ -249,16 +249,16 @@ if $ARGS[0] = 'ozdormas':
 	vidageday += 3
 	money -= 2500
 	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/mass.jpg"></center>'
 	if salonrand = 0:
-		cla
-		*clr
+		*clr & cla
 		picrand = rand(25, 28)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/mass.jpg"></center>'
 		'During your massage, you moan with pleasure as the guy really knows how to get your muscles to relax, it even makes you a little turned on. You feel his had slide down to your ass and before you can even protest he slips an oiled up finger into your pussy and his thumb in your ass.'
 		act 'Indignant':gt 'salon', 'start'
-		act 'Enjoy':
-			gt 'sex', 'minet'
-		end
+		act 'Enjoy': gt 'sex', 'minet'
+	else
+		'During your massage, you moan with pleasure as the guy really knows how to get your muscles to relax, it even makes you a little turned on.'
 	end
 	act 'Leave':gt 'salon', 'start'
 end

locations/saveupdater.qsrc

@@ -559,9 +559,12 @@ if array_updater = 0:
 	killvar '$newnpcvars'
 end
 
+!!Updates for the old school code
 if NatBelLernQW > 0 and NatashaQW = 0: NatashaQW = NatBelLernQW & NatBelLernQW = 0
 
 if grupTipe[25] = 5: grupTipe[25] = 0 & npc_grupTipe['A25'] = 5
 
+if npcSex[14] > 0: npcSex[14] = 0 and npc_sex['A14'] = 1
+
 --- saveupdater ---------------------------------
 

locations/selfplay.qsrc

@@ -40,7 +40,8 @@ if $ARGS[0] = 'start':
 	if maddildo = 1:'You have a humongous dildo, which is 40 cm long.'
 	}!
 	if dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo ! 0:
-		gs 'selfplay', 'dildo_options' 
+		dildonumber = 0
+		!!gs 'selfplay', 'dildo_options' 
 	end
 
 	if pcs_horny > 0:

locations/sexshop.qsrc

@@ -304,12 +304,13 @@ if $ARGS[0] = 'start':
 		'You cannot afford the vibrator.'
 	end
 
-	if money >= 1200 and strapon = 0 and dildo = 0:
+	if money >= 1200 and strapon = 0 and (dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo = 0):
 		act 'Buy a strapon with a 15cm dildo (1,200 <b>₽</b>)':
 			*clr & cla
 			menu_off = 1
 			minut += 5
 			strapon = 1
+			dildo = 1
 			money -= 1200
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
@@ -317,7 +318,7 @@ if $ARGS[0] = 'start':
 
 			act 'Move away from the counter':gt 'sexshop', 'start'
 		end
-	elseif money >= 500 and strapon = 0 and dildo = 1:
+	elseif money >= 500 and strapon = 0 and (dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo ! 0):
 		act 'Buy a strapon harness (500 <b>₽</b>)':
 			*clr & cla
 			menu_off = 1

locations/sitrPar.qsrc

@@ -18,7 +18,9 @@ gs 'themes', 'indoors'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
 ''
 'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a <a href="exec:gt ''family'',''sofa''">sofa bed</a>, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
+*nl
 gs 'family'
+*nl
 gs 'subkid'
 
 if month = 12 and day >= 20:'A Christmas tree stands next to the TV, decorated with tinsel garlands and other ornaments.'

locations/stat.qsrc

@@ -24,9 +24,7 @@ if insleep = 0: gs 'stat_sklattrib'
 
 if cheatHealth = 1: dynamic $cheatmenu['std_cure']
 
-if analplay >= 2 and pcs_ass <= 10: pcs_ass += 1 & analplay = 0
-if analplay >= 4 and pcs_ass <= 15: pcs_ass += 1 & analplay = 0
-if analplay >= 8 and pcs_ass <= 20: pcs_ass += 1 & analplay = 0
+if (analplay >= 2 and pcs_ass <= 10) or (analplay >= 4 and pcs_ass <= 15) or (analplay >= 8 and pcs_ass <= 20): pcs_ass += 1 & analplay = 0
 
 !!The following seems to be part of the combat system.
 musle[1] = musle
@@ -86,8 +84,8 @@ end
 if lernSkill >= 8: intel_exp += 1 & lernSkill = 0
 if lern >= 10: intel_exp += 1 & lern = 0
 
-if pav_slut >= 75:KatjaKnowBJ = 1
-if pav_slut >= 125 or preg > 0:KatjaKnowSex = 1
+if pav_slut >= 75 and KatjaKnowBJ ! 1: KatjaKnowBJ = 1
+if pav_slut >= 125 or preg > 0 and KatjaKnowSex ! 1: KatjaKnowSex = 1
 
 shameless = guy + stat['bj'] + stat['anal'] + stat['hj'] + ((slutty + gang) * 2)
 moneySUM = money + karta + stolmoney