9 Commits 37c49a4b84 ... 0f50d90213

Autor SHA1 Mensaje Fecha
  Lusticon 0f50d90213 [fixed] bracket hace 5 meses
  Kevin_Smarts 66874c5f98 Merge remote-tracking branch 'Awesome/master' hace 5 meses
  Kevin_Smarts 2716120988 Merge remote-tracking branch 'Lusticon/master' hace 5 meses
  Kevin_Smarts 97b628d7af [fixed] annorexic start was using wrong outfit and had a school uniform that doesn't exist. Otherwise it was great hace 5 meses
  anjuna krokus 5e5c3ebc48 [fixed] Images of the butt changes were added after all (thank you Anya), so the rest of the code has been uncommented hace 5 meses
  Awesome aa08c25ef4 [Fixed] refillable Water bottle appearing in the bag even though Sveta doesn't have one hace 5 meses
  anjuna krokus abf7e95ae4 [fixed] rendered hairstyles weren't properly working for short and very short hairlstyles. Removed floating spaces. Added curly for short hair for picture faces. hace 5 meses
  anjuna krokus 4459e24e80 [fixed] blank screen after entering the wardrobe and selecting "saved outfits". Removed trailing spaces hace 5 meses
  anjuna krokus b5ed62f61a [fixed] blank screen after "itty bitty titties" (found by sansos). Removed trailing spaces hace 5 meses

+ 70 - 56
locations/_face_image.qsrc

@@ -21,7 +21,7 @@ elseif face_style['type'] = 2:
 	else
 		$result += 'noglass/'
 	end
-	
+
 	!!----------EYE COLOR----------
 	!! hazel
 	if pcs_eyecol = 0:
@@ -42,7 +42,7 @@ elseif face_style['type'] = 2:
 	!!	$result += 'other/'	!! missing !! will load blue !!
 		$result += 'blue/'
 	end
-	
+
 	!!----------HAIR COLOR----------
 	!! black
 	if pcs_haircol = 0:
@@ -61,7 +61,7 @@ elseif face_style['type'] = 2:
 	!!	$result += 'other'	!! missing !! will load brunette !!
 		$result += 'brunette/'
 	end
-	
+
 	!!----------HAIR LENGTH----------
 	!! very long
 	if pcs_hairlng > 400:
@@ -84,62 +84,74 @@ elseif face_style['type'] = 2:
 	else
 		$result += 'very_short/'
 	end
-	
+
 	!!----------HAIR STYLE----------
 	!! messy/tangled
-	if pcs_hairbsh = -1 or pcs_hairbsh = 0:
+	if pcs_hairbsh <= 0:
 		$result += 'messy/'
 	!! braids
-	elseif hbraids > 0:
-		$result += 'braids/'
-	!! pigtails
-	elseif hpigtail > 0:
-		$result += 'pigtails/'
-	!! curly-bangs-buns
-	elseif curly > 0 and hbangs > 0 and hpingripw > 0:
-	!!	$result += 'curly-bangs-buns/'	!! missing !! will load curly !!
-		$result += 'curly/'
-	!! curly-bangs-scrunch
-	elseif curly > 0 and hbangs > 0 and hscrunchw > 0:
-	!!	$result += 'curly-bangs-scrunch/'	!! missing !! will load curly !!
-		$result += 'curly/'
-	!! curly-bangs
-	elseif curly > 0 and hbangs > 0:
-	!!	$result += 'curly-bangs/'	!! missing !! will load curly !!
-		$result += 'curly/'
-	!! curly-buns
-	elseif curly > 0 and hpingripw > 0:
-	!!	$result += 'curly-buns/'	!! missing !! will load curly !!
-		$result += 'curly/'
-	!! curly-scrunch
-	elseif curly > 0 and hscrunchw > 0:
-	!!	$result += 'curly-scrunch/'	!! missing !! will load curly !!
-		$result += 'curly/'
-	!! bangs-buns
-	elseif hbangs > 0 and hpingripw > 0:
-	!!	$result += 'bangs-buns/'	!! missing !! will load bangs !!
-		$result += 'bangs/'
-	!! bangs-scrunch
-	elseif hbangs > 0 and hscrunchw > 0:
-	!!	$result += 'bangs-scrunch/'	!! missing !! will load bangs !!
-		$result += 'bangs/'
-	!! curly
-	elseif curly > 0:
-		$result += 'curly/'
-	!! bangs
-	elseif hbangs > 0:
-		$result += 'bangs/'
-	!! buns (updo)
-	elseif hpingripw > 0:
-		$result += 'buns/'
-	!! scrunch (ponytail)
-	elseif hscrunchw > 0:
-		$result += 'scrunch/'
-	!! normal
+	elseif pcs_hairlng > 80:
+		if hbraids > 0:
+			$result += 'braids/'
+		!! pigtails
+		elseif hpigtail > 0:
+			$result += 'pigtails/'
+		!! curly-bangs-buns
+		elseif curly > 0 and hbangs > 0 and hpingripw > 0:
+		!!	$result += 'curly-bangs-buns/'	!! missing !! will load curly !!
+			$result += 'curly/'
+		!! curly-bangs-scrunch
+		elseif curly > 0 and hbangs > 0 and hscrunchw > 0:
+		!!	$result += 'curly-bangs-scrunch/'	!! missing !! will load curly !!
+			$result += 'curly/'
+		!! curly-bangs
+		elseif curly > 0 and hbangs > 0:
+		!!	$result += 'curly-bangs/'	!! missing !! will load curly !!
+			$result += 'curly/'
+		!! curly-buns
+		elseif curly > 0 and hpingripw > 0:
+		!!	$result += 'curly-buns/'	!! missing !! will load curly !!
+			$result += 'curly/'
+		!! curly-scrunch
+		elseif curly > 0 and hscrunchw > 0:
+		!!	$result += 'curly-scrunch/'	!! missing !! will load curly !!
+			$result += 'curly/'
+		!! bangs-buns
+		elseif hbangs > 0 and hpingripw > 0:
+		!!	$result += 'bangs-buns/'	!! missing !! will load bangs !!
+			$result += 'bangs/'
+		!! bangs-scrunch
+		elseif hbangs > 0 and hscrunchw > 0:
+		!!	$result += 'bangs-scrunch/'	!! missing !! will load bangs !!
+			$result += 'bangs/'
+		!! curly
+		elseif curly > 0:
+			$result += 'curly/'
+		!! bangs
+		elseif hbangs > 0:
+			$result += 'bangs/'
+		!! buns (updo)
+		elseif hpingripw > 0:
+			$result += 'buns/'
+		!! scrunch (ponytail)
+		elseif hscrunchw > 0:
+			$result += 'scrunch/'
+		!! normal
+		else
+			$result += 'normal/'
+		end
+	elseif pcs_hairlng > 30:
+		if hbangs > 0:
+			$result += 'bangs/'
+		elseif curly > 0:
+			$result += 'curly/'
+		else
+			$result += 'normal/'
+		end
 	else
 		$result += 'normal/'
 	end
-				
+
 	!!----------MAKEUP----------
 	!! none
 	if pcs_makeup = 1:
@@ -167,7 +179,7 @@ elseif face_style['type'] = 2:
 	else
 		$result += 'smeared_'
 	end
-	
+
 	!!----------CUM----------
 	if cumloc[11] = 1:
 		!! enormous
@@ -190,7 +202,7 @@ elseif face_style['type'] = 2:
 	else
 		$result += 'no_cum'
 	end
-	
+
 	$result += '.jpg'
 
 else
@@ -210,7 +222,7 @@ else
 
 	$result = 'images/pc/body/hairstyles/'
 
-	if pcs_haircol > 3: 
+	if pcs_haircol > 3:
 		$result += 'colours'
 		jump 'skipsteps'
 	end
@@ -263,9 +275,11 @@ else
 			$result += 'normal'
 		end
 	!! style for short hair (other images don''t exist)
-	elseif pcs_hairlng <= 80 and pcs_hairlng > 30:
+	elseif pcs_hairlng > 30:
 		if hbangs > 0:
 			$result += 'bangs'
+		elseif curly > 0:
+			$result += 'curly'
 		else
 			$result += 'normal'
 		end

+ 4 - 25
locations/body_desc.qsrc

@@ -388,27 +388,12 @@ if $ARGS[0] = 'breasts':
 end
 
 if $ARGS[0] = 'butt':
-	if 1:
-		!natural butt
-		if pcs_butt <= 14:
-			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.'
-		elseif pcs_butt <= 29:
-			$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a>.'
-		elseif pcs_butt <= 44:
-			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is bigger, rounder and firmer than average.'
-		elseif pcs_butt <= 59:
-			$pcs_butt = 'You have a large heart-shaped <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk.'
-		else
-			$pcs_butt = 'You have a large bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk.'
-		end
+	!have butt implant
+	if bodyVars['butt_silicone'] > 0:
+		$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/9s.jpg''">butt</a>.'
 
-		!have butt implant
-		if bodyVars['butt_silicone'] > 0:
-			buttpic = 4
-			$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a>.'
-		end
+	!natural butt
 	else
-		!natural butt
 		if pcs_butt <= 7:
 			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.'
 		elseif pcs_butt <= 14:
@@ -428,12 +413,6 @@ if $ARGS[0] = 'butt':
 		else
 			$pcs_butt = 'You have a large bubble <a href="exec:view''images/pc/body/ass/9.jpg''">butt</a> that jiggles and sways as you walk.'
 		end
-
-		!have butt implant
-		if bodyVars['butt_silicone'] > 0:
-			buttpic = 4
-			$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/9s.jpg''">butt</a>.'
-		end
 	end
 end
 

+ 1 - 1
locations/cum_call.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] ! 'precum':
 	if $boy ! $ARGS[1] and $ARGS[1] ! '': $boy = $ARGS[1]
 
 	!!This check if the name passed is not in the new MGX format
-	if $ARGS[1] = '' or (isnum(mid($ARGS[1],2,1)) and val(mid($ARGS[1],2,1) > 10)):
+	if $ARGS[1] = '' or (isnum(mid($ARGS[1],2,1)) and val(mid($ARGS[1],2,1)) > 10):
 		if ARGS[2] = 0 or ARGS[2] = 2:
 			gs 'npcgeneratec', 0, $ARGS[1], rand(18,60)
 			gs 'boyStat', $npclastgenerated

+ 5 - 5
locations/din_bad.qsrc

@@ -236,15 +236,15 @@ if $ARGS[0] = 'd_bag':
 	if mc_inventory['breastcream'] > 0:'<a href="exec: gs ''drugs'', ''breastcream'' & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<mc_inventory[''breastcream'']>></b> cream left in your purse.'
 	if mc_inventory['aphrodisiac'] > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $drugVars[''aphrodisiac_msg''] & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<mc_inventory[''aphrodisiac'']>></b> gum left in your purse.'
 
-	if mc_inventory['refill_bottle_water'] = 4: 
+	if mc_inventory['refill_bottle_water'] = 4 and mc_inventory['refill_bottle'] >= 1: 
 		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: mc_inventory[''refill_bottle_water''] = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif mc_inventory['refill_bottle_water'] = 3:
+	elseif mc_inventory['refill_bottle_water'] = 3 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s almost full. <a href="exec: mc_inventory[''refill_bottle_water''] = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif mc_inventory['refill_bottle_water'] = 2:
+	elseif mc_inventory['refill_bottle_water'] = 2 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s half full. <a href="exec: mc_inventory[''refill_bottle_water''] = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'	
-	elseif mc_inventory['refill_bottle_water'] = 1:
+	elseif mc_inventory['refill_bottle_water'] = 1 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s almost empty. <a href="exec: mc_inventory[''refill_bottle_water''] = 0 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
-	elseif mc_inventory['refill_bottle_water'] = 0:
+	elseif mc_inventory['refill_bottle_water'] = 0 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s empty.'
 	end
 	if mc_inventory['food_water'] > 0: 'There''s a bottle of water in your purse. <a href="exec:mc_inventory[''food_water''] = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'

+ 4 - 4
locations/intro_initialization.qsrc

@@ -273,7 +273,7 @@ elseif $start_type['cat'] = 'anorexic':
 	danilovich_swimsuit_h[8] = 60
 	danilovich_swimsuit_b[8] = pcs_hips
 	sportsclothingnumber = 88
-	gs 'clothing', 'wear', 'cats_outfits', 90
+	gs 'clothing', 'wear', 'gm_dress', 39
 elseif $start_type['cat'] = 'bimbo':
 	!!bimbo start
 	gm_panties[14] = 1
@@ -519,9 +519,9 @@ else
 		market_outfits_h[17] = 60
 		market_outfits_b[17] = pcs_hips
 	elseif $start_type['cat'] = 'anorexic':
-		gm_school[127] = 1
-		gm_school_h[127] = 120
-		gm_school_b[127] = pcs_hips
+		gm_school[59] = 1
+		gm_school_h[59] = 120
+		gm_school_b[59] = pcs_hips
 	elseif $start_type['cat'] = 'bimbo':
 		cats_dress[127] = 1
 		cats_dress_h[127] = 100

+ 1 - 1
locations/intro_initialization_city.qsrc

@@ -297,7 +297,7 @@ elseif $start_type['cat'] = 'anorexic':
 	danilovich_swimsuit_h[8] = 60
 	danilovich_swimsuit_b[8] = pcs_hips
 	sportsclothingnumber = 88
-	gs 'clothing', 'wear', 'cats_outfits', 90
+	gs 'clothing', 'wear', 'gm_dress', 39
 elseif $start_type['cat'] = 'bimbo':
 	!!bimbo start
 	gm_panties[14] = 1

+ 99 - 98
locations/sex_ev_pillow_talk2.qsrc

@@ -41,26 +41,26 @@ if $ARGS[0] = 'weather_talk':
 						'You smile softly at <<$npc_firstname[$boy]>> who grins back confidently, wrapping his arm around you.'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Grin':
 						cla
 						'You grin at <<$npc_firstname[$boy]>> who grins back just as wide as he wraps his arm around you.'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Demure':
 						cla
 						'You snuggle in closer to <<$npc_firstname[$boy]>> without further comment, letting the implication of your words speak for itself. You figure he got the message when he grins as he wraps his arm around you.'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
 				end
-				
+
 				act'Sometimes':
 					cla & *nl
 					'"Sometimes yes, sometimes no. I think I''m just like anybody else," you shrug, snuggling closer into <<$npc_firstname[$boy]>>''s warmth.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I''m always cold':
 					cla & *nl
 					pc_gets_chilly[$boy] = 1
@@ -85,7 +85,7 @@ if $ARGS[0] = 'fav_body_part':
 	!!			else
 					'"Your tits obviously," he smiles, glancing down to admire them.'
 	!!			end
-				
+
 				act'Really? (insecure)':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -127,7 +127,7 @@ if $ARGS[0] = 'fav_body_part':
 					end
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Glad you think so':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -135,14 +135,14 @@ if $ARGS[0] = 'fav_body_part':
 					'"Boobs are great," he grins. "And your boobs are especially great because you let me fuck you."'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I like them too':
 					cla & *nl
 					'"Me too," you grin. "I think they''re my best asset."'
 					'"Mhmm..." He nods and bows his head to kiss your nipple.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				if pcs_cupsize <= 10:
 					act'You like ''em small?':
 						cla & *nl
@@ -161,14 +161,15 @@ if $ARGS[0] = 'fav_body_part':
 								'"Big melons, small apples, flat walls, I love ''em all," he grins and bows his head to kiss along the side of your breast.'
 							end
 						end
+						gs 'sex_ev_pillow_talk2', 'small_talk'
 					end
 				elseif pcs_cupsize <= 20:
-				
-				
+
+
 				elseif pcs_cupsize <= 30:
-					
+
 				else
-					
+
 				end
 			elseif $npc_fav_body_part[$boy] = 'ass':
 				if npc_humor[$boy] <= 2:
@@ -176,7 +177,7 @@ if $ARGS[0] = 'fav_body_part':
 				else
 					'"I love your ass," he smiles, running his hand up your thigh to give your bottom a firm squeeze.'
 				end
-				
+
 				act'Really? (insecure)':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -184,7 +185,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"No way." He shakes his head. "Ass is the sexiest thing about a girl, and it''s the sexiest thing about you."'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Glad you think so':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -192,14 +193,14 @@ if $ARGS[0] = 'fav_body_part':
 					'"There''s something irresistible about a good ass," he grins, grabbing another handful of yours.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I like it too':
 					cla & *nl
 					'"Me too," you grin. "It''s my best <i>ass</i>et," you add with a wink.'
 					'"Damn right," he says, unable to resist giving it another grab.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Oh you''re one of those':
 					cla & *nl
 					'"Oh," you say. "You''re one of <i>those</i>."'
@@ -208,7 +209,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Damn right," he grins, unable to resist giving it another grab.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 			elseif $npc_fav_body_part[$boy] = 'pussy':
 				gs 'arousal', 'foreplay', 1, 'no_orgasm_msg', $sex_ev['prostitution_flag']
 				gs 'stat'
@@ -226,7 +227,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Yeah..." he says, giving a predatory smile as he draws his hand away trailing strands of your juices. "Your pussy is the best."'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Glad you think so':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -237,7 +238,7 @@ if $ARGS[0] = 'fav_body_part':
 					end
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I like it too':
 					cla & *nl
 					if sex_ev['fuck_count'] > 0 or npc_fuck_times[$boy] > 0:
@@ -248,7 +249,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Glad we''re in agreement," he grins back.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				if stat['think_virgin'] ! 1 and (sex_ev['fuck_count'] > 0 or npc_fuck_times[$boy] > 0):
 					act'You just like fucking it':
 						cla & *nl
@@ -366,7 +367,7 @@ if $ARGS[0] = 'relationship_talk':
 						'"I know what you mean," you smirk back. "I like sleeping around too much to settle down. Gotta have fun while I''m still young."'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Same (lesbian)':
 						cla & *nl
 						'"I know what you mean," you smirk back. "A lot of pretty young things out there I want to fuck too."'
@@ -402,20 +403,20 @@ if $ARGS[0] = 'take_a_shower':
 					'"Sorry <<$npc_lovername[$boy]>>. I like my alone time," you smirk teasingly and saunter off into the bathroom.'
 					act'Go shower':gt'sex_ev_shower', 'after_alone'
 				end
-				
+
 				act'Sure':
 					cla & *nl
 					!!'"Sorry <<$npc_lovername[$boy]>>'
 					'"Why not?" you shrug and wave him over.'
 					act'Shower together':gt'sex_ev_shower', 'shower_together1'
 				end
-				
+
 				act'Maybe next time':
 					cla & *nl
 					'"Maybe next time," you smirk teasingly and saunter off into the bathroom.'
 					act'Go shower':gt'sex_ev_shower', 'after_alone'
 				end
-				
+
 				act'Nice try':
 					cla & *nl
 					'"Nice try, but no," you say, giving him a knowing smirk and saunter off into the bathroom.'
@@ -459,11 +460,11 @@ if $ARGS[0] = 'made_me_late1':
 				end
 				gs'sex_ev_pillow_talk2', 'made_me_late2'
 			end
-			
+
 			act'Not mad':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				
+
 			end
 		end
 	elseif schoolprogul > 0 and npc_fuck_times[$boy] > 0:
@@ -479,18 +480,18 @@ if $ARGS[0] = 'made_me_late1':
 				end
 				gs'sex_ev_pillow_talk2', 'made_me_late2'
 			end
-			
+
 			act'Not mad':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				
+
 			end
 		end
 	end
 end
 
 if $ARGS[0] = 'made_me_late2':
-	
+
 end
 
 if $ARGS[0] = 'plans_later':
@@ -542,7 +543,7 @@ if $ARGS[0] = 'pc_plans_later':
 		'"Thinking about going to see a movie later."'
 		gs'sex_ev_pillow_talk2', 'small_talk'
 	end
-	
+
 	act'Go to the library':
 		cla
 		act'To study':
@@ -550,14 +551,14 @@ if $ARGS[0] = 'pc_plans_later':
 			'"I was planning on doing some studying at the library later."'
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
-		
+
 		act'To read':
 			cla & *nl
 			'"Wanted to go to the library, see if I can find any new books to borrow."'
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
 	end
-	
+
 	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour < 8:
 		act'School':
 			cla & *nl
@@ -586,7 +587,7 @@ if $ARGS[0] = 'pc_plans_later':
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
 	end
-	
+
 	if (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and starlets_on = 1) or gsAboDance > 0 or (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] ! 0):
 		act'Dance practice':
 			cla & *nl
@@ -606,7 +607,7 @@ if $ARGS[0] = 'pc_plans_later':
 				'"Thinking about going to the disco later," you reply.'
 				gs'sex_ev_pillow_talk2', 'disco_club_dancing'
 			end
-			
+
 			act'Go clubbing':
 				cla & *nl
 				sex_ev['club_after'] = 1
@@ -661,7 +662,7 @@ if $ARGS[0] = 'club_wasted':
 			'"Thinking about going clubbing later," you reply. "I kinda want to get wasted tonight."'
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
-		
+
 	end
 end
 
@@ -695,7 +696,7 @@ if $ARGS[0] = 'day_events':
 				'"Oh. I see..." you murmur uncomfortably. You leave it at that, unsure of what else to say.'
 				gs'sex_ev_pillow_talk2', 'small_talk'
 			end
-			
+
 			act'How was it?':
 				cla & *nl
 				'"Oh, that''s cool," you reply pleasantly. "How was it? Your date?"'
@@ -729,7 +730,7 @@ if $ARGS[0] = 'pc_day_events':
 		'"I didn''t do much. Just you," you smirk back.'
 		gs'sex_ev_pillow_talk2', 'small_talk'
 	end
-	
+
 	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 		act'School':
 			cla & *nl
@@ -737,7 +738,7 @@ if $ARGS[0] = 'pc_day_events':
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
 	end
-	
+
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and lernHome = 0 and kanikuli = 0:
 		act'Homework':
 			cla & *nl
@@ -746,7 +747,7 @@ if $ARGS[0] = 'pc_day_events':
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
 	end
-	
+
 	if (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and starlets_on = 1 and hour < 15) or (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] ! 0):
 		act'Dance practice':
 			cla & *nl
@@ -760,10 +761,10 @@ if $ARGS[0] = 'pc_day_events':
 			gs'sex_ev_pillow_talk2', 'dance_talk'
 		end
 	end
-	
+
 !!{	if shot_porn = daystart:
 		act'Filmed a porno':
-		
+
 		end
 	end}
 end
@@ -788,7 +789,7 @@ if $ARGS[0] = 'dance_talk':
 				act'Keep talking':cla & gs'sex_ev_pillow_talk2', 'small_talk'
 				gs'sex_ev_pillow_talk2', 'show_dance'
 			end
-			
+
 			act'Irritation':
 				gs 'npc_relationship', 'modify', $boy, 'dislike'
 				cla & *nl
@@ -804,7 +805,7 @@ if $ARGS[0] = 'dance_talk':
 				act'Keep talking':cla & gs'sex_ev_pillow_talk2', 'small_talk'
 				gs'sex_ev_pillow_talk2', 'show_dance'
 			end
-			
+
 			act'Sensual':
 				$sex_ev['dance_type'] = 'sexy'
 				cla & *nl
@@ -832,7 +833,7 @@ if $ARGS[0] = 'dance_talk':
 						act'Keep talking':cla & gs'sex_ev_pillow_talk2', 'small_talk'
 						gs'sex_ev_pillow_talk2', 'show_dance'
 					end
-				end					
+				end
 			end
 			gs'sex_ev_pillow_talk2', 'show_dance'
 		end
@@ -879,7 +880,7 @@ if $ARGS[0] = 'dance_talk':
 						gs'sex_ev_pillow_talk2', 'show_dance_end2'
 					end
 				end
-				
+
 				act'A sexy one':
 					gs 'stat'
 					cla & *clr
@@ -936,7 +937,7 @@ if $ARGS[0] = 'show_dance':
 		if $sex_ev['dance_type'] ! 'sexy' and $sex_ev['dance_type'] ! 'starlet':gs'sex_ev_pillow_talk2', 'show_shuffle'
 		if $sex_ev['dance_type'] ! 'modern' and $sex_ev['dance_type'] ! 'starlet':gs'sex_ev_pillow_talk2', 'show_sexy'
 		if $sex_ev['dance_type'] ! 'modern' and $sex_ev['dance_type'] ! 'sexy':gs'sex_ev_pillow_talk2', 'show_starlets'
-		
+
 	end
 end
 
@@ -1013,7 +1014,7 @@ if $ARGS[0] = 'show_starlets':
 						'"I''m glad you enjoyed it," you smile back, finally managing to catch your breath as you stand up straight.'
 						gs'sex_ev_pillow_talk2', 'show_dance_end'
 					end
-					
+
 					act'Not usually naked':
 						cla & *nl
 						'"Kind of weird doing it naked," you smile, easing out of the pose. "Usually all the guys are trying to stare <i>through</i> our clothes. They don''t get to see what you do."'
@@ -1036,7 +1037,7 @@ if $ARGS[0] = 'show_dance_end':
 		end
 		gs'sex_ev_pillow_talk2', 'small_talk'
 	end
-	
+
 	act'Do something else':
 		cla & *clr
 		$sex_ev['bed_room']
@@ -1052,7 +1053,7 @@ if $ARGS[0] = 'show_dance_end2':
 		'You giggle as <<$npc_firstname[$boy]>> pulls you down, kicking off your shoes along the way as you let him pull you back into sexy times.'
 		gs'sex_ev_pillow_talk2', 'show_dance_end3'
 	end
-	
+
 	act'Shoes!':
 		cla & *clr
 		$sex_ev['bed_room']
@@ -1190,7 +1191,7 @@ if $ARGS[0] = 'dicks_are_weird':
 					'"Dicks are <i>so</i> weird," you say, experimentally squishing the flesh of his manhood between your fingers in bemusement. It twitches at your touch, causing you to pull back in alarm for a moment.'
 				else
 					'"Dicks are <i>so</i> weird," you say, experimentally squishing the hard flesh of his cock between your fingers in bemusement. It twitches at your touch, causing you to pull back in alarm for a moment.'
-				end	
+				end
 			else
 				if sex_ev['cum_count'] >= 5 + sex_ev['extra_cum'] or sex_ev['fucked_out'] = 1:
 					'"Dicks are <i>so</i> weird," you say, experimentally squishing the flesh of his manhood between your fingers in bemusement. "It was so hard, now it''s so soft. I can''t believe I had this thing inside me..."'
@@ -1231,14 +1232,14 @@ if $ARGS[0] = 'dick_compliment':
 							'<<$npc_firstname[$boy]>> swells at your words, looking like you just gave him a big confidence boost.'
 							gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 						end
-						
+
 						act'Bigger isn''t better':
 							cla & *nl
 							'"Bigger isn''t always better," you tell him. "I don''t know why guys get it into their heads that girls want a giant cock inside them. All that meat has to go somewhere and if it''s too big, it <i>hurts</i>. I prefer a small dick and a guy who knows how to use it any day."'
 							'<<$npc_firstname[$boy]>> swells at your words, looking like you just gave him a big confidence boost.'
 							gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 						end
-						
+
 						act'Prefer smaller dicks':
 							cla & *nl
 							'"Not even by a millimeter," you smile. "I actually prefer small dicks. Big ones hurt. Small ones feel good and don''t stretch my pussy out."'
@@ -1254,7 +1255,7 @@ if $ARGS[0] = 'dick_compliment':
 						'<<$npc_firstname[$boy]>> looks more than a little smug after your compliment.'
 						gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 					end
-					
+
 					if $npc_thdick[$npclastgenerated] = 'thick' or $npc_thdick[$npclastgenerated] = 'massive' or $npc_thdick[$npclastgenerated] = 'monstrous':
 						act'Great girth':
 							cla & *nl
@@ -1263,7 +1264,7 @@ if $ARGS[0] = 'dick_compliment':
 							gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 						end
 					end
-					
+
 					if $npc_dick_class[$npclastgenerated] = 'big' or $npc_dick_class[$npclastgenerated] = 'extra_big':
 						act'Great length':
 							cla & *nl
@@ -1272,14 +1273,14 @@ if $ARGS[0] = 'dick_compliment':
 							gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 						end
 					end
-					
+
 					if $npc_dick_desc[$boy] = 'huge' or $npc_dick_desc[$boy] = 'enormous' or $npc_dick_desc[$boy] = 'gigantic' or $npc_dick_desc[$boy] = 'monster':
 						act'He''s huge':
 							cla & *nl
 							'"Yeah. I mean, look at this thing," you say, running your fingers along his <<$npc_dick_desc[$boy]>> shaft. "It''s <i>gigantic!</i> How could I <i>not</i> be impressed by a cock like this?"'
 							gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 						end
-						
+
 						act'Bigger is better':
 							cla & *nl
 							'"Size matters," you smirk, running your fingers along his <<$npc_dick_desc[$boy]>> shaft. "Any girl who tells you otherwise is lying. Bigger is better."'
@@ -1288,7 +1289,7 @@ if $ARGS[0] = 'dick_compliment':
 					end
 				end
 			end
-			
+
 			if sex_ev['cum_count'] >= 3 and sex_ev['cum_count'] < 5 + sex_ev['extra_cum'] and sex_ev['fucked_out'] = 0:
 				act'How are you still hard?!':
 					cla & *clr
@@ -1302,7 +1303,7 @@ if $ARGS[0] = 'dick_compliment':
 					gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 				end
 			end
-			
+
 			if ($npc_dick_desc[$boy] = 'huge' or $npc_dick_desc[$boy] = 'enormous' or $npc_dick_desc[$boy] = 'lengthy' or $npc_dick_desc[$boy] = 'gigantic' or $npc_dick_desc[$boy] = 'monster') and ($npc_rel_type[$boy] ! 'boyfriend' or $npc_rel_type[$boy] ! 'husband') and stat['men_fucked'] > 1:
 				act'Its ruining other guys for you':
 					cla & *clr
@@ -1312,7 +1313,7 @@ if $ARGS[0] = 'dick_compliment':
 					'"You''re so big," you say with a rueful expression. "Other guys dicks feel like <i>fingers</i> inside me by comparison..."'
 					gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 				end
-				
+
 				if pcs_lover - pcs_girlfriends > 0:
 					act'Ruining sex with your boyfriend':
 						cla & *clr
@@ -1323,7 +1324,7 @@ if $ARGS[0] = 'dick_compliment':
 						gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 					end
 				end
-				
+
 				if pcs_girlfriends > 0:
 					act'Ruining sex with your girlfriend':
 						cla & *clr
@@ -1381,7 +1382,7 @@ if $ARGS[0] = 'how_stay_hard':
 					'"Don''t be crass," you scowl, disgusted by his childish sense of humor.'
 					gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 				end
-				
+
 				act'Giggle':
 					cla & *nl
 					'You shove your hand in his face, rolling your eyes as he cackles with laughter.'
@@ -1438,14 +1439,14 @@ if $ARGS[0] = 'morning_start_day':
 					'"It feels really good," you giggle, rubbing your thighs together, maybe still a little dick drunk.'
 					gs'sex_ev_pillow_talk', 'topic_route'
 				end
-				
+
 				act'I know you like it':
 					gs 'npc_relationship', 'modify', $boy, 'like'
 					cla & *nl
 					'"I know you like doing it," you smile fondly. "It makes you happy, so it makes me happy too."'
 					gs'sex_ev_pillow_talk', 'topic_route'
 				end
-				
+
 				act'You''re my favorite alarm cock':
 					cla & *nl
 					'"You''re my favorite alarm cock," you giggle. "It''s the best way to wake up."'
@@ -1458,27 +1459,27 @@ if $ARGS[0] = 'morning_start_day':
 					'"Well, this is a nice way to start the day," you sigh happily, stretching out on the bed.'
 				end
 				'"Sorry I didn''t wake you first. You just looked so hot, I had to put it in while you were still asleep."'
-				
-				
+
+
 				act'I didn''t mind':
 					cla & *nl
 					'"I didn''t mind," you smile fondly. "It felt nice."'
 					gs'sex_ev_pillow_talk2', 'morning_sleep_fuck_okay'
 				end
-				
+
 				act'I loved it':
 					cla & *nl
 					'"Don''t be sorry," you say, grinning openly. "I loved it."'
 					gs'sex_ev_pillow_talk2', 'morning_sleep_fuck_okay'
 				end
-				
+
 				if $sex_ev['type'] ! 'hookup':
 					act'Next time':
 						cla & *nl
 						'"Maybe next time," you smirk wryly.'
 						gs'sex_ev_pillow_talk', 'topic_route'
 					end
-					
+
 					act'You should do it more often':
 						npc_sleep_sex_okay[$boy] = 2
 						cla & *nl
@@ -1507,7 +1508,7 @@ if $ARGS[0] = 'morning_sore_pussy':
 				'You give him a rueful smile, rubbing your thighs together over your sore pussy'
 				gs'sex_ev_pillow_talk', 'topic_route'
 			end
-			
+
 			act'Hard to stay awake':
 				gs'sex_ev_pillow_talk', 'talk_time_add'
 				sex_ev['morning_sore_pussy'] = 1
@@ -1539,7 +1540,7 @@ if $ARGS[0] = 'morning_sore_pussy':
 					end
 					gs'sex_ev_pillow_talk', 'topic_route'
 				end
-				
+
 				act'Hard time sitting down':
 					gs'sex_ev_pillow_talk', 'talk_time_add'
 					sex_ev['morning_sore_pussy'] = 1
@@ -1597,13 +1598,13 @@ if $ARGS[0] = 'talk_late_for_school2':
 				gs'sex_ev_pillow_talk', 'topic_route'
 			end
 		end
-		
+
 		act'I need to hurry':
 			cla & *nl
 			'"I gotta get out of here," you say. "I really don''t want to be late."'
 			gs'sex_ev_after', 'after_sex2'
 		end
-		
+
 		act'Worth it':
 			cla & *nl
 			'"If I am, it was still worth it," you smirk.'
@@ -1624,14 +1625,14 @@ if $ARGS[0] = 'talk_late_for_school2':
 			'You put your phone back down and relax, settling back onto the bed.'
 			gs'sex_ev_pillow_talk', 'topic_route'
 		end
-		
+
 		act'Should probably get going (apologetic)':
 			cla & *nl
 			'"I should probably get going," you sigh, flashing an apologetic smile at <<$npc_firstname[$boy]>>. "I really wish I could stay with you but I can''t be late for school' + iif(npc_school_absences[$boy] = 0, '."', ' again."')
 			act'Get dressed':gt'sex_ev_leave', 'dressing1'
 			act'Take a quick shower':gs'sex_ev_shower', 'after_alone'
 		end
-		
+
 		act'Should probably get going (disappointed)':
 			cla & *nl
 			'"I should probably get going," you say, letting out a long sigh of disappointment. "I want to stay here longer but I can''t be late for school' + iif(npc_school_absences[$boy] = 0, '."', ' again."')
@@ -1645,26 +1646,26 @@ if $ARGS[0] = 'talk_late_for_school2':
 		else
 			'"Sorry," <<$npc_firstname[$boy]>> says, the grin on his face making him not look like he means it at all.'
 		end
-		
+
 		act'I need to hurry':
 			cla & *nl
 			'"I gotta get out of here," you say. "I can''t afford to be absent too many times."'
 			gs'sex_ev_morning', 'morning_menu2'
 		end
-		
+
 		act'Worth it':
 			cla & *nl
 			'"Oh well," you smirk. "That fuck was worth it."'
 			gs'sex_ev_pillow_talk2', 'morning_sex_talk'
 		end
-		
+
 		if schoolprogul = 2:
 			act'I''m gonna get kicked out of school':
 				cla & *nl
 				'"Fuck!" you swear again. "If I don''t make it by the end of first period, I''m gonna get expelled!"'
 				gs'sex_ev_morning', 'morning_menu2'
 			end
-		end				
+		end
 	end
 	if cum_loc['vagina'] > 0:
 		act'Gonna leak all day':
@@ -1717,14 +1718,14 @@ if $ARGS[0] = 'morning_sleep_fuck_okay':
 			'"No," you roll your eyes. "It was fine this time, but you should still wait till I wake up."'
 			gs'sex_ev_pillow_talk', 'topic_route'
 		end
-		
+
 		act'Yes':
 			npc_sleep_sex_okay[$boy] = 2
 			cla & *nl
 			'"Sure," you smirk wryly. "Why not?"'
 			gs'sex_ev_pillow_talk', 'topic_route'
 		end
-		
+
 		act'Do whatever you want to me':
 			npc_sleep_sex_okay[$boy] = 2
 			cla & *nl
@@ -1741,7 +1742,7 @@ if $ARGS[0] = 'new_with_you_boy':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 	'"So, anything new going on with you?" <<$npc_firstname[$boy]>> asks.'
-	
+
 	act'Nothing new':
 		cla & *nl
 		'"Not really," you shrug. "Same old same old."'
@@ -1757,25 +1758,25 @@ if $ARGS[0] = 'how_was_day_boy':
 	'"How was your day?" <<$npc_firstname[$boy]>> asks.'
 	act'It was fine':
 		cla & *nl
-		
+
 		gs'sex_ev_pillow_talk2', 'share_life_menu'
 	end
-	
+
 	act'It was good':
 		cla & *nl
-		
+
 		gs'sex_ev_pillow_talk2', 'share_life_menu'
 	end
-	
+
 	act'It was bad':
 		cla & *nl
-		
+
 		gs'sex_ev_pillow_talk2', 'share_life_menu'
 	end
-	
+
 	act'It was okay':
 		cla & *nl
-		
+
 		gs'sex_ev_pillow_talk2', 'share_life_menu'
 	end
 end
@@ -1787,7 +1788,7 @@ end
 if $ARGS[0] = 'share_life_single':
 	if pcs_lover + pcs_girlfriends = 0:
 		act'Single now':
-			
+
 			cla
 			act'Broke up with...':
 				cla
@@ -1795,33 +1796,33 @@ if $ARGS[0] = 'share_life_single':
 					cla & *nl
 					'"I broke up with my boyfriend," you tell <<$npc_firstname[$boy]>>. "So I guess I''m single now."'
 					if npc_know_have_girlfriend[$boy] = 1 or npc_know_have_boyfriend[$boy] = 1:
-					
+
 					else
-					
+
 					end
 					gs 'sex_ev_stats', 'single_know'
 				end
-				
+
 				act'My girlfriend':
 					cla & *nl
 					'"I broke up with my boyfriend," you tell <<$npc_firstname[$boy]>>. "So I guess I''m single now."'
 					if npc_know_have_girlfriend[$boy] = 1 or npc_know_have_boyfriend[$boy] = 1:
-					
+
 					else
-					
+
 					end
 					gs 'sex_ev_stats', 'single_know'
 				end
 			end
-			
+
 		!!{	act'Got broken up with...':
 				cla
 				act'By my boyfriend':
-				
+
 				end
-				
+
 				act'By my girlfriend':
-				
+
 				end
 			end}
 		end

+ 11 - 10
locations/wardrobe.qsrc

@@ -49,6 +49,7 @@ end
 
 
 if $ARGS[0] = 'main':
+	if $wloc = '': $wloc = 'default1'
 	PShoQuality = ShoQuality
 	PShoHeels = ShoHeels
 	PShoCut = ShoCut
@@ -87,7 +88,7 @@ if $ARGS[0] = 'main':
 		*p '<TH>Bodysuit worn</TH><TH>Outfit worn</TH><TH>Coat (only worn outside when cold)</TH>'
 		*P '<TR><TD ROWSPAN=4><center><a href="exec:gt ''wardrobe'', ''underwear_options'', ''full''"><img Height = <<ward_img_hgt>>*2 src="<<FUNC(''$body_image'',''bodysuit'')>>"></a></center></TD><TD><center><a href="exec:gt ''clothing_QV'', ''list''"><img Height = <<ward_img_hgt * 2>> src="<<FUNC(''$body_image'',''clothes'')>>"></a></center></TD><TD><center>'
 	end
-		
+
 	if $coatworntype = 'none':
 		'<a href="exec:gt ''coats'', ''view_coat_list'', ''wardrobe''">Search the wardrobe</a>'
 	else
@@ -129,7 +130,7 @@ if $ARGS[0] = 'main':
 	else
 		'<a href="exec:gt ''purses'', ''view_purse_list'',''wardrobe''">Search the wardrobe</a>'
 	end
-	
+
 	if underwear['type'] = 0:
 		'</center></TD><TR><TD><center>'
 		if $pantyworntype ! 'none':
@@ -163,7 +164,7 @@ if $ARGS[0] = 'main':
 	*nl
 	'<center><font color="grey">Save/load outfits with "Managed saved clothing sets".</font></center>'
 	'<TD></center></TD></table></center>'
-	
+
 	act 'Close wardrobe': gt $loc, $loc_arg
 
 	act 'Strip all clothing':
@@ -233,7 +234,7 @@ $default_clothing_line = {
 	$RESULT = '<TR bgcolor='+$temp_bcolor+'>'
 
 	$RESULT +='<TD><b><<$def_clothing_name[default_entry]>></b></TD>'
-	
+
 	if defclothingnumber[default_entry] = 0:
 		$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
 	else
@@ -352,7 +353,7 @@ end
 
 if $ARGS[0] = 'default_actions':
 	act 'Return': gt $loc, $loc_arg
- 
+
 	act 'Select outfit to wear':
 		cla
 		act 'Return': gt 'wardrobe', $wardrobeDefaultPagePref
@@ -878,10 +879,10 @@ if $ARGS[0] = 'default_entry_delete':
 	$defcoattype[i] = ''
 	defcoatnumber[i] = ''
 	$def_clothing_name[i] = ''
-	if default_sport_number = i: 
+	if default_sport_number = i:
 		default_sport_number = 0
 	end
-	if default_school_number = i: 
+	if default_school_number = i:
 		default_school_number = 0
 	end
 	gt 'wardrobe', $wloc
@@ -901,7 +902,7 @@ end
 
 if $ARGS[0] = 'school_outfit':
 	! if no outfit set in wardrobe they use the default
-	if default_school_number = 0:	
+	if default_school_number = 0:
 		gs 'clothing', 'wear', 'gm_school', 6
 		gs 'panties', 'wear', $lastwornpantytype['bed'], lastwornpantynumber['bed']
 		gs 'bras', 'wear', $lastwornbratype['bed'], lastwornbranumber['bed']
@@ -935,7 +936,7 @@ if $ARGS[0] = 'default_clothing_options':
 			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
@@ -978,7 +979,7 @@ end
 
 if $ARGS[0] = 'default_school_wear':
 	if func('prostitution_functions', 'is_default') ! 0: gs 'wardrobe', 'back_to_regular_clothes'
-	
+
 	$lastwornclothingtype['school'] = $clothingworntype
 	lastwornclothingnumber['school'] = clothingwornnumber
 	lastwornunderwear['school'] = 0