[fixed] Default school uniform appearing multiple times in searches and changed starting outfits for CSB and TF starts so they can actually wear them

locations/clothing.qsrc

@@ -477,30 +477,30 @@ if $ARGS[0] = 'clothing_list':
 		end
 
 		i = 1
-		:loopcats_dress
-			if cats_dress[i] = 1 and ($clothingworntype ! 'cats_dress' or clothingwornnumber ! i):
-				gs 'clothing_attributes', 'cats_dress', i
+		:loopcats_outfits
+			if cats_outfits[i] = 1 and ($clothingworntype ! 'cats_outfits' or clothingwornnumber ! i):
+				gs 'clothing_attributes', 'cats_outfits', i
 				gs 'clothing_QV', 'clo_filter'
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0 and clothingfilter['swim_only'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'cats_dress', i)
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0 and clothingfilter['swim_only'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'cats_outfits', i)
 				end
 			end
 			i += 1
-		if i <= ARRSIZE('cats_dress'):jump 'loopcats_dress'
+		if i <= ARRSIZE('cats_outfits'):jump 'loopcats_outfits'
 
 		i = 1
-		:loopcats_outfits
-			if cats_outfits[i] = 1 and ($clothingworntype ! 'cats_outfits' or clothingwornnumber ! i):
-				gs 'clothing_attributes', 'cats_outfits', i
+		:loopcats_dress
+			if cats_dress[i] = 1 and ($clothingworntype ! 'cats_dress' or clothingwornnumber ! i):
+				gs 'clothing_attributes', 'cats_dress', i
 				gs 'clothing_QV', 'clo_filter'
 				!!sort by filter
 				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
-					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0 and clothingfilter['swim_only'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'cats_outfits', i)
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0 and clothingfilter['swim_only'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'cats_dress', i)
 				end
 			end
 			i += 1
-		if i <= ARRSIZE('cats_outfits'):jump 'loopcats_outfits'
+		if i <= ARRSIZE('cats_dress'):jump 'loopcats_dress'
 
 		if $args[1] ! 'all':
 			clo_i += 1

locations/clothing_QV.qsrc

@@ -265,8 +265,6 @@ if $ARGS[0] = 'clothing_list':
 			:loopgm_school_filter
 		end
 
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
-
 		i = 1
 		:loopschool
 		if gm_school[i] = 1:
@@ -275,14 +273,16 @@ if $ARGS[0] = 'clothing_list':
 			!!sort by filter
 			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
 				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0:
-					if CloInhibit <= pcs_inhib:
+					!! Default school uniform
+					if i = 6:
+						if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0: *p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
+					elseif CloInhibit <= pcs_inhib:
 						if gm_school_s[i] = 0 and gm_school_h[i] > 0 and gm_school_b[i] >= (pcs_hips - 8) and gm_school_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', <<i>>"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
 					end
 				end
 			end
 		end
 		i += 1
-		if i = 6: i = 7
 		if i <= ARRSIZE('gm_school'):jump 'loopschool'
 
 		if $args[1] ! 'all':

locations/preCUST.qsrc

@@ -426,30 +426,30 @@ if $ARGS[0] = 'Done':
 		pantywornnumber = 12
 		$braworntype = 'cheap'
 		brawornnumber = 12
-		danilovich_outfits[78] = 1
-		danilovich_outfits_h[78] = 100
+		danilovich_outfits[81] = 1
+		danilovich_outfits_h[81] = 100
 		danilovich_shoe[21] = 1
 		gm_shoe[9] = 1
 		shoewornnumber = 9
 		$shoeworntype = 'gm'
-		gm_outfits[7] = 1
-		gm_outfits_h[7] = 100
-		gm_outfits_b[7] = pcs_hips
+		gm_outfits[30] = 1
+		gm_outfits_h[30] = 100
+		gm_outfits_b[30] = pcs_hips
 		cats_dress[1] = 1
 		cats_dress_h[1] = 100
 		cats_dress_b[1] = pcs_hips
-		sportsclothingnumber = 78
+		sportsclothingnumber = 81
 		gs 'clothing', 'wear', 'cats_dress', 1
 	elseif pcs_inhib < 5:
-		gm_outfits[7] = 1
-		gm_outfits_h[7] = 100
-		gm_outfits_b[7] = pcs_hips
-		danilovich_outfits[86] = 1
-		danilovich_outfits_h[86] = 100
+		gm_outfits[30] = 1
+		gm_outfits_h[30] = 100
+		gm_outfits_b[30] = pcs_hips
+		danilovich_outfits[81] = 1
+		danilovich_outfits_h[81] = 100
 		cats_dress[1] = 1
 		cats_dress_h[1] = 100
 		cats_dress_b[1] = pcs_hips
-		sportsclothingnumber = 86
+		sportsclothingnumber = 81
 		gs 'clothing', 'wear', 'cats_dress', 1
 	elseif pcs_inhib < 10:
 		gm_outfits[15] = 1