[fixes] for the school and other stuff

locations/HotelWork.qsrc

@@ -1094,7 +1094,7 @@ if $ARGS[0] = 'maid':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/a.jpg"></center>'
 									if lariskaMotherKnown = 1:
-										'You weren''t fast enough, "Got you, <<pcs_nickname>>!" You are quite embarrassed, as you were found out, "Did you like the show?" Anna asks.'
+										'You weren''t fast enough, "Got you, <<$pcs_nickname>>!" You are quite embarrassed, as you were found out, "Did you like the show?" Anna asks.'
 										'Not able to say anything to your defense and being afraid she might get you fired, you remain silent.'
 										'"Come on, cheer up, I''m not angry. I know you have been spying on me for some time" Anna smiles.'
 										'You quickly try to come up with an excuse, "I-I..." you stammer.'

locations/anushka.qsrc

@@ -711,7 +711,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 			'You listen and don''t hear anything at all. "No I don''t hear anything."'
 			'She grins at you. "Yeah means the janitor has moved on, so we can head out. Come on lets go." She gets up and heads for the door, she opens it slowly and then looks out both ways checking to see if it is clear. Then she steps out and hurries down the hall, with you just behind her.'
 			*nl
-			'The two of you quickly make your way back to the library, sneaking back in the way you left. Heading back to where you stashed your clothes the two of you start to get dressed again. Just as the two of you get your clothes back on, the bell that signals detention is over starts ringing. She looks at you and smiles. "Perfect timing, as always. See you later <<pcs_nickname>>, unless you want to come over?"'
+			'The two of you quickly make your way back to the library, sneaking back in the way you left. Heading back to where you stashed your clothes the two of you start to get dressed again. Just as the two of you get your clothes back on, the bell that signals detention is over starts ringing. She looks at you and smiles. "Perfect timing, as always. See you later <<$pcs_nickname>>, unless you want to come over?"'
 			'With that the two of you leave school.'
 			act 'Can''t today': gt 'gschool_grounds', 'main'
 			act 'Go with Anushka':

locations/gschool_boys_bathroom.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'boy2':
 	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:
+		if will_cost <= pcs_willpwr:
 			act 'Stop him (<<will_cost>> willpower)':
 				*clr & cla
 				gs 'willpower', 'resist'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'boy2':
 				gs 'arousal', 'foreplay', 5
 				gs 'stat'
 				gs 'willpower', 'sex'
-				if will_cost >= pcs_willpwr:
+				if will_cost <= pcs_willpwr:
 					act 'Slap him (<<will_cost>> willpower)':
 						gs 'willpower', 'resist'
 						*clr & cla
@@ -325,7 +325,7 @@ if $ARGS[0] = 'boy3':
 	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.'
 		gs 'willpower', 'sex'
-		if will_cost >= pcs_willpwr: 
+		if will_cost <= pcs_willpwr: 
 			act 'Stop him (<<will_cost>> willpower)':
 				*clr & cla
 				gs 'willpower', 'resist'
@@ -341,7 +341,7 @@ if $ARGS[0] = 'boy3':
 				'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:
+				if will_cost <= pcs_willpwr:
 					act '"I said, ''no''" (<<will_cost>> willpower)':
 						*clr & cla
 						gs 'willpower', 'resist'
@@ -735,7 +735,7 @@ if $ARGS[0] = 'boy6':
 		*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.'
 		gs 'willpower', 'sex'
-		if will_cost >= pcs_willpwr:
+		if will_cost <= pcs_willpwr:
 			act 'Run out (<<will_cost>> willpower)':
 				*clr & cla
 				gs 'willpower', 'resist'
@@ -768,7 +768,7 @@ if $ARGS[0] = 'boy6':
 		'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:
+		if will_cost <= pcs_willpwr:
 			act '"Not today" (<<will_cost>> willpower)':
 				gs 'willpower', 'resist'
 				gt 'gschool_boys_bathroom', 'boy6_not'
@@ -808,7 +808,7 @@ if $ARGS[0] = 'boy6_not':
 	*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.'
 	gs 'willpower', 'sex'
-	if will_cost >= pcs_willpwr:
+	if will_cost <= pcs_willpwr:
 		act 'Leave (<<will_cost>> willpower)':
 			cla
 			gs 'willpower', 'resist'
@@ -1363,7 +1363,7 @@ 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?"'
 
-		gs 'school_events', 'sweet', 'sex'
+		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."'

locations/gschool_break.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'girls_restroom_events':
 		menu_off = 0
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sisters.jpg"></center>'
-		'As you walk into the girls bathroom, Katja grabs you and drags you over against the wall next to the door. "Come on <<pcs_nickname>>, pose for a photo with us."' 
+		'As you walk into the girls bathroom, Katja grabs you and drags you over against the wall next to the door. "Come on <<$pcs_nickname>>, pose for a photo with us."' 
 		'She pulls you in close on her right side and wraps one of her legs halfway around you, as you hold it. Vicky wraps an arm and almost a leg around Katja from the left. The three of you do your best to strike several sexy poses, as Lizaveta takes your picture. After several such pictures, the Meynold sisters each kiss you on the cheek before hurrying out. Lizaveta is a bit slower and gives you a knowing smile, before leaving as well. You wonder just what Lizaveta knows and, being the gossip that she is, who else knows as you finish your business and go back to your lunch break.'
 		
 		gs 'gschool_break', 'restroom_actions'
@@ -687,7 +687,7 @@ if $ARGS[0] = 'boys_restroom_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/ivan1.jpg"></center>'
 		if hotcat >= 6 or IvanShowerQW > 0:
-			'You walk into the boys room and see Ivan washing his hands at the sinks. He glances up as you walk in and he smiles. "<<pcs_nickname>> what''s up, get lost?"'
+			'You walk into the boys room and see Ivan washing his hands at the sinks. He glances up as you walk in and he smiles. "<<$pcs_nickname>> what''s up, get lost?"'
 			'You blush a bit. "Um no, I... I don''t know just felt like checking out the boys room."'
 			'He laughs a bit. "Are you sure that is all you wanted? Are you sure you weren''t craving a cock up your ass? If so I could totally help you out with that." He says with a wink.'
 			'You cock your head to one side. "So you just want me to turn around and let you shove your dick up my ass?" You ask with one brow slightly arched.'
@@ -738,7 +738,7 @@ if $ARGS[0] = 'boys_restroom_events':
 								*clr & cla
 								npc_rel['A3'] += 3
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/ivan6.jpg"></center>'
-								'His cock barely leaves your gapping asshole, before he moans loudly and you feel the hot splatter of cum on your butt cheeks. After several more spurts of hot cum on your ass, he leans forward and kisses the back of your neck. "You''re the best <<pcs_nickname>>" Then he steps away, pulls his pants up, and puts his shirt back on.'
+								'His cock barely leaves your gapping asshole, before he moans loudly and you feel the hot splatter of cum on your butt cheeks. After several more spurts of hot cum on your ass, he leans forward and kisses the back of your neck. "You''re the best <<$pcs_nickname>>" Then he steps away, pulls his pants up, and puts his shirt back on.'
 								'As he finishes dressing he says: "Hey thanks for the fuck and all, but I need to get going. Talk to you later." And with that he jogs out of the bathroom, leaving you to clean up alone.'
 								gs 'cum_call', 'butt', 'A3'
 								gs 'arousal', 'voyeur', 2, 'unknown'
@@ -754,7 +754,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			*clr & cla
 			menu_off = 0
 			gs 'stat'
-			'You walk into the boys room and see Ivan washing his hands at the sinks. He glances up as you walk in and he smiles. "<<pcs_nickname>> what''s up, get lost?"'
+			'You walk into the boys room and see Ivan washing his hands at the sinks. He glances up as you walk in and he smiles. "<<$pcs_nickname>> what''s up, get lost?"'
 			'You blush a bit. "Um no, I... I don''t know, just felt like checking out the boys room."'
 			'He laughs a bit. "Don''t sweat it, I won''t tell. Well have fun, catch you later." He says with a wink, as he walks out.'
 			gs 'gschool_break', 'restroom_actions'
@@ -939,7 +939,7 @@ if $ARGS[0] = 'andrey_cum':
 	menu_off = 1
 	npc_rel['A147'] += 3
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/andrey6.jpg"></center>'
-	'While on your knees with your mouth open, he jerks his cock until cum is raining down on your face. Some of it goes into your open mouth, but most of it splatters all over your face. Once his dick starts to get flaccid, he pulls up his pants and tucks it away, then rebuttons his shirt. "I really needed that <<pcs_nickname>>, glad you are such cool chick."'
+	'While on your knees with your mouth open, he jerks his cock until cum is raining down on your face. Some of it goes into your open mouth, but most of it splatters all over your face. Once his dick starts to get flaccid, he pulls up his pants and tucks it away, then rebuttons his shirt. "I really needed that <<$pcs_nickname>>, glad you are such cool chick."'
 	'As you get dressed, you reply. "I enjoyed myself."'
 	'He nods and smiles "Well see you later." and with that he walks out of the bathroom, leaving you to finish cleaning up.'
 	gs 'cum_call', 'face', 'A147'
@@ -964,7 +964,7 @@ if $ARGS[0] = 'join_alylav':
 		*clr & cla
 		gs 'boyStat', 'A155'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/couplefuck.jpg"></center>'
-		'While you are sucking Lavrenti''s cock, he and Alyona undress you. Once you are undressed, she begins to undress herself as well. Once completely naked he says: "Turn around <<pcs_nickname>> so I can fuck that pussy of yours."'
+		'While you are sucking Lavrenti''s cock, he and Alyona undress you. Once you are undressed, she begins to undress herself as well. Once completely naked he says: "Turn around <<$pcs_nickname>> so I can fuck that pussy of yours."'
 		'You get up and barely have time to turn around, before you feel the tip of his dick pushing against your slit. His <<dick>>cm <<$dick_girth>> cock slides in your wet pussy fairly easily. He grabs a hold of your hips and starts fucking you hard and rough. The slapping sound of flesh on flesh echoes in the bathroom, as the two of you fuck wildly. Alyona rubs her clit, while she watches the two of you fuck. After several minutes she speaks up. "Ok enough, I need to get fucked too."'
 		gs 'arousal', 'vaginal', 5
 		gs 'stat'
@@ -979,7 +979,7 @@ if $ARGS[0] = 'join_alylav':
 			act 'Share the cum':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/couplecum.jpg"></center>'
-				'As you step closer and drop to your knees, so does Alyona. With both of you kneeling side by side in front of Lavrenti, he begins to jerk his cock right in front of both of your faces, when a sudden large spurt of cum hits you in the chin. Several smaller spurts land on your tits and on Alyona''s face. With the final few drops falling, he finally sighs loudly. "Fuck that was amazing, we should really do this again. Alyona, you and <<pcs_nickname>> both have tight pussies."'
+				'As you step closer and drop to your knees, so does Alyona. With both of you kneeling side by side in front of Lavrenti, he begins to jerk his cock right in front of both of your faces, when a sudden large spurt of cum hits you in the chin. Several smaller spurts land on your tits and on Alyona''s face. With the final few drops falling, he finally sighs loudly. "Fuck that was amazing, we should really do this again. Alyona, you and <<$pcs_nickname>> both have tight pussies."'
 				*nl
 				'With that Alyona and you start to get dressed and Lavrenti pulls up his pants. Alyona responds. "It was ok, I suppose. Maybe if I get bored enough again, we will see.". Alyona cleans up and heads for the door, with Lavrenti following her and him saying: "Oh please, you loved it and you know it." To which she replies. "You wish, it was okayish." They continue to banter about it, discussing if she liked it or not, as they walk out.'
 				gs 'cum_call', 'face', 'A155'
@@ -1023,7 +1023,7 @@ if $ARGS[0] = 'smoke2':
 				*clr & cla
 				demerit += 10
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo3.jpg"></center>'
-				'Mrs Braakman stops in front of your stall and reaches in and grabs you by the arm, pulling you out of the stall, while wagging her finger at you. "Miss <<pcs_lastname>>, you know the rules for smoking in school."'
+				'Mrs Braakman stops in front of your stall and reaches in and grabs you by the arm, pulling you out of the stall, while wagging her finger at you. "Miss <<$pcs_name>>, you know the rules for smoking in school."'
 				act 'Apologize':
 					*clr & cla
 					minut += 2
@@ -1227,9 +1227,9 @@ if $ARGS[0] = 'lena_gop':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena5.jpg"></center>'
 				'As you move up behind her, she reaches back and guides the dildo into her wet pussy. It slides in easily and she moans loudly as it does, you begin to thrust into her slowly at first. Then picking up speed the louder she moans and she starts to buck back against you, trying to take more of the dildo into her. She fuck herself, pushing in the full length of the dildo, until she cries out trembling, obviously having an intense orgasm.'
 				*nl
-				'Once she stops trembling, she pulls away and starts to get cleaned up. You do the same as you take off the strapon. "Hey <<pcs_nickname>>, thanks I needed that."'
+				'Once she stops trembling, she pulls away and starts to get cleaned up. You do the same as you take off the strapon. "Hey <<$pcs_nickname>>, thanks I needed that."'
 				'You smile to her. "Glad I could help you out." She can hear the humor in your voice and laughs a little. Once dressed, she takes the strapon from you and cleans it off in the sink, before putting it back in her bag.'
-				'As she heads out. "See you around <<pcs_nickname>>."'
+				'As she heads out. "See you around <<$pcs_nickname>>."'
 				gs 'arousal', 'vaginal_strap_give', 5, 'lesbian'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -1260,9 +1260,9 @@ if $ARGS[0] = 'lena_gop':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena5.jpg"></center>'
 					'As you move up behind her, she reaches back and guides the dildo into her wet pussy. It slides in easily and she moans loudly as it does, you begin to thrust into her slowly at first. Then picking up speed the louder she moans and as she starts to buck back against you, trying to take more of the dildo into her. She fuck herself, pushing in the full length of the dildo, until she cries out trembling, obviously having an intense orgasm.'
 					*nl
-					'Once she stops trembling, she pulls away and starts to get cleaned up. You do the same, as you take off the strapon. "Hey <<pcs_nickname>>, thanks I needed that."'
+					'Once she stops trembling, she pulls away and starts to get cleaned up. You do the same, as you take off the strapon. "Hey <<$pcs_nickname>>, thanks I needed that."'
 					'You smile to her. "Glad I could help you out." She can hear the humor in your voice and laughs a little. Once dressed she takes the strapon from you and cleans it off in the sink, before putting it back in her bag.'
-					'As she heads out. "See you around <<pcs_nickname>>."'
+					'As she heads out. "See you around <<$pcs_nickname>>."'
 					gs 'arousal', 'vaginal_strap_give', 5, 'lesbian'
 					gs 'arousal', 'end'
 					gs 'stat'

locations/gschool_chats.qsrc

@@ -9,23 +9,16 @@ if $ARGS[0] = 'nerds':
 		
 		act 'Ignore it': gschool_ignore = 1 & gt 'gschool_chats', 'nerds'
 		act 'Identify the perpetrator': gt 'gschool_events', 'rand_scoolboy'
-	elseif grupTipe = 3:
-		killvar 'gschool_ignore'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/chat/nerd' + rand(1,3) + '.jpg"></center>'
-		'You go to the classrooms that you and your fellow nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, as usual.'
-		'Sitting around the table is <a href="exec:gt ''gschool_chats2'',''artem''">Artem</a>, <a href="exec:gt ''gschool_chats2'',''feofan''">Feofan</a>, <a href="exec:gt ''gschool_chats2'',''gerasim''">Gerasim</a>, <a href="exec:gt ''gschool_chats2'',''evgeny''">Evgeny</a>, <a href="exec:gt ''gschool_chats2'',''petka''">Petka</a>, <a href="exec:gt ''gschool_chats2'',''zinaida''">Zinaida</a>, <a href="exec:gt ''gschool_chats2'',''natasha''">Natasha</a>, and <a href="exec:gt ''gschool_chats2'',''julia''">Julia</a>. The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today. <a href="exec:gt ''gschool_chats2'',''petia''">Petia</a> is roaming around, like is is about to approach someone. Meanwhile <a href="exec:gt ''gschool_chats2'',''lesco''">Lesco</a> sits at a desk and reads a book.'
-		if soniaPS > 0: '<a href="exec:gt ''gschool_chats2'',''sonia''">Sonia</a> is sitting at a desk typing on her phone.'
-		if fedormasha = 1: '<a href="exec:gt ''gschool_chats2'',''fedor''">Fedor</a> is sitting at a window sill looking outside, looking lonely and depressed.'
-		if zverSlutQW >= 2: 'While <a href="exec:gt ''gschool_chats2'',''christina''">Christina</a> is sitting at a desk looking forlorn.'
-		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
 		killvar 'gschool_ignore'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/chat/nerd' + rand(1,3) + '.jpg"></center>'
-		'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects.'
-		'Sitting around the table is <a href="exec:gt ''gschool_chats2'',''artem''">Artem</a>, <a href="exec:gt ''gschool_chats2'',''feofan''">Feofan</a>, <a href="exec:gt ''gschool_chats2'',''gerasim''">Gerasim</a>, <a href="exec:gt ''gschool_chats2'',''evgeny''">Evgeny</a>, <a href="exec:gt ''gschool_chats2'',''petka''">Petka</a>, <a href="exec:gt ''gschool_chats2'',''zinaida''">Zinaida</a>, <a href="exec:gt ''gschool_chats2'',''natasha''">Natasha</a>, and <a href="exec:gt ''gschool_chats2'',''julia''">Julia</a>. The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today. <a href="exec:gt ''gschool_chats2'',''petia''">Petia</a> is roaming around, like is is about to approach someone. Meanwhile <a href="exec:gt ''gschool_chats2'',''lesco''">Lesco</a> sits at a desk and reads a book.'
-		if soniaPS > 0: '<a href="exec:gt ''gschool_chats2'',''sonia''">Sonia</a> is sitting at a desk typing on her phone.'
-		if fedormasha = 1: '<a href="exec:gt ''gschool_chats2'',''fedor''">Fedor</a> is sitting at a window sill looking outside, looking lonely and depressed.'
-		if zverSlutQW >= 2: 'While <a href="exec:gt ''gschool_chats2'',''christina''">Christina</a> is sitting at a desk looking forlorn.'
+		if grupTipe = 3:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/nerd' + rand(1,3) + '.jpg"></center>'
+			'You go to the classrooms that you and your fellow nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, as usual.'
+		else	
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/nerd' + rand(1,3) + '.jpg"></center>'
+			'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects.'
+		end
+		'Sitting around the table is <a href="exec:gt ''gschool_chats2'',''artem''">Artem</a>, <a href="exec:gt ''gschool_chats2'',''feofan''">Feofan</a>, <a href="exec:gt ''gschool_chats2'',''gerasim''">Gerasim</a>, <a href="exec:gt ''gschool_chats2'',''evgeny''">Evgeny</a>, <a href="exec:gt ''gschool_chats2'',''petka''">Petka</a>, <a href="exec:gt ''gschool_chats2'',''zinaida''">Zinaida</a>, <a href="exec:gt ''gschool_chats2'',''natasha''">Natasha</a>, and <a href="exec:gt ''gschool_chats2'',''julia''">Julia</a>. The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today. <a href="exec:gt ''gschool_chats2'',''petia''">Petia</a> is roaming around, like is is about to approach someone. Meanwhile <a href="exec:gt ''gschool_chats2'',''lesco''">Lesco</a> sits at a desk and reads a book.'+iif(soniaPS = 0, '', ' <a href="exec:gt ''gschool_chats2'',''sonia''">Sonia</a> is sitting at a desk typing on her phone.')+iif (fedormasha = 0, '', ' <a href="exec:gt ''gschool_chats2'',''fedor''">Fedor</a> is sitting at a window sill looking outside, looking lonely and depressed.')+iif (zverSlutQW < 2, '', ' While <a href="exec:gt ''gschool_chats2'',''christina''">Christina</a> is sitting at a desk looking forlorn.')+'.'
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	end
 end
@@ -34,14 +27,13 @@ if $ARGS[0] = 'gopniks':
 	*clr & cla
 	minut += 5
 	if grupTipe = 4:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/chat/gopnik.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/gopnik.jpg"></center>'
 		'You go to the stairwell that you and your fellow gopnik''s like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual.'
-		'Hanging around is <a href="exec:gt ''gschool_chats3'',''vitek''">Vitek</a>, <a href="exec:gt ''gschool_chats3'',''dan''">Dan</a>, <a href="exec:gt ''gschool_chats3'',''vasily''">Vasily</a>, <a href="exec:gt ''gschool_chats3'',''radomir''">Radomir</a>, <a href="exec:gt ''gschool_chats3'',''roman''">Roman</a>, <a href="exec:gt ''gschool_chats3'',''niko''">Niko</a>, <a href="exec:gt ''gschool_chats3'',''valentin''">Valentin</a>, <a href="exec:gt ''gschool_chats3'',''arkadi''">Arkadi</a>, <a href="exec:gt ''gschool_chats3'',''lavrenti''">Lavrenti</a>, <a href="exec:gt ''gschool_chats3'',''paulina''">Pauline</a>, <a href="exec:gt ''gschool_chats3'',''Lena''">Lena</a>, <a href="exec:gt ''gschool_chats3'',''lera''">Lera</a>, <a href="exec:gt ''gschool_chats3'',''anushka''">Anushka</a>, <a href="exec:gt ''gschool_chats3'',''alyona''">Alyona</a>, and <a href="exec:gt ''gschool_chats3'',''ekaterina''">Ekaterina</a>.'
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/chat/gopnik.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/gopnik.jpg"></center>'
 		'You go to the stairwell that the gopnik''s like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
-		'Hanging around is <a href="exec:gt ''gschool_chats3'',''vitek''">Vitek</a>, <a href="exec:gt ''gschool_chats3'',''dan''">Dan</a>, <a href="exec:gt ''gschool_chats3'',''vasily''">Vasily</a>, <a href="exec:gt ''gschool_chats3'',''radomir''">Radomir</a>, <a href="exec:gt ''gschool_chats3'',''roman''">Roman</a>, <a href="exec:gt ''gschool_chats3'',''niko''">Niko</a>, <a href="exec:gt ''gschool_chats3'',''valentin''">Valentin</a>, <a href="exec:gt ''gschool_chats3'',''arkadi''">Arkadi</a>, <a href="exec:gt ''gschool_chats3'',''lavrenti''">Lavrenti</a>, <a href="exec:gt ''gschool_chats3'',''paulina''">Pauline</a>, <a href="exec:gt ''gschool_chats3'',''Lena''">Lena</a>, <a href="exec:gt ''gschool_chats3'',''lera''">Lera</a>, <a href="exec:gt ''gschool_chats3'',''anushka''">Anushka</a>, <a href="exec:gt ''gschool_chats3'',''alyona''">Alyona</a>, and <a href="exec:gt ''gschool_chats3'',''ekaterina''">Ekaterina</a>.'
 	end
+	'Hanging around is <a href="exec:gt ''gschool_chats3'',''vitek''">Vitek</a>, <a href="exec:gt ''gschool_chats3'',''dan''">Dan</a>, <a href="exec:gt ''gschool_chats3'',''vasily''">Vasily</a>, <a href="exec:gt ''gschool_chats3'',''radomir''">Radomir</a>, <a href="exec:gt ''gschool_chats3'',''roman''">Roman</a>, <a href="exec:gt ''gschool_chats3'',''niko''">Niko</a>, <a href="exec:gt ''gschool_chats3'',''valentin''">Valentin</a>, <a href="exec:gt ''gschool_chats3'',''arkadi''">Arkadi</a>, <a href="exec:gt ''gschool_chats3'',''lavrenti''">Lavrenti</a>, <a href="exec:gt ''gschool_chats3'',''pauline''">Pauline</a>, <a href="exec:gt ''gschool_chats3'',''lena''">Lena</a>, <a href="exec:gt ''gschool_chats3'',''lera''">Lera</a>, <a href="exec:gt ''gschool_chats3'',''anushka''">Anushka</a>, <a href="exec:gt ''gschool_chats3'',''alyona''">Alyona</a>, and <a href="exec:gt ''gschool_chats3'',''ekaterina''">Ekaterina</a>.'
 	act 'Leave': gt 'gschool_lessons', 'short_break'
 end
 
@@ -49,11 +41,8 @@ if $ARGS[0] = 'cooljocks':
 	*clr & cla
 	minut += 5
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/chat/cooljocks.jpg"></center>'
-	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. Around the lockers is <a href="exec:gt ''gschool_chats1'',''dimka''">Dimka</a>, <a href="exec:gt ''gschool_chats1'',''igor''">Igor</a>, <a href="exec:gt ''gschool_chats1'',''marcus''">Marcus</a>, <a href="exec:gt ''gschool_chats'',''andrey''">Andrey</a>, <a href="exec:gt ''gschool_chats'',''mefodiy''">Mefodiy</a>, <a href="exec:gt ''gschool_chats1'',''albina''">Albina</a>, <a href="exec:gt ''gschool_chats1'',''vicky''">Viktoriya</a>, <a href="exec:gt ''gschool_chats1'',''katja''">Katja</a>, <a href="exec:gt ''gschool_chats1'',''stasya''">Stasya</a>, <a href="exec:gt ''gschool_chats1'',''irina''">Irina</a>, <a href="exec:gt ''gschool_chats1'',''lizaveta''">Lizaveta</a>, <a href="exec:gt ''gschool_chats1'',''lazar''">Lazar</a>, <a href="exec:gt ''gschool_chats1'',''ivan''">Ivan</a>, <a href="exec:gt ''gschool_chats1'',''svyatoslav''">Svyatoslav</a>, <a href="exec:gt ''gschool_chats1'',''vanya''">Vanya</a>, <a href="exec:gt ''gschool_chats1'',''erast''">Erast</a>, <a href="exec:gt ''gschool_chats1'',''bella''">Bella</a>, <a href="exec:gt ''gschool_chats1'',''veronika''">Veronika</a>, <a href="exec:gt ''gschool_chats1'',''lariska''">Lariska</a>, <a href="exec:gt ''gschool_chats1'',''lina''">Lina</a>'+iif(zverSlutQW >= 2 and fedormasha = 1 and soniaPS > 0, '.', ',')	
-	if soniaPS = 0: '<a href="exec:gt ''gschool_chats1'',''sonia''">Sonia</a>'+iif(zverSlutQW >= 2 and fedormasha = 1, '.', ',')
-	if fedormasha = 0: '<a href="exec:gt ''gschool_chats1'',''fedor''">Fedor</a>'+iif(zverSlutQW >= 2, '.', ',')
-	if zverSlutQW < 2: 'and <a href="exec:gt ''gschool_chats1'',''christina''">Christina</a>.'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
+	'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know. The guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building. Around the lockers is <a href="exec:gt ''gschool_chats1'',''dimka''">Dimka</a>, <a href="exec:gt ''gschool_chats1'',''igor''">Igor</a>, <a href="exec:gt ''gschool_chats1'',''marcus''">Marcus</a>, <a href="exec:gt ''gschool_chats1'',''andrey''">Andrey</a>, <a href="exec:gt ''gschool_chats1'',''mefodiy''">Mefodiy</a>, <a href="exec:gt ''gschool_chats1'',''albina''">Albina</a>, <a href="exec:gt ''gschool_chats1'',''viktoriya''">Viktoriya</a>, <a href="exec:gt ''gschool_chats1'',''katja''">Katja</a>, <a href="exec:gt ''gschool_chats1'',''stasya''">Stasya</a>, <a href="exec:gt ''gschool_chats1'',''irina''">Irina</a>, <a href="exec:gt ''gschool_chats1'',''lizaveta''">Lizaveta</a>, <a href="exec:gt ''gschool_chats1'',''lazar''">Lazar</a>, <a href="exec:gt ''gschool_chats1'',''ivan''">Ivan</a>, <a href="exec:gt ''gschool_chats1'',''svyatoslav''">Svyatoslav</a>, <a href="exec:gt ''gschool_chats1'',''vanya''">Vanya</a>, <a href="exec:gt ''gschool_chats1'',''erast''">Erast</a>, <a href="exec:gt ''gschool_chats1'',''bella''">Bella</a>, <a href="exec:gt ''gschool_chats1'',''veronika''">Veronika</a>, <a href="exec:gt ''gschool_chats1'',''lariska''">Lariska</a>, <a href="exec:gt ''gschool_chats1'',''lina''">Lina</a>'+iif(soniaPS = 0, ', <a href="exec:gt ''gschool_chats1'',''sonia''">Sonia</a>', '')+iif (fedormasha = 0, ', <a href="exec:gt ''gschool_chats1'',''fedor''">Fedor</a>', '')+iif (zverSlutQW < 2, ' and <a href="exec:gt ''gschool_chats1'',''christina''">Christina</a>', '')+'.'
 	act 'Leave': gt 'gschool_lessons', 'short_break'
 end
 

locations/gschool_chats1.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'dimka':
 			end
 		else
 			'You bite your lower lip nervously and look down, as you shake you head. "No, just give me a little more time and I will have it please?" You beg him.'
-			'He sighs. "I like you <<pcs_nickname>>, I do. But I can''t just let you slide, how about you pay me a little interest and you can pay me later." The way he says it, it leaves you no doubt exactly what he considers <i>interest</i> and it isn''t money.'
+			'He sighs. "I like you <<$pcs_nickname>>, I do. But I can''t just let you slide, how about you pay me a little interest and you can pay me later." The way he says it, it leaves you no doubt exactly what he considers <i>interest</i> and it isn''t money.'
 			act 'Go with Dimka': gt 'gschool_chats1', 'dimka_sex'
 		end
 	elseif npc_rel['A1'] >= 50 and pav_slut < 125:
@@ -301,7 +301,7 @@ if $ARGS[0] = 'igor_peg':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
 						'Feeling better and knowing he feels better. You give him a few last hard deep thrusts before pulling out of him. You take the harness off and clean up the dildo before putting them back in your purse. Then you both get dressed, just as you both finish getting dressed the bell rings for next class. You slap him on the ass which makes him yelp a little, as you walk out of the class room with him. "Talk to you later Igor." You say to him with a wink.'
-						'He blushes and nods, as he replies. "Talk to you later <<pcs_nickname>>." With that you both hurry to your next class.'
+						'He blushes and nods, as he replies. "Talk to you later <<$pcs_nickname>>." With that you both hurry to your next class.'
 						act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 					end
 				end
@@ -310,7 +310,7 @@ if $ARGS[0] = 'igor_peg':
 	end
 end
 
-if $ARGS[0] = 'katya':
+if $ARGS[0] = 'katja':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
@@ -657,7 +657,7 @@ if $ARGS[0] = 'mefodiy':
 			'"You really couldn''t be more wrong," you tease him.'
 			'He takes a moment to think. "Hmm... ah, you''re right! What I should have said was <i>incredibly handsome and hilarious</i>. Thanks for correcting me, <<$pcs_nickname>>," he says with a wink.'
 		end
-	if npc_rel['A148'] <= 20 and pav_slut < 125:
+	elseif npc_rel['A148'] <= 20 and pav_slut < 125:
 		npc_rel['A148'] += 1
 		if grupTipe = 1:
 			'"It doesn''t take much to get on people''s good sides, just look at me, even I can manage it, so why can''t you?" Mefodiy seems disappointed that you''re not getting along better, but at least he seems willing to give you a chance still.'
@@ -669,7 +669,6 @@ if $ARGS[0] = 'mefodiy':
 	else 
 		npc_rel['A148'] += 1
 		'Mefodiy has you laughing nonstop the entire time you''re hanging out with him. You lose track of time and in the end feel a bit disappointed that break is nearly over.'
-		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -745,7 +744,7 @@ if $ARGS[0] = 'stasya':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
-if $ARGS[0] = 'Irina':
+if $ARGS[0] = 'irina':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
@@ -900,7 +899,7 @@ if $ARGS[0] = 'svyatoslav':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
-if $ARGS[0] = 'Vanya':
+if $ARGS[0] = 'vanya':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'

locations/gschool_chats2.qsrc

@@ -328,11 +328,9 @@ if $ARGS[0] = 'petia':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/47.jpg"></center>'
-	
-	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-	
+		
 	if hotcat >= 6:
-		'As you enter the classroom you are immediately swarmed by Petia. He gets really close to you, invading your personal space without a care, and a raunchy smell hits your nostrils. "Hey, <<pcs_nickname>>, I think you''re good-looking enough to date me. So how about it? Wanna date?" he inquires.'
+		'As you enter the classroom you are immediately swarmed by Petia. He gets really close to you, invading your personal space without a care, and a raunchy smell hits your nostrils. "Hey, <<$pcs_nickname>>, I think you''re good-looking enough to date me. So how about it? Wanna date?" he inquires.'
 		act 'Let him down gently':
 			*clr & cla
 			npc_rel['A159'] += 1
@@ -371,7 +369,7 @@ if $ARGS[0] = 'petia':
 			money -= 50
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/47.jpg"></center>'
 			'Feeling sorry and you do have the spare money. "Here Petia, go get yourself some lunch."'
-			'His eyes get huge and he takes the money from your hand, letting his hand linger against yours to long for comfort. "Thank you <<pcs_nickname>>, you are the best!" He says with a grin and, is that love in his eyes? After another awkward moment he leaves to go buy some food.'
+			'His eyes get huge and he takes the money from your hand, letting his hand linger against yours to long for comfort. "Thank you <<$pcs_nickname>>, you are the best!" He says with a grin and, is that love in his eyes? After another awkward moment he leaves to go buy some food.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Tell him to stop being such a mooch':
@@ -388,9 +386,9 @@ if $ARGS[0] = 'petia':
 	elseif npc_rel['A159'] <= 20 and pav_slut < 125:
 		npc_rel['A159'] += 1
 		if grupTipe = 5:
-			'You notice Petia desperately walking up and down the classroom trying to mooch off some stuff from the other students in the classroom. When he sees you, he breaks out into a smile and quickly starts walking towards you. "Hey <<pcs_nickname>>, do you have any money? I''m getting really hungry. The rest just bully me when I ask them." He says in a pleading voice.'
+			'You notice Petia desperately walking up and down the classroom trying to mooch off some stuff from the other students in the classroom. When he sees you, he breaks out into a smile and quickly starts walking towards you. "Hey <<$pcs_nickname>>, do you have any money? I''m getting really hungry. The rest just bully me when I ask them." He says in a pleading voice.'
 		else
-			'You notice Petia desperately walking up and down the classroom trying to mooch off some stuff from the other students in the classroom. When he sees you, he breaks out into a smile and quickly starts walking towards you. "Hey <<pcs_nickname>>, do you have any money? I''m getting really hungry."'
+			'You notice Petia desperately walking up and down the classroom trying to mooch off some stuff from the other students in the classroom. When he sees you, he breaks out into a smile and quickly starts walking towards you. "Hey <<$pcs_nickname>>, do you have any money? I''m getting really hungry."'
 		end
 		act 'Tell him you don''t':
 			*clr & cla
@@ -405,7 +403,7 @@ if $ARGS[0] = 'petia':
 			money -= 50
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/47.jpg"></center>'
 			'Feeling sorry and you do have the spare money. "Here Petia, go get yourself some lunch."'
-			'His eyes get huge and he takes the money from your hand, letting his hand linger against yours to long for comfort. "Thank you <<pcs_nickname>>, you''re the best!" He says with a grin and, is that love in his eyes? After another awkward moment he leaves to go buy lunch.'
+			'His eyes get huge and he takes the money from your hand, letting his hand linger against yours to long for comfort. "Thank you <<$pcs_nickname>>, you''re the best!" He says with a grin and, is that love in his eyes? After another awkward moment he leaves to go buy lunch.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Tell him to stop being such a mooch':
@@ -421,9 +419,11 @@ if $ARGS[0] = 'petia':
 		end
 	elseif pav_slut >= 125:
 		'When he see''s you walking over he gives you a disgusted look. "Get anyway from me you disgusting slut." With that he moves away from you. But stops a moment later, then turns back looking around a bit. Then he steps back and says. "Unless you want to give me a blowjob that is." He asks hopeful, but even you have standards and walk off instead.'
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	else 
 		npc_rel['A159'] += 1
 		'You strike up a conversation with Petia, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
 end
 	
@@ -439,7 +439,7 @@ if $ARGS[0] = 'lesco':
 	elseif npc_rel['A7'] >= 50 and pav_slut < 125:
 		npc_rel['A7'] += 1
 		if grupTipe = 5:
-			'You see Lesco sitting by himself just like usual, except when you sit with him. As you approach him with a friendly smile, he looks up and gives you a friendly smile in return. "How''s it going <<pcs_nickname>>?"'
+			'You see Lesco sitting by himself just like usual, except when you sit with him. As you approach him with a friendly smile, he looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?"'
 			*nl
 			'You tell him well enough and ask if he wants to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he Lena makes his life a living hell at home, since he moved in with his uncle''s family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		else
@@ -475,23 +475,23 @@ if $ARGS[0] = 'sonia':
 	if npc_rel['A25'] >= 50 and pav_slut < 125:
 		npc_rel['A25'] += 1
 		if grupTipe = 5:
-			'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "How''s it going <<pcs_nickname>>?" You sit down next to her and the two of you engage in a friendly conversation about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
+			'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?" You sit down next to her and the two of you engage in a friendly conversation about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
 		else
-			'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "How''s it going <<pcs_nickname>>?" You sit down next to her and the two of you engage in a friendly conversation about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
+			'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?" You sit down next to her and the two of you engage in a friendly conversation about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
 		end
 	elseif npc_rel['A25'] <= 20 and pav_slut < 125:
 		npc_rel['A25'] += 1
 		if grupTipe = 5:
-			'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and gives you a a slight frown in return. "What do you want <<pcs_nickname>>?" You sit down next to her and explain you just wanted to talk. She is reluctant at first but slowly starts to get engaged in the conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
+			'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and gives you a a slight frown in return. "What do you want <<$pcs_nickname>>?" You sit down next to her and explain you just wanted to talk. She is reluctant at first but slowly starts to get engaged in the conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
 		else
-			'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and stiffens at your approach. "What do you want <<pcs_nickname>>?" You sit down next to her and explain you just wanted to talk. She is reluctant at first but slowly starts to get engaged in the conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
+			'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and stiffens at your approach. "What do you want <<$pcs_nickname>>?" You sit down next to her and explain you just wanted to talk. She is reluctant at first but slowly starts to get engaged in the conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
 		end
 	elseif pav_slut >= 125:
 		npc_rel['A25'] += 1
 		'You see Sonia sitting by herself just like usual, except when you sit with her. As you approach her with a friendly smile, she looks up and gives you a friendly smile in return. "What''s up slut?" You laugh sit down next to her telling her about your day. The two of you banter back and forth about who''s breath smells like cum and discuss each of your latest sexcapades.'
 	else 
 		npc_rel['A25'] += 1
-		'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and stiffens slightly at your approach. "Do you need something <<pcs_nickname>>?" You sit down next to her and the two of you engage in a conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
+		'You see Sonia sitting by herself just like usual. As you approach her with a friendly smile, she looks up and stiffens slightly at your approach. "Do you need something <<$pcs_nickname>>?" You sit down next to her and the two of you engage in a conversation, the two of you talk about fashion, makeup and many other things. Sonia seems well versed in those two especially.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end

locations/gschool_chats3.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'vitek':
 		elseif wil_cost < pcs_willpwr:
 			'You don''t have enough willpower to argue against it.'
 		end
-	if grupTipe = 4 and gopnik_slut = 1:
+	elseif grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A9'] += 1
 		'You go over and sit on the stairs near Vitek. After you sit down, he turns to you, "What''s up, slut?" You grimance slightly, but what can you say, you pretty much are the gopnik''s party slut by choice.'
 		'"I just wanted to say hi and talk is all," you tell him.'
@@ -44,7 +44,7 @@ if $ARGS[0] = 'vitek':
 		if grupTipe = 4:
 			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. After a few questions he starts telling you about some of his more exciting adventures, soon you are both laughing about them and swapping stories.'
 		else
-			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you, Vitek asks, "What do you want <<pcs_nickname>>?"'
+			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you, Vitek asks, "What do you want <<$pcs_nickname>>?"'
 			'"I just wanted to say hi and talk, is all," you tell him.'
 			'He shrugs, "Whatever." He goes back to telling stories and after a few questions, starts telling you about some of his more exciting adventures. Soon you are both laughing about them.'
 		end
@@ -65,7 +65,7 @@ if $ARGS[0] = 'vitek':
 		'Seeing the mood turning dark and ugly you beat a hasty retreat, hearing the laughter behind you.'
 	else 
 		npc_rel['A9'] += 1
-		'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you, Vitek asks, "What do you want <<pcs_nickname>>?"'
+		'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you, Vitek asks, "What do you want <<$pcs_nickname>>?"'
 		'"I just wanted to say hi and talk, is all," you tell him.'
 		'He shrugs, "Whatever." He goes back to telling stories and you ask him a few questions about some of his more exciting adventures. He answers a few of your questions, but doesn''t completely ignore you at least.'
 	end
@@ -115,7 +115,7 @@ if $ARGS[0] = 'roman':
 		'As you walk up, Roman says, "Well well well, if it isn''t our little fuck bunny, you looking for a cock to hop on?"'
 		'"I just wanted to say hi and talk, is all," you tell him.'
 		'"Tell me how much you love cock then." You banter with him for a bit, he rips on you a lot, but at least he does talk to you.'
-	elseif grupTipe = 4 and pav_slut < 150:
+	elseif npc_rel['A157'] >= 50 and pav_slut < 150:
 		npc_rel['A157'] += 1
 		if grupTipe = 4:
 			'"So listen to this, I was arguing with this old hag yesterday. She wouldn''t let go that I was swearing." Roman is again telling one of his crazy stories to the group.'
@@ -152,7 +152,7 @@ if $ARGS[0] = 'dan':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
-	if grupTipe4 and gopnik_slut = 1:
+	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A10'] += 1
 		'As you walk up, Dan says, "You lost or just looking for a cock to suck?"'
 		'"I just wanted to say hi and talk, is all," you tell him.'
@@ -161,7 +161,7 @@ if $ARGS[0] = 'dan':
 		npc_rel['A10'] += 1
 		if grupTipe = 4:
 			'"Hey, Dan!" you greet him.'
-			'"What''s up <<pcs_nickname>>?," he asks you, soon the two of you are engaged in a friendly conversation.'
+			'"What''s up <<$pcs_nickname>>?," he asks you, soon the two of you are engaged in a friendly conversation.'
 		else
 			'"Hey, Dan!" you greet him. As usual, Dan is his arrogant self and barely pays you any attention.'
 			'"Oh, come on now Dan!" you tell him, "Don''t act that way, I know you like it when I talk to you."'
@@ -200,9 +200,9 @@ if $ARGS[0] = 'valentin':
 	
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
-	if grupTipe4 and gopnik_slut = 1:
+	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A58'] += 1
-		'He smiles as you walk up. "What''s up <<pcs_nickname>>?"'
+		'He smiles as you walk up. "What''s up <<$pcs_nickname>>?"'
 		'You smile back. "Nothing much, just wanted to hang out and talk."'
 		'The two of you talk about a few things, though he gets a little hands on with you at times, but you are used to it. As you start to leave, he adds, "Stop by the garage some time, I can always use a break and a quick fuck."'
 	elseif npc_rel['A158'] >= 50 and pav_slut < 150:
@@ -253,7 +253,7 @@ if $ARGS[0] = 'vasily':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/11.jpg"></center>'
-	if grupTipe4 and gopnik_slut = 1:
+	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A11'] += 1
 		'"I am surprised you don''t walk bow legged after the number of times you have been fucked <<$pcs_nickname>>," Vasily says with a laugh.'
 		'You flip him the bird as you sit down by him. After a bit the two of you talk about a variety of things, though he keeps asking about who all you have fucked or who''s dick you just got through sucking.'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'arkadi':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/41.jpg"></center>'
-	if grupTipe4 and gopnik_slut = 1:
+	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A156'] += 1
 		'As you walk up, he cups his crotch and bounces it a bit. "Yeah you want this, don''t you. Well I don''t got time to give it to you right now."'
 		'"I just wanted to talk, is all." you tell him.'
@@ -340,7 +340,7 @@ if $ARGS[0] = 'lavrenti':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/40.jpg"></center>'
-	if grupTipe4 and gopnik_slut = 1:
+	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A155'] += 1
 		'You approach Lavrenti, "So, what''s up with you Lavrenti?"'
 		'Lavrenti smiles to you, "Not a lot, my parents will be out of town next week and I was thinking of throwing a party."'
@@ -423,6 +423,7 @@ if $ARGS[0] = 'ekaterina':
 		end
 	elseif npc_rel['A145'] <= 20 and pav_slut < 150:
 		npc_rel['A145'] += 1
+		if grupTipe = 4:
 			'As you walk over to her, you see her nursing some bruised knuckles. "Get in a fight?" you ask.'
 			'She glares at you. "What fucking business is it of yours?"'
 			'You raise your palms towards her, to show you didn''t mean anything by it. "I was just asking, is all."'
@@ -448,7 +449,7 @@ end
 if $ARGS[0] = 'lera':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/21.jpg"></center>'
-	if grupTipe4 and gopnik_slut = 1:
+	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A21'] += 1
 		'As usual, you find Lera and Lena smoking on the stairs, "So, hopped on any cocks today, bunny?" Lera inquires.'
 		'You sigh slightly, "No, have you licked any pussy?" you reply.'
@@ -494,7 +495,7 @@ if $ARGS[0] = 'alyona':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/44.jpg"></center>'
 	
-	if grupTipe4 and gopnik_slut = 1:
+	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A143'] += 1
 		'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask, "What are you listening to?"'
 		'She pulls out one of the ear buds. "This new band I heard about."'
@@ -540,7 +541,7 @@ if $ARGS[0] = 'anushka':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
 	if npc_rel['A144'] >= 50 and anushkaFirstvisit = 0:
-		'"Hey <<pcs_nickname>> you want to come over at school and hang out today?"'
+		'"Hey <<$pcs_nickname>> you want to come over at school and hang out today?"'
 		act 'Not today':
 			*clr & cla
 			npc_rel['A144'] -= 1
@@ -630,7 +631,7 @@ if $ARGS[0] = 'lena':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/20.jpg"></center>'
-	if grupTipe4 and gopnik_slut = 1:
+	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A20'] += 1
 		'As usual, you find Lena smoking on the stairs, "Shouldn''t you be in the bathroom getting gangbanged?" Lena inquires with a note of disgust.'
 		'You sigh slightly, "No, I just wanted to see what you were up to." you reply.'
@@ -686,7 +687,7 @@ if $ARGS[0] = 'pauline':
 		'You talk to her for a bit and while she doesn''t ignore you, she also makes it clear she doesn''t approve too much of how you got into the gopniks.'
 	elseif npc_rel['A24'] >= 50 and pav_slut < 150:
 		npc_rel['A24'] += 1
-		if grupTipe = 3:
+		if grupTipe = 4:
 			'Seeing Pauline sitting on the steps, you approach her, "Hi Pauline! What are you up to?"'
 			'She looks back at you and shrugs her shoulders, "Hey <<$pcs_nickname>>, nothing much, just waiting for this day to end."'
 			'The two of you continue talking for a while, about how much school sucks and all the better things you could be doing with your time.'

locations/gschool_events.qsrc

@@ -585,7 +585,6 @@ if $ARGS[0] = 'rand_scoolboy':
 end
 !!end of lunch stuff.
 
-
 if $ARGS[0] = 'sweet':
 	if $ARGS[1] = 'normal' or $ARGS[1] = '':
 		if pcs_grades >= 90:

locations/gschool_girls_bathroom.qsrc

@@ -106,7 +106,7 @@ if $ARGS[0] = 'girl2':
 	'"Yeah, I couldn''t take another boring class, I needed a little fun," you tell her with a smile.'
 	'Sonia turns around and looks at you for a moment, biting her lower lip. You can tell by the way the look in her eyes that she''s considering something; her mind made up, she walks up to you, gives you a kiss and whispers seductively into your ear: "I know what we could do for fun..."'
 	gs 'willpower', 'sex'
-	if will_cost >= pcs_willpwr:
+	if will_cost <= pcs_willpwr:
 		act 'Stop her (<<will_cost>> willpower)':
 			*clr & cla
 			gs 'willpower', 'resist'
@@ -183,7 +183,7 @@ if $ARGS[0] = 'girl3':
 		'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. "I bet she thinks she''s a bad girl, for cutting class. How about we show her what happens to bad little girls?" She starts laughing and Lera joins in. You are not sure how you feel about this; they are a lot of fun, but their idea of fun can also be pretty damn mean. Part of you is strangely excited, but you are also worried about what comes next.'
 	end
 	gs 'willpower', 'sex'
-	if will_cost >= pcs_willpwr:
+	if will_cost <= pcs_willpwr:
 		act 'Try to run out (<<will_cost>> willpower)':
 			$location_type = 'public_indoors'
 			*clr & cla
@@ -218,7 +218,7 @@ if $ARGS[0] = 'girl3':
 		'Lera leans in close and blows smoke in your face while Lena says: "Oh, you want to have some fun, huh? Ok, we can have some fun with you." Glancing and smirking at Lera as she speaks, both of them grab ahold of you from each side and you''re starting to wish you had just kept your mouth shut.'
 		act 'Submit': gt 'gschool_girls_bathroom', 'toy bunny'
 		gs 'willpower', 'sex'
-		if will_cost >= pcs_willpwr:
+		if will_cost <= pcs_willpwr:
 			act 'Try to run out (<<will_cost>> willpower)':
 				$location_type = 'public_indoors'
 				*clr & cla
@@ -254,7 +254,7 @@ if $ARGS[0] = 'girl3':
 		'"Is that so, bunny? You a bad girl now? Why don''t we show you what real bad girls are like," Lena says as she steps close and grabs your arm; Lera quickly follows suit on your other side. "We''re going to have some fun with you, little bunny." Lera promises with a mean grin.'
 		act 'Submit': gt 'gschool_girls_bathroom', 'toy bunny'
 		gs 'willpower', 'sex'
-		if will_cost >= pcs_willpwr:
+		if will_cost <= pcs_willpwr:
 			act 'Try to run out (<<will_cost>> willpower)':
 				$location_type = 'public_indoors'
 				*clr & cla

locations/gschool_lessons1.qsrc

@@ -1774,13 +1774,13 @@ if $ARGS[0] = 'math_late':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem1.jpg"></center>'
-		'When you open the door and walk in Mr Tsarev stops talking and everyone turns their eyes towards you. "So good of you to join us Miss <<pcs_lastname>>." Several of the kids smirk, a few look annoyed you interrupted class or that you are getting away with being late.'
+		'When you open the door and walk in Mr Tsarev stops talking and everyone turns their eyes towards you. "So good of you to join us Miss <<$pcs_name>>." Several of the kids smirk, a few look annoyed you interrupted class or that you are getting away with being late.'
 		act 'Say your sorry':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem2.jpg"></center>'
 			'You look down a bit. "Sorry I was running late and time just got away from me."'
-			'He shakes his head slightly and sighs a bit. "Very well Miss <<pcs_lastname>> please take your seat, try not to let it happen again."'
+			'He shakes his head slightly and sighs a bit. "Very well Miss <<$pcs_name>> please take your seat, try not to let it happen again."'
 			act 'Take your seat': gt 'gschool_lessons1', 'math'
 		end
 		act 'Say nothing':
@@ -1788,7 +1788,7 @@ if $ARGS[0] = 'math_late':
 			demerit += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem2.jpg"></center>'
-			'You roll your eyes a bit but say nothing in response. He shakes his head slightly and frowns. "I will have to report this Miss <<pcs_lastname>>, now please take your seat. You have interrupted class enough."'
+			'You roll your eyes a bit but say nothing in response. He shakes his head slightly and frowns. "I will have to report this Miss <<$pcs_name>>, now please take your seat. You have interrupted class enough."'
 			act 'Take your seat': gt 'gschool_lessons1', 'math'
 		end
 	end
@@ -1805,14 +1805,14 @@ if $ARGS[0] = 'literature_late':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latel1.jpg"></center>'
 		if lit_late_counter > 15:
-			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<pcs_lastname>>, obviously we need to take sterner measures. Now come up here right now young lady!" She says as she points in front of her desk.'
+			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_name>>, obviously we need to take sterner measures. Now come up here right now young lady!" She says as she points in front of her desk.'
 			act 'Refuse':
 				*clr & cla
 				gs 'pain', 2, 'ears', 'twist'
 				demerit += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
-				'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<pcs_lastname>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
+				'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<$pcs_name>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
 				act 'Go to principal''s office': gt 'gschool_office', 'principal'
 			end
 			act 'Do as she says':
@@ -1867,14 +1867,14 @@ if $ARGS[0] = 'literature_late':
 				end
 			end
 		elseif lit_late_counter > 10:
-			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<pcs_lastname>>, obviously we need to take sterner measures. Now come up here right now young lady!" She says as she points in front of her desk.'
+			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_name>>, obviously we need to take sterner measures. Now come up here right now young lady!" She says as she points in front of her desk.'
 			act 'Refuse':
 				*clr & cla
 				gs 'pain', 2, 'ears', 'twist'
 				demerit += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
-				'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<pcs_lastname>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
+				'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<$pcs_name>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
 				act 'Go to principal''s office': gt 'gschool_office', 'principal'
 			end
 			act 'Do as she says':
@@ -1916,14 +1916,14 @@ if $ARGS[0] = 'literature_late':
 				end
 			end
 		elseif lit_late_counter > 5:
-			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<pcs_lastname>>, I warned you I would not tolerate this. Now come up here right now young lady!" She says as she points in front of her desk.'
+			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late again Miss <<$pcs_name>>, I warned you I would not tolerate this. Now come up here right now young lady!" She says as she points in front of her desk.'
 			act 'Refuse':
 				*clr & cla
 				gs 'pain', 2, 'ears', 'twist'
 				demerit += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/sleeppun2.jpg"></center>'
-				'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<pcs_lastname>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
+				'You shake your head no and then take your seat at your desk instead. As if daring her to do something about it. Her eyes flicker fiery when you disobey her and she walks over and grabs you by the ear and painfully twists your ear. She drags you out of your chair, out of the classroom and down the hall. "You will learn your place Miss <<$pcs_name>> or find yourself expelled. I will let the Head Mistress deal with you." She tells you as she drags you to the office.'
 				act 'Go to principal''s office': gt 'gschool_office', 'principal'
 			end
 			act 'Do as she says':
@@ -1941,14 +1941,14 @@ if $ARGS[0] = 'literature_late':
 				act 'Take your seat': gt 'gschool_lessons1', 'literature'
 			end
 		else
-			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late Miss <<pcs_lastname>>, I will not tolerate students being late to my class." Several of the kids smirk, a few look annoyed you interrupted class.'
+			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late Miss <<$pcs_name>>, I will not tolerate students being late to my class." Several of the kids smirk, a few look annoyed you interrupted class.'
 			act 'Say your sorry':
 				*clr & cla
 				demerit += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem2.jpg"></center>'
 				'You look down a bit. "Sorry I was running late and time just got away from me."'
-				'She shakes his head slightly and frowns. "Very well of course I will still have to report this Miss <<pcs_lastname>>, now take your seat and might I suggest you set your alarm for earlier."'
+				'She shakes his head slightly and frowns. "Very well of course I will still have to report this Miss <<$pcs_name>>, now take your seat and might I suggest you set your alarm for earlier."'
 				act 'Take your seat': gt 'gschool_lessons1', 'literature'
 			end
 			act 'Say nothing':
@@ -1956,7 +1956,7 @@ if $ARGS[0] = 'literature_late':
 				demerit += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem2.jpg"></center>'
-				'You roll your eyes a bit but say nothing in response. She narrows her eyes at you a little and frowns. "I will have to report this Miss <<pcs_lastname>>, now take your seat. You have interrupted class enough."'
+				'You roll your eyes a bit but say nothing in response. She narrows her eyes at you a little and frowns. "I will have to report this Miss <<$pcs_name>>, now take your seat. You have interrupted class enough."'
 				act 'Take your seat': gt 'gschool_lessons1', 'literature'
 			end
 		end

locations/gschool_lessons2.qsrc

@@ -1379,10 +1379,8 @@ if $ARGS[0] = 'postphys2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
 	'You enter the girls locker room and find several other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the young women in various states of undress around you, find your locker, and start to take off your clothes.'
 	gs 'gschool_gossip', 'gym'
-	act 'Get dressed': gt 'gschool_lessons2', 'dress'
 	act 'Have a shower': gt 'gschool_lessons2', 'shower'
-	act 'Use the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0:	act 'Brush your hair': gt 'mirror', 'brush'
+	act 'Get dressed': gt 'gschool_lessons2', 'dress'
 end
 
 if $ARGS[0] = 'shower':
@@ -1405,7 +1403,7 @@ if $ARGS[0] = 'shower':
 !!			act 'Return to the showers': gt 'gschool_lessons2', 'shower2'
 		end
 !!	else
-		act 'Return to the showers': gt 'gschool_lessons2', 'shower2'
+		act 'Continue': gt 'gschool_lessons2', 'shower2'
 !!	end
 end
 
@@ -1441,7 +1439,7 @@ if $ARGS[0] = 'shower2':
 !!			act 'Check out the other girls': gt 'gschool_lessons2', 'post_shower2'
 !!		end
 !!	end
-	act 'Return to locker room': gt 'gschool_lessons2', 'post_shower'
+	act 'Return to the locker room': gt 'gschool_lessons2', 'post_shower'
 	act 'Check out the other girls': gt 'gschool_lessons2', 'post_shower2'
 end
 

locations/gschool_office.qsrc

@@ -10,21 +10,34 @@ if $ARGS[0] = 'principal':
 	if detention_set = 2:
 		'You take a seat at Principal <<$npc_lastname[''A134'']>>''s desk and wait for her to address you with an exacerbated tone: "I usually give pupils the choice of detention so that I don''t have to punish them personally... but you have abused my leniency one time too many. I''m going to teach you not to insult my kindness." She is clearly angry and you can almost already feel the pain on your butt that you are about to receive.'
 		act 'Accept the inevitable': gt 'gschool_office', 'spanked'
-	elseif demerit > 20:
+	elseif demerit > 50:
 		'You take a seat at Principal <<$npc_lastname[''A134'']>>''s desk and wait for her to address you with an exacerbated tone: "What did you do this time, <<$pcs_lastname>>? No, I don''t want to know. I really don''t care what it is. You obviously have no respect for me or your teachers." She looks over your file some more and shakes her head slightly. "You have been here enough and you know what comes next. So, what will it be this time? Spanking, or perhaps Saturday detention?" She seems more than a bit annoyed that you appear to be immune to her punishment system... or maybe that you are that troubled of a student.'
-		act 'Choose detention':detention_set = 1 & gt 'gschool_lessons', 'short_break','office'
+		if detention_set = 0: 
+			act 'Choose detention': detention_set = 1 & gt 'gschool_lessons', 'short_break'
+			act 'Choose spanking': gt 'gschool_office', 'spanked'
+		else
+			*nl
+			'She takes a look at your file and slowly shakes her head. "I see, you already have detention Miss <<$pcs_lastname>>. That means I have no other choice but to use the alternative punishment."'
+			act 'Ge spanked': gt 'gschool_office', 'spanked'
+		end
 		act 'Choose spanking': gt 'gschool_office', 'spanked'
 !!		if demerit >= 50:act 'Choose suspension': gt 'gschool_lessons', 'suspension'
 !!		act 'Call Parents': gt 'gschool_lessons', 'Call Parents' - I will add this one in later as it will be a bit of work to write and tie in events at home.
-	elseif demerit > 10:
+	elseif demerit > 20:
 		'You take a seat at her desk and wait for Principal <<$npc_lastname[''A134'']>> to address you. "This is becoming a routine with you; I feel like I am seeing you every day! What has changed, <<$pcs_lastname>>? You used to be such a good girl, perhaps a bit quiet, but now? This is not the way to get attention." She looks over your file some more and shakes her head slightly.'
 		'"We can''t have you keep getting in trouble like this - I will have to punish you." She looks directly at you for a moment to make sure you understand that when you cause problems, you will be getting punished. "I believe in giving the students a voice in their future, so I will let you decide: Saturday detention, or a spanking, right now - which will it be?"'
 
-		act 'Choose detention': detention_set = 1 & gt 'gschool_lessons', 'short_break','office'
-		act 'Choose spanking': gt 'gschool_office', 'spanked'
+		if detention_set = 0: 
+			act 'Choose detention': detention_set = 1 & gt 'gschool_lessons', 'short_break'
+			act 'Choose spanking': gt 'gschool_office', 'spanked'
+		else
+			*nl
+			'She takes a look at your file and slowly shakes her head. "I see, you already have detention Miss <<$pcs_lastname>>. That means I have no other choice but to use the alternative punishment."'
+			act 'Ge spanked': gt 'gschool_office', 'spanked'
+		end
 	else
 		'You take a seat at Principal <<$npc_lastname[''A134'']>>''s desk and wait for her to address you. "Do you know why you are here, <<$pcs_lastname>>?", before you have a chance to reply she continues on. "It was a rhetorical question - we both know why you are here. You are here because you got in trouble." She pauses to look over at the folder in front of her. "Your file shows you have mostly stayed out of trouble until now. I hope this is only a minor lapse in judgment and not a new trend from you. We won''t get into what you did, just understand this is a warning. Straighten yourself out or there will be consequences. Now, return to class."'
-		act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -53,7 +66,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 		act 'Flirt/rebel':
 			principal_spank = 6
@@ -72,7 +85,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	elseif principal_spank <= 10 and detention_set ! 2:
 !!Spanked Bare Bottom
@@ -90,7 +103,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 		act 'Flirt/rebel':
 			principal_spank = 11
@@ -109,7 +122,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	elseif principal_spank <= 15 and detention_set ! 2:
 !!Spanked Leather Paddle
@@ -127,7 +140,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 		act 'Flirt/rebel':
 			principal_spank = 16
@@ -146,7 +159,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	elseif principal_spank <= 20 or detention_set = 2:
 !!Spanked Wooden Paddle
@@ -165,7 +178,7 @@ if $ARGS[0] = 'spanked':
 			gs 'stat'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 		act 'Flirt/rebel':
 			principal_spank += 1
@@ -181,7 +194,7 @@ if $ARGS[0] = 'spanked':
 			*nl
 			'To her credit, she doesn''t relent and even manages to spank you harder. After another a minute or two of this, about the time your butt has taken on a nice shade of red, she roughly lifts you off her knees and back on your feet. Her hands rest on your hips and as she stands up to face you, one hand slips down to your bare ass and stays there for just a moment... Then she removes her hands and points at the door, her expression unreadable. "You are playing a very dangerous game, young lady. Get back to class." You head for the door, putting a bit of extra sway into your hips and very slowly pulling your panties back up as you go, giving her an extra-long look at your cherry-red butt cheeks. You don''t dare to look back but you are almost certain that Principal <<$npc_lastname[''A134'']>> had her eyes on your ass right until the door closed behind you.'
 
-			act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	else
 !!this happens if Sveta choose to flirt/rebel 5 times while getting spanked by the wooden paddle and chooses spanking again then it goes to this.
@@ -210,7 +223,7 @@ if $ARGS[0] = 'spanked':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
 			act '"Don''t like wearing them"':
 				*clr
@@ -233,7 +246,7 @@ if $ARGS[0] = 'spanked':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 				act '"No"':
 					*clr
@@ -282,7 +295,7 @@ if $ARGS[0] = 'spanked':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
 			act '"I like wearing it':
 				*clr
@@ -307,7 +320,7 @@ if $ARGS[0] = 'spanked':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 				act 'No':
 					*clr
@@ -356,7 +369,7 @@ if $ARGS[0] = 'spanked':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
 			act '"I like the way it feels"':
 				*clr
@@ -382,7 +395,7 @@ if $ARGS[0] = 'spanked':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 				act 'No':
 					*clr
@@ -546,7 +559,7 @@ if $ARGS[0] = 'whore2':
 					'Once the Principal deems the dildo clean enough, she removes it from your mouth, gets off the desk and pulls you off as well. She leans against the table and points at the door. "Get your shit and remove yourself from my office right now. If you hurry, you can make it back into the hall and get dressed before the next bell." Your eyes widen slightly at the thought of being forced out into a hall full of the classmates, naked as you are, but the expression on her face and her previous cruelties leave no doubt in your mind that she is serious. You quickly gather your clothes and hurry out of the office.'
 					*nl
 					'Once out in the hall, you quickly get dressed and try your best to ignore your burning asshole as you do. You barely finish getting yourself in order before the bell rings and the hall fills up with your fellow students. It takes you a moment to realize that the Principal was fucking you for a full class - no wonder your ass started hurting so much. With a new understanding for what school punishment can entail, you go to your next class, trying not to walk too bowlegged.'
-					act 'Go to class':gt 'gschool_lessons', 'short_break','office'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end

locations/natbelapt.qsrc

@@ -1192,11 +1192,12 @@ if $ARGS[0] = 'chat':
 		*clr & cla
 		minut += 15
 		gs 'stat'
+		'<center><img src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
 		'You talk about the price of clothes and cosmetics for a while. Natasha seems to know a lot about the latest fashion, even though she can''t afford it.'
-		if NatDolg <= 0 and money >= 2000 and natsub > 0:
-			'<center><img src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
+		if NatDolg <= 0 and money >= 2000 and natsub > 0:			
 			'Suddenly Natasha says: "Hey <<$pcs_nickname>>, you seem to have tons of cash, could you lend me some money, please? I swear I''ll pay you back before you even miss it."'
-			act 'Give her the money':
+			act 'Don''t give her the money': gt 'natbelapt', 'chat'
+			act 'Give her the money (2000 <b>₽</b>)':
 				*clr & cla
 				if NatashaMoneyGivenTimes < 10:
 					NatDolg = 2000
@@ -1205,8 +1206,8 @@ if $ARGS[0] = 'chat':
 					gs 'stat'
 					'You get your purse and give Natasha the money.'
 					'"Thank you <<$pcs_nickname>>, you''re the best. I promise you''ll have it back within a month."'
-					act 'Keep talking': gt 'natbelapt', 'chat'
 					act 'Stop talking': gt 'natbelapt', 'natroom'
+					act 'Keep talking': gt 'natbelapt', 'chat'
 				elseif NatashaMoneyGivenTimes < 20:
 					NatDolg = 2000
 					money -= 2000
@@ -1215,8 +1216,8 @@ if $ARGS[0] = 'chat':
 					'"Or I could uhm... I could do those things again for you to... To repay you."'
 					'You get your purse and give Natasha the money.'
 					'"Thank you <<$pcs_nickname>>, you''re the best. I promise you won''t regret it."'
-					act 'Keep talking': gt 'natbelapt', 'chat'
 					act 'Stop talking': gt 'natbelapt', 'natroom'
+					act 'Keep talking': gt 'natbelapt', 'chat'
 				else
 					NatDolg = 2000
 					money -= 2000
@@ -1225,14 +1226,14 @@ if $ARGS[0] = 'chat':
 					'You get your purse and give Natasha the money.'
 					'"I see someone wants to be my little bitch again. You''re going to do whatever I want until you''ve worked off that debt."'
 					'"You know I will, I''ve proven that haven''t I?"'
-					act 'Keep talking': gt 'natbelapt', 'chat'
 					act 'Stop talking': gt 'natbelapt', 'natroom'
+					act 'Keep talking': gt 'natbelapt', 'chat'
 				end
-			act 'Don''t give her the money': gt 'natbelapt', 'chat'
 			end	
 		elseif NatBelBestFrend >= 3 and NatDolg = 0 and money >= 5000 and natsub = 0:
-			'Natasha looks down in embarrassment. "<<$pcs_nickname>>, you have lots of money. Could you lend me 5000<b>₽</b>? I will pay it back, I give you my word."'
+			'Natasha looks down in embarrassment. "<<$pcs_nickname>>, you have lots of money. Could you lend me 5000 <b>₽</b>? I will pay it back, I give you my word."'
 
+			act 'Don''t give her the money': gt 'natbelapt', 'chat'
 			act 'Lend Natasha the 5000 <b>₽</b>':
 				*clr & cla
 				minut += 15
@@ -1247,9 +1248,10 @@ if $ARGS[0] = 'chat':
 				act 'Keep talking': gt 'natbelapt', 'chat'
 				act 'Stop talking': gt 'natbelapt', 'natroom'
 			end
-			act 'Don''t give her the money': gt 'natbelapt', 'chat'
 		elseif NatDolg > 0 and NatDolgDay > daystart:
 			'Natasha promises you to repay the <<NatDolg>><b>₽</b> in <<NatDolgDay-daystart>> days.'
+			act 'Stop talking': gt 'natbelapt', 'natroom'
+			act 'Keep talking': gt 'natbelapt', 'chat'
 		elseif NatDolg > 0 and NatDolgDay <= daystart:
 			'Natasha looks at the floor, "<<$pcs_nickname>>, I... I''m sorry, I don''t have your money."'
 			act 'Forgive Natasha''s debt':
@@ -1291,15 +1293,18 @@ if $ARGS[0] = 'chat':
 						'Natasha looks at you with fearful eyes, and you are getting some more ideas as to how you could "use" her this time. She did say "anything," after all...'
 						'You snarl at her with an evil hiss: "You''ll be my little pet again until you''ve worked off every last Kopeck. And don''t you dare tell anyone about this!"'
 						'You give her a soft slap on the cheek to test your newfound power over her rather than to hurt her, but she flinches and nods profusely. Looks like you''ve got your own little slave now.'
-						act 'Keep talking': gt 'natbelapt', 'chat'
 						act 'Stop talking': gt 'natbelapt', 'natroom'
+						act 'Keep talking': gt 'natbelapt', 'chat'
 					else
 						'"Well, you did agree to be my toy again if you couldn''t pay me back. I guess we''re going to have some more fun very soon Natasha."'
-						act 'Keep talking': gt 'natbelapt', 'chat'
 						act 'Stop talking': gt 'natbelapt', 'natroom'
+						act 'Keep talking': gt 'natbelapt', 'chat'
 					end
 				end
 			end
+		else
+			act 'Stop talking': gt 'natbelapt', 'natroom'
+			act 'Keep talking': gt 'natbelapt', 'chat'	
 		end
 	end
 

locations/natkolEv.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'kolkabj':
 		'"Today I want you to do something different for me, Natasha. You did promise to do anything that I wanted, remember?"'
 		'"Y-Yes <<$pcs_nickname>>."'
 		'"Good, then undress, and I''ll arrange for a special guest. Don''t worry it''ll stay between the three of us."'
-		'You take out your phone and call your brother while you watch Natasha undress. After a couple of rings, your brother picks up. "Hello, <<pcs_nickname>> what''s up?" He asks.'
+		'You take out your phone and call your brother while you watch Natasha undress. After a couple of rings, your brother picks up. "Hello, <<$pcs_nickname>> what''s up?" He asks.'
 		*nl
 		'You tell him. "Hey Kolka, come up to apartment #19, I have a special surprise for you."'
 		'He pauses for a moment, obviously wondering what it could be. "What is it?" He asks.'
@@ -22,7 +22,7 @@ if $ARGS[0] = 'kolkabj':
 	else
 		'"Today we are going to train my brother some more, you would like that, wouldn''t you?" You ask her.'
 		'Her eyes drop a bit, and she nods. "Y-Yes <<$pcs_nickname>>." She begins to undress without you even having to ask.'
-		'You take out your phone and call your brother while you watch Natasha undress. After a couple of rings, your brother picks up. "Hello <<pcs_nickname>>, whats up?" He asks.'
+		'You take out your phone and call your brother while you watch Natasha undress. After a couple of rings, your brother picks up. "Hello <<$pcs_nickname>>, whats up?" He asks.'
 		*nl
 		'You tell him. "Hey Kolka, come up to Natasha''s, we have another lesson for you."'
 		'"Ok, I''ll be right up." He tells you eagerly before hanging up, you can just imagine him running up the stairs.'

locations/pavaptcourtev.qsrc

@@ -1460,7 +1460,7 @@ if $ARGS[0] = 'two_boys':
 	end
 	
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/aptstairsnaked.jpg"></center>'
-	'Once inside you sigh in relief, almost home finally. Taking a look around, you glance up the stairs and then slowly start creeping up them hoping no one suddenly comes out of their apartment or comes down the stairs, catching you naked. Just before you make it to your door, you hear the clomping of boots on the stairs, as you reach your door you hear someone says. "Well well, look-y what we have here. What you doing <<pcs_nickname>>?"'
+	'Once inside you sigh in relief, almost home finally. Taking a look around, you glance up the stairs and then slowly start creeping up them hoping no one suddenly comes out of their apartment or comes down the stairs, catching you naked. Just before you make it to your door, you hear the clomping of boots on the stairs, as you reach your door you hear someone says. "Well well, look-y what we have here. What you doing <<$pcs_nickname>>?"'
 	*nl
 	'You turn around and see <<$boydesc[1]>> and <<$boydesc[2]>>, standing behind you. One of them taking your picture with his phone, while the other walks over and leans against your apartment door, so you open it. "Please guys, I just need to get inside. Please share those pictures."'
 	'The one taking the pictures laughs and keeps taking them, while his friends leers at you, looking over your whole body. "Well if you are going to run around like a whore, we should treat you like one. So how about you come over here and let us fuck you and we will keep your secret and you can be our little whore, what do you say?"'
@@ -1659,7 +1659,7 @@ if $ARGS[0] = 'misha':
 	gs 'exhibitionism', 4
 	npc_rel['A54'] += 3
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/aptstairsnaked.jpg"></center>'
-	'Once inside you sigh in relief, almost home finally. Taking a look around, you glance up the stairs and then slowly start creeping up them hoping no one suddenly comes out of their apartment or comes down the stairs, catching you naked. You almost make it to your door when you hear a door behind you open, followed by a cough. You turn around and see Uncle Misha watching you with a raised eyebrow. "Should I ask why you are running around naked <<pcs_nickname>>?"'
+	'Once inside you sigh in relief, almost home finally. Taking a look around, you glance up the stairs and then slowly start creeping up them hoping no one suddenly comes out of their apartment or comes down the stairs, catching you naked. You almost make it to your door when you hear a door behind you open, followed by a cough. You turn around and see Uncle Misha watching you with a raised eyebrow. "Should I ask why you are running around naked <<$pcs_nickname>>?"'
 	*nl
 	'You blush as he stares at your naked body, having been caught by someone you know. "Some girls at school stole my clothes." You explain to him, he snorts a laugh and shakes his head.'
 	'"Well you best get inside then." He tells you, as you go unlock the door as quickly as you can, as you go inside you think you hear him say. "Where were girls like that when I was in school." Rushing down the hall you go to your bedroom.'

locations/pod_ezd.qsrc

@@ -1154,7 +1154,7 @@ if $ARGS[0] = 'danvas_smoke_bj':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/events/sex/danvas4.jpg"></center>'
-				'You open your mouth and start jerking both of them, Vasily is the first one to shoot his load all over you face with some of it going into your mouth, just a few seconds later Dan''s starts cumming on your face and in your mouth as well. Once you milked the last of their cum out of their cocks you stand up and start to reach into your purse to get something to clean their cum off your face. As you do Vasily grabs you hand and stops you. "Leave the cum on your face <<pcs_nickname>>."'
+				'You open your mouth and start jerking both of them, Vasily is the first one to shoot his load all over you face with some of it going into your mouth, just a few seconds later Dan''s starts cumming on your face and in your mouth as well. Once you milked the last of their cum out of their cocks you stand up and start to reach into your purse to get something to clean their cum off your face. As you do Vasily grabs you hand and stops you. "Leave the cum on your face <<$pcs_nickname>>."'
 				'You give him a curious look. "Why?" You ask.'
 				'Dan answers. "Because it is fucking hot as hell, to see a girl covered in your cum."'
 				gs 'arousal', 'hj', 5, 'group'
@@ -1275,12 +1275,12 @@ if $ARGS[0] = 'lena_chat':
 	elseif grupTipe ! 4:
 		'"Hey guys, what are you doing?" You greet the group as you approach.'
 		'One of the older guys looks at you and then the rest. "Who the fuck is this bitch?"'
-		'Vasily answers before you can. "She is just some girl we go to school with." With that he gets up and walks over to you and leads you back to the stairs. "You should get going <<pcs_nickname>>, this is no place for you." With that he prods you to go down the stairs.'
+		'Vasily answers before you can. "She is just some girl we go to school with." With that he gets up and walks over to you and leads you back to the stairs. "You should get going <<$pcs_nickname>>, this is no place for you." With that he prods you to go down the stairs.'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
 	else
 		'You take a seat next to Lena and Lera. "Hey guys whats up?" You ask them.'
 		'Lera leans over and kisses you on the lips. "Just hanging out and having fun." She slurs obviously she is pretty drunk already, her breath smells like a distillery.'
-		'Vasily offers you one of the beers. "Here <<pcs_nickname>>."'
+		'Vasily offers you one of the beers. "Here <<$pcs_nickname>>."'
 		gs 'willpower', 'drink'
 		if will_cost <= pcs_willpwr:
 			act 'Decline the beer (<<will_cost>> Willpower)':

locations/preCSB.qsrc

@@ -251,7 +251,7 @@ if $ARGS[0] = 'intro_7':
 					'<center><img <<$set_imgh>> src="images/pre/alt/tunnel1pre.jpg"></center>'
 					'A loud crack runs through the ruins. The ground gives way beneath you, sending both of you tumbling down into a dark hole. Miraculously you both manage to land with only minor scrapes and bruises. You curse and look around at your surroundings.'
 					'You seem to be in an underground chamber of some sort. Looking up you see that climbing out is not an option. There is also an old gate one side of the chamber but it''s either locked or rusted shut. Looks like the only way out is the tunnel on the other side of the chamber.'
-					'The romantic mood has been thoroughly broken. You have more immediate concerns of survival. You pull your backpack back on your shoulders, turn on the flashlight on your phone and lead <<pcs_nickname>> out the only way you can.'
+					'The romantic mood has been thoroughly broken. You have more immediate concerns of survival. You pull your backpack back on your shoulders, turn on the flashlight on your phone and lead <<$pcs_nickname>> out the only way you can.'
 
 					act 'Follow the tunnel':
 						*clr & cla