Merge remote-tracking branch 'Lokplart/master'

locations/shop_fashionista.qsrc

@@ -128,47 +128,9 @@ if $ARGS[0] = 'dressingclothes':
 	'<center><b><font color="maroon">Viewing shop_fashionista clothing</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_fashionista', 'changingroom'
-		step = 4
-	end
-
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'fashionista_dress'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopfashionista_filter
-		i = 1 + Clothingstock mod 4
-		:loopfashionista_dress
-			if fashionista_dress[i] = 0:
-				gs 'clothing_attributes', 'fashionista_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_fashionista'', ''dressingclothes2''"><img src="images/pc/items/fashionista/dress/<<i>>.jpg"	 height="250" /></a>  '
-				end
-			end
-			i += step
-		if i <= total: jump 'loopfashionista_dress'
-
-	clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopfashionista_filter'
-	end
-end
-
-if $ARGS[0] = 'dressingclothes2':
-	if fashionista_dress[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_fashionista', 'clothes'
-	end
+	gt 'shop_utils', 'display_clothes', 'fashionista_dress', 4, 'fashionista/dress', 'shop', Clothingstock mod 4
 
-	gt 'clothing', 'view_clothing_item', 'fashionista_dress', i, 8000, 'shop'
+	act 'Return': minut += 1 & gt 'shop_fashionista', 'changingroom'
 end
 
 if $ARGS[0] = 'dressingoutfit':
@@ -180,49 +142,9 @@ if $ARGS[0] = 'dressingoutfit':
 	'<center><b><font color="maroon">Viewing shop_fashionista clothing</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_fashionista', 'changingroom'
-		step = 1
-	end
-
-	gs 'clothing_QV', 'shop_filter_header'
-	gs 'clothing', 'totals', 'fashionista_outfits'
-	
-	step = 1
-	if intro_custom_step ! 0: step = intro_custom_step
-
-	!!To filter just this set
-	clo_i = 0
-	:loopfashionista_outfits_filter
-		i = 1
-		:loopfashionista_outfits
-			if fashionista_outfits[i] = 0:
-				gs 'clothing_attributes', 'fashionista_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_fashionista'', ''dressingoutfit2''"><img src="images/pc/items/fashionista/outfits/<<i>>.jpg"	 height="250" /></a>  '
-				end
-			end
-			i += step
-		if i <= total: jump 'loopfashionista_outfits'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 7 or clothingfilter['inhibition'] = 0 and clo_i <= 50:
-		jump 'loopfashionista_outfits_filter'
-	end
-end
+	gt 'shop_utils', 'display_clothes', 'fashionista_outfits', 1, 'fashionista/outfits', 'shop'
 
-if $ARGS[0] = 'dressingoutfit2':
-	if fashionista_outfits[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_fashionista', 'dressingclothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'fashionista_outfits', i, 8000, 'shop'
+	act 'Return': minut += 1 & gt 'shop_fashionista', 'changingroom'
 end
 
 if $ARGS[0] = 'dressingbra':
@@ -230,90 +152,22 @@ if $ARGS[0] = 'dressingbra':
 	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_fashionista', 'changingroom'
-		step = 1
-	end
+	gt 'shop_utils', 'display_bras', 'fashionista', 1, 'fashionista/bras', 'shop'
 
-	gs 'bras', 'shop_filter_header'
-	gs 'bras', 'totals', 'fashionista_bras'
-	
-	!!To filter just this set
-	clo_i = 0
-	:loopbraquality_filter
-		i = 1
-		:loopfashionista_bras2
-			if fashionista_bras[i] = 0:
-				gs 'underwear_attributes', 'fashionista_bras', i
-				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
-					*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingbras2''"><img src="images/pc/items/fashionista/bras/<<i>>.jpg"	height="150" /></a> '
-				end
-			end
-			i += step
-		if i <= total: jump 'loopfashionista_bras2'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 6:
-		jump 'loopbraquality_filter'
-	end
+	act 'Return': minut += 1 & gt 'shop_fashionista', 'changingroom'
 end
 
-if $ARGS[0] = 'dressingbras2':
-	if fashionista_bras[i] ! 0:
-		msg 'You already own this bra.'
-		gt 'shop_fashionista', 'bras'
-	end
-
-	gt 'bras', 'view_bra_item', 'shop', 'fashionista', i, 750
-end
 
 if $ARGS[0] = 'dressingpanties':
 	gs 'shortgs', 'setloc', 'shop_fashionista', 'dressingpanties'
 	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_fashionista', 'changingroom'
-		step = 2
-	end
-
-	gs 'panties', 'shop_filter_header'
-	gs 'panties', 'totals', 'fashionista_panties'
-	
-	!!To filter just this set
-	clo_i = 0
-	:looppantyquality_filter
-		i = 1 + (Clothingstock / 4) mod 2
-		:loopfashionista_panties2
-			if fashionista_panties[i] = 0:
-				gs 'underwear_attributes', 'fashionista_panties', i
-				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
-					*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingpanties2''"><img src="images/pc/items/fashionista/panties/<<i>>.jpg"	height="150" /></a> '
-				end
-			end
-			i += step
-		if i <= total: jump 'loopfashionista_panties2'
-		clo_i += 1
-	if clothingfilter['quality'] = 0 and clo_i <= 6:
-		jump 'looppantyquality_filter'
-	end
-end
-
-if $ARGS[0] = 'dressingpanties2':
-	if fashionista_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'shop_fashionista', 'dressingpanties'
-	end
+	gt 'shop_utils', 'display_panties', 'fashionista', 2, 'fashionista/panties', 'shop', (Clothingstock / 4) mod 2
 
-	gt 'panties', 'view_panty_item', 'shop', 'fashionista', i, 750
+	act 'Return': minut += 1 & gt 'shop_fashionista', 'changingroom'
 end
 
-
 if $ARGS[0] = 'changingend':
 	!! Sveta dresses again
 	if changingroom_underwear = 1:
@@ -325,7 +179,6 @@ if $ARGS[0] = 'changingend':
 	gt 'shop_fashionista', 'start'
 end
 
-
 !!only items not in dressing room
 if $ARGS[0] = 'purses':
 	$loc = 'shop_fashionista'
@@ -333,21 +186,9 @@ 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_fashionista', 'start'
-		step = 1
-	end 
-	
-	gs 'purses', 'totals', 'fashionista_purses'
-
-	i = 1
-	:loopfashionista_purses
-		if fashionista_purses[i] = 0: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''purses2''"><img src="images/pc/items/fashionista/purses/<<i>>.jpg"	 height="150" /></a> '
-		i += step
-	if i <= total: jump 'loopfashionista_purses'
+	gt 'shop_utils', 'display_purses', 'fashionista', 1, 'fashionista/purses', 'shop'
+
+	act 'Return': minut += 1 & gt 'shop_fashionista', 'start'
 end
 
 if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'fashionista',i, 3000