[Changed] Changed schoool uniform flag to be part of CloStyle2

locations/_attributes_school.qsrc

@@ -6,12 +6,14 @@ if ARGS[1] = 1:
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 5
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 2:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 3
+	CloStyle2 = 4
 	CloExhibit = 15
 elseif ARGS[1] = 3:
 	CloQuality = 4
@@ -19,6 +21,7 @@ elseif ARGS[1] = 3:
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloBimbo = 1
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 4:
 	CloQuality = 3
@@ -26,6 +29,7 @@ elseif ARGS[1] = 4:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloBimbo = 1
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 5:
 	CloQuality = 4
@@ -34,12 +38,14 @@ elseif ARGS[1] = 5:
 	CloSkirtShortness = 6
 	CloBimbo = 1
 	CloStyle = 4
+	CloStyle2 = 4
 	CloExhibit = 35
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloStyle2 = 4
 	CloExhibit = 0	
 elseif ARGS[1] = 7:
 	CloQuality = 4
@@ -47,6 +53,7 @@ elseif ARGS[1] = 7:
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 8:
 	CloQuality = 3
@@ -55,6 +62,7 @@ elseif ARGS[1] = 8:
 	CloSkirtShortness = 6
 	CloBimbo = 1
 	CloExhibit = 35
+	CloStyle2 = 4
 	CloStyle = 4
 elseif ARGS[1] = 9:
 	CloQuality = 3
@@ -63,6 +71,7 @@ elseif ARGS[1] = 9:
 	CloSkirtShortness = 5
 	CloBimbo = 1
 	CloExhibit = 30
+	CloStyle2 = 4
 	CloStyle = 4
 elseif ARGS[1] = 10:
 	CloQuality = 4
@@ -77,18 +86,21 @@ elseif ARGS[1] = 11:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 12:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 13:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 14:
 	CloQuality = 3
@@ -96,6 +108,7 @@ elseif ARGS[1] = 14:
 	CloTopCut = 4
 	CloSkirtShortness = 4
 	CloBimbo = 1
+	CloStyle2 = 4
 	CloExhibit = 25
 elseif ARGS[1] = 15:
 	CloQuality = 3
@@ -109,54 +122,63 @@ elseif ARGS[1] = 16:
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 21:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 5
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 24:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 25:
 	CloQuality = 3
@@ -164,101 +186,118 @@ elseif ARGS[1] = 25:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloBimbo = 1
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloStyle2 = 4
 	CloExhibit = 10
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloStyle2 = 4
 	CloExhibit = 20
 elseif ARGS[1] = 35:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloStyle2 = 4
 	CloExhibit = 10
 elseif ARGS[1] = 36:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloStyle2 = 4
 	CloExhibit = 10
 elseif ARGS[1] = 37:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloStyle2 = 4
 	CloExhibit = 10
 elseif ARGS[1] = 38:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloStyle2 = 4
 	CloExhibit = 10
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
+	CloStyle2 = 4
 	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
+	CloStyle2 = 4
 	CloExhibit = 30
 	CloSkirtShortness = 5
 	CloBimbo = 1
@@ -266,18 +305,21 @@ elseif ARGS[1] = 42:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
+	CloStyle2 = 4
 	CloExhibit = 25
 	CloSkirtShortness = 4
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
+	CloStyle2 = 4
 	CloExhibit = 30
 	CloSkirtShortness = 5
 	CloBimbo = 1
@@ -285,6 +327,7 @@ elseif ARGS[1] = 45:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
+	CloStyle2 = 4
 	CloExhibit = 30
 	CloSkirtShortness = 5
 	CloBimbo = 1
@@ -292,6 +335,7 @@ elseif ARGS[1] = 46:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
+	CloStyle2 = 4
 	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 47:
@@ -299,17 +343,20 @@ elseif ARGS[1] = 47:
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 5
+	CloStyle2 = 4
 	CloExhibit = 30
 elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
+	CloStyle2 = 4
 	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 50:
@@ -321,6 +368,7 @@ elseif ARGS[1] = 50:
 elseif ARGS[1] = 51:
 	CloQuality = 4
 	CloThinness = 4
+	CloStyle2 = 4
 	CloExhibit = 35
 	CloSkirtShortness = 4
 	CloBimbo = 1
@@ -329,30 +377,35 @@ elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 53:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 54:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
+	CloStyle2 = 4
 	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 55:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 56:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
+	CloStyle2 = 4
 	CloExhibit = 20
 	CloSkirtShortness = 4
 	CloBimbo = 1
@@ -360,30 +413,35 @@ elseif ARGS[1] = 57:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 59:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
+	CloStyle2 = 4
 	CloExhibit = 10
 	CloSkirtShortness = 3
 	CloBimbo = 1
@@ -391,6 +449,7 @@ elseif ARGS[1] = 62:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
+	CloStyle2 = 4
 	CloExhibit = 10
 	CloSkirtShortness = 3
 end

locations/bed2.qsrc

@@ -464,9 +464,15 @@ if $ARGS[0] = 'wake':
 		end
 		act 'Get up out of bed and get dressed for school (0:15)':
 			minut += 15
-			if schtype = 0:schtype = 6
-			if schoolH[schtype] = 0:schtype = 6
-			gs 'clothing', 'wear', 'school', schtype
+			if schtype = 0:
+				$schbrand = 'school'
+				schtype = 6
+			end
+			if schoolH[schtype] = 0:
+				$schbrand = 'school'
+				schtype = 6
+			end
+			gs 'clothing', 'wear', $schbrand, schtype
 			gs 'bed2', 'end'
 		end
 	end
@@ -489,8 +495,14 @@ if $ARGS[0] = 'wake':
 			act 'Full morning routine for School (01:00)':
 				fullmorrout = 1
 				minut += 15
-				if schtype = 0:schtype = 6
-				if schoolH[schtype] = 0:schtype = 6
+				if schtype = 0:
+					$schbrand = 'school'
+					schtype = 6
+				end
+				if schoolH[schtype] = 0:
+					$schbrand = 'school'
+					schtype = 6
+				end
 				gs 'clothing', 'wear', 'school', schtype
 				gs 'bed2', 'end'
 			end

locations/clothing.qsrc

@@ -397,7 +397,7 @@ if $ARGS[0] = 'view_clothing_item':
 		end
 	end
 
-	if $ARGS[2] = 'school':
+	if PCloStyle2 = 4:
 		if CloExhibit <= 10:
 			'<font color="blue">This uniform is very conservative. Only the nerds would approve of you wearing it.</font>'
 		elseif CloSkirt < 5 and CloThinness < 5 and CloBra = 0:
@@ -659,7 +659,9 @@ if $ARGS[0] = 'strip':
 		last_vid = 0
 	end
 
-	if $clothingworntype = 'school':schtype = clothingwornnumber
+	if PCloStyle2 = 4:
+		$schbrand = $clothingworntype
+		schtype = clothingwornnumber
 
 	if $ARGS[1] ! '' :
 		DYNAMIC '$CloLos<<$clothingworntype>>[<<clothingwornnumber>>]=<<$ARGS[1]>>'

locations/clothing_QV.qsrc

@@ -410,7 +410,7 @@ if $ARGS[0] = 'change':
 		end
 	end
 
-	if $ARGS[1] = 'school':
+	if CloStyle2 = 4:
 		if CloInhibit <= 10:
 			'<font color="blue">This uniform is very conservative. Only the nerds would approve of you wearing it.</font>'
 		elseif CloSkirt < 5 and CloThinness < 5 and CloBra = 0:

locations/clothing_attributes.qsrc

@@ -5,7 +5,7 @@
 !!		Notes: 1-3 are general purpose clothing, 4-7 are self-explanatory, 8 is fetish wear, latex and leather. 9 is extreme clothing that exposes your body and likely to get you arrested . 10 is waitress, maid and stripper uniforms. 13 is for burlesque shows or a bordello
 !! CloStyle: 1 Girlie, 2 Rebel, 3 Wealthy, 4 Prostitute, 5 is Loose fit
 !!		Notes: 1 is clothing themed to give the impression of innocence of youth. 2 is for stereotypical punks; ripped clothing, leather jackets, etc. 3 gives the impression that theyre debutanttes or rich at first glance. 4 is stuff worn by prostitutes. 5 is formless clothing that doesn''t requiring refitting.
-!! CloStyle2: 1 Maid, 2 Server, 3 Stripper
+!! CloStyle2: 1 Maid, 2 Server, 3 Stripper, 4 School
 !!		Notes: Used to distinguish between the main types of uniform.
 !! CloInhibit: 0-100 Inhibition value required to wear the outfit
 !!

locations/dateF.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 	*clr & cla
 
 	!!1) Sveta in a school uniform
-	if clothingworntype = 'school':
+	if PCloStyle2 = 4:
 		'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
 		'As she nears you, she presents herself; "Hi. My name is <<$boydesc>>. What are you doing here all by yourself?"'

locations/dateM.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 	gs 'boy'
 	
 !!1) Sveta in a school uniform
-	if clothingworntype = 'school':
+	if PCloStyle2 = 4:
 		'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. He is wearing <<$boyClo>>.'
 		'As he nears you, he presents himself; "Hi. My name is <<$boydesc>>. What are you doing here all by yourself?"'

locations/gschool_grounds.qsrc

@@ -116,7 +116,7 @@ if $ARGS[0] = 'main':
 !!	act 'Go to the Principals Office': gt
 
 	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and schoolBlock = 0:
-		if $clothingworntype = 'school' or Enable_sforma = 1:
+		if PCloStyle2 = 4 or Enable_sforma = 1:
 			if hour = 6:
 				if minut < 30:
 					'It''s too early for school now.'

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 $clothingworntype = 'school':
+if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and PCloStyle2 = 4:
 	*nl
 	'Go pick up <a href="exec:gt ''natbelEv'', ''carrybooks''">Natasha</a> before school.'
 end

locations/placer_sex.qsrc

@@ -1819,7 +1819,7 @@ if $ARGS[0] = 'sitting_park_bench':
 	else
 		cla
 		*clr
-		if $clothingworntype = 'school':
+		if PCloStyle2 = 4:
 			iif(rand(0,1)=1,'<center><img <<$set_imgh>> src="images/locations/shared/park/bench_5.jpg"></center>','<center><img <<$set_imgh>> src="images/locations/shared/park/bench_6.jpg"></center>')
 			!I think the original one is better then this...anyway, Lets random.
 		elseif PCloSkirt > 0:
@@ -1860,7 +1860,7 @@ if $ARGS[0] = 'sleeping_park_bench':
 	InSleep = 0
 
 	!Hoping these were not that wrong. by illume
-	if $clothingworntype = 'school':
+	if PCloStyle2 = 4:
 		'<center><img <<$set_imgh>> src="images/locations/shared/park/sleeping_park_form.jpg"></center>'
 	elseif PCloSkirt > 0:
 		'<center><img <<$set_imgh>> src="images/locations/shared/park/sleeping_park_dress.jpg"></center>'
@@ -1878,7 +1878,7 @@ if $ARGS[0] = 'sleeping_park_bench':
 	act 'Wake up':
 		cla & *clr
 		!Hoping these were not that wrong. by illume
-		if $clothingworntype = 'school':
+		if PCloStyle2 = 4:
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/sleeping_park1.jpg"></center>'
 			if $pantyworntype ! 'none':
 				gs 'underwear', 'dispose'

locations/saveupdater.qsrc

@@ -621,35 +621,45 @@ killvar 'natotrab'
 killvar 'natlesb'
 killvar 'natfuck'
 
-if fuckornot_update = 0:
-	fuckornot_update = 1
-	hotcat_rating['A22'] = 9
-	hotcat_rating['A17'] = 9
-	hotcat_rating['A23'] = 8
-	hotcat_rating['A144'] = 8
-	hotcat_rating['A19'] = 7
-	hotcat_rating['A18'] = 7
-	hotcat_rating['A14'] = 7
-	hotcat_rating['A12'] = 7
-	hotcat_rating['A140'] = 7
-	hotcat_rating['A141'] = 7
-	hotcat_rating['A15'] = 7
-	hotcat_rating['A143'] = 6
-	hotcat_rating['A13'] = 6
-	hotcat_rating['A16'] = 6
-	hotcat_rating['A25'] = 6
-	hotcat_rating['A139'] = 6
-	hotcat_rating['A20'] = 6
-	hotcat_rating['A21'] = 6
-	hotcat_rating['A24'] = 5
-	hotcat_rating['A142'] = 5
-	hotcat_rating['A145'] = 4
-elseif fuckornot_update = 1:
-	fuckornot_update = 2
-	hotcat_rating['A145'] = 4
-	hotcat_movement['A145'] = 0
-end
 
+if StoryLine = 1:
+
+	if fuckornot_update = 0:
+		fuckornot_update = 1
+		hotcat_rating['A22'] = 9
+		hotcat_rating['A17'] = 9
+		hotcat_rating['A23'] = 8
+		hotcat_rating['A144'] = 8
+		hotcat_rating['A19'] = 7
+		hotcat_rating['A18'] = 7
+		hotcat_rating['A14'] = 7
+		hotcat_rating['A12'] = 7
+		hotcat_rating['A140'] = 7
+		hotcat_rating['A141'] = 7
+		hotcat_rating['A15'] = 7
+		hotcat_rating['A143'] = 6
+		hotcat_rating['A13'] = 6
+		hotcat_rating['A16'] = 6
+		hotcat_rating['A25'] = 6
+		hotcat_rating['A139'] = 6
+		hotcat_rating['A20'] = 6
+		hotcat_rating['A21'] = 6
+		hotcat_rating['A24'] = 5
+		hotcat_rating['A142'] = 5
+		hotcat_rating['A145'] = 4
+	elseif fuckornot_update = 1:
+		fuckornot_update = 2
+		hotcat_rating['A145'] = 4
+		hotcat_movement['A145'] = 0
+	end
+
+	if grigoryEV ! 0:
+		npc_qw['A221'] = grigoryEV
+		killvar 'grigoryEV'
+	end
+
+	if SchoolAtestat = 0 and SchoolBlock = 0 and $schbrand = '':$schbrand = 'school'
+end
 
 if wombfather_update = 0: wombfather_update = 1 & gs 'din_bad'
 
@@ -679,11 +689,6 @@ if totalmon ! 0:
 	killvar 'mongiveback'
 end
 
-if grigoryEV ! 0:
-	npc_qw['A221'] = grigoryEV
-	killvar 'grigoryEV'
-end
-
 if cyc_update = 0:
 	cyc_update = 1
 	daylastperiod = firstmens
@@ -694,5 +699,6 @@ if cyc_update = 0:
 	end
 end
 
+
 --- saveupdater ---------------------------------
 

locations/stat_display.qsrc

@@ -550,7 +550,7 @@ elseif $clothingworntype = 'office':
 		$stat_clothes_tooltip = 'Normal office dress.'
 		$stat_clothes_style = 'office'
 	end
-elseif $clothingworntype = 'school':
+elseif PCloStyle2 = 4:
 	if PCloStyle = 4 and PCloBimbo = 1 and cheatBimbo = 0:
 		if enable_extra_msg = 1: $stat_msg += '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
 		$stat_clothes_msg = 'You''re wearing a school uniform a prostitute or bimbo would wear.'