[changed] Updated clothing UI for for shops, wardrobe and clothing list to make everything that much easier to use with new filter system that lets you filter out and sort clothing like never before. You will need the image pack that is due out

locations/budgetclothes.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing G&M outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -108,8 +108,9 @@ if $ARGS[0] = 'clothes':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_outfits_filter
 
 		if Clothingstock - 16 > 0:
 			i = 1
@@ -124,16 +125,22 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'gm_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_outfits''"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_outfits''"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 
 			if i = 414:i = 415
 		if i <= 150:jump 'loopgm_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'gm_outfits':
@@ -144,7 +151,7 @@ if $ARGS[0] = 'gm_outfits':
 		gt 'budgetclothes', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_outfits',i, 1000
+	gt 'clothing', 'view_clothing_item', 'gm_outfits',i, 1000, 'shop'
 end
 
 if $ARGS[0] = 'dresses':
@@ -158,7 +165,7 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing G&M dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -166,8 +173,9 @@ if $ARGS[0] = 'dresses':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality1
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_dress_filter
 
 		if Clothingstock - 16 > 0:
 			i = 1
@@ -182,14 +190,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'gm_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_dress''"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_dress''"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 150:jump 'loopgm_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality1'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'gm_dress':
@@ -200,7 +214,7 @@ if $ARGS[0] = 'gm_dress':
 		gt 'budgetclothes', 'dresses'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_dress',i, 1000
+	gt 'clothing', 'view_clothing_item', 'gm_dress',i, 1000, 'shop'
 end
 
 if $ARGS[0] = 'office':
@@ -214,7 +228,7 @@ if $ARGS[0] = 'office':
 	'<center><b><font color="maroon">Viewing G&M office clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -222,29 +236,31 @@ if $ARGS[0] = 'office':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
-!!		if Clothingstock > 15:
-!!			i = 3
-!!		elseif Clothingstock > 7:
-!!			i = 2
-!!		else
-			i = 1
-!!		end
+	!!To filter just this set
+	clo_i = 0
+	:loopoffice_filter
+
+		i = 1
 
 		:loopoffice
 			if gm_office[i] = 0:
 				gs 'clothing_attributes', 'gm_office', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''officeclo''"><img src="images/pc/items/gm/office/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''officeclo''"><img src="images/pc/items/gm/office/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 40:jump 'loopoffice'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopoffice_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopoffice_filter'
+	end
 end
 
 if $ARGS[0] = 'officeclo':
@@ -255,7 +271,7 @@ if $ARGS[0] = 'officeclo':
 		gt 'budgetclothes', 'office'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_office',i, 2000
+	gt 'clothing', 'view_clothing_item',, 'gm_office',i, 2000 'shop'
 end
 
 if $ARGS[0] = 'gm_maid':
@@ -269,7 +285,7 @@ if $ARGS[0] = 'gm_maid':
 	'<center><b><font color="maroon">Viewing G&M maid outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -277,8 +293,10 @@ if $ARGS[0] = 'gm_maid':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_maid
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_maid_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -290,17 +308,23 @@ if $ARGS[0] = 'gm_maid':
 				gs 'clothing_attributes', 'gm_maid', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_maidclo''"><img src="images/pc/items/gm/maid/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_maidclo''"><img src="images/pc/items/gm/maid/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 40:jump 'loopgm_maid'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_maid'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_maid_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_maid_filter'
+	end
 end
 
-if $ARGS[0] = 'gm_maidclo': gt 'clothing', 'view_clothing_item', 'shop', 'gm_maid',i, 2000
+if $ARGS[0] = 'gm_maidclo': gt 'clothing', 'view_clothing_item', 'gm_maid',i, 2000, 'shop'
 
 if $ARGS[0] = 'gm_server':
 	$menu_loc = 'budgetclothes'
@@ -313,7 +337,7 @@ if $ARGS[0] = 'gm_server':
 	'<center><b><font color="maroon">Viewing G&M server uniforms</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -321,8 +345,10 @@ if $ARGS[0] = 'gm_server':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_server
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_server_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -334,17 +360,23 @@ if $ARGS[0] = 'gm_server':
 				gs 'clothing_attributes', 'gm_server', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_serverclo''"><img src="images/pc/items/gm/server/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_serverclo''"><img src="images/pc/items/gm/server/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 30:jump 'loopgm_server'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_server'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_server_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_server_filter'
+	end
 end
 
-if $ARGS[0] = 'gm_serverclo': gt 'clothing', 'view_clothing_item', 'shop', 'gm_server',i, 2000
+if $ARGS[0] = 'gm_serverclo': gt 'clothing', 'clothing_item', 'gm_server',i, 2000, 'shop'
 
 if $ARGS[0] = 'school':
 	$menu_loc = 'budgetclothes'
@@ -357,7 +389,7 @@ if $ARGS[0] = 'school':
 	'<center><b><font color="maroon">Viewing G&M school uniforms</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -365,8 +397,10 @@ if $ARGS[0] = 'school':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality4
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_school_filter
+
 		if Clothingstock > 15:
 			i = 1
 		elseif Clothingstock > 7:
@@ -380,15 +414,21 @@ if $ARGS[0] = 'school':
 				gs 'clothing_attributes', 'gm_school', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''schoolclo''"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''schoolclo''"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 			if i = 6:i = 9
 		if i <= 60:jump 'loopschool'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality4'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_school_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_school_filter'
+	end
 end
 
 if $ARGS[0] = 'schoolclo':
@@ -399,7 +439,7 @@ if $ARGS[0] = 'schoolclo':
 		gt 'budgetclothes', 'school'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_school',i, 1500
+	gt 'clothing', 'view_clothing_item', 'gm_school',i, 1500, 'shop'
 end
 
 if $ARGS[0] = 'shoes':

locations/city_market.qsrc

@@ -193,11 +193,30 @@ if $ARGS[0] = 'clo':
 		gt 'city_market', 'start'
 	end
 
+	!!To filter just this set
+	clo_i = 0
+	:loopmarket_outfits_filter
+
 	i = 1
 	:loopmarket_outfits
-	if market_outfits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+		if loopmarket_outfits[i] = 0:
+			gs 'clothing_attributes', 'loopmarket_outfits', i
+			gs 'clothing_QV', 'shop_filter'
+
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+			end
+		end
 	i += 1
 	if i <= 20:jump 'loopmarket_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmarket_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmarket_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'marketclo':
@@ -208,7 +227,7 @@ if $ARGS[0] = 'marketclo':
 		gt 'city_market', 'clo'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'market_outfits',i, 750
+	gt 'clothing', 'view_clothing_item', 'market_outfits',i, 750, 'shop'
 
 end
 

locations/exhibitionistshop.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Salacious outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -65,8 +65,10 @@ if $ARGS[0] = 'outfits':
 		gt 'exhibitionistshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopsalacious_outfits_filter
+
 		i = 1
 
 		:loopsalacious_outfits
@@ -74,17 +76,23 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'salacious_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_outfits''"><img <<$set_imgh>> src="images/pc/items/salacious/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_outfits''"><img <<$set_imgh>> src="images/pc/items/salacious/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 20:jump 'loopsalacious_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopsalacious_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopsalacious_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'salacious_outfits': gt 'clothing', 'view_clothing_item', 'shop', 'salacious_outfits',i, 1000
+if $ARGS[0] = 'salacious_outfits': gt 'clothing', 'view_clothing_item', 'salacious_outfits',i, 1000, 'shop'
 
 if $ARGS[0] = 'dresses':
 	$loc_arg = 'dresses'
@@ -94,7 +102,7 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Salacious dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -102,8 +110,10 @@ if $ARGS[0] = 'dresses':
 		gt 'exhibitionistshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopsalacious_dress_filter
+
 		if Clothingstock >= 18:
 			i = 1
 		elseif Clothingstock >= 12:
@@ -119,17 +129,23 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'salacious_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_dress''"><img <<$set_imgh>> src="images/pc/items/salacious/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_dress''"><img <<$set_imgh>> src="images/pc/items/salacious/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 4
 		if i <= 150:jump 'loopsalacious_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopsalacious_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopsalacious_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'salacious_dress': gt 'clothing', 'view_clothing_item', 'shop', 'salacious_dress',i, 1000
+if $ARGS[0] = 'salacious_dress': gt 'clothing', 'view_clothing_item', 'salacious_dress',i, 1000, 'shop'
 
 if $ARGS[0] = 'panties':
 	$loc_arg = 'panties'

locations/moncheri.qsrc

@@ -69,12 +69,14 @@ if $ARGS[0] = 'gowns':
 	'<center><b><font color="maroon">Viewing Mon Chéri outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopmoncheri_gown_filter
+
 		if Clothingstock > 7:
 			i = 1
 		elseif Clothingstock > 15:
@@ -88,17 +90,23 @@ if $ARGS[0] = 'gowns':
 				gs 'clothing_attributes', 'moncheri_gown', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_gown''"><img src="images/pc/items/moncheri/gown/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_gown''"><img src="images/pc/items/moncheri/gown/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 160:jump 'loopmoncheri_gown'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmoncheri_gown_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmoncheri_gown_filter'
+	end
 end
 
-if $ARGS[0] = 'moncheri_gown':gt 'clothing', 'view_clothing_item', 'shop', 'moncheri_gown',i, 20000
+if $ARGS[0] = 'moncheri_gown':gt 'clothing', 'view_clothing_item', 'moncheri_gown',i, 20000, 'shop'
 
 if $ARGS[0] = 'dresses':
 	$loc_arg = 'dresses'
@@ -111,12 +119,14 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Mon Chéri outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopmoncheri_dress_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -128,17 +138,23 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'moncheri_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_dress''"><img src="images/pc/items/moncheri/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_dress''"><img src="images/pc/items/moncheri/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 80:jump 'loopmoncheri_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmoncheri_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmoncheri_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'moncheri_dress': gt 'clothing', 'view_clothing_item', 'shop', 'moncheri_dress',i, 20000
+if $ARGS[0] = 'moncheri_dress': gt 'clothing', 'view_clothing_item', 'moncheri_dress',i, 20000, 'shop'
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = $ARGS[0]

locations/pav_train_market.qsrc

@@ -243,11 +243,30 @@ if $ARGS[0] = 'clo':
 		gt 'pav_train_market', 'start'
 	end
 
+	!!To filter just this set
+	clo_i = 0
+	:loopmarket_outfits_filter
+
 	i = 1
 	:loopmarket_outfits
-	if market_outfits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''pav_train_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+		if loopmarket_outfits[i] = 0:
+			gs 'clothing_attributes', 'loopmarket_outfits', i
+			gs 'clothing_QV', 'shop_filter'
+
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:*p '<a href="exec: i = <<i>> & gt ''pav_train_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+			end
+		end
 	i += 1
 	if i <= 20:jump 'loopmarket_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmarket_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmarket_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'marketclo':
@@ -258,7 +277,7 @@ if $ARGS[0] = 'marketclo':
 		gt 'pav_train_market', 'clo'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'market_outfits',i, 750
+	gt 'clothing', 'view_clothing_item', 'market_outfits',i, 750, 'shop'
 
 end
 

locations/scandalicious.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Scandalicious outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -69,8 +69,10 @@ if $ARGS[0] = 'clothes':
 		gt 'scandalicious', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopscandalicious_outfits_filter
+
 	i = 1
 
 		:loopscandalicious_outfits
@@ -78,15 +80,21 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'scandalicious_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''scandalicious_outfits''"><img src="images/pc/items/scandalicious/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''scandalicious_outfits''"><img src="images/pc/items/scandalicious/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 
 		if i <= 20:jump 'loopscandalicious_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopscandalicious_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopscandalicious_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'scandalicious_outfits':
@@ -97,7 +105,7 @@ if $ARGS[0] = 'scandalicious_outfits':
 		gt 'scandalicious', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_outfits',i, 1500
+	gt 'clothing', 'view_clothing_item', 'scandalicious_outfits',i, 1500, 'shop'
 end
 
 if $ARGS[0] = 'dresses':
@@ -111,7 +119,7 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Scandalicious dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -119,8 +127,10 @@ if $ARGS[0] = 'dresses':
 		gt 'scandalicious', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality1
+	!!To filter just this set
+	clo_i = 0
+	:loopscandalicious_dress_filter
+
 	i = 1
 
 		:loopscandalicious_dress
@@ -128,14 +138,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'scandalicious_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''scandalicious_dress''"><img src="images/pc/items/scandalicious/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''scandalicious_dress''"><img src="images/pc/items/scandalicious/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 100:jump 'loopscandalicious_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality1'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopscandalicious_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopscandalicious_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'scandalicious_dress':
@@ -146,7 +162,7 @@ if $ARGS[0] = 'scandalicious_dress':
 		gt 'scandalicious', 'dresses'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_dress',i, 1500
+	gt 'clothing', 'view_clothing_item', 'scandalicious_dress',i, 1500, 'shop'
 end
 
 if $ARGS[0] = 'shoes':
@@ -178,7 +194,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimsuits - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -205,7 +221,7 @@ if $ARGS[0] = 'swim':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'bikinis':
 	$loc_arg = 'bikinis'
@@ -215,7 +231,7 @@ if $ARGS[0] = 'bikinis':
 	'<center><b><font color="maroon">Bikinis - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -242,7 +258,7 @@ if $ARGS[0] = 'bikinis':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_bikinis',i, 1750
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis',i, 1750, 'shop'
 
 --- scandalicious ---------------------------------
 

locations/sexshop.qsrc

@@ -646,12 +646,13 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Fetish dresses - for all your personal needs</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:looperoto_dress_filter
 
 		if Clothingstock > 11:
 			i = 1
@@ -664,17 +665,23 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'eroto_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-					
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_dress''"><img <<$set_imgh>> src="images/pc/items/eroto/dress/<<i>>.jpg"	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_dress''"><img <<$set_imgh>> src="images/pc/items/eroto/dress/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 120:jump 'looperoto_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'looperoto_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'looperoto_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'eroto_dress': gt 'clothing', 'view_clothing_item', 'shop', 'eroto_dress',i, 1000
+if $ARGS[0] = 'eroto_dress': gt 'clothing', 'view_clothing_item', 'eroto_dress',i, 1000, 'shop'
 
 if $ARGS[0] = 'outfits':
 	$loc_arg = 'outfits'
@@ -687,12 +694,13 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Fetish outfits - for all your personal needs</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:looperoto_outfits_filter
 
 		if Clothingstock > 11:
 			i = 1
@@ -705,17 +713,23 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'eroto_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-					
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_outfits''"><img <<$set_imgh>> src="images/pc/items/eroto/outfits/<<i>>.jpg"	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_outfits''"><img <<$set_imgh>> src="images/pc/items/eroto/outfits/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 100:jump 'looperoto_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'looperoto_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'looperoto_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'eroto_outfits': gt 'clothing', 'view_clothing_item', 'shop', 'eroto_outfits',i, 1000
+if $ARGS[0] = 'eroto_outfits': gt 'clothing', 'view_clothing_item', 'eroto_outfits',i, 1000, 'shop'
 
 if $ARGS[0] = 'strip':
 	$loc_arg = 'strip'
@@ -728,12 +742,14 @@ if $ARGS[0] = 'strip':
 	'<center><b><font color="maroon">eroto_strip clothing - for all your personal needs</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:looperoto_strip_filter
+
 		i = 1
 
 		:looperoto_strip
@@ -741,17 +757,23 @@ if $ARGS[0] = 'strip':
 				gs 'clothing_attributes', 'eroto_strip', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-					
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_strip''"><img <<$set_imgh>> src="images/pc/items/eroto/strip/<<i>>.jpg"	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_strip''"><img <<$set_imgh>> src="images/pc/items/eroto/strip/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 30:jump 'looperoto_strip'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'looperoto_strip_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'looperoto_strip_filter'
+	end
 end
 
-if $ARGS[0] = 'eroto_strip': gt 'clothing', 'view_clothing_item', 'shop', 'eroto_strip',i, 1000
+if $ARGS[0] = 'eroto_strip': gt 'clothing', 'view_clothing_item', 'eroto_strip',i, 1000, 'shop'
 
 
 if $ARGS[0] = 'shoes':

locations/shop_allure.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimsuits - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -78,7 +78,7 @@ if $ARGS[0] = 'swim':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'allure_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'allure_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'bikinis':
 	$loc_arg = 'bikinis'
@@ -88,7 +88,7 @@ if $ARGS[0] = 'bikinis':
 	'<center><b><font color="maroon">Bikinis - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -115,7 +115,7 @@ if $ARGS[0] = 'bikinis':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'allure_bikinis',i, 1750
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'allure_bikinis',i, 1750, 'shop'
 
 --- shop_allure ---------------------------------
 

locations/shop_coco_carmen.qsrc

@@ -36,12 +36,14 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Viewing Coco Carmen dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopcoco_dress_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -53,14 +55,20 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'coco_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_dress''"><img src="images/pc/items/coco/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_dress''"><img src="images/pc/items/coco/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 100:jump 'loopcoco_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcoco_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcoco_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'coco_dress':
@@ -71,7 +79,7 @@ if $ARGS[0] = 'coco_dress':
 		gt 'shop_coco_carmen', 'dress'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'coco_dress',i, 3000
+	gt 'clothing', 'view_clothing_item', 'coco_dress',i, 3000, 'shop'
 end
 
 if $ARGS[0] = 'outfits':
@@ -85,12 +93,14 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Viewing Coco Carmen outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_outfits
+	!!To filter just this set
+	clo_i = 0
+	:loopcoco_outfits_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -102,14 +112,20 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'coco_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_outfits''"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_outfits''"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 100:jump 'loopcoco_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcoco_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcoco_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'coco_outfits':
@@ -120,7 +136,7 @@ if $ARGS[0] = 'coco_outfits':
 		gt 'shop_coco_carmen', 'outfits'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'coco_outfits',i, 3000
+	gt 'clothing', 'view_clothing_item', 'coco_outfits',i, 3000, 'shop'
 
 end
 

locations/shop_dolls.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Viewing Patchwork Dolls dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -83,8 +83,10 @@ if $ARGS[0] = 'dress':
 		gt 'shop_dolls', 'browse'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopdolls_dress_filter
+
 		if Clothingstock > 15:
 			i = 1
 		elseif Clothingstock > 7:
@@ -98,14 +100,20 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'dolls_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_dress''"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_dress''"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 110:jump 'loopdolls_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopdolls_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopdolls_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'dolls_dress':
@@ -116,7 +124,7 @@ if $ARGS[0] = 'dolls_dress':
 		gt 'shop_dolls', 'dress'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'dolls_dress',i, 3500
+	gt 'clothing', 'view_clothing_item', 'dolls_dress',i, 3500, 'shop'
 
 end
 
@@ -131,7 +139,7 @@ if $ARGS[0] = 'clothing':
 	'<center><b><font color="maroon">Viewing Patchwork Dolls clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -139,8 +147,10 @@ if $ARGS[0] = 'clothing':
 		gt 'shop_dolls', 'browse'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopdolls_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -152,14 +162,20 @@ if $ARGS[0] = 'clothing':
 				gs 'clothing_attributes', 'dolls_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_outfits''"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_outfits''"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 50:jump 'loopdolls'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopdolls_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopdolls_filter'
+	end
 end
 
 if $ARGS[0] = 'dolls_outfits':
@@ -170,7 +186,7 @@ if $ARGS[0] = 'dolls_outfits':
 		gt 'shop_dolls', 'clothing'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'dolls_outfits',i, 3500
+	gt 'clothing', 'view_clothing_item', 'dolls_outfits',i, 3500, 'shop'
 
 end
 

locations/shop_fancy_pancy.qsrc

@@ -36,12 +36,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Fancy Pancy outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_fancy_pancy', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopfancy_burlesque_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -53,14 +55,20 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'fancy_burlesque', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fancy_pancy'', ''fancy_burlesque''"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fancy_pancy'', ''fancy_burlesque''"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 40:jump 'loopfancy_burlesque'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopfancy_burlesque_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopfancy_burlesque_filter'
+	end
 end
 
 if $ARGS[0] = 'fancy_burlesque':
@@ -71,7 +79,7 @@ if $ARGS[0] = 'fancy_burlesque':
 		gt 'shop_fancy_pancy', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'fancy_burlesque',i, 20000
+	gt 'clothing', 'view_clothing_item', 'fancy_burlesque',i, 20000, 'shop'
 
 end
 

locations/shop_fashionista.qsrc

@@ -126,41 +126,53 @@ if $ARGS[0] = 'dressingclothes':
 	$loc_arg = 'dressingclothes'
 	$loc = 'shop_fashionista'
 	!clorand = rand(1,ARRSIZE('fashionista'))
-	!gt 'clothing', 'view_clothing_item', 'shop', 'fashionista', clorand, 8000
+	!gt 'clothing', 'view_clothing_item', 'fashionista', clorand, 8000, 'shop'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
 	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		minut += 1
 		gt 'shop_fashionista', 'changingroom'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		i = Clothingstock +1
-
-		if Clothingstock - 12 > 0:i -= 12
-		i += 1
-		i = i/2
+	!!To filter just this set
+	clo_i = 0
+	:loopfashionista_filter
+
+		if Clothingstock >= 18:
+			i = 1
+		elseif Clothingstock >= 12:
+			i = 2
+		elseif Clothingstock >= 6:
+			i = 3
+		else
+			i = 4
+		end
 
 		:loopfashionista2
 			if fashionista[i] = 0:
 				gs 'clothing_attributes', 'fashionista', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingshmotmag''"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>  '
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingclothes2''"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>  '
 				end
 			end
-			i += 12
+			i += 4
 		if i <= 200:jump 'loopfashionista2'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopfashionista_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopfashionista_filter'
+	end
 end
 
 if $ARGS[0] = 'dressingclothes2':
@@ -171,7 +183,7 @@ if $ARGS[0] = 'dressingclothes2':
 		gt 'shop_fashionista', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'fashionista',i, 8000
+	gt 'clothing', 'view_clothing_item', 'fashionista',i, 8000, 'shop'
 end
 
 if $ARGS[0] = 'dressingoutfits':
@@ -179,37 +191,45 @@ if $ARGS[0] = 'dressingoutfits':
 	$loc_arg = 'dressingoutfits'
 	$loc = 'shop_fashionista'
 	!clorand = rand(1,ARRSIZE('fashionista'))
-	!gt 'clothing', 'view_clothing_item', 'shop', 'fashionista', clorand, 8000
+	!gt 'clothing', 'view_clothing_item', 'fashionista', clorand, 8000, 'shop'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
 	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		minut += 1
 		gt 'shop_fashionista', 'changingroom'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopfashionista_outfits_filter
 
-		:loopfashionistaoutfits
-			if fashionista[i] = 0:
-				gs 'clothing_attributes', 'fashionista', i
-				gs 'clothing_QV', 'shop_filter'
+	i = 1
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
+	:loopfashionista_outfits
+		if fashionista[i] = 0:
+			gs 'clothing_attributes', 'fashionista', i
+			gs 'clothing_QV', 'shop_filter'
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingoutfits2''"><img src="images/pc/items/fashionista/outfits/<<i>>.jpg" 	height="250" /></a>  '
-				end
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingoutfits2''"><img src="images/pc/items/fashionista/outfits/<<i>>.jpg" 	height="250" /></a>  '
 			end
-			i += 1
-		if i <= 20:jump 'loopfashionistaoutfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+		end
+		i += 1
+	if i <= 20:jump 'loopfashionista_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopfashionista_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopfashionista_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'dressingoutfits2':
@@ -220,7 +240,7 @@ if $ARGS[0] = 'dressingoutfits2':
 		gt 'shop_fashionista', 'dressingclothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'fashionista_outifits',i, 8000
+	gt 'clothing', 'view_clothing_item', 'fashionista_outifits',i, 8000, 'shop'
 end
 
 if $ARGS[0] = 'dressingbra':
@@ -296,118 +316,7 @@ if $ARGS[0] = 'dressingpanties2':
 	gt 'panties', 'view_panty_item', 'shop', 'fashionista',i, 750
 end
 
-
-!! Old code
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-	
-	i = Clothingstock +1
-
-	if Clothingstock - 12 > 0:i -= 12
-	i += 1
-	i = i/2
-	
-	:loopfashionista
-		if fashionista[i] = 0:
-			gs 'clothing_attributes', 'fashionista', i
-			gs 'clothing_QV', 'shop_filter'
-				
-			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''shmotmag''"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>'
-		end
-		i += 6
-	if i <= 200:jump 'loopfashionista'
-end
-
-if $ARGS[0] = 'shmotmag':
-	cla
-	
-	if fashionista[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_fashionista', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'fashionista',i, 8000
-end
-
-if $ARGS[0] = 'panties':
-	$loc_arg = 'panties'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-
-	i = 1
-
-	:loopfashionista_panties
-		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 79:jump 'loopfashionista_panties'
-end
-
-if $ARGS[0] = 'panties2':
-	cla
-	
-	if fashionista_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'shop_fashionista', 'panties'
-	end
-
-	gt 'panties', 'view_panty_item', 'shop', 'fashionista',i, 750
-
-end
-
-if $ARGS[0] = 'bras':
-	$loc_arg = 'bras'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-
-	i = 1
-
-	:loopfashionista_bras
-		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 42:jump 'loopfashionista_bras'
-end
-
-if $ARGS[0] = 'bras2':
-	cla
-	
-	if fashionista_bras[i] ! 0:
-		msg 'You already own this bra.'
-		gt 'shop_fashionista', 'bras'
-	end
-
-	gt 'bras', 'view_bra_item', 'shop', 'fashionista',i, 750
-end
-
+!!only items not in dressing room
 if $ARGS[0] = 'purses':
 	$loc_arg = 'purses'
 	$loc = 'shop_fashionista'

locations/shop_flamingos.qsrc

@@ -36,12 +36,14 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Flamingo''s dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_flamingos', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopflamingos_dress_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -53,14 +55,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'flamingos_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_dress''"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_dress''"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 90:jump 'loopflamingos_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopflamingos_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopflamingos_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'flamingos_dress':
@@ -71,7 +79,7 @@ if $ARGS[0] = 'flamingos_dress':
 		gt 'shop_flamingos', 'dresses'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'flamingos_dress',i, 3000
+	gt 'clothing', 'view_clothing_item', 'flamingos_dress',i, 3000, 'shop'
 end
 
 if $ARGS[0] = 'clothes':
@@ -85,12 +93,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Flamingo''s outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_flamingos', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopflamingos_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -102,14 +112,20 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'flamingos_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_outfits''"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_outfits''"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 50:jump 'loopflamingos'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopflamingos_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopflamingos_filter'
+	end
 end
 
 if $ARGS[0] = 'flamingos_outfits':
@@ -120,7 +136,7 @@ if $ARGS[0] = 'flamingos_outfits':
 		gt 'shop_flamingos', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'flamingos_outfits',i, 3000
+	gt 'clothing', 'view_clothing_item', 'flamingos_outfits',i, 3000, 'shop'
 
 end
 

locations/shop_materinstvo.qsrc

@@ -59,12 +59,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Mommy Style clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_materinstvo', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopmaterinstvo_filter
+
 		i = 1
 
 		:loopmaterinstvo
@@ -72,17 +74,23 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'materinstvo_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_materinstvo'', ''materinstvo_dress''"><img src="images/pc/items/mommy/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_materinstvo'', ''materinstvo_dress''"><img src="images/pc/items/mommy/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 10:jump 'loopmaterinstvo'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmaterinstvo_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmaterinstvo_filter'
+	end
 end
 
-if $ARGS[0] = 'materinstvo_dress': gt 'clothing', 'view_clothing_item', 'shop', 'materinstvo_dress',i, 2000
+if $ARGS[0] = 'materinstvo_dress': gt 'clothing', 'view_clothing_item', 'materinstvo_dress',i, 2000, 'shop'
 
 --- shop_materinstvo ---------------------------------
 

locations/shop_nerdvana.qsrc

@@ -38,12 +38,14 @@ if $ARGS[0] = 'cosplay':
 	'<center><b><font color="maroon">Viewing Nerdvana Cosplay Outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_cosplay
+	!!To filter just this set
+	clo_i = 0
+	:loopnerdvana_cosplay_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -55,14 +57,20 @@ if $ARGS[0] = 'cosplay':
 				gs 'clothing_attributes', 'nerdvana_cosplay', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''nerdvana_cosplay''"><img src="images/pc/items/nerdvana/cosplay/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''nerdvana_cosplay''"><img src="images/pc/items/nerdvana/cosplay/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 60:jump 'loopnerdvana_cosplay'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_cosplay'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopnerdvana_cosplay_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopnerdvana_cosplay_filter'
+	end
 end
 
 if $ARGS[0] = 'nerdvana_cosplay':
@@ -73,7 +81,7 @@ if $ARGS[0] = 'nerdvana_cosplay':
 		gt 'shop_nerdvana', 'cosplay'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_cosplay',i, 3000
+	gt 'clothing', 'view_clothing_item', 'nerdvana_cosplay',i, 3000, 'shop'
 end
 
 if $ARGS[0] = 'outfits':
@@ -87,12 +95,14 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Viewing Nerdvana outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_outfits
+	!!To filter just this set
+	clo_i = 0
+	:loopnerdvana_outfits_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -104,14 +114,20 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'nerdvana_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''nerdvana_outfits''"><img src="images/pc/items/nerdvana/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''nerdvana_outfits''"><img src="images/pc/items/nerdvana/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 60:jump 'loopnerdvana_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopnerdvana_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopnerdvana_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'nerdvana_outfits':
@@ -122,7 +138,7 @@ if $ARGS[0] = 'nerdvana_outfits':
 		gt 'shop_nerdvana', 'outfits'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_outfits',i, 3000
+	gt 'clothing', 'view_clothing_item', 'nerdvana_outfits',i, 3000, 'shop'
 
 end
 
@@ -134,7 +150,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimsuits - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
@@ -157,7 +173,7 @@ if $ARGS[0] = 'swim':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'nerdvana_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'bikinis':
 	$loc_arg = 'bikinis'
@@ -167,7 +183,7 @@ if $ARGS[0] = 'bikinis':
 	'<center><b><font color="maroon">Bikinis - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
@@ -190,7 +206,7 @@ if $ARGS[0] = 'bikinis':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_bikinis',i, 1750
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'nerdvana_bikinis',i, 1750, 'shop'
 
 
 --- shop_nerdvana ---------------------------------

locations/shop_pussycats.qsrc

@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Viewing Pussy Kats dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -1050,8 +1050,10 @@ if $ARGS[0] = 'dress':
 		gt 'shop_pussycats', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopcats_dress_filter
+
 		i = Clothingstock + 1
 
 		if Clothingstock > 15:
@@ -1067,17 +1069,23 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'cats_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo_dress''"><img <<$set_imgh>> src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo_dress''"><img <<$set_imgh>> src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 110:jump 'loopcats_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcats_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcats_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'yshopclo_dress': gt 'clothing', 'view_clothing_item', 'shop', 'cats_dress',i, 3000
+if $ARGS[0] = 'yshopclo_dress': gt 'clothing', 'view_clothing_item', 'cats_dress',i, 3000, 'shop'
 
 if $ARGS[0] = 'clothes':
 	$loc_arg = 'clothes'
@@ -1087,7 +1095,7 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Pussy Kats outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -1095,8 +1103,10 @@ if $ARGS[0] = 'clothes':
 		gt 'shop_pussycats', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopcats_outfits_filter
+
 		i = Clothingstock + 1
 
 		if Clothingstock > 15:
@@ -1112,17 +1122,23 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'cats_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo_outfit''"><img <<$set_imgh>> src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo_outfit''"><img <<$set_imgh>> src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 100:jump 'loopcats_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcats_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcats_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'yshopclo_outfit': gt 'clothing', 'view_clothing_item', 'shop', 'cats_outfits',i, 3000
+if $ARGS[0] = 'yshopclo_outfit': gt 'clothing', 'view_clothing_item', 'cats_outfits',i, 3000, 'shop'
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = 'shoes'

locations/shop_tsar_bomba.qsrc

@@ -41,12 +41,14 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Tsar Bomba dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_tsar_bomba', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dresses
+	!!To filter just this set
+	clo_i = 0
+	:loopbomba_dresses_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -58,14 +60,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'bomba_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_dresses''"><img src="images/pc/items/bomba/goth_dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_dresses''"><img src="images/pc/items/bomba/goth_dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 70:jump 'loopbomba_dresses'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dresses'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopbomba_dresses_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopbomba_dresses_filter'
+	end
 end
 
 if $ARGS[0] = 'bomba_dresses':
@@ -76,7 +84,7 @@ if $ARGS[0] = 'bomba_dresses':
 		gt 'shop_tsar_bomba', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'bomba_dress',i, 3500
+	gt 'clothing', 'view_clothing_item', 'bomba_dress',i, 3500, 'shop'
 end
 
 if $ARGS[0] = 'clothes':
@@ -90,12 +98,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Tsar Bomba outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_tsar_bomba', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopbomba_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -107,14 +117,20 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'bomba_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_outfits''"><img src="images/pc/items/bomba/goth_outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_outfits''"><img src="images/pc/items/bomba/goth_outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 50:jump 'loopbomba'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopbomba_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopbomba_filter'
+	end
 end
 
 if $ARGS[0] = 'bomba_outfits':
@@ -125,7 +141,7 @@ if $ARGS[0] = 'bomba_outfits':
 		gt 'shop_tsar_bomba', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'bomba_outfits',i, 3500
+	gt 'clothing', 'view_clothing_item', 'bomba_outfits',i, 3500, 'shop'
 end
 
 if $ARGS[0] = 'purses':

locations/sportShop.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'clo':
 	'<center><b><font color="maroon">Sportswear - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -103,8 +103,10 @@ if $ARGS[0] = 'clo':
 		gt 'sportshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
+	!!To filter just this set
+	clo_i = 0
+	:loopdanilovich_outfits_filter
+
 		if Clothingstock > 16:
 			i = 1
 		elseif Clothingstock > 8:
@@ -117,18 +119,24 @@ if $ARGS[0] = 'clo':
 			if danilovich_outfits[i] = 0:
 				gs 'clothing_attributes', 'danilovich_outfits', i
 				gs 'clothing_QV', 'shop_filter'
-					
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sportshop'', ''danilovich''"><img src="images/pc/items/danilovich/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sportshop'', ''danilovich''"><img src="images/pc/items/danilovich/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 160:jump 'loopdanilovich_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopdanilovich_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopdanilovich_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'danilovich': gt 'clothing', 'view_clothing_item', 'shop', 'danilovich_outfits',i, 2000
+if $ARGS[0] = 'danilovich': gt 'clothing', 'view_clothing_item', 'danilovich_outfits',i, 2000, 'shop'
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = 'shoes'
@@ -149,7 +157,7 @@ if $ARGS[0] = 'shoes':
 	if i <= 40:jump 'loopdanilovich_shoes'
 end
 
-if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'danilovich',i, 1500
+if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'danilovich',i, 1500, 'shop'
 
 if $ARGS[0] = 'swim':
 	$loc_arg = 'swim'
@@ -159,7 +167,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimwear - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -187,7 +195,7 @@ if $ARGS[0] = 'swim':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'danilovich_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'danilovich_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'panties':
 	$loc_arg = 'panties'

locations/wardrobe.qsrc

@@ -1,6 +1,7 @@
 # wardrobe
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	'<center><font color="maroon">Please select an option</font></center>'
 	*nl
 	*nl
@@ -14,6 +15,13 @@ if $ARGS[0] = 'start':
 	*nl
 	*nl
 	'<center><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''"><img src="images/system/icons/clothing/organize.png"></a></center>'
+
+	if $pursepantytype ! '' or $pursebratype ! '':
+		'<center><b>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</b></center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
+
 end