Merge remote-tracking branch 'upstream/master' into ML-DEV

locations/AlbStars.qsrc

@@ -235,6 +235,7 @@ if $ARGS[0] = 'albina5':
 					gs 'stat'
 					'"You...mean...I''m a...Starlet?" you ask as you continue panting.'
 					'"Well of course you are! I can''t let someone as good as you go to waste on these amateurs. We practice every day, so don''t be late!" Albina replies.'
+					AlbinaQW['StarletsJoined'] = 1
 					!! If Sveta is virgin
 					if pcs_vag = 0 and stat['vaginal'] = 0:
 						'When the other girls leave, Albina pulls you aside. "Hey, are you ''pure''?" she whispers.'

locations/NikoEv2.qsrc

@@ -1025,7 +1025,7 @@ if $ARGS[0] = 'Diner 2':
 			NikoSlut = 2
 			minut += 5
 			gs'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/patrons.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/patrons.jpg"></center>'
 			'As soon as you both enter the diner, all of the patrons turn to you then start happily greeting you.'
 			'Biker1: "Hey girl, glad to see you back."'
 			'Trucker1: "You''re lookin'' good girl."'

locations/NikoSlut.qsrc

@@ -134,7 +134,7 @@ if $ARGS[0] = 'Customer 1':
 				act 'Continue':
 					*clr & cla
 					gs'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/Home/bedroom/cum/cum3.mp4"></video></center>'	
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum3.mp4"></video></center>'	
 					'The man suddenly groans and you feel his hard penis throbbing inside you, filling up your womb with his warm seed.'
 					'The man looks you in the eyes and says, "Thank you so much <<$NikoSlutName>>. You are such a perfect girl and I would gladly pay you every day, for your services." The man puts his pants on then walks out of the restroom as you follow behind.'
 					gs 'cum_call', '', 'Biker'

locations/clothing.qsrc

@@ -808,6 +808,11 @@ if $ARGS[0] = 'wear':
 
 	dynamic '<<$ARGS[1]>>S[<<ARGS[2]>>] = 0'
 
+	if CloStyle2 = 4:
+		$schbrand = $clothingworntype
+		schtype = clothingwornnumber
+	end
+
 	PCloQuality = CloQuality
 	PCloThinness = CloThinness
 	PCloTopCut = CloTopCut

locations/wardrobe.qsrc

@@ -424,13 +424,25 @@ if $ARGS[0] = 'sports_outfit':
 end
 
 if $ARGS[0] = 'school_outfit':
+	! check to see if player has created a school uniform outfit
 	if ARRSIZE('defclothingnumber') > 0:
 		SchoolOutfitLoop = 0
 		:FindSchoolOutfit
 		gs 'clothing_attributes', $defclothingtype[SchoolOutfitLoop], defclothingnumber[SchoolOutfitLoop]
+		! found an outfit that includes a school uniform
 		if CloStyle2 = 4:
+			tempSchtype = 0
+			! if they have worn a uniform recently we will use that rather than the one in the outfit
+			if schtype <> 0:	
+				tempSchtype = schtype
+				$tempSchbrand = $schbrand
+			end
+			! put the outfit on
 			gs 'wardrobe', 'default_entry_wear', SchoolOutfitLoop
-			if schtype = 0:	
+			!over ride the uniform with the most recent one used if there was one
+			if tempSchtype <> 0:	
+				clothingwornnumber = tempSchtype
+				$clothingworntype = $tempSchbrand
 				schtype = clothingwornnumber
 				$schbrand = $clothingworntype
 			end
@@ -440,8 +452,12 @@ if $ARGS[0] = 'school_outfit':
 		if SchoolOutfitLoop < ARRSIZE('defclothingnumber'):jump 'FindSchoolOutfit'
 		:FoundSchoolOutfit
 		killvar 'SchoolOutfitLoop'
+		killvar 'tempSchtype'
+		killvar '$tempSchbrand'
 	end
-	if schtype = 0 or schoolH[schtype] = 0:
+
+	! if no uniform found or the one selected is worn out, use the default one
+	if schtype = 0 or dyneval('RESULT = <<$schbrand>>H[<<schtype>>]') <= 0:
 		schtype = 6
 		$schbrand = 'school'
 	end