[fixed] update for katja

locations/KatjaHomeTalk.qsrc

@@ -125,7 +125,7 @@ if $ARGS[0] = '':
 				cls
 				KatjaHorny += 1
 				!KatjaLust += 1
-				!if npcSex[14] = 1:
+				!if npc_sex['A14'] = 1:
 				minut += 15
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
@@ -184,7 +184,7 @@ if $ARGS[0] = '':
 				act 'Further':gt 'KatjaHomeTalk'
 			end
 			
-			if npcSex[14] = 1 and pcs_dom >= KatjaDom:
+			if npc_sex['A14'] = 1 and pcs_dom >= KatjaDom:
 				act 'Offer to take a walk in the Park':
 					pcs_dom-=1
 					minut += 15
@@ -495,7 +495,7 @@ if $ARGS[0] = 'shower_kiss_home':
 		KatjaLust += 1
 		KatjaSlut += 1
 
-		if npcSex[14] = 0:npcSex[14] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+		if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
 		
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/showersex.jpg"></center>'

locations/Katja_Tanga.qsrc

@@ -151,7 +151,7 @@ if $ARGS[0] = 'school3':
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga4_2.jpg"></center>'
 		'Katja looks around to make sure that no one is watching the two of you. Then she unbuttons her shirt and pulls it open to reveal her bare breasts. With a smile you reach up and grab both her breasts in your hands and tease her nipples with your fingers, eliciting a moan of pleasure from her.'
-		if pcs_horny >= 50 and KatjaHorny >= 50 and npcSex[14] = 1 and mesec <= 0:
+		if pcs_horny >= 50 and KatjaHorny >= 50 and npc_sex['A14'] > 0 and mesec <= 0:
 			'Blushing Katja pulls away from your touch and buttons her shirt back up, but looks at you slyly and says. "I have a key to a storage closet, we can go there for a bit more privacy if you want." Giving you a hopeful look that you will agree.'
 			Act 'Go': gt 'Katja_tanga', 'secretroom'
 		else

locations/Snpc.qsrc

@@ -379,7 +379,7 @@ if numnpc = 14:
 			end
 		end
 	end
-	if rand(1,3) = 1 and npcSex[14] = 1 and $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart:  gt 'Katja_tanga', 'start'
+	if rand(1,3) = 1 and npc_sex['A14'] = 1 and $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart:  gt 'Katja_tanga', 'start'
 	if rand(1,2) = 1 and katschoolsex = 1 and pcs_horny > 40:
 		*clr
 		if $loc = 'gdkin':

locations/gschool_chats1.qsrc

@@ -338,16 +338,7 @@ if $ARGS[0] = 'katja':
 			'Katja is as red as a lobster, and her chest is heaving from her heavy breaths. She''s idly rubbing her thighs against one another while you talk.'
 		end
 	end
-	
-	if rand(1,3) = 1 and npcSex[14] = 1 and $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart:  gt 'Katja_tanga', 'start'
-	
-	if rand(1,2) = 1 and katschoolsex = 1 and pcs_horny > 40:
-		*clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
-		'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'
-	end
-	
+			
 	if npc_rel['A14'] >= 50 and pav_slut < 125:
 		npc_rel['A14'] += 1
 		if grupTipe = 1:
@@ -454,6 +445,15 @@ if $ARGS[0] = 'katja':
 			end
 		end
 	end
+	
+	if rand(1,3) = 1 and npc_sex['A14'] > 0 and $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart:  gt 'Katja_tanga', 'start'
+	
+	if rand(1,2) = 1 and katschoolsex = 1 and pcs_horny > 40:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
+		'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'
+	end	
 end
 
 if $ARGS[0] = 'albina':

locations/gschool_lunch.qsrc

@@ -329,7 +329,7 @@ end
 
 if $ARGS[0] = 'events':
 	menu_off = 1
-	if npcSex[14] = 1 and KatjaLust >= 50 and Katjahorny + KatjaSlut >= 100 and KatjaHorny > 50:
+	if npc_sex['A14'] = 1 and KatjaLust >= 50 and Katjahorny + KatjaSlut >= 100 and KatjaHorny > 50:
 		cla
 		'During the break Katja Meynold approaches you, her face flushed in a mixture of shame and what seems to be arousal. After a few seconds, she gathers enough courage to ask if you want go somewhere quiet with her.'
 		act 'Refuse': KatjaDom -= 1 & gt 'gschool_lunch', 'break'

locations/katjaEv.qsrc

@@ -151,7 +151,7 @@ if $ARGS[0] = '6':
 
 		exit
 	elseif katjaDeystRand = 1:
-		if npcSex[14] = 1:
+		if npc_sex['A14'] = 1:
 			if KatjaSlut <= 150:
 				'Katja invites you to take a walk in the park.'
 
@@ -179,7 +179,7 @@ if $ARGS[0] = '6':
 			act 'Refuse and go home':minut += 15 & KatjaHorny -= 5 & gt 'pavResidential'
 
 			exit
-		elseif npcSex[14] = 0:
+		elseif npc_sex['A14'] = 0:
 			KatjaHorny += 5
 			KatjaLust += 1
 			'Katja starts chatting about boys, cosmetics and school with you.'
@@ -401,11 +401,11 @@ if $ARGS[0] = 'kiss':
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits_katja_get.jpg"></center>'
 								'You free Katja''s small, firm breasts from under her clothes and begin to lick them, paying special attention to her nipples. Katja closed her eyes in pleasure and bites her lip.'
 
-								if npcSex[14] = 0:
+								if npc_sex['A14'] = 0:
 									'After a while Katja moves your hands away.'
 
 									act 'Further':gt 'KatjaHomeTalk'
-								elseif npcSex[14] > 0:
+								elseif npc_sex['A14'] > 0:
 									gs 'boystat', 'A14', 'a'
 									gs 'KatjaEvDin', 'sex'
 								end
@@ -427,11 +427,11 @@ if $ARGS[0] = 'kiss':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
 					'Katja bares your breasts and touches them with her fingers, then she bows her head and begins to lick your nipple.'
 
-					if npcSex[14] = 0:
+					if npc_sex['A14'] = 0:
 						'Having licked your breasts, Katja stands up and turns to start cleaning her room.'
 
 						act 'Further':gt 'KatjaHomeTalk'
-					elseif npcSex[14] > 0:
+					elseif npc_sex['A14'] > 0:
 						gs 'boystat', 'A14', 'a'
 						gs 'KatjaEvDin', 'sex'
 					end

locations/katjaEvDin.qsrc

@@ -214,7 +214,7 @@ if $ARGS[0] = 'shower_kiss':
 		KatjaLust += 1
 		KatjaSlut += 1
 
-		if npcSex[14] = 0:npcSex[14] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+		if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
 		
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/showersex.jpg"></center>'
@@ -319,7 +319,7 @@ if $ARGS[0] = 'kuni':
 	KatjaLust += 1
 	katjahorny = 0
 
-	if npcSex[14] = 0:npcSex[14] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'
@@ -346,7 +346,7 @@ if $ARGS[0] = 'kuni_p':
 	KatjaSlut += 1
 	KatjaLust += 1
 
-	if npcSex[14] = 0:npcSex[14] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni.jpg"></center>'
@@ -379,7 +379,7 @@ if $ARGS[0] = 'kuni_dom':
 	lesbian += 1
 	katjahorny = 0
 
-	if npcSex[14] = 0:npcSex[14] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'

locations/saveupdater.qsrc

@@ -559,9 +559,12 @@ if array_updater = 0:
 	killvar '$newnpcvars'
 end
 
+!!Updates for the old school code
 if NatBelLernQW > 0 and NatashaQW = 0: NatashaQW = NatBelLernQW & NatBelLernQW = 0
 
 if grupTipe[25] = 5: grupTipe[25] = 0 & npc_grupTipe['A25'] = 5
 
+if npcSex[14] > 0: npcSex[14] = 0 and npc_sex['A14'] = 1
+
 --- saveupdater ---------------------------------