1
0
Эх сурвалжийг харах

[added] Shoe filters for both wardrobe and shops

Kevin_Smarts 1 жил өмнө
parent
commit
e5395bb685

+ 53 - 7
locations/budgetclothes.qsrc

@@ -452,6 +452,11 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
+
 
 	act 'Return':
 		cla
@@ -459,11 +464,28 @@ if $ARGS[0] = 'shoes':
 		gt 'budgetclothes', 'start'
 	end
 
-	i = 1
-	:loopgm_shoes
-		if gm_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''budget_shoes''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 30:jump 'loopgm_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+		:loopgm_shoes
+			if gm_shoe[i] = 0:
+				gs 'shoe_attributes', 'gm', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''budget_shoes''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 30:jump 'loopgm_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'gm',i, 700
@@ -524,6 +546,10 @@ if $ARGS[0] = 'panties':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M panties</font></b></center>'
+	*nl
+
+	gs 'panties', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -533,7 +559,15 @@ if $ARGS[0] = 'panties':
 
 	i = 1
 	:looppanties
-		if gm_panties[i] = 0:*p '<a href="exec: gt ''panties'', ''view_panty_item'', ''shop'', ''gm'', <<i>>, 300"><img src="images/pc/items/gm/panties/<<i>>.jpg" 	height="150" /></a>'
+		if gm_panties[i] = 0:
+			gs 'underwear_attributes', 'gm', i
+			gs 'panties', 'panty_filter'
+			if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+					*p '<a href="exec: gt ''panties'', ''view_panty_item'', ''shop'', ''gm'', <<i>>, 300"><img src="images/pc/items/gm/panties/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
+		end
 		i += 1
 		if i = 7: i = 8
 		if i = 9: i = 10
@@ -550,6 +584,10 @@ if $ARGS[0] = 'bras':
 	$loc = 'budgetclothes'
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M bras</font></b></center>'
+	*nl
+
+	gs 'bras', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -559,7 +597,15 @@ if $ARGS[0] = 'bras':
 
 	i = 1
 	:loopbras
-		if gm_bras[i] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''gm'', <<i>>, 300"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
+		if gm_bras[i] = 0:
+			gs 'underwear_attributes', 'gm', i
+			gs 'bras', 'bra_filter'
+			if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+					*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''gm'', <<i>>, 300"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
+		end
 		i += 1
 		if i = 11: i = 13
 		if i = 16: i = 17

+ 27 - 5
locations/moncheri.qsrc

@@ -242,14 +242,36 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
-	i = 1
 
-	:loopmoncheri_shoes
-		if moncheri_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_shoes''"><img src="images/pc/items/moncheri/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 140:jump 'loopmoncheri_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+
+		:loopmoncheri_shoes
+			if moncheri_shoe[i] = 0:
+				gs 'shoe_attributes', 'moncheri', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_shoes''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 140:jump 'loopmoncheri_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'moncheri_shoes':	gt 'shoes', 'view_shoe_item', 'shop', 'moncheri',i, 5000

+ 26 - 5
locations/sexshop.qsrc

@@ -335,15 +335,36 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
 
-	:looperoto_shoes
-		if eroto_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_shoes''"><img src="images/pc/items/eroto/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'looperoto_shoes'
+		i = 1
+
+		:looperoto_shoes
+			if eroto_shoe[i] = 0:
+				gs 'shoe_attributes', 'eroto', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_shoes''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 40:jump 'looperoto_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'eroto_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'eroto',i, 2500

+ 333 - 18
locations/shoes.qsrc

@@ -17,7 +17,7 @@ $shoe_list_line = {
 	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>'
+	$RESULT +='<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''wardrobe'', ''<<$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]
 
@@ -36,7 +36,7 @@ $shoe_list_line = {
 		$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><a href="exec:gt ''shoes'', ''view_shoe_item'', ''wardrobe'', ''<<$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>'
@@ -95,60 +95,142 @@ if $ARGS[0] = 'view_shoe_list':
 	if $ARGS[1] = 'unwanted':
 		sloc = 2
 	end
+	gs 'shoes', 'filter_header', 'store'
 
 	$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>'
 
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
 	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 moncheri_shoe_s[i] = sloc and moncheri_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'moncheri', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'moncheri', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('moncheri_shoe'):jump 'loopmoncheri_shoe'
 
 	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 cats_shoe_s[i] = sloc and cats_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'cats', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'cats', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('cats_shoe'):jump 'loopcats_shoe'
 
 	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 bomba_shoe_s[i] = sloc and bomba_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'bomba', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'bomba', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('bomba_shoe'):jump 'loopbomba_shoe'
 
 	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 dolls_shoe_s[i] = sloc and dolls_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'dolls', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'dolls', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('dolls_shoe'):jump 'loopdolls_shoe'
 
 	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 gm_shoe_s[i] = sloc and gm_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'gm', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'gm', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('gm_shoe'):jump 'loopgm_shoe'
 
 	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 eroto_shoe_s[i] = sloc and eroto_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'eroto', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'eroto', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('eroto_shoe'):jump 'looperoto_shoe'
 
 	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 scandalicious_shoe_s[i] = sloc and scandalicious_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'scandalicious', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'scandalicious', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('scandalicious_shoe'):jump 'loopscandalicious_shoe'
 
 	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 danilovich_shoe_s[i] = sloc and danilovich_shoe[i] = 1 and Shofilter['sport'] = 0:
+			gs 'shoe_attributes', 'danilovich', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'danilovich', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('danilovich_shoe'):jump 'loopdanilovich_shoe'
 
 	'</table></center>' 
+	
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'moncheri':
@@ -345,4 +427,237 @@ if $ARGS[0] = 'wear':
 	end
 end
 
+if $ARGS[0] = 'filter_header':
+!! exclude filters
+	$Headerstring = '<TD>'
+	if Shofilter['sport'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''sport''] = 1 & Shofilter[''sport_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/sport.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''sport''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
+	end
+
+	$Headerstring += '<TD>'
+	if Shofilter['stripper'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''stripper''] = 1 & Shofilter[''stripper_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''stripper''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
+	end
+
+	$Headerstring += '<TD>'
+	if Shofilter['bimbo'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''bimbo''] = 1 & Shofilter[''bimbo_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''bimbo''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
+	end
+
+	$Headerstring += '<TD>'
+	if Shofilter['alternative'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''alternative''] = 1 & Shofilter[''alternative_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/alternative.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''alternative''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/alternative_off.png"></a></TD>'
+	end
+
+!! sort by filters
+	$Headerstring += '<TD>'
+	if Shofilter['number'] = 0:
+		Shofilter['quality'] = 1
+		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''number''] = 0 & Shofilter[''quality''] = 1 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/number_off.png"></a></TD>'
+	end
+	
+	$Headerstring += '<TD>'
+	if Shofilter['quality'] = 0:
+		$Headerstring += '<img src="images/system/icons/clothing/quality.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:Clo_i = 0 & Shofilter[''quality''] = 0 & Shofilter[''number''] = 1 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
+	end
+
+!! Show only filers
+	$Headerstring[1] = '<TD>'
+	if Shofilter['sport_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''sport_only''] = 1 & Shofilter[''sport''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''sport_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/sport.png"></a></TD>'
+	end
+
+	$Headerstring[1] += '<TD>'
+	if Shofilter['stripper_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''stripper_only''] = 1 & Shofilter[''stripper''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''stripper_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+	end
+
+	$Headerstring[1] += '<TD>'
+	if Shofilter['bimbo_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''bimbo_only''] = 1 & Shofilter[''bimbo''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''bimbo_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+	end
+
+	$Headerstring[1] += '<TD>'
+	if Shofilter['alternative_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''alternative_only''] = 1 & Shofilter[''alternative''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/alternative_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''alternative_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/alternative.png"></a></TD>'
+	end
+
+
+	$Headerstring[2] = '<TH>Include</TH><TH></TH><TH></TH><TH></TH><TH>Sort by</TH><TH></TH>'
+
+	$Headerstring[3] = '<TH>Only show</TH>'
+
+	'<center><table><<$Headerstring[2]>>'
+	'<TR><border=1><<$Headerstring>>'
+
+	'<TR><border=0><<$Headerstring[3]>>'
+	'<TR><border=1><<$Headerstring[1]>></table></center>'
+end
+
+if $ARGS[0] = 'shoe_filter':
+!!Exclude filters
+	Shofilter['inc'] = 1
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['stripper'] = 1 and ShoStyle = 1:
+		Shofilter['inc'] = 0
+	end
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['bimbo'] = 1 and ShoStyle = 2:
+		Shofilter['inc'] = 0
+	end
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['alternative'] = 1 and ShoStyle = 3:
+		Shofilter['inc'] = 0
+	end
+
+!!only filters
+	Shofilter['only'] = 0
+	!!filters, if only set to 1 they will only display those set
+	if Shofilter['stripper_only'] = 1 and ShoStyle = 1:
+		Shofilter['only'] += 1
+	end
+	if Shofilter['bimbo_only'] = 1 and ShoStyle = 2:
+		Shofilter['only'] += 1
+	end
+	if Shofilter['alternative_only'] = 1 and ShoStyle = 3:
+		Shofilter['only'] += 1
+	end
+	!!Check total count to make sure it fits all groups selected
+	if Shofilter['only'] = Shofilter['stripper_only'] + Shofilter['bimbo_only'] + Shofilter['alternative_only']:
+		Shofilter['only'] = 1
+	else
+		Shofilter['only'] = 0
+	end
+end
+
+if $ARGS[0] = 'shop_filter_header':
+!! exclude filters
+	$Headerstring = '<TD>'
+	if Shofilter['stripper'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''stripper''] = 1 & Shofilter[''stripper_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''stripper''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
+	end
+
+	$Headerstring += '<TD>'
+	if Shofilter['bimbo'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''bimbo''] = 1 & Shofilter[''bimbo_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''bimbo''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
+	end
+
+	$Headerstring += '<TD>'
+	if Shofilter['alternative'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''alternative''] = 1 & Shofilter[''alternative_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/alternative.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''alternative''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/alternative_off.png"></a></TD>'
+	end
+
+!! sort by filters
+	$Headerstring += '<TD>'
+	if Shofilter['number'] = 0:
+		Shofilter['quality'] = 1
+		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''number''] = 0 & Shofilter[''quality''] = 1 & Shofilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/number_off.png"></a></TD>'
+	end
+	
+	$Headerstring += '<TD>'
+	if Shofilter['quality'] = 0:
+		$Headerstring += '<img src="images/system/icons/clothing/quality.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''quality''] = 0 & Shofilter[''number''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
+	end
+
+!! Show only filers
+	$Headerstring[1] = '<TD>'
+	if Shofilter['stripper_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''stripper_only''] = 1 & Shofilter[''stripper''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''stripper_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+	end
+
+	$Headerstring[1] += '<TD>'
+	if Shofilter['bimbo_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''bimbo_only''] = 1 & Shofilter[''bimbo''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''bimbo_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+	end
+
+	$Headerstring[1] += '<TD>'
+	if Shofilter['alternative_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''alternative_only''] = 1 & Shofilter[''alternative''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/alternative_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''alternative_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/alternative.png"></a></TD>'
+	end
+
+
+	$Headerstring[2] = '<TH>Include</TH><TH></TH><TH></TH><TH>Sort by</TH><TH></TH>'
+
+	$Headerstring[3] = '<TH>Only show</TH>'
+
+	'<center><table><<$Headerstring[2]>>'
+	'<TR><border=1><<$Headerstring>>'
+
+	'<TR><border=0><<$Headerstring[3]>>'
+	'<TR><border=1><<$Headerstring[1]>></table></center>'
+end
+
+if $ARGS[0] = 'shop_filter':
+!!Exclude filters
+	Shofilter['inc'] = 1
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['stripper'] = 1 and ShoStyle = 1:
+		Shofilter['inc'] = 0
+	end
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['bimbo'] = 1 and ShoStyle = 2:
+		Shofilter['inc'] = 0
+	end
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['alternative'] = 1 and ShoStyle = 3:
+		Shofilter['inc'] = 0
+	end
+
+!!only filters
+	Shofilter['only'] = 0
+	!!filters, if only set to 1 they will only display those set
+	if Shofilter['stripper_only'] = 1 and ShoStyle = 1:
+		Shofilter['only'] += 1
+	end
+	if Shofilter['bimbo_only'] = 1 and ShoStyle = 2:
+		Shofilter['only'] += 1
+	end
+	if Shofilter['alternative_only'] = 1 and ShoStyle = 3:
+		Shofilter['only'] += 1
+	end
+	!!Check total count to make sure it fits all groups selected
+	if Shofilter['only'] = Shofilter['stripper_only'] + Shofilter['bimbo_only'] + Shofilter['alternative_only']:
+		Shofilter['only'] = 1
+	else
+		Shofilter['only'] = 0
+	end
+end
+
+
 --- shoes ---------------------------------

+ 0 - 23
locations/shop_coco_carmen.qsrc

@@ -146,29 +146,6 @@ if $ARGS[0] = 'coco_outfits':
 
 end
 
-if $ARGS[0] = 'shoes':
-	$loc_arg = $ARGS[0]
-	$loc = 'shop_coco_carmen'
-	$menu_loc = 'shop_coco_carmen'
-	$menu_arg = 'shoes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
-
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
-	:loopcoco_shoes
-		if scoco[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_shoes''"><img src="images/pc/shoes/coco/<<i>>.jpg" height="250" /></a>'
-		i += 2
-	if i <= 37:jump 'loopcoco_shoes'
-end
-
 if $ARGS[0] = 'purses':
 	$loc_arg = 'purses'
 	$loc = 'shop_coco_carmen'

+ 27 - 5
locations/shop_dolls.qsrc

@@ -205,18 +205,40 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return':
 		cla
 		minut += 5
 		gt 'shop_dolls', 'browse'
 	end
-	i = 1
 
-	:loopdolls_shoes
-		if dolls_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_shoes''"><img src="images/pc/items/dolls/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 120:jump 'loopdolls_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+
+		:loopdolls_shoes
+			if dolls_shoe[i] = 0:
+				gs 'shoe_attributes', 'dolls', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_shoes''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 120:jump 'loopdolls_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'dolls_shoes':

+ 26 - 5
locations/shop_pussycats.qsrc

@@ -1140,6 +1140,10 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -1147,11 +1151,28 @@ if $ARGS[0] = 'shoes':
 		gt 'shop_pussycats', 'start'
 	end
 
-	i = 1
-	:loopcats_shoe
-		if cats_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''cats_shoe''"><img src="images/pc/items/cats/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'loopcats_shoe'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+		:loopcats_shoe
+			if cats_shoe[i] = 0:
+				gs 'shoe_attributes', 'cats', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''cats_shoe''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 40:jump 'loopcats_shoe'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'cats_shoe': gt 'shoes', 'view_shoe_item', 'shop', 'cats',i, 900

+ 26 - 5
locations/shop_scandalicious.qsrc

@@ -181,6 +181,10 @@ if $ARGS[0] = 'shoes':
 	$loc = 'shop_scandalicious'
 	cls
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -188,11 +192,28 @@ if $ARGS[0] = 'shoes':
 		gt 'shop_scandalicious', 'start'
 	end
 
-	i = 1
-	:loopscandalicious_shoes
-		if scandalicious_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''shoes2''"><img src="images/pc/items/scandalicious/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 80:jump 'loopscandalicious_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+		:loopscandalicious_shoes
+			if scandalicious_shoe[i] = 0:
+				gs 'shoe_attributes', 'scandalicious', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''shoes2''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 80:jump 'loopscandalicious_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'shoes2': gt 'shoes', 'view_shoe_item', 'shop', 'scandalicious',i, 1500

+ 27 - 5
locations/shop_tsar_bomba.qsrc

@@ -174,14 +174,36 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return': minut += 5 & gt 'shop_tsar_bomba', 'start'
-	i = 1
 
-	:loopbomba_shoes
-		if bomba_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_shoes''"><img src="images/pc/items/bomba/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'loopbomba_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+
+		:loopbomba_shoes
+			if bomba_shoe[i] = 0:
+				gs 'shoe_attributes', 'bomba', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_shoes''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 40:jump 'loopbomba_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'bomba_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'bomba',i, 2000

+ 26 - 5
locations/sportShop.qsrc

@@ -119,6 +119,10 @@ if $ARGS[0] = 'shoes':
 	$loc = 'sportShop'
 	cls
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -126,11 +130,28 @@ if $ARGS[0] = 'shoes':
 		gt 'sportShop', 'start'
 	end
 
-	i = 1
-	:loopdanilovich_shoes
-		if danilovich_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''training_shoes''"><img src="images/pc/items/danilovich/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'loopdanilovich_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+		:loopdanilovich_shoes
+			if danilovich_shoe[i] = 0:
+				gs 'shoe_attributes', 'danilovich', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''training_shoes''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 40:jump 'loopdanilovich_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'danilovich',i, 1500