[fixed] more fixes for the old random npc generators

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

locations/gschool_detention.qsrc

@@ -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.'

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'
@@ -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

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.'		

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.'

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'

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: