[added] More changes to default clothing system

locations/wardrobe.qsrc

@@ -31,7 +31,6 @@ if $ARGS[0] = 'main':
 	PShoHeels = ShoHeels
 	PShoCut = ShoCut
 	PShoStyle = ShoStyle
-	$wloc = 'wardrobe'
 	menu_off = 1
 	gs 'stat'
 	if CloBra = 1: gs 'bras', 'remove'
@@ -110,7 +109,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': killvar '$wloc' & gt $loc, $loc_arg
+	act 'Close wardrobe': gt $loc, $loc_arg
 
 	act 'Strip all clothing':
 		gs 'bras', 'remove'
@@ -181,32 +180,63 @@ $default_sports_line = {
 
 	$RESULT = '<TR bgcolor='+$bgcolor+'>'
 
-	$RESULT +='<TD><b><<$sports_clothing_name>></b></TD>'
+	$RESULT +='<TD><b><<$sports_clothing_name[default_entry]>></b></TD>'
 	
-	$RESULT +='<TD><img width="100" src="<<FUNC(''$clothing_image'', ''danilovich_outfits'', sportsclothingnumber)>>"></TD>'
-	$RESULT +='<TD><img width="100" src="<<FUNC(''$panty_image'',  $sportspantytype, sportspantynumber)>>"></TD>'
-	$RESULT +='<TD><img width="100" src="<<FUNC(''$bra_image'',  $sportsbratype, sportsbranumber)>>"></TD>'
-	$RESULT +='<TD><img width="100" src="<<FUNC(''$shoe_image'', ''danilovich'', sportsshoenumber)>>"></TD>'
-	$RESULT +='<TD><img width="100" src="<<FUNC(''$coat_image'',  $sportscoattype, sportscoatnumber)>>"></TD>'
-	$RESULT +='<TD><img width="100" src="<<FUNC(''$purse_image'',  $sportspursetype, sportspursenumber)>>"></TD>'
+	if sportsclothingnumber[default_entry] = 0:
+		$RESULT +='<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	else
+		$RESULT +='<TD><img width="100" src="<<FUNC(''$clothing_image'', ''danilovich_outfits'', sportsclothingnumber[default_entry])>>"></TD>'
+		$RESULT +='<TD><img width="100" src="<<FUNC(''$panty_image'',  $sportspantytype[default_entry], sportspantynumber[default_entry])>>"></TD>'
+		$RESULT +='<TD><img width="100" src="<<FUNC(''$bra_image'',  $sportsbratype[default_entry], sportsbranumber[default_entry])>>"></TD>'
+		$RESULT +='<TD><img width="100" src="<<FUNC(''$shoe_image'', ''danilovich'', sportsshoenumber[default_entry])>>"></TD>'
+		$RESULT +='<TD><img width="100" src="<<FUNC(''$coat_image'',  $sportscoattype[default_entry], sportscoatnumber[default_entry])>>"></TD>'
+		$RESULT +='<TD><img width="100" src="<<FUNC(''$purse_image'',  $sportspursetype[default_entry], sportspursenumber[default_entry])>>"></TD>'
+	end
 
 	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''sports_entry_wear''">Wear</a></TD>'
 	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''sports_entry_set''">Overwrite</a></TD>'
 	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''sports_clothing_name''">Rename</a></TD>'
-	$RESULT +='<TD></TD><TR>'
+	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''default_entry_delete'', <<default_entry>>">Delete</a></TD><TR>'
 }
 
 if $ARGS[0] = 'default':
+	if $clothing_default['page_name1'] = '': $clothing_default['page_name1'] = 'Custom1'
+	if $clothing_default['page_name2'] = '': $clothing_default['page_name2'] = 'Custom2'
+	if $clothing_default['page_name3'] = '': $clothing_default['page_name3'] = 'Custom3'
+	if $clothing_default['page_name4'] = '': $clothing_default['page_name4'] = 'Custom4'
+	if $clothing_default['page_name5'] = '': $clothing_default['page_name5'] = 'Custom5'
+	if $clothing_default['page_name6'] = '': $clothing_default['page_name6'] = 'Custom6'
+	if $clothing_default['page_name7'] = '': $clothing_default['page_name7'] = 'Custom7'
+	if $clothing_default['page_name8'] = '': $clothing_default['page_name8'] = 'Custom8'
+	if $clothing_default['page_name9'] = '': $clothing_default['page_name9'] = 'Custom9'
+	if $clothing_default['page_name10'] = '': $clothing_default['page_name10'] = 'Custom10'
+	$wloc = 'default'
 	gs 'stat'
-	'<center><table><TH>Name</TH><TH>Outfit</TH><TH>Panties</TH><TH>Bra</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
 	
-	'<TD></TD><TD></TD><TD></TD><TD><b>Sports outfit</b></TD><TR>'
+	'<center><table><TH><a href="exec:gt ''wardrobe'', ''main''"><img src="images/system/icons/clothing/clothes.png" height="50"></a></TH><TH><B>Default sets: Sport</B></TH><TH><a href="exec:gt ''wardrobe'', ''default''"><img src="images/system/icons/clothing/default.png" height="50"></a></TH></table></center>'
+	'<center><table><TH>Name</TH><TH>Outfit</TH><TH>Panties</TH><TH>Bra</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
+
+	default_entry = 0
+
+	:loopdefault_entry
 
 	*p dyneval($default_sports_line)
 
-	'<TR><TD></TD><TD></TD><TD></TD><TD><b>Default outfits</b></TD><TR>'
+		default_entry += 1
+
+	if default_entry <= 9:jump 'loopdefault_entry'
 	
-	default_entry = 1
+	'</table></center>'
+
+	gs 'wardrobe', 'default_actions', 0
+end
+
+if $ARGS[0] = 'default_template':
+	gs 'stat'
+	
+	'<center><table><TH><a href="exec:gt ''wardrobe'', ''main''"><img src="images/system/icons/clothing/clothes.png" height="50"></TH><TH><B>Default sets: <<$default_entry[2]>></B></TH><TH><a href="exec:gt ''wardrobe'', ''default''"><img src="images/system/icons/clothing/default.png" height="50"></TH><TR><TD></TD><TD><a href="exec:$clothing_default[''page_name<<ARGS[1]>>'']=input(''Enter new name for this set'') & gt ''wardrobe'', ''default<<ARGS[1]>>''">Rename set</a></TD></table></center>'
+	'<center><table><TH>Name</TH><TH>Outfit</TH><TH>Panties</TH><TH>Bra</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
+
 
 	:loopdefault_entry
 		
@@ -214,22 +244,127 @@ if $ARGS[0] = 'default':
 		
 		default_entry += 1
 
-	if default_entry <= 10:jump 'loopdefault_entry'
+	if default_entry <= default_entry[1]:jump 'loopdefault_entry'
 	
 	'</table></center>'
-	
-		
+end
+
+
+if $ARGS[0] = 'default_actions':
 	act 'Return':
-		if quick_dress = 1:
-			killvar '$wloc'
-			killvar 'quick_dress'
-			gt $loc, $loc_arg
-		else
-			gt $loc, $loc_arg
-		end
-	end
-	act 'Choose items to wear': gt 'wardrobe', 'main'
-	act 'Organise your outfits': org_loc = 1 & gt 'clothing', 'view_clothing_list', 'wardrobe'
+		gt $loc, $loc_arg
+	end
+	if ARGS[1] ! 0: act 'Sport': gt 'wardrobe', 'default'
+	if ARGS[1] ! 1: act '<<$clothing_default[''page_name1'']>>': gt 'wardrobe', 'default1'
+	if ARGS[1] ! 2: act '<<$clothing_default[''page_name2'']>>': gt 'wardrobe', 'default2'
+	if ARGS[1] ! 3: act '<<$clothing_default[''page_name3'']>>': gt 'wardrobe', 'default3'
+	if ARGS[1] ! 4: act '<<$clothing_default[''page_name4'']>>': gt 'wardrobe', 'default4'
+	if ARGS[1] ! 5: act '<<$clothing_default[''page_name5'']>>': gt 'wardrobe', 'default5'
+	if ARGS[1] ! 6: act '<<$clothing_default[''page_name6'']>>': gt 'wardrobe', 'default6'
+	if ARGS[1] ! 7: act '<<$clothing_default[''page_name7'']>>': gt 'wardrobe', 'default7'
+	if ARGS[1] ! 8: act '<<$clothing_default[''page_name8'']>>': gt 'wardrobe', 'default8'
+	if ARGS[1] ! 9: act '<<$clothing_default[''page_name9'']>>': gt 'wardrobe', 'default9'
+	if ARGS[1] ! 10: act '<<$clothing_default[''page_name10'']>>': gt 'wardrobe', 'default10'
+end
+
+if $ARGS[0] = 'default1':
+	$wloc = 'default1'
+	default_entry = 1
+	default_entry[1] = 10
+	$default_entry[2] = $clothing_default['page_name1']
+
+	gs 'wardrobe', 'default_template'
+	gs 'wardrobe', 'default_actions', 1
+end
+
+if $ARGS[0] = 'default2':
+	$wloc = 'default2'
+	default_entry = 11
+	default_entry[1] = 20
+	$default_entry[2] = $clothing_default['page_name2']
+
+	gs 'wardrobe', 'default_template'
+	gs 'wardrobe', 'default_actions', 2
+end
+
+if $ARGS[0] = 'default3':
+	$wloc = 'default3'
+	default_entry = 21
+	default_entry[1] = 30
+	$default_entry[2] = $clothing_default['page_name3']
+
+	gs 'wardrobe', 'default_template'
+	gs 'wardrobe', 'default_actions', 3
+end
+
+if $ARGS[0] = 'default4':
+	$wloc = 'default4'
+	default_entry = 31
+	default_entry[1] = 40
+	$default_entry[2] = $clothing_default['page_name4']
+
+	gs 'wardrobe', 'default_template'
+	gs 'wardrobe', 'default_actions', 4
+end
+
+if $ARGS[0] = 'default5':
+	$wloc = 'default5'
+	default_entry = 41
+	default_entry[1] = 50
+	$default_entry[2] = $clothing_default['page_name5']
+
+	gs 'wardrobe', 'default_template'
+	gs 'wardrobe', 'default_actions', 5
+end
+
+if $ARGS[0] = 'default6':
+	$wloc = 'default6'
+	default_entry = 51
+	default_entry[1] = 60
+	$default_entry[2] = $clothing_default['page_name6']
+
+	gs 'wardrobe', 'default_template'
+	gs 'wardrobe', 'default_actions', 6
+end
+
+if $ARGS[0] = 'default7':
+	$wloc = 'default7'
+	default_entry = 61
+	default_entry[1] = 70
+	$default_entry[2] = $clothing_default['page_name7']
+
+	gs 'wardrobe', 'default_template'
+	gs 'wardrobe', 'default_actions', 7
+end
+
+if $ARGS[0] = 'default8':
+	$wloc = 'default8'
+	default_entry = 71
+	default_entry[1] = 80
+	$default_entry[2] = $clothing_default['page_name8']
+
+	gs 'wardrobe', 'default_template'
+	gs 'wardrobe', 'default_actions', 8
+end
+
+if $ARGS[0] = 'default9':
+	$wloc = 'default9'
+	default_entry = 81
+	default_entry[1] = 90
+	$default_entry[2] = $clothing_default['page_name9']
+
+	gs 'wardrobe', 'default_template'
+	gs 'wardrobe', 'default_actions', 9
+end
+
+if $ARGS[0] = 'default10':
+	$wloc = 'default10'
+	default_entry = 91
+	default_entry[1] = 100
+	$default_entry[2] = $clothing_default['page_name10']
+
+	gs 'wardrobe', 'default_template'
+	gs 'wardrobe', 'default_actions', 10
 end
 
 if $ARGS[0] = 'default_entry_wear':
@@ -291,26 +426,13 @@ if $ARGS[0] = 'default_entry_wear':
 		cls
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
-		act 'Return':
-			if $wloc = 'wardrobe':
-				gt 'wardrobe', 'default'
-			elseif $wloc = 'workout':
-				gt 'exercise', 'workout'
-			else
-				gt $loc, $loc_arg
-			end
-		end
+		act 'Return': gt 'wardrobe', $wloc
 	!! do not own this clothing anymore
 	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>[<<defclothingnumber[default_entry]>>]') = 0:
 		cls
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'As you go to pull your <<$def_clothing_name[default_entry]>> outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
-		act 'Return to wardrobe':
-			gs 'clothing', 'strip'
-			killvar 'default_entry'
-			gs 'stat'
-			gt 'wardrobe', 'default'
-		end
+		act 'Return': gt 'wardrobe', $wloc
 	!! strength of clothing is less than or equal to 0
 	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>_h[<<defclothingnumber[default_entry]>>]') <= 0:
 		cls
@@ -320,7 +442,7 @@ if $ARGS[0] = 'default_entry_wear':
 			gs 'clothing', 'strip'
 			killvar 'default_entry'
 			gs 'stat'
-			gt 'wardrobe', 'default'
+			act 'Return': gt 'wardrobe', $wloc
 		end
 	!! clothing exhibition is greater than player exhibition
 	elseif CloInhibit > pcs_inhib:
@@ -331,7 +453,7 @@ if $ARGS[0] = 'default_entry_wear':
 			gs 'clothing', 'strip'
 			killvar 'default_entry'
 			gs 'stat'
-			gt 'wardrobe', 'default'
+			act 'Return': gt 'wardrobe', $wloc
 		end
 	!! not exercise clothing, and not loose fitting
 	elseif $defclothingtype[default_entry] ! 'danilovich_outfits' and CloStyle ! 5:
@@ -345,37 +467,21 @@ if $ARGS[0] = 'default_entry_wear':
 				gs 'clothing', 'strip'
 				killvar 'default_entry'
 				gs 'stat'
-				gt 'wardrobe', 'default'
+				act 'Return': gt 'wardrobe', $wloc
 			end
 		!! clothing ok to wear after passing hip check
 		else
 			cls
 			'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 			'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
-			act 'Return':
-				if $wloc = 'wardrobe':
-					gt 'wardrobe', 'default'
-				elseif $wloc = 'workout':
-					gt 'exercise', 'workout'
-				else
-					gt $loc, $loc_arg
-				end
-			end
+			act 'Return': gt 'wardrobe', $wloc
 		end
 	!! clothing ok to wear without needing hip check and passing all other checks
 	else
 		cls
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
-		act 'Return':
-			if $wloc = 'wardrobe':
-				gt 'wardrobe', 'default'
-			elseif $wloc = 'workout':
-				gt 'exercise', 'workout'
-			else
-				gt $loc, $loc_arg
-			end
-		end
+		act 'Return': gt 'wardrobe', $wloc
 	end
 end
 
@@ -406,7 +512,7 @@ if $ARGS[0] = 'default_entry_set':
 	elseif $def_clothing_name[i] = '':
 		$def_clothing_name[i] = '<<$def_clothing_temp>>'
 	end
-	gt 'wardrobe', 'default'
+	gt 'wardrobe', $wloc
 end
 
 if $ARGS[0] = 'default_entry_rename':
@@ -420,7 +526,7 @@ if $ARGS[0] = 'default_entry_rename':
 	elseif $def_clothing_name[i] = '':
 		$def_clothing_name[i] = '<<$def_clothing_temp>>'
 	end
-	gt 'wardrobe', 'default'
+	gt 'wardrobe', $wloc
 end
 
 if $ARGS[0] = 'default_entry_up':
@@ -475,7 +581,7 @@ if $ARGS[0] = 'default_entry_up':
 	defcoatnumber[j] = tempcurrentcoatnumber
 	$def_clothing_name[j] = '<<$def_clothing_temp>>'
 
-	gt 'wardrobe', 'default'
+	gt 'wardrobe', $wloc
 end
 
 if $ARGS[0] = 'default_entry_down':
@@ -530,49 +636,49 @@ if $ARGS[0] = 'default_entry_down':
 	defcoatnumber[j] = tempcurrentcoatnumber
 	$def_clothing_name[j] = '<<$def_clothing_temp>>'
 
-	gt 'wardrobe', 'default'
+	gt 'wardrobe', $wloc
 end
 
 if $ARGS[0] = 'default_entry_delete':
 	gs 'stat'
 	i = ARGS[1]
-	killvar 'defclothingtype', i
-	killvar 'defclothingnumber', i
-	killvar 'defbratype', i
-	killvar 'defbranumber', i
-	killvar 'defpantytype', i
-	killvar 'defpantynumber', i
-	killvar 'defshoetype', i
-	killvar 'defshoenumber', i
-	killvar 'defpursetype', i
-	killvar 'defpursenumber', i
-	killvar 'defcoattype', i
-	killvar 'defcoatnumber', i
-	killvar 'def_clothing_name', i
-	gt 'wardrobe', 'default'
+	$defclothingtype[i] = ''
+	defclothingnumber[i] = ''
+	$defbratype[i] = ''
+	defbranumber[i] = ''
+	$defpantytype[i] = ''
+	defpantynumber[i] = ''
+	$defshoetype[i] = ''
+	defshoenumber[i] = ''
+	$defpursetype[i] = ''
+	defpursenumber[i] = ''
+	$defcoattype[i] = ''
+	defcoatnumber[i] = ''
+	$def_clothing_name[i] = ''
+	gt 'wardrobe', $wloc
 end
 
 !!-- sports outfit stuff
 
 if $ARGS[0] = 'sports_entry_set':
 	gs 'stat'
-	if $clothingworntype ! 'danilovich_outfits' OR $shoeworntype ! 'danilovich':
+	if $clothingworntype ! 'danilovich_outfits' or $shoeworntype ! 'danilovich':
 		MSG 'The sports outfit needs to include exercise clothes and training shoes'
-		gt 'wardrobe', 'main'
+		gt 'wardrobe', $wloc
 	else
 		gs 'stat'
-		$sportsclothingtype = $clothingworntype
-		sportsclothingnumber = clothingwornnumber
-		$sportsbratype = $braworntype
-		sportsbranumber = brawornnumber
-		$sportspantytype = $pantyworntype
-		sportspantynumber = pantywornnumber
-		$sportsshoetype = $shoeworntype
-		sportsshoenumber = shoewornnumber
-		$sportspursetype = $currentpursetype
-		sportspursenumber = currentpursenumber
-		$sportscoattype = $coatworntype
-		sportscoatnumber = coatwornnumber
+		$sportsclothingtype[i] = $clothingworntype
+		sportsclothingnumber[i] = clothingwornnumber
+		$sportsbratype[i] = $braworntype
+		sportsbranumber[i] = brawornnumber
+		$sportspantytype[i] = $pantyworntype
+		sportspantynumber[i] = pantywornnumber
+		$sportsshoetype[i] = $shoeworntype
+		sportsshoenumber[i] = shoewornnumber
+		$sportspursetype[i] = $currentpursetype
+		sportspursenumber[i] = currentpursenumber
+		$sportscoattype[i] = $coatworntype
+		sportscoatnumber[i] = coatwornnumber
 
 		$sports_clothing_temp = '<<$sports_clothing_name>>'
 		$sports_clothing_name = input ('<center>Enter a name for this outfit set<br><font color="grey">Leaving blank will reuse current name.</font></center>')
@@ -581,57 +687,49 @@ if $ARGS[0] = 'sports_entry_set':
 		elseif $sports_clothing_name = '':
 			$sports_clothing_name = '<<$sports_clothing_temp>>'
 		end
-		gt 'wardrobe', 'default'
+		gt 'wardrobe', $wloc
 	end
 end
 
 if $ARGS[0] = 'sports_entry_wear':
-	$lastwornclothingtype['sports'] = $clothingworntype
-	lastwornclothingnumber['sports'] = clothingwornnumber
-	$lastwornpantytype['sports'] = $pantyworntype
-	lastwornpantynumber['sports'] = pantywornnumber
-	$lastwornbratype['sports'] = $braworntype
-	lastwornbranumber['sports'] = brawornnumber
-	$lastwornshoetype['sports'] = $shoeworntype
-	lastwornshoenumber['sports'] = shoewornnumber
 	gs 'stat'
 	!gs 'wardrobe', 'prev_entry_set' this does not exist
 
-	gs 'clothing_attributes', 'danilovich_outfits', sportsclothingnumber
+	gs 'clothing_attributes', 'danilovich_outfits', sportsclothingnumber[i]
 
-	if ARRPOS('$CloLosTyp', 'danilovich_outfits') ! -1 and ARRPOS('CloLosNum', sportsclothingnumber) ! -1:
+	if ARRPOS('$CloLosTyp', 'danilovich_outfits') ! -1 and ARRPOS('CloLosNum', sportsclothingnumber[i]) ! -1:
 		msg '<center>You''ve lost part of this set, and are unable to wear all items.<br>Maybe you can find the missing clothes somewhere?</center>'
 	else
-		gs 'clothing', 'wear', 'danilovich_outfits', sportsclothingnumber
+		gs 'clothing', 'wear', 'danilovich_outfits', sportsclothingnumber[i]
 	end
 
-	if dyneval('RESULT = <<$sportsbratype>>_bras[<<sportsbranumber>>]') = 0: $sportsbratype = 'none' & sportsbranumber = 0
+	if dyneval('RESULT = <<$sportsbratype[i]>>_bras[<<sportsbranumber[i]>>]') = 0: $sportsbratype[i] = 'none' & sportsbranumber[i] = 0
 	
-	if $sportspantytype = 'none':
+	if $sportspantytype[i] = 'none':
 		$lastwornbratype = 'none'
 		lastwornbranumber = 0
 		gs 'bras', 'remove'
 	else
-		gs 'bras', 'wear', $sportsbratype, sportsbranumber
+		gs 'bras', 'wear', $sportsbratype[i], sportsbranumber[i]
 	end
 		
 
-	if dyneval('RESULT = <<$sportspantytype>>_panties[<<sportspantynumber>>]') = 0: $sportspantytype = 'none' & sportspantynumber = 0
-	if $sportspantytype = 'none':
+	if dyneval('RESULT = <<$sportspantytype[i]>>_panties[<<sportspantynumber[i]>>]') = 0: $sportspantytype[i] = 'none' & sportspantynumber[i] = 0
+	if $sportspantytype[i] = 'none':
 		$lastwornpantytype = 'none'
 		lastwornpantynumber = 0
 		gs 'panties', 'remove'
 	else
-		gs 'panties', 'wear', $sportspantytype, sportspantynumber
+		gs 'panties', 'wear', $sportspantytype[i], sportspantynumber[i]
 	end
 	
-	gs 'shoes', 'wear', 'danilovich', sportsshoenumber
+	gs 'shoes', 'wear', 'danilovich', sportsshoenumber[i]
 
 	minut += 2
 	gs 'stat'
 
 	!! do not own this clothing anymore
-	if dyneval('RESULT = danilovich_outfits[<<sportsclothingnumber>>]') = 0:
+	if dyneval('RESULT = danilovich_outfits[<<sportsclothingnumber[i]>>]') = 0:
 		cls
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'As you go to pull your sports outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
@@ -639,7 +737,7 @@ if $ARGS[0] = 'sports_entry_wear':
 		gs 'clothing', 'strip'
 		gs 'stat'
 	!! strength of clothing is less than or equal to 0
-	elseif dyneval('RESULT = danilovich_outfits_h[<<sportsclothingnumber>>]') <= 0:
+	elseif dyneval('RESULT = danilovich_outfits_h[<<sportsclothingnumber[i]>>]') <= 0:
 		cls
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
 		'Your sports outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
@@ -661,49 +759,7 @@ if $ARGS[0] = 'sports_entry_wear':
 		'You put on your sports outfit without any problems.'
 	end
 	
-	act 'Return':
-		if $wloc = 'wardrobe':
-			gt 'wardrobe', 'default'
-		elseif $wloc = 'workout':
-			gt 'exercise', 'workout'
-		else
-			gt $loc, $loc_arg
-		end
-	end
-end
-
-if $ARGS[0] = 'sports_outfit_remove':
-	$lastwornclothingtype = $lastwornclothingtype['sports']
-	lastwornclothingnumber = lastwornclothingnumber['sports']
-	$lastwornbratype = $lastwornbratype['sports']
-	lastwornbranumber = lastwornbranumber['sports']
-	$lastwornpantytype = $lastwornpantytype['sports']
-	lastwornpantynumber = lastwornpantynumber['sports']
-	$shoelastworntype = $lastwornshoetype['sports']
-	shoelastwornnumber = lastwornshoenumber['sports']
-	gs 'clothing', 'wear_last_worn'
-	gs 'underwear', 'wear'
-	gs 'shoes', 'wear', 'last_worn'
-	gs 'stat'
-	cla & *clr
-	'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-	'You change out of your sports outfit and back into your regular clothes.'
-	act 'Return':
-		if $wloc = 'wardrobe':
-			gt 'wardrobe', 'main'
-		else
-			gt $loc, $loc_arg
-		end
-	end
-end
-
-if $ARGS[0] = 'sports_outfit':
-	gs 'stat'
-	if $clothingworntype ! 'danilovich_outfits' or $shoeworntype ! 'danilovich':
-		act 'Change into: <<$sports_clothing_name>>':gs 'wardrobe', 'sports_entry_wear'
-	elseif $lastwornclothingtype['sports'] ! '' and ($clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich'):
-		act'Change out of your <<$sports_clothing_name>>':gs 'wardrobe', 'sports_outfit_remove'
-	end
+	act 'Return': gt 'wardrobe', $wloc
 end
 
 if $ARGS[0] = 'school_outfit':
@@ -747,27 +803,5 @@ if $ARGS[0] = 'school_outfit':
 	gs 'clothing', 'wear', $schbrand, schtype
 end
 
-!!-- quickdress
-
-if $ARGS[0] = 'quickdress':
-	if quickdress = 1:
-	'<table width="600">'
-		'<tr><td>'
-			'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
-			'<b><<$sports_clothing_name>>:</b> <a href="exec:gs ''wardrobe'', ''sports_entry_wear''">Wear</a>'
-			if ARRSIZE('defclothingnumber') > 0:
-				i = 0
-				:loopdefclothing
-				'<b><<$def_clothing_name[i]>>:</b> <a href="exec:gs ''wardrobe'', ''default_entry_wear'', <<i>>">Wear</a>'
-				i += 1
-				if i < ARRSIZE('defclothingnumber'):jump 'loopdefclothing'
-			end
-		'</td></tr>'
-	'</table>' 
-	else
-	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
-	end
-end
-
 --- wardrobe ---------------------------------