Browse Source

[changed] edited 'shop_allure' to use the generalized display loops

f95Lok 2 weeks ago
parent
commit
d72a3bd747
2 changed files with 5 additions and 63 deletions
  1. 4 62
      locations/shop_allure.qsrc
  2. 1 1
      locations/shop_utils.qsrc

+ 4 - 62
locations/shop_allure.qsrc

@@ -40,41 +40,11 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimsuits - 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_allure', 'start'
-		step = 3
-	end
-
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'allure_swimsuit'
+	gs 'shop_utils', 'display_clothes', 'allure_swimsuit', 3, 'allure/one', 'shop', Clothingstock mod 3
 
-	!!To filter just this set
-	clo_i = 0
-	:loopallure_swimsuit_filter
-		i = 1 + Clothingstock mod 3
-		:loopallure_swimsuit
-			if allure_swimsuit[i] = 0:
-				gs 'clothing_attributes', 'allure_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_allure'', ''swim1''"><img src="images/pc/items/allure/one/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopallure_swimsuit'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopallure_swimsuit_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_allure', 'start'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'allure_swimsuit',i, 1750, 'shop'
-
 if $ARGS[0] = 'bikinis':
 	gs 'shortgs', 'setloc', 'shop_allure', 'bikinis'
 	menu_off = 0
@@ -82,39 +52,11 @@ if $ARGS[0] = 'bikinis':
 
 	'<center><b><font color="maroon">Bikinis - 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_allure', 'start'
-		step = 4
-	end
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'allure_bikinis'
 
-	!!To filter just this set
-	clo_i = 0
-	:loopallure_bikinis_filter
-		i = 1 + (Clothingstock / 3) mod 4
-		:loopallure_bikinis
-			if allure_bikinis[i] = 0:
-				gs 'clothing_attributes', 'allure_bikinis', i
-				gs 'clothing_QV', 'shop_filter'
+	gs 'shop_utils', 'display_clothes', 'allure_bikinis', 4, 'allure/two', 'shop', (Clothingstock / 3) mod 4
 
-				!!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 += step
-		if i <= total:jump 'loopallure_bikinis'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopallure_bikinis_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_allure', 'start'
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'allure_bikinis',i, 1750, 'shop'
-
 --- shop_allure ---------------------------------
 

+ 1 - 1
locations/shop_utils.qsrc

@@ -95,7 +95,7 @@ elseif $ARGS[0] = 'cheat':
 end
 
 
-! [1] - variable
+! [1] - variable - '*shop*_*type*' for clothing, just '*shop*' for anything else
 ! [2] - loop step
 ! [3] - img path
 ! [4] - link type - shop, wardrode, cheat