Clothing enhancments and bug fixes

locations/_bra_image.qsrc

@@ -17,6 +17,8 @@ elseif $ARGS[0] = 'sexshop':
 	$RESULT = 'images/pc/bras/sexshop/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'sport':
 	$RESULT = 'images/pc/bras/sport/<<ARGS[1]>>.jpg'
+else
+	$RESULT = ''
 end
 
 --- $bra_image ---------------------------------

locations/_panty_image.qsrc

@@ -17,6 +17,8 @@ elseif $ARGS[0] = 'sexshop':
 	$RESULT = 'images/pc/panties/sexshop/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'sport':
 	$RESULT = 'images/pc/panties/sport/<<ARGS[1]>>.jpg'
+else
+	$RESULT = ''
 end
 
 --- $panty_image ---------------------------------

locations/_purse_image.qsrc

@@ -21,6 +21,8 @@ elseif $ARGS[0] = 'moncheri':
 	$RESULT = 'images/pc/items/moncheri/purses/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'bomba':
 	$RESULT = 'images/pc/items/bomba/purses/<<ARGS[1]>>.jpg'
+else
+  $RESULT = ''
 end
 
 --- $purse_image ---------------------------------

locations/bras.qsrc

@@ -21,8 +21,8 @@ end
 
 if $ARGS[0] = 'wear':
 	bra_none = 0
-	if $ARGS[1] = '':
-		if dyneval('RESULT = <<$lastwornbratype>>_brasS[<<lastwornbranumber>>]') = 0 and $lastwornbratype ! '':
+	if $ARGS[1] = '' or $ARGS[1] = 'none' or ARGS[2] = 0:
+		if $lastwornbratype ! '':
 			$braworntype = $lastwornbratype
 			brawornnumber = lastwornbranumber
 		else
@@ -30,7 +30,7 @@ if $ARGS[0] = 'wear':
 			brawornnumber = 0
 		end
 	else
-		if dyneval('RESULT = <<$ARGS[1]>>_brasS[<<ARGS[2]>>]') = 0:
+		if $ARGS[1] ! '' and $ARGS[1] ! 'none' and ARGS[2] > 0:
 			$braworntype = $ARGS[1]
 			brawornnumber = ARGS[2]
 		else
@@ -38,6 +38,9 @@ if $ARGS[0] = 'wear':
 			brawornnumber = 0
 		end
 	end
+
+	$lastwornbratype = $braworntype
+	lastwornbranumber = brawornnumber
 end
 
 

locations/clothing.qsrc

@@ -1421,6 +1421,11 @@ if $ARGS[0] = 'view_clothing_item':
 		end
 	end
 
+	if CloStyle3 = 1: 'This is a dominant outfit.'
+	if CloStyle3 = 2: 'This is a submissive outfit.'
+	if CloStyle3 = 3: 'This outfit is used for roleplay.'
+	if CloStyle3 = 4: 'This outfit is worn by secretaries.'
+
 	if $ARGS[4] ! 'shop' and ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6):
 		$RESULT = '(strength '
 		dynamic '$RESULT += <<$ARGS[1]>>_h[<<ARGS[2]>>]'

locations/clothing_QV.qsrc

@@ -26,45 +26,45 @@ if $ARGS[0] = 'list':
 
 	'<center><TH><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''all''"><img src="images/system/icons/clothing/all_outfits.png"></a></TH></center>'
 
-	if ARRSIZE('gm_outfits') > 0 or ARRSIZE('gm_dress'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
+	if ARRSIZE('gm_outfits') > 0 or ARRSIZE('gm_dress'): *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a>'
 
-	if ARRSIZE('gm_school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_school''"><img src="images/pc/items/gm/school.png"></a></center>'
+	if ARRSIZE('gm_school') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_school''"><img src="images/pc/items/gm/school.png"></a>'
  
-	if ARRSIZE('gm_office'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_office''"><img src="images/pc/items/gm/officewear.png"></a></center>'
+	if ARRSIZE('gm_office'): *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_office''"><img src="images/pc/items/gm/officewear.png"></a>'
 
-	if ARRSIZE('gm_maid'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_maid''"><img src="images/pc/items/gm/maid.png"></a></center>'
+	if ARRSIZE('gm_maid'): *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_maid''"><img src="images/pc/items/gm/maid.png"></a>'
 
-	if ARRSIZE('gm_server'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_server''"><img src="images/pc/items/gm/server.png"></a></center>'
+	if ARRSIZE('gm_server'): *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_server''"><img src="images/pc/items/gm/server.png"></a>'
 
-	if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
+	if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a>'
 
-	if ARRSIZE('flamingos_outfits') > 0 or ARRSIZE('flamingos_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''flamingos''"><img src="images/locations/city/island/flamingos/shop_name.png"></a></center>'
+	if ARRSIZE('flamingos_outfits') > 0 or ARRSIZE('flamingos_dress') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''flamingos''"><img src="images/locations/city/island/flamingos/shop_name.png"></a>'
 
-	if ARRSIZE('coco_outfits') > 0 or ARRSIZE('coco_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''coco''"><img src="images/locations/pavlovsk/coco/shop_name.png"></a></center>'
+	if ARRSIZE('coco_outfits') > 0 or ARRSIZE('coco_dress') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''coco''"><img src="images/locations/pavlovsk/coco/shop_name.png"></a>'
 
-	if ARRSIZE('fashionista') > 0 or ARRSIZE('fashionista_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''fashionista''"><img src="images/locations/city/citycenter/mall/fashionista.png"></a></center>'
+	if ARRSIZE('fashionista') > 0 or ARRSIZE('fashionista_outfits') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''fashionista''"><img src="images/locations/city/citycenter/mall/fashionista.png"></a>'
 
-	if ARRSIZE('moncheri_gown') > 0 or ARRSIZE('moncheri_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''moncheri''"><img src="images/locations/city/citycenter/mall/moncheri.png"></a></center>'
+	if ARRSIZE('moncheri_gown') > 0 or ARRSIZE('moncheri_dress') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''moncheri''"><img src="images/locations/city/citycenter/mall/moncheri.png"></a>'
 
-	if ARRSIZE('scandalicious_outfits') > 0 or ARRSIZE('scandalicious_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''scandalicious''"><img src="images/locations/city/citycenter/mall/scandalicious.png"></a></center>'
+	if ARRSIZE('scandalicious_outfits') > 0 or ARRSIZE('scandalicious_dress') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''scandalicious''"><img src="images/locations/city/citycenter/mall/scandalicious.png"></a>'
 
-	if ARRSIZE('fancy_burlesque') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''fancypancy''"><img src="images/locations/pushkin/fancypancy/shop_name.png"></a></center>'
+	if ARRSIZE('fancy_burlesque') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''fancypancy''"><img src="images/locations/pushkin/fancypancy/shop_name.png"></a>'
 
-	if ARRSIZE('eroto_dress') > 0 or ARRSIZE('eroto_outfits') > 0 or ARRSIZE('eroto_strip') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''sexshop''"><img src="images/locations/city/redlight/erotomaniac/shop_name.png"></a></center>'
+	if ARRSIZE('eroto_dress') > 0 or ARRSIZE('eroto_outfits') > 0 or ARRSIZE('eroto_strip') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''sexshop''"><img src="images/locations/city/redlight/erotomaniac/shop_name.png"></a>'
 
-	if ARRSIZE('salacious_outfits') > 0 or ARRSIZE('salacious_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''exhibitshop''"><img src="images/locations/pushkin/exhibitshop/shop_name.png"></a></center>'
+	if ARRSIZE('salacious_outfits') > 0 or ARRSIZE('salacious_dress') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''exhibitshop''"><img src="images/locations/pushkin/exhibitshop/shop_name.png"></a>'
 
-	if ARRSIZE('dolls_outfits') > 0 or ARRSIZE('dolls_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''dolls''"><img src="images/locations/city/island/dolls/shop_name.png"></a></center>'
+	if ARRSIZE('dolls_outfits') > 0 or ARRSIZE('dolls_dress') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''dolls''"><img src="images/locations/city/island/dolls/shop_name.png"></a>'
 
-	if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('bomba_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''bomba''"><img src="images/locations/pushkin/bomba/shop_name.png"></a></center>'
+	if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('bomba_dress') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''bomba''"><img src="images/locations/pushkin/bomba/shop_name.png"></a>'
 
-	if ARRSIZE('nerdvana_cosplay') > 0 or ARRSIZE('nerdvana_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''nerdvana''"><img src="images/locations/city/island/nerdvana/shop_name.png"></a></center>'
+	if ARRSIZE('nerdvana_cosplay') > 0 or ARRSIZE('nerdvana_outfits') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''nerdvana''"><img src="images/locations/city/island/nerdvana/shop_name.png"></a>'
 
-	if ARRSIZE('danilovich_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
+	if ARRSIZE('danilovich_outfits') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a>'
 
-	if ARRSIZE('materinstvo_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''materinstvo''"><img src="images/locations/city/citycenter/mall/mommy.png"></a></center>'
+	if ARRSIZE('materinstvo_dress') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''materinstvo''"><img src="images/locations/city/citycenter/mall/mommy.png"></a>'
 
-	if ARRSIZE('market_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''market''"><img src="images/pc/items/market/market.png"></a></center>'
+	if ARRSIZE('market_outfits') > 0: *p '<a href="exec:gt ''clothing_QV'', ''clothing_list'', ''market''"><img src="images/pc/items/market/market.png"></a>'
 end
 
 if $ARGS[0] = 'clothing_list':
@@ -1301,6 +1301,12 @@ if $ARGS[0] = 'change':
 			'<font color="red">This uniform makes a mockery of the school regulations. Every students except the gopniks will think you a slut for wearing it.</font>'
 		end
 	end
+
+	if CloStyle3 = 1: 'This is a dominant outfit.'
+	if CloStyle3 = 2: 'This is a submissive outfit.'
+	if CloStyle3 = 3: 'This outfit can be used for roleplay.'
+	if CloStyle3 = 4: 'This outfit can be worn by secretaries.'
+
 	act 'Return':gt 'clothing_QV', 'clothing_list', '<<$ward_list_store>>'
 
 	if $clothingworntype = $ARGS[1] and clothingwornnumber = ARGS[2]:

locations/clothing_attributes.qsrc

@@ -86,8 +86,11 @@ CloDress = 0
 CloOnePiece = 0
 CloStyle = 0
 CloStyle2 = 0
+CloStyle3 = 0
 CloBimbo = 0
 CloInhibit = 0
+CloSwimwear = 0
+$swimwear_description = ''
 
 if $ARGS[0] = 'gm_outfits':
 	*P FUNC('$attributes_gm_outfits', $ARGS[0], ARGS[1])
@@ -173,7 +176,7 @@ elseif $ARGS[0] = 'nerdvana_swimsuit':
 	*P FUNC('$attributes_nerdvana_swim_one', $ARGS[0], ARGS[1])
 end
 
-if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! 'scandalicious_swimsuit' and $ARGS[0] ! 'scandalicious_bikinis' and $ARGS[0] ! 'danilovich_swimsuit' and $ARGS[0] ! 'nerdvana_swimsuit' and $ARGS[0] ! 'nerdvana_bikinis':
+if CloInhibit = 0:
 	if CloSkirtShortness = 6:
 		CloInhibit = 35
 	elseif CloSkirtShortness = 5 or CloPantsShortness = 6:
@@ -245,5 +248,6 @@ if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! '
 	end
 end
 
+if $swimwear_description ! '': CloSwimwear = 1
 --- clothing_attributes ---------------------------------
 

locations/clothing_descriptions.qsrc

@@ -184,5 +184,7 @@ elseif CloSkirtShortness > 0:
 	end
 end
 
+if $swimwear_description ! '': $description = $swimwear_description
+
 --- clothing_descriptions ---------------------------------
 

locations/panties.qsrc

@@ -25,9 +25,8 @@ if $ARGS[0] = 'remove':
 end
 
 if $ARGS[0] = 'wear':
-	panty_none = 0
-	if $ARGS[1] = '':
-		if dyneval('RESULT = <<$lastwornbratype>>_pantiesS[<<lastwornbranumber>>]') = 0 and $lastwornbratype ! '':
+	if $ARGS[1] = '' or $ARGS[1] = 'none' or ARGS[2] = 0:
+		if $lastwornpantytype ! '':
 			$pantyworntype = $lastwornpantytype
 			pantywornnumber = lastwornpantynumber
 		else
@@ -35,7 +34,7 @@ if $ARGS[0] = 'wear':
 			pantywornnumber = 0
 		end
 	else
-		if dyneval('RESULT = <<$ARGS[1]>>_pantiesS[<<ARGS[2]>>]') = 0:
+		if $ARGS[1] ! '' and $ARGS[1] ! 'none' and ARGS[2] > 0:
 			$pantyworntype = $ARGS[1]
 			pantywornnumber = ARGS[2]
 		else
@@ -43,6 +42,10 @@ if $ARGS[0] = 'wear':
 			pantywornnumber = 0
 		end
 	end
+
+	$lastwornpantytype = $pantyworntype
+	lastwornpantynumber = pantywornnumber
+
 end
 
 if $ARGS[0] = 'view_panty_list':

locations/shoes.qsrc

@@ -2,47 +2,51 @@
 
 !!This is the main file for shoes, like clothes but for your feet.
 
-$shoe_list_line = {
-	!! a single line in a shoe list (shoe rack, etc)
-	!! ARGS 0 - action type (shoe rack, sell, store, forsale)
-	!! ARGS 1 - shoe type
-	!! ARGS 2 - shoe index
-
-	gs 'themes', 'clothing', 1
-
-	$RESULT = '<TR bgcolor='+$bgcolor+'>'
-
-	if Enable_clothwidth > 0:
-		shoe_temp = Enable_clothwidth - 1
-	else
-		shoe_temp = 75 & !shoe widdefault to 75
-	end
-	$RESULT +='<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$shoe_image'', $ARGS[1], ARGS[2])>>" width="<<shoe_temp>>"></a></TD>'
-	killvar 'shoe_temp'
-	gs 'shoe_attributes', $ARGS[1], ARGS[2]
-
-	gs 'shoe_description2', $ARGS[2]
-	$RESULT += '<TD><<FUNC(''$shoe_description'', $ARGS[1])>> <<ARGS[2]>></TD><TD><<$description>></TD>'
-
-	if ShoStyle = 2:
-		$RESULT += '<TD>Yes</TD>'
-	else
-		$RESULT += '<TD>No</TD>'
-	end
-
-	if ShoStyle = 1:
-		$RESULT += '<TD>Yes</TD>'
-	else
-		$RESULT += '<TD>No</TD>'
-	end
-	
-	$RESULT += '<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a></TD>'
+!!$shoe_list_line = {
+!!	!! a single line in a shoe list (shoe rack, etc)
+!!	!! ARGS 0 - action type (shoe rack, sell, store, forsale)
+!!	!! ARGS 1 - shoe type
+!!	!! ARGS 2 - shoe index
+!!
+!!	gs 'themes', 'clothing', 1
+!!
+!!	$RESULT = '<TR bgcolor='+$bgcolor+'>'
+!!
+!!	if Enable_clothwidth > 0:
+!!		shoe_temp = Enable_clothwidth - 1
+!!	else
+!!		shoe_temp = 75 & !shoe widdefault to 75
+!!	end
+!!	$RESULT +='<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$shoe_image'', $ARGS[1], ARGS[2])>>" width="<<shoe_temp>>"></a></TD>'
+!!	killvar 'shoe_temp'
+!!	gs 'shoe_attributes', $ARGS[1], ARGS[2]
+!!
+!!	gs 'shoe_description2', $ARGS[2]
+!!	$RESULT += '<TD><<FUNC(''$shoe_description'', $ARGS[1])>> <<ARGS[2]>></TD><TD><<$description>></TD>'
+!!
+!!	if ShoStyle = 2:
+!!		$RESULT += '<TD>Yes</TD>'
+!!	else
+!!		$RESULT += '<TD>No</TD>'
+!!	end
+!!
+!!	if ShoStyle = 1:
+!!		$RESULT += '<TD>Yes</TD>'
+!!	else
+!!		$RESULT += '<TD>No</TD>'
+!!	end
+!!	
+!!	$RESULT += '<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a></TD>'
+!!
+!!	$RESULT += '<TD>'
+!!	if sloc ! 1:$RESULT += ' <a href="exec:gt ''shoes'', ''dest1'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Storage</a><BR>'
+!!	if sloc ! 0:$RESULT += ' <a href="exec:gt ''shoes'', ''dest0'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Wardrobe</a><BR>'
+!!	if sloc ! 2:$RESULT += ' <a href="exec:gt ''shoes'', ''dest2'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Unwanted</a>'
+!!	$RESULT += '</TD>'
+!!}
 
-	$RESULT += '<TD>'
-	if sloc ! 1:$RESULT += ' <a href="exec:gt ''shoes'', ''dest1'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Storage</a><BR>'
-	if sloc ! 0:$RESULT += ' <a href="exec:gt ''shoes'', ''dest0'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Wardrobe</a><BR>'
-	if sloc ! 2:$RESULT += ' <a href="exec:gt ''shoes'', ''dest2'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Unwanted</a>'
-	$RESULT += '</TD>'
+$shoe_list_line = {
+	$RESULT +='<a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$shoe_image'', $ARGS[1], ARGS[2])>>" height="200"></a>'
 }
 
 if $ARGS[0] = 'dest0':
@@ -78,7 +82,7 @@ if $ARGS[0] = 'view_shoe_list':
 		'<center><b>Select shoes to wear</b> *Bonus to attractiveness only applied in wardrobe and outdoors.</center>'
 		if $shoeworntype ! 'none':
 			act 'Remove shoes':
-				gs 'shoes', 'strip'
+				gs 'shoes', 'remove'
 				gt 'shoes', 'view_shoe_list', $ARGS[1]
 			end
 		end
@@ -98,57 +102,81 @@ if $ARGS[0] = 'view_shoe_list':
 
 	$bgcolor='#f3f4ee'
 
-	'<center><table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Shoe</TH><TH>Description</TH><TH>Bimbo</TH><TH>Stripper</TH><TH>Actions</TH>'
+	!!'<center><table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Shoe</TH><TH>Description</TH><TH>Bimbo</TH><TH>Stripper</TH><TH>Actions</TH>'
 
+	*nl
+  '<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
+	*nl
 	i = 1
 	:loopmoncheri_shoe
 		if moncheri_shoe[i] = 1 and moncheri_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'moncheri', i)
 		i += 1
 	if i <= 40:jump 'loopmoncheri_shoe'
 
+  *nl
+	'<center><img src="images/locations/city/citycenter/mall/pussycat.png"></center>'
+	*nl
 	i = 1
 	:loopcats_shoe
 		if cats_shoe[i] = 1 and cats_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'cats', i)
 		i += 1
 	if i <= 20:jump 'loopcats_shoe'
 
+  *nl
+	'<center><img src="images/locations/oldtown/bomba/shop_name.png"></center>'
+	*nl
 	i = 1
 	:loopbomba_shoe
 		if bomba_shoe[i] = 1 and bomba_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'bomba', i)
 		i += 1
 	if i <= 40:jump 'loopbomba_shoe'
 
+	*nl
+	'<center><img src="images/locations/city/island/dolls/shop_name.png"></center>'
+	*nl
 	i = 1
 	:loopdolls_shoe
 		if dolls_shoe[i] = 1 and dolls_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'dolls', i)
 		i += 1
 	if i <= 30:jump 'loopdolls_shoe'
 
+	*nl
+	'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+	*nl
 	i = 1
 	:loopgm_shoe
 		if gm_shoe[i] = 1 and gm_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'gm', i)
 		i += 1
 	if i <= 30:jump 'loopgm_shoe'
 
+	*nl
+	'<center><img src="images/locations/city/citycenter/sexshop/shop_name.png"></center>'
+	*nl
 	i = 1
 	:looperoto_shoe
 		if eroto_shoe[i] = 1 and eroto_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'eroto', i)
 		i += 1
 	if i <= 30:jump 'looperoto_shoe'
 
+	*nl
+	'<center><img src="images/locations/city/citycenter/mall/scandalicious.png"></center>'
+	*nl
 	i = 1
 	:loopscandalicious_shoe
 		if scandalicious_shoe[i] = 1 and scandalicious_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'scandalicious', i)
 		i += 1
 	if i <= 30:jump 'loopscandalicious_shoe'
 
+	*nl
+	'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
+	*nl
 	i = 1
 	:loopdanilovich_shoe
 		if danilovich_shoe[i] = 1 and danilovich_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'danilovich', i)
 		i += 1
 	if i <= 40:jump 'loopdanilovich_shoe'
 
-	'</table></center>' 
+	!!'</table></center>' 
 end
 
 if $ARGS[0] = 'moncheri':
@@ -276,8 +304,8 @@ if $ARGS[0] = 'view_shoe_item':
 	end
 end
 
-if $ARGS[0] = 'strip':
-	if $shoeworntype = 'none': exit
+if $ARGS[0] = 'remove' or $ARGS[0] = 'strip':
+	if $shoesworntype = 'none': exit
 
 	$shoelastworntype = $shoeworntype
 	shoelastwornnumber = shoewornnumber
@@ -319,7 +347,7 @@ if $ARGS[0] = 'wear':
 
 	gs 'shoe_attributes', $ARGS[1], ARGS[2]
 
-	dynamic '<<$ARGS[1]>>S[<<ARGS[2]>>] = 0'
+	dynamic '<<$ARGS[1]>>_shoe_s[<<ARGS[2]>>] = 0'
 
 	PShoQuality = ShoQuality
 	PShoHeels = ShoHeels

locations/underwear.qsrc

@@ -11,23 +11,25 @@ end
 
 if $ARGS[0] = 'remove':
 	!!check for swimwear to prevent duplicate stripping stopping Sveta putting underwear on when she puts her clothes on
-	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and $clothingworntype ! 'nerdvana_swimsuit' and $clothingworntype ! 'nerdvana_bikinis' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
-		if $pantyworntype = 'none':
-			panty_none = 1
-		else
+	if PCloSwimwear = 0 and ($pantyworntype ! 'none' or $braworntype ! 'none'):
+		if $pantyworntype ! 'none':
 			gs 'panties', 'remove'
-		end
-		if $braworntype = 'none':
-			bra_none = 1
 		else
+			$lastwornpantynumber = 'none'
+			lastwornpantynumber = 0
+		end
+		if $braworntype ! 'none':
 			gs 'bras', 'remove'
+		else
+			$lastwornbranumber = 'none'
+			lastwornbranumber = 0
 		end
 	end
 end
 
 if $ARGS[0] = 'wear':
-	if panty_none = 0: gs 'panties', 'wear'
-	if bra_none = 0: gs 'bras', 'wear'
+	gs 'panties', 'wear'
+	gs 'bras', 'wear'
 end
 
 if $ARGS[0] = 'dresser':

locations/wardrobe.qsrc

@@ -23,9 +23,17 @@ if $ARGS[0] = 'start':
 		killvar '$pursebratype' & killvar 'pursebranumber'
 	end
 
-end
+	act 'Your Clothes': gt 'wardrobe', 'main'
+	act 'Your Sets': gt 'wardrobe', $wloc
+	act 'Your Wardrobe': gt 'clothing', 'view_clothing_list', 'wardrobe'
+	act 'Leave': gt $loc, $loc_arg
 
+end
 
+if $ARGS[0] = 'sets':
+	if $wloc = '': $wloc = 'default1'
+	gt 'wardrobe', $wloc
+end
 
 if $ARGS[0] = 'main':
 	PShoQuality = ShoQuality
@@ -146,6 +154,10 @@ $default_clothing_suma = {
 	RESULT = defclothingnumber[ARGS[0]]+ defbranumber[ARGS[0]] + defpantynumber[ARGS[0]] + defshoenumber[ARGS[0]] + defpursenumber[ARGS[0]] + defcoatnumber[ARGS[0]]
 	}
 
+$sports_clothing_suma = {
+	RESULT = sportsclothingnumber[ARGS[0]]+ sportsbranumber[ARGS[0]] + sportspantynumber[ARGS[0]] + sportsshoenumber[ARGS[0]] + sportspursenumber[ARGS[0]] + sportscoatnumber[ARGS[0]]
+	}
+
 $default_clothing_line = {
 	!! a single line in a clothing list (wardrobe, etc)
 	!! ARGS 0 - action type (wardrobe, sell, resize, store, forsale)
@@ -244,6 +256,14 @@ $default_sports_line = {
 	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''sports_entry_delete'', <<default_entry>>"><img src="images/system/icons/clothing/delete_on.png"></a></TD><TR>'
 }
 
+$default_clothing_wear = {
+	$RESULT += 'act ''Wear <<$def_clothing_name[default_entry]>>'': gs ''wardrobe'', ''default_entry_wear'', <<default_entry>>'
+}
+
+$default_sports_wear = {
+	$RESULT += 'act ''Wear <<$sports_clothing_name[default_entry]>>'': gs ''wardrobe'', ''sports_entry_wear'', <<default_entry>>'
+}
+
 if $ARGS[0] = 'default':
 	if $clothing_default_page[1] = '': $clothing_default_page[1] = 'Custom1'
 	if $clothing_default_page[2] = '': $clothing_default_page[2] = 'Custom2'
@@ -261,17 +281,17 @@ if $ARGS[0] = 'default':
 	'<center><table><TH><a href="exec:gt ''wardrobe'', ''main''"><img src="images/system/icons/clothing/clothes.png" height="50"></a></TH><TH><B>Your Sets: Sport</B></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''"><img src="images/system/icons/clothing/organize.png" height="50"></a></TH></table></center>'
 	'<center><table><TH>Name</TH><TH>Outfit</TH><TH>Bra</TH><TH>Panties</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
 
-	default_entry = 0
+	default_entry = 1
 	:loopdefault_entry_sport_set
-		if dyneval($default_clothing_suma,default_entry) ! 0: *p dyneval($default_sports_line)
+		if dyneval($sports_clothing_suma,default_entry) ! 0: *p dyneval($default_sports_line)
 		default_entry += 1
-	if default_entry <= 9:jump 'loopdefault_entry_sport_set'
+	if default_entry <= 10:jump 'loopdefault_entry_sport_set'
 
-	default_entry = 0
+	default_entry = 1
 	:loopdefault_entry_sport_empty
-		if dyneval($default_clothing_suma,default_entry) = 0: *p dyneval($default_sports_line)
+		if dyneval($sports_clothing_suma,default_entry) = 0: *p dyneval($default_sports_line)
 		default_entry += 1
-	if default_entry <= 9:jump 'loopdefault_entry_sport_empty'
+	if default_entry <= 10:jump 'loopdefault_entry_sport_empty'
 
 	'</table></center>'
 
@@ -298,6 +318,8 @@ if $ARGS[0] = 'default_template':
 		if dyneval($default_clothing_suma,default_entry) = 0: *p dyneval($default_clothing_line)
 		default_entry += 1
 	if default_entry <= default_entry[1]:jump 'loopdefault_entry_empty'
+	
+	default_entry = temp
 
 	'</table></center>'
 end
@@ -312,6 +334,38 @@ if $ARGS[0] = 'default_actions':
 	act 'Return':
 		gt $loc, $loc_arg
 	end
+
+	if ARGS[1] = 0:  $temp3 = 'default'   & $temp4 = 'Sport'
+	if ARGS[1] = 1:  $temp3 = 'default1'  & $temp4 = '<<$clothing_default_page[1]>>'
+	if ARGS[1] = 2:  $temp3 = 'default2'  & $temp4 = '<<$clothing_default_page[2]>>'
+	if ARGS[1] = 3:  $temp3 = 'default3'  & $temp4 = '<<$clothing_default_page[3]>>'
+	if ARGS[1] = 4:  $temp3 = 'default4'  & $temp4 = '<<$clothing_default_page[4]>>'
+	if ARGS[1] = 5:  $temp3 = 'default5'  & $temp4 = '<<$clothing_default_page[5]>>'
+	if ARGS[1] = 6:  $temp3 = 'default6'  & $temp4 = '<<$clothing_default_page[6]>>'
+	if ARGS[1] = 7:  $temp3 = 'default7'  & $temp4 = '<<$clothing_default_page[7]>>'
+	if ARGS[1] = 8:  $temp3 = 'default8'  & $temp4 = '<<$clothing_default_page[8]>>'
+	if ARGS[1] = 9:  $temp3 = 'default9'  & $temp4 = '<<$clothing_default_page[9]>>'
+	if ARGS[1] = 10: $temp3 = 'default10' & $temp4 = '<<$clothing_default_page[10]>>'
+	
+	act '<b>Wear <<$temp4>></b>':
+		cla
+
+		act '<b>Back</b>': gt 'wardrobe', $temp3
+
+		if $temp3 = 'default':
+			default_entry = 1
+			:loopdefault_entry_sport_wear
+				if dyneval($sports_clothing_suma,default_entry) ! 0: dyneval(dyneval($default_sports_wear))
+				default_entry += 1
+			if default_entry <= 10:jump 'loopdefault_entry_sport_wear'
+		else
+			:loopdefault_entry_wear
+				if dyneval($default_clothing_suma,default_entry) ! 0: dyneval(dyneval($default_clothing_wear))
+				default_entry += 1
+			if default_entry <= default_entry[1]:jump 'loopdefault_entry_wear'
+		end
+	end
+
 	if ARGS[1] ! 0: act 'Sport': gt 'wardrobe', 'default'
 	if ARGS[1] ! 1: act '<<$clothing_default_page[1]>>': gt 'wardrobe', 'default1'
 	if ARGS[1] ! 2: act '<<$clothing_default_page[2]>>': gt 'wardrobe', 'default2'
@@ -740,7 +794,7 @@ if $ARGS[0] = 'sports_entry_set':
 		$sportscoattype[i] = $coatworntype
 		sportscoatnumber[i] = coatwornnumber
 
-		$sports_clothing_temp = '<<$sports_clothing_name>>'
+		$sports_clothing_temp = '<<$sports_clothing_name[i]>>'
 		$sports_clothing_name[i] = input ('<center>Enter a name for this outfit set<br><font color="grey">Leaving blank will reuse current name.</font></center>')
 		if $sports_clothing_name[i] = '' and $sports_clothing_temp = '':
 			$sports_clothing_name[i] = 'default sports outfit'