Sfoglia il codice sorgente

[edit] large batch of fixes for the school kids interactions. dinnpc can probably be simplified further.

CroWke 5 anni fa
parent
commit
34d44ddd73

+ 13 - 13
locations/FedorEv.qsrc

@@ -8,8 +8,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'Start':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><b><font color="blue"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+	'<center><b><font color="blue"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></font></b></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 
 	if kotovLoveQW > 0 and week < 5 and kotovVSkozlov = 0 and fedorKozlovQW >= 10:
 		gt 'FedorEv', 'Vitek Vs Fedor'
@@ -40,7 +40,7 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 	kotovVSkozlov = 1
 	gs 'stat'
 	'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 	'When you approach Fedor, Vitek sees you walking Fedor''s way and follows you right away. He shoves Fedor roughly: "What do you think you''re doing, punk?'
 	'<<$pcs_firstname>> is <b>mine!</b>" Fedor turns his face to Vitek and calmly says, "I''m not doing anything. <<$pcs_firstname>> is with me now,'
 	'so you should just leave us alone." Vitek theatrically moves his hand to his ear, and says, in a threatening voice: "What did you just say!?" to which Fedor' 
@@ -53,7 +53,7 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 		kotovLoveQW = -1
 		gs 'stat'
 		'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 		'You tell Vitek that you don''t want to be with him any more. You can tell he''s very angry, and has to restrain himself from hitting you in the face. Ultimately he exclaims' 
 		'"Fuck you, bitch!" and leaves, kicking over several garbage cans on the way. You fear that this might not be the last thing you''ve heard of him.'
 
@@ -76,7 +76,7 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 		'to let it go: "<<$pcs_firstname>> is my girl..." he moans. Vasily laughs like a jackal, while Vitek is furious once more: "You little shit! I''m going to..." Dan interrupts' 
 		'him: "Relax, Vitek. Look at his face. I think he realizes his mistake. Or do you want to make things even worse for yourself?" That last question was directed at Fedor.'
 		'<center><b><font color="maroon"><<"Vasily [Shulga] Shulgin">></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/11.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
 
 		act 'Remain silent':
 			*clr & cla
@@ -134,7 +134,7 @@ if $ARGS[0] = 'Gorslut':
 			fedorkoztalk = 1
 			gs 'stat'
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 			'"It was a stupid mistake that I wish I could take back, I had too many drinks and..." Fedor raises his hand and says, "You don''t need to tell me more, let''s just put this behind us." You lean forward and greatfully kiss Fedor on the cheek he then hugs you for a few moments and walks away.'
 
 			act 'Move away':
@@ -168,7 +168,7 @@ if $ARGS[0] = 'Gorslut':
 		fedorkoztalk = 1
 		gs 'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'You step forward and place your hand on Fedors cheek as you softly tell him "I would never do such a thing! you know how rumors can be, I''m sure it''s just some guy with a hard on for me trying to tear us apart" Fedor lowers his head but after a few moments raises it with a smile on his face and says," I knew it had to be a lie, I know you''re better than that, I''m sorry I jumped the gun on this one but I will find a way to make it up to you" while carressing his cheek with your hand you lean forward and give him a soft kiss on his other cheek and whisper "There is no need."'
 
 		act 'Move away':
@@ -232,7 +232,7 @@ if $ARGS[0] = 'Park':
 		*clr & cla
 		gs 'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'You slowly pull back and say to Fedor "I can''t go right now, I have something I need to do" he then nods with a forced smile and responds, "I guess I''ll catch you next time" But as you leave you look back and notice that Fedor lowers his head trying to hide a light frown on his face as he watches you walk away.'
 		
 		act 'Move away':gt 'gschool_grounds', 'main'
@@ -260,7 +260,7 @@ if $ARGS[0] = 'Cinema':
 		*clr & cla
 		gs 'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'You slowly pull back and say to Fedor "I can''t go right now, I have something I need to do" he then nods with a smirk and responds, "Too scared huh... well I guess I''ll catch you next time" You give him a light punch in the arm with a smirk on your face and walk away.'
 		
 		act 'Move away':gt 'gschool_grounds', 'main'
@@ -300,7 +300,7 @@ if $ARGS[0] = 'Home':
 		*clr & cla
 		gs 'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'You slowly pull back and say to Fedor "I can''t go right now, I have something I need to do" he then nods with a forced smile and responds, "I guess I''ll catch you next time" But as you leave you hear him whistper to himself "I guess it was too soon" you then look back to notice that Fedor lowers his head trying to hide a frown on his face as he watches you walk away.'
 		
 		act 'Move away':gt 'gschool_grounds', 'main'
@@ -337,7 +337,7 @@ if $ARGS[0] = 'Skate Date':
 		*clr & cla
 		gs 'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'You slowly pull back and say to Fedor "I can''t go right now, I have something I need to do" he then nods with a forced smile and responds, "I guess I''ll catch you next time" But as you leave you hear him whistper to himself "I guess it was too soon" you then look back to notice that Fedor lowers his head trying to hide a frown on his face as he watches you walk away.'
 		
 		act 'Move away':gt 'gschool_grounds', 'main'
@@ -365,7 +365,7 @@ if $ARGS[0] = 'Park 3':
 		*clr & cla
 		gs 'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'You slowly pull back and say to Fedor "I can''t go right now, I have something I need to do" he then nods with a forced smile and responds, "I guess I''ll catch you next time" But as you leave you look back and notice that Fedor lowers his head trying to hide a light frown on his face as he watches you walk away.'
 		
 		act 'Move away':gt 'gschool_grounds', 'main'
@@ -479,7 +479,7 @@ if $ARGS[0] = 'No Date':
 	menu_off = 1
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	'You slowly pull back and say to Fedor "I can''t go right now, I have something I need to do." he then nods with a forced smile and responds, "I guess I''ll catch you next time" But as you leave you look back and notice that Fedor lowers his head trying to hide a light frown on his face as he watches you walk away.'
 
 	act 'Leave':gt 'gschool_grounds', 'main'

+ 2 - 2
locations/IvanEv.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = '':
 	ivansportday = daystart
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></font></b></center>'
-	'<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>'
 
 	if $loc = 'gdksport':
 		'When you enter Pavlovsk''s sports center, Ivan sees you come in. Even though he''s getting ready for a training and is only wearing his boxing shorts, he comes over for a quick chat.'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'School Chat':
 	gs'stat'
 	'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/school/ivan1.jpg"></center>'
-	'<<$npc_notes[$static_num]>>'
+	'<<$npc_notes[''A3'']>>'
 	'Ivan is part of the athletic clique in your school.'
 	if npc_rel['A3'] < 20:'You and Ivan don''t get along at all.'
 	if npc_rel['A3'] >= 20 and npc_rel['A3'] < 40:'You and Ivan don''t get along very well.'

+ 36 - 36
locations/LariskaStart.qsrc

@@ -9,20 +9,20 @@ if $ARGS[0] = 'start':
 	menu_off = 1
 	gs'stat'
 
-	'<center><b><font color = maroon><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+	'<center><b><font color = maroon><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></font></b></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
 	'<<$npc_notes[''A<<numnpc>>'']>>'
 
-	if grupTipe[numnpc] = 5:'<<$npc_firstname[$static_num]>> She is one of the school outcasts.'
-	if grupTipe[numnpc] = 2:'<<$npc_firstname[$static_num]>> She is one of the sporty kids.'
+	if npc_grupTipe['A13'] = 5:'<<$npc_firstname[''A13'']>> She is one of the school outcasts.'
+	if npc_grupTipe['A13'] = 2:'<<$npc_firstname[''A13'']>> She is one of the sporty kids.'
 
-	if npc_rel[$static_num] < 20:
+	if npc_rel['A13'] < 20:
 		'You avoid each other.'
-	elseif npc_rel[$static_num] < 40:
+	elseif npc_rel['A13'] < 40:
 		'You don''t get along.'
-	elseif npc_rel[$static_num] < 60:
+	elseif npc_rel['A13'] < 60:
 		'You have a normal relationship.'
-	elseif npc_rel[$static_num] < 80:
+	elseif npc_rel['A13'] < 80:
 		'You are friends.'
 	else
 		'You are best friends.'
@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 				'After calming down a little, Lariska takes a deep breath and starts talking quickly:'
 				'"<<$pcs_nickname>>, you are in danger! Zvereva wants to set junkies on you .. "'
 				'You are totally numb now. "What junkies?"'
-				'"Well, she gave blow jobs not only the trainer, but she also blew the junkies, who are selling drugs here. She also bought some super steroids and she wants to contaminate you with them! Tomorrow after the section, they want to catch and rape you!"'
+				'"Well, she didn''t only give blow jobs to the trainer, but she also blew the junkies, who are selling drugs here. She also bought some super steroids and she wants to contaminate you with them! Tomorrow after the section, they want to catch and rape you!"'
 				'As soon as she said it, she runs away.'
 				lariskaHelp = 1
 
@@ -135,16 +135,16 @@ if $ARGS[0] = 'start':
 					cls
 					minut += 5
 					gs'stat'
-					npc_rel[$static_num] = 0
+					npc_rel['A13'] = 0
 
-					'<center><b><font color = maroon><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
-					'<<$npc_notes[''A<<numnpc>>'']>>'
+					'<center><b><font color = maroon><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
+					'<<$npc_notes[''A13'']>>'
 
-					if grupTipe[numnpc] = 5:'<<$npc_firstname[$static_num]>> belongs to a group of outcasts.'
-					if grupTipe[numnpc] = 2:'<<$npc_firstname[$static_num]>> belongs to a group of sportsmen.'
+					if npc_grupTipe['A13'] = 5:'<<$npc_firstname[''A13'']>> belongs to a group of outcasts.'
+					if npc_grupTipe['A13'] = 2:'<<$npc_firstname[''A13'']>> belongs to a group of sportsmen.'
 
-					if npc_rel[$static_num] < 20:'You have a bad relationship.'
+					if npc_rel['A13'] < 20:'You have a bad relationship.'
 					''
 					'Right after you hit the stomach, you realize that it is Lariska, who is standing in front of you. She has tears in her eyes. You unclinch her immediately. As soon as you do, Lariska yells in your face:'
 					'"Idiot, I wanted to help you!" and she pushes you back and runs away.'
@@ -167,19 +167,19 @@ if $ARGS[0] = 'end':
 	if IvanZverHelp = 1:
 		numnpc = 3
 
-		'<center><b><font color = maroon><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
-		'<<$npc_notes[''A<<numnpc>>'']>>'
+		'<center><b><font color = maroon><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
+		'<<$npc_notes[''A3'']>>'
 
-		if grupTipe[numnpc] = 2:'<<$npc_firstname[$static_num]>> He is one of the sporty kids.'
+		if npc_grupTipe['A3'] = 2:'<<$npc_firstname[''A3'']>> He is one of the sporty kids.'
 
-		if npc_rel[$static_num] < 20:
+		if npc_rel['A3'] < 20:
 			'You avoid each other.'
-		elseif npc_rel[$static_num] < 40:
+		elseif npc_rel['A3'] < 40:
 			'You don''t get along.'
-		elseif npc_rel[$static_num] < 60:
+		elseif npc_rel['A3'] < 60:
 			'You have a normal relationship.'
-		elseif npc_rel[$static_num] < 80:
+		elseif npc_rel['A3'] < 80:
 			'You are friends.'
 		else
 			'You are best friends.'
@@ -194,7 +194,7 @@ if $ARGS[0] = 'end':
 			cls
 			minut += 5
 			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 are leaving the club when you see Lina coming to you.'
 			'"<<$pcs_nickname>>, wait! Help me, please, to tidy up the equipment in the storage room, the trainer ordered me to do it, but the bulb burned out there. You will hold just the flashlight, and I do the rest!"'
 			'"Uhm, I''m sorry, Lina, but I must go home." You reply making a hint to Ivan.'
@@ -205,19 +205,19 @@ if $ARGS[0] = 'end':
 				cls
 				minut += 15
 				gs'stat'
-				'<center><b><font color = maroon><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
-				'<<$npc_notes[''A<<numnpc>>'']>>'
+				'<center><b><font color = maroon><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></font></b></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
+				'<<$npc_notes[''A3'']>>'
 
-				if grupTipe[numnpc] = 2:'<<$npc_firstname[$static_num]>> He is one of the sporty kids.'
+				if npc_grupTipe['A3'] = 2:'<<$npc_firstname[''A3'']>> He is one of the sporty kids.'
 
-				if npc_rel[$static_num] < 20:
+				if npc_rel['A3'] < 20:
 					'You avoid each other.'
-				elseif npc_rel[$static_num] < 40:
+				elseif npc_rel['A3'] < 40:
 					'You don''t get along.'
-				elseif npc_rel[$static_num] < 60:
+				elseif npc_rel['A3'] < 60:
 					'You have a normal relationship.'
-				elseif npc_rel[$static_num] < 80:
+				elseif npc_rel['A3'] < 80:
 					'You are friends.'
 				else
 					'You are best friends.'
@@ -278,7 +278,7 @@ if $ARGS[0] = 'end':
 		end
 	elseif 	FyodorZverHelp = 1:
 		'<center><b><h4><font color=#00ffe4><<"Avelina [Lina] Starov">></font></h4></b></center>'
-		'<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 leave the club then see Lina approaching you.'
 		'"<<$pcs_nickname>>, wait! Help me please, I need to move inventory in the storeroom but the light blew out. Can you please help me move it while I go and get a flashlight?"'
 		'"Erm, forgive me Lina but I have to go home." you then give Fedor a nod.'
@@ -291,12 +291,12 @@ if $ARGS[0] = 'end':
 		if fedorKozlovQW < -10:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		end
 
 		act 'Leave':gt 'korrPar'
 	else
-		'<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 leave the club and see Lina.'
 		'"<<$pcs_nickname>>, wait! Help me please, I need to move inventory in the storeroom but the light blew out. Can you please help me move it while I go and get a flashlight?"'
 		act 'Help':

+ 11 - 11
locations/NikoEv.qsrc

@@ -85,7 +85,7 @@ end
 
 if $ARGS[0] = 'Lunch Chat':
 	cls
-	numnpc = 61
+	numnpc = 189
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	if NikoFightDay = daystart:
@@ -95,9 +95,9 @@ if $ARGS[0] = 'Lunch Chat':
 	else	
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 	end	
-	'<<$npc_notes[$static_num]>>'
-	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.'
-	if grupTipe[61] = 4:'Niko is a Gopnik, and spends a lot of time doing what Gopniks usually do: be loud, and drink beer.'
+	'<<$npc_notes[''A189'']>>'
+	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.'
+	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.'
@@ -486,9 +486,9 @@ if $ARGS[0] = 'Disco Chat':
 	else	
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 	end	
-	'<<$npc_notes[$static_num]>>'
-	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.'
-	if grupTipe[61] = 4:'Niko is a Gopnik, and spends a lot of time doing what Gopniks usually do: be loud, and drink beer.'
+	'<<$npc_notes[''A189'']>>'
+	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.'
+	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.'
@@ -733,7 +733,7 @@ if $ARGS[0] =  'Fyodor':
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		'You turn to see Fedor with a concerned look on his face. "<<$pcs_firstname>> what are doing over here with him? You should be careful hanging around guys like him. He is no good for you." Niko just stares on in silence with an annoyed look on his face. You turn to Fedor and say, "Don''t worry Fedor it''s not what it looks like. Niko was just..." Niko quickly continues your sentence. "<<$pcs_firstname>>''s father is planing on buying one of my brothers old bikes, so she came to me to discuss the details. That''s all." Fedor gives Niko a blank stare. "I''ve seen your brother before and I don''t think that <<$pcs_firstname>> should be dealing with him or you." Niko shrugs as he replies, "Well that''s <<$pcs_firstname>>''s call, not yours." Fedor walks right up to Niko then clenches his fists. "Well no one asked for your input."' 
 		'Niko doesn''t seem worried as he casually leans against the wall. "No need to get violent. I''m sure <<$pcs_firstname>> doesn''t want us fighting in front of her for no reason. That would be really rude of us, wouldn''t it?" Fedor looks back to you with an embarrassed look on his face. "Sorry <<$pcs_nickname>> I hope I''m not making you uncomfortable. Just be careful with this one okay?" You give Fedor a nod and a smile as he turns around then walks away.'		
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
@@ -752,7 +752,7 @@ if $ARGS[0] =  'Viktor':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko'+rand(1,3)+'.jpg"></center>'
 	'You walk up to Niko and give him a smile then you suddenly see Vitek quickly walk up to Niko and say, "What are you doing with <<$pcs_firstname>>? She is mine." Niko chuckles as he raises his hands, "I was just helping <<$pcs_firstname>> with finding the person spreading mean rumors about her." Vitek responds, "What rumors?" Niko replies, "Someone said that <<$pcs_firstname>> here is dating a fat, brain dead, gopnik. I wonder who that rumor was referring to." Vitek begins seething with anger as he ask, "Who the fuck said that shit?" Niko replies, "It took some digging, but I found out that it was him." Niko points to Lesco Tsarev, causing Vitek to turn to Lesco then shout, "You fucking little bitch! I will tear your arm off!" He then charges at Lesco, who begins running for his life. While they were distracted, Niko takes your hand then leads you out of the school grounds.'
 	'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9>.jpg"></center>'
 	
 	act 'Follow Niko''s lead':gt 'NikoEv', 'Niko Dates'
 end
@@ -762,7 +762,7 @@ if $ARGS[0] =  'Dimka':
 	NikoVsDimka = 1
 	gs'stat'
 	'<center><b><h4><font color="maroon"><<"Dmitriy [Dimka] Nosov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	'You walk up to Niko and give him a smile then see Dimka approach you then gives Niko a puzzled look. "What are you with <<$pcs_firstname>>. She is my girl." Niko gives Dimka a blank stare as he responds, "Sure she is...Why don''t you just piss off before I get pissed off?" Dimka then says, "Why don''t we ask her who she''s dating?" Niko replies, "Because asking a girl to kiss and tell is rude." Dimka looks shocked as he responds, "You don''t care? But would you care if I told you that <<$pcs_nickname>> here is a cocksucker?" Niko raises an eyebrow. "Well do you have proof of that, or are you just blowing smoke?"'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'	
@@ -772,7 +772,7 @@ if $ARGS[0] =  'Dimka':
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color="maroon"><<"Dmitriy [Dimka] Nosov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, causing you to think to yourself: <font color=#FF00FF>Oh shit! How am I going to explain this to Niko. I''m really screwed now.</font> Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'		

+ 55 - 54
locations/Snpc.qsrc

@@ -2,17 +2,18 @@
 
 gs 'dinnpc'
 gs 'stat'
-$static_num = $school_static_num[numnpc]
-'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
-'<<$npc_notes[$static_num]>>'
+!!$static_num = $school_static_num[numnpc]
+$static_num = 'A<<numnpc>>'
+'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
+'<<$npc_notes[''A<<numnpc>>'']>>'
 
-if npc_grupTipe['A<<numnpc>>'] = 5:'<<$npc_firstname[$static_num]>> is an outcast in school, and often gets picked on at school.'
+if npc_grupTipe['A<<numnpc>>'] = 5:'<<$npc_firstname[''A<<numnpc>>'']>> is an outcast in school, and often gets picked on at school.'
 if npc_grupTipe['A<<numnpc>>'] = 6:''
-if npc_grupTipe['A<<numnpc>>'] = 3:'<<$npc_firstname[$static_num]>> is a nerd, and is often found around the rest of the nerds doing homework or a their game night.'
-if npc_grupTipe['A<<numnpc>>'] = 2:'<<$npc_firstname[$static_num]>> is part of the athletic clique in your school.'
-if npc_grupTipe['A<<numnpc>>'] = 1:'<<$npc_firstname[$static_num]>> is popular, and spends time with the other popular kids usually.'
-if npc_grupTipe['A<<numnpc>>'] = 4:'<<$npc_firstname[$static_num]>> is a Gopnik, and spends a lot of time doing what Gopniks usually do: be loud, and drink beer.'
+if npc_grupTipe['A<<numnpc>>'] = 3:'<<$npc_firstname[''A<<numnpc>>'']>> is a nerd, and is often found around the rest of the nerds doing homework or a their game night.'
+if npc_grupTipe['A<<numnpc>>'] = 2:'<<$npc_firstname[''A<<numnpc>>'']>> is part of the athletic clique in your school.'
+if npc_grupTipe['A<<numnpc>>'] = 1:'<<$npc_firstname[''A<<numnpc>>'']>> is popular, and spends time with the other popular kids usually.'
+if npc_grupTipe['A<<numnpc>>'] = 4:'<<$npc_firstname[''A<<numnpc>>'']>> is a Gopnik, and spends a lot of time doing what Gopniks usually do: be loud, and drink beer.'
 if npc_rel['A<<numnpc>>'] < 20:'They really don''t like you.'
 if npc_rel['A<<numnpc>>'] >= 20 and npc_rel['A<<numnpc>>'] < 40:'They are fairly indifferent to you.'
 if npc_rel['A<<numnpc>>'] >= 40 and npc_rel['A<<numnpc>>'] < 60:'The two of you get along together fairly well together, more of casual friends.'
@@ -65,9 +66,9 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 		if pav_slut < 125:
 			if numnpc ! 9:
 				if npc_gender['A<<numnpc>>'] = 0:
-					'<<$npc_firstname[$static_num]>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
+					'<<$npc_firstname[''A<<numnpc>>'']>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
 				else
-					'<<$npc_firstname[$static_num]>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
+					'<<$npc_firstname[''A<<numnpc>>'']>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
 				end
 
 				act 'Decline':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $metka
@@ -86,16 +87,16 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 					gs 'cum_cleanup'
 					pcs_breath = 0
 					gs 'stat'
-					'You happily take the beer, and drink it in <<$npc_firstname[$static_num]>>''s company.'
+					'You happily take the beer, and drink it in <<$npc_firstname[''A<<numnpc>>'']>>''s company.'
 
 					act 'Move away':gt $loc, $metka
 				end
 			end
 		elseif pav_slut >= 125:
 			if npc_gender['A<<numnpc>>'] = 0:
-				'<<$npc_firstname[$static_num]>> looks at you wearily: "What do you want? Looking for a dick to suck on or something?"'
+				'<<$npc_firstname[''A<<numnpc>>'']>> looks at you wearily: "What do you want? Looking for a dick to suck on or something?"'
 			else
-				'<<$npc_firstname[$static_num]>> wrinkles her nose as she looks at you: "Hey cocksucker, get away from me! I don''t want to be seen talking to you."'
+				'<<$npc_firstname[''A<<numnpc>>'']>> wrinkles her nose as she looks at you: "Hey cocksucker, get away from me! I don''t want to be seen talking to you."'
 			end
 
 			act 'Move away':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $metka
@@ -111,7 +112,7 @@ if numnpc = 144:
 		act 'You''re looking flushed':
 			*clr & cla
 			if Anush_lunch = 0:
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/144.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 				'"Hey Anush you feeling ok? You kinda look flush, is something wrong? Would you like to talk about it?"'
 				'She leans in close and tries to kiss you, while one hand reaches down and squeezes your butt. You turn your head and pull away. "What are you doing? I was only seeing if you was ok."'
 				'She crowds you a bit and leans in close. "You talk to much, I can think of better things you can do with that tongue of yours."'
@@ -237,8 +238,8 @@ act 'Chat':
 	if $loc = 'gdkin':minut += 5
 
 	gs 'stat'
-	'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
+	'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 
 	if numnpc = 1 and npc_rel['A<<numnpc>>'] = 0:
 		cla
@@ -295,8 +296,8 @@ if numnpc = 2:
 			if pav_slut < 125: artemLernQW = 1
 
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 
 			if pav_slut < 125:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
 			if pav_slut >= 125:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged: "Bah... the school whore needs my help? I don''t think so."'
@@ -346,8 +347,8 @@ if numnpc = 12:
 			sub += 1
 			JuliaMilLernQW = 1
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 
 			if pav_slut < 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			if pav_slut >= 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
@@ -375,8 +376,8 @@ if numnpc = 14:
 			npc_rel['A<<numnpc>>'] += 5
 			meynoldQW = 2
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 			'You approach Katja and thank her for taking you home from the disco when you were drunk, the other night. Katja gives you a knowing smile and says: "Don''t mention it, <<$pcs_nickname>>! You really shouldn''t get that drunk at the disco though, that could end badly. Some of the guys there are real pigs..."'
 
 			if $loc ! 'gdkin':
@@ -410,8 +411,8 @@ if numnpc = 14:
 			if $loc = 'gdkin':minut += 5
 
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 			'Katja happily grins as she quickly straightens your hair: "What do you want? A light touch-up, some normal make-up or shall I just shovel it on?"'
 
 			act 'Light touch-up':
@@ -477,8 +478,8 @@ if numnpc = 14:
 			else
 				*clr & cla
 				gs 'stat'
-				'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
+				'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 				'You slowly lean in towards Katja to kiss her. Unable to resist, Katja almost closing her eyes, slowly opening her mouth, leans in and meets your kiss.'
 				gs 'katjaEv', 'kiss_events'
 			end
@@ -492,8 +493,8 @@ if numnpc = 14:
 			artemIzdev = 1
 			gs 'stat'
 
-			'<center><b><font color = maroon><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
+			'<center><b><font color = maroon><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 			'You make sure no one else is paying attention, and tell Katja about what Artem and Peter are doing to you on Mondays. At first she doesn''t believe you. After a while, all of the nasty details you''re sharing convince her that there is no way you''re making this up. Katja is shocked!'
 			'You tell her that the only way you have thought of to get rid of their blackmailing, is to get blackmailing material of your own. Katja nods and says: "That makes sense, actually... if you could somehow make it look violent, I bet it would work even better! I don''t know where you would be able to find a tiny camera though... maybe Albina can help you?"'
 
@@ -535,8 +536,8 @@ if numnpc = 16:
 			sub += 1
 			NatBelLernQW = 1
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 
 			if pav_slut < 125:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			if pav_slut >= 125:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
@@ -593,7 +594,7 @@ if numnpc = 31:
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 		'"So Lizaveta hear any good gossip of late?"'
 		'As you ask that her face lights up and she leans in close like she has the best secret in the world to share with you. "Oh my god yes! I was... well it doesn''t matter what I was doing but I overheard some others talking and they said..."'
 		if rand(0,2) = 0:
@@ -620,12 +621,12 @@ if numnpc = 231:
 			minut += 5
 			npc_QW['A<<numnpc>>'] = 1
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
-			'"Hi <<$npc_nickname[''<<$static_num>>'']>>! I just finished my last book at home and I''m not sure what I should read next. Can I join you at the library this afternoon so that you can help me find another good one to read?"'
-			'<<$npc_firstname[''<<$static_num>>'']>>''s face quickly shifts from a smile to confusion. You can tell she''s not sure how to respond and there is a long pause as a result.  Finally after about 30 seconds of thought she responds "Sure, that should be alright.  Do you mind going home with me first so that I can change out of our uniform?"'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
+			'"Hi <<$npc_nickname[''<<''A<<numnpc>>''>>'']>>! I just finished my last book at home and I''m not sure what I should read next. Can I join you at the library this afternoon so that you can help me find another good one to read?"'
+			'<<$npc_firstname[''<<''A<<numnpc>>''>>'']>>''s face quickly shifts from a smile to confusion. You can tell she''s not sure how to respond and there is a long pause as a result.  Finally after about 30 seconds of thought she responds "Sure, that should be alright.  Do you mind going home with me first so that I can change out of our uniform?"'
 			'"That is no problem at all" you reply. "I''ll meet you outside of school after our last period, and then we can head to your house together."'
-			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''<<$static_num>>'']>> replies as she heads off.'
+			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> replies as she heads off.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -638,12 +639,12 @@ if numnpc = 231:
 			minut += 5
 			npc_QW['A<<numnpc>>'] = 3
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
-			'"Hi <<$npc_nickname[''<<$static_num>>'']>>! I ended up missing school the other day because I was sick. Would it be alright with you if we went to your house after school so that you can help me catch up?"'
-			'<<$npc_firstname[''<<$static_num>>'']>> replies "Sure <<$pcs_nickname>>, just as long as you aren''t sick anymore.  I don''t want to get sick with whatever you had and miss school as well."'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
+			'"Hi <<$npc_nickname[''<<''A<<numnpc>>''>>'']>>! I ended up missing school the other day because I was sick. Would it be alright with you if we went to your house after school so that you can help me catch up?"'
+			'<<$npc_firstname[''<<''A<<numnpc>>''>>'']>> replies "Sure <<$pcs_nickname>>, just as long as you aren''t sick anymore.  I don''t want to get sick with whatever you had and miss school as well."'
 			'You giggle a little bit and reply "Nah, I got over my sickness so you should be fine. I''ll meet you outside of school after our last period, and then we can head to your house together."'
-			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''<<$static_num>>'']>> replies as she heads off.'
+			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> replies as she heads off.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -656,16 +657,16 @@ if numnpc = 231:
 			minut += 5
 			gs 'stat'
 			npc_QW['A231'] = 5
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
-			'As you walk to up <<$npc_firstname[''<<$static_num>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. However you''re not about to let what happened end your friendship without at least clearing the air.'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
+			'As you walk to up <<$npc_firstname[''<<''A<<numnpc>>''>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. However you''re not about to let what happened end your friendship without at least clearing the air.'
 			'After about a minute or so of eye contact, you finally develop enough courage to speak first.'
-			'"Hi <<$npc_nickname[''<<$static_num>>'']>>...." You say in a nervous and defeated voice.'
+			'"Hi <<$npc_nickname[''<<''A<<numnpc>>''>>'']>>...." You say in a nervous and defeated voice.'
 			'"Hi <<$pcs_nickname>>...." she replies in an equally nervous voice.'
 			'After taking a couple more seconds to fully collect your thoughs, you say "Look, I think we need to talk about what happened last time at your house. Given the subject, it would be best to do so privately.  Can we meet after school to talk about it?"'
-			'<<$npc_nickname[''<<$static_num>>'']>> doesn''t respond, and almost looks like she''s about to start crying. She finally wimpers "Are you mad at me or are you sickened by me?"'
+			'<<$npc_nickname[''<<''A<<numnpc>>''>>'']>> doesn''t respond, and almost looks like she''s about to start crying. She finally wimpers "Are you mad at me or are you sickened by me?"'
 			'Not completely surprised by what she said, you hold firm in making sure to wait until the two of you are alone. "I don''t wan''t to discuss things here. Meet me after school so we can talk about this more. I promise I''m not going to hurt you if that is what you''re afraid of."'
-			'Looking a little releaved, <<$npc_firstname[''<<$static_num>>'']>> nods her head in a slow manner and sheds a couple of tears. You walk away without either of you saying another word."'
+			'Looking a little releaved, <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> nods her head in a slow manner and sheds a couple of tears. You walk away without either of you saying another word."'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -677,9 +678,9 @@ if numnpc = 231:
 			*clr & cla
 			minut += 5
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
-			'As you see <<$npc_firstname[''<<$static_num>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. You don''t have enough courage to bring up what happened the last time you were at <<$npc_firstname[''<<$static_num>>'']>>''s house, so you pretend to not see her and carry on your way.'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
+			'As you see <<$npc_firstname[''<<''A<<numnpc>>''>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. You don''t have enough courage to bring up what happened the last time you were at <<$npc_firstname[''<<''A<<numnpc>>''>>'']>>''s house, so you pretend to not see her and carry on your way.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -687,7 +688,7 @@ if numnpc = 231:
 			end
 		end
 	elseif npc_QW['A<<numnpc>>'] > 5:
-		'Ever since you asked <<$npc_nickname[''<<$static_num>>'']>> to be your girlfriend, she has come out of her shell a bit more. She even kisses you while at school!'
+		'Ever since you asked <<$npc_nickname[''<<''A<<numnpc>>''>>'']>> to be your girlfriend, she has come out of her shell a bit more. She even kisses you while at school!'
 		act 'Kiss her':
 			*clr & cla
 			minut += 5
@@ -696,9 +697,9 @@ if numnpc = 231:
 			npc_horny['A<<numnpc>>'] += 15
 			gs 'arousal', 'kiss', '5', 'futa'
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/aleksandra/school_kiss.jpg"></center>'
-			'You lean in to kiss <<$npc_firstname[''<<$static_num>>'']>> and you both close your eyes as your lips meet. You don''t really care what anyone else thinks, you both just enjoy the moment.' 
+			'You lean in to kiss <<$npc_firstname[''<<''A<<numnpc>>''>>'']>> and you both close your eyes as your lips meet. You don''t really care what anyone else thinks, you both just enjoy the moment.' 
 			'You eventually break off the kiss and say "See you later cutie" and head on your way.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'

+ 16 - 16
locations/dinnpc.qsrc

@@ -6,8 +6,8 @@ $din_predlog_dima_bj = {
 		DimaRudeQW += 1
 		sub += 1
 		gs 'stat'
-		'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+		'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 		'Embarrassed, blushing, but eager to please Dimka and a little intimated by him, you get on your knees before Dimka who pulls out his dick and slaps it against your face, looking at you like he owns you.'
 
 		act 'Take it into your mouth':
@@ -75,10 +75,10 @@ $din_dima_predlog = {
 	act 'Who does he think you are?! - Slap him':
 		*clr & cla
 		pcs_dom += 1
-		npc_rel[$static_num] = 0
+		npc_rel['A<<numnpc>>'] = 0
 		gs 'stat'
-		'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+		'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 		'You give Dimka a good, hard, resounding slap that causes him to yelp like a girl as he clutched his red cheek. His immediate reaction only adds to your satisfaction, but the look he gives you is one of pure hatred - one that makes you wonder if he''s going to hit you back now.' 
 		'But instead, he backs away from you, looking like an animal trapped in a corner. His voice is more of an angry hiss:' 
 		'"You''ll pay for this, sooner or later. Don''t ever come near me again, bitch! Get the hell away from me!"'
@@ -89,18 +89,18 @@ $din_dima_predlog = {
 	act '... is he serious? Think about what he said for a moment':
 		*clr & cla
 		gs 'stat'
-		'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+		'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 		'Your eyes widen and you flush at his proposal - surely, he didn''t actually mean that you had to give him a blowjob right here, just so you could go out with him... right?' 
 		'As if to answer your question, Dimka unbuttons his pants. "Come on, are you gonna keep me waiting all night long? Which is it? Are you brave and fun? Or just another prude?"'
 
 		act 'That does it! - Slap him':
 			*clr & cla
 			pcs_dom += 1
-			npc_rel[$static_num] = 0
+			npc_rel['A<<numnpc>>'] = 0
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-            '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+            '<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 			'You give Dimka a good, hard, resounding slap that causes him to yelp like a girl as he clutched his red cheek. His immediate reaction only adds to your satisfaction, but the look he gives you is one of pure hatred - one that makes you wonder if he''s going to hit you back now.' 
 			'But instead, he backs away from you, looking like an animal trapped in a corner. His voice is more of an angry hiss:' 
 			'"You''ll pay for this, sooner or later. Don''t ever come near me again, bitch! Get the hell away from me!"'
@@ -112,8 +112,8 @@ $din_dima_predlog = {
 			*clr & cla
 			pcs_dom += 1
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-            '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
+            '<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 			'You ask Dimka. You''re really not sure if you want to do this but you also don''t want him to think that you are a prude. You are fun... right? And as long as nobody finds out, as long as only he knows...' 
 			''
 			'Dimka gives you a gentle smile and reassuringly touches your cheek. "No, of course I wouldn''t tell anybody. You''ll be my girlfriend - why would I tell somebody about what we are doing when we''re together?"'
@@ -161,7 +161,7 @@ $din_igor_dima_disco_bj = {
 
 		dick = 6
 		spafinloc = 12
-gs 'cum_manage'
+		gs 'cum_manage'
 		swallow += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/group/cocksucker6.jpg"></center>'
@@ -182,7 +182,7 @@ $din_igor__disco = {
 	act 'Leave the disco':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 		'You go outside with Igor. In a bout of passion, Igor takes you by the hand and says: "<<$pcs_nickname>>, you''re such a pretty girl. Everytime I see you, my mood gets better, even when I''m feeling down. I like you very much, <<$pcs_nickname>>. I''d really like to start a relationship with you."'
 
 		act 'Refuse him and leave':gt $loc, $metka
@@ -191,7 +191,7 @@ $din_igor__disco = {
 			*clr & cla
 			IgorLoverQW = 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 			'You agreed to go out with Igor. A smile blossoms on his face and he hugs you tightly. "I''m so happy, <<$pcs_nickname>>! Now that we''re a couple... can we kiss?"'
 			'Something about the eagerness with which he suggests this makes you think he''s never kissed a girl before. And without waiting for your answer, he''s already leaning in to kiss you...'
 
@@ -201,7 +201,7 @@ $din_igor__disco = {
 					pcs_dom += 5
 					IgorDominaQW = 1
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 					'You tell Igor that you''re not gonna give away kisses like that, and even though you''re grinning, your demeanor is unmistakeably dominant. So much so that Igor blushes and kneels before you. "<<$pcs_nickname>>, I beg you, on my knees, just one kiss! I''ll do anything for you - I''ll be your willing slave."'
 					'Even though you expected him to be put off by your refusal and dominance, Igor seems... happy that you are taking charge and not just letting him do as he pleases. It''s almost as if he wants to be dominated. But do you really want to dominate a guy?'
 

+ 28 - 28
locations/gdksport.qsrc

@@ -222,15 +222,15 @@ if $ARGS[0] = 'albina1':
 	numnpc = 23
 	$static_num = 'A23'
 	gs 'stat'
-	'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+	'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 	'At the end of the class, a few girls enter the dance studio, including Albina Barlovskaya. You''ve seen Albina around, but you know almost nothing about her.'
 
 	act 'Say hello to Albina':
 		*clr & cla
 		gs 'stat'
-		'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+		'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 		'You approach Albina and say hello. She raised an eyebrow haughtily.'
 		'"And you are? Oh yeah <<$pcs_nickname>>. You''ve taken up dancing, have you?" You nodded confirming the obvious. Albina laughed dismissively. "Well, how''s that going for you?"'
 		'"Not bad." You answer her coldly, "Not bad at all."'
@@ -239,10 +239,10 @@ if $ARGS[0] = 'albina1':
 		act 'I do not care':
 			*clr & cla
 			pcs_dom += 1
-			npc_rel[$static_num] -= 5
+			npc_rel['A23'] -= 5
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 			'You replied to Albina as scornfully as possible that you do not care and turned away from her.'
 			'She snickered nastily then said to the other girls, "Alright, girls. Let''s get to work."'
 
@@ -252,8 +252,8 @@ if $ARGS[0] = 'albina1':
 		act 'I know how to dance':
 			*clr & cla
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 			'Albina''s arrogance was getting on your nerves so you told her. "I know how to dance."'
 			'Albina turned to you with a sneer and said, "You can sit and see how professionals do it. Then we''ll see if you still think you can dance."'
 			'Turning to the other girls, she said, "Alright girls, Let''s get to work!"'
@@ -270,15 +270,15 @@ if $ARGS[0] = 'albina2':
 	numnpc = 23
 	$static_num = 'A23'
 	gs 'stat'
-	'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+	'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 	'At the end of the class, a few girls enter the dance studio, including Albina Barlovskaya. You know Albina from school and you have a pretty good relationship.'
 
 	act 'Say hello to Albina':
 		*clr & cla
 		gs 'stat'
-		'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+		'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 		'You approached Albina and said hello. She turned to you and smiled.'
 		'"Oh, hello, <<$pcs_nickname>>. I didn''t know you started dancing. Are you any good?" Albina asked with interest.'
 		'"I''m pretty good, I think." you replied with an answering smile, "Even if I do say so myself."'
@@ -287,10 +287,10 @@ if $ARGS[0] = 'albina2':
 		act 'I do not care':
 			*clr & cla
 			pcs_dom += 1
-			npc_rel[$static_num] -= 5
+			npc_rel['A23'] -= 5
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 			'Offended by her tone, you replied to Albina as scornfully as possible, "I couldn''t care less what you think."'
 			'As you walked away, she snickered nastily then said to the other girls, "Alright, girls. Let''s get to work."'
 
@@ -300,8 +300,8 @@ if $ARGS[0] = 'albina2':
 		act 'I know how to dance':
 			*clr & cla
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 			'Albina''s tone offended you and you replied hotly, "I can dance as well as any of these girls."'
 			'Albina turned to you with a look of disbelief and said, "You can sit and see how professionals do it. Then we''ll see if you still think you can dance."'
 			'Turning to the other girls, she said, "Alright girls, Let''s get to work!"'
@@ -318,15 +318,15 @@ if $ARGS[0] = 'albina3':
 	numnpc = 23
 	$static_num = 'A23'
 	gs 'stat'
-	'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+	'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 	'At the end of the class, a few girls enter the dance studio, including Albina Barlovskaya. You know Albina from school and you have a very close relationship.'
 
 	act 'Say hello to Albina':
 		*clr & cla
 		gs 'stat'
-		'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+		'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 		'You approached Albina and said hello. She turned to you and smiled.'
 		'"Oh, hello, <<$pcs_nickname>>. I forget you told me you started dancing. Are you any good?" Albina asked with interest.'
 		'"I''m pretty good, I think." you replied with an answering smile, "Even if I do say so myself."'
@@ -334,10 +334,10 @@ if $ARGS[0] = 'albina3':
 
 		act 'Not really':
 			*clr & cla
-			npc_rel[$static_num] -= 5
+			npc_rel['A23'] -= 5
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 			'Unsure of yourself, you relied hesitantly, "I couldn''t really say, I''ve never really thought about it."'
 			'"Well, you keep working at it, maybe you''ll get there someday." then she turned and said to the other girls, "Alright, girls. Let''s get to work."'
 
@@ -347,8 +347,8 @@ if $ARGS[0] = 'albina3':
 		act 'I know how to dance':
 			*clr & cla
 			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 			'"I''d like to think I can dance as good as anyone, even a professional." you replied honestly.'
 			'Albina turned to you with a look of consideration and said, "You can sit and see how professionals do it. Then we''ll see if you still think you can dance."'
 			'Turning to the other girls, she said, "Alright girls, Let''s get to work!"'
@@ -1163,7 +1163,7 @@ if $ARGS[0] = 'Fedor First Date':
 	numnpc = 5
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	if fedorkozbreak = 1:
 		'You enter the sports club and see Fyodor Kozlov, standing by the front door. He looks as though he is waiting for someone and as soon as he sees you, he flashes you a smile and he approaches with an affable smile on his face. "Hello <<$pcs_firstname>>." he says with a warm smile. He pauses for a moment then reaches into his pockets and pulls out 2 tickets and says, "Here is the deal ... I know that we had a bit of a bumpy relationship before but I would like to try again if you will. So what do you say? Wanna go on another date with me?'
 	else

+ 18 - 18
locations/kotovtalker.qsrc

@@ -2,17 +2,17 @@
 !!!!!!!!!!!!!!!!!
 !!!Vitek Cats!!!
 !!!!!!!!!!!!!!!!!
-if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel[$static_num] >= 80 or hotcat >= 5):
+if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel['A9'] >= 80 or hotcat >= 5):
 	if $loc = 'gdkin':
 		if alko < 3:
-			'<<$npc_firstname[$static_num]>> "<<$pcs_nickname>> Hey, let''s get drunk and then do something dumb."'
+			'<<$npc_firstname[''A9'']>>: "<<$pcs_nickname>> Hey, let''s get drunk and then do something dumb."'
 
-			act 'Refuse':npc_rel[$static_num] -= 5 & gt $loc, $metka
+			act 'Refuse':npc_rel['A9'] -= 5 & gt $loc, $metka
 			
 			act 'Drink beer':
 				*clr & cla
 				minut += 5
-				npc_rel[$static_num] += 5
+				npc_rel['A9'] += 5
 				alko += rand(1,2)
 				cumspclnt = 2
 				gs 'cum_cleanup'
@@ -25,14 +25,14 @@ if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel[$static_num]
 
 			if NikoPayback = 2 and kotovloveqw > 0 and VitekVsNiko = 0:act 'Tell him about Niko':gt 'NikoPayback', 'Vitek Help 2'
 		elseif alko >= 3:
-			'<<$npc_firstname[$static_num]>> "<<$pcs_nickname>> Hey, let''s dance."'
+			'<<$npc_firstname[''A9'']>>: "<<$pcs_nickname>> Hey, let''s dance."'
 
-			act 'Refuse':npc_rel[$static_num] -= 5 & gt $loc, $metka
+			act 'Refuse':npc_rel['A9'] -= 5 & gt $loc, $metka
 
 			act 'Dance':
 				*clr & cla
 				minut += 10
-				npc_rel[$static_num] += 2
+				npc_rel['A9'] += 2
 				danc_exp += rand(1, 3)
 				pcs_horny += 10
 				if pcs_inhib < 40:inhib_exp += rand(1,2)
@@ -41,17 +41,17 @@ if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel[$static_num]
 				'You go to the dance floor and started dancing with Vitek, he pawed at your ass with his strong hands.'
 
 				if kotovLoveQW = 0:
-					if kotovQW < 5 or npc_rel[$static_num] = 0:
+					if kotovQW < 5 or npc_rel['A9'] = 0:
 						act 'Move away':gt $loc, $metka
-					elseif kotovQW >= 5 and npc_rel[$static_num] ! 0:
+					elseif kotovQW >= 5 and npc_rel['A9'] ! 0:
 						'The dance ended and Vitek took you by the hand, steering you to the wall. "Hey <<$pcs_nickname>>, wanna go out with me, be my chick? I''ll wring any guy''s neck for you."'
 
 						act 'Refuse':
 							*clr & cla
-							npc_rel[$static_num] = 0
+							npc_rel['A9'] = 0
 							gs 'stat'
-							'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+							'<center><b><font color="maroon"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></font></b></center>'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 							'You refused and Vitek looks completely confused, but he was immediately angry. "Well, then fuck you, you cock sucking whore!"'
 
 							act 'Move away':gt $loc, $metka
@@ -61,8 +61,8 @@ if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel[$static_num]
 							*clr & cla
 							kotovLoveQW = 1
 							gs 'stat'
-							'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+							'<center><b><font color="maroon"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></font></b></center>'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 							'Vitek was delighted "Sweet. I almost can''t believe that you agreed to be my chick."'
 
 							act 'Move away':gt $loc, $metka
@@ -77,7 +77,7 @@ if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel[$static_num]
 						*clr & cla
 						minut += 15
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/9.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 						'You left the disco and went in the direction Vitek''s house, while he was holding your arm. Soon Vitek and you arrived at the dilapidated house, he opened the door and led you into the poor, unkept apartment. In the room clothes where lying in crumpled heaps everywhere on the floor and empty bottles littered the whole place.'
 
 						act 'Continue':gt 'kotovSex'
@@ -87,7 +87,7 @@ if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel[$static_num]
 		end
 	else
 		cla
-		'<<$npc_firstname[$static_num]>> "Hey <<$pcs_nickname>>, I''m busy. I''ll catch up with you later." He says as he turns back to talk to his friends.'
+		'<<$npc_firstname[''A9'']>>: "Hey <<$pcs_nickname>>, I''m busy. I''ll catch up with you later." He says as he turns back to talk to his friends.'
 		act 'Continue': gt 'gschool_lessons', 'short_break'
 	end
 elseif kotovLoveQW > 0 and pav_slut > 100:
@@ -123,7 +123,7 @@ elseif kotovLoveQW > 0 and pav_slut > 100:
 	end
 elseif $loc = 'gdkin':
 	if pav_slut < 150:
-		'<<$npc_firstname[$static_num]>> "<<$pcs_nickname>> Hey, let''s get drunk and then do something dumb."'
+		'<<$npc_firstname[$static_num]>>: "<<$pcs_nickname>> Hey, let''s get drunk and then do something dumb."'
 
 		act 'Refuse':npc_rel[$static_num] -= 5 & gt $loc, $metka
 		
@@ -141,7 +141,7 @@ elseif $loc = 'gdkin':
 			act 'Move away':gt $loc, $metka
 		end
 	else
-		'<<$npc_firstname[$static_num]>> "Then what the fuck are you doing here cumwhore? Came to suck some dick?"'
+		'<<$npc_firstname[$static_num]>>: "Then what the fuck are you doing here cumwhore? Came to suck some dick?"'
 
 		act 'Leave':npc_rel[$static_num] -= 5 & gt $loc, $metka
 	end

+ 12 - 12
locations/nogorslut.qsrc

@@ -4,17 +4,17 @@ menu_off = 1
 
 if pav_slut < 125:
 	if pcs_apprnc/8 = 0:
-		npc_rel[$static_num] += 1
+		npc_rel['A<<numnpc>>'] += 1
 	else
-		npc_rel[$static_num] += pcs_apprnc/8
+		npc_rel['A<<numnpc>>'] += pcs_apprnc/8
 	end
 
-	if npc_rel[$static_num] < 20:
-		'You talk about some random things that happened to you, and <<$npc_firstname[$static_num]>> listens with a moderate amount of interest.'
-	elseif npc_rel[$static_num] < 80:
-		'You chat about random topics, and <<$npc_firstname[$static_num]>> happily listens to you and shares some thoughts on them.'
-	elseif npc_rel[$static_num] >= 80:
-		'You chat about random topics and <<$npc_firstname[$static_num]>> happily listens to your stories, sharing several new stories and anecdotes as well.'
+	if npc_rel['A<<numnpc>>'] < 20:
+		'You talk about some random things that happened to you, and <<$npc_firstname[''A<<numnpc>>'']>> listens with a moderate amount of interest.'
+	elseif npc_rel['A<<numnpc>>'] < 80:
+		'You chat about random topics, and <<$npc_firstname[''A<<numnpc>>'']>> happily listens to you and shares some thoughts on them.'
+	elseif npc_rel['A<<numnpc>>'] >= 80:
+		'You chat about random topics and <<$npc_firstname[''A<<numnpc>>'']>> happily listens to your stories, sharing several new stories and anecdotes as well.'
 
 		if numnpc = 1:
 			!!Dimka Nosov
@@ -52,7 +52,7 @@ if pav_slut < 125:
 				act 'Discuss':
 					cls
 					gs'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
 					'You nod at what Ivan says. "Sure Ivan I understand, I am ok with just being friends, really close friends who sometimes fool around in the shower." You say in your best sexy voice with a wink.'
 
 					'He gives you a one armed hug. "<<$pcs_nickname>> your the best, not only are you smoking hot but you are a super cool chick too. If you want to hang out some time you can stop by my place." He pauses a moment and then looks around and leans in close. "Or if you get a little bored during lunch break, you can let me know too." He says with a suggestive tone and waggled eyebrows.'
@@ -63,8 +63,8 @@ if pav_slut < 125:
 					if $loc ! 'gdkin':act 'Tell him you''re bored':gt 'gdksport', 'Ivan_bored'
 				end
 
-			elseif npc_rel[$static_num] >= 80:
-				'You chat about random topics and <<$npc_firstname[$static_num]>> happily listens to your stories, sharing several new stories and anecdotes as well.'
+			elseif npc_rel['A<<numnpc>>'] >= 80:
+				'You chat about random topics and <<$npc_firstname[''A<<numnpc>>'']>> happily listens to your stories, sharing several new stories and anecdotes as well.'
 
 				if IvanShowerQW = 11 and $loc ! 'gdkin':
 					if rand(0,4) = 0:
@@ -124,7 +124,7 @@ if pav_slut < 125:
 			if kristinaSex = 0 and swinbeggor = 0 and kristinaSex = 0:
 				''
 			elseif kristinaSex = 0 and swinbeggor > 0 and kristinaSex = 0:
-				npc_rel[$static_num] = 20
+				npc_rel['A<<numnpc>>'] = 20
 				'Christina looks at you full of hate: "I can''t believe you were faster than me... bitch!"'
 			elseif kristinaSex > 0:
 				''

+ 34 - 33
locations/yesgorslut.qsrc

@@ -1,57 +1,58 @@
 # yesgorslut
+
 if pav_slut >= 125:
-	if grupTipe[numnpc] = 5:
+	if npc_grupTipe['A<<numnpc>>'] = 5:
 		!!rogue
 		bonusotnG = pcs_apprnc / 8
 
 		if bonusotnG <= 0:bonusotnG = 1
 
-		npc_rel[$static_num] += bonusotnG
+		npc_rel['A<<numnpc>>'] += bonusotnG
 
-		if npcPol[numnpc] = 0:
+		if npc_gender['A<<numnpc>>'] = 0:
 			!!Guy
-			'You have a chat with <<$npc_firstname[$static_num]>>, who happily listens to what you have to say.'
-		elseif npcPol[numnpc] > 0:
+			'You have a chat with <<$npc_firstname[''A<<numnpc>>'']>>, who happily listens to what you have to say.'
+		else
 			!!Girl
-			'You have a chat with <<$npc_firstname[$static_num]>>, who happily listens to what you have to say.'
+			'You have a chat with <<$npc_firstname[''A<<numnpc>>'']>>, who happily listens to what you have to say.'
 		end
-	elseif grupTipe[numnpc] = 0:
+	elseif npc_grupTipe['A<<numnpc>>'] = 0:
 		!!no social group
-		if npcPol[numnpc] = 0:
+		if npc_gender['A<<numnpc>>'] = 0:
 			!!Guy
-			'You''re doing your best to engage in conversation with the guy, but <<$npc_firstname[$static_num]>> just looks at your body while he ignores everything you say.'
-		elseif npcPol[numnpc] > 0:
+			'You''re doing your best to engage in conversation with the guy, but <<$npc_firstname[''A<<numnpc>>'']>> just looks at your body while he ignores everything you say.'
+		else
 			!!Girl
-			'You''re doing your best to engage in conversation with the girl, but <<$npc_firstname[$static_num]>> turns away and does not want to talk with you: "Get away from me! I can''t believe you think we''re still friends!"'
+			'You''re doing your best to engage in conversation with the girl, but <<$npc_firstname[''A<<numnpc>>'']>> turns away and does not want to talk with you: "Get away from me! I can''t believe you think we''re still friends!"'
 		end
-	elseif grupTipe[numnpc] = 3:
+	elseif npc_grupTipe['A<<numnpc>>'] = 3:
 		!!nerdy
-		if npcPol[numnpc] = 0:
+		if npc_gender['A<<numnpc>>'] = 0:
 			!!Guy
-			'You''re doing your best to engage in conversation with the guy, but <<$npc_firstname[$static_num]>> just stares at your boobs and chuckles.'
-		elseif npcPol[numnpc] > 0:
+			'You''re doing your best to engage in conversation with the guy, but <<$npc_firstname[''A<<numnpc>>'']>> just stares at your boobs and chuckles.'
+		else
 			!!Girl
-			'You''re doing your best to engage in conversation with the girl, but <<$npc_firstname[$static_num]>> turns away and does not want to talk with you. Definitely not where others can see you.'
+			'You''re doing your best to engage in conversation with the girl, but <<$npc_firstname[''A<<numnpc>>'']>> turns away and does not want to talk with you. Definitely not where others can see you.'
 		end
-	elseif grupTipe[numnpc] = 2:
+	elseif npc_grupTipe['A<<numnpc>>'] = 2:
 		!!sportiki
 		if numnpc = 18:
 			!!Christina Zvereva
 			if kristinaSex = 0 and swinbeggor = 0:
-				'The moment you try to say something to <<$npc_firstname[$static_num]>>, a grimace appears on her face and she says in a squeamish voice: "Ewwww! Go away <<$gnikname>>!"'
+				'The moment you try to say something to <<$npc_firstname[''A<<numnpc>>'']>>, a grimace appears on her face and she says in a squeamish voice: "Ewwww! Go away <<$gnikname>>!"'
 			elseif kristinaSex = 0 and swinbeggor > 0:
 				'Christina looks at you full of hate: "I can''t believe you find time to run on Saturdays, aren''t you too busy whoring yourself out?"'
 			elseif kristinaSex > 0:
 				'Christina smiles at you and says quietly: "You were not bad, the last time we entertained. You look so sexy with a cock down your throat!"'
 			end
-		elseif npcPol[numnpc] = 0:
+		elseif npc_gender['A<<numnpc>>'] = 0:
 			!!Guy
-			'You are trying to start a conversation with <<$npc_firstname[$static_num]>>, but he immediately dismisses you: "I have no time for you <<$pcs_nickname>>, I''m busy."'
-		elseif npcPol[numnpc] > 0 and numnpc ! 18:
+			'You are trying to start a conversation with <<$npc_firstname[''A<<numnpc>>'']>>, but he immediately dismisses you: "I have no time for you <<$pcs_nickname>>, I''m busy."'
+		elseif npc_gender['A<<numnpc>>'] > 0 and numnpc ! 18:
 			!!Girl
-			'The moment you try to say something to <<$npc_firstname[$static_num]>>, a grimace appears on her face and she says in a squeamish voice: "Ewwww! Go away <<$gnikname>>!"'
+			'The moment you try to say something to <<$npc_firstname[''A<<numnpc>>'']>>, a grimace appears on her face and she says in a squeamish voice: "Ewwww! Go away <<$gnikname>>!"'
 		end
-	elseif grupTipe[numnpc] = 1:
+	elseif npc_grupTipe['A<<numnpc>>'] = 1:
 		!!cool kid
 		if numnpc = 14:
 			!!Katja Meynold
@@ -60,31 +61,31 @@ if pav_slut >= 125:
 			!!Vicky
 			'You have a nice chat with Vicky. However, the topic keeps circling back to rumours of you and your reputation. Vicky is concerned about the rumours of you being a <<$gnikname>>.'
 		else
-			if npcPol[numnpc] = 0:
+			if npc_gender['A<<numnpc>>'] = 0:
 				!!Guy
-				'You are trying to start a conversation with <<$npc_firstname[$static_num]>> but he immediately dismisses you, making an effort of leafing through a calendar: "I have no time for you for you <<$pcs_nickname>>, I''m busy. Maybe try again in two-thousand-and-never."'
-			elseif npcPol[numnpc] > 0:
+				'You are trying to start a conversation with <<$npc_firstname[''A<<numnpc>>'']>> but he immediately dismisses you, making an effort of leafing through a calendar: "I have no time for you for you <<$pcs_nickname>>, I''m busy. Maybe try again in two-thousand-and-never."'
+			else
 				!!Girl
 				if AlbFrend >= 1 and numnpc = 23:
-					'<<$npc_firstname[$static_num]>> happily chats with you, giving you a confident smile.'
+					'<<$npc_firstname[''A<<numnpc>>'']>> happily chats with you, giving you a confident smile.'
 				else
-					'The moment you try to say something to <<$npc_firstname[$static_num]>>, a grimace appears on her face and she says in a squeamish voice: "Ewwww! Go away!"'
+					'The moment you try to say something to <<$npc_firstname[''A<<numnpc>>'']>>, a grimace appears on her face and she says in a squeamish voice: "Ewwww! Go away!"'
 				end
 			end		
 		end
-	elseif grupTipe[numnpc] = 4:
+	elseif npc_grupTipe['A<<numnpc>>'] = 4:
 		!!Gopnik
-		if npcPol[numnpc] = 0:
+		if npc_gender['A<<numnpc>>'] = 0:
 			!!Guy
 			if numnpc = 9:
 				!!Cats
 				'You try to talk with Vitek, but he immediately cuts you off: "I don''t talk to sluts, <<$pcs_nickname>>. Fuck off."'
 			elseif numnpc ! 9:
-				'<<$npc_firstname[$static_num]>> laughs at you when you try to talk to him: "Haha, what''s wrong <<$gnikname>>? Looking for more cocks to suck?"'
+				'<<$npc_firstname[''A<<numnpc>>'']>> laughs at you when you try to talk to him: "Haha, what''s wrong <<$gnikname>>? Looking for more cocks to suck?"'
 			end
-		elseif npcPol[numnpc] > 0:
+		else
 			!!Girl
-			'<<$npc_firstname[$static_num]>>''s face contorts in disgust: "Yuck, <<$gnikname>>! Fuck off!"'
+			'<<$npc_firstname[''A<<numnpc>>'']>>''s face contorts in disgust: "Yuck, <<$gnikname>>! Fuck off!"'
 		end
 	end
 end