Merge remote-tracking branch 'Lokplart/master'

locations/shop_danilovich.qsrc

@@ -62,41 +62,11 @@ if $ARGS[0] = 'clo':
 	'<center><b><font color="maroon">Sportswear - one size fits all</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
-		step = 3
-	end
+	gt 'shop_utils', 'display_clothes', 'danilovich_outfits', 3, 'danilovich/outfits', 'shop', Clothingstock mod 3
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'danilovich_outfits'
-
-	!!To filter just this set
-	clo_i = 0
-	:loopdanilovich_outfits_filter
-		i = 1 + Clothingstock mod 3
-		:loopdanilovich_outfits
-			if danilovich_outfits[i] = 0:
-				gs 'clothing_attributes', 'danilovich_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 ''shop_danilovich'', ''danilovich''"><img src="images/pc/items/danilovich/outfits/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopdanilovich_outfits'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopdanilovich_outfits_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
 end
 
-if $ARGS[0] = 'danilovich': gt 'clothing', 'view_clothing_item', 'danilovich_outfits', i, 2000, 'shop'
-
 if $ARGS[0] = 'shoes':
 	gs 'shortgs', 'setloc', 'shop_danilovich', 'shoes'
 	menu_off = 1
@@ -105,39 +75,11 @@ if $ARGS[0] = 'shoes':
 	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
-		step = 1
-	end
+	gt 'shop_utils', 'display_shoes', 'danilovich', 1, 'danilovich/shoes', 'shop'
 
-	gs 'shoes', 'shop_filter_header'
-	gs 'shoes', 'totals', 'danilovich_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 ''shop_danilovich'', ''training_shoes''"><img src="images/pc/items/danilovich/shoes/<<i>>.jpg" height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopdanilovich_shoes'
-		clo_i += 1
-	if Shofilter['quality'] = 0 and clo_i <= 7:
-		jump 'loopshoequality_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
 end
 
-if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'danilovich', i, 1500
-
 if $ARGS[0] = 'swim':
 	gs 'shortgs', 'setloc', 'shop_danilovich', 'swim'
 	menu_off = 1
@@ -146,87 +88,20 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimwear - one size fits all</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
-		step = 2
-	end
+	shop_display_exceptions[0] = 4
+	gt 'shop_utils', 'display_clothes', 'danilovich_swimsuit', 2, 'danilovich/swimwear', 'shop', Clothingstock mod 2
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'danilovich_swimsuit'
-
-	!!To filter just this set
-	clo_i = 0
-	:loopswim_filter
-		i = 1 + Clothingstock mod 2
-		:loopswim
-			if danilovich_swimsuit[i] = 0:
-				gs 'clothing_attributes', 'danilovich_swimsuit', 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 ''shop_danilovich'', ''swim1''"><img src="images/pc/items/danilovich/swimwear/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-			!!4 is in he supermarket, so skipped
-			if intro_custom_noexcept = 0:
-				if i = 4: i += 2
-			end
-		if i <= total: jump 'loopswim'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopswim_filter'
-	end
+	act 'Return': minut += 1 & killvar 'shop_display_exceptions' & gt 'shop_danilovich', 'start'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'danilovich_swimsuit', i, 1750, 'shop'
-
 if $ARGS[0] = 'panties':
 	gs 'shortgs', 'setloc', 'shop_danilovich', 'panties'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
-		step = 1
-	end
-
-	gs 'panties', 'shop_filter_header'
-	gs 'panties', 'totals', 'danilovich_panties'
-	
-	!!To filter just this set
-	clo_i = 0
-	:looppantyquality_filter
-		i = 1
-		:loopdanilovich_panties
-			if danilovich_panties[i] = 0:
-				gs 'underwear_attributes', 'danilovich_panties', i
-				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
-					*p '<a href="exec: i = <<i>> & gt ''shop_danilovich'', ''panties2''"><img src="images/pc/items/danilovich/panties/<<i>>.jpg"	 height="150" /></a> '
-				end
-			end
-			i += step
-		if i <= total: jump 'loopdanilovich_panties'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 6:
-		jump 'looppantyquality_filter'
-	end
-end
-
-if $ARGS[0] = 'panties2':
-	if danilovich_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'shop_danilovich', 'panties'
-	end
+	gt 'shop_utils', 'display_panties', 'danilovich', 1, 'danilovich/panties', 'shop'
 
-	gt 'panties', 'view_panty_item', 'shop', 'danilovich', i, 1000
+	act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
 end
 
 if $ARGS[0] = 'bras':
@@ -234,43 +109,9 @@ if $ARGS[0] = 'bras':
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
-		step = 1
-	end
-
-	gs 'bras', 'shop_filter_header'
-	gs 'bras', 'totals', 'danilovich_bras'
-
-	!!To filter just this set
-	clo_i = 0
-	:loopbraquality_filter
-		i = 1
-		:loopdanilovich_bras
-			if danilovich_bras[i] = 0:
-				gs 'underwear_attributes', 'danilovich_bras', i
-				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
-					*p '<a href="exec: i = <<i>> & gt ''shop_danilovich'', ''bras2''"><img src="images/pc/items/danilovich/bras/<<i>>.jpg"	 height="150" /></a> '
-				end
-			end
-			i += step
-		if i <= total: jump 'loopdanilovich_bras'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 6:
-		jump 'loopbraquality_filter'
-	end
-end
-
-if $ARGS[0] = 'bras2':
-	if danilovich_bras[i] ! 0:
-		msg 'You already own this bra.'
-		gt 'shop_danilovich', 'bras'
-	end
+	gt 'shop_utils', 'display_bras', 'danilovich', 1, 'danilovich/bras', 'shop'
 
-	gt 'bras', 'view_bra_item', 'shop', 'danilovich', i, 1000
+	act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
 end
 
 if $ARGS[0] = 'purses':
@@ -278,48 +119,20 @@ if $ARGS[0] = 'purses':
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
-		step = 2
-	end
+	gt 'shop_utils', 'display_purses', 'danilovich', 2, 'danilovich/purses', 'shop', (Clothingstock / 6) mod 2
 
-	gs 'purses', 'totals', 'danilovich_purses'
-	
-	i = 1 + (Clothingstock / 6) mod 2
-	:loopdanilovich_purses
-		if danilovich_purses[i] = 0: *p '<a href="exec: i = <<i>> & gt ''shop_danilovich'', ''purses2''"><img src="images/pc/items/danilovich/purses/<<i>>.jpg"	 height="150" /></a> '
-		i += step
-	if i <= total: jump 'loopdanilovich_purses'
+	act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
 end
 
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'danilovich', i, 1500
-
 if $ARGS[0] = 'coats':
 	gs 'shortgs', 'setloc', 'shop_danilovich', 'coats'
 	menu_off = 1
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
-		step = 1
-	end
+	gt 'shop_utils', 'display_coats', 'danilovich', 1, 'danilovich/coats', 'shop'
 
-	gs 'coats', 'totals', 'danilovich_coats'
-
-	i = 1
-	:loopdanilovich_coats
-		if danilovich_coats[i] = 0: *p '<a href="exec: i = <<i>> & gt ''shop_danilovich'', ''coats2''"><img src="images/pc/items/danilovich/coats/<<i>>.jpg"	 height="150" /></a> '
-		i += step
-	if i <= total: jump 'loopdanilovich_coats'
+	act 'Return': minut += 1 & gt 'shop_danilovich', 'start'
 end
 
-if $ARGS[0] = 'coats2': gt 'coats', 'view_coat_item', 'shop', 'danilovich', i, 1500
-
 --- shop_danilovich ---------------------------------
 

locations/shop_dolls.qsrc

@@ -65,46 +65,9 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Viewing Patchwork Dolls dresses</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 5 & gt 'shop_dolls', 'browse'
-		step = 3
-	end
-
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'dolls_dress'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopdolls_dress_filter
-		i = 1 + Clothingstock mod 3
-		:loopdolls_dress
-			if dolls_dress[i] = 0:
-				gs 'clothing_attributes', 'dolls_dress', 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 ''shop_dolls'', ''dolls_dress''"><img src="images/pc/items/dolls/dress/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopdolls_dress'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopdolls_dress_filter'
-	end
-end
-
-if $ARGS[0] = 'dolls_dress':
-	if dolls_dress[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_dolls', 'dress'
-	end
+	gt 'shop_utils', 'display_clothes', 'dolls_dress', 3, 'dolls/dress', 'shop', Clothingstock mod 3
 
-	gt 'clothing', 'view_clothing_item', 'dolls_dress', i, iif(anushkaQW['dolls'] > 2, 3150, 3500), 'shop'
+	act 'Return': minut += 5 & gt 'shop_dolls', 'browse'
 end
 
 if $ARGS[0] = 'clothing':
@@ -115,50 +78,9 @@ if $ARGS[0] = 'clothing':
 	'<center><b><font color="maroon">Viewing Patchwork Dolls clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'dolls_outfits'
+	gt 'shop_utils', 'display_clothes', 'dolls_outfits', 2, 'dolls/outfits', 'shop', (Clothingstock / 3) mod 2
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return':
-			cla
-			minut += 5
-			gt 'shop_dolls', 'browse'
-		end
-		step = 2
-	end
-
-	!!To filter just this set
-	clo_i = 0
-	:loopdolls_filter
-		i = 1 + (Clothingstock / 3) mod 2
-		:loopdolls
-			if dolls_outfits[i] = 0:
-				gs 'clothing_attributes', 'dolls_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 ''shop_dolls'', ''dolls_outfits''"><img src="images/pc/items/dolls/outfits/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopdolls'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopdolls_filter'
-	end
-end
-
-if $ARGS[0] = 'dolls_outfits':
-	if dolls_outfits[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_dolls', 'clothing'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'dolls_outfits', i, iif(anushkaQW['dolls'] > 2, 3150, 3500), 'shop'
+	act 'Return': cla & minut += 5 & gt 'shop_dolls', 'browse'
 end
 
 if $ARGS[0] = 'shoes':
@@ -169,41 +91,9 @@ if $ARGS[0] = 'shoes':
 	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 5 & gt 'shop_dolls', 'browse'
-		step = 1
-	end
-
-	gs 'shoes', 'shop_filter_header'
-	gs 'shoes', 'totals', 'dolls_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/dolls/shoes/<<i>>.jpg" height="250" /></a>'
-					end
-				end
-			end
-			i += step
-		if i <= total: jump 'loopdolls_shoes'
-		clo_i += 1
-	if Shofilter['quality'] = 0 and clo_i <= 7:
-		jump 'loopshoequality_filter'
-	end
-end
+	gt 'shop_utils', 'display_shoes', 'dolls', 1, 'dolls/shoes', 'shop'
 
-if $ARGS[0] = 'dolls_shoes':
-	gt 'shoes', 'view_shoe_item', 'shop', 'dolls', i, iif(anushkaQW['dolls'] > 2, 1800, 2000)
+	act 'Return': minut += 5 & gt 'shop_dolls', 'browse'
 end
 
 if $ARGS[0] = 'purses':
@@ -211,25 +101,9 @@ if $ARGS[0] = 'purses':
 	menu_off = 0
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 5 & gt 'shop_dolls', 'browse'
-		step = 1
-	end
-
-	gs 'purses', 'totals', 'dolls_purses'
-	
-	i = 1
-	:loopdolls_purses
-		if dolls_purses[i] = 0: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''purses2''"><img src="images/pc/items/dolls/purses/<<i>>.jpg" height="250" /></a>'
-		i += step
-	if i <= total: jump 'loopdolls_purses'
-end
+	gt 'shop_utils', 'display_purses', 'dolls', 1, 'dolls/purses', 'shop'
 
-if $ARGS[0] = 'purses2':
-	gt 'purses', 'view_purse_item', 'shop', 'dolls', i, iif(anushkaQW['dolls'] > 2, 1800, 2000)
+	act 'Return': minut += 5 & gt 'shop_dolls', 'browse'
 end
 
 if $ARGS[0] = 'coats':
@@ -237,25 +111,9 @@ if $ARGS[0] = 'coats':
 	menu_off = 0
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 5 & gt 'shop_dolls', 'browse'
-		step = 1
-	end
-
-	gs 'coats', 'totals', 'dolls_coats'
-	
-	i = 1
-	:loopdolls_coats
-		if dolls_coats[i] = 0: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''coats2''"><img src="images/pc/items/dolls/coats/<<i>>.jpg" height="250" /></a>'
-		i += step
-	if i <= total: jump 'loopdolls_coats'
-end
+	gt 'shop_utils', 'display_coats', 'dolls', 1, 'dolls/coats', 'shop'
 
-if $ARGS[0] = 'coats2':
-	gt 'coats', 'view_coat_item', 'shop', 'dolls', i, iif(anushkaQW['dolls'] > 2, 1800, 2000)
+	act 'Return': minut += 5 & gt 'shop_dolls', 'browse'
 end
 
 if $ARGS[0] = 'savva':

locations/shop_erotomaniac.qsrc

@@ -126,41 +126,11 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Fetish dresses - for all your personal needs</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
-		step = 2
-	end
+	gt 'shop_utils', 'display_clothes', 'eroto_dress', 2, 'eroto/dress', 'shop', Clothingstock mod 2
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'eroto_dress'
-	
-	!!To filter just this set
-	clo_i = 0
-	:looperoto_dress_filter
-		i = 1 + Clothingstock mod 2
-		:looperoto_dress
-			if eroto_dress[i] = 0:
-				gs 'clothing_attributes', 'eroto_dress', 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 ''shop_erotomaniac'', ''eroto_dress''"><img src="images/pc/items/eroto/dress/<<i>>.jpg"	height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'looperoto_dress'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'looperoto_dress_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
 end
 
-if $ARGS[0] = 'eroto_dress': gt 'clothing', 'view_clothing_item', 'eroto_dress', i, 1000, 'shop'
-
 if $ARGS[0] = 'outfits':
 	gs 'shortgs', 'setloc', 'shop_erotomaniac', 'outfits'
 	menu_off = 0
@@ -169,41 +139,11 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Fetish outfits - for all your personal needs</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
-		step = 2
-	end
+	gt 'shop_utils', 'display_clothes', 'eroto_outfits', 2, 'eroto/outfits', 'shop', (Clothingstock / 2) mod 2
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'eroto_outfits'
-	
-	!!To filter just this set
-	clo_i = 0
-	:looperoto_outfits_filter
-		i = 1 + (Clothingstock / 2) mod 2
-		:looperoto_outfits
-			if eroto_outfits[i] = 0:
-				gs 'clothing_attributes', 'eroto_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 ''shop_erotomaniac'', ''eroto_outfits''"><img src="images/pc/items/eroto/outfits/<<i>>.jpg"	height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'looperoto_outfits'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'looperoto_outfits_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
 end
 
-if $ARGS[0] = 'eroto_outfits': gt 'clothing', 'view_clothing_item', 'eroto_outfits', i, 1000, 'shop'
-
 if $ARGS[0] = 'strip':
 	gs 'shortgs', 'setloc', 'shop_erotomaniac', 'strip'
 	menu_off = 0
@@ -212,41 +152,11 @@ if $ARGS[0] = 'strip':
 	'<center><b><font color="maroon">Stripper clothing - for work or the bedroom</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
-		step = 1
-	end
+	gt 'shop_utils', 'display_clothes', 'eroto_strip', 1, 'eroto/strip', 'shop'
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'eroto_strip'
-	
-	!!To filter just this set
-	clo_i = 0
-	:looperoto_strip_filter
-		i = 1
-		:looperoto_strip
-			if eroto_strip[i] = 0:
-				gs 'clothing_attributes', 'eroto_strip', 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 ''shop_erotomaniac'', ''eroto_strip''"><img src="images/pc/items/eroto/strip/<<i>>.jpg"	height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'looperoto_strip'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'looperoto_strip_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
 end
 
-if $ARGS[0] = 'eroto_strip': gt 'clothing', 'view_clothing_item', 'eroto_strip',i, 1000, 'shop'
-
 if $ARGS[0] = 'shoes':
 	gs 'shortgs', 'setloc', 'shop_erotomaniac', 'shoes'
 	menu_off = 0
@@ -255,83 +165,19 @@ if $ARGS[0] = 'shoes':
 	'<center><b><font color="maroon">Viewing Erotomaniac shoes</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
-		step = 1
-	end
+	gt 'shop_utils', 'display_shoes', 'eroto', 1, 'eroto/shoes', 'shop'
 
-	gs 'shoes', 'shop_filter_header'
-	gs 'shoes', 'totals', 'eroto_shoes'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopshoequality_filter
-		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 ''shop_erotomaniac'', ''eroto_shoes''"><img src="images/pc/items/eroto/shoes/<<i>>.jpg" height="250" /></a>'
-					end
-				end
-			end
-			i += step
-		if i <= total: jump 'looperoto_shoes'
-		clo_i += 1
-	if Shofilter['quality'] = 0 and clo_i <= 7:
-		jump 'loopshoequality_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
 end
 
-if $ARGS[0] = 'eroto_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'eroto',i, 2500
-
 if $ARGS[0] = 'panties':
 	gs 'shortgs', 'setloc', 'shop_erotomaniac', 'panties'
 	menu_off = 0
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
-		step = 2
-	end
+	gt 'shop_utils', 'display_panties', 'eroto', 2, 'eroto/panties', 'shop', (Clothingstock / 4) mod 2
 
-	gs 'panties', 'shop_filter_header'
-	gs 'panties', 'totals', 'eroto_panties'
-	
-	!!To filter just this set
-	clo_i = 0
-	:looppantyquality_filter
-		i = 1 + (Clothingstock / 4) mod 2
-		:looperoto_panties
-			if eroto_panties[i] = 0:
-				gs 'underwear_attributes', 'eroto_panties', i
-				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
-					*p '<a href="exec: i = <<i>> & gt ''shop_erotomaniac'', ''panties2''"><img src="images/pc/items/eroto/panties/<<i>>.jpg"	height="150" /></a> '
-				end
-			end
-			i += step
-		if i <= total: jump 'looperoto_panties'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 6:
-		jump 'looppantyquality_filter'
-	end
-end
-
-if $ARGS[0] = 'panties2':
-	if eroto_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'shop_erotomaniac', 'panties'
-	end
-
-	gt 'panties', 'view_panty_item', 'shop', 'eroto', i, 500
+	act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
 end
 
 if $ARGS[0] = 'bras':
@@ -339,43 +185,9 @@ if $ARGS[0] = 'bras':
 	menu_off = 0
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
-		step = 1
-	end
-
-	gs 'bras', 'shop_filter_header'
-	gs 'bras', 'totals', 'eroto_bras'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopbraquality_filter
-		i = 1
-		:looperoto_bras
-			if eroto_bras[i] = 0:
-				gs 'underwear_attributes', 'eroto_bras', i
-				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
-					*p '<a href="exec: i = <<i>> & gt ''shop_erotomaniac'', ''bras2''"><img src="images/pc/items/eroto/bras/<<i>>.jpg"	height="150" /></a> '
-				end
-			end
-			i += step
-		if i <= total: jump 'looperoto_bras'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 6:
-		jump 'loopbraquality_filter'
-	end
-end
-
-if $ARGS[0] = 'bras2':
-	if eroto_bras[i] ! 0:
-		msg 'You already own this bra.'
-		gt 'shop_erotomaniac', 'bras'
-	end
+	gt 'shop_utils', 'display_bras', 'eroto', 1, 'eroto/bras', 'shop'
 
-	gt 'bras', 'view_bra_item', 'shop', 'eroto', i, 500
+	act 'Return': minut += 1 & gt 'shop_erotomaniac', 'start'
 end
 
 if $ARGS[0] = 'basement':

locations/shop_exhibitionist.qsrc

@@ -44,7 +44,6 @@ if $ARGS[0] = 'start':
 	act 'View bodysuits': minut += 5 & gt 'shop_exhibitionist', 'bodysuit'
 end
 
-
 if $ARGS[0] = 'outfits':
 	gs 'shortgs', 'setloc', 'shop_exhibitionist', 'outfits'
 	menu_off = 0
@@ -53,41 +52,11 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Salacious outfits</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_exhibitionist', 'start'
-		step = 1
-	end
+	gt 'shop_utils', 'display_clothes', 'salacious_outfits', 1, 'salacious/outfits', 'shop'
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'salacious_outfits'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopsalacious_outfits_filter
-		i = 1
-		:loopsalacious_outfits
-			if salacious_outfits[i] = 0:
-				gs 'clothing_attributes', 'salacious_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 ''shop_exhibitionist'', ''salacious_outfits''"><img <<$set_imgh>> src="images/pc/items/salacious/outfits/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopsalacious_outfits'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopsalacious_outfits_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_exhibitionist', 'start'
 end
 
-if $ARGS[0] = 'salacious_outfits': gt 'clothing', 'view_clothing_item', 'salacious_outfits', i, 1000, 'shop'
-
 if $ARGS[0] = 'dresses':
 	gs 'shortgs', 'setloc', 'shop_exhibitionist', 'dresses'
 	menu_off = 0
@@ -96,83 +65,19 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Salacious dresses</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_exhibitionist', 'start'
-		step = 2
-	end
+	gt 'shop_utils', 'display_clothes', 'salacious_dress', 2, 'salacious/dress', 'shop', Clothingstock mod 2
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'salacious_dress'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopsalacious_dress_filter
-		i = 1 + Clothingstock mod 2
-		:loopsalacious_dress
-			if salacious_dress[i] = 0:
-				gs 'clothing_attributes', 'salacious_dress', 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 ''shop_exhibitionist'', ''salacious_dress''"><img <<$set_imgh>> src="images/pc/items/salacious/dress/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopsalacious_dress'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopsalacious_dress_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_exhibitionist', 'start'
 end
 
-if $ARGS[0] = 'salacious_dress': gt 'clothing', 'view_clothing_item', 'salacious_dress', i, 1000, 'shop'
-
 if $ARGS[0] = 'panties':
 	gs 'shortgs', 'setloc', 'shop_exhibitionist', 'panties'
 	menu_off = 0
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_exhibitionist', 'start'
-		step = 2
-	end
-
-	gs 'panties', 'shop_filter_header'
-	gs 'panties', 'totals', 'salacious_panties'
-	
-	!!To filter just this set
-	clo_i = 0
-	:looppantyquality_filter
-		i = 1 + (Clothingstock / 2) mod 2
-		:loopsalacious_panties
-			if salacious_panties[i] = 0:
-				gs 'underwear_attributes', 'salacious_panties', i
-				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
-					*p '<a href="exec: i = <<i>> & gt ''shop_exhibitionist'', ''panties2''"><img src="images/pc/items/salacious/panties/<<i>>.jpg" height="150" /></a> '
-				end
-			end
-			i += step
-		if i <= total: jump 'loopsalacious_panties'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 6:
-		jump 'looppantyquality_filter'
-	end
-end
-
-if $ARGS[0] = 'panties2':
-	if salacious_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'shop_exhibitionist', 'panties'
-	end
+	gt 'shop_utils', 'display_panties', 'salacious', 2, 'salacious/panties', 'shop', (Clothingstock / 2) mod 2
 
-	gt 'panties', 'view_panty_item', 'shop', 'salacious', i, 600
+	act 'Return': minut += 1 & gt 'shop_exhibitionist', 'start'
 end
 
 if $ARGS[0] = 'bras':
@@ -180,43 +85,9 @@ if $ARGS[0] = 'bras':
 	menu_off = 0
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_exhibitionist', 'start'
-		step = 2
-	end
-
-	gs 'bras', 'shop_filter_header'
-	gs 'bras', 'totals', 'salacious_bras'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopbraquality_filter
-		i = 1 + (Clothingstock / 4) mod 2
-		:loopsalacious_bras
-			if salacious_bras[i] = 0:
-				gs 'underwear_attributes', 'salacious_bras', i
-				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
-					*p '<a href="exec: i = <<i>> & gt ''shop_exhibitionist'', ''bras2''"><img src="images/pc/items/salacious/bras/<<i>>.jpg" height="150" /></a> '
-				end
-			end
-			i += step
-		if i <= total: jump 'loopsalacious_bras'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 6:
-		jump 'loopbraquality_filter'
-	end
-end
-
-if $ARGS[0] = 'bras2':
-	if salacious_bras[i] ! 0:
-		msg 'You already own these bras.'
-		gt 'shop_exhibitionist', 'bras'
-	end
+	gt 'shop_utils', 'display_bras', 'salacious', 2, 'salacious/bras', 'shop', (Clothingstock / 4) mod 2
 
-	gt 'bras', 'view_bra_item', 'shop', 'salacious', i, 600
+	act 'Return': minut += 1 & gt 'shop_exhibitionist', 'start'
 end
 
 if $ARGS[0] = 'bodysuit':
@@ -224,40 +95,11 @@ if $ARGS[0] = 'bodysuit':
 	menu_off = 0
 	gs 'stat'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_exhibitionist', 'start'
-		step = 1
-	end
+	gt 'shop_utils', 'display_bodysuits', 'salacious', 1, 'salacious/bodysuits', 'shop'
 
-	gs 'underwear_bodysuits', 'shop_filter_header'
-	gs 'underwear_bodysuits', 'totals', 'salacious_bodysuits'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopbodysuitquality_filter
-		i = 1
-		:loopsalacious_bodysuit
-			if salacious_bodysuits[i] = 0:
-				gs 'underwear_attributes', 'salacious_bodysuits', i
-				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
-					*p '<a href="exec: i = <<i>> & gt ''shop_exhibitionist'', ''bodysuit2''"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg"	 height="250" /></a> '
-				end
-			end
-			i += step
-		if i <= total: jump 'loopsalacious_bodysuit'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 6:
-		jump 'loopbodysuitquality_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_exhibitionist', 'start'
 end
 
-if $ARGS[0] = 'bodysuit2': gt 'underwear_bodysuits', 'view_bodysuit_item', 'shop', 'salacious', i, 1000
-
-
-
 
 	!!================================================!!
 	!!                                                !!

locations/shop_fancy_pancy.qsrc

@@ -30,46 +30,9 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Fancy Pancy outfits</font></b></center>'
 	*nl
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return': minut += 1 & gt 'shop_fancy_pancy', 'start'
-		step = 2
-	end
+	gt 'shop_utils', 'display_clothes', 'fancy_burlesque', 2, 'fancy/burlesque', 'shop', Clothingstock mod 2
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'fancy_burlesque'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopfancy_burlesque_filter
-		i = 1 + Clothingstock mod 2
-		:loopfancy_burlesque
-			if fancy_burlesque[i] = 0:
-				gs 'clothing_attributes', 'fancy_burlesque', 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 ''shop_fancy_pancy'', ''fancy_burlesque''"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopfancy_burlesque'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopfancy_burlesque_filter'
-	end
-end
-
-if $ARGS[0] = 'fancy_burlesque':
-	if fancy_burlesque[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_fancy_pancy', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'fancy_burlesque', i, 20000, 'shop'
+	act 'Return': minut += 1 & gt 'shop_fancy_pancy', 'start'
 end
 
 --- shop_fancy_pancy ---------------------------------

locations/shop_utils.qsrc

@@ -101,6 +101,7 @@ end
 ! [4] - link type - shop, wardrode, cheat
 ! [5] - loop index start offset
 ! Populate the 'shop_display_exceptions[]' array with the index of the outfits you want excluded from the display.
+! gt 'shop_utils', 'display_clothes', 'shop_type', 1, 'path', 'link_type'
 if $ARGS[0] = 'display_clothes':
 	$shop_display['variable']	= $ARGS[1]
 
@@ -139,6 +140,7 @@ if $ARGS[0] = 'display_clothes':
 	killvar 'shop_display'
 end
 
+! gt 'shop_utils', 'display_shoes', 'shop', 1, 'path', 'link_type'
 if $ARGS[0] = 'display_shoes':
 	$shop_display['variable']	= $ARGS[1]
 
@@ -177,6 +179,7 @@ if $ARGS[0] = 'display_shoes':
 	killvar 'shop_display'
 end
 
+! gt 'shop_utils', 'display_bras', 'shop', 1, 'path', 'link_type'
 if $ARGS[0] = 'display_bras':
 	$shop_display['variable']	= $ARGS[1]
 
@@ -215,6 +218,7 @@ if $ARGS[0] = 'display_bras':
 	killvar 'shop_display'
 end
 
+! gt 'shop_utils', 'display_panties', 'shop', 1, 'path', 'link_type'
 if $ARGS[0] = 'display_panties':
 	$shop_display['variable']	= $ARGS[1]
 
@@ -253,6 +257,7 @@ if $ARGS[0] = 'display_panties':
 	killvar 'shop_display'
 end
 
+! gt 'shop_utils', 'display_bodysuits', 'shop', 1, 'path', 'link_type'
 if $ARGS[0] = 'display_bodysuits':
 	$shop_display['variable']	= $ARGS[1]
 
@@ -291,6 +296,7 @@ if $ARGS[0] = 'display_bodysuits':
 	killvar 'shop_display'
 end
 
+! gt 'shop_utils', 'display_coats', 'shop', 1, 'path', 'link_type'
 if $ARGS[0] = 'display_coats':
 	$shop_display['variable']	= $ARGS[1]
 
@@ -328,6 +334,7 @@ if $ARGS[0] = 'display_coats':
 	killvar 'shop_display'
 end
 
+! gt 'shop_utils', 'display_purses', 'shop', 1, 'path', 'link_type'
 if $ARGS[0] = 'display_purses':
 	$shop_display['variable']	= $ARGS[1]