[fixed] New filter not applied to swimwear causing them to not appear in shops

locations/scandalicious.qsrc

@@ -203,8 +203,10 @@ if $ARGS[0] = 'swim':
 		gt 'scandalicious', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
+	!!To filter just this set
+	clo_i = 0
+	:loopscandalicious_swimsuit_filter
+
 	i = 1
 
 		:loopscandalicious_swimsuit
@@ -212,14 +214,19 @@ if $ARGS[0] = 'swim':
 				gs 'clothing_attributes', 'scandalicious_swimsuit', 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'', ''swim1''"><img src="images/pc/items/scandalicious/swim/one/<<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: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''swim1''"><img src="images/pc/items/scandalicious/swim/one/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 40:jump 'loopscandalicious_swimsuit'
-	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 'loopscandalicious_swimsuit_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
+		jump 'loopscandalicious_swimsuit_filter'
+	end
 end
 
 if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swimsuit',i, 1750, 'shop'
@@ -240,8 +247,10 @@ if $ARGS[0] = 'bikinis':
 		gt 'scandalicious', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality3
+	!!To filter just this set
+	clo_i = 0
+	:loopscandalicious_bikinis_filter
+
 	i = 1
 
 		:loopscandalicious_bikinis
@@ -249,14 +258,19 @@ if $ARGS[0] = 'bikinis':
 				gs 'clothing_attributes', 'scandalicious_bikinis', 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'', ''bikini1''"><img src="images/pc/items/scandalicious/swim/two/<<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: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''bikini1''"><img src="images/pc/items/scandalicious/swim/two/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 70:jump 'loopscandalicious_bikinis'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopscandalicious_bikinis_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
+		jump 'loopscandalicious_bikinis_filter'
+	end
 end
 
 if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis',i, 1750, 'shop'

locations/shop_allure.qsrc

@@ -60,8 +60,9 @@ if $ARGS[0] = 'swim':
 		gt 'shop_allure', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
+	!!To filter just this set
+	clo_i = 0
+	:loopallure_swimsuit_filter
 
 		if Clothingstock > 15:
 			i = 1
@@ -76,14 +77,20 @@ if $ARGS[0] = 'swim':
 				gs 'clothing_attributes', 'allure_swimsuit', 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_allure'', ''swim1''"><img src="images/pc/items/allure/one/<<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_allure'', ''swim1''"><img src="images/pc/items/allure/one/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 100:jump 'loopallure_swimsuit'
-	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 'loopallure_swimsuit_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopallure_swimsuit_filter'
+	end
 end
 
 if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'allure_swimsuit',i, 1750, 'shop'
@@ -104,8 +111,9 @@ if $ARGS[0] = 'bikinis':
 		gt 'shop_allure', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality3
+	!!To filter just this set
+	clo_i = 0
+	:loopallure_bikinis_filter
 
 		if Clothingstock > 15:
 			i = 1
@@ -120,14 +128,20 @@ if $ARGS[0] = 'bikinis':
 				gs 'clothing_attributes', 'allure_bikinis', 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_allure'', ''bikini1''"><img src="images/pc/items/allure/two/<<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_allure'', ''bikini1''"><img src="images/pc/items/allure/two/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 140:jump 'loopallure_bikinis'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopallure_bikinis_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopallure_bikinis_filter'
+	end
 end
 
 if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'allure_bikinis',i, 1750, 'shop'

locations/shop_nerdvana.qsrc

@@ -155,8 +155,10 @@ if $ARGS[0] = 'swim':
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
+	!!To filter just this set
+	clo_i = 0
+	:loopnerdvana_swimsuit_filter
+
 	i = 1
 
 		:loopnerdvana_swimsuit
@@ -164,14 +166,20 @@ if $ARGS[0] = 'swim':
 				gs 'clothing_attributes', 'nerdvana_swimsuit', 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'', ''swim1''"><img src="images/pc/items/nerdvana/swim/one/<<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'', ''swim1''"><img src="images/pc/items/nerdvana/swim/one/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 30:jump 'loopnerdvana_swimsuit'
-	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 'loopnerdvana_swimsuit_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopnerdvana_swimsuit_filter'
+	end
 end
 
 if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'nerdvana_swimsuit',i, 1750, 'shop'

locations/sportShop.qsrc

@@ -176,24 +176,39 @@ if $ARGS[0] = 'swim':
 		gt 'sportshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopswim_filter
+
 	!!4 is in he supermarket, so skipped
-		i = 1
+
+		if Clothingstock > 11:
+			i = 1
+		else
+			i = 2
+		end
+
 
 		:loopswim
 			if danilovich_swimsuit[i] = 0:
 				gs 'clothing_attributes', 'danilovich_swimsuit', 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'', ''swim1''"><img src="images/pc/items/danilovich/swimwear/<<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'', ''swim1''"><img src="images/pc/items/danilovich/swimwear/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
-			i += 4
+			i += 3
+			if i = 4: i += 2
 		if i <= 30:jump 'loopswim'
-	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 'loopswim_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopswim_filter'
+	end
 end
 
 if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'danilovich_swimsuit',i, 1750, 'shop'