Merge remote-tracking branch 'Philo/master'

locations/bed2.qsrc

@@ -470,15 +470,7 @@ if $ARGS[0] = 'wake':
 		end
 		act 'Get out of bed and get dressed for school (0:15)':
 			minut += 15
-			if schtype = 0:
-				$schbrand = 'school'
-				schtype = 6
-			end
-			if schoolH[schtype] = 0:
-				$schbrand = 'school'
-				schtype = 6
-			end
-			gs 'clothing', 'wear', $schbrand, schtype
+			gs 'wardrobe', 'school_outfit'
 			gs 'bed2', 'end'
 		end
 	end
@@ -501,15 +493,7 @@ if $ARGS[0] = 'wake':
 			act 'Full morning routine for School (01:00)':
 				fullmorrout = 1
 				minut += 15
-				if schtype = 0:
-					$schbrand = 'school'
-					schtype = 6
-				end
-				if schoolH[schtype] = 0:
-					$schbrand = 'school'
-					schtype = 6
-				end
-				gs 'clothing', 'wear', 'school', schtype
+				gs 'wardrobe', 'school_outfit'
 				gs 'bed2', 'end'
 			end
 		end

locations/sitrPar.qsrc

@@ -75,15 +75,7 @@ if $ARGS[0] = '':
 				'As you walk into the living room you see your mother sweeping the floor. She looks up at and gives you a disappointed look. "What are you still doing home? Go to school, now!" With that she practically pushes you out of the apartment and closes the door. As she does she adds ones more. "Go to school."' 
 				act 'Continue': gt'pod_ezd','etaj_2'
 			else
-				if schtype = 0:
-					$schbrand = 'school'
-					schtype = 6
-				end
-				if schoolH[schtype] = 0:
-					$schbrand = 'school'
-					schtype = 6
-				end
-				gs 'clothing', 'wear', $schbrand, schtype
+				gs 'wardrobe', 'school_outfit'
 				'As you walk into the living room you see your mother sweeping the floor. She looks up at and gives you a disappointed look. "What are you still doing home? Why are you not wearing your unifrom? Go get changed and go to school, now!" She follows you back to your room and watches as you change into your uniform, after that she practically pushes you out of the apartment and closes the door. As she does she adds ones more. "Go to school."' 
 				act 'Continue':  gt'pod_ezd','etaj_2'
 			end

locations/wardrobe.qsrc

@@ -422,5 +422,31 @@ if $ARGS[0] = 'sports_outfit':
 		act 'Change into: <<$sports_clothing_name>>': gs 'wardrobe', 'sports_entry_wear'
 	end
 end
+
+if $ARGS[0] = 'school_outfit':
+	if ARRSIZE('defclothingnumber') > 0:
+		SchoolOutfitLoop = 0
+		:FindSchoolOutfit
+		gs 'clothing_attributes', $defclothingtype[SchoolOutfitLoop], defclothingnumber[SchoolOutfitLoop]
+		if CloStyle2 = 4:
+			gs 'wardrobe', 'default_entry_wear', SchoolOutfitLoop
+			if schtype = 0:	
+				schtype = clothingwornnumber
+				$schbrand = $clothingworntype
+			end
+			jump 'FoundSchoolOutfit'
+		end 
+		SchoolOutfitLoop += 1
+		if SchoolOutfitLoop < ARRSIZE('defclothingnumber'):jump 'FindSchoolOutfit'
+		:FoundSchoolOutfit
+		killvar 'SchoolOutfitLoop'
+	end
+	if schtype = 0 or schoolH[schtype] = 0:
+		schtype = 6
+		$schbrand = 'school'
+	end
+	gs 'clothing', 'wear', $schbrand, schtype
+end
+
 --- wardrobe ---------------------------------