[changed] More clothing totals centralised and changed fashionista to fashionista_dress for consistancy

glife.qproj

@@ -142,7 +142,7 @@
 		<Location name="$attributes_flamingos_dress"/>
 		<Location name="$attributes_coco_outfits"/>
 		<Location name="$attributes_coco_dress"/>
-		<Location name="$attributes_fashionista"/>
+		<Location name="$attributes_fashionista_dress"/>
 		<Location name="$attributes_fashionista_outfits"/>
 		<Location name="$attributes_moncheri_gown"/>
 		<Location name="$attributes_moncheri_dress"/>

locations/_attributes_fashionista.qsrc → locations/_attributes_fashionista_dress.qsrc

@@ -1,4 +1,4 @@
-# $attributes_fashionista
+# $attributes_fashionista_dress
 !2022/06/14
 !prince range from 4 to 6, please avoid adding too many 4s
 
@@ -1457,5 +1457,5 @@ elseif ARGS[1] = 200:
 	
 end
 
---- $attributes_fashionista ---------------------------------
+--- $attributes_fashionista_dress ---------------------------------
 

locations/_clothing_image.qsrc

@@ -21,7 +21,7 @@ elseif $ARGS[0] = 'coco_outfits':
 	$RESULT = 'images/pc/items/coco/outfits/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'coco_dress':
 	$RESULT = 'images/pc/items/coco/dress/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'fashionista':
+elseif $ARGS[0] = 'fashionista_dress':
 	$RESULT = 'images/pc/items/fashionista/dress/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'fashionista_outfits':
 	$RESULT = 'images/pc/items/fashionista/outfits/<<ARGS[1]>>.jpg'

locations/_short_description.qsrc

@@ -26,7 +26,7 @@ elseif $ARGS[0] = 'coco_outfits':
 	$RESULT = 'Coco outfit number '
 elseif $ARGS[0] = 'coco_dress':
 	$RESULT = 'Coco dress number '
-elseif $ARGS[0] = 'fashionista':
+elseif $ARGS[0] = 'fashionista_dress':
 	$RESULT = 'Fashionista dress number '
 elseif $ARGS[0] = 'fashionista_outfits':
 	$RESULT = 'Fashionista outfit number '

locations/budgetclothes.qsrc

@@ -200,7 +200,7 @@ if $ARGS[0] = 'dresses':
 				end
 			end
 			i += 3
-		if i <= 300:jump 'loopgm_dress'
+		if i <= total:jump 'loopgm_dress'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -258,7 +258,7 @@ if $ARGS[0] = 'office':
 				end
 			end
 			i += 1
-		if i <= 40:jump 'loopoffice'
+		if i <= total:jump 'loopoffice'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -320,7 +320,7 @@ if $ARGS[0] = 'gm_maid':
 				end
 			end
 			i += 2
-		if i <= 40:jump 'loopgm_maid'
+		if i <= total:jump 'loopgm_maid'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -373,7 +373,7 @@ if $ARGS[0] = 'gm_server':
 				end
 			end
 			i += 2
-		if i <= 30:jump 'loopgm_server'
+		if i <= total:jump 'loopgm_server'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -429,7 +429,7 @@ if $ARGS[0] = 'school':
 			end
 			i += 3
 			if i = 6:i = 9
-		if i <= 62:jump 'loopschool'
+		if i <= total:jump 'loopschool'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:

locations/clothing.qsrc

@@ -23,6 +23,16 @@ if $ARGS[0] = 'totals':
 		total = 300
 	elseif $ARGS[1] = 'coco_outfits':
 		total = 160
+	elseif $ARGS[1] = 'dolls_dress':
+		total = 120
+	elseif $ARGS[1] = 'dolls_outfits':
+		total = 80
+	elseif $ARGS[1] = 'fancy_burlesque':
+		total = 40
+	elseif $ARGS[1] = 'fashionista_dress':
+		total = 40
+	elseif $ARGS[1] = 'fashionista_outfits':
+		total = 40
 	end
 end
 
@@ -223,7 +233,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 	if ARRSIZE('coco_outfits') > 0 or ARRSIZE('coco_dress') > 0:'<center><a href="exec:$ward_list_store = ''coco'' & gt ''clothing'', ''clothing_list'', ''coco''"><img src="images/locations/pavlovsk/coco/shop_name.png"></a></center>'
 
-	if ARRSIZE('fashionista') > 0 or ARRSIZE('fashionista_outfits') > 0:'<center><a href="exec:$ward_list_store = ''fashionista'' & gt ''clothing'', ''clothing_list'', ''fashionista''"><img src="images/locations/city/citycenter/mall/fashionista.png"></a></center>'
+	if ARRSIZE('fashionista_dress') > 0 or ARRSIZE('fashionista_outfits') > 0:'<center><a href="exec:$ward_list_store = ''fashionista'' & gt ''clothing'', ''clothing_list'', ''fashionista''"><img src="images/locations/city/citycenter/mall/fashionista.png"></a></center>'
 
 	if ARRSIZE('moncheri_gown') > 0 or ARRSIZE('moncheri_dress') > 0:'<center><a href="exec:$ward_list_store = ''moncheri'' & gt ''clothing'', ''clothing_list'', ''moncheri''"><img src="images/locations/city/citycenter/mall/moncheri.png"></a></center>'
 
@@ -672,17 +682,17 @@ if $ARGS[0] = 'clothing_list':
 		end
 
 		i = 1
-		:loopfashionista
-			if fashionista[i] = 1 and ($clothingworntype ! 'fashionista' or clothingwornnumber ! i):
-				gs 'clothing_attributes', 'fashionista', i
+		:loopfashionista_dress
+			if fashionista_dress[i] = 1 and ($clothingworntype ! 'fashionista_dress' or clothingwornnumber ! i):
+				gs 'clothing_attributes', 'fashionista_dress', i
 				gs 'clothing_QV', 'clo_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 and clothingfilter['sport_only'] = 0 and clothingfilter['swim_only'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'fashionista', i)
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0 and clothingfilter['swim_only'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'fashionista_dress', i)
 				end
 			end
 			i += 1
-		if i <= ARRSIZE('fashionista'):jump 'loopfashionista'
+		if i <= ARRSIZE('fashionista_dress'):jump 'loopfashionista_dress'
 
 		i = 1
 		:loopfashionista_outfits

locations/clothing_QV.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'list':
 
 	if ARRSIZE('coco_outfits') > 0 or ARRSIZE('coco_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''coco''"><img src="images/locations/pavlovsk/coco/shop_name.png"></a></center>'
 
-	if ARRSIZE('fashionista') > 0 or ARRSIZE('fashionista_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''fashionista''"><img src="images/locations/city/citycenter/mall/fashionista.png"></a></center>'
+	if ARRSIZE('fashionista_dress') > 0 or ARRSIZE('fashionista_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''fashionista''"><img src="images/locations/city/citycenter/mall/fashionista.png"></a></center>'
 
 	if ARRSIZE('moncheri_gown') > 0 or ARRSIZE('moncheri_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''moncheri''"><img src="images/locations/city/citycenter/mall/moncheri.png"></a></center>'
 
@@ -501,25 +501,25 @@ if $ARGS[0] = 'clothing_list':
 		end
 
 		i = 1
-		:loopfashionista
-		if fashionista[i] = 1:
-			gs 'clothing_attributes', 'fashionista', i
+		:loopfashionista_dress
+		if fashionista_dress[i] = 1:
+			gs 'clothing_attributes', 'fashionista_dress', i
 			gs 'clothing_QV', 'clo_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 and clothingfilter['sport_only'] = 0:
 					if CloInhibit <= pcs_inhib:
 						if CloStyle ! 5:
-							if fashionista_s[i] = 0 and fashionista_h[i] > 0 and fashionista_b[i] >= (pcs_hips - 8) and fashionista_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''fashionista'', <<i>>"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>'
+							if fashionista_dress_s[i] = 0 and fashionista_dress_h[i] > 0 and fashionista_dress_b[i] >= (pcs_hips - 8) and fashionista_dress_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''fashionista_dress_dress'', <<i>>"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>'
 						else
-							if fashionista_s[i] = 0 and fashionista_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''fashionista'', <<i>>"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>'
+							if fashionista_dress_s[i] = 0 and fashionista_dress_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''fashionista_dress_dress'', <<i>>"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>'
 						end
 					end
 				end
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('fashionista'):jump 'loopfashionista'
+		if i <= ARRSIZE('fashionista_dress'):jump 'loopfashionista_dress'
 
 		i = 1
 		:loopfashionista_outfits

locations/clothing_attributes.qsrc

@@ -133,8 +133,8 @@ elseif $ARGS[0] = 'coco_outfits':
 	*P FUNC('$attributes_coco_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'coco_dress':
 	*P FUNC('$attributes_coco_dress', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'fashionista':
-	*P FUNC('$attributes_fashionista', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'fashionista_dress':
+	*P FUNC('$attributes_fashionista_dress', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'fashionista_outfits':
 	*P FUNC('$attributes_fashionista_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'moncheri_dress':

locations/katja_party.qsrc

@@ -296,7 +296,7 @@ if $ARGS[0] = 'part_dress_check':
 					'"Just a moment," Katja says and runs to her wardrobe and starts rummaging through it. A short while later, she pulls out a dress. "Here, this should fit you. You can borrow it for tonight," she says as she hands you a pretty nice dress.'
 				end
 				act 'Wear Katja''s dress': 
-					gs 'clothing', 'wear', 'fashionista', 196
+					gs 'clothing', 'wear', 'fashionista_dress', 196
 					gt 'katja_party', 'party_look_approval'
 				end
 			end

locations/lover_love.qsrc

@@ -62,13 +62,13 @@ elseif loverlove[lover_number] = 2:
 	exit
 end
 
-if pcs_makeup > 1 and ($clothingworntype = 'fashionista' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'moncheri_dress') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 0:
+if pcs_makeup > 1 and ($clothingworntype = 'fashionista_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'moncheri_dress') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 0:
 	'<<$loverdesc[lover_number]>> looks very excited. He decides that you are now ready to meet his mother.'
 
 	act 'Meet the parents':gt 'love', 'mother'
 
 	exit
-elseif pcs_makeup > 1 and ($clothingworntype = 'fashionista' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'moncheri_dress') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 1 and $pantyworntype ! 'none':
+elseif pcs_makeup > 1 and ($clothingworntype = 'fashionista_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'moncheri_dress') and curly > 0 and loverlove[lover_number] = 1 and haraklover[lover_number] = 1 and $pantyworntype ! 'none':
 	'<<$loverdesc[lover_number]>> examins you and decides that you are ready to meet his friends.'
 
 	act 'Meet his friends':gt 'love', 'frends'

locations/mey_tamara_events.qsrc

@@ -506,7 +506,7 @@ if $args[0] = 'check_look':
 	*clr & cla
 	! dress, medium black, clean, looks stunning
 	!there need a good glamour dress, change to moncheri or expensive in ECV (she already give you 1 moncheri)
-	if ($clothingworntype = 'moncheri_gown' or $clothingworntype = 'moncheri_dress' or $clothingworntype = 'fashionista') and (pcs_makeup = 3 or pcs_makeup = 2) and pcs_sweat <= 20 and pcs_apprnc >= 60:
+	if ($clothingworntype = 'moncheri_gown' or $clothingworntype = 'moncheri_dress' or $clothingworntype = 'fashionista_dress') and (pcs_makeup = 3 or pcs_makeup = 2) and pcs_sweat <= 20 and pcs_apprnc >= 60:
 		! if long hair is desired styling
 		if shorthair = 0 and pcs_hairbsh = 0:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/party0.jpg"></center>'

locations/mother.qsrc

@@ -682,7 +682,7 @@ if $ARGS[0] = '':
 		end
 	end
 
-	if ($clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista') and hour > 9:'Your <<$npc_nickname[''A29'']>> looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
+	if ($clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista_dress') and hour > 9:'Your <<$npc_nickname[''A29'']>> looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
 
 	if locat['Fam_set_month_inGad'] = 1 and grandmaQW['block'] = 0 and SchoolAtestat = 0:
 		if week = 5:

locations/pav_disco.qsrc

@@ -364,7 +364,7 @@ if $ARGS[0] = '':
 				verodance = 0
 				if pcs_hairbsh = 1:verodance += 1
 				if PCloSkirt > 2 or PCloPants > 4:verodance += 1
-				if $clothingworntype = 'fashionista':verodance += 2
+				if $clothingworntype = 'fashionista_dress':verodance += 2
 				if pcs_makeup = 2:verodance += 1
 				if pcs_makeup = 3:verodance += 2
 				if pcs_makeup = 4:verodance += 3

locations/pav_market.qsrc

@@ -199,7 +199,7 @@ end
 	
 if kidalob = 0:
 	podrand = rand(0, 5)	
-	if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 5 and ($clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista') and monthKidalo ! month:
+	if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 5 and ($clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista_dress') and monthKidalo ! month:
 		*clr & cla
 		menu_off = 1
 		monthKidalo = month

locations/pod_whore.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'client_talk':
 	else
 		if $clothingworntype = 'nude':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door_nude'+rand(1,3)+'.jpg"></center>'
-		elseif $clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista':
+		elseif $clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista_dress':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door_glamur.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/event/whore/door.jpg"></center>'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'setup':
 	if pcs_hairbsh = 1: money_hapri = 50
 	!glamorous clothes
 	money_glamur = 0
-	if $clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista': money_glamur = 150
+	if $clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista_dress': money_glamur = 150
 	!!hooker clothing
 	money_odethooker = 0
 	if PCloStyle = 4: money_odethooker = 50

locations/portnoi.qsrc

@@ -112,10 +112,10 @@ selltot = 0
 	if i <= ARRSIZE('coco_outfits'):jump 'coco_outfitsmet'
 
 	i = 1
-	:fashionistamet
-		if fashionista[i] = 1 and fashionista_s[i] = 2:dynamic($batch_sell, 'fashionista', i)
+	:fashionista_dressmet
+		if fashionista_dress[i] = 1 and fashionista_dress_s[i] = 2:dynamic($batch_sell, 'fashionista_dress', i)
 		i += 1
-	if i <= ARRSIZE('fashionista'):jump 'fashionistamet'
+	if i <= ARRSIZE('fashionista_dress'):jump 'fashionista_dressmet'
 
 	i = 1
 	:fashionista_outfitsmet

locations/rex_events.qsrc

@@ -188,7 +188,7 @@ if $ARGS[0] = 'skver':
 				gs 'stat'
 				numrand = 137
 				:markbuycloreks
-				if fashionista[numrand] ! 0:
+				if fashionista_dress[numrand] ! 0:
 					numrand = rand(16, 198)
 					jump 'markbuycloreks'
 				end
@@ -212,17 +212,17 @@ if $ARGS[0] = 'skver':
 						cla
 						*clr
 						minut += 30
-						if fashionista[137] = 0:
-							fashionista[137] = 1
-							fashionista_h[137] = 50
-							fashionista_s[137] = 0
-							fashionista_b[137] = pcs_hips
+						if fashionista_dress[137] = 0:
+							fashionista_dress[137] = 1
+							fashionista_dress_h[137] = 50
+							fashionista_dress_s[137] = 0
+							fashionista_dress_b[137] = pcs_hips
 							'Rex buys you the dress.'
 						else
-							fashionista[numrand] = 1
-							fashionista_h[numrand] = 50
-							fashionista_s[numrand] = 0
-							fashionista_b[numrand] = pcs_hips
+							fashionista_dress[numrand] = 1
+							fashionista_dress_h[numrand] = 50
+							fashionista_dress_s[numrand] = 0
+							fashionista_dress_b[numrand] = pcs_hips
 						end
 						npc_rel['A57'] += 1
 						gs 'stat'
@@ -230,7 +230,7 @@ if $ARGS[0] = 'skver':
 						'Rex wants to see you in the dress, so you go home and change into it.'
 						act 'Further':
 							*clr & cla
-							gs 'clothing', 'wear', 'fashionista', numrand
+							gs 'clothing', 'wear', 'fashionista_dress', numrand
 							minut += 5
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/newclothes/fpr4.jpg"></center>'

locations/saveupdater.qsrc

@@ -2495,6 +2495,23 @@ if temp_current_save_version < 00090200:
 
 		killvar 'temp_st'
 	end
+	
+	!update fashionista to fashionista_dress\
+	if ARRSIZE('fashionista') > 0:
+		:loopfashionista2
+			if fashionista[i] = 1:
+				fashionista_dress[i] = 1
+				fashionista_dress_h[i] = fashionista_h[i]
+				fashionista_dress_b[i] = fashionista_b[i]
+				fashionista_dress_s[i] = fashionista_s[i]
+			end
+			i += 4
+		if i <= 200:jump 'loopfashionista2'
+		killvar 'fashionista'
+		killvar 'fashionista_h'
+		killvar 'fashionista_b'
+		killvar 'fashionista_s'
+	end
 end
 
 

locations/shop_allure.qsrc

@@ -84,7 +84,7 @@ if $ARGS[0] = 'swim':
 				end
 			end
 			i += 3
-		if i <= 100:jump 'loopallure_swimsuit'
+		if i <= total:jump 'loopallure_swimsuit'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -136,7 +136,7 @@ if $ARGS[0] = 'bikinis':
 				end
 			end
 			i += 3
-		if i <= 140:jump 'loopallure_bikinis'
+		if i <= total:jump 'loopallure_bikinis'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:

locations/shop_coco_carmen.qsrc

@@ -68,7 +68,7 @@ if $ARGS[0] = 'dress':
 				end
 			end
 			i += 2
-		if i <= 300:jump 'loopcoco_dress'
+		if i <= total:jump 'loopcoco_dress'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -126,7 +126,7 @@ if $ARGS[0] = 'outfits':
 				end
 			end
 			i += 2
-		if i <= 160:jump 'loopcoco_outfits'
+		if i <= total:jump 'loopcoco_outfits'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:

locations/shop_dolls.qsrc

@@ -77,6 +77,7 @@ if $ARGS[0] = 'dress':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'dolls_dress'
 
 	act 'Return':
 		cla
@@ -107,7 +108,7 @@ if $ARGS[0] = 'dress':
 				end
 			end
 			i += 3
-		if i <= 120:jump 'loopdolls_dress'
+		if i <= total:jump 'loopdolls_dress'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -144,6 +145,7 @@ if $ARGS[0] = 'clothing':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'dolls_outfits'
 
 	act 'Return':
 		cla
@@ -172,7 +174,7 @@ if $ARGS[0] = 'clothing':
 				end
 			end
 			i += 2
-		if i <= 80:jump 'loopdolls'
+		if i <= total:jump 'loopdolls'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:

locations/shop_fancy_pancy.qsrc

@@ -38,6 +38,7 @@ if $ARGS[0] = 'clothes':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'fancy_burlesque'
 
 	act 'Return': minut += 1 & gt 'shop_fancy_pancy', 'start'
 
@@ -62,7 +63,7 @@ if $ARGS[0] = 'clothes':
 				end
 			end
 			i += 2
-		if i <= 40:jump 'loopfancy_burlesque'
+		if i <= total:jump 'loopfancy_burlesque'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:

locations/shop_fashionista.qsrc

@@ -128,8 +128,6 @@ if $ARGS[0] = 'dressingclothes':
 	*clr & cla
 	$loc_arg = 'dressingclothes'
 	$loc = 'shop_fashionista'
-	!clorand = rand(1,ARRSIZE('fashionista'))
-	!gt 'clothing', 'view_clothing_item', 'fashionista', clorand, 8000, 'shop'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
@@ -137,6 +135,7 @@ if $ARGS[0] = 'dressingclothes':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'fashionista_dress'
 
 	act 'Return':
 		minut += 1
@@ -157,9 +156,9 @@ if $ARGS[0] = 'dressingclothes':
 			i = 4
 		end
 
-		:loopfashionista2
-			if fashionista[i] = 0:
-				gs 'clothing_attributes', 'fashionista', i
+		:loopfashionista_dress
+			if fashionista_dress[i] = 0:
+				gs 'clothing_attributes', 'fashionista_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
 				!!sort by filter
@@ -168,7 +167,7 @@ if $ARGS[0] = 'dressingclothes':
 				end
 			end
 			i += 4
-		if i <= 200:jump 'loopfashionista2'
+		if i <= 200:jump 'loopfashionista_dress'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -181,20 +180,18 @@ end
 if $ARGS[0] = 'dressingclothes2':
 	cla
 	
-	if fashionista[i] ! 0:
+	if fashionista_dress[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'shop_fashionista', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'fashionista',i, 8000, 'shop'
+	gt 'clothing', 'view_clothing_item', 'fashionista_dress',i, 8000, 'shop'
 end
 
 if $ARGS[0] = 'dressingoutfit':
 	*clr & cla
 	$loc_arg = 'dressingoutfit'
 	$loc = 'shop_fashionista'
-	!clorand = rand(1,ARRSIZE('fashionista'))
-	!gt 'clothing', 'view_clothing_item', 'fashionista', clorand, 8000, 'shop'
 	menu_off = 1
 	*clr & cla
 	gs'stat'

locations/starenie.qsrc

@@ -14,38 +14,39 @@ $loc_clothestypes[11]='flamingos_outfits'
 $loc_clothestypes[12]='gm_coats'
 $loc_clothestypes[13]='coco_dress'
 $loc_clothestypes[14]='coco_outfits'
-$loc_clothestypes[15]='fashionista'
-$loc_clothestypes[16]='moncheri_dress'
-$loc_clothestypes[17]='scandalicious_dress'
-$loc_clothestypes[18]='scandalicious_outfits'
-$loc_clothestypes[19]='scandalicious_bikinis'
-$loc_clothestypes[20]='scandalicious_swimsuit'
-$loc_clothestypes[21]='salacious_dress'
-$loc_clothestypes[22]='eroto_dress'
-$loc_clothestypes[23]='fancy_burlesque'
-$loc_clothestypes[24]='dolls_outfits'
-$loc_clothestypes[25]='dolls_dress'
-$loc_clothestypes[26]='bomba_outfits'
-$loc_clothestypes[27]='bomba_dress'
-$loc_clothestypes[28]='danilovich_outfits'
-$loc_clothestypes[29]='cats_coats'
-$loc_clothestypes[30]='moncheri_coats'
-$loc_clothestypes[31]='dolls_coats'
-$loc_clothestypes[32]='bomba_coats'
-$loc_clothestypes[33]='danilovich_coats'
-$loc_clothestypes[34]='danilovich_swimsuit'
-$loc_clothestypes[35]='allure_bikinis'
-$loc_clothestypes[36]='allure_swimsuit'
-$loc_clothestypes[37]='market_outfits'
-$loc_clothestypes[38]='eroto_outfits'
-$loc_clothestypes[39]='eroto_strip'
-$loc_clothestypes[40]='moncheri_gown'
-$loc_clothestypes[41]='salacious_outfits'
-$loc_clothestypes[42]='materinstvo_dress'
-$loc_clothestypes[43]='nerdvana_cosplay'
-$loc_clothestypes[44]='nerdvana_outfits'
-$loc_clothestypes[45]='nerdvana_bikinis'
-$loc_clothestypes[46]='nerdvana_swimsuit'
+$loc_clothestypes[15]='fashionista_dress'
+$loc_clothestypes[16]='fashionista_oufits'
+$loc_clothestypes[17]='moncheri_dress'
+$loc_clothestypes[18]='scandalicious_dress'
+$loc_clothestypes[19]='scandalicious_outfits'
+$loc_clothestypes[20]='scandalicious_bikinis'
+$loc_clothestypes[21]='scandalicious_swimsuit'
+$loc_clothestypes[22]='salacious_dress'
+$loc_clothestypes[23]='eroto_dress'
+$loc_clothestypes[24]='fancy_burlesque'
+$loc_clothestypes[25]='dolls_outfits'
+$loc_clothestypes[26]='dolls_dress'
+$loc_clothestypes[27]='bomba_outfits'
+$loc_clothestypes[28]='bomba_dress'
+$loc_clothestypes[29]='danilovich_outfits'
+$loc_clothestypes[30]='cats_coats'
+$loc_clothestypes[31]='moncheri_coats'
+$loc_clothestypes[32]='dolls_coats'
+$loc_clothestypes[33]='bomba_coats'
+$loc_clothestypes[34]='danilovich_coats'
+$loc_clothestypes[35]='danilovich_swimsuit'
+$loc_clothestypes[36]='allure_bikinis'
+$loc_clothestypes[37]='allure_swimsuit'
+$loc_clothestypes[38]='market_outfits'
+$loc_clothestypes[39]='eroto_outfits'
+$loc_clothestypes[40]='eroto_strip'
+$loc_clothestypes[41]='moncheri_gown'
+$loc_clothestypes[42]='salacious_outfits'
+$loc_clothestypes[43]='materinstvo_dress'
+$loc_clothestypes[44]='nerdvana_cosplay'
+$loc_clothestypes[45]='nerdvana_outfits'
+$loc_clothestypes[46]='nerdvana_bikinis'
+$loc_clothestypes[47]='nerdvana_swimsuit'
 
 ! disable wearing base school form
 schoolW[6] = 0

locations/succubus.qsrc

@@ -626,17 +626,17 @@ if $args[0] = 'sucwalkinginit':
 	if i <= 60:jump 'loopsalacious_dress'
 
 	i = 1
-	:loopfashionista
-		gs 'clothing_attributes', 'fashionista', i
+	:loopfashionista_dress
+		gs 'clothing_attributes', 'fashionista_dress', i
 		if CloStyle ! 5:
-			if fashionista[i] = 1 and fashionista_s[i] = 0 and fashionista_h[i] > 0 and fashionista_b[i] >= (pcs_hips - 8) and fashionista_b[i] <= (pcs_hips + 8):
-				$succlolistn[x] = 'fashionista' & succlolisti[x] = i & x += 1
+			if fashionista_dress[i] = 1 and fashionista_dress_s[i] = 0 and fashionista_dress_h[i] > 0 and fashionista_dress_b[i] >= (pcs_hips - 8) and fashionista_dress_b[i] <= (pcs_hips + 8):
+				$succlolistn[x] = 'fashionista_dress' & succlolisti[x] = i & x += 1
 			end
 		else
-			if fashionista[i] = 1 and fashionista_s[i] = 0 and fashionista_h[i] > 0: $succlolistn[x] = 'fashionista' & succlolisti[x] = i & x += 1
+			if fashionista_dress[i] = 1 and fashionista_dress_s[i] = 0 and fashionista_dress_h[i] > 0: $succlolistn[x] = 'fashionista_dress' & succlolisti[x] = i & x += 1
 		end
 		i += 1
-	if i <= 200:jump 'loopfashionista'
+	if i <= 200:jump 'loopfashionista_dress'
 
 	i = 1
 	:loopcats_dress
@@ -815,7 +815,7 @@ if $args[0] = 'sucwalkinginit':
 		$succlocat[1] = 'eroto_outfits'
 		$succlocat[2] = 'salacious_outfit'
 		$succlocat[3] = 'salacious_dress'
-		$succlocat[4] = 'fashionista'
+		$succlocat[4] = 'fashionista_dress'
 		$succlocat[5] = 'cats_dress'
 		$succlocat[6] = 'cats_outfits'
 		$succlocat[7] = 'coco_dress'

locations/tailor.qsrc

@@ -81,10 +81,10 @@ i = 1
 if i <= ARRSIZE('coco_outfits'):jump 'ycoco_outfitsmet'
 
 i = 1
-:yfashionistamet
-	if fashionista[i] = 1 and ((fashionista_b[i] > pcs_hips + 8) or (fashionista_b[i] < pcs_hips - 8)):poshvalldrop += 1
+:yfashionista_dressmet
+	if fashionista_dress[i] = 1 and ((fashionista_dress_b[i] > pcs_hips + 8) or (fashionista_dress_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('fashionista'):jump 'yfashionistamet'
+if i <= ARRSIZE('fashionista_dress'):jump 'yfashionista_dressmet'
 
 i = 1
 :yfashionista_outfitsmet

locations/tailor2.qsrc

@@ -81,10 +81,10 @@ i = 1
 if i <= ARRSIZE('coco_outfits'):jump 'xcoco_outfitsmet'
 
 i = 1
-:xfashionistamet
-	if fashionista[i] = 1 and ((fashionista_b[i] > pcs_hips + 8) or (fashionista_b[i] < pcs_hips - 8)): fashionista_b[i] = pcs_hips
+:xfashionista_dressmet
+	if fashionista_dress[i] = 1 and ((fashionista_dress_b[i] > pcs_hips + 8) or (fashionista_dress_b[i] < pcs_hips - 8)): fashionista_dress_b[i] = pcs_hips
 	i += 1
-if i <= ARRSIZE('fashionista'):jump 'xfashionistamet'
+if i <= ARRSIZE('fashionista_dress'):jump 'xfashionista_dressmet'
 
 i = 1
 :xfashionista_outfitsmet