Forráskód Böngészése

convert rest of grupTipe[] to npc_grupTipe['']

rachels 3 éve
szülő
commit
4568fb4057

+ 6 - 6
locations/FedorMisc.qsrc

@@ -53,12 +53,12 @@ if $ARGS[0] = 'Fedor Chat':
 		'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb''">comb</a>.'
 	end
 
-	if grupTipe[5] = 5:'Fedor is an outcast in school, and doesn''t have anyone to sit with during lunch.'
-	if grupTipe[5] = 6:'Fedor is a Super Hero, Pssst you shouldn''t be seeing this. please report this bug.'
-	if grupTipe[5] = 3:'Fedor is a nerd, and usually spends lunch time with them.'
-	if grupTipe[5] = 2:'Fedor is part of the athletic clique in your school.'
-	if grupTipe[5] = 1:'Fedor is popular, and spends time with the other popular kids usually.'
-	if grupTipe[5] = 4:'Fedor is a Gopnik, and spends a lot of time doing what Gopniks usually do: be loud, and drink beer.'
+	if npc_grupTipe['A5'] = 5:'Fedor is an outcast in school, and doesn''t have anyone to sit with during lunch.'
+	if npc_grupTipe['A5'] = 6:'Fedor is a Super Hero, Pssst you shouldn''t be seeing this. please report this bug.'
+	if npc_grupTipe['A5'] = 3:'Fedor is a nerd, and usually spends lunch time with them.'
+	if npc_grupTipe['A5'] = 2:'Fedor is part of the athletic clique in your school.'
+	if npc_grupTipe['A5'] = 1:'Fedor is popular, and spends time with the other popular kids usually.'
+	if npc_grupTipe['A5'] = 4:'Fedor is a Gopnik, and spends a lot of time doing what Gopniks usually do: be loud, and drink beer.'
 	if npc_rel['A5'] < 20:'You and Fedor don''t get along at all.'
 	if npc_rel['A5'] >= 20 and npc_rel['A5'] < 40:'You and Fedor don''t get along very well.'
 	if npc_rel['A5'] >= 40 and npc_rel['A5'] < 60:'You and Fedor have a normal relationship.'

+ 1 - 1
locations/MeynoldHome.qsrc

@@ -512,7 +512,7 @@ if $ARGS[0] = 'Vicky Goodbye':
 	*clr & cla
 	music_loop = 0
 	close all
-	if grupTipe[61] = 4:grupTipe[61] = 600
+	if npc_grupTipe['A189'] = 4:npc_grupTipe['A189'] = 600
 	gs'stat'
 	'<center><b><h4><font color=#ffae00><<"Viktoriya [Vicky] Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meynold/vicky/vicky2.jpg"></center>'

+ 4 - 4
locations/NikoEv.qsrc

@@ -95,8 +95,8 @@ if $ARGS[0] = 'Lunch Chat':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 	end	
 	'<<$npc_notes[''A189'']>>'
-	if grupTipe[61] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#FF00FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
-	if grupTipe[61] = 4:'Niko is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
+	if npc_grupTipe['A189'] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#FF00FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
+	if npc_grupTipe['A189'] = 4:'Niko is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
 	if npc_rel['A189'] < 20:'You and Niko don''t get along at all.'
 	if npc_rel['A189'] >= 20 and npc_rel['A189'] < 40:'You and Niko don''t get along very well.'
 	if npc_rel['A189'] >= 40 and npc_rel['A189'] < 60:'You and Niko have a normal relationship.'
@@ -496,8 +496,8 @@ if $ARGS[0] = 'Disco Chat':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 	end	
 	'<<$npc_notes[''189'']>>'
-	if grupTipe[A189] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#E400FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
-	if grupTipe[A189] = 4:'Niko is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
+	if npc_grupTipe['A189'] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#E400FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
+	if npc_grupTipe['A189'] = 4:'Niko is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
 	if npc_rel['A189'] < 20:'You and Niko don''t get along at all.'
 	if npc_rel['A189'] >= 20 and npc_rel['A189'] < 40:'You and Niko don''t get along very well.'
 	if npc_rel['A189'] >= 40 and npc_rel['A189'] < 60:'You and Niko have a normal relationship.'

+ 1 - 1
locations/NikoMeyHome.qsrc

@@ -512,7 +512,7 @@ if $ARGS[0] = 'Vicky Goodbye':
 	*clr & cla
 	music_loop = 0
 	close all
-	if grupTipe[61] = 4:grupTipe[61] = 600
+	if npc_grupTipe['A189'] = 4:npc_grupTipe['A189'] = 600
 	gs'stat'
 	'<center><b><h4><font color=#ffae00><<"Viktoriya [Vicky] Meynold">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meynold/vicky/vicky2.jpg"></center>'

+ 1 - 1
locations/NikoSlut.qsrc

@@ -1261,7 +1261,7 @@ if $ARGS[0] = 'Biker Attack':
 
 				act 'Help Niko up':
 					*clr & cla
-					grupTipe[61] = 600
+					npc_grupTipe['A189'] = 600
 					NikoEv = 21
 					NikoSlut = 0
 					minut += 5

+ 2 - 2
locations/NikoWhore.qsrc

@@ -317,7 +317,7 @@ if $ARGS[0] = 'Exposed':
 	if grupTipe = 6:VKGroup = 6 & grupTipe = 5
 	school_lunch = 0
 	NikoEv = 10
-	grupTipe[61] = 600
+	npc_grupTipe['A189'] = 600
 	inhib_exp += 10
 	if pav_sex < 300:pav_sex = 300
 	gs 'fame'
@@ -732,7 +732,7 @@ if $ARGS[0] = 'Walk Of Shame':
 	gs 'fame'
 	$location_type = 'indoors'	
 	gs 'themes', 'indoors'
-	grupTipe[61] = 4
+	npc_grupTipe['A189'] = 4
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/wos1.jpg"></center>'

+ 1 - 1
locations/Snpc.qsrc

@@ -35,7 +35,7 @@ end
 gs 'cumreaction'
 
 !!option to mock outcasts
-if grupTipe[numnpc] = 5 and grupTipe ! 5:
+if npc_grupTipe['A<<numnpc>>'] = 5 and grupTipe ! 5:
 	gs 'willpower', 'humiliation', 'force', 'easy'
 	if will_cost <= pcs_willpwr:
 		if pav_slut < 100:

+ 4 - 4
locations/dimaRevenge.qsrc

@@ -55,7 +55,7 @@ if ARGS[0] = 3:
 			*clr & cla
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
-			if grupTipe[0] = 1:
+			if grupTipe = 1:
 				'"<<$pcs_firstname>> thinks she''s so great. What I wouldn''t give to watch her fall."'
 				'"You won''t need to give anything. Word is she cheated on Dimka and now he''s out to destroy her. You have to be a real idiot to cross him."'
 				'"I didn''t even know they were dating. Where did you hear this?"'
@@ -90,7 +90,7 @@ if ARGS[0] = 3:
 					'Not knowing what else to do right now, you head to class.'
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
-			elseif grupTipe[0] = 2:
+			elseif grupTipe = 2:
 				'"I heard <<$pcs_firstname>> is on steroids."'
 				'"I heard she sucked off the coach for a spot on the team."'
 				'At this point you can''t help yourself and barge out of the stall to the surprise of the two girls.'
@@ -131,7 +131,7 @@ if ARGS[0] = 3:
 					'Not knowing what else to do right now, you head to class.'
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
-			elseif grupTipe[0] = 3:
+			elseif grupTipe = 3:
 				'"So, did you hear about that nerd girl, <<$pcs_firstname>>? They say she is secretly a slut who gives it up to all the nerds."'
 				'"I heard she''s actually an idiot and the nerds do her homework for her in exchange for blowjobs whenever they want."'
 				'You cover your ears and try to ignore their comments. After they leave you go to the sink and splash water on your face and try to steel yourself.
@@ -233,7 +233,7 @@ if ARGS[0] = 3:
 					'Not knowing what else to do right now, you head to class.'
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
-			elseif grupTipe[0] = 4:
+			elseif grupTipe = 4:
 				'"You know that <<$pcs_firstname>> girl who is always hanging out with the gopniks. Well, I heard she has to suck them off everyday to be allowed to hang out with them."'
 				'"I believe it. She acts all tough, but if it weren''t for her friends she would just be a scared little girl."'
 				'No fucking way are you standing for this! You quickly exit the stall head towards them. The first girl sees you and bolts out of the restroom.

+ 0 - 1
locations/ender.qsrc

@@ -422,7 +422,6 @@ if $ARGS[0] = 'win':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/school/win.jpg"></center>'
 		$npc_notes['A13'] = 'Lariska, who is very dependent on other people''s opinions. After you managed to win the fight against Christina Lariska looks more cheerful. She''s a good volleyball player, and could go pro if she keeps it up even though she doesn''t believe it herself. But with the help of Mikhail Nikolayevich, the volleyball coach, she might make it.'
 		$npc_notes['A18'] = 'After you beat Christina in front of the whole school started gossiping about how you managed to break her. Once known as the Christina the terrified she was a former shell of herself.'
-		grupTipe[18] = 5
 		npc_grupTipe['A18'] = 5
 		'Christina fell to the ground, and you grabbed her by the hair. "Well bitch, tell the whole school, have you ever sucked a cock or not?" Christine squealed as she admitted to the whole school that she loved sucking cock.'
 		act 'Leave':gs 'gschool_grounds', 'main'

+ 1 - 468
locations/gschool_lessons.qsrc

@@ -336,471 +336,4 @@ if $ARGS[0] = 'schedule':
 	end
 end
 
-!!{ Probably can be deleted
-if $ARGS[0] = 'npc_data':
-!!$npc_firstname[i] - npc given name stored since MGX
-!!$npc_nickname[i] - npc nick name stored since MGX
-!!$npc_lastname[i] - npc surname name stored since MGX
-!!$npc_usedname[i] - npc usual used name stored since MGX
-!!$npc_notes[i] - npc character description stored since MGX
-!!npc_rel[i] - npc relationship stored since MGX
-!!npc_love[i] - npc lust for PC stored since MGX
-!!npc_gender[i] - 0 - male, 1 - female stored since MGX
-!!npc_rel['A<<i>>'] - Starting relationship
-!!npcPol[i] - sex, 0 - male, 1 - female
-!!grupTipe[i] - social group
-!!1 - cool kids
-!!2 - jocks
-!!3 - nerds
-!!4 - Gopnik
-!!5 - outcasts
-!!6 - teachers
-
-!!
-!!===========================Male Students=======================
-!!
-!!Dimka Nosov
-	$school_static_num[1] = 'A1'
-	npcPol[1] = 0
-	grupTipe[1] = 1
-	$npcGo[1] = '<a href="exec:numnpc = 1 & gt ''Snpc''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
-	$npcSelfie[1] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
-
-!!Artem Chebotarev
-	$school_static_num[2] = 'A2'
-	npcPol[2] = 0
-	grupTipe[2] = 3
-	$npcGo[2] = '<a href="exec:numnpc = 2 & gt ''Snpc''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
-	$npcSelfie[2] = '<a href="exec:numnpc = 2 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
-
-!!Ivan Prokhorov
-	$school_static_num[3] = 'A3'
-	npcPol[3] = 0
-	grupTipe[3] = 2
-	$npcGo[3] = '<a href="exec:numnpc = 3 & gt ''Snpc''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
-	$npcSelfie[3] = '<a href="exec:numnpc = 3 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
-
-!!Igor Kruglov
-	$school_static_num[4] = 'A4'
-	npcPol[4] = 0
-	grupTipe[4] = 1
-	$npcGo[4] = '<a href="exec:numnpc = 4 & gt ''Snpc''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
-	$npcSelfie[4] = '<a href="exec:numnpc = 4 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
-
-!!Fedor Kozlov
-	$school_static_num[5] = 'A5'
-	npcPol[5] = 0
-	if fedormasha = 1: grupTipe[5] = 5
-	if fedormasha = 0: grupTipe[5] = 2
-	$npcGo[5] = '<a href="exec:numnpc = 5 & gt ''Snpc''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
-	$npcSelfie[5] = '<a href="exec:numnpc = 5 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
-
-!!Petka Klyuyev
-	$school_static_num[6] = 'A6'
-	npcPol[6] = 0
-	grupTipe[6] = 3
-	$npcGo[6] = '<a href="exec:numnpc = 6 & gt ''Snpc''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
-	$npcSelfie[6] = '<a href="exec:numnpc = 6 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
-
-!!Lesco Tsarev
-	$school_static_num[7] = 'A7'
-	npcPol[7] = 0
-	grupTipe[7] = 5
-	$npcGo[7] = '<a href="exec:numnpc = 7 & gt ''Snpc''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
-	$npcSelfie[7] = '<a href="exec:numnpc = 7 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
-
-!!Svyatoslav Voinov
-	$school_static_num[8] = 'A8'
-	npcPol[8] = 0
-	grupTipe[8] = 2
-	$npcGo[8] = '<a href="exec:numnpc = 8 & gt ''Snpc''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
-	$npcSelfie[8] = '<a href="exec:numnpc = 8 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
-
-!!Vitek Kotov
-	$school_static_num[9] = 'A9'
-	npcPol[9] = 0
-	grupTipe[9] = 4
-	$npcGo[9] = '<a href="exec:numnpc = 9 & gt ''Snpc''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
-	$npcSelfie[9] = '<a href="exec:numnpc = 9 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
-
-!!Dan Ryzhov
-	$school_static_num[10] = 'A10'
-	npcPol[10] = 0
-	grupTipe[10] = 4
-	$npcGo[10] = '<a href="exec:numnpc = 10 & gt ''Snpc''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
-	$npcSelfie[10] = '<a href="exec:numnpc = 10 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
-
-!!Vasily Shulgin
-	$school_static_num[11] = 'A11'
-	npcPol[11] = 0
-	grupTipe[11] = 4
-	$npcGo[11] = '<a href="exec:numnpc = 11 & gt ''Snpc''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
-	$npcSelfie[11] = '<a href="exec:numnpc = 11 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
-
-!!Marcus Larson
-	$school_static_num[27] = 'A146'
-	npcPol[27] = 0
-	grupTipe[27] = 1
-	$npcGo[27] = '<a href="exec:numnpc = 27 & gt ''Snpc''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
-	$npcSelfie[27] = '<a href="exec:numnpc = 27 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
-
-!!Andrey Aleksandrov
-	$school_static_num[28] = 'A147'
-	npcPol[28] = 0
-	grupTipe[28] = 1
-	$npcGo[28] = '<a href="exec:numnpc = 28 & gt ''Snpc''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
-	$npcSelfie[28] = '<a href="exec:numnpc = 28 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
-
-!!Mefodiy Utkin
-	$school_static_num[29] = 'A148'
-	npcPol[29] = 0
-	grupTipe[29] = 1
-	$npcGo[29] = '<a href="exec:numnpc = 29 & gt ''Snpc''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
-	$npcSelfie[29] = '<a href="exec:numnpc = 29 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
-
-!!Lazar Utkin
-	$school_static_num[32] = 'A149'
-	npcPol[32] = 0
-	grupTipe[32] = 2
-	$npcGo[32] = '<a href="exec:numnpc = 32 & gt ''Snpc''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
-	$npcSelfie[32] = '<a href="exec:numnpc = 32 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
-
-!!Erast Vagin
-	$school_static_num[33] = 'A150'
-	npcPol[33] = 0
-	grupTipe[33] = 2
-	$npcGo[33] = '<a href="exec:numnpc = 33 & gt ''Snpc''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
-	$npcSelfie[33] = '<a href="exec:numnpc = 33 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
-
-!!Evgeny Kuznetsov
-	$school_static_num[35] = 'A151'
-	npcPol[35] = 0
-	grupTipe[35] = 3
-	$npcGo[35] = '<a href="exec:numnpc = 35 & gt ''Snpc''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
-	$npcSelfie[35] = '<a href="exec:numnpc = 35 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
-
-!!Feofan Krupin
-	$school_static_num[36] = 'A152'
-	npcPol[36] = 0
-	grupTipe[36] = 3
-	$npcGo[36] = '<a href="exec:numnpc = 36 & gt ''Snpc''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
-	$npcSelfie[36] = '<a href="exec:numnpc = 36 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
-
-!!Gerasim Vasilyev
-	$school_static_num[37] = 'A153'
-	npcPol[37] = 0
-	grupTipe[37] = 3
-	$npcGo[37] = '<a href="exec:numnpc = 37 & gt ''Snpc''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
-	$npcSelfie[37] = '<a href="exec:numnpc = 37 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
-
-!!Radomir Popov
-	$school_static_num[39] = 'A154'
-	npcPol[39] = 0
-	grupTipe[39] = 4
-	$npcGo[39] = '<a href="exec:numnpc = 39 & gt ''Snpc''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
-	$npcSelfie[39] = '<a href="exec:numnpc = 39 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
-
-!!Lavrenti Romanov
-	$school_static_num[40] = 'A155'
-	npcPol[40] = 0
-	grupTipe[40] = 4
-	$npcGo[40] = '<a href="exec:numnpc = 40 & gt ''Snpc''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
-	$npcSelfie[40] = '<a href="exec:numnpc = 40 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
-
-!!Arkadi Fyodorov
-	$school_static_num[41] = 'A156'
-	npcPol[41] = 0
-	grupTipe[41] = 4
-	$npcGo[41] = '<a href="exec:numnpc = 41 & gt ''Snpc''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
-	$npcSelfie[41] = '<a href="exec:numnpc = 41 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
-
-!!Roman Yakovlev
-	$school_static_num[42] = 'A157'
-	npcPol[42] = 0
-	grupTipe[42] = 4
-	$npcGo[42] = '<a href="exec:numnpc = 42 & gt ''Snpc''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
-	$npcSelfie[42] = '<a href="exec:numnpc = 42 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
-
-!!Valentin Bogdanov
-	$school_static_num[43] = 'A158'
-	npcPol[43] = 0
-	grupTipe[43] = 4
-	$npcGo[43] = '<a href="exec:numnpc = 43 & gt ''Snpc''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
-	$npcSelfie[43] = '<a href="exec:numnpc = 43 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
-
-!!Petia Alkaev
-	$school_static_num[47] = 'A159'
-	npcPol[47] = 0
-	grupTipe[47] = 5
-	$npcGo[47] = '<a href="exec:numnpc = 47 & gt ''Snpc''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
-	$npcSelfie[47] = '<a href="exec:numnpc = 47 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
-
-!!Vanya Yanka
-	$school_static_num[59] = 'A165'
-	npcPol[59] = 0
-	grupTipe[59] = 2
-	$npcGo[59] = '<a href="exec:numnpc = 59 & gt ''Snpc''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
-	$npcSelfie[59] = '<a href="exec:numnpc = 59 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
-	
-!!Nikolai Volkov
-	$school_static_num[61] = 'A189'
-	npcPol[61] = 0
-	grupTipe[61] = 4
-	$npcGo[61] = '<a href="exec:numnpc = 61 & gt ''Snpc''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
-	$npcSelfie[61] = '<a href="exec:numnpc = 61 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
-
-!!
-!!===========================Female Students=======================
-!!
-!!Julia Milov
-	$school_static_num[12] = 'A12'
-	npcPol[12] = 1
-	grupTipe[12] = 3
-	$npcGo[12] = '<a href="exec:numnpc = 12 & gt ''Snpc''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
-	$npcSelfie[12] = '<a href="exec:numnpc = 12 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
-
-!!Lariska Gruzdeva
-	$school_static_num[13] = 'A13'
-	npcPol[13] = 1
-	grupTipe[13] = 2
-	$npcGo[13] = '<a href="exec:numnpc = 13 & gt ''Snpc''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
-	$npcSelfie[13] = '<a href="exec:numnpc = 13 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
-
-!!Katja Meynold
-	$school_static_num[14] = 'A14'
-	npcPol[14] = 1
-	grupTipe[14] = 1
-	$npcGo[14] = '<a href="exec:numnpc = 14 & gt ''Snpc''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
-	$npcSelfie[14] = '<a href="exec:numnpc = 14 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
-
-!!Vicky Meynold
-	$school_static_num[15] = 'A15'
-	npcPol[15] = 1
-	grupTipe[15] = 1
-	$npcGo[15] = '<a href="exec:numnpc = 15 & gt ''Snpc''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
-	$npcSelfie[15] = '<a href="exec:numnpc = 15 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
-
-!!Natasha Belova
-	$school_static_num[16] = 'A16'
-	npcPol[16] = 1
-	grupTipe[16] = 3
-	$npcGo[16] = '<a href="exec:numnpc = 16 & gt ''Snpc''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
-	$npcSelfie[16] = '<a href="exec:numnpc = 16 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
-
-!!Inna Devyatova
-	$school_static_num[17] = 'A17'
-	npcPol[17] = 1
-	grupTipe[17] = 1
-	$npcGo[17] = '<a href="exec:numnpc = 17 & gt ''Snpc''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
-	$npcSelfie[17] = '<a href="exec:numnpc = 17 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
-
-!!Christina Zvereva
-	$school_static_num[18] = 'A18'
-	npcPol[18] = 1
-	if zverSlutQW >= 2:
-		grupTipe[18] = 0
-	else
-		grupTipe[18] = 2
-	end
-	$npcGo[18] = '<a href="exec:numnpc = 18 & gt ''Snpc''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
-	$npcSelfie[18] = '<a href="exec:numnpc = 18 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
-
-!!Lina Starov
-	$school_static_num[19] = 'A19'
-	npcPol[19] = 1
-	grupTipe[19] = 2
-	$npcGo[19] = '<a href="exec:numnpc = 19 & gt ''Snpc''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
-	$npcSelfie[19] = '<a href="exec:numnpc = 19 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
-
-!!Lena Kotova
-	$school_static_num[20] = 'A20'
-	npcPol[20] = 1
-	grupTipe[20] = 4
-	$npcGo[20] = '<a href="exec:numnpc = 20 & gt ''Snpc''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
-	$npcSelfie[20] = '<a href="exec:numnpc = 20 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
-
-!!Lera Tsarev
-	$school_static_num[21] = 'A21'
-	npcPol[21] = 1
-	grupTipe[21] = 4
-	$npcGo[21] = '<a href="exec:numnpc = 21 & gt ''Snpc''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
-	$npcSelfie[21] = '<a href="exec:numnpc = 21 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
-
-!!Bella Artamonov
-	$school_static_num[22] = 'A22'
-	npcPol[22] = 1
-	grupTipe[22] = 2
-	$npcGo[22] = '<a href="exec:numnpc = 22 & gt ''Snpc''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
-	$npcSelfie[22] = '<a href="exec:numnpc = 22 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
-
-!!Albina Barlovskaya
-	$school_static_num[23] = 'A23'
-	npcPol[23] = 1
-	grupTipe[23] = 1
-	$npcGo[23] = '<a href="exec:numnpc = 23 & gt ''Snpc''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
-	$npcSelfie[23] = '<a href="exec:numnpc = 23 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
-
-!!Pauline Sebagotulina
-	$school_static_num[24] = 'A24'
-	npcPol[24] = 1
-	grupTipe[24] = 4
-	$npcGo[24] = '<a href="exec:numnpc = 24 & gt ''Snpc''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
-	$npcSelfie[24] = '<a href="exec:numnpc = 24 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
-
-!!Sonia Ivanko
-	$school_static_num[25] = 'A25'
-	npcPol[25] = 1
-	if soniaPS > 0:
-		grupTipe[25] = 5
-	else
-		grupTipe[25] = 1
-	end
-	$npcGo[25] = '<a href="exec:numnpc = 25 & gt ''Snpc''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
-	$npcSelfie[25] = '<a href="exec:numnpc = 25 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
-
-!!Stasya Pavlov
-	$school_static_num[30] = 'A139'
-	npcPol[30] = 1
-	grupTipe[30] = 1
-	$npcGo[30] = '<a href="exec:numnpc = 30 & gt ''Snpc''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
-	$npcSelfie[30] = '<a href="exec:numnpc = 30 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
-
-!!Lizaveta Petrov
-	$school_static_num[31] = 'A140'
-	npcPol[31] = 1
-	grupTipe[31] = 1
-	$npcGo[31] = '<a href="exec:numnpc = 31 & gt ''Snpc''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
-	$npcSelfie[31] = '<a href="exec:numnpc = 31 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
-
-!!Veronika Sokolov
-	$school_static_num[34] = 'A141'
-	npcPol[34] = 1
-	grupTipe[34] = 2
-	$npcGo[34] = '<a href="exec:numnpc = 34 & gt ''Snpc''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
-	$npcSelfie[34] = '<a href="exec:numnpc = 34 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
-
-!!Zinaida Alkaev
-	$school_static_num[38] = 'A142'
-	npcPol[38] = 1
-	grupTipe[38] = 3
-	$npcGo[38] = '<a href="exec:numnpc = 38 & gt ''Snpc''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
-	$npcSelfie[38] = '<a href="exec:numnpc = 38 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
-	
-!!Alyona Alkaev
-	$school_static_num[44] = 'A143'
-	npcPol[44] = 1
-	grupTipe[44] = 4
-	$npcGo[44] = '<a href="exec:numnpc = 44 & gt ''Snpc''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
-	$npcSelfie[44] = '<a href="exec:numnpc = 44 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
-
-!!Anushka Konstantinov
-	$school_static_num[45] = 'A144'
-	npcPol[45] = 1
-	grupTipe[45] = 4
-	$npcGo[45] = '<a href="exec:numnpc = 45 & gt ''Snpc''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
-	$npcSelfie[45] = '<a href="exec:numnpc = 45 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
-
-!!Ekaterina Maksimov
-	$school_static_num[46] = 'A145'
-	npcPol[46] = 1
-	grupTipe[46] = 4
-	$npcGo[46] = '<a href="exec:numnpc = 46 & gt ''Snpc''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
-	$npcSelfie[46] = '<a href="exec:numnpc = 46 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
-
-!!
-!!===========================Teachers=======================
-!!
-!!Anatoly E. Tsarev
-	$school_static_num[26] = 'A26'
-	npcPol[26] = 0
-	grupTipe[26] = 6
-	$npcGo[26] = '<a href="exec:numnpc = 26 & gt ''Snpc''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
-	$npcSelfie[26] = '<a href="exec:numnpc = 26 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
-
-!!Ilya Yenotin
-	$school_static_num[48] = 'A130'
-	npcPol[48] = 0
-	grupTipe[48] = 6
-	$npcGo[48] = '<a href="exec:numnpc = 48 & gt ''Snpc''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
-	$npcSelfie[48] = '<a href="exec:numnpc = 48 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
-
-!!Viktor Pavlovich
-	$school_static_num[49] = 'A131'
-	npcPol[49] = 0
-	grupTipe[49] = 6
-	$npcGo[49] = '<a href="exec:numnpc = 49 & gt ''Snpc''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
-	$npcSelfie[49] = '<a href="exec:numnpc = 49 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
-
-!!Aleksandrina Volkov
-	$school_static_num[50] = 'A134'
-	npcPol[50] = 1
-	grupTipe[50] = 6
-	$npcGo[50] = '<a href="exec:numnpc = 50 & gt ''Snpc''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
-	$npcSelfie[50] = '<a href="exec:numnpc = 50 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
-
-!!Yeva Sokoloff
-	$school_static_num[51] = 'A135'
-	npcPol[51] = 1
-	grupTipe[51] = 6
-	$npcGo[51] = '<a href="exec:numnpc = 51 & gt ''Snpc''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
-	$npcSelfie[51] = '<a href="exec:numnpc = 51 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
-
-!!Serafim Ivanov
-	$school_static_num[52] = 'A129'
-	npcPol[52] = 0
-	grupTipe[52] = 6
-	$npcGo[52] = '<a href="exec:numnpc = 52 & gt ''Snpc''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
-	$npcSelfie[52] = '<a href="exec:numnpc = 52 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
-
-!!Olga Aleksandrov
-	$school_static_num[53] = 'A136'
-	npcPol[53] = 1
-	grupTipe[53] = 6
-	$npcGo[53] = '<a href="exec:numnpc = 53 & gt ''Snpc''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
-	$npcSelfie[53] = '<a href="exec:numnpc = 53 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
-
-!!Raven Braakman
-	$school_static_num[54] = 'A137'
-	npcPol[54] = 1
-	grupTipe[54] = 6
-	$npcGo[54] = '<a href="exec:numnpc = 54 & gt ''Snpc''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
-	$npcSelfie[54] = '<a href="exec:numnpc = 54 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
-
-!!Arina Orlov
-	$school_static_num[55] = 'A138'
-	npcPol[55] = 1
-	grupTipe[55] = 6
-	$npcGo[55] = '<a href="exec:numnpc = 55 & gt ''Snpc''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
-	$npcSelfie[55] = '<a href="exec:numnpc = 55 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
-
-!!Ruslan Kuznetsov
-	$school_static_num[56] = 'A132'
-	npcPol[56] = 0
-	grupTipe[56] = 6
-	$npcGo[56] = '<a href="exec:numnpc = 56 & gt ''Snpc''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
-	$npcSelfie[56] = '<a href="exec:numnpc = 56 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
-
-!!Makar Vasilyev
-	$school_static_num[58] = 'A128'
-	npcPol[58] = 0
-	grupTipe[58] = 6
-	$npcGo[58] = '<a href="exec:numnpc = 58 & gt ''Snpc''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
-	$npcSelfie[58] = '<a href="exec:numnpc = 58 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
-
-!!Rolan Matveev
-	$school_static_num[57] = 'A133'
-	npcPol[57] = 0
-	grupTipe[57] = 6
-	$npcGo[57] = '<a href="exec:numnpc = 57 & gt ''Snpc''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
-	$npcSelfie[57] = '<a href="exec:numnpc = 57 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
-	
-!!Mikhail Nikolaevich
-	$school_static_num[60] = 'A69'
-	npcPol[60] = 0
-	grupTipe[60] = 6
-	$npcGo[60] = '<a href="exec:numnpc = 60 & gt ''Snpc''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
-	$npcSelfie[60] = '<a href="exec:numnpc = 60 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
-end
-}
---- gschool_lessons ---------------------------------
-
+--- gschool_lessons ---------------------------------

+ 35 - 33
locations/gschool_randperson.qsrc

@@ -20,42 +20,44 @@
 !! NOTE that in $rand_girl1 zero values for outcasts and teachers are not defined - undefined values will be zero by language
 !! Thanks to that you can include new social group and you don''t need to make changes in all places
 
-if $ARGS[0] = 'person_generator':
-	rand_person_ind = 0
-	rand_filtered_ind = 0
 
-	:filter_loop
-	  rand_person_ind = rand_person_ind + 1
-	  if rand_person_ind >= ARRSIZE('grupTipe') : jump 'outside_filter_loop'
-	  genderMatches = ARGS[0] = npcPol[rand_person_ind]
-	  nameIsNotRepeated = ARGS[1] <> $npc_firstname[$school_static_num[rand_person_ind]]
-	  grupTipeIsLegal = grupTipe[rand_person_ind] > 0
-	  grupTipeMatches = ARGS[grupTipe[rand_person_ind] + 1] = 1
-	  if genderMatches and nameIsNotRepeated and grupTipeIsLegal and grupTipeMatches :
-		rand_filtered[rand_filtered_ind] = rand_person_ind
-		rand_filtered_ind = rand_filtered_ind + 1
-	  end
-	  jump 'filter_loop'
-	:outside_filter_loop
+!! need rework
+!!if $ARGS[0] = 'person_generator':
+!!	rand_person_ind = 0
+!!	rand_filtered_ind = 0
 
-	if ARRSIZE('rand_filtered') > 0 :
-	  random_person = rand_filtered[rand(0,ARRSIZE('rand_filtered'))]
-	  $RESULT = $npc_firstname[$school_static_num[random_person]]
-	else
-	  $rand_gender = IIF (ARGS[0] = 0, 'boy', 'girl')
-	  $RESULT =  '<<$rand_gender>> you don''t know'
-	end
+!!	:filter_loop
+!!	  rand_person_ind = rand_person_ind + 1
+!!	  if rand_person_ind >= ARRSIZE('grupTipe') : jump 'outside_filter_loop'
+!!	  genderMatches = ARGS[0] = npcPol[rand_person_ind]
+!!	  nameIsNotRepeated = ARGS[1] <> $npc_firstname[$school_static_num[rand_person_ind]]
+!!	  grupTipeIsLegal = grupTipe[rand_person_ind] > 0
+!!	  grupTipeMatches = ARGS[grupTipe[rand_person_ind] + 1] = 1
+!!	  if genderMatches and nameIsNotRepeated and grupTipeIsLegal and grupTipeMatches :
+!!		rand_filtered[rand_filtered_ind] = rand_person_ind
+!!		rand_filtered_ind = rand_filtered_ind + 1
+!!	  end
+!!	  jump 'filter_loop'
+!!	:outside_filter_loop
 
-	KILLVAR 'rand_person_ind'
-	KILLVAR 'rand_filtered_ind'
-	KILLVAR 'rand_filtered'
-	KILLVAR '$rand_gender'
-	KILLVAR 'random_person'
-	KILLVAR 'genderMatches'
-	KILLVAR 'nameIsNotRepeated'
-	KILLVAR 'grupTipeIsLegal'
-	KILLVAR 'grupTipeMatches'
-end
+!!	if ARRSIZE('rand_filtered') > 0 :
+!!	  random_person = rand_filtered[rand(0,ARRSIZE('rand_filtered'))]
+!!	  $RESULT = $npc_firstname[$school_static_num[random_person]]
+!!	else
+!!	  $rand_gender = IIF (ARGS[0] = 0, 'boy', 'girl')
+!!	  $RESULT =  '<<$rand_gender>> you don''t know'
+!!	end
+
+!!	KILLVAR 'rand_person_ind'
+!!	KILLVAR 'rand_filtered_ind'
+!!	KILLVAR 'rand_filtered'
+!!	KILLVAR '$rand_gender'
+!!	KILLVAR 'random_person'
+!!	KILLVAR 'genderMatches'
+!!	KILLVAR 'nameIsNotRepeated'
+!!	KILLVAR 'grupTipeIsLegal'
+!!	KILLVAR 'grupTipeMatches'
+!!end
 
 if $ARGS[0] = 'couple_generator':
 	:couple_jump

+ 3 - 3
locations/gschool_socialchg.qsrc

@@ -267,7 +267,7 @@ if $ARGS[0] = 'jock warn 2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
 	'As you walk down the school hallway, you stop at your locker. You sense someone standing next to you so you turn to see Lariska and Lina there. They give you friendly smiles. Lariska speaks "Hey <<$pcs_nickname>>, I know we talked about this before, but you still seem to be not getting with the program."'
-	if grupTipe[18] = 0:
+	if npc_grupTipe['A18'] = 0:
 		'Before you can answer Lina adds. "Some of us have been feeling like you aren''t really fitting in with us anymore and that we should probably cut you loose."'
 	else	
 		'Before you can answer Lina adds. "Christina says she doesn''t want you to be one of us and that we should have never let you hang out with us in the first place."'
@@ -668,8 +668,8 @@ if $ARGS[0] = 'group_student_rel_change':
 		if npc_rel['A159'] <= 20: grupvalue[5] -= 1
 		if npc_rel['A165'] >= 80: grupvalue[2] += 1
 		if npc_rel['A165'] <= 20: grupvalue[2] -= 1
-		if grupTipe[61] = 4 and npc_rel['A189'] >= 80: grupvalue[4] += 1
-		if grupTipe[61] = 4 and npc_rel['A189'] <= 20: grupvalue[4] -= 1
+		if npc_grupTipe['A189'] = 4 and npc_rel['A189'] >= 80: grupvalue[4] += 1
+		if npc_grupTipe['A189'] = 4 and npc_rel['A189'] <= 20: grupvalue[4] -= 1
 		grupvalue_student_day = daystart
 	end
 	if grupvalue[1] > (dailycheck_grupvalue[1] + 30): grupvalue[1] = (dailycheck_grupvalue[1] + 30)

+ 0 - 3
locations/loadg.qsrc

@@ -78,9 +78,6 @@ end
 
 if arrsize('$phonetheme_name') = 0: gs 'telefon', 'setup'
 
-!!Can probably be removed
-!!if ARRSIZE('school_static_num') < 61: gs 'gschool_lessons', 'npc_data'
-
 if housr = 1:
 	home_owned[1] = 1
 elseif housr = 2:

+ 1 - 1
locations/nyp_school.qsrc

@@ -863,7 +863,7 @@ if $ARGS[0] = 'outcast':
 		close all
 		pl '<a href="exec: music_on = 1 & gt ''nyp_school'', ''outcast''">Play music</a>'
 	end
-	if grupTipe[25] = 5:
+	if npc_grupTipe['A25'] = 5:
 		!if Sonia is an outcast too
 		cla & *clr
 		minut += 15

+ 0 - 1
locations/preSYS.qsrc

@@ -343,7 +343,6 @@ if $ARGS[0] = 'SGStart3':
 	*nl
 	'In the Pavlovsk start, you awaken at your parent''s home in the provincial town of Pavlovsk <i>(Recommended for new players)</i>. In the Gadukino start, you are visiting your grandparent''s house in the small farming village of Gadukino.'
 
-	!gs 'gschool_lessons', 'npc_data'
 
 	!! default friendship is 30 for all students
 	gs 'npc_relationship', 'defaultfriendship'

+ 14 - 3
locations/saveupdater.qsrc

@@ -258,8 +258,6 @@ if pcs_exhibition ! 0:
 	killvar 'exhibition_exp'
 end
 
-if grupTipe[57] = 0: grupTipe[57] = 6
-
 !! adds pregnancy progression images to saves that did not have them previously.
 if arrsize('$bodimgsets') = 30:
 	$bodimgsets[30] = 'pregnant, but not showing'
@@ -391,7 +389,20 @@ end
 !!Updates for the old school code
 if NatBelLernQW > 0 and NatbelQW['QWstage'] = 0: NatbelQW['QWstage'] = NatBelLernQW & NatBelLernQW = 0
 
-if grupTipe[25] = 5: grupTipe[25] = 0 & npc_grupTipe['A25'] = 5
+
+if npc_grupTipe['A133'] = 0: npc_grupTipe['A133'] = 6
+if grupTipe[25] ! 0: 
+	if npc_grupTipe['A25'] = 0: npc_grupTipe['A25'] = grupTipe[25]
+	grupTipe[25] = 0
+end
+if grupTipe[5] ! 0: 
+	if npc_grupTipe['A5'] = 0: npc_grupTipe['A5'] = grupTipe[5]
+	grupTipe[5] = 0
+end
+if grupTipe[61] ! 0: 
+	if npc_grupTipe['A189'] = 0: npc_grupTipe['A189'] = grupTipe[61]
+	grupTipe[61] = 0
+end
 
 if npcSex[1] > 0: npcSex[1] = 0 & npc_sex['A1'] = 1
 if npcSex[2] > 0: npcSex[2] = 0 & npc_sex['A2'] = 1

+ 1 - 1
locations/soniadisco.qsrc

@@ -1432,7 +1432,7 @@ if $ARGS[0] = 'soniafall':
 					*clr & cla
 					minut += 15
 					soniaPS = 1
-					grupTipe[25] = 5
+					npc_grupTipe['A25'] = 5
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/disco/cumwalk.jpg"></center>'
 					'Vitek is dragging a drunken Sonia around as if she''s a trophy to be put on display. She is all smiles and seems pretty happy and completely wasted. You follow them just inside the dance and then stop near the door.'
 					'Vitek leads her around the disco, several people take photo''s of Sonia''s cum covered face. She seems to be catching on that something isn''t right, but hasn''t yet figured it out. As they near the entrance again, one of the guys with her loudly proclaims. "Sonia just let us all six of us fuck her in every hole she has at the same time, like some wanton whore."'

+ 1 - 1
locations/strela.qsrc

@@ -67,7 +67,7 @@ act 'Listen':
 				$npc_notes[5] = 'Ever since Fedor gave Vasily a blowjob in the school courtyard, everyone calls him Masha.'
 				npc_rel['A5'] = 50
 				hotcat_rating['A5'] = 6
-				grupTipe[5] = 5
+				npc_grupTipe['A5'] = 5
 				fedorKozlovQW = -10
 				FedorKozHome = 0
 				fedormasha = 1