40 Commits 9a477b0e65 ... 86c26462ef

Author SHA1 Message Date
  KevinSmarts 86c26462ef Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts e77dc2a24a [fixed] Errors spotted by analyser 4 years ago
  VioletKitten e101528a44 [fixes] Missing journal entry for Natalia and wrong first names for a few npcs. [Nicknames were used as first names] 4 years ago
  KevinSmarts 30c0a01c86 [fixed] Shortened names and added extra image for the taxi regular shoots as all have been replaced. 4 years ago
  KevinSmarts dfb1f84ac0 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts d1b5f2d47b [fixed] Self loving was endless. Which is too much so now it should drop you out post orgasm. 4 years ago
  KevinSmarts 2286f9587a [fixed] Exceptions aren't needed and might have been breaking something 4 years ago
  VioletKitten 6c5172e8d9 [fixes] Wrong description for Natalia. 4 years ago
  VioletKitten f2c9b7bca6 [fixes] Wrong npc name and event description. 4 years ago
  KevinSmarts 3832581ddc [fixed] Old mom locations caused her to be in 2 places at once. 4 years ago
  KevinSmarts 251375caa2 [fixed] Missing end and action spotted by Violet Kitten 4 years ago
  VioletKitten 2ed0d08367 [fixes] Artem remained boyfriend of Sveta after breaking up. 4 years ago
  VioletKitten fb4b8f2922 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  KevinSmarts 8aae610fe4 [fixed] PC nickname strings lacking the $ so they showed as 0 4 years ago
  VioletKitten b09f2370bc Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  VioletKitten 8c730a2627 [fixes] Incorrect images paths & Wrong role in scene. 4 years ago
  VioletKitten a082838b51 [fixes] Volume for these scenes, were too loud. 4 years ago
  KevinSmarts 0edcf5d817 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts d3825e2700 Merge remote-tracking branch 'hornguy6/master' 4 years ago
  KevinSmarts 5501905c8a [fixed]Worng file name in gotos 4 years ago
  KevinSmarts bce5749a13 [fixed] Starting uniforms for different school starts so they don't get kicked out of their cliques fo wearing wrong clothing so easily 4 years ago
  VioletKitten e9709d6f1c [fixes] Corrected student name and quest variable. 4 years ago
  hornguy6 83b7ec7085 [fixed] missing willpower payments in photo shoots 4 years ago
  KevinSmarts 0e8c3709ee [fixes] Wrong location link in gschool grounds and reversed order of checks for Olu when he opens the door so that the correct ones are not missed. 4 years ago
  KevinSmarts b6ccf07c7c [fixes] extra symbol removed from Niko file, typo in art skill experience additions at school and wrong folder for dolls purses in full custom setup 4 years ago
  KevinSmarts 2d90f34431 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  VioletKitten 653a343bf1 [fixes] Hopefully removed spamming orgasm text. 4 years ago
  KevinSmarts e7a9a348aa [fixed] Mom events were leaking into the regular church stuff and it got really odd 4 years ago
  KevinSmarts 4971047528 Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  KevinSmarts 622e043162 [fixed] Mom church events had you entering the church multiple times 4 years ago
  VioletKitten 72c6133516 [fixes] Fixed overlapping audio. 4 years ago
  VioletKitten 0bc459b291 [fixes] Fixed wrong image path & removed incorrect jock reference. 4 years ago
  VioletKitten f29735c1e6 [fixes] Made Smiley less spammy. 4 years ago
  VioletKitten cf77845513 [fixes] Corrected wrongly labeled images 4 years ago
  VioletKitten 19d4a7baa1 [fixes] Wrong image path. 4 years ago
  VioletKitten 2e62464a8e [fixes] Corrected wrong npc names. 4 years ago
  VioletKitten e8e17b6106 [fixes] Wrong npc picture. 4 years ago
  KevinSmarts 34d407c6b2 [fixed] redundant end found by analyser 4 years ago
  VioletKitten 1c489ad1f2 [fixes] Wrong npc picture. 4 years ago
  VioletKitten 8a6f50878e [fixed] Wrong backstory in text. 4 years ago

+ 1 - 1
locations/AleksandraGo.qsrc

@@ -29,7 +29,7 @@ elseif npc_QW['A231'] > 5:
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></font></b></center>'
 !!Image needed	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big62.jpg"></center>'
-	'As you walk up to <<$npc_firstname[''A231'']>> and she smiles and says, "Hey <<pcs_nickname>>, there you are."'
+	'As you walk up to <<$npc_firstname[''A231'']>> and she smiles and says, "Hey <<$pcs_nickname>>, there you are."'
 	'Once you finally reach her, she leans in an gives you a brief kiss on the lips. You reluctantly break off the kiss and she asks, "Are you ready to head to my house?"'
 	'You nod your head and say "Yes, I''m ready, so let''s go."'
 	act 'Go to <<$npc_firstname[''A231'']>>''s home':gt 'AleksandraHome', 'bedroom' & minut += 15

+ 4 - 4
locations/NikoDates.qsrc

@@ -391,7 +391,7 @@ if $ARGS[0] = 'Date 2':
 						gs'stat'
 						'<center><b><h4><font color="red"><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-						'You shake your head as you respond, "No way. I''m not that kind of girl. I told you that." Niko get noticeably angry. "Come on <<$pcs_firstname>>. I''m not asking you to donate one of your kidneys. Just give a quick.." You cut him off. "I SAID NO!" Niko grabs your head then begins pushing it toward his crotch, as he says, "Come on <<pcs_nickname>>, it wont take long."'
+						'You shake your head as you respond, "No way. I''m not that kind of girl. I told you that." Niko get noticeably angry. "Come on <<$pcs_firstname>>. I''m not asking you to donate one of your kidneys. Just give a quick.." You cut him off. "I SAID NO!" Niko grabs your head then begins pushing it toward his crotch, as he says, "Come on <<$pcs_nickname>>, it wont take long."'
 
 						act 'Continue':
 							*clr & cla
@@ -694,7 +694,7 @@ if $ARGS[0] =  'Date 3':
 												gs'stat'
 												'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/sad2.jpg"></center>'
-												'Niko replies, "Our little brother Eduard was alway drawn to rattling things like bells, and the like. He was always excited to play with them, and watching him play with them was like watching a cat play with a ball of yarn. He saw the rattling bells on the tree then he must have tried to climb the tree, or maybe knocked the tree down, trying to get the rattling ornaments because the next thing we knew, the house was on fire, and our little brother was trapped inside. My father tried to rush in to save him, and managed to get him out, but he was too quick to run out. He ran out of the house and onto the street where a truck... The rest is history. None of them survived, and nothing else really matters..."'
+												'Niko replies, "Our little brother Eduard was always drawn to rattling things like bells and the like. He was always excited to play with them and watching him play with them was like watching a cat play with a ball of yarn. He saw the rattling bells on the tree then he must have tried to climb the tree, or maybe knocked the tree down, trying to get the rattling ornaments because the next thing we knew, the house was on fire and our little brother was trapped inside. My father tried to rush in to save him and managed to get him out. My father and step mother tried to rush him to the hospital but... They never made it... A car crash... None of them survived and nothing else really matters..."'
 												
 												act 'Continue':
 													*clr & cla
@@ -1172,7 +1172,7 @@ if $ARGS[0] = 'After School':
 								inhib_exp += 1
 								gs'stat'
 								'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
-								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/10.jpg"></center>'							
+								'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big10.jpg"></center>'							
 								'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?"'
 								gs 'arousal', 'BDSM', 2, 'humiliation'
 								gs'stat'
@@ -1317,7 +1317,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/pc/npc_headshots/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':

+ 6 - 5
locations/NikoDreams.qsrc

@@ -239,7 +239,7 @@ end
 
 if $ARGS[0] =  'Woods 7':
 	*clr & cla
-	PLAY 'sound/happyhome/WeePee.mp3', 50
+	PLAY 'sound/happyhome/WeePee.mp3', 40
 	VKWoods = 7
 	VKSmiley -= 1
 	gs'stat'
@@ -268,7 +268,7 @@ end
 
 if $ARGS[0] =  'Woods 8':
 	*clr & cla
-	PLAY 'sound/happyhome/WeePee.mp3', 100
+	PLAY 'sound/happyhome/WeePee.mp3', 60
 	VKWoods = 8
 	VKSmiley -= 1
 	gs'stat'
@@ -297,11 +297,11 @@ end
 
 if $ARGS[0] =  'Woods Home':
 	*clr & cla
-	PLAY 'sound/happyhome/WeePee.mp3', 100
+	PLAY 'sound/happyhome/WeePee.mp3', 80
 	if VKHappyHome = 0:VKHappyHome = 1
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Happy Home">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/house/happyhome.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/mansion/happyhome.jpg"></center>'
 	if VKTeeHee = 0:
 		'You finally approach the end of the forest when you see a derelict house. As you walk toward the house, you can can see; what appears to be a woman standing in the middle of the path, leading to the house while crying. <font color=#FF00FF>She must be stranded here like me. Maybe I can help her.</font> you suddenly feel a cold chill down your spine before seeing a strange looking <a href="exec:gt ''NikoDreams'', ''TeeHee''">cat</a> on a tree stump, licking its paw.'
 	else
@@ -349,6 +349,7 @@ end
 
 if $ARGS[0] =  'WeePee 1':
 	*clr & cla
+	PLAY 'sound/happyhome/WeePee.mp3', 0
 	PLAY 'sound/happyhome/WeePee2.mp3', 100
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"WeePee">></font></h4></b></center>'
@@ -365,7 +366,7 @@ if $ARGS[0] =  'Woods Hide':
 		'<center><b><h4><font color="red"><<"Smiley">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/smiley.jpg"></center>'
 		'You quickly duck behind a tree just as a horrific looking man, wielding a hammer, and wearing clown makeup, comes out of the mist. He begins laughing loudly as he walks past the tree that you are hiding behind. He doesn''t seem to notice you, as he then walks back into the mist.'
-		VKSmiley = rand(2,3)
+		VKSmiley = rand(3,4)
 		PLAY 'sound/happyhome/Smiley.mp3', 100
 	else
 		'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'

+ 19 - 19
locations/NikoMeyHome.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'Aftermath':
 		minut += 5
 		gs'stat'	
 		'<center><b><h4><font color=#ff0090><<"Katja [Kat] Meynold">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meyhome/bedroom/katja.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meyhome/bedroom/katja2.jpg"></center>'		
 		'You turn to see Katja Meynold, and Natalia Pavlova sitting on the seats right next to the bed. Katja says, "I''m so glad that you are okay. I was worried when you didn''t wake up." Natalia adds, "I also cleaned your hair for you. It was... Messy" You look around the room then back at <<$VK_VikName>>. "Thank you all, for helping me. I can''t believe what happened in school was not a dream. I want it to be a dream, so bad." You can feel tears forming under your eyes. Katja hugs you, as she says, "I don''t know what caused it, but we will find a way to make things better. You didn''t deserve what they did to you."' 
 		*nl
 		'<<$VK_VikName>> places her hand on your shoulder then says, "There, there, you''ll be alright." Natalia gives you a very supportive smile as she lightly squeezes your hand, as Katja sighs, "What is going at school these days, first Sonia and now <<$pcs_firstname>>. These boys are animals." You reply, "Yes they are." Natalia places her hand on your leg, "<<$pcs_firstname>> what happened exactly?"'
@@ -77,7 +77,7 @@ if $ARGS[0] = 'Aftermath':
 								*clr & cla
 								gs'stat'							
 								'<center><b><h4><font color=#ff0090><<"Katja [Kat] Meynold">></font></h4></b></center>'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meyhome/bedroom/katja.jpg"></center>'							
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meyhome/bedroom/katja2.jpg"></center>'							
 								'Katja gets up then tells you, "I''m sorry that I have been a bit stern, I just don''t want to see what happened today repeat itself. When you finish resting then come see me okay? We can have a nice chat together, and don''t worry, I wont lecture you again." Natalia adds, "Come see me too, I would like to speak with you. Now get some rest." The girls leave the room, as you lay down and close your eyes...'
 
 								act 'Rest':gt 'NikoDreams', 'Woods'
@@ -102,9 +102,9 @@ if $ARGS[0] = 'Aftermath 2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meyhome/bedroom/katja.jpg"></center>'
 	'You quickly jump up, and see Katja with a concerned look on her face. "It''s okay <<$pcs_firstname>>. You were just having a bad dream." You look around the room, trying to get your bearings then turn to Katja, "Thank you Katja, I hope these nightmare don''t become a habit." Katja rubs your forehead, as she responds,"Everything will be alright. You don''t worry need to worry about anything right now. You are among friends. Remember that." As she lightly rubs your forehead. You give her a smile and an approving nod. Katja returns the smile before saying, "Now that''s what I like to see, a fresh smile."' 
 	*nl
-	'You both giggle before Katja tells you, "Natalia has some activity that she thinks we will all enjoy. It''s hard to imagine what she has planned but who knows? It might be fun. Anyway you should get yourself washed up. A nice relaxing bath can work wonders for the body and mind. You should also see Vicky when you have the chance. She will be pleased to see you up.' 
+	'You both giggle before Katja tells you, "Vicky has something planned that she thinks we will all enjoy. It''s hard to imagine what it is but who knows? It might be fun. Anyway you should get yourself washed up. A nice relaxing bath can work wonders for the body and mind. You should also see Vicky when you have the chance. She will be pleased to see you up.' 
 	if NataliaPavlovaQW >= 10:
-		'I know that Natalia will be excited to see that you''re okay. She was panicking over you. The two of you must be close." You nod then say, "I will go them and thank you for your help." Katja replies, "Don''t mention it. I coldn''t just leave you there." You give Katja an approving nod as you climb out of bed.'
+		'I know that Natalia will be excited to see that you''re okay. She was panicking over you. The two of you must be close." You nod then say, "I will go them and thank you for your help." Katja replies, "Don''t mention it. I couldn''t just leave you there." You give Katja an approving nod as you climb out of bed.'
 	else
 		'I''m sure Natalia will be pleased to see that you''re okay. She was seemed very worried about you. She obviously has a kind heart." You nod then say, "I will go them and thank you for your help." Katja replies, "Don''t mention it. I coldn''t just leave you there." You give Katja an approving nod as you climb out of bed.'
 	end	
@@ -326,7 +326,7 @@ if $ARGS[0] =  'Bathroom Locked':
 	*clr & cla
 	VKMeyLock = 1
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meyhome/bathroom/door.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meyhome/bathroom/locked.jpg"></center>'
 	'You try to enter the bathroom but the door is locked. <font color=#FF00FF>Hmm it''s locked. Katja or <<$VK_VikName>> must have the key. I should speak with them</font>'
 
 	act 'Walk away': gt 'NikoMeyHome', 'Hallway'	
@@ -890,37 +890,37 @@ if $ARGS[0] = 'Kat Bath':
 		act 'Continue':	
 			cla & *clr
 			gs'stat'
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath1.mp4"></video></center>'
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/bath1.mp4"></video></center>'
 			'Realizing your pain, Katja quickly stops then whispers in your ear, "Get in the tub." You do as she says and climb into the tub as Katja undresses herself and joins you. She begins soaping up the sponge then says, "Sit up." You do as she says and she begins lathering your body with the soft sponge while being very careful not to put too much pressure on your sore spots.'
 					
 			act 'Let Katja rinse you':	
 				cla & *clr
 				gs'stat'	
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath2.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/bath2.mp4"></video></center>'
 				'After Katja finishes rinsing off the soap she grabs onto the back of your head then pulls you forward toward her nipple and you obediently begin licking her nipple passionately while occasionally looking up to see her lightly bitting her lip, obviously pleased at your performance. She then lightly grips your neck, gently pushing you off her, before climbing on top of the side of the tub before spreading her legs and rubbing her pussy gently.'
 			
 				act 'Lick her pussy':	
 					cla & *clr
 					gs'stat'
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/bath3.mp4"></video></center>'
 					'You lean forward then begin lightly licking her pussy as Katja leans back against the wall. You continue licking her vagina gently at first then begin quickening your pace while occasionally looking up to see her tilting her head back and moaning. You can see her legs tensing up as you pleasure her.'
 					
 					act 'Continue':	
 						cla & *clr
 						gs'stat'
-						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath4.mp4"></video></center>'
+						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/bath4.mp4"></video></center>'
 						'As you continue licking Katja''s pussy, you decide to slide one of your fingers into her vagina then do your best to please her with it. You run your finger inside of her, brushing her g-spot with the tip of your finger as Katja begins moaning louder. You look up to Katja to see her fidgeting as she moans out loud.'
 						
 						act 'Increase your pace':	
 							cla & *clr
 							gs'stat'
-							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath5.mp4"></video></center>'
+							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/bath5.mp4"></video></center>'
 							'You increase your pace before Katja suddenly slams her head back. Katja''s body begins to spasm as she experiences a powerful orgasm. Her moaning is erratic and her hands tightly clench around the shelf. You look up at her and watch her writhing in pleasure. <font color=#FF00FF>Yes Katja. Feel what you mean to me. You deserve every second of pleasure I can give you. I want you to feel pure ecstasy.</font>'
 							
 							act 'Continue':	
 								cla & *clr
 								gs'stat'
-								'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath6.mp4"></video></center>'
+								'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/bath6.mp4"></video></center>'
 								'Katja finishes her orgasm then lays still for a few seconds, catching her breath before looking into your eyes and saying, "You did good <<$pcs_nickname>>... Real good." She then leans forward and places her hand on your cheek, "You''re such a good girl aren''t you?" She then shares a soft passionate kiss with you for what feels like an eternity, but an eternity that you welcome.'
 								
 								act 'Finish the kiss':	
@@ -1005,38 +1005,38 @@ if $ARGS[0] = 'Katja Bath':
 		act 'Continue':	
 			cla & *clr
 			gs'stat'
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath1.mp4"></video></center>'
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/bath1.mp4"></video></center>'
 			'Realizing your pain, Katja quickly stops then whispers in your ear, "I''m sorry I just...I forgot." You stroke her cheek then say, "Take off your clothes then get in." Katja quickly undresses herself and joins you. She begins soaping up the sponge then says, "Can you sit up please." You nod and she begins lathering your body with the soft sponge while being very careful not to put too much pressure on your sore spots.'
 					
 			act 'Let Katja rinse you off':	
 				cla & *clr
 				gs'stat'	
-				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath2.mp4"></video></center>'
+				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/bath2.mp4"></video></center>'
 				'After Katja finishes rinsing off the soap you grab onto the back of her head then pull her forward toward your nipple and she obediently begins licking your nipple passionately while occasionally looking up to see if you approve. You give her a nod then lightly grip her neck, gently pushing her off of you, before climbing on top of the side of the tub before laying back and spreading your legs and rubbing your pussy gently.'
 			
 				act 'Let Katja lick your pussy':	
 					cla & *clr
 					gs'stat'
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/bath3.mp4"></video></center>'
 					'Katja leans forward then begin lightly licking your pussy as you lean back laying against the side of the tub. Katja continues licking your vagina gently at first then begins quickening her pace while occasionally looking up to see your reaction, obviously wanting to please you. You reach down then stroke her cheek as she continues licking your vagina.'
 					
 					act 'See what she does':	
 						cla & *clr
 						gs'stat'
-						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath4.mp4"></video></center>'
-						'Katja slowly begins to slide one of her fingers into your vagina then dooes her best to please her with it. She runs her finger inside of you, brushing against your g-spot with the tip of her finger as you begin moaning louder. Katja looks up to you as you feel the pleasure building to an almost unsustainable amount, as you begin moaning loudly, feeling like you will burst into an orgasm at any second.'
+						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/bath4.mp4"></video></center>'
+						'Katja slowly begins to slide one of her fingers into your vagina then does her best to please you with it. She runs her finger inside of you, brushing against your g-spot with the tip of her finger as you begin moaning louder. Katja looks up to you as you feel the pleasure building to an almost unsustainable amount, as you begin moaning loudly, feeling like you will burst into an orgasm at any second.'
 						
 						act 'Orgasm':	
 							cla & *clr
 							gs'stat'
-							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath5.mp4"></video></center>'
+							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/bath5.mp4"></video></center>'
 							'Katja notices your loud moaning then begins increasing her pace, causing you to suddenly slam your head back. You feel your breath stop as waves of pleasure begin pulsing throughout your body. You lose all control as your body is filled with perfect ecstasy. You can hear yourself moaning loudly and feel your body spasming wildly while Katja remains latched onto your vagina, licking vigorously. <font color=#FF00FF>Yes Katja. Please me. Show me what I mean to you. Make me feel pure ecstasy!</font>'
 							
 							act 'Continue':	
 								cla & *clr
 								gs'stat'
-								'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/bath6.mp4"></video></center>'
-								'You finish your orgasm then lay still for a few seconds, catching your breath before looking into Katja''s eyes and saying, "You did great Kat... Really good." You then lean forward and places your hand on her cheek, "You''re such a good girl aren''t you?" You both then share a soft passionate kiss for what feels like an eternity, but an eternity that you welcome.'
+								'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/bath6.mp4"></video></center>'
+								'You finish your orgasm then lay still for a few seconds, catching your breath before looking into Katja''s eyes and saying, "You did great Kat... Really good." She then leans forward and places her hand on your chest as you say, "You''re such a good girl aren''t you?" You both then share a soft passionate kiss for what feels like an eternity, but an eternity that you welcome.'
 								
 								act 'Meekly nod':	
 									cla & *clr

+ 30 - 8
locations/NikoWhore.qsrc

@@ -86,6 +86,7 @@ if $ARGS[0] = 'Locker Room':
 										'You lower your head in submission, "Please don''t do that. I''ll stay quiet." Dan quickly turns you around then unbuttons his pants before sliding his dick inside of your ass, causing a surge of pressure, and pain to fill your ass. Dan wastes no time and begins fucking your ass, slowly at first then continues picking up the pace. <font color=#FF00FF>I can''t believe this is happening. Niko where are you? Please help me!</font> Dan continues fucking your ass when his phone begins ringing.'
 										*nl
 										'Dan doesn''t even stop fucking you, as he answers his phone. The person on the other end of the phone says something to Dan, to which he responds, "I can''t right now. I''m too busy fucking <<$pcs_firstname>>''s ass." Your eyes widen, as Dan continues, "Yeah, I''m in the locker room...Sure you can come." <font color=#FF00FF>Did he just tell someone about this? Who was he talking too? I can''t do anything. Please tell me I''m dreaming.</font>'
+										$orgasm_txt = ''
 										gs 'arousal', 'anal', 5, 'sub'
 										gs 'stat'
 
@@ -93,7 +94,8 @@ if $ARGS[0] = 'Locker Room':
 											*clr & cla
 											gs'stat'
 											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/locker6.mp4"></video></center>'
-											'Dan hangs up as he replies, "It was just Vasily, don''t worry about it." He begins fucking you harder, as you try ask, "Why...mmmmm...Why''d you....mmmm..Tell him abo...." Dan wraps his hand around your neck, bringing your head to his face. "He is my friend, and I believe in sharing, don''t you?" You suddenly hear the locker room door open again then turn to see who it is...'
+											'Dan hangs up as he replies, "It was just Vitek, don''t worry about it." He begins fucking you harder, as you try ask, "Why...mmmmm...Why''d you....mmmm..Tell him abo...." Dan wraps his hand around your neck, bringing your head to his face. "He is my friend, and I believe in sharing, don''t you?" You suddenly hear the locker room door open again then turn to see who it is...'
+											$orgasm_txt = ''
 											gs 'arousal', 'anal', 5, 'sub'
 											gs 'stat'
 
@@ -111,10 +113,11 @@ if $ARGS[0] = 'Locker Room':
 													*nl
 													'"I love you Nikolai. I love you with all my heart." You suddenly realize what that Dan must have recorded you, as you sucked Niko''s dick in the hallway, after school. <font color=#FF00FF>There is no way I can talk my way out of this. What will Viktor do to me?</font> Vitek watches the video for a few more seconds before releasing Dan''s throat then turning to you with his face; seething with rage. "You fucking worthless whore!" He then lifts his hand, and smacks you hard, knocking you to the ground. Vitek begins smashing a nearby garbage can in rage then Dan places his hand on Vitek''s shoulder, "It''s alright Vitek, you don''t need her, you never did." Vitek takes a few seconds to calm himself then brushes Dan''s hand off his shoulder, as he unbuttons his pants then pushes his dick against your lips. "What are you waiting for, whore? Start sucking." You meekly nod before wrapping your lips around his dick.'
 												else
-													'Vitek, and Dan enter the room then quickly begin whistling at you before Vitek says, "I thought that Dan was fucking with me when he told me about this." 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. "You take a second to catch your breath when you look up to see Vitek''s dick in your face. "What are you waiting for slut? Start sucking."'
+													'Vitek and Vasily enter the room then quickly begin whistling at you before Vitek says, "I thought that Dan was fucking with me when he told me about this." 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. "You take a second to catch your breath when you look up to see Vitek''s dick in your face. "What are you waiting for slut? Start sucking."'
 													*nl
 													'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
+												$orgasm_txt = ''
 												gs 'cum_call', 'anus', 'A10', 1
 												gs 'arousal', 'bj', 5, 'sub'
 												gs 'stat'
@@ -156,7 +159,7 @@ if $ARGS[0] = 'Locker Room':
 															else
 																'Vitek: That sounds like a great idea. <<$pcs_firstname>> looks like a overgrown pig, but we can always fuck her from behind. Alright let''s do it. Hey <<$pcs_firstname>>, you''re coming with us.'
 															end
-														end											
+														end	
 														gs 'cum_call', 'mouth', 'A9', 1
 														gs 'arousal', 'bj', 5, 'sub'
 														gs 'boyStat', 'A11'
@@ -368,7 +371,7 @@ if $ARGS[0] = 'Exposed':
 				act 'Lower your head':
 					*clr & cla
 					gs'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/lena.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lena.jpg"></center>'
 					'You lower your head in embarrassment. Not wanting to be recorded but not being in any position to stop her. Lena quickly approaches you then grabs you by your hair and holds your face up to the camera, "She said smile bitch! Do you have cum in your ears?" Lera then sarcastically adds, "Maybe she''s just shy." to which Lena replies, "Shy? Does she look shy to you?" Lena then runs her hand up your thigh to your pussy, pinching your clitoris. You can see the boys are getting very excited. Most of them are rubbing their crotches.'
 					gs 'arousal', 'flash', 3, 'sub', 'humiliation', 'exhibitionism'
 					gs 'stat'
@@ -404,7 +407,7 @@ if $ARGS[0] = 'Exposed':
 									'<center><img src="images/characters/pavlovsk/school/head/big143.jpg"></center>'
 								else
 									'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
-									'<center><img src="images/characters/pavlovsk/school/head/big10.jpg"></center>'
+									'<center><img src="images/pc/npc_headshots/big10.jpg"></center>'
 								end
 								if npc_rel['A144'] >= 80:
 									'Anushka holds out her hand to you. "Come on, lets get out of here!" Dan walks in front of her. "Leave it Nush, <<$pcs_nickname>> likes it... She wants to stay." Then he turns towards you. "Don''t you slut?" You stare at Anushka, too terrified to speak. Anushka shouts, "<<$pcs_nickname>>! Say something!" You want to say something but your body wont let you. Taking your silence as acceptance, Anushka just sighs in a defeated tone then gives you a look of pity. "See, what did I tell you? Now stop being such a buzz kill and either join in, or shove off!" She then says to Dan. "Fuck you asshole." Dan only grins as he adds, "Anywhere, any time, sweet cheeks."'
@@ -423,6 +426,7 @@ if $ARGS[0] = 'Exposed':
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/exposed2.jpg"></center>'
 									'Once Anushka and Alyona leave, Radomir Popov steps up to you then begins fingering your vagina, "I want to fuck her first." Dan laughs, as he replies, "You mean second, right?" He then turns you around, and spreads your ass cheeks, causing his cum to leak out of your ass. Radomir replies, "Ohh shit, she really is a filthy whore. I''m still fucking her though." He grabs you by the hair then unbuttons his pants, and lays down, as he pulls you on top of him.'		
+									$orgasm_txt = ''
 									gs 'arousal', 'vaginal_finger', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 									gs 'stat'		
 									
@@ -432,6 +436,7 @@ if $ARGS[0] = 'Exposed':
 										gs'stat'
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock1.mp4"></video></center>'
 										'You can feel Radomir''s penis enter your vagina causing a jolt of pressure as your weight pushes his cock completely inside of you. knowing that it is too late to go back, you begin riding Radomir. You can hear the boys cheering, as they enjoy the show. You can still see Pauline recording you and the other girls cheering with malicious smirks on their faces.'
+										$orgasm_txt = ''
 										gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 										gs 'stat'
 										
@@ -440,6 +445,7 @@ if $ARGS[0] = 'Exposed':
 											gs'stat'
 											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum7.mp4"></video></center>'
 											'Radomir pulls out of you then begins cumming on your feet, as you milk him. Feeling his cock throbbing in your hand, His warm cum landing on your feet. You use the comfort of his warm cum to distract you from your racing thoughts.'
+											$orgasm_txt = ''
 											gs 'cum_call', 'feet', 'A158', 1
 											gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 											gs 'stat'
@@ -457,6 +463,7 @@ if $ARGS[0] = 'Exposed':
 													gs'stat'
 													'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/stair2.mp4"></video></center>'
 													'You meekly nod and Roman grabs you by the hair then pulls you in front of the stairs as he sits down, pulling you on top of his dick. You moan loudly as you feel his dick forcefully thrust into your pussy. You hold still for few seconds before Roman shouts, "Hurry up slut! Ride my dick." You quickly nod before thrusting on top of his dick as the other boys grab and fondle your breasts as Lera hollers, "Oh boy, look at her go to work!" Lena then says, "I wonder how many she can fit in there?" Pauline adds, "I''m sure we will soon find out." The girls laugh before you suddenly hear someone shout, "Eww what the fuck is this!?"'							
+													$orgasm_txt = ''
 													gs 'arousal', 'massage', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 													gs 'arousal', 'vaginal', -5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 													gs 'stat'
@@ -491,7 +498,8 @@ if $ARGS[0] = 'Locker Room 2':
 	inhib_exp += 1
 	gs'stat'
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock2.mp4"></video></center>'
-	'As soon as you reach the locker room, Dan shoves you into the crowd, and Roman Yakovlev catches you then turns you around. You feel Roman''s penis entering your vagina then his pace begins increasing as he holds onto your waist, pushing you against his crotch. <font color=#FF00FF>This is it. This is my life now. How did I let this happen?</font> Roman leans forward, and whispers in your ear, "How does my dick feel <<$pcs_nickname>>? Isn''t it the biggest dick you ever had?"' 										
+	'As soon as you reach the locker room, Dan shoves you into the crowd, and Roman Yakovlev catches you then turns you around. You feel Roman''s penis entering your vagina then his pace begins increasing as he holds onto your waist, pushing you against his crotch. <font color=#FF00FF>This is it. This is my life now. How did I let this happen?</font> Roman leans forward, and whispers in your ear, "How does my dick feel <<$pcs_nickname>>? Isn''t it the biggest dick you ever had?"'
+	$orgasm_txt = ''
 	gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 	gs 'stat'
 
@@ -501,7 +509,8 @@ if $ARGS[0] = 'Locker Room 2':
 		minut -= 5
 		gs'stat'	
 		'<center><video autoplay loop src="images/shared/sex/cum/cum5.mp4"></video></center>'
-		'You meekly nod, not wanting to upset him. After a few more seconds, Roman pulls out of you and groans, covering your back in his cum. Roman gives your ass a firm smack, as he says, "Damn <<$pcs_firstname>>, you have a tight pussy. We have to do this again sometime." Arkadi suddenly shouts, "Hey Roman don''t hog her, all for yourself." Roman laughs, as he pulls up his pants then pushes you toward the other boys, causing you to fall on your knees in front of the jocks, who are holding their dicks in their hand.'
+		'You meekly nod, not wanting to upset him. After a few more seconds, Roman pulls out of you and groans, covering your back in his cum. Roman gives your ass a firm smack, as he says, "Damn <<$pcs_firstname>>, you have a tight pussy. We have to do this again sometime." Arkadi suddenly shouts, "Hey Roman don''t hog her, all for yourself." Roman laughs, as he pulls up his pants then pushes you toward the other boys, causing you to fall on your knees in front of the Gopniks, who are holding their dicks in their hand.'
+		$orgasm_txt = ''
 		gs 'cum_call', 'back', 'A157', 1
 		gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 		gs 'stat'
@@ -537,6 +546,7 @@ if $ARGS[0] = 'Locker Room 2':
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock4.mp4"></video></center>'
 					'After a few seconds, Vitek lifts you up by your shoulders then says, "Enough warm up, who is ready to fuck this bitch?" Dan waves his hand then says, "I could go for seconds." Vitek gives him an approving nod as he lifts you up then lowers you on top of Dan''s hard cock. You let out a loud moan, as Dan''s cock enters you. You begin riding Dan''s dick, felling him pushing deeper inside you and enjoying the boys cheering you on. You look around and see a few of the nerdy boys peeking in from the doorway. They are rubbing their crotches, but then looking around to make sure that no one notices them. The fact that you are turning them on, causes you to feel even more aroused then you already are. Dan suddenly states, "Get ready for another facial, slut!"'
+					$orgasm_txt = ''
 					gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 					gs 'stat'
 
@@ -553,6 +563,7 @@ if $ARGS[0] = 'Locker Room 2':
 							gs'stat'
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock5.mp4"></video></center>'	
 							'Vasily spreads your legs then pushes his penis inside of you, causing a jolt of pleasure. Shulga''s hard cock enters you, and starts rubbing against your g spot. Vasily stares you in the eyes with a very sad look on his face, as he whispers, "I wish things ended up differently <<$pcs_firstname>> but there is no turning back now." as he continues fucking you, his frown disappears and he starts getting into fucking you. Increasing his pace.'
+							$orgasm_txt = ''
 							gs 'arousal', 'vaginal', 5, 'exhibitionism', 'humiliation', 'gangbang'
 							gs 'stat'
 
@@ -562,6 +573,7 @@ if $ARGS[0] = 'Locker Room 2':
 								gs'stat'
 								'<center><video autoplay loop src="images/shared/sex/cum/cum110.mp4"></video></center>'
 								'You continue staring Vasily in his eyes, as you hear him groan. He pulls out of you and sprays his warm seed all over your chest as you instinctively stroke his cock, milking his penis. Vasily then takes a few seconds to catch his breath before whispering in your ear, "You are so beautiful <<$pcs_firstname>>. Too bad it had to come to this but you''ll get used to it." He then climbs off of you then pulls his pants up, and gives Vitek a high five before leaving the locker room. Vitek then lifts you up, and says, "You better be ready bitch because I''m ready for seconds." Vitek then pushes you onto your knees then has you spend the next 10 seconds lubing his dick before he shoves it into your ass.'
+								$orgasm_txt = ''
 								gs 'cum_call', 'breasts', 'A11', 1
 								gs 'arousal', 'vaginal', 5, 'exhibitionism', 'humiliation', 'gangbang'
 								gs 'stat'
@@ -571,6 +583,7 @@ if $ARGS[0] = 'Locker Room 2':
 									gs'stat'
 									'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/dog9.mp4"></video></center>'
 									'Vitek fucks your ass slowly at first, but then picks up the pace. You let out high pitch squeals, as you feel Vitek''s penis rubbing against your inner ass. His big hard cock, pushing it''s way deeper inside you as his strong hands firmly grips you hair. Yuo feel completely at his mercy as he continues to ram is cock in your sore asshole.' 
+									$orgasm_txt = ''
 									gs 'arousal', 'anal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 									gs 'stat'
 								
@@ -580,6 +593,7 @@ if $ARGS[0] = 'Locker Room 2':
 										gs'stat'
 										'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumAnal2.mp4"></video></center>'
 										'<font color=#FF00FF>Vitek is so strong and aggressive. He is always so rough. Why is he always so angry?</font> After a few more seconds, Vitek says, "This is what a whore like you deserves." Vitek then fills your ass with his warm seed. You can feel Vitek''s hot cum filling your ass and then leaking out, as he pulls out of you. "You better get used to this <<$pcs_firstname>> Because this is your new life now." Vitek pulls up his pants then leaves the locker room.'
+										$orgasm_txt = ''
 										gs 'cum_call', 'anus', 'A9', 1
 										gs 'arousal', 'anal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 										gs 'arousal', 'end'
@@ -592,6 +606,7 @@ if $ARGS[0] = 'Locker Room 2':
 											gs'stat'
 											'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock6.mp4"></video></center>'
 											'Valentin walks up to you then says, "I guess I''m up. Don''t worry <<$pcs_nickname>>, I''ll make this quick." As he pushes his hard cock inside of your vagina causing a jolt of pain as your sore vagina is once again used. Valentin continuously rams his cock into your pussy, slamming the head of his penis against your g-spot. You don''t have enough breath to moan but with Valentin''s rough thrusts. You can feel Vitek''s cum leaking out of your ass, as you hear Lera say, "Damn, look at <<$pcs_nickname>>, leaking like an overfilled water balloon." causing the girls to giggle. Valentin then pulls out of you and says, "Open your moth slut!"'
+											$orgasm_txt = ''
 											gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 											gs 'stat'
 								
@@ -632,7 +647,11 @@ if $ARGS[0] = 'Locker Room 2':
 															*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 															'You can feel all of your energy sapped, your will... Broken, as you lay there in silence with the boys moving closer. You take this moment of silence to think to yourself, <font color=#FF00FF>So this is my life now. What did I do to deserve this? Why is this happening to me? This can''t be real.</font> Tears begin streaming down your cheeks, as you hear footsteps. You look up to see Artem, Petka and Petia standing over you.'
 															*nl
-															if artembf = 1 and artembrokenheart = 0 and artemblok = 0:'Artem sadly looks down at you then says, "How could you? I loved you but you''re just a whore now." Lena leans forward and says in a mocking tone, "Aww was <<$pcs_nickname>> your girlfriend? Well you should be used to fucking her by now, so why not give it another go." Lera then squats down right next to you then puts one of her fingers in your vagina as she says, "She is really wet Artem, she obviously wants you to fuck her. So go on, give her what she wants and it''s not like she doesn''t owe you that much... Right?" Artem starts lightly rubbing his crotch as he watches Lera fingering you. Before nodding his head in agreement.'
+															if artembf = 1 and artembrokenheart = 0 and artemblok = 0:
+																artembf = 0
+																artemblok = 1
+																'Artem sadly looks down at you then says, "How could you? I loved you but you''re just a whore now." Lena leans forward and says in a mocking tone, "Aww was <<$pcs_nickname>> your girlfriend? Well you should be used to fucking her by now, so why not give it another go." Lera then squats down right next to you then puts one of her fingers in your vagina as she says, "She is really wet Artem, she obviously wants you to fuck her. So go on, give her what she wants and it''s not like she doesn''t owe you that much... Right?" Artem starts lightly rubbing his crotch as he watches Lera fingering you. Before nodding his head in agreement.'
+															end	
 															gs 'arousal', 'flash', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang', 'prostitution'
 															gs 'stat'
 															
@@ -641,6 +660,7 @@ if $ARGS[0] = 'Locker Room 2':
 																gs'stat'
 																'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock7.mp4"></video></center>'
 																'Petka begins fondling your breasts as Artem spreads your legs, pulls out his penis then lines it up with your pussy. You then feel his penis entering your sore vagina, You lay still, as Artem begins fucking you. Barely able to feel anything anymore. You look around the room and only see Artem, Petka, Petia, Lena, Lera and Pauline still in the room. Pauline continues filming you as the others watch you get fucked. Artem''s pace increases as he gets more excited. You can hear his balls slamming against your ass.'
+																$orgasm_txt = ''
 																gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang', 'prostitution'
 																gs 'stat'
 																
@@ -650,6 +670,7 @@ if $ARGS[0] = 'Locker Room 2':
 																	gs'stat'
 																	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/cum/facial7.mp4"></video></center>'
 																	'Artem suddenly pulls out of you then begins painting your stomach with his cum before buttoning his pants then giving you a light kiss on the cheek before leaving the room. You suddenly hear heavy breathing over you. You look up to see Petia standing over you with his penis in his hand, stroking it over your face. He then suddenly groans, as he begins cumming all over your face. Petia storms out of the room shortly after, as Petka begins pushing his penis inside you.'
+																	$orgasm_txt = ''
 																	gs 'cum_call', 'stomach', 'A2', 1
 																	gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang', 'prostitution'
 																	gs 'cum_call', 'face', 'A159', 1
@@ -660,6 +681,7 @@ if $ARGS[0] = 'Locker Room 2':
 																		gs'stat'
 																		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock8.mp4"></video></center>'
 																		'Petka begins fucking you, thrusting at an increased pace, as he holds your legs open, giving himself easier access. You have no fight left, your strength is gone, your entire body is numb, you feel nothing, as Petka continues using your body. <font color=#FF00FF>Wha...what''s going...feel...so hot...head...can''t think...why...</font>'
+																		$orgasm_txt = ''
 																		gs 'cum_call', 'stomach', 'A6', 1
 																		gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang', 'prostitution'
 																		gs 'arousal', 'end'

+ 58 - 27
locations/ParChurch.qsrc

@@ -56,7 +56,6 @@ end
 
 if $ARGS[0] = 'Mom':
 	cla & *clr
-	mom_church = daystart
 	gs'stat'
 	'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 	if VKChurchNo = 4 or VKChurchNo = 5:
@@ -65,15 +64,15 @@ if $ARGS[0] = 'Mom':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'
 	end
 	if motherKnowWhore = 0 and VKChurchIntro = 0:
-		'You walk into the church then look for a seat when you suddenly hear someone casually call out, "<<$pcs_firstname>> I never expected you to come here without me dragging you." You turn to see your <<$npc_nickname[''A29'']>> sitting in the middle row. You reply, "Hey <<$npc_nickname[''A29'']>>." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
+		'You suddenly hear someone casually call out, "<<$pcs_firstname>> I never expected you to come here without me dragging you." You turn to see your <<$npc_nickname[''A29'']>> sitting in the middle row. You reply, "Hey <<$npc_nickname[''A29'']>>." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
 	elseif motherKnowWhore = 0 and VKChurchNo < 4:
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then says, "<<$pcs_firstname>> you''re here. Come here, take a seat." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then says, "<<$pcs_firstname>> you''re here. Come here, take a seat." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
 	elseif motherKnowWhore = 0 and VKChurchNo = 4:
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then get up and walks to you before saying, "<<$pcs_firstname>> we need to talk." She then guides you out of the church.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then get up and walks to you before saying, "<<$pcs_firstname>> we need to talk." She then guides you out of the church.'
 	elseif motherKnowWhore > 0 or VKChurchNo = 5:
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She peeks over in your direction then turns away from you, as if you were not there.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She peeks over in your direction then turns away from you, as if you were not there.'
 	else
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She doesn''t seem to notice you.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She doesn''t seem to notice you.'
 	end
 
 	if motherKnowWhore = 0 and VKChurchNo = 4:
@@ -137,6 +136,7 @@ end
 if $ARGS[0] = 'Excuses':
 	cla & *clr
 	VKChurchEvents = 0
+	mom_church = daystart
 	gs'stat'
 	if VKChurchNo = 0:
 		VKChurchNo += 1
@@ -234,7 +234,11 @@ if $ARGS[0] = 'vigil':
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(9,10) +'.jpg"></center>'
 		'You decide to stay for the rite of mutual forgiveness and feel much better afterwards.'
-		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+		if $args[1] = 'mom':
+			act 'Return to Narthex': gt 'ParChurch', 'Narthex_mom'
+		else
+			act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+		end
 	end
 end
 
@@ -274,7 +278,11 @@ if $ARGS[0] = 'liturgy':
     vokal_exp += rand(0,3)
     gs 'stat'
 
-	act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+	if $args[1] = 'mom':
+		act 'Return to Narthex': gt 'ParChurch', 'Narthex_mom'
+	else
+		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+	end
 end
 
 if $ARGS[0] = 'reducepavrep':
@@ -306,42 +314,56 @@ if $ARGS[0] = 'Narthex':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/enterchurch.jpg"></center>'
 	'You enter the church and the scent of incense and beeswax fills your lungs. Your eyes are drawn past the Narthex into the Nave with its walls covered in lovingly painted icons while a thousand points of light dance in joy throughout God''s house from the magnificent chandelier that hangs from the ceiling.'
 	'To your left as you enter, there is a counter where a deacon sells candles, icons, and prayer books. He smiles and nods at you absently, acknowledging your presence without really seeing you.'
+	act 'Leave the church': gt 'ParChurch' , 'start'
+	act 'Attend the Vigil':gt 'ParChurch', 'vigil'
+	act 'Join the Liturgy':gt 'ParChurch', 'liturgy'
+	act 'Light a candle':gt 'ParChurch', 'candle'
+	act 'Pray':gt 'ParChurch', 'pray'
+end
+
+if $ARGS[0] = 'Narthex_mom':
+	CLOSE ALL
+	$menu_loc = 'ParChurch'
+	$menu_arg = 'Narthex_mom'
+	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>'
+	'You enter the church and the scent of incense and beeswax fills your lungs. Your eyes are drawn past the Narthex into the Nave with its walls covered in lovingly painted icons while a thousand points of light dance in joy throughout God''s house from the magnificent chandelier that hangs from the ceiling.'
+	'To your left as you enter, there is a counter where a deacon sells candles, icons, and prayer books. He smiles and nods at you absently, acknowledging your presence without really seeing you.'
 	if VKChurchEvents < 2 and hour < 14:
 		if VKChurch = 0 or VKChurch = 4:
 			if VKChurch < 4: VKChurch += 1
-			act 'Attend the Vigil':gt 'ParChurch', 'vigil'
+			act 'Attend the Vigil':VKChurchEvents += 1 & gt 'ParChurch', 'vigil', 'mom'
 		elseif VKChurch = 1 or VKChurch = 4:
 			if VKChurch < 4: VKChurch += 1
-			act 'Join the Liturgy':gt 'ParChurch', 'liturgy'
-		elseif VKChurch = 2 or VKChurch = 4:
+			act 'Join the Liturgy':VKChurchEvents += 1 & gt 'ParChurch', 'liturgy', 'mom'
+		elseif VKChurch = 2 or VKChurch = 4:	
 			if VKChurch < 4: VKChurch += 1
-			act 'Light a candle':gt 'ParChurch', 'candle'
+			act 'Light a candle':VKChurchEvents += 1 & gt 'ParChurch', 'candle', 'mom'
 			if VKChurch < 4: VKChurch += 1
 		elseif VKChurch = 3 or VKChurch = 4:
 			if VKChurch < 4: VKChurch = 4
-			act 'Pray':gt 'ParChurch', 'pray'
+			act 'Pray':VKChurchEvents += 1 & gt 'ParChurch', 'pray', 'mom'
 		else
-			act 'Attend the Vigil':gt 'ParChurch', 'vigil'
-			act 'Join the Liturgy':gt 'ParChurch', 'liturgy'
-			act 'Light a candle':gt 'ParChurch', 'candle'
-			act 'Pray':gt 'ParChurch', 'pray'
+			act 'Attend the Vigil':gt 'ParChurch', 'vigil', 'mom'
+			act 'Join the Liturgy':gt 'ParChurch', 'liturgy', 'mom'
+			act 'Light a candle':gt 'ParChurch', 'candle', 'mom'
+			act 'Pray':gt 'ParChurch', 'pray', 'mom'
 		end
 		act 'Leave early':gt 'ParChurch', 'Leave Early'
 	else
-		if hour = 12:
-			minut += 120 - minut
-		else
-		   minut += 60 - minut
-		end
-		if hour >= 14:hour = 14 - minut
 		if VKChurchQW < 6:VKChurchQW += 1
 		act 'Finish':gt 'ParChurch', 'Leave'
-	end
+	end	
 end
 
 if $ARGS[0] = 'Leave Early':
 	CLOSE ALL
 	VKChurchEvents = 0
+	mom_church = daystart
 	*clr & cla
 	'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'
@@ -360,6 +382,7 @@ if $ARGS[0] =  'Leave':
 	else
 		hour = 14
 	end
+	mom_church = daystart
 	VKChurchEvents = 0
 	gs'stat'
 	'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
@@ -421,7 +444,11 @@ if $ARGS[0] = 'candle':
 		'You approach the iconostasis and light your candle in the dark church. It gives you a nice feeling and decide to say a little prayer. The darkness, combined with the pleasant sight of fire makes you feel warm inside.'
 	end
 
-	act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+	if $args[1] = 'mom':
+		act 'Return to Narthex': gt 'ParChurch', 'Narthex_mom'
+	else
+		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+	end
 end
 
 if $ARGS[0] = 'pray':
@@ -489,10 +516,14 @@ if $ARGS[0] = 'pray':
 			'"That felt refreshing," you mumble to yourself.'
 		end
 		gs 'stat'
-		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+		if $args[1] = 'mom':
+			act 'Return to Narthex': gt 'ParChurch', 'Narthex_mom'
+		else
+			act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+		end
 	end
 
-	if exhibitionist_lvl > 0:
+	if exhibitionist_lvl > 0 and $args[1] ! 'mom':
 		act 'Be naughty':
 			*clr & cla
 			menu_off = 1

+ 1 - 0
locations/_attributes_alternative.qsrc

@@ -303,6 +303,7 @@ elseif ARGS[1] = 55:
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle = 2
+	CloStyle2 = 4
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 3

+ 1 - 1
locations/artemdate.qsrc

@@ -320,7 +320,7 @@ if $ARGS[0] = 'stand_up':
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_save.jpg"></center>'
 											'After awhile you finally see Artem limping towards you. He smiles through busted bloody lips when he sees you. You rush over to him and help him walk, putting one of his arms over your shoulder. Artem wipes the blood from his face, deeply embarrassed you had to see him like this. "I''m glad you got away, they said they were going to rape you if they caught you." He says as he hugs you obviously not made you ran and left him. He seems genuinely glad you are safe. You walk in silence as you help him get home.'
 											*nl
-											'Once you get him home, you help him to bed and then clean up his wounds and tend to him as best you can. "Thank you <<pcs_nickname>> for everything. For helping me home, for going out with me and for helping me now. I just wish it could have been a better date."'
+											'Once you get him home, you help him to bed and then clean up his wounds and tend to him as best you can. "Thank you <<$pcs_nickname>> for everything. For helping me home, for going out with me and for helping me now. I just wish it could have been a better date."'
 											'You smile to him and place a finger on his lips. "Shhh, it''s fine, I am just sorry you got hurt."'
 											'He smiles. "Yeah well maybe our next date won''t be so exciting. The pain meds are kicking in, I could really use some sleep, see you later ok." He rolls over obviously not wanting to talk anymore and in obvious pain. So you get up and leave him to rest.'
 											act 'Leave': gt 'pod_ezd', 'etaj_1'

+ 1 - 1
locations/artemhome.qsrc

@@ -129,7 +129,7 @@ if $ARGS[0] = 'home':
 				else
 					if artlie = 2 or artembrokenheart = 1 or artemblok = 1:
 						'"Who should I tell him is here?"'
-						'"I''m <<pcs_nickname>>."'
+						'"I''m <<$pcs_nickname>>."'
 						'When she hears your name her demeanor changes swiftly. Frowning she says: "Oh, it''s you. I don''t know what you did to my sweet Artem but he says he never wants to see you again, so please leave." With that she closes the door in your face.'
 						act 'Leave': gt'pod_ezd','etaj_1'
 					else

+ 1 - 16
locations/family.qsrc

@@ -117,9 +117,8 @@ if StoryLine = 1:
 
 	if indorf = 0:
 		if $loc = 'bedrPar2':
-			if hour < 6 or hour >= 21:
+			if moloc = 1:
 				'Your <<$npc_nickname[''A29'']>> and stepfather are sleeping on the bed.'
-				if hour = 21:parsexrand = rand(0, 5)
 			end
 		end
 
@@ -178,20 +177,6 @@ if StoryLine = 1:
 			end
 		end
 
-		if $loc = 'kuhrPar':
-			gs 'dinmother'
-
-			if mother_go = 0:
-				if (week < 6 and hour >= 16 and hour < 21) or (week >= 6 and hour >= 7 and hour < 21):
-					*pl dyneval($d_mother[rand(4,8)])
-				end
-			else
-				if (week < 6 and hour >= 17 and hour < 21) or (week >= 6 and hour >= 7 and hour < 21 and hour ! 16):
-					*pl dyneval($d_mother[rand(4,8)])
-				end
-			end
-		end
-
 		if $loc = 'korrPar':
 			!! for future code I guess
 		end

+ 1 - 1
locations/father.qsrc

@@ -133,7 +133,7 @@ end
 
 if $clothingworntype = 'nude' and npc_pregtalk['A28'] = 0 and func('body_din','pregnancyVisibility') = 1:
     'Your stepfather looks at your belly with a surprised look on his face. He shakes his head in disappointment before looking back at you.: "<<$pcs_nickname>>, you''re pregnant?"'
-    if npc_sex['A28']!0: 'You see him hesitate for a second, as if weighing whether he should say something or not. He finally does: "All i can say is that i hope the baby is not mine... i''m so disappointed in you "<<pcs_nickname>>"'
+    if npc_sex['A28']!0: 'You see him hesitate for a second, as if weighing whether he should say something or not. He finally does: "All i can say is that i hope the baby is not mine... i''m so disappointed in you "<<$pcs_nickname>>"'
     npc_pregtalk['A28'] = 1
     
 elseif $clothingworntype ! 'nude' and npc_pregtalk['A28'] = 0 and func('body_din','pregnancyVisibility') = 1:

+ 10 - 0
locations/foto_shoot.qsrc

@@ -491,6 +491,7 @@ if $ARGS[0] = 'bikini':
 	minut += 120
 	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_bikini += 1
+	if pcs_inhib < 20: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(7,12)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
@@ -516,6 +517,7 @@ if $ARGS[0] = 'lingerie':
 	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_lingerie += 1
 	mdlng_exp += rand(6,10)
+	if pcs_inhib < 25: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(7,13)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
@@ -543,6 +545,7 @@ if $ARGS[0] = 'sexy':
 	modelfoto_glamour += 1
 	modelfoto_ero_clo += 1
 	mdlng_exp += rand(5,10)
+	if pcs_inhib < 30: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(7,12)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(1,6)
@@ -563,6 +566,7 @@ if $ARGS[0] = 'transparent':
 	modelfoto_transparent += 1
 	modelfoto_nip += 1
 	mdlng_exp += rand(6,10)
+	if pcs_inhib < 45: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(7,13)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
@@ -588,6 +592,7 @@ if $ARGS[0] = 'trans_ling':
 	modelfoto_nip += 1
 	modelfoto_lingerie += 1
 	mdlng_exp += rand(8,10)
+	if pcs_inhib < 45: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(9,14)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
@@ -618,6 +623,7 @@ if $ARGS[0] = 'topless':
 	modelfoto_nip += 1
 	modelfoto_topless += 1
 	mdlng_exp += rand(6,10)
+	if pcs_inhib < 50: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(8,14)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
@@ -641,6 +647,7 @@ if $ARGS[0] = 'tasteful':
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto_tastenude += 1
 	mdlng_exp += rand(9,10)
+	if pcs_inhib < 40: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(10,20)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
@@ -664,6 +671,7 @@ if $ARGS[0] = 'topless_nude':
 	modelfoto_nude += 1
 	modelfoto_toplessnude += 1
 	mdlng_exp += rand(9,10)
+	if pcs_inhib < 55: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(10,20)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
@@ -692,6 +700,7 @@ if $ARGS[0] = 'nude':
 	modelfoto_nip += 1
 	modelfoto_pussy += 1
 	mdlng_exp += rand(9,10)
+	if pcs_inhib < 60: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(10,20)
 	gs 'fame', 'pav', 'modelling', rand(10,15)
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(5,10)
@@ -732,6 +741,7 @@ if $ARGS[0] = 'erotic':
 	modelfoto_pussy += 1
 	modelfoto_asshole += 1
 	mdlng_exp += rand(1,4)
+	if pcs_inhib < 65: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(5,10)
 	gs 'fame', 'city', 'porn', rand(5,15)
 	gs 'fame', 'pav', 'porn', rand(0,15)

+ 2 - 2
locations/gschool_grounds.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'main':
 				end
 			elseif hour = 7:
 				if NikoEv = 10:
-					gt 'NikoDates', 'Walk Of Shame'
+					gt 'NikoWhore', 'Walk Of Shame'
 				elseif minut <= 45:
 					act '<b>Go to class</b>': gt 'gschool_grounds', 'bulding'
 				else
@@ -170,7 +170,7 @@ if $ARGS[0] = 'main':
 					end
 				end
 			elseif hour = 8:
-				if NikoEv = 10: gt 'NikoDates', 'Walk Of Shame'
+				if NikoEv = 10: gt 'NikoWhore', 'Walk Of Shame'
 				'You missed your whole first class, hopefully no one noticed.'
 				act '<b>Rush to class</b>':	demerit += 10 & gt 'gschool_grounds', 'bulding'
 			elseif hour < 14:

+ 5 - 5
locations/gschool_lessons3.qsrc

@@ -442,7 +442,7 @@ end
 if $ARGS[0] = 'art':
 	menu_off = 1
 	pcs_grades += rand(0,1)
-	artslks_exp += rand(1,2)
+	artskls_exp += rand(1,2)
 	agil_exp += rand(0,1)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classart.jpg"></center>'
@@ -456,7 +456,7 @@ if $ARGS[0] = 'art':
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			pcs_grades += rand(0,1)
-			artslks_exp += rand(1,2)
+			artskls_exp += rand(1,2)
 			agil_exp += rand(0,1)
 			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
@@ -465,7 +465,7 @@ if $ARGS[0] = 'art':
 			'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned a lot about the history of art and famous artist.'
 			act 'Ask a question about the lesson':
 				*clr & cla
-				artslks_exp += rand(0,1)
+				artskls_exp += rand(0,1)
 				agil_exp += rand(0,1)
 				pcs_grades += rand(0,1)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
@@ -830,7 +830,7 @@ if $ARGS[0] = 'art':
 			'Mr. Vasilyev tries to convince you of the importance of todays lesson, "<<$pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Reluctantly pay attention':
 				*clr & cla
-				artslks_exp += rand(0,1)
+				artskls_exp += rand(0,1)
 				agil_exp += rand(0,1)
 				pcs_grades += rand(0,1)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
@@ -841,7 +841,7 @@ if $ARGS[0] = 'art':
 				*clr & cla
 				grupvalue[4] -= 1
 				grupvalue[3] += 1
-				artslks_exp += rand(0,2)
+				artskls_exp += rand(0,2)
 				agil_exp += rand(0,1)
 				pcs_grades += rand(0,1)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/payattention.jpg"></center>'

+ 5 - 5
locations/gschool_lessons4.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'math':
 			*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 Julia Milov, 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?"'
+			'A few students raise their hands and Anatoly points to Natalia Pavlova, 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 Natalia''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.'
 		end
@@ -141,9 +141,9 @@ 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.'
 				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."'
+					'You nervously look around the room, not knowing what the question was when you hear Natalia ask Mr. Tsarev, "Why was the problem structured like that? I thought that finding X came after finding Y" Mr. Tsarev turns to Natalia 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
-					'Julia nods with a smile, as Anatoly turns around and continues his lesson, completely forgetting about you. Julia turns to you with a warm smile then turns back toward Mr. Tsarev for the rest of the period.'
+					'Natalia nods with a smile, as Anatoly turns around and continues his lesson, completely forgetting about you. Natalia turns to you with a warm smile then turns back toward Mr. Tsarev for the rest of the period.'
 				elseif VKrand = 3 and NikoLuv >= 2 and npc_grupTipe['A189'] = 4:
 					'You nervously look around the room, not knowing what the question was when you suddenly hear Evgeny let out a yelp as his chair is pulled out from under him, causing him to fall to the ground. Mr. Tsarev recoils in shock before suddenly shouting, "NIKOLAI! WHAT HAS GOTTEN INTO YOU!?" Niko and most of the class are laughing loudly, as Anatoly shouts out, "NIKOLAI GO TO THE PRINCIPAL''S OFFICE NOW!" Niko packs his stuff in his bag then heads toward the door, giving you a wink as he passes by.'
 					'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/crash.mp4"></video></center>'
@@ -257,8 +257,8 @@ 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
 				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.'
+			elseif VK = 2 and NataliaPavlovaQW >= 10:
+				'You continue browsing the web, when you suddenly receive a text message from Natalia Pavlova; depicting your name, and her''s, inside of a heart together. You turn to Natalia 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, Natalia." Natalia quickly replies, "I am so happy that I have you in my life." You reply to Natalia, "Ohhh you are just so cute. Muah." Natalia giggles before turning back to Mr. Tsarev while occasionally turning back toward you and smiling.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			elseif VK = 3 and NikoVolkovQW >= 5 and npc_grupTipe['A189'] = 4:
 				'While you are browsing the internet, you receive a text message from Niko, reading; "Who is this beautiful creature, I see? This precious gem, sitting in front of me? I gaze at her with eyes so amazed, will she not turn around, and return my gaze?" You giggle before turning around to face Niko to see him with a loving smile. You then type back, "You are so sweet Niko." Niko gives you a wink before laying back in his seat.'

+ 8 - 4
locations/journal.qsrc

@@ -493,6 +493,10 @@ if $ARGS[0] = 'nerds':
 	'<center><img <<$set_imgh>> src="images/pc/notebook/16.png"></center>'
 	'<center>Natasha Belova</center>'
 	'Natasha is an excellent student and one of the smartest people in your school. Even though you are living in the same building, her parents are very poor, and it shows as Natasha is always dressed in second-hand clothes and can never afford to do anything fun. As a result, she doesn''t have many friends, as most of the other girls shun her or mock her poor clothing.'
+
+	'<center><img <<$set_imgh>> src="images/pc/notebook/240.png"></center>'
+	'<center><<"Natalia "Nat" Pavlova">></center>'	
+	'Natalia is a very smart but weak willed girl. She constantly struggles to maintain friendships but her good looks and eagerness to help others, prevents her from being an outcast. She is rarely seen with anyone but one thing she always keeps with her, is a special notebook that she never lets anyone touch.'
 	
 	act 'Go back': gt 'journal', 'school'
 	act 'Put your notebook down': gt $loc, $metka
@@ -523,7 +527,7 @@ if $ARGS[0] = 'jocks':
 
 	if npc_grupTipe['A5'] = 2:
 		'<center><img <<$set_imgh>> src="images/pc/notebook/5.png"></center>'
-		'<center>Fedor Kozlov</center>'
+		'<center>Fyodor "Fedor" Kozlov</center>'
 		'Fedor Kozlov is a decent athlete. He often trains with his good friend Ivan, but lacks the level of talent that Ivan does have. He is decent looking and often is seen chasing Ivan''s leftovers.'
 	end
 
@@ -661,7 +665,7 @@ if $ARGS[0] = 'gopniks':
 	*clr & cla
 	'<center><h2>Gopniks</h2></center>'
 	'<center><img <<$set_imgh>> src="images/pc/notebook/9.png"></center>'
-	'<center>Vitek Kotov</center>'
+	'<center>Viktor "Vitek" Kotov</center>'
 	'Vitek Kotov is an aggressive and strong guy, who considers himself a gangsta. He is very loud, obnoxious and not very attractive. Lena is his twin-sister, whom he is overly protective of and that has caused more than a fair share of drama. He is the local leader of the Gopniks and as such is the most feared boy in school. Even some adults are afraid of him. He is even rumored to be involved with the local organized crime selling drugs.'
 
 	'<center><img <<$set_imgh>> src="images/pc/notebook/154.png"></center>'
@@ -697,7 +701,7 @@ if $ARGS[0] = 'gopniks':
 	'Lena Kotov is Vitek''s twin sister. Just like her brother, she is one of the local Gopniks. With a chip on her shoulder, she can be aggressive and unpredictable. She''s best friends with Lera, and they can often be found together smoking in the school''s restrooms during school, or hanging out together after school.'
 
 	'<center><img <<$set_imgh>> src="images/pc/notebook/11.png"></center>'
-	'<center>Vasily Shulgin</center>'
+	'<center>Vasily "Shulga" Shulgin</center>'
 	if grupTipe = 4:
 		'Vasily is always hanging out with Dan and Vitek, who are his best friends. His nickname is Shulga. He''s physically considered the weakest one of the bunch, but is a bit of a prankster and is always making the other ones laugh, which makes him popular with the gopniks. He was raised just by his father, after his mother left when he was still an infant. When you where younger you was good friends with him and as you both drifted towards the gopniks have stayed good friends.'
 	else
@@ -721,7 +725,7 @@ if $ARGS[0] = 'gopniks':
 	'Lavrenti Romanov comes from a wealthy family, an only child with parents that are rarely around. He used to be one of the cool kids, but his attitude abruptly changed last year. He became mean and violent, which lead to him and Dimika having a major falling out at the same time, since the fight he started hanging with the Gopniks. He is more of a follower, and the Gopniks like using his money, while tolerating him.'
 
 	'<center><img <<$set_imgh>> src="images/pc/notebook/189.png"></center>'
-	'<center>Nikolai Volkov</center>'
+	'<center>Nikolai "Niko" Volkov</center>'
 	'Niko Volkov is clever, but short tempered. When he is not drinking, and partying then he is hanging out with Roman Yakovlev. Many say that he only spends time with Roman, for his money. Niko always seems confident, and well spoken, but he can sometimes come off as paranoid, and unstable.'
 	
 	act 'Go back': gt 'journal', 'school'

+ 30 - 30
locations/ludahome.qsrc

@@ -111,36 +111,7 @@ if $ARGS[0] = 'home':
 		elseif rand(7,10) <= 9 and (week < 5 and hour >= 18 and hour <= 22) or (week > 5 and hour >= 8 and hour <= 22):
 			*clr & cla
 			'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-			if OluQW['met'] = 0:
-				OluQW['met'] = 1
-				'You stand outside your aunts apartment, knocking on the door. The door is answered by a large African man, who has a big friendly smile on his face "Hello can I help you?" He asks in heavily accented Russian.'
-				'You return his smile "Yes, is my Aunt Luda home?"'
-				'He shakes his head no "No she not home right now, you one her nieces?"'
-				'You nod "Yes I am <<$pcs_nickname>>, you must be Olu, my Aunts boyfriend. I have heard about you, nice to finally meet you."'
-				'He smiles even bigger "All good I hope. I will tell her you stopped by, it was nice meeting you."'
-				act 'Leave': gt 'pod_ezd', 'etaj_4'
-				act 'Ask if you can come in': 
-					*clr & cla
-					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-					'He pauses a moment and then nods opening the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What do you need?"'
-					!! Temporary loc measure
-					act 'I just wanted to talk': OluLoc = 5 & gt 'ludahome', 'chat_olu'
-					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
-				end
-			elseif OluQW['met'] = 1 and OluQW['talked'] = 1:
-				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
-				'You return his smile "Is my Aunt Luda home?"'
-				'He shakes his head no "No she not home right now. Would you like to come in and talk again?"'
-				act 'Leave': gt 'pod_ezd', 'etaj_4'
-				act 'Go in and talk':
-					*clr & cla
-					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-					'He opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
-					!! Temporary loc measure
-					act 'Sit down and chat': OluLoc = 5 & gt 'ludahome', 'chat_olu'
-					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
-				end
-			elseif OluQW['sex'] = 1:
+			if OluQW['sex'] = 1:
 				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian. When he sees it is you, his smile turns into a hungry grin as his eyes roam all over you body.'
 				'You return his smile "Is my Aunt Luda home?"'
 				'He shakes his head no "No she not home right now. We have time to have some fun, come in, come in."'
@@ -170,6 +141,35 @@ if $ARGS[0] = 'home':
 				end
 				!! Temporary loc measure
 				act 'Agree to have fun': OluLoc = 5 & gt 'olu', 'olusex1'
+			elseif OluQW['met'] = 1 and OluQW['talked'] = 1:
+				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
+				'You return his smile "Is my Aunt Luda home?"'
+				'He shakes his head no "No she not home right now. Would you like to come in and talk again?"'
+				act 'Leave': gt 'pod_ezd', 'etaj_4'
+				act 'Go in and talk':
+					*clr & cla
+					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
+					'He opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
+					!! Temporary loc measure
+					act 'Sit down and chat': OluLoc = 5 & gt 'ludahome', 'chat_olu'
+					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
+				end
+			elseif OluQW['met'] = 0:
+				OluQW['met'] = 1
+				'You stand outside your aunts apartment, knocking on the door. The door is answered by a large African man, who has a big friendly smile on his face "Hello can I help you?" He asks in heavily accented Russian.'
+				'You return his smile "Yes, is my Aunt Luda home?"'
+				'He shakes his head no "No she not home right now, you one her nieces?"'
+				'You nod "Yes I am <<$pcs_nickname>>, you must be Olu, my Aunts boyfriend. I have heard about you, nice to finally meet you."'
+				'He smiles even bigger "All good I hope. I will tell her you stopped by, it was nice meeting you."'
+				act 'Leave': gt 'pod_ezd', 'etaj_4'
+				act 'Ask if you can come in': 
+					*clr & cla
+					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
+					'He pauses a moment and then nods opening the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What do you need?"'
+					!! Temporary loc measure
+					act 'I just wanted to talk': OluLoc = 5 & gt 'ludahome', 'chat_olu'
+					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
+				end
 			else
 				'You stand outside your aunts apartment, knocking on the door. The door is answered by a Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
 				'You return his smile "Is my Aunt Luda home?"'

+ 0 - 1
locations/mother.qsrc

@@ -542,7 +542,6 @@ if $ARGS[0] = '':
 			end
 		end
 		gs 'mother', 'pregreact'
-		end
 	end
 
 	if alko >= 3  and alkomday ! daystart:

+ 26 - 25
locations/nerd_game_night.qsrc

@@ -197,7 +197,7 @@ if $ARGS[0] = 'keep_playing_on1':
 	'The battle with the dragon begins, Feofan weaves a scarying sounding battle as everyone takes turns taking a action. At one point most of the group is down, only Julia and Petka''s characters are still up. Julia is trying to heal Zinaida and Artem''s characters, while Petka''s sorceress is trying to cast a powerful spell. It looks like the dragon is about to finish off Petka''s character for sure and maybe Julia''s as well, but you have managed to sneak around the dragon as it is distracted, focusing on the rest of the party. At that point you decided to try out your back stab ability Feofan told you about that your character could do earlier. "I want to back stab the dragon."'
 	'Feofan looks surprised at first. "You have to be behi... Oh." He says looking at the figures on the map, seeing your rogue directly behind the dragon, he seems to have not noticed you moving behind his dragon.'
 	'Artem says "Yes!" Several of the others acknowledge what you have done which makes your feel good at their praise even if it is over just a game.'
-	'Feofan nods with a smile. "Ok then <<pcs_nickname>> roll your attack.'
+	'Feofan nods with a smile. "Ok then <<$pcs_nickname>> roll your attack.'
 	act 'Roll the dice':
 		*clr & cla
 		minut += 10
@@ -206,15 +206,15 @@ if $ARGS[0] = 'keep_playing_on1':
 		if temp = 20:
 			pcs_mood += 20
 			'You roll the dice and the 20 comes up, you here a slight gasp go around the table, you are not sure what just happened but everyone but Feofan looks happy. You know higher is better though. "You got a critical strike." Feofan informs you, well that sounds good you think as you roll your dice damage.'
-			'Feofan checks his notes a moment, then double checks them. "As the dragon rears back to let lose it''s firey breath, <<pcs_nickname>> rogue spots a weak point between two of it''s scales. Lunging forward she buries her sword into the dragon. It roars in pain and thrashes about tossing you aside, but you manage to land and roll safely taking no damage. Then the dragon falls over and moves no more, obviously dead." The rest of the group cheers and congratulates you on killing the dragon, you can''t help but feel good about it.'
+			'Feofan checks his notes a moment, then double checks them. "As the dragon rears back to let lose it''s firey breath, <<$pcs_nickname>> rogue spots a weak point between two of it''s scales. Lunging forward she buries her sword into the dragon. It roars in pain and thrashes about tossing you aside, but you manage to land and roll safely taking no damage. Then the dragon falls over and moves no more, obviously dead." The rest of the group cheers and congratulates you on killing the dragon, you can''t help but feel good about it.'
 		elseif temp => 11:
 			pcs_mood += 10
 			'You roll the dice and Feofan checks the numbers. "You managed to land a backstab on the dragon, roll your damage." Feofan informs you, well that sounds good you think as you roll your dice damage.'
-			'Feofan checks his notes a moment. "As the dragon rears back to let lose it''s firey breath, <<pcs_nickname>> rogue lunges forward scoring a back stab on the dragon. It roars in pain and thrashes about tossing you aside, but you manage to land and roll safely taking no damage. Then the dragon turns on you and tries to bite you." More dice are rolled and you manage to dodge the dragon, as the dragon focuses on you. Julia has manage to heal both Zinaida and Artem back up and it bought enough time for Petka to finish casting his sorceress most powerful spell. Which lands causing a great deal of damage with attacks from the rest the dragon finally falls over dead. The rest of the group congratulates you on landing a powerful hit and distracting the dragon, you can''t help but feel good about it.'
+			'Feofan checks his notes a moment. "As the dragon rears back to let lose it''s firey breath, <<$pcs_nickname>> rogue lunges forward scoring a back stab on the dragon. It roars in pain and thrashes about tossing you aside, but you manage to land and roll safely taking no damage. Then the dragon turns on you and tries to bite you." More dice are rolled and you manage to dodge the dragon, as the dragon focuses on you. Julia has manage to heal both Zinaida and Artem back up and it bought enough time for Petka to finish casting his sorceress most powerful spell. Which lands causing a great deal of damage with attacks from the rest the dragon finally falls over dead. The rest of the group congratulates you on landing a powerful hit and distracting the dragon, you can''t help but feel good about it.'
 		else
 			pcs_mood += 5
 			'You roll the dice and Feofan checks the numbers. "Your weapon hits the dragons scales but fails to pierce them." Feofan informs you.'
-			'Feofan checks his notes a moment. "As the dragon rears back to let lose it''s firey breath, <<pcs_nickname>> rogue lunges forward but fails to hurt the dragon. Then the dragon turns on you and tries to bite you." More dice are rolled and you manage to dodge the dragon, as the dragon focuses on you. Julia has manage to heal both Zinaida and Artem back up and it bought enough time for Petka to finish casting his sorceress most powerful spell. Which lands causing a great deal of damage with attacks from the rest the dragon finally falls over dead. The rest of the group congratulates you on distracting the dragon, you can''t help but feel good about it.'
+			'Feofan checks his notes a moment. "As the dragon rears back to let lose it''s firey breath, <<$pcs_nickname>> rogue lunges forward but fails to hurt the dragon. Then the dragon turns on you and tries to bite you." More dice are rolled and you manage to dodge the dragon, as the dragon focuses on you. Julia has manage to heal both Zinaida and Artem back up and it bought enough time for Petka to finish casting his sorceress most powerful spell. Which lands causing a great deal of damage with attacks from the rest the dragon finally falls over dead. The rest of the group congratulates you on distracting the dragon, you can''t help but feel good about it.'
 		end
 		gs 'stat'
 		act 'Finish the game night':
@@ -294,6 +294,8 @@ if $ARGS[0] = 'keep_playing_on2':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/camp.jpg"></center>'
 		'You decide maybe that is a bit to much realism and decide to stay in camp, feeling a little embarrassed for suggesting it. Soon the party has the camp set up and eats dinner, they banter back and forth as their characters talking about what they plan to spend their share of the treasure on, before deciding the order of who is on watch during the night. After that everyone goes to sleep, taking their turns on watch until morning.'
 		'"We''re out of time," since all of you are having fun you let out a sigh, "Don''t worry, there are lots of adventures left to explore. We''ll pick it up the next time."'
+		act 'Leave': gt 'gdk', 'lobby'
+	end
 	act 'Go to the river and bath':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/bathing.jpg"></center>'
@@ -304,7 +306,7 @@ if $ARGS[0] = 'keep_playing_on2':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/bathing_confront.jpg"></center>'
 			'You tell him, "I grab my sword and tell who ever is there to show themselves now."'
 			'Petka sighs, "Sorry I just wanted to check on you, I didn''t mean to spy on you."'
-			'Feofan then descibes how your character is standing their naked with her bare sword out. Then Petka blurts out, "<<pcs_nickname>> naked?" Then blushes as he realizes what he said. "I-I meant her character!"'
+			'Feofan then descibes how your character is standing their naked with her bare sword out. Then Petka blurts out, "<<$pcs_nickname>> naked?" Then blushes as he realizes what he said. "I-I meant her character!"'
 			*nl
 			'The others start laughing, "Sure you did," they wink, "<<$pcs_nickname>>''s naked body."'
 			'"I didn''t know you were such a perv, Petka!" The tension rises a bit before easing up as the rest tease Petka about his unfortunate choice of words. You tell him your fine and the return to camp, then you finish bathing, get dressed and head back to camp. After you do the rest of them take your lead and one at a time their characters all go and bath as well. Apparently enjoying the more immersive roll playing you are doing.'
@@ -556,7 +558,7 @@ if $ARGS[0] = 'group':
 		'You ponder for a while, "I need to talk to my friends... I''ll be right back."'
 		'As you turn you back the men are hollering, "Did you see her ass?! I wouldn''t mind getting my hands on that. I bet I could make her scream all night long." The men continue to be rowdy as they order another round.'
 		'Feofan finishes by talking as one of the men. "Pay as the gold now and the information is yours or no deal."'
-		'Feofan then says. "Well <<pcs_nickname>> what are you going to do? Pay them or...?"'
+		'Feofan then says. "Well <<$pcs_nickname>> what are you going to do? Pay them or...?"'
 		*nl
 		'You really want the information and you think it''ll be right move for the group, "How much?"'
 		'What seems to be the leader licks his lips and tells you the price he wants you to pay, The price is pretty much the last of the gold your party has. "No haggling, you understand girl! That''s the price, take it or leave it!"'
@@ -628,25 +630,16 @@ if $ARGS[0] = 'inform_them':
 		'You walk back to the group and tell them about the different adventures you''ve discovered from the patrons of the tavern. They all listen attentively to what you have to say, "Well, I feel like we should go and bash that Necromancer''s head in." Artem says.'
 		'"I disagree, I''m not too fond of that, I''d rather do something else." Julia counters. The arguing then starts getting more intensive as all of the players are trying to get their point across. The yelling is getting louder and louder as Feofan gets fed up and slams the table, "Now that I have your attention! Since you can''t decide what you should do, I suggest that you have a vote on what the next adventure will be."'
 		'There''s a lot of loud moans from the players, "I don''t care how you feel about it! Vote!" Feofan commands the players.'
-			act 'Vote for the mansion adventure':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
-				'All the players take turn to vote while Feofan writes down what every player voted for, "Great, now that the vote is decided I suggest that we call it for the day and pick up it next time."'
-				'"But we want to continue playing, we already know what adventure we''re going on." Gerasim sighs.'
-				'"That''s it for today!" Feofan stands firm, "Everyone needs to calm down as this discussion got out of line!" Then everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as does Artem and Petka. Gerasim and Feofan each leave on their own.'
-				act 'Leave':gt 'gdk', 'lobby'
-			end
-			if nerd_game['acceptpay'] = 1:
-				act 'Vote for the treasure map adventure':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
-					'All the players take turn to vote while Feofan writes down what every player voted for, "Great, now that the vote is decided I suggest that we call it for the day and pick up it next time."'
-					'"But we want to continue playing, we already know what adventure we''re going on." Gerasim sighs.'
-					'"That''s it for today!" Feofan stands firm, "Everyone needs to calm down as this discussion got out of line!" Then everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as does Artem and Petka. Gerasim and Feofan each leave on their own.'
-					act 'Leave':gt 'gdk', 'lobby'
-				end
-			end
-			act 'Vote to kill the Necromancer':
+		act 'Vote for the mansion adventure':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
+			'All the players take turn to vote while Feofan writes down what every player voted for, "Great, now that the vote is decided I suggest that we call it for the day and pick up it next time."'
+			'"But we want to continue playing, we already know what adventure we''re going on." Gerasim sighs.'
+			'"That''s it for today!" Feofan stands firm, "Everyone needs to calm down as this discussion got out of line!" Then everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as does Artem and Petka. Gerasim and Feofan each leave on their own.'
+			act 'Leave':gt 'gdk', 'lobby'
+		end
+		if nerd_game['acceptpay'] = 1:
+			act 'Vote for the treasure map adventure':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
 				'All the players take turn to vote while Feofan writes down what every player voted for, "Great, now that the vote is decided I suggest that we call it for the day and pick up it next time."'
@@ -655,6 +648,14 @@ if $ARGS[0] = 'inform_them':
 				act 'Leave':gt 'gdk', 'lobby'
 			end
 		end
+		act 'Vote to kill the Necromancer':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
+			'All the players take turn to vote while Feofan writes down what every player voted for, "Great, now that the vote is decided I suggest that we call it for the day and pick up it next time."'
+			'"But we want to continue playing, we already know what adventure we''re going on." Gerasim sighs.'
+			'"That''s it for today!" Feofan stands firm, "Everyone needs to calm down as this discussion got out of line!" Then everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as does Artem and Petka. Gerasim and Feofan each leave on their own.'
+			act 'Leave':gt 'gdk', 'lobby'
+		end
 	end
 end
 

+ 1 - 1
locations/npcstatic5.qsrc

@@ -694,7 +694,7 @@ if school_year = 2000:
 else
 	npc_dob['A<<npctemp>>'] = 20010330
 end
-$npc_notes['A<<npctemp>>'] = 'Natalia is a very smart but weak willed girl. She constantly struggles to maintain friendships but her good looks and eagerness to help others prevents her from being an outcast. She rarely spends time with anyone after school but some say to have seen her in the community center watching the starlets practice dancing.'
+$npc_notes['A<<npctemp>>'] = 'Natalia is a very smart but weak willed girl. She constantly struggles to maintain friendships but her good looks and eagerness to help others, prevents her from being an outcast. She is rarely seen with anyone but one thing she always keeps with her, is a special notebook that she never lets anyone touch.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'nerd'

+ 28 - 3
locations/preCUST.qsrc

@@ -583,8 +583,11 @@ if $ARGS[0] = 'Done':
 	end
 	
 !!setting default exercise outfit and setting coats
-	if goth_clothing = 1:
-		killvar 'goth_clothing'
+	if school_clothing = 1:
+		killvar 'school_clothing'
+		alternative[55] = 1
+		alternativeH[55] = 120
+		alternativeB[55] = pcs_hips
 		sportspantynumber = 44
 		sportsbranumber = 28
 		$sportsbratype = 'kats'
@@ -606,7 +609,29 @@ if $ARGS[0] = 'Done':
 		coat[5] = 1
 		coatH[5] = 200
 		defaultcoat = 5
-		sportscoat = 5	
+		sportscoat = 5
+		if school_clothing = 2:
+			school[10] = 1
+			schoolH[10] = 120
+			schoolB[10] = pcs_hips
+		elseif school_clothing = 3:
+			school[62] = 1
+			schoolH[62] = 120
+			schoolB[62] = pcs_hips
+		elseif school_clothing = 4:
+			alternative[19] = 1
+			alternativeH[19] = 120
+			alternativeB[19] = pcs_hips
+		elseif school_clothing = 5:
+			school[25] = 1
+			schoolH[25] = 120
+			schoolB[25] = pcs_hips
+		elseif school_clothing = 6:
+			school[26] = 1
+			schoolH[26] = 120
+			schoolB[26] = pcs_hips
+		end
+		killvar 'school_clothing'
 	end
 	sportsshoenumber = 21
 	$sportspursetype = $currentpursetype

+ 9 - 1
locations/preSYS.qsrc

@@ -931,6 +931,7 @@ if $ARGS[0] = 'socialite':
 		currentpursenumber = 4
 		fashionista_purses[4] = 1
 		bag = 1
+		school_clothing = 6
 		if player_avatar ! 1: pcs_hairlng = 200
 		gs 'npc_relationship', 'socialgroup_setting', 10, 5, 0, 0, 0, 0
 		npc_rel['A140'] += 10
@@ -959,6 +960,7 @@ if $ARGS[0] = 'beautiful':
 			pcs_lip = 3
 			pcs_lashes = 2
 		end
+		school_clothing = 6
 		pcs_skin = 100
 		pcs_tan = 50
 		genbsize = 37
@@ -1047,6 +1049,7 @@ if $ARGS[0] = 'gopnikstart':
 		pcs_kick = 35
 		pcs_def = 35
 		pcs_makupskl = 20
+		school_clothing = 5
 		npc_rel['A9'] += 10
 		npc_rel['A10'] += 10
 		npc_rel['A11'] += 10
@@ -1090,6 +1093,7 @@ if $ARGS[0] = 'troublemaker':
 		currentpursenumber = 16
 		dolls_purses[16] = 1
 		bag = 1
+		school_clothing = 5
 		if player_avatar ! 1: pcs_hairlng = 55
 		npc_rel['A24'] += 10
 		npc_rel['A155'] += 15
@@ -1208,6 +1212,7 @@ if $ARGS[0] = 'alternative':
 			pcs_lip = 2
 			pcs_lashes = 1
 		end
+		school_clothing = 4
 		pcs_skin = 80
 		pcs_tan = 5
 		pcs_inhib = 40
@@ -1305,6 +1310,7 @@ if $ARGS[0] = 'uglyduckling':
 			pcs_lip = 0
 			pcs_lashes = 2
 		end
+		school_clothing = 3
 		salo = 20
 		willpowermax = 70
 		gt 'preCUST', 'SGStart'
@@ -1340,6 +1346,7 @@ if $ARGS[0] = 'goodgirl':
 			pcs_lip = 2
 			pcs_lashes = 1
 		end
+		school_clothing = 3
 		salo = 80
 		genbsize = 17
 		npc_rel['A25'] -= 5
@@ -1398,6 +1405,7 @@ if $ARGS[0] = 'slut':
 			pcs_lip = 2
 			pcs_lashes = 1
 		end
+		school_clothing = 2
 		pcs_perform = 20
 		pcs_skin = 80
 		pcs_tan = 20
@@ -1473,7 +1481,7 @@ if $ARGS[0] = 'goth':
 			pcs_eyecol = 1
 			pcs_lashes = 1
         end
-		goth_clothing = 1
+		school_clothing = 1
         kosmetica = 25
 		stanok = 20
 		tampon = 10

+ 1 - 1
locations/preSYS2.qsrc

@@ -270,7 +270,7 @@ if $ARGS[0] = 'modpur':
 		'<center><img src="images/locations/city/island/dolls.png"></center>'
 		i = 1
 		:loopdollspurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''dolls'', <<i>>"><img src="images/pc/purses/cheap/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''dolls'', <<i>>"><img src="images/pc/purses/dolls/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 22:jump 'loopdollspurses'
 	end

+ 3 - 0
locations/saveupdater.qsrc

@@ -903,6 +903,9 @@ end
 if pcs_gaming_exp > 0: gaming_exp += pcs_gaming_exp & killvar 'pcs_gaming_exp'
 if nerd_night_game ! 0: killvar 'nerd_night_game'
 if nerd_night_game_day ! 0: nerd_game['game_day'] = nerd_night_game_day & killvar 'nerd_night_game_day'
+
+!!Masturbation check wasn''t being cleared
+mastrOnce = 0
 !! ----- Other bug fixes and cleanup ----- 0.8.0
 
 --- saveupdater ---------------------------------

+ 197 - 191
locations/selfplay.qsrc

@@ -8,9 +8,14 @@ if $ARGS[0] = 'start':
 	if mastrOnce = 0:
 		stat['mast'] += 1
 		mastrOnce = 1
+		org_temp = orgasm
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
 	end
 
+	if org_temp < orgasm:
+		act 'Finish': gt 'selfplay', 'stop'
+	exit
+	end
 	gs 'stat'
 
 	if $loc = 'bedrPar' or $loc = 'gadsarai':'<center><img <<$set_imgh>> src="images/shared/sex/mast/start.jpg"></center>'
@@ -66,9 +71,9 @@ if $ARGS[0] = 'start':
 
 			'<<$AnyaMsg>>'
 
-			act 'Stop touching yourself':gt $loc, $metka
+			act 'Stop touching yourself':gt 'selfplay', 'stop'
 
-			if pcs_horny > 0:gs 'selfplay', 'fingering'
+			if org_temp = orgasm:gs 'selfplay', 'fingering'
 		end
 	end
 
@@ -99,220 +104,222 @@ if $ARGS[0] = 'start':
 
 			act 'Stop touching yourself':gt $loc, $metka
 
-			act 'Add a second finger':
-				cls
-				selfplaytime += 5
-				gs 'selfplay', 'sis_prov'
+			if org_temp = orgasm:
+				act 'Add a second finger':
+					cls
+					selfplaytime += 5
+					gs 'selfplay', 'sis_prov'
 
-				'<center><img <<$set_imgh>> src="images/shared/sex/mast/2.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/shared/sex/mast/2.jpg"></center>'
 
-				gs 'arousal', 'masturbate', 5
-				gs 'stat'
+					gs 'arousal', 'masturbate', 5
+					gs 'stat'
 
-				if pcs_ass >= 10:
-					'You relax and squeeze a second finger in, alongside the first. It slides in fairly easily.'
+					if pcs_ass >= 10:
+						'You relax and squeeze a second finger in, alongside the first. It slides in fairly easily.'
 
-					if agape > 0:
-						if agape = 2:agape = 3
-						if agape = 1:agape = 2
+						if agape > 0:
+							if agape = 2:agape = 3
+							if agape = 1:agape = 2
 
-						pcs_horny -= 50
+							pcs_horny -= 50
 
-						if pcs_ass > 1:pcs_ass -= 1
+							if pcs_ass > 1:pcs_ass -= 1
 
-						'Pushing a second finger into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
-					end
-				elseif pcs_ass >= 5 and pcs_ass < 10:
-					analplay += 1
-					'You slide a second finger into your asshole. You can feel your anus squeezing your fingers tightly.'
+							'Pushing a second finger into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+						end
+					elseif pcs_ass >= 5 and pcs_ass < 10:
+						analplay += 1
+						'You slide a second finger into your asshole. You can feel your anus squeezing your fingers tightly.'
+
+						if agape > 0:
+							if agape = 2:agape = 3
+							if agape = 1:agape = 2
+							pcs_horny -= 50
+							pcs_ass += 1
+							'Pushing a second finger into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+						end
+					else
+						pcs_ass += 1
 
-					if agape > 0:
 						if agape = 2:agape = 3
 						if agape = 1:agape = 2
+						if agape = 0:agape = 1
+
 						pcs_horny -= 50
-						pcs_ass += 1
-						'Pushing a second finger into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+						'When you slide in the second finger, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 					end
-				else
-					pcs_ass += 1
 
-					if agape = 2:agape = 3
-					if agape = 1:agape = 2
-					if agape = 0:agape = 1
+					gs 'stat'
+					'<<$AnyaMsg>>'
 
-					pcs_horny -= 50
-					'When you slide in the second finger, you feel a sharp pain in your anus. You may have tried too much, too fast.'
-				end
+					act 'Stop touching yourself':gt 'selfplay', 'stop'
 
-				gs 'stat'
-				'<<$AnyaMsg>>'
+					if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
-				act 'Stop touching yourself':gt $loc, $metka
 
-				if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
+					if org_temp = orgasm and agape < 3:
+						act 'Thrust three fingers in':
+							cls
+							selfplaytime += 5
+							gs 'selfplay', 'sis_prov'
+							'<center><img <<$set_imgh>> src="images/shared/sex/mast/3.jpg"></center>'
 
+							gs 'arousal', 'masturbate', 5
+							gs 'stat'
 
-				if pcs_horny > 0 and agape < 3:
-					act 'Thrust three fingers in':
-						cls
-						selfplaytime += 5
-						gs 'selfplay', 'sis_prov'
-						'<center><img <<$set_imgh>> src="images/shared/sex/mast/3.jpg"></center>'
+							if pcs_ass >= 15:
+								'Your asshole is fairly loose, and you manage to slide three fingers in without much effort.'
 
-						gs 'arousal', 'masturbate', 5
-						gs 'stat'
+								if agape > 0:
+									if agape = 2:agape = 3
+									if agape = 1:agape = 2
 
-						if pcs_ass >= 15:
-							'Your asshole is fairly loose, and you manage to slide three fingers in without much effort.'
+									pcs_horny -= 50
 
-							if agape > 0:
-								if agape = 2:agape = 3
-								if agape = 1:agape = 2
+									if pcs_ass > 1:pcs_ass += 1
 
-								pcs_horny -= 50
+									'Pushing three fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+								end
+							elseif pcs_ass >= 10 and pcs_ass < 15:
+								analplay += 1
+								'You slide three fingers into your asshole. You can feel your anus squeezing your fingers tightly.'
 
-								if pcs_ass > 1:pcs_ass += 1
+								if agape > 0:
+									if agape = 2:agape = 3
+									if agape = 1:agape = 2
 
-								'Pushing three fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
-							end
-						elseif pcs_ass >= 10 and pcs_ass < 15:
-							analplay += 1
-							'You slide three fingers into your asshole. You can feel your anus squeezing your fingers tightly.'
+									pcs_horny -= 50
+									pcs_ass += 1
+									'Pushing three fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+								end
+							else
+								pcs_ass += 1
 
-							if agape > 0:
 								if agape = 2:agape = 3
 								if agape = 1:agape = 2
+								if agape = 0:agape = 1
 
 								pcs_horny -= 50
-								pcs_ass += 1
-								'Pushing three fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+								'When you slide in three fingers, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 							end
-						else
-							pcs_ass += 1
 
-							if agape = 2:agape = 3
-							if agape = 1:agape = 2
-							if agape = 0:agape = 1
+							if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
-							pcs_horny -= 50
-							'When you slide in three fingers, you feel a sharp pain in your anus. You may have tried too much, too fast.'
-						end
+							gs 'stat'
+							'<<$AnyaMsg>>'
 
-						if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
+							act 'Stop touching yourself':gt 'selfplay', 'stop'
 
-						gs 'stat'
-						'<<$AnyaMsg>>'
+							if org_temp = orgasm and agape < 3:
+								act 'Push four fingers into your asshole':
+									cls
+									selfplaytime += 5
+									gs 'selfplay', 'sis_prov'
 
-						act 'Stop touching yourself':gt $loc, $metka
+									'<center><img <<$set_imgh>> src="images/shared/sex/mast/4.jpg"></center>'
 
-						if pcs_horny > 0 and agape < 3:
-							act 'Push four fingers into your asshole':
-								cls
-								selfplaytime += 5
-								gs 'selfplay', 'sis_prov'
+									gs 'arousal', 'masturbate', 5
+									gs 'stat'
 
-								'<center><img <<$set_imgh>> src="images/shared/sex/mast/4.jpg"></center>'
+									if pcs_ass >= 20:
+										'Your asshole is very loose, and you manage to push four fingers into it.'
 
-								gs 'arousal', 'masturbate', 5
-								gs 'stat'
+										if agape > 0:
+											if agape = 2:agape = 3
+											if agape = 1:agape = 2
 
-								if pcs_ass >= 20:
-									'Your asshole is very loose, and you manage to push four fingers into it.'
+											pcs_horny -= 50
 
-									if agape > 0:
-										if agape = 2:agape = 3
-										if agape = 1:agape = 2
+											if pcs_ass > 1:pcs_ass -= 1
 
-										pcs_horny -= 50
+											'Pushing four fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+										end
+									elseif pcs_ass >= 15 and pcs_ass < 20:
+										analplay += 1
+										'You manage to push four fingers into your asshole. You can feel your anus squeezing your fingers tightly.'
 
-										if pcs_ass > 1:pcs_ass -= 1
+										if agape > 0:
+											if agape = 2:agape = 3
+											if agape = 1:agape = 2
 
-										'Pushing four fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
-									end
-								elseif pcs_ass >= 15 and pcs_ass < 20:
-									analplay += 1
-									'You manage to push four fingers into your asshole. You can feel your anus squeezing your fingers tightly.'
+											pcs_horny -= 50
+											pcs_ass += 1
+											'Pushing four fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+										end
+									else
+										pcs_ass += 1
 
-									if agape > 0:
 										if agape = 2:agape = 3
 										if agape = 1:agape = 2
+										if agape = 0:agape = 1
 
 										pcs_horny -= 50
-										pcs_ass += 1
-										'Pushing four fingers into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+										'When you slide in four fingers, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 									end
-								else
-									pcs_ass += 1
 
-									if agape = 2:agape = 3
-									if agape = 1:agape = 2
-									if agape = 0:agape = 1
+									if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
-									pcs_horny -= 50
-									'When you slide in four fingers, you feel a sharp pain in your anus. You may have tried too much, too fast.'
-								end
+									gs 'stat'
+									'<<$AnyaMsg>>'
 
-								if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
+									act 'Stop touching yourself':gt 'selfplay', 'stop'
 
-								gs 'stat'
-								'<<$AnyaMsg>>'
+									if org_temp = orgasm and agape < 3:
+										act 'Put your whole hand in':
+											cls
+											SelfFisting += 1
+											selfplaytime += 5
+											gs 'selfplay', 'sis_prov'
 
-								act 'Stop touching yourself':gt $loc, $metka
+											'<center><img <<$set_imgh>> src="images/shared/sex/mast/5.jpg"></center>'
 
-								if pcs_horny > 0 and agape < 3:
-									act 'Put your whole hand in':
-										cls
-										SelfFisting += 1
-										selfplaytime += 5
-										gs 'selfplay', 'sis_prov'
+											gs 'arousal', 'masturbate', 5
+											gs 'stat'
 
-										'<center><img <<$set_imgh>> src="images/shared/sex/mast/5.jpg"></center>'
+											if pcs_ass >= 25:
+												'Slowly but surely, you manage to get your entire hand into your ass.'
 
-										gs 'arousal', 'masturbate', 5
-										gs 'stat'
+												if agape > 0:
+													if agape = 2:agape = 3
+													if agape = 1:agape = 2
 
-										if pcs_ass >= 25:
-											'Slowly but surely, you manage to get your entire hand into your ass.'
+													pcs_horny -= 50
 
-											if agape > 0:
-												if agape = 2:agape = 3
-												if agape = 1:agape = 2
+													if pcs_ass > 1:pcs_ass -= 1
 
-												pcs_horny -= 50
+													'Pushing your whole hand into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+												end
+											elseif pcs_ass >= 20 and pcs_ass < 25:
+												analplay += 1
+												'It takes a lot of effort, but over the course of several minutes you manage to work your whole hand into your ass. You feel your anus squeeze your wrist tightly.'
 
-												if pcs_ass > 1:pcs_ass -= 1
+												if agape > 0:
+													if agape = 2:agape = 3
+													if agape = 1:agape = 2
 
-												'Pushing your whole hand into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
-											end
-										elseif pcs_ass >= 20 and pcs_ass < 25:
-											analplay += 1
-											'It takes a lot of effort, but over the course of several minutes you manage to work your whole hand into your ass. You feel your anus squeeze your wrist tightly.'
+													pcs_horny -= 50
+													pcs_ass += 1
+													'Pushing your whole hand into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+												end
+											else
+												pcs_ass += 1
 
-											if agape > 0:
 												if agape = 2:agape = 3
 												if agape = 1:agape = 2
+												if agape = 0:agape = 1
 
 												pcs_horny -= 50
-												pcs_ass += 1
-												'Pushing your whole hand into your already sore asshole was a bad idea. It hurts a lot and you feel like you damaged it further.'
+												'When you push your hand into your asshole, you feel a sharp pain in your anus. You may have tried too much, too fast.'
 											end
-										else
-											pcs_ass += 1
-
-											if agape = 2:agape = 3
-											if agape = 1:agape = 2
-											if agape = 0:agape = 1
 
-											pcs_horny -= 50
-											'When you push your hand into your asshole, you feel a sharp pain in your anus. You may have tried too much, too fast.'
-										end
+											act 'Stop touching yourself':gt 'selfplay', 'stop'
 
-										act 'Stop touching yourself':gt $loc, $metka
+											if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
-										if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
-
-										gs 'stat'
-										'<<$AnyaMsg>>'
+											gs 'stat'
+											'<<$AnyaMsg>>'
+										end
 									end
 								end
 							end
@@ -403,18 +410,7 @@ if $ARGS[0] = 'start':
 
 	if pcs_horny > 0:gs 'selfplay', 'fingering'
 
-	act 'Stop masturbating':
-		analplay = 0
-		selfplaytime = 0
-		mastrOnce = 0
-		proverkasisterhere = 0
-
-		if vaginaTemp > pcs_vag * 2:pcs_vag += 1 & vaginaTemp = 0
-
-		gt $loc, $metka
-		gs 'arousal', 'end'
-		gs 'stat'
-	end
+	act 'Stop masturbating': gt 'selfplay', 'stop'
 
 	if $loc = 'vanrPar' and selfplaytime >= 60:gs 'selfplay', 'van_vtor'
 
@@ -527,14 +523,7 @@ if $ARGS[0] = 'van_vtor':
 		'You hear shouting from outside the bathroom: "<<$pcs_nickname>>! Are you drowning in there or something? What''s taking so long? Get out of there!"'
 
 		act 'Get out of the bath and dry yourself off':
-			analplay = 0
-			selfplaytime = 0
-			mastrOnce = 0
-			proverkasisterhere = 0
-
-			if vaginaTemp > pcs_vag * 2:pcs_vag += 1 & vaginaTemp = 0
-
-			gt $loc, $metka
+			gt 'selfplay', 'stop'
 		end
 
 		exit
@@ -574,14 +563,14 @@ if $ARGS[0] = 'fingering':
 			gs 'stat'
 			'<<$AnyaMsg>>'
 
-			gs 'selfplay', 'fingering2'
+			if org_temp = orgasm: gs 'selfplay', 'fingering2'
 
 		elseif mesec > 0:
 			pcs_mood -= 5
 			'Your vagina has some dried up blood from your period on it. You attempt to shove your finger in, but then are kind of grossed out by the idea and reconsider.'
 		end
 
-		act 'Stop touching yourself':gt $loc, $metka
+		act 'Stop touching yourself':gt 'selfplay', 'stop'
 	end
 end
 
@@ -611,9 +600,9 @@ if $ARGS[0] = 'fingering2':
 
 		gs 'selfplay', 'fingering2', 1
 
-		if pcs_horny > 0 and pcs_vag > 0:gs 'selfplay', 'fingering3'
+		if org_temp = orgasm and pcs_vag > 0: gs 'selfplay', 'fingering3'
 
-		act 'Stop touching yourself':gt $loc, $metka
+		act 'Stop touching yourself':gt 'selfplay', 'stop'
 	end
 end
 
@@ -652,42 +641,59 @@ if $ARGS[0] = 'fingering3':
 
 		'<<$AnyaMsg>>'
 
-		act 'Fuck yourself with your fingers':
-			cls
-			selfplaytime += 10
-			gs 'selfplay', 'sis_prov'
+		if org_temp = orgasm:
+			act 'Fuck yourself with your fingers':
+				cls
+				selfplaytime += 10
+				gs 'selfplay', 'sis_prov'
 
-			if pcs_vag < 10:
-				if vgape = 2:vgape = 3
-				if vgape = 1:vgape = 2
-				if vgape = 0:vgape = 1
+				if pcs_vag < 10:
+					if vgape = 2:vgape = 3
+					if vgape = 1:vgape = 2
+					if vgape = 0:vgape = 1
 
-				pcs_horny -= 10
-				pcs_mood -= 10
-			end
+					pcs_horny -= 10
+					pcs_mood -= 10
+				end
 
-			'<center><img <<$set_imgh>> src="images/shared/sex/mast/hand.jpg"></center>'
-			'You start to slowly move your hand, thrusting your fingers into your pussy again and again.'
+				'<center><img <<$set_imgh>> src="images/shared/sex/mast/hand.jpg"></center>'
+				'You start to slowly move your hand, thrusting your fingers into your pussy again and again.'
 
-			gs 'arousal', 'masturbate', 10
-			gs 'stat'
+				gs 'arousal', 'masturbate', 10
+				gs 'stat'
 
-			if pcs_vag <= 15:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'
-			if pcs_vag > 10:pcs_horny += rand(10, 20) & 'Your pussy walls are stretched nicely from the finger fucking, and you feel a pleasant warmth spread in your lower body.'
+				if pcs_vag <= 15:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'
+				if pcs_vag > 10:pcs_horny += rand(10, 20) & 'Your pussy walls are stretched nicely from the finger fucking, and you feel a pleasant warmth spread in your lower body.'
 
-			gs 'stat'
+				gs 'stat'
 
-			if pcs_vag < 20:vaginaTemp += 1
+				if pcs_vag < 20:vaginaTemp += 1
 
-			'<<$AnyaMsg>>'
+				'<<$AnyaMsg>>'
 
-			gs 'selfplay', 'fingering3'
+				gs 'selfplay', 'fingering3'
 
-			act 'Stop touching yourself':gt $loc, $metka
+				act 'Stop touching yourself':gt 'selfplay', 'stop'
+			end
+		else
+			act 'Stop touching yourself':gt 'selfplay', 'stop'
 		end
 	end
 
-	act 'Stop touching yourself':gt $loc, $metka
+	act 'Stop touching yourself':gt 'selfplay', 'stop'
+end
+
+if $ARGS[0] = 'stop':
+	analplay = 0
+	selfplaytime = 0
+	mastrOnce = 0
+	proverkasisterhere = 0
+
+	if vaginaTemp > pcs_vag * 2:pcs_vag += 1 & vaginaTemp = 0
+
+	gs 'arousal', 'end'
+	gs 'stat'
+	gt $loc, $metka
 end
 
 --- selfplay ---------------------------------

+ 4 - 4
locations/stat_display.qsrc

@@ -624,11 +624,11 @@ elseif $clothingworntype = 'cheap' and clothingwornnumber = '414':
 	$stat_clothes_style = 'clothes'
 else
 	if PCloStyle = 4 and PCloBimbo = 1 and cheatBimbo = 0:
-		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
-		$stat_clothes_msg = 'You''re wearing an outfit a bimbo or a prostitute would wear.'
+		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo/prostitute</font>'
+		$stat_clothes_msg = 'You''re wearing an outfit a bimbo, prostitute would wear.'
 		$stat_clothes_tooltip = 'Prostitute/Bimbo outfit.'
 		$stat_clothes_style = 'clothes_pb'
-	elseif PCloStyle = 4 and (PCloBimbo = 0 or cheatBimbo = 1):
+	elseif PCloStyle = 4:
 		$stat_clothes_msg = 'You''re wearing an outfit a prostitute would wear.'
 		$stat_clothes_tooltip = 'Prostitute outfit.'
 		$stat_clothes_style = 'clothes_p'
@@ -637,7 +637,7 @@ else
 		$stat_clothes_msg = 'You''re wearing exhibitionist clothes a bimbo would wear.'
 		$stat_clothes_tooltip = 'Exhibitionist/Bimbo outfit.'
 		$stat_clothes_style = 'clothes_eb'
-	elseif (PCloInhibit >= 40 or PCloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
+	elseif (PCloInhibit >= 40 or PCloThinness = 6):
 		$stat_clothes_msg = 'You are wearing exhibitionist clothes.'
 		$stat_clothes_tooltip = 'Exhibitionist outfit.'
 		$stat_clothes_style = 'clothes_e'

+ 2 - 2
locations/taxi.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = '':
 		$menu_arg = ''
 		menu_off = 1
 		minut += 5
-		'<center><img <<$set_imgh>> src="images/locations/shared/taxi/taxi.base0,'+rand(1,4)+'.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/taxi/base'+rand(1,5)+'.jpg"></center>'
 		'Seeing a taxi coming down the road you raise your arm and wave him down, as he stops you get in.'
 		'Fare 250 RUB.'
 
@@ -267,7 +267,7 @@ if $ARGS[0] = 'trip':
 		taxi_pay = 0
 		gs 'npcgeneratec', 0, 'Taxi Driver', rand(30,46)
 		gs 'boyStat', $npclastgenerated
-		'<center><img <<$set_imgh>> src="images/locations/shared/taxi/taxi.base0,'+rand(1,4)+'.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/taxi/base'+rand(1,5)+'.jpg"></center>'
 		'Having told the driver where you need to go, he chats in a friendly way as he drives. After awhile you finally break it to him that you don''t have any money. "I''m sorry but I don''t have any money."'
 		'He hits the brakes hard and pulls over, bringing the taxi to a sudden stop, he turns around and yells at you. "You fucking little cunt, I should take you to the police right now, it would serve your ass right!"'
 		'A chill runs through you at the thought of him taking you to the police. "Please, please don''t take me to the police. I''m sorry I was just desperate."'

+ 6 - 2
locations/wardrobe.qsrc

@@ -283,8 +283,12 @@ if $ARGS[0] = 'default_entry_set':
 	defpantynumber[i] = pantywornnumber
 	$defshoetype[i] = $shoeworntype
 	defshoenumber[i] = shoewornnumber
-	$defpursetype[i] = $currentpursetype
-	defpursenumber[i] = currentpursenumber
+	if bag = 1:
+		$defpursetype[i] = $currentpursetype
+		defpursenumber[i] = currentpursenumber
+	else
+		$defpursetype[i] = 'none'
+	end
 	defcoat[i] = defaultcoat
 
 	$def_clothing_temp = '<<$def_clothing_name[i]>>'