[added] first part of the new school files

[fixed] missing arousal calls, reworked sweet talk, wrong arousal calls, missing arousal ends and a lot of other stuff

locations/gschool_boys_bathroom.qsrc

@@ -10,9 +10,9 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
 	'After the bell rings and you see the boys leave their bathroom, you slip inside and hurry into one of the stalls. Your heart is pounding with a mixture of fear and excitement - you know you shouldn''t be in here but that''s part of the thrill. You can''t lock the stall without making it obvious that someone''s here, so you simply sit on the toilet with your feet pulled up. Hopefully that''s enough to keep you hidden should someone else enter the bathroom.'
 	act 'Play on your phone':
-		school_bunk = 0
 		*clr & cla
 		menu_off = 1
+		school_bunk = 0
 		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/usephone1.jpg"></center>'
 		'You pull out your phone, looking for something to do. You can''t really text anyone right now and the games you can play aren''t very good, but it sure as hell beats sitting through another boring class.'
@@ -32,10 +32,10 @@ if $ARGS[0] = 'start':
 	end
 	if siga > 0:
 		act 'Have a smoke':
+			*clr & cla
 			menu_off = 1
 			school_bunk = 1
-			gs 'shortgs','smoker'
-			*clr & cla
+			gs 'drugs','smoke'
 			gs 'stat'
 			'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke1.jpg"></center>'
@@ -61,25 +61,19 @@ if $ARGS[0] = 'bathroom2':
 	$menu_loc = 'gschool_boys_bathroom'
 	$menu_arg = 'bathroom2'
 	menu_off = 0
+	*clr & cla
+	pcs_willpwr += rand(5,10)
+	pcs_mood += rand(10,30)
+	gs 'stat'
+	'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 	if school_bunk = 0:
-		pcs_willpwr += rand(5, 10)
-		pcs_mood += rand(10, 30)
-		*clr & cla
-		gs 'stat'
-		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/usephone2.jpg"></center>'
-		'For the rest of the period, you play on your phone and find it very relaxing. By the time the next class bell rings, you are in a far better mood.'
-		act 'Go to class':gt 'gschool_lessons', 'short_break'
+		'For the rest of the period, you play on your phone and find it very relaxing. By the time the next class bell rings, you are in a far better mood.'		
 	else
-		pcs_willpwr += rand(5, 10)
-		pcs_mood += rand(10, 30)
-		*clr & cla
-		gs 'stat'
-		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke2.jpg"></center>'
 		'For the rest of the period, you play on your phone while having another cigarette or two. You find it very relaxing and by the time the next class bell rings, you are in a far better mood.'
-		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
+	act 'Go to class':gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'boys':
@@ -153,7 +147,7 @@ if $ARGS[0] = 'boy2':
 	'"Who''s in here?" You hear a gruff voice ask. You don''t answer and hope he, whoever it is, will just let it go. Unfortunately, he doesn''t, "Hey, don''t fuck with me! I know you''re here." Next thing you hear, a stall door at the far end of the bathroom slams, audibly opened with a hard push. The sound repeats, again and again, and is slowly working its way towards you. Having little choice, you sit and wait until it''s your stall''s turn. The boy turns out to be Radomir, looking angry at first but his expression changes into a half-grin when he sees who it is. "Hey <<$pcs_nickname>>, what''s up?"'
 	*nl
 	'You look up at him and smile, "Hey Radomir, just cutting class. Needed a break, you know?"'
-	if hotcat => 5:
+	if hotcat >= 5:
 		'He nods his head a bit. "Sure, sure, I gotcha. Glad to find you here, I was afraid I might get bored," he says as he moves into the stall with you, grabs your wrist tightly and pulls you up. You haven''t even processed what he''s doing when you feel his lips on yours as he drags you out of the stall with him.'
 		gs 'willpower', 'sex'
 		if will_cost >= pcs_willpwr:
@@ -170,7 +164,6 @@ if $ARGS[0] = 'boy2':
 				if gruptipe = 4:'As he finds and rubs your clit '+iif($pantyworntype ! 'nude', 'through your panties','')+', he whispers: "If you''re an obedient little bitch, I will put in a good word with the rest. Who knows, maybe I could get you fully accepted."'
 				gs 'arousal', 'foreplay', 5
 				gs 'stat'
-				act 'Submit to him':gt 'gschool_boys_bathroom', 'boy2_sub'
 				gs 'willpower', 'sex'
 				if will_cost >= pcs_willpwr:
 					act 'Slap him (<<will_cost>> willpower)':
@@ -187,6 +180,8 @@ if $ARGS[0] = 'boy2':
 						'Glad he at least backed off, you gather your stuff and leave in a hurry before he can change his mind. You spend the rest of the class period hiding in the stairwells, trying to keep from getting spotted. Maybe skipping class isn''t such a good idea after all, but then again, this probably could have gone worse. Much worse.'
 						act 'Go to class':gt 'gschool_lessons', 'short_break'
 					end
+				else
+					'<br>You don''t have enough willpower to slap him.'
 				end
 				act 'I said no':
 					*clr & cla
@@ -211,7 +206,10 @@ if $ARGS[0] = 'boy2':
 						end
 					end
 				end
+				act 'Submit to him':gt 'gschool_boys_bathroom', 'boy2_sub'
 			end
+		else
+			'<br>You don''t have enough willpower to stop him.'
 		end
 		act 'Have fun':
 			*clr & cla
@@ -242,7 +240,7 @@ if $ARGS[0] = 'boy2':
 		elseif siga > 0:
 			act 'Yes':
 				*clr & cla
-				gs 'shortgs','smoker'
+				gs 'drugs','smoke'
 				npc_rel['A154'] += 1
 				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/39.jpg"></center>'
@@ -324,36 +322,45 @@ if $ARGS[0] = 'boy3':
 	'He looks up in surprise, perhaps because he is not alone or because it was a girl''s voice in the boy''s room. Either way, he replies. "Hi <<$pcs_nickname>>, you cutting class?"'
 	'"Yeah, I couldn''t take another boring class," you tell him with a smile. "I needed a little fun. You?"'
 	*nl
-	if hotcat => 6:
+	if hotcat >= 6:
 		'Lazar sets the folder aside. "I was studying the playbook for this week''s game, but I''d be up for some fun and stress relief," he says with a lustful grin. You''re wondering what he means by ''stress relief,'' when he suddenly moves towards you. He quickly starts kissing you and grabbing at your breasts and ass.'
-		act 'Stop him':
-			*clr & cla
-			'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
-			'You use your hands to pry his off of your body and step back from the kiss, "Sorry, Lazar, but that''s not what I meant."'
-			'Lazar frowns a bit. "So, what did you have in mind?" he shrugs.'
-			*nl
-			'"We could, you know, just talk. I mean, how have you been?" you ask as you lean against the stall.'
-			'"Talk?" He raises his eyebrows. "Really? I mean, if you weren''t looking for some action, why are you in the men''s room?" he inquires.'
-			'You pause for a moment, realizing why he thought you wanted to have sex. "I... Look, girls can really be catty at times, like super-annoying and bitchy, and I just wasn''t in the mood for that. So, I thought, hiding in here would be more relaxing, you know?"'
-			*nl
-			'He grins and steps close again, so close that you can feel his breath on your cheeks. "I know a great way to relax, and it sure beats talking..." There''s something appealing about him, a charm that is hard to resist, and you notice that he''s leaning in for another kiss...'
-			act 'Return the kiss':gt 'gschool_boys_bathroom', 'boy3_kiss'
-			gs 'willpower', 'sex'
-			if will_cost >= pcs_willpwr:
-				act '"I said, ''no''" (<<will_cost>> willpower)':
-					*clr & cla
-					gs 'willpower', 'resist'
-					'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
-					'You put your hand up and stop him again, "Look, seriously, I just wanted to talk. But if you''d rather not..." You trail off and make telling motions towards your things in the stall and the bathroom door.'
-					*nl
-					'He sighs loudly; clearly he wanted more but he''s not pushing the issue. "Okay, alright, I get it. Sure, we can talk for a bit." He shrugs a half-assed apology, "I just thought you wanted more is all."'
-					*nl
-					'The two of you spend the next few minutes talking about pretty much anything: school, music, movies, Lazar''s previous games and the upcoming ones. Before you know it, the bell rings. You gather your things and bid Lazar farewell before heading towards your next class.'
-					act 'Go to class':gt 'gschool_lessons', 'short_break'
+		gs 'willpower', 'sex'
+		if will_cost >= pcs_willpwr: 
+			act 'Stop him (<<will_cost>> willpower)':
+				*clr & cla
+				gs 'willpower', 'resist'
+				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+				'You use your hands to pry his off of your body and step back from the kiss, "Sorry, Lazar, but that''s not what I meant."'
+				'Lazar frowns a bit. "So, what did you have in mind?" he shrugs.'
+				*nl
+				'"We could, you know, just talk. I mean, how have you been?" you ask as you lean against the stall.'
+				'"Talk?" He raises his eyebrows. "Really? I mean, if you weren''t looking for some action, why are you in the men''s room?" he inquires.'
+				'You pause for a moment, realizing why he thought you wanted to have sex. "I... Look, girls can really be catty at times, like super-annoying and bitchy, and I just wasn''t in the mood for that. So, I thought, hiding in here would be more relaxing, you know?"'
+				*nl
+				'He grins and steps close again, so close that you can feel his breath on your cheeks. "I know a great way to relax, and it sure beats talking..." There''s something appealing about him, a charm that is hard to resist, and you notice that he''s leaning in for another kiss...'
+				gs 'willpower', 'sex'
+				will_cost = will_cost / 2
+				if will_cost >= pcs_willpwr:
+					act '"I said, ''no''" (<<will_cost>> willpower)':
+						*clr & cla
+						gs 'willpower', 'resist'
+						'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
+						'You put your hand up and stop him again, "Look, seriously, I just wanted to talk. But if you''d rather not..." You trail off and make telling motions towards your things in the stall and the bathroom door.'
+						*nl
+						'He sighs loudly; clearly he wanted more but he''s not pushing the issue. "Okay, alright, I get it. Sure, we can talk for a bit." He shrugs a half-assed apology, "I just thought you wanted more is all."'
+						*nl
+						'The two of you spend the next few minutes talking about pretty much anything: school, music, movies, Lazar''s previous games and the upcoming ones. Before you know it, the bell rings. You gather your things and bid Lazar farewell before heading towards your next class.'
+						act 'Go to class':gt 'gschool_lessons', 'short_break'
+					end
+				else
+					'<br>You don''t have a enough willpower to resist him.'
 				end
+				act 'Return the kiss':gt 'gschool_boys_bathroom', 'boy3_kiss'
 			end
+		else
+			'<br>You don''t have a enough willpower to stop him.'
 		end
 		act 'Return the kiss':gt 'gschool_boys_bathroom', 'boy3_kiss'
 	else
@@ -618,7 +625,7 @@ if $ARGS[0] = 'boy5':
 	'Not sure what else to do, you stay quiet, but you hear them opening the stall doors, one after the other, working their way down to the one you are in. Finally, your own stall door opens and you see Ivan and Fedor, smirking and looking at you, each leaning on the stall on either side of the door. Ivan is the one to greet you. "Hey <<$pcs_nickname>>. Whatcha doing?"'
 	*nl
 	'You bite you lower lip a moment before answering. "Cutting class. I needed a break. What about you boys?"'
-	if hotcat => 5:
+	if hotcat >= 5:
 		'They glance at each other and then grin at you. Ivan answers: "We needed a break, too, and wanted to have a little fun. What about you? You feel up for a little <i>fun</i>?" The way he says it leaves no doubt in your mind what kind of fun they have in mind.'
 		act 'Suggest chatting':
 			*clr & cla
@@ -632,7 +639,7 @@ if $ARGS[0] = 'boy5':
 			'You give Ivan a grateful smile in return and engage the two boys in conversation. Soon, the three of you are talking about their sparring, fights, and training, but also about recently released movies, your favorite music and anything else that strikes your fancy. Before you know it, the class bell rings. All of you stop and look up reflexively at the sound. You bid each other later, your eyes locking with Ivan''s for a moment and you two sharing another smile, and then head to your next class.'
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
-		act '"Fun sounds like fun"':
+		act '"<i>Fun</i> sounds like fun"':
 			*clr & cla
 			npc_rel['A3'] += 3
 			npc_rel['A5'] += 3
@@ -722,11 +729,10 @@ if $ARGS[0] = 'boy6':
 	menu_off = 1
 	'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/stall.jpg"></center>'
-	if gruptipe ! 4 and hotcat => 5:
+	if gruptipe ! 4 and hotcat >= 5:
 		'After a couple of minutes, you hear several boy''s voices and recognize several of them as gopniks from your class. Several stall doors slam open, their echo loud as thunder and just as startling, and one of them says, "Man, you sure?" There is a pause in the noise as another answers, "I''m telling you, I saw her come in here just after the bell rang." A few more doors of stalls slam open until, suddenly, your door is the one to slam. You see Dan standing there, grinning at you, "Found her. You was right." He steps in and grabs you around the waist, dragging you out of the stall.'
 		*nl
 		'The other boys quickly move over. Within moments, you find yourself in the middle of five of your gopnik classmates, all leering at you lustfully. You know exactly what they are thinking and what they want. You doubt you can reason with them... but perhaps you could scream? Maybe someone would hear you; or maybe it would only piss them off. You could also try and make a run for it.'
-		act 'Submit': gt 'gschool_boys_bathroom', 'boy6_sub'
 		gs 'willpower', 'sex'
 		if will_cost >= pcs_willpwr:
 			act 'Run out (<<will_cost>> willpower)':
@@ -743,10 +749,7 @@ if $ARGS[0] = 'boy6':
 					*nl
 					'"Be that as it may, Miss, that is no excuse. Now get your butt to the principal''s office. I will let her know you are on your way." With that, he points down the hall and waits until you start heading toward the office before returning to his class. With a sigh, but without a choice, you go to the principal''s office.'
 					'The only good thing about this is that you got away from the horny gopniks.'
-					act 'Go to Principal''s Office':
-						demerit += 10
-						gt 'gschool_office', 'principal'
-					end
+					act 'Go to Principal''s Office': demerit += 10 & gt 'gschool_office', 'principal'
 				else
 					'<center><b><font color="maroon">School Hall</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall02.jpg"></center>'
@@ -754,14 +757,25 @@ if $ARGS[0] = 'boy6':
 					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end
+		else
+			'<br>You don''t have enough willpower to resist him.'
 		end
-	elseif gruptipe = 4 and hotcat => 5:
+		act 'Submit': gt 'gschool_boys_bathroom', 'boy6_sub'
+	elseif gruptipe = 4 and hotcat >= 5:
 		'After a couple of minutes, you hear several boy''s voices and recognize several of them as gopniks from your class. Several stall doors slam open, their echo loud as thunder and just as startling, and one of them says, "Man, you sure?" There is a pause in the noise as another answers, "I''m telling you, I saw her come in here just after the bell rang." A few more doors of stalls slam open until, suddenly, your door is the one to slam. You see Dan standing there, grinning at you. "Found her. You was right." He steps in and grabs you around the waist, dragging you out of the stall.'
 		*nl
 		'The other boys quickly move over. Within moments, you find yourself in the middle of five of your gopnik classmates, all leering at you lustfully. Vitek roughly grabs and squeezes one of your tits. "Come on, <<$pcs_nickname>>, let''s have some fun. You know you want to... and so do we. Isn''t that right?" he asks the others who nod their heads yes and start pawing at you as well. You could still get out of this and make them stop, you know that - the gopniks are a rowdy bunch but they''re not complete assholes or rapists - but if you make them stop, they''ll become angry. That makes giving in and seeing where this goes an option you seriously consider; it could genuinely be fun and would certainly make them like you more if you submitted to their desires. That''s how it works, right?'
+		gs 'willpower', 'sex'
+		will_cost = will_cost / 2
+		if will_cost >= pcs_willpwr:
+			act '"Not today" (<<will_cost>> willpower)':
+				gs 'willpower', 'resist'
+				gt 'gschool_boys_bathroom', 'boy6_not'
+			end
+		else
+			'<br>You don''t have enough willpower to resist them.'
+		end
 		act 'Submit': gt 'gschool_boys_bathroom', 'boy6_sub'
-		act '"Not today"': gt 'gschool_boys_bathroom', 'boy6_not'
-
 	elseif gruptipe = 4 and hotcat < 5:
 		'After a couple of minutes, you hear several boy''s voices and recognize several of them as gopniks from your class. Several stall doors slam open, their echo loud as thunder and just as startling, and one of them says, "Man, you sure?" There is a pause in the noise as another answers, "I''m telling you, I saw her come in here just after the bell rang." A few more doors of stalls slam open until, suddenly, your door is the one to slam. You see Dan standing there, grinning at you. "Found her. You was right." He steps in and grabs you around the waist, dragging you out of the stall.'
 		*nl
@@ -771,7 +785,6 @@ if $ARGS[0] = 'boy6':
 		else
 			act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
 		end
-
 	elseif gruptipe ! 4 and hotcat < 5:
 		pcs_mood -= 20
 		gs 'stat'
@@ -793,7 +806,6 @@ if $ARGS[0] = 'boy6_not':
 	'Once near the door, you finally manage break out of the circle of them, your clothes half pulled off, but you are getting a little annoyed with them now and they can clearly hear that when you cry out, "I said enough! Back the fuck up, all of you, now!" With that, all of them stop, but Vitek, who has been silently watching you struggle for the last minute or two, shoves you towards the door, his eyes hard, "Then get the fuck out of here, and don''t come trying to hang out with us." You are looking at him incredulity - he seriously would ''cast you out'', just because you wouldn''t have sex with all of them? He couldn''t possibly be serious... right?'
 	*nl
 	'It''s not too late; you could still submit to their desires, if you wanted to... or you could stand your ground and leave. After all, Vitek might not mean that about hanging out with them. It is always hard to tell with gopniks.'
-	act 'Give in': gt 'gschool_boys_bathroom', 'boy6_sub'
 	gs 'willpower', 'sex'
 	if will_cost >= pcs_willpwr:
 		act 'Leave (<<will_cost>> willpower)':
@@ -805,16 +817,19 @@ if $ARGS[0] = 'boy6_not':
 			'Without another word, you walk out the door. You hear the guys grumbling and calling you names, but you don''t listen. They are pretty pissed right now. You manage to sneak through the school and into one of the girls'' bathrooms. The rest of the period passes with you trying not to think about how the gopniks may or may not treat you now. You''ll find out the next time you run into them.'
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
+	else
+		'<br>You don''t have enough willpower to resist them.'
 	end
+	act 'Give in': gt 'gschool_boys_bathroom', 'boy6_sub'
 end
 
 if $ARGS[0] = 'boy6_sub':
 	menu_off = 1
 	grupvalue[4] -=3
 	if gruptipe = 4:
-		pav_sex +=2
+		gs 'fame', 'pav', 'sex', 2
 	else
-		pav_sex +=5
+		gs 'fame', 'pav', 'sex', 5
 	end
 	'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/gang.jpg"></center>'
@@ -950,42 +965,41 @@ if $ARGS[0] = 'boy6_sub':
 	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] = 'companyb':
-	*clr & cla
 	menu_off = 1
-	!!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 soniaPS > 0 and rand(0,1) = 0:
 		$rand_girl = 'Sonia'
 	elseif rand(0,1) = 0:
@@ -1020,8 +1034,7 @@ if $ARGS[0] = 'companyb1':
 	*nl
 	'The couple has their backs to you but you can see that her skirt is flipped up and his pants down - you can''t tell if the guy is a student or a teacher but both seem possible. He has <<$rand_girl>> up against the sinks, partially bent over them, and he is fucking her from behind. Her face is nearly touching the mirror as he pounds her pussy doggystyle and she seems to be loving every second of it! Afraid you might get caught, you close the door and move back to sit on the toilet.'
 	act 'Wait them out':
-		*clr & cla
-		*nl
+		*clr & cla & *nl
 		'You decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her harder. A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
 		if school_bunk = 0:
 			act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
@@ -1065,8 +1078,7 @@ if $ARGS[0] = 'companyb2':
 	*nl
 	'The couple has their backs to you but you can see that her skirt is flipped up and his pants down - you can''t tell if the guy is a student or a teacher but both seem possible. He has <<$rand_girl>> bent over near the bathroom window and she is looking back at him and in your direction - or at least she would be, if she didn''t have her eyes closed. You can tell that he is fucking her ass and she seems to be loving it, getting her tight little ass pounded right here in a school bathroom! Her soft moans of pleasure echo in the room and the sight is entrancing... but if she opened her eyes right now, you are pretty sure she''d see you! Afraid you might get caught, you close the door and move back to sit on the toilet.'
 	act 'Wait':
-		*clr & cla
-		*nl
+		*clr & cla & *nl
 		'You decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass harder. A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
 		if school_bunk = 0:
 			act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
@@ -1111,8 +1123,7 @@ if $ARGS[0] = 'companyb3':
 	'You see Arkadi, with his pants around his ankles, while Anushka is squatting down in front of him and sucking his dick. You watch for a moment and you''d like to watch even longer, but Arkadi keeps looking around, and in your direction! You duck back into the stall before you get spotted... and feel yourself getting very aroused from watching them, listening to them, even just knowing what they are doing. The sucking sounds stop and are quickly replaced by soft female moans of pleasure. Before your inner eye, you can see him fucking her over the sink, or perhaps against the wall? And is he fucking her pussy or ass?'
 	if pcs_horny < 70:
 		act 'Wait':
-			*clr & cla
-			*nl
+			*clr & cla & *nl
 			'You banish these thoughts from your mind - with great effort - and decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass harder. A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
 			if school_bunk = 0:
 				act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
@@ -1144,7 +1155,7 @@ if $ARGS[0] = 'companyb3':
 			act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
 		end
 	end
-	act 'Join them':gt 'gschool_boys_bathroom', 'Join them'
+	act 'Join them': gs 'arousal', 'end' & gt 'gschool_boys_bathroom', 'Join them'
 end
 
 if $ARGS[0] = 'Join them':
@@ -1153,7 +1164,7 @@ if $ARGS[0] = 'Join them':
 	'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/couplefuck.jpg"></center>'
 	'You step out of the stall and see Arkadi has Anushka bent over, up against one of the stalls, and is fucking her hard and fast. He may have been looking around before but he seems completely oblivious to you now; she, on the other hand, is looking right at you and smiling, as if she had been expecting you.'
-	if hotcat => 6:
+	if hotcat >= 6:
 		'Between her moans of pleasure, she asks, "What are you waiting for? Oh... Take your clothes off and join us!" Arkadi looks confused for a second, his blood-deprived brain having trouble assessing what Anushka has said, and to whom. It takes him another second or so to finally notice you, but when he does, he grunts his agreement and motions his head for you to come over.'
 		*nl
 		'You strip off your clothes as you watch them fuck, locking eyes with Anushka and unconsciously lingering on your nipples and pussy as you remove your underwear. Once you''re naked, your hands begin exploring your body, finding your clit with ease, but Anushka moans for you to come closer, and when you do she starts rubbing your pussy and sucking on your nipple, eliciting the highest moans from you. You return the favor, squeezing her tits, stroking her clit and brushing against Arkadi''s balls every time he thrusts back into her, and after only a few seconds of this, Anushka cries out, partially muffled by your breast in her mouth. Her body shakes as she orgasms and you can see the tension in her body, feel how much she has to focus not to bite down on your nipple and to keep masturbating you. Once she settles down, he pulls out of her, shoves her aside and grabs your hand, pulling you over to him.'
@@ -1223,7 +1234,8 @@ if $ARGS[0] = 'Join them':
 			'He lifts one of her legs off the ground and turns her sideways. Her leg is barely up in the air when his <<dick>>cm <<$dick_girth>> cock penetrates her pussy. You would be impressed with his stamina if you weren''t so occupied with enjoying this.'
 			*nl
 			'Anushka starts to scream as her body rocks by muscle spasms, obviously having an orgasm. Arkadi just fucks her right through her orgasm, shortly after he pulls out and pushes her down. She quickly turns around and drops to her knees, opening her mouth and sticking out her tongue. He gives his cock a few jerks, before his cum starts flying all over her face and in her mouth. Once he finishes, she sucks his dick, sucking out the last few drops of cum from him. Afterwards as he gets dressed she uses her fingers to clean up her face of cum, sucking the cum from her fingers before she gets dressed as well. As she finishes getting dressed she looks over at you and winks, "Hope you enjoyed the show." Then the two of them leave.'
-			gs 'arousal', 'voyeur', 10, 'group'
+			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
@@ -1242,6 +1254,7 @@ if $ARGS[0] = 'companyb4':
 		*clr & cla
 		pcs_horny += 15
 		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'end'
 		gs 'stat'
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/teachers2.mp4"></video></center>'
@@ -1272,10 +1285,11 @@ end
 if $ARGS[0] = 'masturbateb4':
 	*clr & cla
 	stat['mast'] += 1
-	if pcs_inhib < 40:inhib_exp += rand(1,3)
+	if pcs_inhib < 40: inhib_exp += rand(1,3)
 	orgasm += 1
 	pcs_horny = 0
 	gs 'arousal', 'mast', 10
+	gs 'arousal', 'end'
 	gs 'stat'
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/masturbate'+ rand(1,2) +'.mp4"></video></center>'
@@ -1319,9 +1333,8 @@ if $ARGS[0] = 'caughtb1':
 	act 'Sweet talk him':
 		*clr & cla
 		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-		!!sweet talk has two versions, success and failure. Chance it works. 40% base + 5% per appearance scale point above 5(1-10 range), -5% per appearance scale point under 5. +5% if A student, +10% if honor roll, -5% if C student, -10% if D, -20% if failing school. +10 nerd, +5% if cool kid, +10% if jock, -10% if gopnik.
-		gs 'gschool_events', 'sweet'
-		if rand(1,100) < Sweet_talk + 40:
+		gs 'gschool_events', 'sweet', 'normal'
+		if rand(1,100) < Sweet_talk:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
 			'You hang your head and feign shame as best you can. "I know, and I''m sorry, Mr. Vasilyev, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have but I couldn''t help it." You give him a pleading look, "Please, please don''t report me. I promise I won''t do it again."'
 			'Mr. Vasilyev looks at you and snorts. "Do you really think I am dumb enough to fall for that?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall, then leads you out of the bathroom. "Come on, I''m taking you to the principal''s office."'
@@ -1349,27 +1362,8 @@ if $ARGS[0] = 'caughtb1':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
 		'You get down on your knees in front of him and hike up your skirt just a little bit to reveal more of your legs. When you are sure you have his eyes on you, you look up at him and suggestively lick your lips, "You seem tense, sir. How about I help you relax a little bit and you just pretend you didn''t see me here?"'
 		!!blowjob has two versions, success and failure. Chance it works. 35% base + 5% per appearance scale point above 5(1-10 range), -10% per appearance scale point under 5. -10% if A student, -20% if honor roll, +5% if C student, +10% if D, +20% if failing school. -20% nerd, +10% if cool kid, +10% if jock, +20% if gopnik.
-		if pcs_grades >= 90:
-			Sweet_talk = -20
-		elseif pcs_grades >= 80:
-			Sweet_talk = -10
-		elseif pcs_grades >= 70:
-			Sweet_talk = 0
-		elseif pcs_grades >= 60:
-			Sweet_talk = 5
-		elseif pcs_grades >= 50:
-			Sweet_talk = 10
-		else
-			Sweet_talk = 20
-		end
-		if grupTipe = 1: Sweet_talk += 10
-		if grupTipe = 2: Sweet_talk += 10
-		if grupTipe = 3: Sweet_talk -= 40
-		if grupTipe = 4: Sweet_talk += 20
-		Sweet_talk += (hotcat - 5) * 5
-		if hotcat < 5: Sweet_talk += (hotcat - 5) * 5
-		Sweet_talk += 35
 
+		gs 'school_events', 'sweet', 'sex'
 		if rand(1,100) < Sweet_talk:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
 			'Mr. Vasilyev looks at you and snorts. "Please, don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall, then leads you out of the bathroom. "Come on, I''m taking you to the principal''s office."'
@@ -1418,27 +1412,8 @@ if $ARGS[0] = 'caughtb1':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
 		'You get up and walk past him, out of the stall, then bend over against the wall. One of your hands runs down to your butt and you hike the skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at Mr. Vasilyev over your shoulder, and you say, "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your butt.'
 		!!offer sex has two versions, success and failure. Chance it works. 25% base + 5% per appearance scale point above 5(1-10 range), -10% per appearance scale point under 5. -10% if A student, -20% if honor roll, +5% if C student, +10% if D, +20% if failing school. -20% nerd, +10% if cool kid, +10% if jock, +20% if gopnik.
-		if pcs_grades >= 90:
-			Sweet_talk = -20
-		elseif pcs_grades >= 80:
-			Sweet_talk = -10
-		elseif pcs_grades >= 70:
-			Sweet_talk = 0
-		elseif pcs_grades >= 60:
-			Sweet_talk = 5
-		elseif pcs_grades >= 50:
-			Sweet_talk = 10
-		else
-			Sweet_talk = 20
-		end
-		if grupTipe = 1: Sweet_talk += 10
-		if grupTipe = 2: Sweet_talk += 10
-		if grupTipe = 3: Sweet_talk -= 40
-		if grupTipe = 4: Sweet_talk += 20
-		Sweet_talk += (hotcat - 5) * 5
-		if hotcat < 5: Sweet_talk += (hotcat - 5) * 5
-		Sweet_talk += 25
 
+		gs 'gschool_events', 'sweet', 'sex'
 		if rand(1,100) < Sweet_talk:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
 			'Mr. Vasilyev looks at you and snorts. "Please, don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall, then leads you out of the bathroom. "Come on, I''m taking you to the principal''s office."'
@@ -1528,27 +1503,8 @@ if $ARGS[0] = 'caughtb2':
 	act 'Sweet talk him':
 		*clr & cla
 		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-		!!sweet talk has two versions, success and failure. Chance it works. 10% base + 5% per appearance scale point above 5(1-10 range), -5% per appearance scale point under 5. +10% if A student, +20% if honor roll, -10% if C student, -20% if D, -40% if failing school. +40% nerd, -30% if cool kid, -30% if jock, -60% if gopnik.
-		if pcs_grades >= 90:
-			Sweet_talk = 20
-		elseif pcs_grades >= 80:
-			Sweet_talk = 10
-		elseif pcs_grades >= 70:
-			Sweet_talk = 0
-		elseif pcs_grades >= 60:
-			Sweet_talk = -10
-		elseif pcs_grades >= 50:
-			Sweet_talk = -20
-		else
-			Sweet_talk = -40
-		end
-		if grupTipe = 1: Sweet_talk -= 40
-		if grupTipe = 2: Sweet_talk -= 40
-		if grupTipe = 3: Sweet_talk += 40
-		if grupTipe = 4: Sweet_talk -= 80
-		Sweet_talk += (hotcat - 5) * 5
-		Sweet_talk += 10
 
+		gs 'gschool_events', 'sweet', 'normal'
 		if rand(1,100) < Sweet_talk:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
 			'You hang your head and feign shame as best you can. "I know, and I''m sorry, Mr. Ivanov, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have but I couldn''t help it." You give him a pleading look, "Please, please don''t report me. I promise I won''t do it again."'
@@ -1576,28 +1532,8 @@ if $ARGS[0] = 'caughtb2':
 		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
 		'You get down on your knees in front of him and hike up your skirt just a little bit to reveal more of your legs. When you are sure you have his eyes on you, you look up at him and suggestively lick your lips. "You seem tense, sir. How about I help you relax a little bit and you just pretend you didn''t see me here?"'
-		!!blowjob has two versions, success and failure. Chance it works. 30% base + 5% per appearance scale point above 5(1-10 range), -10% per appearance scale point under 5. -20% if A student, -40% if honor roll, +10% if C student, +20% if D, +40% if failing school. -70% nerd, +30% if cool kid, +30% if jock, +50% if gopnik.
-		if pcs_grades >= 90:
-			Sweet_talk = -40
-		elseif pcs_grades >= 80:
-			Sweet_talk = -20
-		elseif pcs_grades >= 70:
-			Sweet_talk = 0
-		elseif pcs_grades >= 60:
-			Sweet_talk = 10
-		elseif pcs_grades >= 50:
-			Sweet_talk = 20
-		else
-			Sweet_talk = 40
-		end
-		if grupTipe = 1: Sweet_talk += 30
-		if grupTipe = 2: Sweet_talk += 30
-		if grupTipe = 3: Sweet_talk -= 70
-		if grupTipe = 4: Sweet_talk += 70
-		Sweet_talk += (hotcat - 5) * 5
-		if hotcat < 5: Sweet_talk += (hotcat - 5) * 5
-		Sweet_talk += 30
-
+		
+		gs 'gschool_events', 'sweet', 'sex'
 		if rand(1,100) < Sweet_talk:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
@@ -1645,27 +1581,8 @@ if $ARGS[0] = 'caughtb2':
 		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
 		'You get up and walk past him, out of the stall, then bend over against the wall. One of your hands runs down to your butt and you hike the skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at Mr. Ivanov over your shoulder, "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your butt.'
-		!!offer sex has two versions, success and failure. Chance it works. 30% base + 5% per appearance scale point above 5(1-10 range), -10% per appearance scale point under 5. -20% if A student, -40% if honor roll, +10% if C student, +20% if D, +40% if failing school. -70% nerd, +30% if cool kid, +30% if jock, +50% if gopnik.
-		if pcs_grades >= 90:
-			Sweet_talk = -40
-		elseif pcs_grades >= 80:
-			Sweet_talk = -20
-		elseif pcs_grades >= 70:
-			Sweet_talk = 0
-		elseif pcs_grades >= 60:
-			Sweet_talk = 10
-		elseif pcs_grades >= 50:
-			Sweet_talk = 20
-		else
-			Sweet_talk = 40
-		end
-		if grupTipe = 1: Sweet_talk += 30
-		if grupTipe = 2: Sweet_talk += 30
-		if grupTipe = 3: Sweet_talk -= 70
-		if grupTipe = 4: Sweet_talk += 70
-		Sweet_talk += (hotcat - 5) * 5
-		Sweet_talk += 30
-
+		
+		gs 'gschool_events', 'sweet', 'sex'
 		if rand(1,100) < Sweet_talk:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
@@ -1707,7 +1624,6 @@ if $ARGS[0] = 'caughtb2':
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
-						gs 'arousal', 'end'
 						gs 'cum_call', 'mouth', $boy
 						'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtcum.jpg"></center>'
@@ -1719,8 +1635,9 @@ if $ARGS[0] = 'caughtb2':
 						*nl
 						'You go to the mirror yourself and clean yourself up, get the cum off your face and fix your hair. Your ass and throat are burning abit and his ''promise'' still rings in your ears, but... well, there''s no denying that he made you cum really hard. You are also kinda glad you didn''t have to go the principal and, hey, you have the rest of the period to yourself.'
 						gs 'arousal', 'bj', 10, 'sub','deepthroat'
+						gs 'arousal', 'end'
 						gs 'stat'
-						!!This last one will eventually trigger one of my after class events. I am debating naming this teacher.
+!!ToDo: This last one will eventually trigger one of my after class events. I am debating naming this teacher (nutluck)
 						if school_bunk = 0:
 							act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
 						else

locations/gschool_events.qsrc

@@ -587,24 +587,47 @@ end
 
 
 if $ARGS[0] = 'sweet':
-	if pcs_grades >= 90:
-		Sweet_talk = 10
-	elseif pcs_grades >= 80:
-		Sweet_talk = 5
-	elseif pcs_grades >= 70:
-		Sweet_talk = 0
-	elseif pcs_grades >= 60:
-		Sweet_talk = -5
-	elseif pcs_grades >= 60:
-		Sweet_talk = -10
-	else
-		Sweet_talk = -20
+	if $ARGS[1] = 'normal' or $ARGS[1] = '':
+		if pcs_grades >= 90:
+			Sweet_talk = 10
+		elseif pcs_grades >= 80:
+			Sweet_talk = 5
+		elseif pcs_grades >= 70:
+			Sweet_talk = 0
+		elseif pcs_grades >= 60:
+			Sweet_talk = -5
+		elseif pcs_grades >= 60:
+			Sweet_talk = -10
+		else
+			Sweet_talk = -20
+		end
+		if grupTipe = 3: Sweet_talk += 10
+		if grupTipe = 2: Sweet_talk += 10
+		if grupTipe = 1: Sweet_talk += 5
+		if grupTipe = 4: Sweet_talk -= 10
+		sweet_talk += rand(0,10)
+		if hotcat < 5: Sweet_talk += (hotcat - 5) * 5
+	elseif $ARGS[1] = 'sex':
+		if pcs_grades >= 90:
+			Sweet_talk = -20
+		elseif pcs_grades >= 80:
+			Sweet_talk = -10
+		elseif pcs_grades >= 70:
+			Sweet_talk = 0
+		elseif pcs_grades >= 60:
+			Sweet_talk = 5
+		elseif pcs_grades >= 50:
+			Sweet_talk = 10
+		else
+			Sweet_talk = 20
+		end
+		if grupTipe = 1: Sweet_talk += 10
+		if grupTipe = 2: Sweet_talk += 10
+		if grupTipe = 3: Sweet_talk -= 40
+		if grupTipe = 4: Sweet_talk += 20
+		Sweet_talk += rand(15,35)
+		if hotcat < 5: Sweet_talk += (hotcat - 5) * 5
 	end
-	if grupTipe = 3: Sweet_talk += 10
-	if grupTipe = 2: Sweet_talk += 10
-	if grupTipe = 1: Sweet_talk += 5
-	if grupTipe = 4: Sweet_talk -= 10
-	Sweet_talk += (hotcat - 5) * 5
 end
 
 !!Random boy, arguments set to 1 mean included, groups are cool kids, jock, nerd, gopnik, outcast, teachers

locations/gschool_girls_bathroom.qsrc

@@ -11,9 +11,9 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
 	'You slip into the girl''s bathroom and into one of the stalls; the few other students who are already in the room don''t pay any attention to you. You sit on one of the toilets and pull your feet up, so no one can see them under the stall. After a few minutes, you hear the other girls all leave. Only moments later, the bell for class rings and you relax, a period of peace and quiet ahead of you.'
 	act 'Play on phone':
-		school_bunk = 0
 		*clr & cla
 		menu_off = 1
+		school_bunk = 0
 		gs 'stat'
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/usephone'+ rand(1,2) +'.jpg"></center>'
@@ -31,10 +31,10 @@ if $ARGS[0] = 'start':
 	end
 	if siga > 0:
 		act 'Smoke':
-			school_bunk = 1
-			gs 'shortgs','smoker'
 			*clr & cla
 			menu_off = 1
+			school_bunk = 1
+			gs 'drugs', 'smoke'
 			gs 'stat'
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke'+ rand(1,3) +'.jpg"></center>'
@@ -58,25 +58,18 @@ if $ARGS[0] = 'bathroom2':
 	$menu_loc = 'gschool_girls_bathroom'
 	$menu_arg = 'bathroom2'
 	menu_off = 0
+	pcs_willpwr += rand(5, 10)
+	pcs_mood += rand(10, 30)
+	gs 'stat'
+	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	if school_bunk = 0:
-		pcs_willpwr += rand(5, 10)
-		pcs_mood += rand(10, 30)
-		gs 'stat'
-		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/usephone'+ rand(1,2) +'.jpg"></center>'
-		'For the rest of the period, you play on your phone. Despite several instances of boredom and indecision that left you wishing you could just go out, you find it very relaxing to be your own master and by the time the next class bell rings, you are in a far better mood than before.'
-
-		act 'Go to class':gt 'gschool_lessons', 'short_break'	
+		'For the rest of the period, you play on your phone. Despite several instances of boredom and indecision that left you wishing you could just go out, you find it very relaxing to be your own master and by the time the next class bell rings, you are in a far better mood than before.'	
 	else
-		pcs_willpwr += rand(5, 10)
-		pcs_mood += rand(10, 30)
-		gs 'stat'
-		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke'+ rand(1,3) +'.jpg"></center>'
 		'You spend the rest of the period playing on your phone while you smoke. The games on your cellphone are kinda boring, and once or twice you hear somebody walking around out on the corridor, causing your heart to skip a beat when you realize they might smell the smoke, but despite all that, you found this use of the period very relaxing and by the time the next class bell rings, you are in a far better mood than before.'
-
-		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
+	act 'Go to class':gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'girls':
@@ -94,7 +87,8 @@ end
 if $ARGS[0] = 'girl1':
 	*clr & cla
 	menu_off = 1
-!!girl should be random girl from your class, one of the cool girls, jock girls or one of the gopnik girls. No nerds as they would be unlikely to cut. No Lena or Lera and no Sonia, they will all have their own scenes.
+	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 0, 0
+!!ToDo: Check the gs and exclude Lena or Lera and no Sonia
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
 	'After a couple of minutes, you hear the bathroom door open - someone else is in the bathroom with you! Carefully, you peek out, half-expecting to see a teacher... and see <<$girl>>. Relieved and smiling, you exit the stall and greet her. She turns around, slightly startled at first but then breaking into a smile when she see you. Within seconds, the two of you are chatting away about school, boys, clothes, makeup and anything else that strikes your fancy, having all but forgotten about the fact that you are sitting in the school bathroom. Before you know it, the class bell rings. You both stop and look up out of reflex, then bid each other later and head to your next class.'		
@@ -130,6 +124,8 @@ if $ARGS[0] = 'girl2':
 			'And before you know it, the bell rings. Sonia gives you lingering hug and a final, dazzling smile before both of you head to class.'
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
+	else
+		'<br>You don''t have enough willpower to stop her.'
 	end
 	act 'Return the kiss':
 		*clr & cla
@@ -155,11 +151,12 @@ if $ARGS[0] = 'girl2':
 				'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.'
-				gs 'arousal', 'cuni_give', 10, 'lesbian'
-				gs 'stat'
 				'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
@@ -171,15 +168,14 @@ if $ARGS[0] = 'girl3':
 	menu_off = 1
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena-lera.jpg"></center>'
+	*nl
 	if grupTipe ! 4:
-		''
 		'After a couple of minutes, you hear someone else in the bathroom with you: Two girls are talking, and you recognize the voices as Lena and Lera''s. Most of the other girls in school avoid them, as they like to bully them and even some of the boys. Trying to be quiet, you pull your feet up - you really don''t want to draw their attention and catch you here, alone in the bathroom. Unfortunately, you''ve forgotten all about your phone in your lap: As you raise your legs up so they can''t see your feet under the stall, your phone slides off your lap and clatters onto the floor.'
 		*nl
 		'At once, the room is eerily silent; you hold your breath, your heartbeat so loud in your ears that, for a moment, it might be drowning out their sounds, but then you hear them walking in your direction and, suddenly, the door is slammed open. Lena and Lera stand on each side of the open stall, cigarettes in their mouths, looking right at you. "Well, well, look what we have here, Lena: A scared little bunny hiding in a stall," Lera says with a smirk.'
 		*nl
 		'Lena leans in a bit, taking a closer look at you. "Is that right? Are you a scared little bunny, <<$pcs_nickname>>?" Without waiting for you to answer, she glances at Lera. "Maybe she thinks she''s a bad girl, trying to cut class. How about we show her what happens to bad little girls?" She laughs gleefully and Lera joins in. You have a really bad feeling about what they might want to do to you.'
 	else
-		''
 		'After a couple of minutes, you hear someone else in the bathroom with you: Two girls are talking, and you recognize the voices as Lena and Lera''s. You consider going out to talk to them. All and all, they treat you pretty well, but sometimes they can be pretty mean and demeaning. You know you are the low girl on the totem pole in the gopniks, but it would be nice if they treated you better. Still, they do make sure no one else messes with you, and when they are in a good mood, it is a blast hanging out with them, so it''s not all bad.'
 		*nl
 		'Before you can make up your mind, though, you hear their footsteps heading your way and you realize you forgot to lift up your feet. Suddenly, the door is pushed open. Lena and Lera stand on each side of the open stall, cigarettes in their mouths, looking right at you. "Well, well, look what we have here, Lena, our favorite scared little bunny hiding in a stall," Lera says with a smirk.'
@@ -210,6 +206,8 @@ if $ARGS[0] = 'girl3':
 				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
 		end
+	else
+		'<br>You don''t have enough willpower to get away from her.'
 	end
 	act 'Protest':
 		*clr & cla
@@ -243,6 +241,8 @@ if $ARGS[0] = 'girl3':
 					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end
+		else
+			'<br>You don''t have enough willpower to get away from her.'
 		end
 	end
 	act 'Bad girl':
@@ -276,10 +276,12 @@ if $ARGS[0] = 'girl3':
 					'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several class room; you don''t even really know where you''re going, you just want to put some distance between them and you. Finally you stop and lean against some of the lockers, looking back you don''t see them and it seems no one notice you running down the halls. Sighing you spend the rest of the period trying not to be spotted until your next class.'
 					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
-			end
+			end	
+		else
+			'<br>You don''t have enough willpower to get away from her.'
 		end
 	end
-!!Only shows up as an option if Sveta has already played the Lena/Lera scene out already.
+
 	if toy_bunny = 1:
 		act 'Submit':
 			sub += 1
@@ -293,7 +295,7 @@ if $ARGS[0] = 'girl3':
 			act 'Toy bunny': gt 'gschool_girls_bathroom', 'toy bunny'
 		end
 	end
-!!Only possible if Sveta is a gopnik.
+	
 	if grupTipe = 4:
 		act 'Maybe later':
 			*clr & cla
@@ -315,7 +317,6 @@ if $ARGS[0] = 'girl3':
 	end
 end
 
-!!Sex with Lera and Lena in the toilets
 if $ARGS[0] = 'toy bunny':
 	toy_bunny = 1
 	*clr & cla
@@ -366,6 +367,7 @@ if $ARGS[0] = 'toy bunny':
 				$orgasm_or = 'custom'
 				$orgasm_txt = 'Even though they forced you into this, you can''t help but feel turned on, not only by the erotic display in front of you but also by the fact itself that somebody took control of you. Slowly, as if it had a will of its own, your hand creeps down to your sopping pussy and your fingers work their magic, dipping into your nether hole and playing with your engorged clit. Soon enough, all three of you are moaning in pleasure, Lera''s and yours muffled by your respective mouthfuls of pussy. You''re not sure who came first, but soon all three of you are shivering in orgasmic delight.'
 				gs 'arousal', 'masturbate', 5
+				gs 'arousal', 'end'
 				minut -= 5
 				gs 'stat'
 				act 'Clean up':
@@ -399,7 +401,6 @@ if $ARGS[0] = 'toy bunny':
 	end
 end
 
-if $ARGS[0] = 'company':
 !!This replaces random girls, with these possible couples for either company1 or company2
 !!replacement for random boy/girl
 !!Viktoriya and Vanya
@@ -433,8 +434,9 @@ if $ARGS[0] = 'company':
 !!Andrey and Lizaveta
 !!Andrey and Sonia
 !!Lena and Lavrenti
-menu_off = 1
-if soniaPS > 0 and rand(0,1) = 0:
+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'
@@ -476,6 +478,7 @@ if $ARGS[0] = 'company1':
 	act 'Wait them out':
 		*clr & cla
 		pcs_horny += 15
+		gs 'arousal', 'end'
 		gs 'stat'
 		'You decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her "harder!". A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
 		if school_bunk = 0:
@@ -495,6 +498,7 @@ if $ARGS[0] = 'company1':
 		$orgasm_or = 'custom'
 		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat like you are having a seizure.'
 		gs 'arousal', 'mast', 10
+		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and everything is quiet once more.'
 		act 'Go to Class':gt 'gschool_lessons', 'short_break'
@@ -515,6 +519,7 @@ if $ARGS[0] = 'company2':
 	act 'Wait them out':
 		*clr & cla
 		pcs_horny += 15
+		gs 'arousal', 'end'
 		gs 'stat'
 		'You decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass "harder!". A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
 		if school_bunk = 0:
@@ -538,6 +543,7 @@ if $ARGS[0] = 'company2':
 		$orgasm_or = 'custom'
 		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seats like you are having a seizure.'
 		gs 'arousal', 'mast', 10
+		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
 		act 'Go to Class':gt 'gschool_lessons', 'short_break'
@@ -557,8 +563,8 @@ if $ARGS[0] = 'company3':
 	'You see Arkadi, with his pants around his ankles, while Anushka is squatting down in front of him and sucking his dick. You watch for a moment and you''d like to watch even longer, but Arkadi keeps looking around, and in your direction! You duck back into the stall before you get spotted... and feel yourself getting very aroused from watching them, listening to them, even just knowing what they are doing. The sucking sounds stop and are quickly replaced by soft female moans of pleasure. Before your inner eye, you can see him fucking her over the sink, or perhaps against the wall? And is he fucking her pussy or her ass?'
 	if pcs_horny < 70:
 		act 'Wait':
-			cla
-			*nl
+			cla & *nl
+			gs 'arousal', 'end'
 			'You banish these thoughts from your mind - with great effort - and decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass "harder!". A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
 			if school_bunk = 0:
 				act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
@@ -586,12 +592,15 @@ if $ARGS[0] = 'company3':
 			act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
 		end
 	end
-	act 'Join them':gt 'gschool_boys_bathroom', 'Join them'
+	act 'Join them': gs 'arousal', 'end' & gt 'gschool_boys_bathroom', 'Join them'
 end
 
 if $ARGS[0] = 'company4':
 	*clr & cla
 	menu_off = 1
+	gs 'arousal', 'voyeur', 5
+	minut -= 5
+	gs 'stat'
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/teachers1.mp4"></video></center>'
 	'After a couple of minutes, you hear someone else in the bathroom with you. Soft murmured voices echo in the room, one male, the other female; you can''t quite make out what they are saying. Then there is some rustling of clothes, shortly followed by female moans. You creep up to the stall door, open it just a tiny bit, just as far as you dare without drawing attention, and peek outside.'
@@ -608,17 +617,17 @@ if $ARGS[0] = 'company4':
 		gs 'stat'
 		'They grin at each other and then kiss, after that they get dressed and leave the bathroom.'
 
-		act 'Masturbate':gt 'gschool_girls_bathroom', 'bathroom2'
-
 		if school_bunk = 0:
 			act 'Continue playing on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 		else
 			act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
 		end
+		act 'Masturbate':gt 'gschool_girls_bathroom', 'bathroom2'
 	end
 	act 'Wait them out':
 		*clr & cla
 		pcs_horny += 15
+		gs 'arousal', 'end'
 		gs 'stat'
 		'You decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her "harder!". A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
 		if school_bunk = 0:
@@ -638,13 +647,13 @@ if $ARGS[0] = 'company4':
 		$orgasm_txt = ' You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seats like you are having a seizure.'
 		$orgasm_or = 'custom'
 		gs 'arousal', 'mast', 10
+		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
 		act 'Go to Class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
-
 if $ARGS[0] = 'caught':
 	menu_off = 1
 	gtoilet_rand = rand(1,75)
@@ -659,7 +668,6 @@ if $ARGS[0] = 'caught':
 		if school_bunk = 0:
 			gt 'gschool_girls_bathroom', 'caught'
 		else
-!!caught 4 only happens if Sveta is smoking.
 			gt 'gschool_girls_bathroom', 'caught4'
 		end
 	end
@@ -674,7 +682,6 @@ if $ARGS[0] = 'caught1':
 	'After a couple of minutes, you hear someone else in the bathroom with you. You peek out and see one of your teachers, Ms Braakman, at the mirror. You duck back into the stall, close the door as quietly as you can and sit down on the toilet, your heart beating like crazy, hoping he didn''t notice you. You hear the click of her heels coming closer, closer... and stop, right outside your stall door.' 
 	*nl
 	'"I saw you in the mirror, young lady", she says sternly as she pushes the door open. "What do you think you are doing in the bathroom in the middle of the period, anyways? Skipping class?"'
-!!next line only if Sveta was smoking.
 	if school_bunk = 1:'Her nostrils flare and her eyes narrow when she finds the source of the acrid smoke: The cigarette the shock over her appearance knocked out of your hand, leaving it to smolder on the floor. "And smoking in school, I see. I really thought you were smarter than that, <<$pcs_firstname>>."'
 	*nl
 	'Ms Braakman shakes her head, looking more disappointed than angry to you. "Well, come on, young lady. Get your butt out of here and down to the principal''s office." She points in the direction of the bathroom door.'
@@ -686,7 +693,6 @@ if $ARGS[0] = 'caught1':
 	end
 	act 'Sweet talk her':
 		*clr & cla
-!!sweet talk has two versions, success and failure. Chance it works. 25% base + 5% per appearance scale point above 5(1-10 range), -5% per appearance scale point under 5. +5% if A student, +10% if honor roll, -5% if C student, -10% if D, -20% if failing school. nerd no change, +5% if cool kid, +10% if jock, -20% if gopnik.
 		gs 'gschool_events', 'sweet'
 		if rand(1,100) < Sweet_talk + 25:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
@@ -715,7 +721,6 @@ if $ARGS[0] = 'caught1':
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
 		'You get up and walk past her, out of the stall, then get down on all fours. You meet her look of incomprehension with feigned innocence. "I know I''ve been a bad girl, Miss, but why does it have to be the principle? Couldn''t **you** punish me instead? Those demerits could ruin my life, and you would love a chance to teach me a lesson, wouldn''t you?" You wiggle your butt invitingly.'
-!!punish me has two versions, success and failure. Chance it works. 35% base + 5% per appearance scale point above 5(1-10 range), -5% per appearance scale point under 5. -10% if A student, -20% if honor roll, +5% if C student, +10% if D, +20% if failing school. -15% nerd, 0% if cool kid, -10% if jock, +20% if gopnik.
 		act 'Continue':
 			*clr & cla
 			gs 'gschool_events', 'sweet'
@@ -744,6 +749,7 @@ if $ARGS[0] = 'caught1':
 						act 'Continue':
 							*clr & cla
 							gs 'pain', 2, 'asscheeks', 'spank'
+							gs 'arousal', 'end'
 							gs 'stat'
 							'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfspank.jpg"></center>'
@@ -760,7 +766,7 @@ if $ARGS[0] = 'caught1':
 						end
 					end
 				else
-					act 'strapon':
+					act 'Strapon':
 						*clr & cla
 						'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/strap.jpg"></center>'
@@ -777,6 +783,7 @@ if $ARGS[0] = 'caught1':
 							*nl
 							'Her rhythm is steadily increasing, Ms Braakman''s pounding your ass harder and deeper and, in turn, causing you to cry out louder. She''s starting to pant, the vibrating harness and sight of the school girl whose ass she''s violating stoking the flames in pelvis. Whatever regard she displayed for your comfort is evidently gone now as she mercilessly hammers the strapon into you, going tip to root almost every time. But the truth is that you don''t need and, in fact, don''t *want* her to be gentle anymore, now that the eroticism of the situation has caught up with you: You''re a student, naked and bent over a school bathroom sink, and your female teacher is fucking your ass hard with a large strapon - it sounds like something out of a cheap porno, and you''re loving it. Your moans are loud, almost matching hers, as you feel warmth pool in your belly.'
 							gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub'
+							gs 'arousal', 'end'
 							gs 'stat'
 							*nl
 							'All too soon, she cries out and goes still, nearly collapsing on your back when her orgasm hits, the strapon fully buried in your ass. You can feel her kisses on the back of your neck, a display of affection to contrast the rough anal you received, and she whispers: "My my, I really think you earned to take the rest of the period off." She gently pulls the strapon out of you and takes the harness off, then moves to the sinks to clean it up. "This will be our little secret, <<$pcs_firstname>>," she promises, smiling absentmindedly as she dries the dildo. After throwing the condom away and checking her appearance, she walks towards the exit and gives you one last look, a hint of desire gleaming through the cracks of her mask of authority and indifference, before she silently leaves the bathroom. You rub your butt, get dressed while your mind goes over what you just experienced, and you eventually find yourself back in your stall where you have to decide what to do with the rest of the period.'
@@ -796,7 +803,6 @@ if $ARGS[0] = 'caught1':
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
 		'You get down on your knees in front of her and hike up your skirt a little bit to reveal more of your legs. When you are sure you have her eyes on you, you look up at your teacher and suggestively lick your lips. "You seem tense, ma''am . How about I help you relax a little bit and you just pretend you didn''t see me here?"'
-!!offer sex has two versions, success and failure. Chance it works. 30% base + 5% per appearance scale point above 5(1-10 range), -10% per appearance scale point under 5. -10% if B student, -20% A student, -40% if honor roll, 0% if C student, +5% if D, +10% if failing school. -20% nerd, 0% if cool kid, -10% if jock, +20% if gopnik.
 		act 'Continue': 
 			*clr & cla
 			gs 'gschool_events', 'sweet'
@@ -811,7 +817,6 @@ if $ARGS[0] = 'caught1':
 					gt 'gschool_office', 'principal'
 				end
 			else
-				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtffinger.jpg"></center>'
 				'Ms Braakman looks at you for a long moment. You can tell that she is seriously considering her options, can see a hardness in her eyes give way to lust. She seems to be struggling with herself, but her words leave no doubt as to which side came out on top: "Take off your skirt and panties." Suppressing a smile, you do as she tells you and you get naked from the waist down. Once you are, she bends you over the sink, sucking on two of her fingers as she goes. With her other hand, she gives your bare ass several hard swats of the kind that make you yelp and leaves your butt red and stinging, but you almost immediately forget about that when she slides her wet fingers inside your pussy and starts finger-banging you with one hand. Ms Braakman doesn''t ease up on the spanking but now all the pain does is add to the pleasure.'
 				*nl
@@ -830,6 +835,7 @@ if $ARGS[0] = 'caught1':
 					*nl
 					'You keep up your rhythm but move with more force, pushing your lips and tongue harder against her weak spots, and slip your fingers inside of her too, fingerfucking her like she did you. Within moments, she shudders and cries out, quivering against her mouth, her juices running down your chin and hand.'
 					gs 'arousal', 'cuni_give', 10, 'lesbian', 'sub'
+					gs 'arousal', 'end'
 					gs 'stat'
 					'She basks in the afterglow, rhythmically moving against you still but without the need that drove her before. Once she has come back to her senses, she immediately lets go off your hair and moves her leg back down. Your teacher awkwardly moves past you and starts getting dressed, and even as you join her at the sinks to wash her secretions off of you, she avoids your curious gaze. "This never happened, you understand? You stay in this stall until I leave, and we will both forget this ever happened." It would seem that she''s regretting your encounter, now that her lust is sated and she''s cleaning herself up. Still, you nod, and a few seconds later, she hastily leaves the bathroom. Alone once more, you gather up your clothes and get dressed - looks like your still have a little bit of time to kill before the bell rings.'
 					if school_bunk = 0:
@@ -863,10 +869,8 @@ if $ARGS[0] = 'caught2':
 	end
 	act 'Sweet talk him':
 		*clr & cla
-!!sweet talk has two versions, success and failure.  Chance it works 40% base + 5% per appearance scale point above 5(1-10 range), -5% per appearance scale point under 5. +5% if A student, +10% if honor roll, -5% if C student, -10% if D, -20% if failing school. +10 nerd, +5% if cool kid, +10% if jock, -10% if gopnik.
-		gs 'gschool_events', 'sweet'
-		if grupTipe = 4: Sweet_talk += 10
-		if rand(1,100) < Sweet_talk + 40:
+		gs 'gschool_events', 'sweet', 'normal'
+		if rand(1,100) < Sweet_talk:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
 			'You hang your head and feign shame as best you can. "I know, and I''m sorry, sir, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have but I couldn''t help it." You give him a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
 			'The teacher looks at you and snorts. "Do you really think I am dumb enough to fall for that?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall, then leads you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
@@ -892,11 +896,10 @@ if $ARGS[0] = 'caught2':
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
 		'You get down on your knees in front of him and hike up your skirt just a little bit to reveal more of your legs. When you are sure you have his eyes on you, you look up at him and suggestively lick your lips. "You seem tense, sir. How about I help you relax a little bit and you just pretend you didn''t see me here?"'
-!!blowjob has two versions, success and failure. Chance it works. 35% base + 5% per appearance scale point above 5(1-10 range), -10% per appearance scale point under 5. -10% if A student, -20% if honor roll, +5% if C student, +10% if D, +20% if failing school. -20% nerd, +10% if cool kid, +10% if jock, +20% if gopnik.
 		act 'Continue':
 			*clr & cla
-			gs 'gschool_events', 'sweet'
-			if rand(1,100) < Sweet_talk + 35:
+			gs 'gschool_events', 'sweet', 'sex'
+			if rand(1,100) < Sweet_talk:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
 				'The teacher looks at you and snorts. "Please, don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall, then leads you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
 				'He is nothing if not a man of his word, and he drags you down the hall, by your arm, until you are standing in front of the principal''s office.'
@@ -914,6 +917,7 @@ if $ARGS[0] = 'caught2':
 				*nl
 				'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him deeper inside, too, as deep into your mouth as you can without gagging. He starts moaning now, all false pretense of self-possession gone, completely at the mercy of you, his student, right here in a school bathroom - the thought is empowering and intoxicating. You feel his hand dig into your hair and can tell that he is getting close to cumming.'
 				gs 'arousal', 'bj', 10, 'dom'
+				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
@@ -940,11 +944,10 @@ if $ARGS[0] = 'caught2':
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
 		'You get up and walk past him, out of the stall, then bend over against the wall. One of your hand runs down to your butt and you hike the skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at Mr Vasilyev over your shoulder, and now you say: "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your butt.'
-!!offer sex has two versions, success and failure. Chance it works. 20% base + 5% per appearance scale point above 5(1-10 range), -10% per appearance scale point under 5. -10% if A student, -20% if honor roll, +5% if C student, +10% if D, +20% if failing school. -20% nerd, +10% if cool kid, +10% if jock, +20% if gopnik.
 		act 'Continue':
 			*clr & cla
-			gs 'gschool_events', 'sweet'
-			if rand(1,100) < Sweet_talk + 20:
+			gs 'gschool_events', 'sweet', 'sex'
+			if rand(1,100) < Sweet_talk:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
 				'Your teacher looks at you and snorts. "Please, don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall, then leads you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
 				'He is nothing if not a man of his word, and he drags you down the hall, by your arm, until you are standing in front of the principal''s office.'
@@ -967,9 +970,8 @@ if $ARGS[0] = 'caught2':
 					gs 'arousal', 'bj', 10, 'dom'
 					gs 'stat'
 					'He enjoys your blowjob in silence and after several minutes of this, he grabs you by the hair and roughly pulls you up and over to the sinks.'
-!!if sveta is a virgin skip vaginal and go to cum act below.
 					if pcs_vag = 0:
-						act 'Cum': gt 'gschool_girls_bathroom', 'caught2_cum'
+						act 'Cum': gs 'arousal', 'end' & gt 'gschool_girls_bathroom', 'caught2_cum'
 					else
 						act 'Vaginal':
 							*clr & cla
@@ -983,6 +985,7 @@ if $ARGS[0] = 'caught2':
 							$orgasm_txt = 'With an unexpectedly considerate lover like that, it doesn''t take long until you orgasm and scream out your ecstasy, your wet folds twitching around your teacher''s hard cock. He doesn''t let up, though, and his stamina seems to know no limit, violating your pussy in all the right ways. A second orgasm and even a third shake you before he finally starts to grunt.'
 							$orgasm_or = 'custom'
 							gs 'arousal', 'vaginal', 10, 'dom'
+							gs 'arousal', 'end'
 							gs 'stat'
 
 							act 'Cum': gt 'gschool_girls_bathroom', 'caught2_cum'
@@ -1039,6 +1042,7 @@ if $ARGS[0] = 'caught3':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caughtpr5.jpg"></center>'
 					'As you lick her shoes, she reaches down and grabs you by the hair and twists it painfully in her hand, yanking you to your feet by your hair painfully. Once back on your feet she pushes you forward bending you over, her hand in you hair holds you in place while her other hand pulls up your skirt and pulls your panties down around your knees.'
 					gs 'arousal', 'foreplay', 10, 'sub', 'maso'
+					gs 'arousal', 'end'
 					gs 'stat'
 					if $pantyworntype = 'none': 'As you lick her shoes, she reaches down and grabs you by the hair and twists it painfully in her hand, yanking you to your feet by your hair painfully. Once back on your feet she pushes you forward bending you over, her hand in you hair holds you in place while her other hand pulls up your skirt and when she can''t find your panties. She twists your hair painfully. "You dirty little slut, where are your panties? From now on you better be wearing panties in my school, you hear me?!" She''s not waiting for a reply.'
 					*nl
@@ -1048,8 +1052,9 @@ if $ARGS[0] = 'caught3':
 						'Once your bare ass is exposed your begins to spank it with her open hand. She uses the full force of her swings to deliver stinging slaps to your bare ass. She spanks you until your ass is cherry red, she seems to only stop when her hand starts to hurt to much from spanking you to continue. She finally lets go of you and steps away. "In addition you will report to detention this weekend. Now get your ass to class and I don''t want to catch you cutting class again, you understand?" You nod your head and wipe away the tears, you straighten up your clothes and go to class.'
 					else
 						gs 'pain', 2, 'asscheeks', 'spank'
-						'Once your bare ass is exposed your begins to spank it with her open hand. She uses the full force of her swings to deliver stinging slaps to your bare ass. She spanks you until your ass is cherry red, she seems to only stop when her hand starts to hurt to much from spanking you to continue. She finally lets go of you and steps away. "In addition you will report to my office after school. Now get your ass to class and I don''t want to catch you cutting class again, you understand?" You nod your head and wipe away the tears, you straighten up your clothes and go to class.'
-						'DEV NOTE: This is not available yet.'
+						'Once your bare ass is exposed your begins to spank it with her open hand. She uses the full force of her swings to deliver stinging slaps to your bare ass. She spanks you until your ass is cherry red, she seems to only stop when her hand starts to hurt to much from spanking you to continue. She finally lets go of you and steps away.' 
+!!Todo: Has to be written
+!!						'"In addition you will report to my office after school. Now get your ass to class and I don''t want to catch you cutting class again, you understand?" You nod your head and wipe away the tears, you straighten up your clothes and go to class.'
 					end
 					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end