Browse Source

Merge remote-tracking branch 'CroWke/master'

KevinSmarts 5 years ago
parent
commit
4042314877
1 changed files with 65 additions and 68 deletions
  1. 65 68
      locations/Snpc.qsrc

+ 65 - 68
locations/Snpc.qsrc

@@ -7,17 +7,17 @@ $static_num = $school_static_num[numnpc]
 '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
 '<<$npc_notes[$static_num]>>'
 
-if grupTipe[numnpc] = 5:'<<$npc_firstname[$static_num]>> is an outcast in school, and often gets picked on at school.'
-if grupTipe[numnpc] = 6:''
-if grupTipe[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 grupTipe[numnpc] = 2:'<<$npc_firstname[$static_num]>> is part of the athletic clique in your school.'
-if grupTipe[numnpc] = 1:'<<$npc_firstname[$static_num]>> is popular, and spends time with the other popular kids usually.'
-if grupTipe[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_rel[$static_num] < 20:'They really don''t like you.'
-if npc_rel[$static_num] >= 20 and npc_rel[$static_num] < 40:'They are fairly indifferent to you.'
-if npc_rel[$static_num] >= 40 and npc_rel[$static_num] < 60:'The two of you get along together fairly well together, more of casual friends.'
-if npc_rel[$static_num] >= 60 and npc_rel[$static_num] < 80:'You get along great with them, they are one of your friends.'
-if npc_rel[$static_num] >= 80:'They are one of your best friends.'
+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>>'] = 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_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.'
+if npc_rel['A<<numnpc>>'] >= 60 and npc_rel['A<<numnpc>>'] < 80:'You get along great with them, they are one of your friends.'
+if npc_rel['A<<numnpc>>'] >= 80:'They are one of your best friends.'
 
 if numnpc = 14 and KatjaOTN > 0:
 	if KatjaHorny < 20:'Katja looks calm and stoic.'
@@ -41,41 +41,41 @@ if numnpc = 9:gs 'kotovtalker'
 !!!Niko Volkov!!!!
 !!!!!!!!!!!!!!!!!!
 
-	if numnpc = 61 and $loc ! 'gdkin' and NikoBreakup = 1:
+	if numnpc = 189 and $loc ! 'gdkin' and NikoBreakup = 1:
 		gt 'NikoEv', 'Lunch Breakup'
-	elseif numnpc = 61 and $loc = 'gdkin' and NikoBreakup = 1:
+	elseif numnpc = 189 and $loc = 'gdkin' and NikoBreakup = 1:
 		gt 'NikoEv', 'Disco Breakup'
-	elseif numnpc = 61 and $loc = 'gdkin' and NikoBreakupDay = daystart:
+	elseif numnpc = 189 and $loc = 'gdkin' and NikoBreakupDay = daystart:
 		gt 'NikoEv', 'Disco Breakup 2'
-	elseif numnpc = 61 and $loc ! 'gdkin' and NikoIntro = 0:
+	elseif numnpc = 189 and $loc ! 'gdkin' and NikoIntro = 0:
 		gt 'NikoEv', 'Lunch Intro'
-	elseif numnpc = 61 and $loc ! 'gdkin' and NikoIntro = 1:
+	elseif numnpc = 189 and $loc ! 'gdkin' and NikoIntro = 1:
 		gt 'NikoEv', 'Lunch Chat'
-	elseif numnpc = 61 and $loc = 'gdkin' and NikoIntro = 0:
+	elseif numnpc = 189 and $loc = 'gdkin' and NikoIntro = 0:
 		gt 'NikoEv', 'Disco Intro'
-	elseif numnpc = 61 and $loc = 'gdkin' and NikoIntro = 1:
+	elseif numnpc = 189 and $loc = 'gdkin' and NikoIntro = 1:
 		gt 'NikoEv', 'Disco Chat'
 	end
 
 !!!!!!!!!!!!!
 !!!gopniks!!!
 !!!!!!!!!!!!!
-if grupTipe[numnpc] = 4:
+if npc_grupTipe['A<<numnpc>>'] = 4:
 	if $loc = 'gdkin':
 		if pav_slut < 125:
 			if numnpc ! 9:
-				if npcPol[numnpc] = 0:
+				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!"'
 				else
 					'<<$npc_firstname[$static_num]>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
 				end
 
-				act 'Decline':npc_rel[$static_num] -= 5 & gt $loc, $metka
+				act 'Decline':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $metka
 				
 				act 'Drink the beer':
 					*clr & cla
 					minut += 5
-					npc_rel[$static_num] += 5
+					npc_rel['A<<numnpc>>'] += 5
 					alko += rand(1,2)
 					if pcs_hydra >= 100:
 						pcs_hydra += 5
@@ -92,26 +92,26 @@ if grupTipe[numnpc] = 4:
 				end
 			end
 		elseif pav_slut >= 125:
-			if npcPol[numnpc] = 0:
+			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?"'
 			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."'
 			end
 
-			act 'Move away':npc_rel[$static_num] -= 5 & gt $loc, $metka
+			act 'Move away':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $metka
 		end
 
 		exit
 	end
 end
 
-if numnpc = 45:
+if numnpc = 144:
 !!I would like to change this so even if all the requirements are meet it only fires one in 5 times. 
-	if $loc ! 'gdkin' and npc_rel[$static_num] > 50 and (Anush_sex > 0 or hotcat >= 7) and rand(0,4) = 0:
+	if $loc ! 'gdkin' and npc_rel['A<<numnpc>>'] > 50 and (Anush_sex > 0 or hotcat >= 7) and rand(0,4) = 0:
 		act 'You''re looking flushed':
 			*clr & cla
 			if Anush_lunch = 0:
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/144.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."'
@@ -238,11 +238,11 @@ act 'Chat':
 
 	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><img <<$set_imgh>> src="images/pc/npc_headshots/<<numnpc>>.jpg"></center>'
 
-	if numnpc = 1 and npc_rel[$static_num] = 0:
+	if numnpc = 1 and npc_rel['A<<numnpc>>'] = 0:
 		cla
-		'Dimka does no efforts to hide his disdain for you: "Get away from me, you pimply pig."'
+		'Dimka doesn''t try to hide his disdain for you: "Get away from me, you pimply pig."'
 
 		if $loc ! 'gdkin':
 			act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -289,14 +289,14 @@ if numnpc = 2:
 
 			if $loc = 'gdkin':minut += 5
 
-			npc_rel[$static_num] += 5
+			npc_rel['A<<numnpc>>'] += 5
 			sub += 1
 
 			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/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<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."'
@@ -336,18 +336,18 @@ end
 !!!JULIA milova!!!
 !!!!!!!!!!!!!!!!!!
 if numnpc = 12:
-	if (pcs_dom > 0 or grupTipe = 3) and JuliaMilLernQW = 0 and npc_rel[$static_num] >= 80:
+	if (pcs_dom > 0 or grupTipe = 3) and JuliaMilLernQW = 0 and npc_rel['A<<numnpc>>'] >= 80:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 
 			if $loc = 'gdkin':minut += 5
 
-			npc_rel[$static_num] += 5
+			npc_rel['A<<numnpc>>'] += 5
 			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/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<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.'
@@ -372,11 +372,11 @@ if numnpc = 14:
 
 			if $loc = 'gdkin':minut += 5
 
-			npc_rel[$static_num] += 5
+			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/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<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':
@@ -390,14 +390,13 @@ if numnpc = 14:
 	if rand(1,2) = 1 and katschoolsex = 1 and pcs_horny > 40:
 		*clr
 		if $loc = 'gdkin':
-			minut += 1
-			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss1.jpg"></center>'
 		else
-			minut += 1
-			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
 		end
+		
+		minut += 1
+		gs'stat'
 
 		'Katja slowly leans in towards you, almost closing her eyes and slowly opening her mouth. Unable to resist, you lean in and meet her with a kiss.'
 		gs 'katjaEv', 'kiss_events'
@@ -412,7 +411,7 @@ if numnpc = 14:
 
 			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><img <<$set_imgh>> src="images/pc/npc_headshots/<<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':
@@ -456,19 +455,17 @@ if numnpc = 14:
 		end
 	end
 
-	if (npc_rel[$static_num] > 60) and (KatjaOTN > 0) and (KatjaLust > 15) :
+	if (npc_rel['A<<numnpc>>'] > 60) and (KatjaOTN > 0) and (KatjaLust > 15) :
 		!!new Katja stuff not sure where you want to put it. It should be an option when you talk to her at school or the dance where it says Chat, but add this as an option.
 		act 'Kiss Katja':
 			*clr & cla
 			if $loc = 'gdkin':
-				minut += 1
-				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss1.jpg"></center>'
 			elseif $loc ! 'gdkin':
-				minut += 1
-				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
 			end
+			minut += 1
+			gs'stat'
 			'You lean in to kiss Katja'
 			if Katjahorny < 30:
 				'She pulls away from you as you try and kiss her, she looks around to see if anyone seen. "Not here and not now."'
@@ -481,7 +478,7 @@ if numnpc = 14:
 				*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><img <<$set_imgh>> src="images/pc/npc_headshots/<<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
@@ -496,7 +493,7 @@ if numnpc = 14:
 			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><img <<$set_imgh>> src="images/pc/npc_headshots/<<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?"'
 
@@ -528,18 +525,18 @@ end
 !!!!!!!!!!!!!!!!!!!!!!!!!
 
 if numnpc = 16:
-	if pcs_dom > 0 and NatBelLernQW = 0 and npc_rel[$static_num] >= 80:
+	if pcs_dom > 0 and NatBelLernQW = 0 and npc_rel['A<<numnpc>>'] >= 80:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 
 			if $loc = 'gdkin':minut += 5
 
-			npc_rel[$static_num] += 5
+			npc_rel['A<<numnpc>>'] += 5
 			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/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<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.'
@@ -596,7 +593,7 @@ if numnpc = 31:
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/31.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/<<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:
@@ -616,15 +613,15 @@ end
 !!!!!Aleksandra Kirilenko!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-if numnpc = 62:
-	if npc_rel[$static_num] >= 100 and grupTipe = 3 and npc_QW[$static_num] = 0 and temper >= 15:
+if numnpc = 231:
+	if npc_rel['A<<numnpc>>'] >= 100 and grupTipe = 3 and npc_QW['A<<numnpc>>'] = 0 and temper >= 15:
 		act 'Ask to join at library after school':
 			*clr & cla
 			minut += 5
-			npc_QW[$static_num] = 1
+			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/characters/pavlovsk/school/head/62.jpg"></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?"'
 			'"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."'
@@ -635,14 +632,14 @@ if numnpc = 62:
 				act 'Move away': gt $loc, $metka
 			end
 		end
-	elseif npc_rel[$static_num] >= 100 and grupTipe = 3 and npc_QW[$static_num] = 2 and schoolprogul > 0:
+	elseif npc_rel['A<<numnpc>>'] >= 100 and grupTipe = 3 and npc_QW['A<<numnpc>>'] = 2 and schoolprogul > 0:
 		act 'Ask to study at her house after school':
 			*clr & cla
 			minut += 5
-			npc_QW[$static_num] = 3
+			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/characters/pavlovsk/school/head/62.jpg"></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."'
 			'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."'
@@ -653,14 +650,14 @@ if numnpc = 62:
 				act 'Move away': gt $loc, $metka
 			end
 		end
-	elseif npc_rel[$static_num] >= 100 and npc_QW[$static_num] = 4 and pcs_dom >= 20:
+	elseif npc_rel['A<<numnpc>>'] >= 100 and npc_QW['A<<numnpc>>'] = 4 and pcs_dom >= 20:
 		act 'Serious talk':
 			*clr & cla
 			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/characters/pavlovsk/school/head/62.jpg"></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.'
 			'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.'
@@ -675,13 +672,13 @@ if numnpc = 62:
 				act 'Move away': gt $loc, $metka
 			end
 		end	
-	elseif npc_rel[$static_num] >= 100 and npc_QW[$static_num] = 4 and pcs_dom < 20:
+	elseif npc_rel['A<<numnpc>>'] >= 100 and npc_QW['A<<numnpc>>'] = 4 and pcs_dom < 20:
 		act 'Chicken Out':
 			*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/characters/pavlovsk/school/head/62.jpg"></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.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
@@ -689,14 +686,14 @@ if numnpc = 62:
 				act 'Move away': gt $loc, $metka
 			end
 		end
-	elseif npc_QW[$static_num] > 5:
+	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!'
 		act 'Kiss her':
 			*clr & cla
 			minut += 5
-			npc_rel[$static_num] += 10
-			npc_love[$static_num] += 5
-			npc_horny[$static_num] += 15
+			npc_rel['A<<numnpc>>'] += 10
+			npc_love['A<<numnpc>>'] += 5
+			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>'