Explorar el Código

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

f95Lok hace 1 mes
padre
commit
632a145bfd
Se han modificado 1 ficheros con 12 adiciones y 201 borrados
  1. 12 201
      locations/shop_scandalicious.qsrc

+ 12 - 201
locations/shop_scandalicious.qsrc

@@ -33,46 +33,9 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Scandalicious 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_scandalicious', 'start'
-		step = 1
-	end
+	gt 'shop_utils', 'display_clothes', 'scandalicious_outfits', 1, 'scandalicious/outfits', 'shop'
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'scandalicious_outfits'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopscandalicious_outfits_filter
-		i = 1
-		:loopscandalicious_outfits
-			if scandalicious_outfits[i] = 0:
-				gs 'clothing_attributes', 'scandalicious_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_scandalicious'', ''scandalicious_outfits''"><img src="images/pc/items/scandalicious/outfits/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopscandalicious_outfits'
-		clo_i += 1
-	if (clothingfilter['quality'] = 0 and clo_i <= 7) or (clothingfilter['inhibition'] = 0 and clo_i <= 50):
-		jump 'loopscandalicious_outfits_filter'
-	end
-end
-
-if $ARGS[0] = 'scandalicious_outfits':
-	if scandalicious_outfits[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_scandalicious', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'scandalicious_outfits', i, 1500, 'shop'
+	act 'Return': minut += 1 & gt 'shop_scandalicious', 'start'
 end
 
 if $ARGS[0] = 'dresses':
@@ -83,46 +46,9 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Scandalicious 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_scandalicious', 'start'
-		step = 3
-	end
-
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'scandalicious_dress'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopscandalicious_dress_filter
-		i = 1 + Clothingstock mod 3
-		:loopscandalicious_dress
-			if scandalicious_dress[i] = 0:
-				gs 'clothing_attributes', 'scandalicious_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_scandalicious'', ''scandalicious_dress''"><img src="images/pc/items/scandalicious/dress/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopscandalicious_dress'
-		clo_i += 1
-	if (clothingfilter['quality'] = 0 and clo_i <= 7) or (clothingfilter['inhibition'] = 0 and clo_i <= 50):
-		jump 'loopscandalicious_dress_filter'
-	end
-end
-
-if $ARGS[0] = 'scandalicious_dress':
-	if scandalicious_dress[i] ! 0:
-		msg 'You already own this dress.'
-		gt 'shop_scandalicious', 'dresses'
-	end
+	gt 'shop_utils', 'display_clothes', 'scandalicious_dress', 3, 'scandalicious/dress', 'shop', Clothingstock mod 3
 
-	gt 'clothing', 'view_clothing_item', 'scandalicious_dress', i, 1500, 'shop'
+	act 'Return': minut += 1 & gt 'shop_scandalicious', 'start'
 end
 
 if $ARGS[0] = 'shoes':
@@ -133,39 +59,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_scandalicious', 'start'
-		step = 4
-	end
+	gt 'shop_utils', 'display_shoes', 'scandalicious', 4, 'scandalicious/shoes', 'shop', (Clothingstock / 3) mod 4
 
-	gs 'shoes', 'shop_filter_header'
-	gs 'shoes', 'totals', 'scandalicious_shoes'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopshoequality_filter
-		i = 1 + (Clothingstock / 3) mod 4
-		: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/scandalicious/shoes/<<i>>.jpg" height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopscandalicious_shoes'
-		clo_i += 1
-	if Shofilter['quality'] = 0 and clo_i <= 7:
-		jump 'loopshoequality_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_scandalicious', 'start'
 end
 
-if $ARGS[0] = 'shoes2': gt 'shoes', 'view_shoe_item', 'shop', 'scandalicious', i, 1500
-
 if $ARGS[0] = 'swim':
 	gs 'shortgs', 'setloc', 'shop_scandalicious', 'swim'
 	menu_off = 0
@@ -174,41 +72,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_scandalicious', 'start'
-		step = 2
-	end
+	gt 'shop_utils', 'display_clothes', 'scandalicious_swimsuits', 2, 'scandalicious/swim/one', 'shop', (Clothingstock / 4) mod 2
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'scandalicious_swimsuits'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopscandalicious_swimsuit_filter
-		i = 1 + (Clothingstock / 4) mod 2
-		:loopscandalicious_swimsuit
-			if scandalicious_swimsuit[i] = 0:
-				gs 'clothing_attributes', 'scandalicious_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_scandalicious'', ''swim1''"><img src="images/pc/items/scandalicious/swim/one/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopscandalicious_swimsuit'
-		clo_i += 1
-	if (clothingfilter['quality'] = 0 and clo_i <= 7) or (clothingfilter['inhibition'] = 0 and clo_i <= 50):
-		jump 'loopscandalicious_swimsuit_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_scandalicious', 'start'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swimsuit',i, 1750, 'shop'
-
 if $ARGS[0] = 'bikinis':
 	gs 'shortgs', 'setloc', 'shop_scandalicious', 'bikinis'
 	menu_off = 0
@@ -217,76 +85,19 @@ 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_scandalicious', 'start'
-		step = 4
-	end
+	gt 'shop_utils', 'display_clothes', 'scandalicious_bikinis', 4, 'scandalicious/swim/two', 'shop', (Clothingstock / 2) mod 4
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'scandalicious_bikinis'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopscandalicious_bikinis_filter
-		i = 1 + (Clothingstock / 2) mod 4
-		:loopscandalicious_bikinis
-			if scandalicious_bikinis[i] = 0:
-				gs 'clothing_attributes', 'scandalicious_bikinis', 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_scandalicious'', ''bikini1''"><img src="images/pc/items/scandalicious/swim/two/<<i>>.jpg"	 height="250" /></a>'
-				end
-			end
-			i += step
-		if i <= total: jump 'loopscandalicious_bikinis'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopscandalicious_bikinis_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_scandalicious', 'start'
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis', i, 1750, 'shop'
-
 if $ARGS[0] = 'bodysuit':
 	gs 'shortgs', 'setloc', 'shop_scandalicious', '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_scandalicious', 'start'
-		step = 2
-	end
+	gt 'shop_utils', 'display_bodysuits', 'scandalicious', 2, 'scandalicious/bodysuits', 'shop', Clothingstock mod 2
 
-	gs 'underwear_bodysuits', 'shop_filter_header'
-	gs 'underwear_bodysuits', 'totals', 'scandalicious_bodysuits'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopbodysuitquality_filter
-		i = 1 + Clothingstock mod 2
-		:loopscandalicious_bodysuit
-			if scandalicious_bodysuits[i] = 0:
-				gs 'underwear_attributes', 'scandalicious_bodysuits', i
-				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
-					*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''bodysuit1''"><img src="images/pc/items/scandalicious/bodysuits/<<i>>.jpg"	 height="250" /></a> '
-				end
-			end
-			i += step
-		if i <= total: jump 'loopscandalicious_bodysuit'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 6:
-		jump 'loopbodysuitquality_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_scandalicious', 'start'
 end
 
-if $ARGS[0] = 'bodysuit1': gt 'underwear_bodysuits', 'view_bodysuit_item', 'shop', 'scandalicious', i, 1250
-
 --- shop_scandalicious ---------------------------------