[changed] Default school uniform still had some of old system where it just changed the clothes and not the rest of outfit based on last worn uniform. Now uses and merged with sports with option to change in to it everywhere sports option is seeded.

locations/ballet_secrets.qsrc

@@ -172,7 +172,7 @@ if $ARGS[0] = 'changing_room':
 		gt 'wardrobe', 'start'
 	end
 
-	gs 'wardrobe', 'default_sport_options'
+	gs 'wardrobe', 'default_clothing_options'
 
 	if mc_inventory['deodorant'] > 0 and deodorant_on = 0:
 		'Your deodorant will last you for <b><<mc_inventory[''deodorant'']>></b> more '+iif(mc_inventory['deodorant'] =	1, 'application.', 'applications.')

locations/bedrPar.qsrc

@@ -238,7 +238,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 			if locat['Anya_inroom'] = 0: dynamic $palelady
 			
-			gs 'wardrobe', 'default_sport_options'
+			gs 'wardrobe', 'default_clothing_options'
 			
 			gs 'exercise', 'start'
 

locations/city_house_res_misc.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = 'backy':
 				*nl
 				'You can do some exercises here.'
 
-				gs 'wardrobe', 'default_sport_options'
+				gs 'wardrobe', 'default_clothing_options'
 
 				act 'Exercise': gt 'exercise', 'workout'
 			else

locations/city_mansion_residence_3.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'ygym':
 	if ymanrem[11] = 2:
 		'Your private gym with all the necessities to live a healthy life. From here you can walk over to the pool or relax in the sauna.'
 
-		gs 'wardrobe', 'default_sport_options'
+		gs 'wardrobe', 'default_clothing_options'
 
 		gs 'exercise', 'start'
 	end

locations/clothing.qsrc

@@ -1774,11 +1774,6 @@ if $ARGS[0] = 'strip':
 	cumspclnt = 6
 	gs 'cum_cleanup'
 
-	if PCloStyle2 = 4:
-		$schbrand = $clothingworntype
-		schtype = clothingwornnumber
-	end
-
 	if $strip_loc ! '' :
 		DYNAMIC '$CloLos<<$clothingworntype>>[<<clothingwornnumber>>]=<<$strip_loc>>'
 		$CloLosLoc[] = $strip_loc
@@ -1891,11 +1886,6 @@ 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/fit.qsrc

@@ -144,7 +144,7 @@ if $ARGS[0] = 'dressing_room':
 		gt 'wardrobe', 'start'
 	end
 
-	gs 'wardrobe', 'default_sport_options'
+	gs 'wardrobe', 'default_clothing_options'
 
 	if (pcs_makeup = 1 or cosmetic_tattoo > 0) and PCloswimwear = 1:
 		act 'Use the pool': gs 'shoes', 'strip' & gt 'bass', 'start'

locations/gdksport.qsrc

@@ -64,7 +64,7 @@ if $ARGS[0] = 'start':
 		gt 'wardrobe', 'start'
 	end
 
-	gs 'wardrobe', 'default_sport_options'
+	gs 'wardrobe', 'default_clothing_options'
 
 	if mc_inventory['shampoo'] > 0 or (mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0)):
 		act 'Take a shower': gt 'gdksport', 'shower'

locations/gschool_grounds.qsrc

@@ -779,7 +779,7 @@ if $ARGS[0] = 'change_room':
 		gt 'wardrobe', 'start'
 	end
 
-	gs 'wardrobe', 'default_sport_options'
+	gs 'wardrobe', 'default_clothing_options'
 
 	dynamic $publicpan, 'no_prost'
 	act 'Look in the mirror': gt 'mirror', 'start'

locations/hotel_anna.qsrc

@@ -30,9 +30,9 @@ if $ARGS[0] = 'meeting':
 		gt 'hotel_anna', 7
 	elseif IgorevnaBDSM = 12:
 		gt 'hotel_anna', 8
-	elseif IgorevnaBDSM > 13:
+	elseif IgorevnaBDSM = 13:
 		gt 'hotel_anna', 9
-	elseif IgorevnaBDSM > 14:
+	elseif IgorevnaBDSM >= 14:
 		gt 'hotel_anna', 10
 	end
 end
@@ -718,19 +718,28 @@ if ARGS[0] = 7:
 	IgorevnaBDSM += 1
 	AnnaQW['trust'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract10.jpg"></center>'
-	'You knock at Anna''s door for your weekly visit....<font color = #DC143C>"Hi Anna!..."</font><br><font color = blue>"<<$pcs_nickname>> move...move...it''s started!"</font> You have no time to realize that you are dragged by Anna in the main room.... <font color = #DC143C>"Emmmh....Hi Anna!..."</font><br><font color = blue>"Oh sorry! Hi <<$pcs_nickname>>, take a seat...I''m watching a film and I don''t want to miss a scene...but we can chit-chat of course... . Awww...she''s pretty...but...nothing more than the bush?...Awwww"</font><br><font color = #DC143C>"...Uh?..."</font> You notice on the screen that there''s a girl on the bed and a man that slowly pulls her panties down approaching her intimate zone; despite the scene and what is probably the genre of the film you are looking with Anna it''s seems a "normal" evening between real friends...and this is really strange with Anna.<br><font color = #DC143C>"...Is this a...porno? Anna!...He''s going to...uh? No...it''s cut..."</font><br><font color = blue>"...Hell...I''m really disappointed too...a porno is more realistic without any bet. No it''s a "famous" American film about BDSM...and I''m quite happy I didn''t pay for it at the moment... . But I understand if you don''t want to look at it: let''s settle this way: since this is probably boring for you why don''t you look for some of my clothes? You can try what I have on the bed...I''ll take something to drink in the meantime..."</font>'
-
-	act'Mmmm....ok let me check if something will catch my attention...':
+	'You knock at Anna''s door for your weekly visit. "Hi Anna!"'
+	'"<<$pcs_nickname>> Move, move...it''s started!" You have no time to realize that you are dragged by Anna in the main room.'
+	'"Err... Hi Anna!"'
+	'"Oh sorry! Hi <<$pcs_nickname>>, take a seat. I''m watching a film and its just getting to the good bit, come in we can still talk."'
+	'"Awww, she''s pretty but too much bush can''t see anything." The scene is of a woman on the bed and a man slowly pulling her panties down showing her pubes but it cuts away before you see her pussy.'
+	'Despite the scene and the genre of the film for that matter, it seems a "normal" evening between real friends. This feels really strange with Anna. "Is this a porno?"'
+	'"A porno would be more realistic. No it''s a "famous" American film about BDSM and I''m quite happy I didn''t pay for it. I know let''s have a little fun Sweetie, why don''t you try on an outfit from these on the bed. I''m trying to find something for a female friend and you are about the same size. I''ll get a drink in the meantime, this film is trash." She turns the TV off and walks over to the mini bar which you notice has several large bottles of liquor in it.'
+
+	act'Sure, sounds fun':
 		*clr & cla
 		IgorevnaBDSM_hooble_examine = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapracttable.jpg"></center>'
-		'<font color = #DC143C>"... ''...that''s quite unexpected...''..."</font> This seems to be a "normal" evening between friends for real; maybe Anna is reverting back to a "normal" lifestyle...or maybe she finished to teach you something useful. You aren''t sure about that but the fact that for once she''s totally dressed too leave you with no words... . ...And you went into her rooms to try some clothes...maybe you can skip it and go to see if she''s ok...it''s rather strange considering what you have discussed with Anna since you first encounter...or you can go after you put on some dress...."'
+		'It''s no quite what you expected, it seems to be a "normal" evening between friends for real. Maybe Anna has finished teaching you and the last lesson was your final test?'
+		'Then you get to the bed and see the two options. "This friend of yours, she wouldn''t happen to be a client?" You ask.'
+		'Anna laughs, "You are very sharp Sweetie, I can get nothing past you."'
+		'There are two leather dresses in front of you one is red the other black and they look heavy. maybe you can skip it and go to see if she''s ok...it''s rather strange considering what you have discussed with Anna since you first encounter...or you can go after you put on some dress...."'
 		act'Red hooble skirt':
 			*clr & cla
 			IgorevnaBDSM_hooble_red = 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/items/eroto/dress/5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/items/eroto/dress/4.jpg"></center>'
 			'<font color = #DC143C>"... ''...Ok this one...''..."</font> You try the dress as fast as you can; it''s easy to wear at the beginning, but when you have to close it it became very tight, and your legs are strictly closed together that you cannot made wide steps to walk. Despite the difficulty about wearing this dress it seems really classy...maybe it''s a party dress... . You decide to move towards Anna.'
 			act 'Go to the main room': gt'hotel_anna_sex','dresscontest'
 		end
@@ -738,7 +747,7 @@ if ARGS[0] = 7:
 			*clr & cla
 			IgorevnaBDSM_hooble_black = 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/items/eroto/dress/67.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/items/eroto/dress/26.jpg"></center>'
 			'<font color = #DC143C>"... ''...Ok this one...''..."</font> You try the dress as fast as you can; it''s easy to wear at the beginning, but when you have to close it it became very tight, and your legs are strictly closed together that you cannot made wide steps to walk. Despite the difficulty about wearing this dress it''s seems really classy...maybe it''s a party dress... . You decide to move towards Anna'
 			act 'Go to the main room': gt'hotel_anna_sex','dresscontest'
 		end
@@ -756,9 +765,17 @@ if ARGS[0] = 7:
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract10a.jpg"></center>'
-		'<font color = blue>"Uh? Of course not...you are here for our chit-chat. Wait me for a sec I''ll bring something to drink"</font><br><font color = #DC143C>"I can go for you..."</font><br><font color = blue>"No way! You are the guest...don''t worry I''ll be here in no time, I don''t want to miss a scene...oh! Just if something happens tell me, I quite doubt about that but you never know..."</font>'
-
-		act 'Listen': gt'hotel_anna_sex','dresscontest'
+		'"Of course not, you are here for our chit-chat. Wait a sec I''ll get us both a drink"'
+		'"I can help."'
+		'"No way! You are my guest." She insists as she makes 2 cocktails. You don''t see exactly what she puts in them except for a large measure of Vodka.'
+		'The two of you sit and chat as she explains about presentation in the BDSM world and how important clothing is. She goes into great detail about restrictive clothing for submissives and how the outfits she is currently trying to decide upon are hobble dresses which make it harder to walk and about corsetry and exposure.'
+		'"Like that stupid movie, if I had a pretty submissive like that I''d make sure she was neatly groomed and naked as much as possible."'
+		'This makes you curious and you ask her if she is gay.'
+		'"Oh no, it is not that. I find pretty women attractive but I have a daughter and I had a lot of fun making her." She laughs at her own joke." In our community it is very common for sex and sexuality to be secondary to the activity. After all a woman can spit on you and whip your pussy just as well as (if not better than) a man."'
+		'This makes sense of course but you are glad you are not trying to explain it to someone like your Mother.'
+		'After sometime and a couple of drinks Anna once more ushers you out as her client is due to arrive.'
+
+		act 'Leave': gt 'pav_hotel'
 	end
 end
 

locations/sitr.qsrc

@@ -54,7 +54,7 @@ if mc_inventory['book_yoga'] > 0: 'Your yoga mat is rolled up in a corner.'
 !gs'husb' - do not delete!
 gs'subkid'
 
-gs 'wardrobe', 'default_sport_options'
+gs 'wardrobe', 'default_clothing_options'
 
 gs 'exercise', 'start'
 

locations/wardrobe.qsrc

@@ -881,6 +881,9 @@ if $ARGS[0] = 'default_entry_delete':
     if default_sport_number = i: 
 		default_sport_number = 0
 	end
+    if default_school_number = i: 
+		default_school_number = 0
+	end
 	gt 'wardrobe', $wloc
 end
 
@@ -897,70 +900,98 @@ if $ARGS[0] = 'default_school_set':
 end
 
 if $ARGS[0] = 'school_outfit':
-	! if they have worn a uniform recently we will use that rather than the one in the outfit
+	! if no outfit set in wardrobe they use the default
 	if default_school_number = 0:	
-		clothingwornnumber = schtype
-		$clothingworntype = $schbrand
-		gs  'wardrobe', 'school_outfit_end'
+		gs 'clothing', 'wear', 'gm_school', 6
+		gs 'panties', 'wear', $lastwornpantytype['bed'], lastwornpantynumber['bed']
+		gs 'bras', 'wear', $lastwornbratype['bed'], lastwornbranumber['bed']
+		if $bed['shoetype'] ! 'none':
+			gs 'shoes', 'wear', $bed['shoetype'], bed['shoenumber']
+		end
 	else
 		gs  'wardrobe', 'default_entry_wear', default_school_number
 	end
 end
 
-if $ARGS[0] = 'school_outfit_end':
-	! 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 = 'gm_school'
-	end
-	gs 'clothing', 'wear', $schbrand, schtype
-	gs 'panties', 'wear', $lastwornpantytype['bed'], lastwornpantynumber['bed']
-	gs 'bras', 'wear', $lastwornbratype['bed'], lastwornbranumber['bed']
-	if $bed['shoetype'] ! 'none':
-		gs 'shoes', 'wear', $bed['shoetype'], bed['shoenumber']
-	end
-end
-
-if $ARGS[0] = 'default_sport_options':
-	if default_sport_number = 0:
-		'You have no default sports clothing set, you can set this in your wardrobe.'
+if $ARGS[0] = 'default_clothing_options':
+	if default_sport_number = 0: 'You have no default sports clothing set, you can set this in your wardrobe.'
+	if default_school_number = 0: 'You have no default school uniform set, you can set this in your wardrobe.'
+
+	!!checks to see if either full outfit is currently being worn
+	gs 'wardrobe', 'is_school'
+	gs 'wardrobe', 'is_sport'
+	if default_sport_number[2] = 5 or default_school_number[2] = 5:
+		act 'Change into your regular clothes':
+			gs 'wardrobe', 'back_to_regular_clothes'
+			if func('prostitution_functions', 'is_default') ! 0: gs 'wardrobe', 'back_to_regular_clothes'
+			gt $loc, $loc_arg
+		end
 	else
-		gs 'wardrobe', 'is_sport'
-		!! check to see if sports outfit is worn out
-		if dyneval('RESULT = <<$defclothingtype[default_sport_number]>>_h[<<defclothingnumber[default_sport_number]>>]') <= 0:
-			act 'Put on your sports clothes': msg '<font color="red">Unavailable as outfit is worn out!</font>'
-		!! check to see that player is not wearing default sports outfit
-		elseif default_sport_number[2] ! 5:
-			act 'Put on your sports clothes':
-				if func('prostitution_functions', 'is_default') ! 0: gs 'wardrobe', 'back_to_regular_clothes'
-				
-				$lastwornclothingtype['sport'] = $clothingworntype
-				lastwornclothingnumber['sport'] = clothingwornnumber
-				lastwornunderwear['sport'] = 0
-				if underwear['type'] = 2:
-					lastwornunderwear['sport'] = 2
-					$lastwornbodysuittype['sport'] = $bodysuitworntype
-					lastwornbodysuitnumber['sport'] = bodysuitwornnumber
-				else
-					$lastwornpantytype['sport'] = $pantyworntype
-					lastwornpantynumber['sport'] = pantywornnumber
-					$lastwornbratype['sport'] = $braworntype
-					lastwornbranumber['sport'] = brawornnumber
+		if default_sport_number ! 0:
+			!! check to see if sports outfit is worn out
+			if dyneval('RESULT = <<$defclothingtype[default_sport_number]>>_h[<<defclothingnumber[default_sport_number]>>]') <= 0:
+				act 'Put on your sports clothes': msg '<font color="red">Unavailable as outfit is worn out!</font>'
+			!! check to see that player is not wearing default sports outfit
+			elseif default_sport_number[2] ! 5:
+				act 'Put on your sports clothes':
+					if func('prostitution_functions', 'is_default') ! 0: gs 'wardrobe', 'back_to_regular_clothes'
+					
+					$lastwornclothingtype['sport'] = $clothingworntype
+					lastwornclothingnumber['sport'] = clothingwornnumber
+					lastwornunderwear['sport'] = 0
+					if underwear['type'] = 2:
+						lastwornunderwear['sport'] = 2
+						$lastwornbodysuittype['sport'] = $bodysuitworntype
+						lastwornbodysuitnumber['sport'] = bodysuitwornnumber
+					else
+						$lastwornpantytype['sport'] = $pantyworntype
+						lastwornpantynumber['sport'] = pantywornnumber
+						$lastwornbratype['sport'] = $braworntype
+						lastwornbranumber['sport'] = brawornnumber
+					end
+					$lastwornshoetype['sport'] = $shoeworntype
+					lastwornshoenumber['sport'] = shoewornnumber
+					$lastwornpursetype['sport'] = $currentpursetype
+					lastwornpursenumber['sport'] = currentpursenumber
+					$lastworncoattype['sport'] = $coatworntype
+					lastworncoatnumber['sport'] = coatwornnumber
+					gs  'wardrobe', 'default_entry_wear', default_sport_number
+					gt $loc, $loc_arg
 				end
-				$lastwornshoetype['sport'] = $shoeworntype
-				lastwornshoenumber['sport'] = shoewornnumber
-				$lastwornpursetype['sport'] = $currentpursetype
-				lastwornpursenumber['sport'] = currentpursenumber
-				$lastworncoattype['sport'] = $coatworntype
-				lastworncoatnumber['sport'] = coatwornnumber
-      			gs  'wardrobe', 'default_entry_wear', default_sport_number
-				gt $loc, $loc_arg
 			end
-		else
-			act 'Change into your regular clothes':
-				gs 'wardrobe', 'back_to_regular_clothes'
-				if func('prostitution_functions', 'is_default') ! 0: gs 'wardrobe', 'back_to_regular_clothes'
-				gt $loc, $loc_arg
+		end
+
+		if (default_school_number ! 0 and SchoolAtestat = 0):
+			!! check to see if schools outfit is worn out
+			if dyneval('RESULT = <<$defclothingtype[default_school_number]>>_h[<<defclothingnumber[default_school_number]>>]') <= 0:
+				act 'Put on your school uniform': msg '<font color="red">Unavailable as outfit is worn out!</font>'
+			!! check to see that player is not wearing default schools outfit
+			elseif default_school_number[2] ! 5:
+				act 'Put on your school uniform':
+					if func('prostitution_functions', 'is_default') ! 0: gs 'wardrobe', 'back_to_regular_clothes'
+					
+					$lastwornclothingtype['school'] = $clothingworntype
+					lastwornclothingnumber['school'] = clothingwornnumber
+					lastwornunderwear['school'] = 0
+					if underwear['type'] = 2:
+						lastwornunderwear['school'] = 2
+						$lastwornbodysuittype['school'] = $bodysuitworntype
+						lastwornbodysuitnumber['school'] = bodysuitwornnumber
+					else
+						$lastwornpantytype['school'] = $pantyworntype
+						lastwornpantynumber['school'] = pantywornnumber
+						$lastwornbratype['school'] = $braworntype
+						lastwornbranumber['school'] = brawornnumber
+					end
+					$lastwornshoetype['school'] = $shoeworntype
+					lastwornshoenumber['school'] = shoewornnumber
+					$lastwornpursetype['school'] = $currentpursetype
+					lastwornpursenumber['school'] = currentpursenumber
+					$lastworncoattype['school'] = $coatworntype
+					lastworncoatnumber['school'] = coatwornnumber
+					gs  'wardrobe', 'default_entry_wear', default_school_number
+					gt $loc, $loc_arg
+				end
 			end
 		end
 	end
@@ -980,6 +1011,22 @@ if $ARGS[0] = 'is_sport':
 	if $coatworntype = $defcoattype[default_sport_number] and coatwornnumber = defcoatnumber[default_sport_number]: default_sport_number[2] += 1
 end
 
+
+
+if $ARGS[0] = 'is_school':
+	!! checks to see if player is wearing the default school set using default_school_number[2]
+	default_school_number[2] = 0
+	if $clothingworntype = $defclothingtype[default_school_number] and clothingwornnumber = defclothingnumber[default_school_number]: default_school_number[2] += 1
+	if defunderwear[default_school_number] = 2:
+		if $bodysuitworntype = $defbodysuittype[default_school_number] and bodysuitwornnumber = defbodysuitnumber[default_school_number]: default_school_number[2] += 1
+	else
+		if $pantyworntype = $defpantytype[default_school_number] and pantywornnumber = defpantynumber[default_school_number] and $braworntype = $defbratype[default_school_number] and brawornnumber = defbranumber[default_school_number]: default_school_number[2] += 1
+	end
+	if $shoeworntype = $defshoetype[default_school_number] and shoewornnumber = defshoenumber[default_school_number]: default_school_number[2] += 1
+	if $currentpursetype = $defpursetype[default_school_number] and currentpursenumber = defpursenumber[default_school_number]: default_school_number[2] += 1
+	if $coatworntype = $defcoattype[default_school_number] and coatwornnumber = defcoatnumber[default_school_number]: default_school_number[2] += 1
+end
+
 if $ARGS[0] = 'back_to_regular_clothes':
 
 	!! wearing prostitute outfit
@@ -1032,6 +1079,30 @@ if $ARGS[0] = 'back_to_regular_clothes':
 		end
 
 		default_sport_number[2] = 0
+
+	!! wearing school uniform
+	elseif default_school_number[2] >= 5:
+		if $lastwornclothingtype['school'] = '':
+			gs 'clothing', 'wear_last_worn'
+			gs 'underwear', 'wear', 'wear_last_worn'
+			gs 'shoes', 'wear', 'last_worn'
+			gs 'purses', 'wear', 'last_worn'
+			gs 'coats', 'wear', 'last_worn'
+		else
+			gs 'clothing', 'wear', $lastwornclothingtype['school'], lastwornclothingnumber['school']
+
+			if lastwornunderwear['school'] = 2:
+				gs 'underwear_bodysuits', 'wear', $lastwornbodysuittype['school'], lastwornbodysuitnumber['school']
+			else
+				gs 'panties', 'wear', $lastwornpantytype['school'], lastwornpantynumber['school']
+				gs 'bras',    'wear', $lastwornbratype['school'],   lastwornbranumber['school']
+			end
+			gs 'shoes',  'wear', $lastwornshoetype['school'],  lastwornshoenumber['school']
+			gs 'purses', 'wear', $lastwornpursetype['school'], lastwornpursenumber['school']
+			gs 'coats',  'wear', $lastworncoattype['school'],  lastworncoatnumber['school']
+		end
+
+		default_school_number[2] = 0
 	end
 end