[fixed] artem not shutting up about his blackmail, switched random girls/boys to pre-defined sets of couples

[added] willpower by nutluck

locations/gschool_chats2.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'artem':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 
-	if artQW = 5:
+	if artQW = 5 and arthakQW ! 11:
 		'You sit down and Artem pulls you close enough so only you can hear him as he speaks. "I can''t wait for our next lesson after school…" He says, his hand running down your thigh and stopping at the hem of your skirt. "I bet you can''t wait either." Slowly, he lowers his hand between your legs and gives the soft, sensitive area a light squeeze before bringing his hand back up above the desk with a confident, lecherous smile.'
 	elseif artQW = 3 or artQW = 20:
 		npc_rel['A2'] += 1
@@ -64,7 +64,7 @@ if $ARGS[0] = 'petka':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big6.jpg"></center>'
-	if artQW = 5:
+	if artQW = 5 and arthakQW ! 11:
 		npc_rel['A6'] += 1
 		'A devious smile spreads across his face as he closes his book and sets it aside. You try your best to keep the conversation lighthearted, but Petka is determined to let you know how much he''s enjoying his after school "lessons" and how he can''t wait for the next one.'
 	elseif npc_rel['A6'] >= 50 and pav_slut < 100

locations/gschool_events.qsrc

@@ -1488,28 +1488,42 @@ if $ARGS[0] = 'afterschool_events':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
 		'You''re running a bit late leaving school, the hallways are deserted. Or so you thought at first, as you hear some voices down one of the corridors, you slow down and then peak around the corner. You see several of the jock boys and Lariska, she seems unsure about something and you hear the boys encouraging her to give them a peak and show off her great body. She glances up and down the hallway, obviously afraid of being seen, but also just as obviously about to give into peer pressure.'
 		act 'Ignore whats happening and leave': gt 'gschool_grounds', 'main'
-		act 'Intervene':
-			*clr & cla
-			npc_rel['A13'] += 5
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
-			'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
-			'For a moment she seems as confused, but then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
-			'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
-			act 'Leave': gt 'gschool_grounds', 'main'
+		gs 'willpower', 'misc', 'self', 'medium'
+		if will_cost <= pcs_willpwr:
+			act 'Intervene (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'self'
+				npc_rel['A13'] += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
+				'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
+				'For a moment she seems as confused, but then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
+				'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
+				act 'Leave': gt 'gschool_grounds', 'main'
+			end
+		else
+			act 'Intervene (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip2.jpg"></center>'
 			'After a few moments they encourage her to take off her jacket, it''s just her jacket nothing to it. She seems unsure but after one more quick glance around she pulls off her jacket, then smiles as the boys whistle and compliment her. She seems to be a little more ok with it, since the boys are complimenting her so much. Then they start encouraging her to show them her underwear.'
 			act 'Ignore whats happening and leave': gt 'gschool_grounds', 'main'
-			act 'Intervene':
-				*clr & cla
-				npc_rel['A13'] += 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip2.jpg"></center>'
-				'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
-				'For a moment she seems as confused, but then with a final look at the boys she nods quickly, putting her jacket back on. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
-				'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
-				act 'Leave': gt 'gschool_grounds', 'main'
+			gs 'willpower', 'misc', 'self', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Intervene (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					npc_rel['A13'] += 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
+					'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
+					'For a moment she seems as confused, but then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
+					'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
+					act 'Leave': gt 'gschool_grounds', 'main'
+				end
+			else
+				act 'Intervene (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Keep Watching':
 				*clr & cla
@@ -1520,16 +1534,21 @@ if $ARGS[0] = 'afterschool_events':
 				gs 'arousal', 'voyeur', 5, 'unknown'
 				gs 'stat'
 				act 'Ignore whats happening and leave': gs 'arousal', 'end' & gt 'gschool_grounds', 'main'
-				act 'Intervene':
-					*clr & cla
-					gs 'arousal', 'end'
-					gs 'stat'
-					npc_rel['A13'] += 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip3.jpg"></center>'
-					'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
-					'For a moment she seems as confused and ashamed, she quickly covers herself up and blushes deeply, but then with a final look at the boys she nods quickly, pulling up her skirt and putting her shirt back on. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
-					'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
-					act 'Leave': gt 'gschool_grounds', 'main'
+				gs 'willpower', 'misc', 'self', 'medium'
+				if will_cost <= pcs_willpwr:
+					act 'Intervene (<<will_cost>> Willpower)':
+						*clr & cla
+						gs 'willpower', 'pay', 'self'
+						npc_rel['A13'] += 5
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
+						'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
+						'For a moment she seems as confused, but then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
+						'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
+						act 'Leave': gt 'gschool_grounds', 'main'
+					end
+				else
+					act 'Intervene (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				act 'Keep Watching':
 					*clr & cla
@@ -1540,22 +1559,26 @@ if $ARGS[0] = 'afterschool_events':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 					act 'Ignore whats happening and leave': gs 'arousal', 'end' & gt 'gschool_grounds', 'main'
-					act 'Intervene':
-						*clr & cla
-						npc_rel['A13'] += 5
-						gs 'arousal', 'end'
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip4.jpg"></center>'
-						'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
-						'For a moment she seems as confused and ashamed, she quickly covers herself up and blushes deeply, as she scrambles to quickly get dressed. The boys groan and say things like "Way to go <<$pcs_nickname>>." or "<<$pcs_nickname>> you''re are such a spoil sport." Then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
-						'The boys grumble a bit more as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
-						act 'Leave': gt 'gschool_grounds', 'main'
+					gs 'willpower', 'misc', 'self', 'medium'
+					if will_cost <= pcs_willpwr:
+						act 'Intervene (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'self'
+							npc_rel['A13'] += 5
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip1.jpg"></center>'
+							'You decided to give her a out, you boldly walk out and head right for Lariska. "There you are, you ready to go?" You ask her.'
+							'For a moment she seems as confused, but then with a final look at the boys she nods quickly. "Yes." Then she smiles to the boys as the two you head out. She leans over to you and says quietly "Thanks."'
+							'The boys grumble a bit as the two of you walk off but they go their own way as well, once outside Lariska thanks you again and then hurries off.'
+							act 'Leave': gt 'gschool_grounds', 'main'
+						end
+					else
+						act 'Intervene (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-
 					act 'Keep Watching':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip5.jpg"></center>'
-						'Finally she gives in and pulls her panties down and steps out of them, now completely naked in front of the boys. Who seem to be loving the show and she seems torn on enjoying the approval of the boys and the embarrassment of being naked. After giving she a look at her naked body for a couple of more minutes she seems to change her mind and start to quickly get dressed. The boys try to get her to stay naked by she gets dressed. The boys take it in stride and comment about how great she looks and how cool she is, once dressed they all leave together, leaving you to go on your way as well.'
+						'Finally she gives in and pulls her panties down and steps out of them, now completely naked in front of the boys. Who seem to be loving the show and she seems torn on enjoying the approval of the boys and the embarrassment of being naked. She lets the boys look at her naked body for a couple of more minutes, before she seems to change her mind and start to quickly get dressed. The boys try to get her to stay naked by she gets dressed. The boys take it in stride and comment about how great she looks and how cool she is, once dressed they all leave together, leaving you to go on your way as well.'
 						gs 'arousal', 'voyeur', 5
 						gs 'arousal', 'end'
 						gs 'stat'

locations/gschool_girls_bathroom.qsrc

@@ -1,5 +1,6 @@
 # gschool_girls_bathroom
 
+
 !!This bathroom file is for the bathroom scenes when Sveta is skiping class
 if $ARGS[0] = 'start':
 	$location_type = 'bathroom'
@@ -151,16 +152,21 @@ if $ARGS[0] = 'girl2':
 				*clr & cla
 				'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/school/soniatrade.jpg"></center>'
-				'It seems to last forever, your insides twitching and squeezing the life out of Sonia''s fingers, your knuckles as white as the porcelain you''re holding onto. It takes you a while to recover from the orgasm, to notice the goofy, smug smile on Sonia''s face, and you can''t help but chuckle at her expression and your own sudden relaxation. With your legs feeling like they''re made out of jelly, you slide yourself off the toilet and trade places with Sonia, down on your knees in front of her. You consider teasing her like she did you, admiring her perfectly smooth sex and her beautiful body and face for a few seconds, but you are both past teasing at this point and you put your head between her legs and start licking her pussy with enthusiasm. She moans and grips your hair, showing you how much she appreciates your effort, but you don''t feel like you are as skilled as she is, and it both peeves you and spurs you on. It takes you longer to get her to start moaning loudly than it did her. In an attempt to copy her technique, you slip one of your slender fingers into her pussy, penetrating her while you work her clit with your tongue.'
-				*nl
-				'Realizing what you are trying to do, she reaches down and spreads the lips of her pussy wide while you lick her, as if to guide you. Following her cue, you alternate between fingering and tongue-fucking her, and if her grabbing you by the hair and pulling your face against her crotch is any indication, you are doing something right. Sonia grinds her pussy against you as she starts twitching and moaning your name, coating your lips and chin in her pussy juices as she cums.'
-				'You relish the smell and taste of her as she comes down from her high, eyes locked with each other and smiling like idiots as you recover. When her convulsions have stopped, she pulls you up and passionately kisses you, then gently licks her own juices off your face. The final kisses she gives you are different: Lingering, tender, almost bashful. With a smile, she breaks away from you and announces that you better get dressed. As you do, she asks: "<<$pcs_nickname>>, do you think we are going to write a test in chemistry this week?"'
+				'It seems to last forever, your insides twitching and squeezing the life out of Sonia''s fingers, your knuckles as white as the porcelain you''re holding onto. It takes you a while to recover from the orgasm, to notice the goofy, smug smile on Sonia''s face, and you can''t help but chuckle at her expression and your own sudden relaxation. With your legs feeling like they''re made out of jelly, you slide yourself off the toilet and trade places with Sonia, down on your knees in front of her. You consider teasing her like she did you, admiring her perfectly smooth sex and her beautiful body and face for a few seconds, but you are both past teasing at this point and you put your head between her legs and start licking her pussy with enthusiasm. She moans and grips your hair, showing you how much she appreciates your effort, but you don''t feel like you are as skilled as she is, and it both peeves you and spurs you on.'
 				*nl
-				'The question leaves you dumbfounded - it takes you a moment or two to realize that everything you just experienced with her took place in a school toilet and that you now have to return to ''reality''. "Uh, I think he said there would be a quiz, yeah. Maybe we should have studied instead of having fun." You can''t help but giggle, and Sonia joins in. You spend the rest of the hour till the bell rings talking about mundane stuff and (sigh) going over some chemistry notes. Still, if this is how good it can be, maybe you should skip class more often.'
-				gs 'arousal', 'cuni_give', 10, 'lesbian'
-				gs 'arousal', 'end'
-				gs 'stat'
-				act 'Go to Class':gt 'gschool_lessons', 'short_break'
+				'It takes you longer to get her to start moaning loudly than it did her. In an attempt to copy her technique, you slip one of your slender fingers into her pussy, penetrating her while you work her clit with your tongue. Realizing what you are trying to do, she reaches down and spreads the lips of her pussy wide while you lick her, as if to guide you. Following her cue, you alternate between fingering and tongue-fucking her, and if her grabbing you by the hair and pulling your face against her crotch is any indication, you are doing something right. Sonia grinds her pussy against you as she starts twitching and moaning your name, coating your lips and chin in her pussy juices as she cums.'
+				act 'Continue':
+					*clr & cla
+					'<center><b><font color="maroon">Girls bathroom</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/school/soniatrade.jpg"></center>'
+					'You relish the smell and taste of her as she comes down from her high, eyes locked with each other and smiling like idiots as you recover. When her convulsions have stopped, she pulls you up and passionately kisses you, then gently licks her own juices off your face. The final kisses she gives you are different: Lingering, tender, almost bashful. With a smile, she breaks away from you and announces that you better get dressed. As you do, she asks: "<<$pcs_nickname>>, do you think we are going to write a test in chemistry this week?"'
+					*nl
+					'The question leaves you dumbfounded - it takes you a moment or two to realize that everything you just experienced with her took place in a school toilet and that you now have to return to ''reality''. "Uh, I think he said there would be a quiz, yeah. Maybe we should have studied instead of having fun." You can''t help but giggle, and Sonia joins in. You spend the rest of the hour till the bell rings talking about mundane stuff and (sigh) going over some chemistry notes. Still, if this is how good it can be, maybe you should skip class more often.'
+					gs 'arousal', 'cuni_give', 10, 'lesbian'
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go to Class':gt 'gschool_lessons', 'short_break'
+				end
 			end
 		end
 	end
@@ -404,48 +410,9 @@ if $ARGS[0] = 'toy bunny':
 	end
 end
 
-!!This replaces random girls, with these possible couples for either company1 or company2
-!!replacement for random boy/girl
-!!Viktoriya and Vanya
-!!Ivan and Lariska
-!!Ivan and Lina
-!!Ivan and Bella
-!!Lazar and Irina
-!!Lazar and Lariska
-!!Lazar and Lina
-!!Marcus and Irina (Marcus only if Sveta is not dating him)
-!!Marcus and Bella (Marcus only if Sveta is not dating him)
-!!Paulina and Vitek(Vitek only if Sveta is not dating him)
-!!Paulina and Dan
-!!Alyona and Radomir
-!!Alyona and Lavrenti
-!!Sonia and Lazar
-!!Sonia and Dimka
-!!Sonia and Vitek (Vitek only if Sveta is not dating him)
-!!Sonia and Dan
-!!Sonia and Vasily
-!!Sonia and Svyatoslav
-!!Sonia and Erast
-!!Sonia and Feofan
-!!Sonia and Radomir
-!!Sonia and Roman
-!!Sonia and Lavrenti
-!!Sonia and Valentin
-!!Sonia and Arkadi
-!!Andrey and Stasy 
-!!Andrey and Irina
-!!Andrey and Lizaveta
-!!Andrey and Sonia
-!!Lena and Lavrenti
 if $ARGS[0] = 'company':
 	menu_off = 1
-	if soniaPS > 0 and rand(0,1) = 0:
-		$rand_girl = 'Sonia'
-	elseif rand(0,1) = 0:
-		$rand_girl = 'a girl you don''t know'
-	else
-		gs 'gschool_events', 'rand_girl_arg', 1, 1, 1, 1, 1, 0
-	end
+	gs 'gschool_randperson', 'couple_generator'
 	gtoilet_rand = rand(1,100)
 	if gtoilet_rand <= 30:
 		killvar 'gtoilet_rand'