Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/ballet_secrets.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'init':
   else
     'You look at the shop window and realise it''s closed, there is a security door to the left of you that allows you access the studio areas if you are a member.'
     if balletqw['membership'] >= daystart:
-      act 'Swipe membership card': gt $loc, 'membership'
+      act 'Swipe membership card': gt $loc, 'reception'
     end
   end
 

locations/exhibitionistshop.qsrc

@@ -141,7 +141,7 @@ if $ARGS[0] = 'ksenya_shop':
             '"You are the closest thing I have to a friend, and I want you to be my girlfriend" she repeats.'
             act 'Sure':
                 *clr & cla
-                '<center><video autoplay loop src="images/character/pushkin/ksenya/shop5.mp4"></video></center>'
+                '<center><video autoplay loop src="images/shared/sex/kiss/kiss_lips.mp4"></video></center>'
                 'She walks over to you and gives you a gentle hug. She moves a hand to your hair and moves it behind your ear before leaning in and kissing you. The kiss lingers for a bit before she pulls back. Before anything can be done further, a knock is heard on her office door and a voice says. "Miss?! You''re needed in the store."'
                 '"Be right there" she says and turns back to you. "I''ll see you later" she says and her hand slowly rubs your cheek as she walks away from you, leaving you alone in her office. After you collect your bearings, you leave and see her arguing with a customer as you exit the store.'
                 act 'Leave the store': gt 'pushkin_sq'

locations/kendra.qsrc

@@ -242,7 +242,7 @@ if $ARGS[0] = 'kendra_room_9':
 	'Once inside, she leads you over to her bed and commands you to strip.'
 	'"Yes, mistress." You start stripping as she opens the night stand and pulls out a collar that she tightly buckles it around your neck, making it a little hard for you to breathe. With the collar firmly in place, she pulls out a leash and attaches it to the collar before pushing you down. "Get down on all fours like a good slave."'
 	*nl
-	'You get down on your hands and knees and she leads you around the room for a few minutes before she grabs a bowl and fills it with water. She places it down in front of you as she sits on the couch and starts texting on her phone. "Drink!" You start lapping up the water as best you can bnefore sitting quietly until she notices you.'
+	'You get down on your hands and knees and she leads you around the room for a few minutes before she grabs a bowl and fills it with water. She places it down in front of you as she sits on the couch and starts texting on her phone. "Drink!" You start lapping up the water as best you can before sitting quietly until she notices you.'
 	'After a while, she finally points to the door. "You can go now slave, but put your collar and leash away first."'
 	'"Yes, mistress." You stand up and take off the collar and leash before walking over and putting them back in the drawer where they belong. You then walk over to the door and leave.'
 	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'inhibition'

locations/pav_lake.qsrc

@@ -704,23 +704,23 @@ end
 if $ARGS[0] = 'klake':
     *clr & cla
 	KsenyaQW = 2
-    '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/KLake2.jpg"></center>'
+    '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/lake2.jpg"></center>'
     'As you head to the lake you see a figure walking around the water. It''s Ksenya. She is in a black negligee and nothing else. You walk up to her and see her mother taking pictures of her. You stand back for a bit watching her work.'
     act 'Continue':
         *clr & cla
-        '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/KLake1.jpg"></center>'
+        '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/lake1.jpg"></center>'
         'You watch her for some time and you see her lift the back side of her outfit and her panties drop to the sand. You hear her mother say something and she turns around.'
         act 'Continue':
             *clr & cla
-            '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/KLake3.jpg"></center>'
+            '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/lake3.jpg"></center>'
             'When she turns around, she sees you and is shocked but keeps doing what she is told by her mother, trying to look like nothing is wrong.'
             act 'Continue':
                 *clr & cla
-                '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/KLake4.jpg"></center>'
+                '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/lake4.jpg"></center>'
                 'She makes a tease with her panties around her ankles. She lifts her leg and makes it look like she is going to grab them but doesn''t.'
                 act 'Continue':
                     *clr & cla
-                    '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/KLake5.jpg"></center>'
+                    '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/lake5.jpg"></center>'
                     'She pulls her dress up and shows you her bare pussy. You hear her mother sigh and keep taking a few pictures.'
                     '"Is she doing this for me?" you ask yourself as you watch. "I''ll have to ask her the next time I see her. Best get away before her mother sees me" and with that, you leave the lake area.'
                     act 'Go back': gt 'pav_lake'

locations/prostitution_functions.qsrc

@@ -125,8 +125,7 @@ if $ARGS[0] = 'prostitute_outfit_at_home':
 	if func('homes_properties', 'is_current_home') and prostitute['active']:
 		gs 'prostitution_functions', 'work_clothes'
 		if prostitute['work_clothes']:
-			gs 'prostitution_functions', 'is_default'
-			if prostitute['outfit_is_set'] = 1 and is_default = 0:
+			if prostitute['outfit_is_set'] = 1 and func('prostitution_functions', 'is_default') = 0:
 				act 'Replace your default prostitute outfit with the current outfit':
 					gs 'prostitution_functions', 'set_default_outfit'
 					gt $loc, $loc_arg
@@ -147,7 +146,6 @@ if $ARGS[0] = 'prostitute_outfit_at_home':
 				gt $loc, $loc_arg
 			end
 		end
-		killvar 'is_default'
 	end
 end
 
@@ -410,7 +408,7 @@ if $ARGS[0] = 'work_clothes':
 end
 
 if $ARGS[0] = 'is_default':
-	is_default = prostitute['clothingwornnumber'] = clothingwornnumber _ 
+	RESULT = prostitute['clothingwornnumber'] = clothingwornnumber _ 
 			 and prostitute['shoewornnumber']     = shoewornnumber _ 
 			 and prostitute['currentpursenumber'] = currentpursenumber _ 
 			 and prostitute['coatwornnumber']     = coatwornnumber _ 
@@ -428,7 +426,9 @@ if $ARGS[0] = 'set_default_outfit':
 	prostitute['clothingwornnumber'] = clothingwornnumber
 
 	!!-- Underwear
-	if bodysuitwornnumber > 0:
+	prostitute['underweartype'] = 0
+	if underwear['type'] = 2:
+		prostitute['underweartype'] = 2
 		$prostitute['bodysuitworntype'] = $bodysuitworntype
 		prostitute['bodysuitwornnumber'] = bodysuitwornnumber
 	else
@@ -482,11 +482,20 @@ end
 
 
 if $ARGS[0] = 'change_into_prostitute_outfit':
+	if dyneval('RESULT = <<$prostitute["clothingworntype"]>>_h[<<prostitute["clothingwornnumber"]>>]') <= 0:
+		msg '<font color="red">Unavailable as outfit is worn out!</font>'
+		exit
+	end
+	!! if last outfit is sport outfit
+	gs 'wardrobe', 'is_sport'
+	gs 'wardrobe', 'back_to_regular_clothes'
+
 	!!-- Backup
 	$lastwornclothingtype['prostitute'] = $clothingworntype
 	lastwornclothingnumber['prostitute'] = clothingwornnumber
-	lastwornunderwear['prostitute'] = underwear['type']
-	if bodysuitwornnumber > 0:
+	lastwornunderwear['prostitute'] = 0
+	if underwear['type'] = 2:
+		lastwornunderwear['prostitute'] = 2
 		$lastwornbodysuittype['prostitute'] = $bodysuitworntype
 		lastwornbodysuitnumber['prostitute'] = bodysuitwornnumber
 	else
@@ -505,7 +514,7 @@ if $ARGS[0] = 'change_into_prostitute_outfit':
 	!!-- Clothing
 	gs 'clothing', 'wear', $prostitute['clothingworntype'], prostitute['clothingwornnumber']
 	!!-- Underwear
-	if lastwornbodysuitnumber['prostitute'] > 0:
+	if prostitute['underweartype'] = 2:
 		gs 'underwear_bodysuits', 'wear', $lastwornbodysuittype['prostitute'], lastwornbodysuitnumber['prostitute']
 	else
 		gs 'panties', 'wear', $prostitute['pantyworntype'], prostitute['pantywornnumber']
@@ -525,29 +534,11 @@ if $ARGS[0] = 'change_into_prostitute_outfit':
 end
 
 if $ARGS[0] = 'change_into_regular_clothes':
-	if $lastwornclothingtype['prostitute'] = '':
-		gs 'clothing', 'wear_last_worn'
-		gs 'underwear', 'wear'
-		gs 'shoes', 'wear', 'last_worn'
-		gs 'purses', 'wear', 'last_worn'
-		gs 'coats', 'wear', 'last_worn'
-	else
-		!!-- Clothing
-		gs 'clothing', 'wear', $lastwornclothingtype['prostitute'], lastwornclothingnumber['prostitute']
-		!!-- Underwear
-		if lastwornunderwear['prostitute'] = 2:
-			gs 'underwear_bodysuits', 'wear', $lastwornbodysuittype['prostitute'], lastwornbodysuitnumber['prostitute']
-		else
-			gs 'panties', 'wear', $lastwornpantytype['prostitute'], lastwornpantynumber['prostitute']
-			gs 'bras',    'wear', $lastwornbratype['prostitute'],   lastwornbranumber['prostitute']
-		end
-		!!-- Shoes
-		gs 'shoes',  'wear', $lastwornshoetype['prostitute'],  lastwornshoenumber['prostitute']
-		gs 'purses', 'wear', $lastwornpursetype['prostitute'], lastwornpursenumber['prostitute']
-		gs 'coats',  'wear', $lastworncoattype['prostitute'],  lastworncoatnumber['prostitute']
-		gs 'prostitution_functions', 'work_clothes'
-		if prostitute['changed_for_work']: prostitute['changed_for_work'] = 0
-	end
+	gs 'wardrobe', 'back_to_regular_clothes'
+
+	!! if last outfit is sport outfit
+	gs 'wardrobe', 'is_sport'
+	gs 'wardrobe', 'back_to_regular_clothes'
 end
 
 !!---------- Chaging outfits in public locations ------------------------------------------------------------------------

locations/sex_ev_morning.qsrc

@@ -657,6 +657,7 @@ if $ARGS[0] = 'want_coffee_response':
 		gs'sex_ev_morning', 'morning_menu1'
 	elseif rand(1,2) = 1:
 		'"Sure, I wouldn''t mind some coffee," <<$npc_firstname[$boy]>> says and gets up to make some.'
+		gs'sex_ev_morning', 'npc_coffe_make'
 	else
 		'"I''ve got some time," <<$npc_firstname[$boy]>> says. "How about breakfast instead?"'
 		gs'sex_ev_morning', 'boy_breakfast_offer'

locations/therapist_hotel.qsrc

@@ -552,7 +552,7 @@ if $ARGS[0] = 'event5_submit':
 			'"Sir?!" You moan out as he ravishes your pussy with his mouth and tongue.'
 			'"You will be mine, your body will not deny me, you only have to say yes to me. My dear, tell me to fuck you." He exclaims and the trigger clicks in your mind.'
 
-			act '"Sir, please, fuck me"':
+			act '"Sire, please, fuck me"':
 				*clr & cla
 				gs 'arousal', 'vaginal', 60, 'sub'
 				gs 'cum_call', 0, 'A186', 2, 0, 15000, 60
@@ -650,7 +650,6 @@ if $ARGS[0] = 'event6_submit':
 	dynamic $showerdin
 	gs 'stat'
 
-	!! ANYA
 	'<center><video autoplay loop <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_shower1.mp4"></video></center>'
 	'You enter the hotel again, but this time it is different. The moment you walk in, you remove your clothes, folding them up before heading into the shower to get cleaned up.'
 	'In your mind, you know this phrase, "A Clean Wife has a Happy Husband" You spend time making sure everything about yourself is clean before you dry off and enter the hotel room.'
@@ -696,7 +695,7 @@ if $ARGS[0] = 'event6_submit':
 		end
 
 		act 'Don''t sign the paper':
-			'He helps you to your feet and tells you to get dressed and leave but tells you "I expect you to sign it the next time i see you" he says. You dress and leave.'
+			'He helps you to your feet and tells you to get dressed and leave. "I expect you to sign it the next time I see you" he says. You dress and leave.'
 			act 'Leave':
 				minut += 5
 				gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
@@ -720,7 +719,6 @@ if $ARGS[0] = 'event6_submit2':
 
 	if func('homes_properties', 'is_current_home', 'parents_home'):
 		cla
-		!! ANYA
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_00.jpg"></center>'
 		'You return home and see your family watching TV. You head to your bedroom and see Anya on her bed reading a book. When you pull out your suitcase, she looks up from her book. "You going somewhere?" she asks.'
 		*nl
@@ -737,7 +735,7 @@ if $ARGS[0] = 'event6_submit2':
 			minut += 20
 			gs 'stat'
 
-			'You enter the living room with your suitcase and just say, "<Mom>, Dad, Im moving out. I have found a place to stay and I will be living there" you say and <Mom> stands up looking confused. "What are you talking about?" she says.'
+			'You enter the living room with your suitcase and just say, "<<$npc_nickname[''A29'']>>, Dad, Im moving out. I have found a place to stay and I will be living there" you say and your mother stands up looking confused. "What are you talking about?" she says.'
 			*nl
 			'"I''m moving out" you repeat.'
 			*nl
@@ -782,7 +780,6 @@ if $ARGS[0] = 'event6_submit3':
 	gs 'clothing', 'strip'
 	gs 'stat'
 
-	!! ANYA
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/naked1.jpg"></center>'
 	'You return to the hotel room with your stuff. When you enter, you see the therapist waiting for you. "Welcome back, my wife. Looks like all went well" he says and you nod.'
 	'"Just put your stuff in the closet there and lay on the bed and wait for me." He says and you strip down, putting your clothes into the closet, then you lay on the bed, naked. You are glad the TV is on and you watch it.'
@@ -794,8 +791,7 @@ if $ARGS[0] = 'event6_submit3':
 		gs 'cum_call', 'vagina', 'A186', 2, 0, 15000, 60
 		gs 'stat'
 
-		!! ANYA: Mission9
-		'<center><video autoplay loop <<$set_imgh>> src="images/shared/sex/vag/miss/old9.mp4"></video></center>'
+		'<center><video autoplay loop <<$set_imgh>> src="images/shared/sex/vag/miss/old1.mp4"></video></center>'
 		'You spend the next hour or two, naked on the bed, watching TV before he comes to bed. He pushes you on your back and before you know it, he is inside you having sex with you.'
 		'You were already wet from being in his presence. He moves your hands above your head and spends the next few hours pumping in and out of you before you both pass out.'
 
@@ -815,8 +811,7 @@ if $ARGS[0] = 'event6_submit3':
 			gs 'cum_call', 'vagina', 'A186', 2, 0, 15000, 60
 			gs 'stat'
 
-			!! ANYA: Mission8
-			'<center><video autoplay loop <<$set_imgh>> src="images/shared/sex/vag/miss/old8.mp4"></video></center>'
+			'<center><video autoplay loop <<$set_imgh>> src="images/shared/sex/vag/miss/old2.mp4"></video></center>'
 			'You wake up the next morning and your legs are on his shoulders and he is still having sex with you.'
 			'He says nothing and you just lay there looking up at him. It takes him a bit and he cums deep inside you again. He stays inside you and looks down at you.'
 			'"Good Morning, Wife. Tell me, Do you love being woken up like this?"'
@@ -834,7 +829,6 @@ if $ARGS[0] = 'event6_submit3':
 				minut += 5
 				gs 'stat'
 
-				!! ANYA
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/naked1.jpg"></center>'
 				'You lay there naked on the bed as he goes to get cleaned up. You lay there for a bit and when he exits the shower, you get up and go take one yourself. You wash up and return to him. "Now to make sure no one sees anything wrong with our pairing, you are free to leave and do whatever you want. But you will return here every night.'
 				'This is your home now. You will have all the same freedoms you did in any place you lived before, only the difference is that you will be naked at all times while in this room. At night, we will have sex and you will allow it, even if you are not in the mood, isn''t that right my dear?" he says.'

locations/torgcentr.qsrc

@@ -84,33 +84,33 @@ end
 
 if hour > 12 and hour < 18 and sunWeather = 1 and exhibitionQW >= 5 and KsenyaQW = 0 and Kignore ! daystart:
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/KMall1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall1.jpg"></center>'
 	'As you approach the mall, you see a beautiful, hot pink Lamborghini before you. It''s top is down and it''s doors are wide open. Inside you see a familiar face. "Hello Ksenya" You say walking up to her.'
 	'She looks up at you with a smile and steps out of the car. You can see she isn''t wearing her normal exhibition clothes today but with slight movement, you can get a look at her panties as her dress is rather tight and short.'
 	
 	act 'Talk to Ksenya':
 		*clr & cla
 		KsenyaQW = 1
-		'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/KMall5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall5.jpg"></center>'
 		'"Hello <<$pcs_nickname>>, What brings you to the city?" she asks leaning on the windshield.'
 		'"Oh you know, shopping" you reply. "What about you?"'
 		'"My mother is getting her hair down and I''m waiting for her to finish," she admits. "Stick around long enough and you can meet her if you want" she offers.'
 
 		act 'head into the Mall':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/KMall4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall4.jpg"></center>'
 			'You see Ksenya lean over her car looking bored. "If I had time I would, but I have to get my shopping done. Hope to see you around" You tell her and she gives you a slight smile and lets you head off with a gentle wave.'
 
 			act 'stick around':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/KMall3.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall3.jpg"></center>'
 				'You and Ksenya wait around talking about your shared passion when a woman in a white dress walks up to the car. For a moment you could swear this was her sister but when Ksenya walked up to her and hugged her, you understood that this was her mother. "You look good, mom" She says to the other woman.' 
 				'"Who''s your friend?" she asks leaning on the hood of the car.'
 				'"Mom, This is <<$pcs_firstname>>. She is a friend that I share an interest with and she is also a customer of mine" Ksenya says. "<<$pcs_nickname>>, This is my mother, Makoto." she says and her mother hugs you. "Any friend of my daughters is a friend of mine."' 
 
 				act 'continue':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/KMall2.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall2.jpg"></center>'
 					'Makoto gets into the driver seat and starts up the car. "Come on Ksenya, we need to make a stop at the bank before we head back" she says and looks at you as Ksenya goes to the other side of the car. "Nice to have met you, <name>. I hope to see you around" she says and they drive off, leaving you alone in the parking lot.'
 				end
 			end

locations/underwear.qsrc

@@ -54,10 +54,10 @@ end
 
 if $ARGS[0] = 'wear':
 	if underwear['lastworntype'] = 2:
-		gs 'underwear_bodysuits', 'wear'
+		gs 'underwear_bodysuits', 'wear', $ARGS[1]
 	else
-		gs 'panties', 'wear'
-		gs 'bras', 'wear'
+		gs 'panties', 'wear', $ARGS[1]
+		gs 'bras', 'wear', $ARGS[1]
 	end
 end
 

locations/underwear_bodysuits.qsrc

@@ -368,7 +368,7 @@ if $ARGS[0] = 'wear':
 		end
 	else
 		if dyneval('RESULT = <<$ARGS[1]>>_bodysuits_s[<<ARGS[2]>>]') = 0:
-			gs 'underwear_bodysuits', 'wear2', $ARGS[2], ARGS[3]
+			gs 'underwear_bodysuits', 'wear2', $ARGS[1], ARGS[2]
 		else
 			underwear['type'] = 0
 			$bodysuitworntype = 'none'

locations/wardrobe.qsrc

@@ -347,20 +347,20 @@ end
 if $ARGS[0] = 'default_set_name':
 	*clr & cla
 	$clothing_default_page[clothing_default_page] = input('Enter new name for this set')
-	act 'Return': gt 'wardrobe', 'default<<clothing_default_page>>'
+	gt 'wardrobe', 'default<<clothing_default_page>>'
 end
 
 if $ARGS[0] = 'default_actions':
-	act 'Return':
-		gt $loc, $loc_arg
-	end
+	act 'Return': gt $loc, $loc_arg
  
 	act 'Select outfit to wear':
 		cla
+		act 'Return': gt 'wardrobe', $wardrobeDefaultPagePref
 		gs 'wardrobe', 'default_actions_wear'
 	end
 	act 'Choose another page':
 		cla
+		act 'Return': gt 'wardrobe', $wardrobeDefaultPagePref
 		gs 'wardrobe', 'default_actions_page'
 	end
 	act 'Rename this set': gs 'wardrobe', 'default_set_name'
@@ -925,29 +925,20 @@ 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.'
 	else
-		!! checks to see if player is wearing the default sports set using default_sport_number[2]
-		default_sport_number[2] = 0
-		if $clothingworntype = $defclothingtype[default_sport_number] and clothingwornnumber = defclothingnumber[default_sport_number]: default_sport_number[2] += 1
-		if defunderwear[default_sport_number] = 2:
-			if $bodysuitworntype = $defbodysuittype[default_sport_number] and bodysuitwornnumber = defbodysuitnumber[default_sport_number]: default_sport_number[2] += 1
-		else
-			if $pantyworntype = $defpantytype[default_sport_number] and pantywornnumber = defpantynumber[default_sport_number] and $braworntype = $defbratype[default_sport_number] and brawornnumber = defbranumber[default_sport_number]: default_sport_number[2] += 1
-		end
-		if $shoeworntype = $defshoetype[default_sport_number] and shoewornnumber = defshoenumber[default_sport_number]: default_sport_number[2] += 1
-		if $currentpursetype = $defpursetype[default_sport_number] and currentpursenumber = defpursenumber[default_sport_number]: default_sport_number[2] += 1
-		if $coatworntype = $defcoattype[default_sport_number] and coatwornnumber = defcoatnumber[default_sport_number]: default_sport_number[2] += 1
-
+		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 '<font color="red">Put on your sports clothes - unavailable as outfit is worn out</font>':
-			end
+		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':
+			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'] = underwear['type']
-				if defunderwear[default_sport_number] = 2:
+				lastwornunderwear['sport'] = 0
+				if underwear['type'] = 2:
+					lastwornunderwear['sport'] = 2
 					$lastwornbodysuittype['sport'] = $bodysuitworntype
 					lastwornbodysuitnumber['sport'] = bodysuitwornnumber
 				else
@@ -966,32 +957,83 @@ if $ARGS[0] = 'default_sport_options':
 				gt $loc, $loc_arg
 			end
 		else
-			act'Put your regular clothes back on':
-				if $lastwornclothingtype['sport'] = '':
-					gs 'clothing', 'wear_last_worn'
-					gs 'underwear', 'wear'
-					gs 'shoes', 'wear', 'last_worn'
-					gs 'purses', 'wear', 'last_worn'
-					gs 'coats', 'wear', 'last_worn'
-				else
-					gs 'clothing', 'wear', $lastwornclothingtype['sport'], lastwornclothingnumber['sport']
-
-					if lastwornunderwear['sport'] = 2:
-						gs 'underwear_bodysuits', 'wear', $lastwornbodysuittype['sport'], lastwornbodysuitnumber['sport']
-					else
-						gs 'panties', 'wear', $lastwornpantytype['sport'], lastwornpantynumber['sport']
-						gs 'bras',    'wear', $lastwornbratype['sport'],   lastwornbranumber['sport']
-					end
-					gs 'shoes',  'wear', $lastwornshoetype['sport'],  lastwornshoenumber['sport']
-					gs 'purses', 'wear', $lastwornpursetype['sport'], lastwornpursenumber['sport']
-					gs 'coats',  'wear', $lastworncoattype['sport'],  lastworncoatnumber['sport']
-					gt $loc, $loc_arg
-				end
+			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
 		end
 	end
 end
 
+if $ARGS[0] = 'is_sport':
+	!! checks to see if player is wearing the default sports set using default_sport_number[2]
+	default_sport_number[2] = 0
+	if $clothingworntype = $defclothingtype[default_sport_number] and clothingwornnumber = defclothingnumber[default_sport_number]: default_sport_number[2] += 1
+	if defunderwear[default_sport_number] = 2:
+		if $bodysuitworntype = $defbodysuittype[default_sport_number] and bodysuitwornnumber = defbodysuitnumber[default_sport_number]: default_sport_number[2] += 1
+	else
+		if $pantyworntype = $defpantytype[default_sport_number] and pantywornnumber = defpantynumber[default_sport_number] and $braworntype = $defbratype[default_sport_number] and brawornnumber = defbranumber[default_sport_number]: default_sport_number[2] += 1
+	end
+	if $shoeworntype = $defshoetype[default_sport_number] and shoewornnumber = defshoenumber[default_sport_number]: default_sport_number[2] += 1
+	if $currentpursetype = $defpursetype[default_sport_number] and currentpursenumber = defpursenumber[default_sport_number]: default_sport_number[2] += 1
+	if $coatworntype = $defcoattype[default_sport_number] and coatwornnumber = defcoatnumber[default_sport_number]: default_sport_number[2] += 1
+end
+
+if $ARGS[0] = 'back_to_regular_clothes':
+
+	!! wearing prostitute outfit
+	if func('prostitution_functions', 'is_default') ! 0:
+		if $lastwornclothingtype['prostitute'] = '':
+			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
+			!!-- Clothing
+			gs 'clothing', 'wear', $lastwornclothingtype['prostitute'], lastwornclothingnumber['prostitute']
+			!!-- Underwear
+			if lastwornunderwear['prostitute'] = 2:
+				gs 'underwear_bodysuits', 'wear', $lastwornbodysuittype['prostitute'], lastwornbodysuitnumber['prostitute']
+			else
+				gs 'panties', 'wear', $lastwornpantytype['prostitute'], lastwornpantynumber['prostitute']
+				gs 'bras',    'wear', $lastwornbratype['prostitute'],   lastwornbranumber['prostitute']
+			end
+			!!-- Shoes
+			gs 'shoes',  'wear', $lastwornshoetype['prostitute'],  lastwornshoenumber['prostitute']
+			gs 'purses', 'wear', $lastwornpursetype['prostitute'], lastwornpursenumber['prostitute']
+			gs 'coats',  'wear', $lastworncoattype['prostitute'],  lastworncoatnumber['prostitute']
+		end
+
+		gs 'prostitution_functions', 'work_clothes'
+		if prostitute['changed_for_work']: prostitute['changed_for_work'] = 0
+
+	!! wearing sport outfit
+	elseif default_sport_number[2] >= 5:
+		if $lastwornclothingtype['sport'] = '':
+			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['sport'], lastwornclothingnumber['sport']
+
+			if lastwornunderwear['sport'] = 2:
+				gs 'underwear_bodysuits', 'wear', $lastwornbodysuittype['sport'], lastwornbodysuitnumber['sport']
+			else
+				gs 'panties', 'wear', $lastwornpantytype['sport'], lastwornpantynumber['sport']
+				gs 'bras',    'wear', $lastwornbratype['sport'],   lastwornbranumber['sport']
+			end
+			gs 'shoes',  'wear', $lastwornshoetype['sport'],  lastwornshoenumber['sport']
+			gs 'purses', 'wear', $lastwornpursetype['sport'], lastwornpursenumber['sport']
+			gs 'coats',  'wear', $lastworncoattype['sport'],  lastworncoatnumber['sport']
+		end
+
+		default_sport_number[2] = 0
+	end
+end
 
 --- wardrobe ---------------------------------