1
0
Prechádzať zdrojové kódy

[changed] edited the various market clothing shops to use the generalized display loops

f95Lok 3 týždňov pred
rodič
commit
becbc79177

+ 2 - 33
locations/city_market.qsrc

@@ -128,40 +128,9 @@ if $ARGS[0] = 'clo':
 	'<center><b><font color="maroon">Clothes.</font></b></center>'
 	'You inspect the cheap clothing the stall has to offer.'
 
-	act 'Return': minut += 5 & gt 'city_market', 'start'
+	gt 'shop_utils', 'display_clothes', 'market_outfits', 1, 'market/clothes', 'shop'
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'market_outfits'
-
-	!!To filter just this set
-	clo_i = 0
-	:loopmarket_outfits_filter
-		i = 1
-		:loopmarket_outfits
-			if market_outfits[i] = 0:
-				gs 'clothing_attributes', 'market_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 ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 1
-		if i <= total: jump 'loopmarket_outfits'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopmarket_outfits_filter'
-	end
-end
-
-if $ARGS[0] = 'marketclo':
-	if market_outfits[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'city_market', 'clo'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'market_outfits', i, 750, 'shop'
+	act 'Return': minut += 5 & gt 'city_market', 'start'
 end
 
 if $ARGS[0] = 'wares':

+ 4 - 36
locations/gad_market.qsrc

@@ -141,41 +141,9 @@ if $ARGS[0] = 'clothing_cart':
 		exit
 	end
 
+	gt 'shop_utils', 'display_clothes', 'market_outfits', 8, 'market/clothes', 'shop', clothingstock mod 4
+	
 	act 'Return': minut += 5 & gt 'gad_market', 'clothing_stand'
-
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'market_outfits'
-
-	!!To filter just this set
-	clo_i = 0
-	:loopmarket_outfits_filter
-		i = 1 + clothingstock mod 4
-		:loopmarket_outfits
-			if market_outfits[i] = 0:
-				gs 'clothing_attributes', 'market_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 ''gad_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			!! Only half of the market outfits are ever sold here.
-			i += 8
-		if i <= total: jump 'loopmarket_outfits'
-		clo_i += 1
-	if (clothingfilter['quality'] = 0 and clo_i <= 7) or (clothingfilter['inhibition'] = 0 and clo_i <= 50):
-		jump 'loopmarket_outfits_filter'
-	end
-end
-
-if $ARGS[0] = 'marketclo':
-	if market_outfits[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'gad_market', 'clothing_cart'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'market_outfits', i, 750, 'shop'
 end
 
 if $ARGS[0] = 'swimsuit_cart':
@@ -270,8 +238,8 @@ if $ARGS[0] = 'swimsuit_cart':
 	end
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis', i, 1750, 'shop'
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swimsuit', i, 1750, 'shop'
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis', i, 'shop'
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swimsuit', i, 'shop'
 
 
 

+ 5 - 49
locations/pav_train_market.qsrc

@@ -237,57 +237,13 @@ if $ARGS[0] = 'clo':
 	'<center><b><font color="maroon">Clothes.</font></b></center>'
 	'Cheap clothing on the market stall.'
 
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'market_outfits'
+	gt 'shop_utils', 'display_clothes', 'market_outfits', 1, 'market/clothes', 'shop'
 
-	if intro_custom_shop_return = 1:
-		act 'Return': gt 'intro_customization', 'modclo'
-		step = intro_custom_step
-	else
-		act 'Return':
-			cla
-			minut += 5
-			gt 'pav_train_market', 'start'
-		end
-		step = 1
-	end
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopmarket_outfits_filter
-
-	i = 1
-	:loopmarket_outfits
-		if market_outfits[i] = 0:
-			gs 'clothing_attributes', 'market_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 ''pav_train_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
-			end
-		end
-	i += step
-	if i <= total:jump 'loopmarket_outfits'
-
-	clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7:
-		jump 'loopmarket_outfits_filter'
-	elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopmarket_outfits_filter'
-	end
-end
-
-if $ARGS[0] = 'marketclo':
-	cla
-
-	if market_outfits[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'pav_train_market', 'clo'
+	act 'Return':
+		cla
+		minut += 5
+		gt 'pav_train_market', 'start'
 	end
-
-	gt 'clothing', 'view_clothing_item', 'market_outfits',i, 750, 'shop'
-
 end
 
 if $ARGS[0] = 'events':