Browse Source

Merge branch 'master' into dev

KeyMasterOfGozer 5 years ago
parent
commit
4ff5de0cc6

+ 2 - 2
locations/Katja_Tanga.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'secretroom':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_10.jpg"></center>'
 			'After a few minutes of teasing her nipples you kiss your way down to her stomach, pulling off her skirt as you do. Your lips descend down her body and you begin kissing and teasing her clit with your tongue. You pull her down and gentle lay her down on her back, once she is laying down you slide two of your fingers into her wet pussy and begin to finger fuck her. She moans in pleasure, as her hands run all over her own body, as squeezes her own breasts.'
 			if (middildo = 1 or dildo = 1 or largedildo = 1 ) and pcs_vag > 15:
-				Act 'Get dildo':
+				act 'Get dildo':
 					pcs_horny += 10
 					gs'stat'
 					*clr & cla
@@ -80,7 +80,7 @@ end
 if $ARGS[0] = 'start':
 	gs'stat'
 	CLOSE ALL
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 	'You did a quick turn, causing your skirt to twirl up. For a brief moment exposing your lack of panties. Katja''s eyes widened in surprise. "You''re not wearing panties?" She whispers to you.'
 	act 'Show her you are not wearing panties.':
 		*clr & cla

+ 3 - 4
locations/ender.qsrc

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

+ 1 - 1
locations/gLakeNude.qsrc

@@ -293,7 +293,7 @@ if $ARGS[0] = 'sauna':
 	'You walk up the small trail from the beach to the sauna, it is newly built. They say it was built for the tourist, but if that is true, you wonder why they put it on the secluded beach and even then a little ways back from the beach. Surely no tourist would ever find it, either way you and many others are glad they built it. It is well built and nice inside and out, there is three areas to the sauna. The mens section, womens section, and a co-ed section, to use the sauna you need a bikini or some people use it naked.'
 	
 	act 'Go back to the beach': 
-		if pcs_inhib > 30:
+		if pcs_inhib > 30 or $clothingworntype ! 'nude':
 			gt 'gLakeNude'
 		else
 			*clr & cla

+ 15 - 23
locations/gschool_detention.qsrc

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

+ 132 - 135
locations/gschool_events.qsrc

@@ -274,7 +274,7 @@ if $ARGS[0] = 'break_events':
 					grupvalue[1] += 1
 					grupvalue[2] += 2
 					grupvalue[4] += 3
-					npc_rel['A#'] -= 5
+					npc_rel['A<<r>>'] -= 5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
 					'The moment the hand makes contact with your bottom, you jump mid-stride and squeal at the stinging pain. You whip around and glare furiously at <<$rand_boy>> who is standing right behind you with a shit eating grin on his face. "What the fuck do you think you''re doing you fucking perv!" you scream in his face before swinging your hand, your smack causing a resounding clap that is echoed by the, "Ooooh!" of your observing classmates. Before giving him a chance to respond, you storm off in the direction you were originally headed'+iif($pantyworntype ! 'none', '.', ', though the whispers of your classmates regarding the sound of his hand on your naked ass cheeks follow you down the hallway.')
 					gs 'gschool_events', 'leave_break_events'
@@ -1057,13 +1057,13 @@ if $ARGS[0] = 'break_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 		if grupTipe = 1 or grupTipe = 2 or grupTipe = 4:
-			'As you walk down the halls you notice Petia stop at the boys bathroom door and look around a moment like he is afraid to go into the bathroom. He opens the door and looks in, then apparently liking what he see''s he goes in. He must have been checking if any of the gopniks was already in there to bully him or something. That likely means he is alone in there, looking around you see the hall start to clear out of people.'
+			'As you walk down the halls you notice Petka stop at the boys bathroom door and look around a moment like he is afraid to go into the bathroom. He opens the door and looks in, then apparently liking what he see''s he goes in. He must have been checking if any of the gopniks was already in there to bully him or something. That likely means he is alone in there, looking around you see the hall start to clear out of people.'
 		else
-			'As you walk down the halls you notice Petia stop at the boys bathroom door and look around a moment like he is afraid to go into the bathroom. He opens the door and looks in, then apparently liking what he see''s he goes in. He must have been checking if any of the gopniks was already in there to bully him or something. You don''t blame him for being cautious, as you go about your business.'
+			'As you walk down the halls you notice Petka stop at the boys bathroom door and look around a moment like he is afraid to go into the bathroom. He opens the door and looks in, then apparently liking what he see''s he goes in. He must have been checking if any of the gopniks was already in there to bully him or something. You don''t blame him for being cautious, as you go about your business.'
 		end
 		act 'Leave': gt 'gschool_events', 'leave_break_events2'
 		if petka_homework_need = 1:
-			act 'Follow Petia': gt 'gschool_events', 'follow_petka'
+			act 'Follow Petka': gt 'gschool_events', 'follow_petka'
 		elseif petka_homework > 0:
 			'<br>You already done all your homework and you don''t need his help today.'
 		else
@@ -1094,8 +1094,8 @@ if $ARGS[0] = 'follow_petka':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/nerdtalk.jpg"></center>'
 	if petka_homework = 0:
-		'You follow Petia into the bathroom, as the door closes her quickly turns around alarmed. When he see''s you he looks a little confused but also a little leary of you. "Hey this is the boys bathroom, you shouldn''t be in here." He tells you.'
-		'You ignore his comment. "Petia I was wondering if you could do me a favor. How about you give me your homework so I can copy it?"'
+		'You follow Petka into the bathroom, as the door closes her quickly turns around alarmed. When he see''s you he looks a little confused but also a little leary of you. "Hey this is the boys bathroom, you shouldn''t be in here." He tells you.'
+		'You ignore his comment. "Petka I was wondering if you could do me a favor. How about you give me your homework so I can copy it?"'
 		'He is already shaking his head no before you even finish. "I can''t do that, that would be cheating. I could get expelled for helping you cheat, sorry I can''t help you."'
 
 		act 'Oh well, you tried':
@@ -1167,7 +1167,7 @@ if $ARGS[0] = 'follow_petka':
 		end
 		act 'Seduce him with sex': petka_homework = 2 & gt 'gschool_events', 'homework_sex_bribe'
 	elseif petka_homework = 2:
-		'You follow Petia into the bathroom, as the door closes her quickly turns around alarmed. When he see''s you he looks a little eager, obviously hoping you want to repeat last time. "Do you need my homework again?" He asks you.'
+		'You follow Petka into the bathroom, as the door closes her quickly turns around alarmed. When he see''s you he looks a little eager, obviously hoping you want to repeat last time. "Do you need my homework again?" He asks you.'
 		'You nod your head. "Yes."'
 		'He licks his lips a bit and you can already see the bulge in his pants growing. "Same as last time?" He asks sounding hopeful.'
 		'You nod your head as you walk over to him.'
@@ -1176,8 +1176,8 @@ if $ARGS[0] = 'follow_petka':
 	else
 		pcs_grades += 3
 		lernHome -= 1
-		'You follow Petia into the bathroom, as the door closes her quickly turns around alarmed. When he see''s you he looks a little afraid and creast fallen.  "What do you want this time?" He asks you.'
-		'You tell him. "The same thing as last time Petia, or do you need a reminder?"'
+		'You follow Petka into the bathroom, as the door closes her quickly turns around alarmed. When he see''s you he looks a little afraid and creast fallen.  "What do you want this time?" He asks you.'
+		'You tell him. "The same thing as last time Petka, or do you need a reminder?"'
 		'He quickly pulls out his homework, obviously afraid of you. "Here, take it. Just leave me alone."'
 		act 'Take the homework': gt 'gschool_events', 'leave_break_events2'
 	end
@@ -1634,15 +1634,14 @@ if $ARGS[0] = 'afterschool_events':
 			'"I''ll show you what the fuck I want, slut." With these words, Vitek suddenly grabs you by the hair and presses your face against his desk. "What I want is your lips around my dick, right now. Everyone already knows you''re a <<$gnikname>>, you better start acting like it or there will be consequences." He turns to his friends and says, "Come on boys, this whore doesn''t understand her place in life. It''s about time we show her."'
 			i = 0
 			:rand_jock_loop
-			r = rand(0,55)
-			$static_num = $static_num[r]
-			if npcPol[r] = 0 and grupTipe[r] = 2 and npc_rel[$static_num] > 50:
-				$jock = $npc_firstname[$static_num]
+			gs 'gschool_events', 'rand_boy_arg', 0,1,0,0,0,0
+			if npc_gender['A<<r>>'] = 0 and npc_grupTipe['A<<r>>'] = 2 and npc_rel['A<<r>>'] > 50:
+				$jock = $npc_nickname['A<<r>>']
 				'As you try and pull away <<$jock>> comes over and pulls the gopnik off you and turns to him. "Leave her alone!"'
 				'The gopnik turns towards him and narrows his eyes. "Or what pussy?"'
 				'<<$jock>> Steps up close crowding him. "Or I will fucking kick your ass right here!" Then they start shoving each other, but before more can happen a teacher interrupts. "What''s going on here, break it up all of you." With that everyone goes their own way as the teacher watches and you word a thank you to <<$jock>> as you slip away.'
 				act 'Continue': gt 'gschool_grounds', 'main'
-			elseif i < 50:
+			elseif i < 1000:
 				i += 1
 				jump 'rand_jock_loop'
 			else
@@ -1771,20 +1770,20 @@ if $ARGS[0] = 'rand_scoolboy':
 		elseif rand(0,1) = 0:
 			r = 4
 		else
-			r = 28
+			r = 147
 		end
-		$school_static_num = $school_static_num[r]
-		$rand_boy = $npc_firstname[$school_static_num]
+		$school_static_num = $school_static_num['A<<r>>']
+		$rand_boy = $npc_nickname['A<<r>>']	
 	elseif scoolboy = 3:
-		if artQW > 1 and rand(0,2) = 0:
+		if (artQW ! 3 and artQW ! 20) and rand(0,2) = 0:
 			r = 2
 		elseif rand(0,1) = 0:
 			r = 6
 		else
-			r = 36
+			r = 152
 		end
-		$school_static_num = $school_static_num[r]
-		$rand_boy = $npc_firstname[$school_static_num]
+		$school_static_num = $school_static_num['A<<r>>']
+		$rand_boy = $npc_nickname['A<<r>>']
 	elseif scoolboy = 4:
 		if pav_sex >= 50 and kotovLoveQW <= 0:
 			gt 'gschool_events', 'rand_gopnic'
@@ -1794,22 +1793,19 @@ if $ARGS[0] = 'rand_scoolboy':
 	else
 		gs 'gschool_events', 'rand_boy_arg', 0, 1, 0, 0, 1, 0
 	end
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<r>>.jpg"></center>'
-	if npcsex[r] = 0:
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<r>>.jpg"></center>'
+	if npc_gender['A<<r>>'] = 0:
 		if scoolboy = 3:
-!!Instead of random lets make it Artem(unless they are dating), Feofan, or Petia
 			'You can tell from the embarrassed look on his face and the admiring glances of his friends that <<$rand_boy>> was the one touching your ass. Looks like he scored some points in his group today.'
 		elseif scoolboy = 2:
-!!This one is fine if it is random but Fedor should be blocked if they are dating.
+!!ToDo: Remove fedor		
 			'You can tell from his disappointed expression that <<$rand_boy>> was the one groping your ass. Perhaps he was expecting something firmer, after hanging out with the athletic girls so much? Maybe you should work out more...'
 		elseif scoolboy = 1:
-!!instead of random have it be Dimka(though he is blocked if you erased the video tape he can get), Igor, Andrey, or Mefodiy(Not sure on him, I don''t know if he is openly gay or not, if he is not he might do it to hide being gay. You wanted to do a story with him so your call if he is included here.)
 			'Even though he tries to hide it as best he can, the proud grin the face of <<$rand_boy>> tells you that he was the one groping your ass.'
 		elseif scoolboy = 4:
-!!instead of random lets make it Vitek, Dan, or Vasily which uses group 1 in this pav_sex act. Or Roman, Lavrenti, Radomir or Arkadi then it is group two for the pav_sex act
+!!ToDo: instead of random lets make it Vitek, Dan, or Vasily which uses group 1 in this pav_sex act. Or Roman, Lavrenti, Radomir or Arkadi then it is group two for the pav_sex act
 			'The brazen look on his face betrays <<$rand_boy>>, it must have been him touching your ass. Knowing him, he probably would''ve gone further if there weren''t so many people here.'
 		elseif scoolboy = 5:
-!!Random is fine since we only have two of them currently and Fedor if he becomes an outcast but again block Fedor if Sveta is still seeing him.
 			'<<$rand_boy>> is trembling slightly, his eyes shifting back and forth as he awkwardly tries to not be noticed by you. It must''ve been him.'
 			'"<<$rand_boy>>, are you out of your mind!?" you cry out, as the other boys burst out into laughter. You can see the panic in his face as he raises his hands in defense, rapidly apologizing:'
 			'"Please, I didn''t want to! They made me, I promise! I''m sorry!"'
@@ -1820,34 +1816,46 @@ if $ARGS[0] = 'rand_scoolboy':
 		else
 			'Wait a minute... you don''t recognize any of these people! You must be in the wrong classroom!'
 		end
-		if npc_rel[$school_static_num] <= 50 and scoolboy ! 3:
-!!this option doesn''t show up if it is an outcast since the text above says you believe him.
-			act 'Slap him across the face as hard as you can':
-				*clr & cla
-				npc_rel[$school_static_num] -= 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
-				if mesec > 0:
-					'It''s bad enough he did it, it is worse because you are on your period. "You fucking pervert!" you shout angrily, and you slap him across the face as hard as you can. You shake the stinging out of your hand afterwards, while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek that''s going to leave a bruise. The other boys laugh loudly, this is the best entertainment they''ve had during the break in a long time.'
-				else
-					'"You fucking pervert!" you shout angrily, and you slap him across the face as hard as you can. You shake the stinging out of your hand afterwards, while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek that''s going to leave a bruise. The other boys laugh loudly, this is the best entertainment they''ve had during the break in a long time.'
-!!follow up text to either of the above based on the boy in question.
-					if $rand_boy = 'Dimka':
-						'Dimka rubs his face and glares at those laughing then glares at you. "You''ll pay for that bitch!" With that he walks off.'
-					elseif scoolboy = 1 or scoolboy = 2:
-						'After rubbing his face he looks at you in disbelief. "What the fuck was that for? I was just messing with you." Then he walks off.'
-					elseif scoolboy = 4 and $rand_boy ! 'Roman':
-						if gruptipe = 4:
-							'As the others laugh at him his eyes get hard and he raises his hand to obviously slap you. But your look back to him promises him a lot more than just a slap back from you if he does. He seems to hesitate, then he finally snorts a laugh obviously over it. He just gives you a look like he will get you back for this and then heads out.'
-						else
-							'As the others laugh at him his eyes get hard and he slaps you back, not as hard as he could. But hard enough your face is really stinging now. "Don''t fucking every slap me!" Then he storms off.'
+		if npc_rel['A<<r>>'] <= 50 and npc_grupTipe['A<<r>>'] ! 5:
+			act 'Ignore it':
+				grupvalue[1] -= 1
+				grupvalue[2] -= 1
+				grupvalue[3] -= 1	
+				grupvalue[4] -= 1
+				gt 'gschool_events', 'leave_break_events2'
+			end
+			gs 'willpower', 'misc'
+			if will_cost <= pcs_willpwr:
+				act 'Slap him hard (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'force', 'self'
+					gs 'stat'
+					npc_rel['A<<r>>'] -= 5
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
+					if mesec > 0:
+						'It''s bad enough he did it, it is worse because you are on your period. "You fucking pervert!" you shout angrily, and you slap him across the face as hard as you can. You shake the stinging out of your hand afterwards, while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek that''s going to leave a bruise. The other boys laugh loudly, this is the best entertainment they''ve had during the break in a long time.'
+					else
+						'"You fucking pervert!" you shout angrily, and you slap him across the face as hard as you can. You shake the stinging out of your hand afterwards, while he clutches his cheek in agony. When he finally pulls his hands away from his face, the outline of your hand is clearly visible on his cheek that''s going to leave a bruise. The other boys laugh loudly, this is the best entertainment they''ve had during the break in a long time.'
+						if $rand_boy = 'Dimka':
+							'Dimka rubs his face and glares at those laughing then glares at you. "You''ll pay for that bitch!" With that he walks off.'
+						elseif scoolboy = 1 or scoolboy = 2:
+							'After rubbing his face he looks at you in disbelief. "What the fuck was that for? I was just messing with you." Then he walks off.'
+						elseif scoolboy = 4 and $rand_boy ! 'Roman':
+							if gruptipe = 4:
+								'As the others laugh at him his eyes get hard and he raises his hand to obviously slap you. But your look back to him promises him a lot more than just a slap back from you if he does. He seems to hesitate, then he finally snorts a laugh obviously over it. He just gives you a look like he will get you back for this and then heads out.'
+							else
+								'As the others laugh at him his eyes get hard and he slaps you back, not as hard as he could. But hard enough your face is really stinging now. "Don''t fucking every slap me!" Then he storms off.'
+							end
 						end
 					end
+					act 'Continue': gt 'gschool_events', 'leave_break_events2'
 				end
-				act 'Continue': gt 'gschool_events', 'leave_break_events2'
+			else
+				'<br>You don''t have enough willpower to slap him.'
 			end
-		elseif npc_rel[$school_static_num] > 50:
+		elseif npc_rel['A<<r>>'] > 50:
 			act 'Slap him playfully':
-				npc_rel[$school_static_num] -= 2
+				npc_rel['A<<r>>'] -= 2
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy2.jpg"></center>'
 				'You think to yourself, "<<$rand_boy>> ain''t so bad... but still, I can''t just let him do this."'
@@ -1866,13 +1874,14 @@ if $ARGS[0] = 'rand_scoolboy':
 		else
 			act 'Continue': gt 'gschool_events', 'leave_break_events2'
 		end
-	elseif npcsex[r] = 1:
+!! or npcsex[r]	> 0 can be removed if all remnants of the old school ID-System are gone	
+	elseif npc_sex['A<<r>>'] > 0 or npcsex[r] > 0:
 		'You notice the confident stares of <<$rand_boy>> it must''ve been him.'
 		act 'Taunt him':
+			*clr & cla
 			pcs_horny += 50
-			gs 'boyStat', $school_static_num
+			gs 'boyStat', 'A<<r>>'
 			gs'stat'
-			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy4.jpg"></center>'
 			'He''s kind of cute. You''re so horny right now, you decide to tease him and see if you can push him into doing more. You put your finger in your mouth and quietly ask him in a lewd voice, "Come on <<$rand_boy>>, is that all you have for me?"'
 			'His friends heard your question, and are now daring him to take you to the men''s room. He doesn''t seem so sure.'
@@ -1887,7 +1896,7 @@ if $ARGS[0] = 'rand_scoolboy':
 				grupvalue[1] -= 10
 				grupvalue[2] -= 10
 				grupvalue[3] -= 10
-				pav_sex +=30
+				gs 'fame', 'pav', 'sex', 15
 				gs 'exhibitionism', 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet1.jpg"></center>'
 				'You give him a sweet smile and take him by the hand, pulling him into the men''s room. Slightly lifting up your skirt, you put his hand between your legs. The other boys all follow the two of you, and now you''re being fondled in front of a crowd.'
@@ -1897,7 +1906,7 @@ if $ARGS[0] = 'rand_scoolboy':
 				grupvalue[1] -= 5
 				grupvalue[2] -= 5
 				grupvalue[3] -= 5
-				pav_sex +=10
+				gs 'fame', 'pav', 'sex', 5
 				gt 'gschool_sex', 'rand_sex'
 			end
 			if katschoolsex = 1:
@@ -1905,7 +1914,7 @@ if $ARGS[0] = 'rand_scoolboy':
 					grupvalue[1] -= 5
 					grupvalue[2] -= 5
 					grupvalue[3] -= 5
-					pav_sex +=10
+					gs 'fame', 'pav', 'sex', 5
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/kiss.jpg"></center>'
 					'You remember the back room that Katja showed you. When you tell <<$rand_boy>> about it, he takes your hand and tells you to guide him there. As soon as you pull the door shut behind you when you arrive there, <<$rand_boy>> pounces you and begins to kiss you.'
@@ -1940,12 +1949,11 @@ if $ARGS[0] = 'rand_scoolboy':
 									gs 'stat'
 									act 'Lick him clean':
 										*clr & cla
-										stat['bj'] += 1
-										gs'stat'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom5.jpg"></center>'
 										'Realizing you have to get to class soon, you quickly scoot over and take his penis in your mouth. As you quickly lick him clean, you taste the mixture of his and your juices; it makes you feel kind of raunchy, and you wouldn''t mind having another go if it wasn''t for class starting any minute now. You quickly straighten your clothes and hand him his pants, and quickly check your hair before you both run to class.'
 										gs 'arousal', 'bj', 2
 										gs 'arousal', 'end'
+										gs'stat'
 										act 'Continue': gt 'gschool_events', 'leave_break_events2'
 									end
 								end
@@ -1961,9 +1969,9 @@ if $ARGS[0] = 'rand_scoolboy':
 			*nl
 			'After all <<$rand_boy>> did with you, he''s still pinching your ass in school like that? He''s kinda cute, but still that''s just wrong!'
 			act 'Kick him in the balls':
-				npc_rel[$school_static_num] -= 10
-				grupvalue[4] += 5
 				*clr & cla
+				npc_rel['A<<r>>'] -= 10
+				grupvalue[4] += 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy8.jpg"></center>'
 				'You kick <<$rand_boy>> in the balls, sending him and all of his classmates the message that you will not put up with this behavior in school. You watch him writhe in pain on the floor for a second, before collecting your things and making your way to your next class.'
 				act 'Continue': gt 'gschool_events', 'leave_break_events2'
@@ -1973,16 +1981,16 @@ if $ARGS[0] = 'rand_scoolboy':
 end
 
 if $ARGS[0] = 'rand_gopnic':
-		menu_off = 1
+	menu_off = 1
 	if rand(0,1) = 0:
 		r = 9
 	else
-		r = 42
+		r = rand(154,156)
 	end
 
 	if grupTipe = 4:
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<r>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<r>>.jpg"></center>'
 		'You step away from him, pulling out of reach as you turn around. You point your finger at him. "Don''t make me hurt you, you know I will."'
 		'He laughs a bit and steps up closer again, crowding you a bit but keeps his hands to himself. "Come on <<$pcs_nickname>> you know you want to have some fun, stop acting like you are not all hot and bothered by this. We can help you with that itch."'
 		act 'Back off':
@@ -2003,7 +2011,7 @@ if $ARGS[0] = 'rand_gopnic':
 			'You are in the mood anyways so why not, hopefully it isn''t to quick. They lead you to the men''s room, one of the guys drives everyone else out; it''s just you and the Gopniks in there now. One of them leans against the door to block anyone else from coming in. While the rest all start unzipping their pants and pulling out their dicks.'
 			'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way.'
 			*nl
-			if pav_slut > 25: 'On one wall you see written in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+			if pav_slut > 125: 'On one wall you see written in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
 			act 'Start sucking':
 				*clr & cla
 				if r = 9:
@@ -2038,12 +2046,8 @@ if $ARGS[0] = 'rand_gopnic':
 			end
 		end
 	else
-		if r = 9:
-			$boydesc = 'Vitek'
-		else
-			$boydesc = 'Radomir'
-		end
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<r>>.jpg"></center>'
+		gs 'boystat', 'A<<r>>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<r>>.jpg"></center>'
 		'You look at <<$boydesc>> with contempt, "What the fuck do you want?" He''s not impressed in the slightest, your loose reputation undermining any authority you try to impose.'
 		act 'Continue':
 			*clr & cla
@@ -2051,19 +2055,12 @@ if $ARGS[0] = 'rand_gopnic':
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy5.jpg"></center>'
 			'"I''ll show you what the fuck I want, slut." With these words, <<$boydesc>> suddenly grabs you by the hair and presses your face against his desk. "What I want is your lips around my dick, right now. Everyone already knows you''re a <<$gnikname>>, you better start acting like it or there will be consequences." He turns to his friends and says, "Come on boys, this whore doesn''t understand her place in life. It''s about time we show her."'
-			i = 0
-			:rand_jock_loop
-			r = rand(0,55)
-			$school_static_num = $school_static_num[r]
-			if npcPol[r] = 0 and grupTipe[r] = 2 and npc_rel[$school_static_num] > 50:
-				$jock = $npc_firstname[$school_static_num]
-				'As you try and pull away <<$jock>> comes over and pulls the gopnik off you and turns to him. "Leave her alone!"'
+			gs 'gschool_events', 'rand_boy_arg1', 0, 1, 0, 0, 0, 0
+			if npc_rel['A<<r>>'] > 50:
+				'As you try and pull away <<$rand_boy1>> comes over and pulls the gopnik off you and turns to him. "Leave her alone!"'
 				'The gopnik turns towards him and narrows his eyes. "Or what pussy?"'
-				'<<$jock>> Steps up close crowding him. "Or I will fucking kick your ass right here!" Then they start shoving each other, but before more can happen a teacher interupts. "What''s going on here, break it up all of you." With that you word a thank you to <<$jock>> and slip away.'
+				'<<$rand_boy1>> Steps up close crowding him. "Or I will fucking kick your ass right here!" Then they start shoving each other, but before more can happen a teacher interupts. "What''s going on here, break it up all of you." With that you word a thank you to <<$rand_boy1>> and slip away.'
 				act 'Leave': gt 'gschool_grounds', 'main'
-			elseif i < 50:
-				i += 1
-				jump 'rand_jock_loop'
 			else
 				gs 'willpower', 'bj'
 				if will_cost <= pcs_willpwr:
@@ -2184,27 +2181,27 @@ end
 
 !!Random boy, arguments set to 1 mean included, groups are cool kids, jock, nerd, gopnik, outcast, teachers
 if $ARGS[0] = 'rand_boy_arg':
-	grup0 = 0
 	grup1 = 0
 	grup2 = 0
 	grup3 = 0
 	grup4 = 0
 	grup5 = 0
-	if ARGS[1] = 1:grup0 = 1
-	if ARGS[2] = 1:grup1 = 2
-	if ARGS[3] = 1:grup2 = 3
-	if ARGS[4] = 1:grup3 = 4
-	if ARGS[5] = 1:grup4 = 5
-	if ARGS[6] = 1:grup5 = 6
+	grup6 = 0
+	if ARGS[1] = 1:grup1 = 1
+	if ARGS[2] = 1:grup2 = 2
+	if ARGS[3] = 1:grup3 = 3
+	if ARGS[4] = 1:grup4 = 4
+	if ARGS[5] = 1:grup5 = 5
+	if ARGS[6] = 1:grup6 = 6
 	boy_counter = 0
 	:rnd_boy_loop
 	boy_counter += 1
-	r = rand(0,ARRSIZE('grupTipe'))
-	if npcPol[r] = 0 and (grupTipe[r] = grup0 or grupTipe[r] = grup1 or grupTipe[r] = grup2 or grupTipe[r] = grup3 or grupTipe[r] = grup4 or grupTipe[r] = grup5):
-		$school_static_num = $school_static_num[r]
-		$rand_boy = $npc_firstname[$school_static_num]
+	r = rand(0,arrsize('npc_grupTipe'))
+	if npc_gender['A<<r>>'] = 0 and schoolenable['A<<r>>'] = 1 and npc_grupTipe['A<<r>>'] ! 0 and (npc_grupTipe['A<<r>>'] = grup1 or npc_grupTipe['A<<r>>'] = grup2 or npc_grupTipe['A<<r>>'] = grup3 or npc_grupTipe['A<<r>>'] = grup4 or npc_grupTipe['A<<r>>'] = grup5 or npc_grupTipe['A<<r>>'] = grup6):
+		$school_static_num = $school_static_num['A<<r>>']
+		$rand_boy = $npc_nickname['A<<r>>']
 		killvar 'boy_counter'
-	elseif boy_counter = 50:
+	elseif boy_counter = 1000:
 		$school_static_num = 0
 		$rand_boy = 'boy you don''t know'
 		killvar 'boy_counter'
@@ -2214,28 +2211,28 @@ if $ARGS[0] = 'rand_boy_arg':
 end
 
 if $ARGS[0] = 'rand_boy_arg1':
-	grup0 = 0
 	grup1 = 0
 	grup2 = 0
 	grup3 = 0
 	grup4 = 0
 	grup5 = 0
-	if ARGS[1] = 1:grup0 = 1
-	if ARGS[2] = 1:grup1 = 2
-	if ARGS[3] = 1:grup2 = 3
-	if ARGS[4] = 1:grup3 = 4
-	if ARGS[5] = 1:grup4 = 5
-	if ARGS[6] = 1:grup5 = 6
+	grup6 = 0
+	if ARGS[1] = 1:grup1 = 1
+	if ARGS[2] = 1:grup2 = 2
+	if ARGS[3] = 1:grup3 = 3
+	if ARGS[4] = 1:grup4 = 4
+	if ARGS[5] = 1:grup5 = 5
+	if ARGS[6] = 1:grup6 = 6
 	boy_counter = 0
-	:rnd_boy1_loop
+	:rnd_boy_loop
 	boy_counter += 1
-	r = rand(0,ARRSIZE('grupTipe'))
-	if npcPol[r] = 0 and (grupTipe[r] = grup0 or grupTipe[r] = grup1 or grupTipe[r] = grup2 or grupTipe[r] = grup3 or grupTipe[r] = grup4 or grupTipe[r] = grup5):
-		$school_static_num = $school_static_num[r]
-		$rand_boy1 = $npc_firstname[$school_static_num]
+	r = rand(0,arrsize('npc_grupTipe'))
+	if npc_gender['A<<r>>'] = 0 and schoolenable['A<<r>>'] = 1 and npc_grupTipe['A<<r>>'] ! 0 and (npc_grupTipe['A<<r>>'] = grup1 or npc_grupTipe['A<<r>>'] = grup2 or npc_grupTipe['A<<r>>'] = grup3 or npc_grupTipe['A<<r>>'] = grup4 or npc_grupTipe['A<<r>>'] = grup5 or npc_grupTipe['A<<r>>'] = grup6):
+		$school_static_num = $school_static_num['A<<r>>']
+		$rand_boy1 = $npc_nickname['A<<r>>']
 		if $rand_boy = $rand_boy1: jump 'rnd_boy1_loop'
 		killvar 'boy_counter'
-	elseif boy_counter = 50:
+	elseif boy_counter = 1000:
 		$school_static_num = 0
 		$rand_boy1 = 'boy you don''t know'
 		killvar 'boy_counter'
@@ -2245,27 +2242,27 @@ if $ARGS[0] = 'rand_boy_arg1':
 end
 
 if $ARGS[0] = 'rand_girl_arg':
-	grup0 = 0
 	grup1 = 0
 	grup2 = 0
 	grup3 = 0
 	grup4 = 0
 	grup5 = 0
-	if ARGS[1] = 1:grup0 = 1
-	if ARGS[2] = 1:grup1 = 2
-	if ARGS[3] = 1:grup2 = 3
-	if ARGS[4] = 1:grup3 = 4
-	if ARGS[5] = 1:grup4 = 5
-	if ARGS[6] = 1:grup5 = 6
+	grup6 = 0
+	if ARGS[1] = 1:grup1 = 1
+	if ARGS[2] = 1:grup2 = 2
+	if ARGS[3] = 1:grup3 = 3
+	if ARGS[4] = 1:grup4 = 4
+	if ARGS[5] = 1:grup5 = 5
+	if ARGS[6] = 1:grup6 = 6
 	girl_counter = 0
 	:rnd_girl_loop
 	girl_counter += 1
-	r = rand(0,ARRSIZE('grupTipe'))
-	if npcPol[r] = 1 and (grupTipe[r] = grup0 or grupTipe[r] = grup1 or grupTipe[r] = grup2 or grupTipe[r] = grup3 or grupTipe[r] = grup4 or grupTipe[r] = grup5):
-		$school_static_num = $school_static_num[r]
-		$rand_girl = $npc_firstname[$school_static_num]
+	r = rand(0,arrsize('npc_grupTipe'))
+	if npc_gender['A<<r>>'] = 0 and schoolenable['A<<r>>'] = 1 and npc_grupTipe['A<<r>>'] ! 0 and (npc_grupTipe['A<<r>>'] = grup1 or npc_grupTipe['A<<r>>'] = grup2 or npc_grupTipe['A<<r>>'] = grup3 or npc_grupTipe['A<<r>>'] = grup4 or npc_grupTipe['A<<r>>'] = grup5 or npc_grupTipe['A<<r>>'] = grup6):
+		$school_static_num = $school_static_num['A<<r>>']
+		$rand_girl = $npc_nickname['A<<r>>']
 		killvar 'girl_counter'
-	elseif girl_counter = 50:
+	elseif girl_counter = 1000:
 		$school_static_num = 0
 		$rand_girl = 'girl you don''t know'
 		killvar 'girl_counter'
@@ -2275,28 +2272,28 @@ if $ARGS[0] = 'rand_girl_arg':
 end
 
 if $ARGS[0] = 'rand_girl_arg1':
-	grup0 = 0
 	grup1 = 0
 	grup2 = 0
 	grup3 = 0
 	grup4 = 0
 	grup5 = 0
-	if ARGS[1] = 1:grup0 = 1
-	if ARGS[2] = 1:grup1 = 2
-	if ARGS[3] = 1:grup2 = 3
-	if ARGS[4] = 1:grup3 = 4
-	if ARGS[5] = 1:grup4 = 5
-	if ARGS[6] = 1:grup5 = 6
+	grup6 = 0
+	if ARGS[1] = 1:grup1 = 1
+	if ARGS[2] = 1:grup2 = 2
+	if ARGS[3] = 1:grup3 = 3
+	if ARGS[4] = 1:grup4 = 4
+	if ARGS[5] = 1:grup5 = 5
+	if ARGS[6] = 1:grup6 = 6
 	girl_counter = 0
 	:rnd_girl1_loop
 	girl_counter += 1
-	r = rand(0,ARRSIZE('grupTipe'))
-	if npcPol[r] = 1 and (grupTipe[r] = grup0 or grupTipe[r] = grup1 or grupTipe[r] = grup2 or grupTipe[r] = grup3 or grupTipe[r] = grup4 or grupTipe[r] = grup5):
-		$school_static_num = $school_static_num[r]
-		$rand_girl1 = $npc_firstname[$school_static_num]
+	r = rand(0,arrsize('npc_grupTipe'))
+	if npc_gender['A<<r>>'] = 1 and schoolenable['A<<r>>'] = 1 and npc_grupTipe['A<<r>>'] ! 0 and (npc_grupTipe['A<<r>>'] = grup1 or npc_grupTipe['A<<r>>'] = grup2 or npc_grupTipe['A<<r>>'] = grup3 or npc_grupTipe['A<<r>>'] = grup4 or npc_grupTipe['A<<r>>'] = grup5 or npc_grupTipe['A<<r>>'] = grup6):
+		$school_static_num = $school_static_num['A<<r>>']
+		$rand_girl1 = $npc_nickname['A<<r>>']
 		if $rand_girl = $rand_girl1: jump 'rnd_girl1_loop'
 		killvar 'girl_counter'
-	elseif girl_counter = 50:
+	elseif girl_counter = 1000:
 		$school_static_num = 0
 		$rand_girl1 = 'girl you don''t know'
 		killvar 'girl_counter'
@@ -2310,14 +2307,14 @@ if $ARGS[0] = 'rand_teacher_arg':
 	teacher_counter = 0
 	:rnd_teacher_loop
 	teacher_counter += 1
-	r = rand(0,ARRSIZE('grupTipe'))
-	if teacher_counter = 50:
+	r = rand(0,arrsize('npc_grupTipe'))
+	if teacher_counter = 1000:
 		$rand_teacher = 'Tsarev'
 		killvar 'teacher_counter'
-	elseif grupTipe[r] ! 6 or npcPol[r] = 1:
+	elseif npc_grupTipe['A<<r>>'] ! 6 or npc_gender['A<<r>>'] = 1:
 		jump 'rnd_teacher_loop'
 	end
-	$rand_teacher = dyneval('$result = $npc_lastname[$school_static_num[<<r>>]]')
+	$rand_teacher = dyneval('$result = $npc_lastname[''A<<r>>'']')
 end
 
 --- gschool_events ---------------------------------

+ 3 - 1
locations/gschool_girls_bathroom.qsrc

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

+ 1 - 1
locations/gschool_lessonsev2.qsrc

@@ -978,7 +978,7 @@ if $ARGS[0] = 'shop':
 			gs 'gschool_events', 'rand_boy_arg', 1, 1, 0, 1, 1, 0
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/brasnap.jpg"></center>'
 			'During class, you feel a hand grab and pull your bra strap away from your body and before you can turn or protest they let go, causing it to snap back painfully. You let out a little yelp and turn to glare at <<$rand_boy>> behind you.'
-			'Then you hear Mr. Kuznetsov. "Is there a problem miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, <<$rand_boy>> behind you is snickering. The teacher looks at you accusingly.'
+			'Then you hear Mr. Kuznetsov. "Is there a problem Miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, <<$rand_boy>> behind you is snickering. The teacher looks at you accusingly.'
 			act 'Nothing is wrong':
 				cla
 				'You shake your head no to the teacher and desperately want to turn around and strangle <<$rand_boy>>, but you don''t dare with the teacher now keeping a eye on you.'

+ 1 - 1
locations/gschool_lunch.qsrc

@@ -448,7 +448,7 @@ if $ARGS[0] = 'events':
 				*nl
 				'A few minutes later, Vitek is about to cum and tells you, "Good job, cocksucker. I''m going to drop my load in your mouth now and when I do, you ''re going to swallow it all and lick me clean. If you spill anything, you''re going to lick it up from the floor. Got that?" You nod up at him and as soon as his cum hits your tongue, you diligently swallow his load, making sure not to let a single drop escape. When you''re sure he''s finished, you lick and suck his slowly softening dick clean, before tucking it back into his pants for him.'
 				*nl
-				'"That was great, <<$pcs_firstname>>, I see you''ve certainly earned your reputation. We''ll definitely be doing this more often, maybe next time I''ll make sure the other boys can have a turn as well. We''ll come find you when we want you. Understood?"'
+				'"That was great, <<$pcs_nickname>>, I see you''ve certainly earned your reputation. We''ll definitely be doing this more often, maybe next time I''ll make sure the other boys can have a turn as well. We''ll come find you when we want you. Understood?"'
 				*nl
 				'You''re not looking forward to the perspective, but not knowing what else to do you just nod. After the guys leave the bathroom you quickly have a drink, trying to wash the nasty taste of his cum out of your mouth.'
 				act 'Continue': gt 'gschool_lessons', 'short_break'

+ 1 - 1
locations/gschool_sex.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = 'suck':
 				elseif lpp = 3:
 					'"I think I might have tonsillitis... Throat hurts." feigning a hoarse voice, you say.'
 				elseif lpp = 4:
-					gs 'gschool_events', 'rand_girl_arg2'
+					gs 'gschool_events', 'rand_girl_arg'
 
 					'"I told <<$rand_girl>>, I would go home with her and study."'
 				elseif lpp = 5:

+ 36 - 36
locations/gschool_socialchg1.qsrc

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

+ 1 - 1
locations/pavComplexb2.qsrc

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

+ 1 - 1
locations/pavaptcourtev.qsrc

@@ -131,7 +131,7 @@ if $ARGS[0] = 'events1':
 		if storyline ! 1: jump 'reroll_jump1'
 		*clr & cla
 		anushka_met = daystart
-		'<center><img src="images\locations\pavlovsk\school\head\45.jpg"></center>'
+		'<center><img src="images\pc\npc_headshots\big144.jpg"></center>'
 		'As you walk into the building you nearly run into Anushka. "Hey <<$pcs_nickname>> whats up?"'
 		'A bit surprised to see her but not disappointed, you was just wandering around for the hell of it. "Just killing time, kinda bored you know?"'
 		'She nods a bit and finishes checking the mail. "Yeah I know how that is, hey want to come up to my place and hang out?"'

+ 5 - 5
locations/salon.qsrc

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

+ 2 - 1
locations/selfplay.qsrc

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

+ 3 - 5
locations/stat.qsrc

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

+ 2 - 0
locations/succubus.qsrc

@@ -103,11 +103,13 @@ if $ARGS[0] = 'RapistFight':
 			scrand -= 1
 			scfwon = 0
 			RapistFight = 0
+			ThiefFight = 0
 			if rikudo > 10:rikudo += 100
 			pcs_dom += 1
 			Win += 1
 		elseif RapistFight = 1:
 			RapistFight = 0
+			ThiefFight = 0
 			SUB += 1
 			Loss += 1
 			if rikudo > 10:rikudo -= 10