[fixes] school uniform checks missing/incomplete fix from slanon

old variables removed from npcgeneratec

locations/korrPar.qsrc

@@ -90,7 +90,7 @@ if nodimkaK >= rand(7,10) and DimkaWarnedToday = 0:
 	if hour >= 9 and hour < 24 and week >=6 and DimkaWarnedToday = 0: gt 'dimaEv', 'Dimka_warning'
 end
 
-if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and PCloStyle2 = 4:
+if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
 	*nl
 	'Go pick up <a href="exec:gt ''natbelEv'', ''carrybooks''">Natasha</a> before school.'
 end

locations/npcgeneratec.qsrc

@@ -200,7 +200,6 @@ npc_glasses[$npclastgenerated] = rand(0,1)
 npc_grades[$npclastgenerated] = rand(40,100)
 npc_run[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_vball[$npclastgenerated] = rand(0,(npctempc2 + 10))
-npc_nerd[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_shoot[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_sewing[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_serving[$npclastgenerated] = rand(0,(npctempc2 + 10))
@@ -233,7 +232,6 @@ npc_herpes[$npclastgenerated] = 0
 npc_syth[$npclastgenerated] = 0
 npc_gon[$npclastgenerated] = 0
 npc_chlam[$npclastgenerated] = 0
-npc_Hiv[$npclastgenerated] = 0
 npc_genwart[$npclastgenerated] = 0
 npc_Thrush[$npclastgenerated] = 0
 npc_Malen[$npclastgenerated] = 0

locations/pavSharedApt.qsrc

@@ -278,7 +278,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	
-	if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0:
+	if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
 		act 'Go pick up Natasha before school': gt 'natbelEv', 'carrybooks'
 	end