[fixes] Clothing mega fix sorting out wrong image paths and incosistant variables plus some items missing in the tailor and selling loops. Also, ran grep search to find and update old clothing variables in other locations

locations/_clothing_image.qsrc

@@ -17,7 +17,7 @@ elseif $ARGS[0] = 'flamingos_outfit':
 	$RESULT = 'images/pc/items/flamingos/outfits/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'flamingos_dress':
 	$RESULT = 'images/pc/items/flamingos/dress/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'coco_outfit':
+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'

locations/burger.qsrc

@@ -192,9 +192,9 @@ if $ARGS[0] = 'dishes':
 						*clr & cla
 						BurgerQW['Level'] = 50
 						guy += 1
-						average[23] = 1
-						averageH[23] = 160
-						averageB[23] = pcs_hips
+						cats_dress[23] = 1
+						cats_dressH[23] = 160
+						cats_dressB[23] = pcs_hips
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/sex/bj.jpg"></center>'
 						'You squat down in front of Anatoly, he unbuttons his pants and pulls out his penis. You lean over his hard cock and kiss it, feeling its warmth. You run your tongue along his cock finally putting it in your big wet mouth and start to suck his dick.'
 						'Soon Anatoly groans and you feel a spurt of warm liquid like in your mouth. You are giving your best to swallow all of his cum, trying not to choke. Anatoly straightens his clothes and leaves.'
@@ -230,9 +230,9 @@ if $ARGS[0] = 'dishes':
 							minut += 1
 							BurgerQW['Level'] = 50
 							guy += 1
-							average[24] = 1
-							averageH[24] = 160
-							averageB[24] = pcs_hips
+							cats_dress[24] = 1
+							cats_dressH[24] = 160
+							cats_dressB[24] = pcs_hips
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/sex/pr.jpg"></center>'
 							'You look up at him startled as you notice the hot head of his cock resting on your lips. Anatoly pushes his dick to your lips. "Don''t shy baby, lick it with your tongue."'

locations/city_market.qsrc

@@ -199,21 +199,21 @@ if $ARGS[0] = 'clo':
 	end
 
 	i = 15
-	:loopcheap
-	if cheap[i] = 0:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<i>>.jpg" 	height="400" /></a>'
+	:loopgm_outfits
+	if gm_outfits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="400" /></a>'
 	i += 1
-	if i <= 20:jump 'loopcheap'
+	if i <= 20:jump 'loopgm_outfits'
 end
 
 if $ARGS[0] = 'marketclo':
 	cla
 
-	if cheap[i] ! 0:
+	if gm_outfits[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'city_market', 'clo'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'cheap',i, 750
+	gt 'clothing', 'view_clothing_item', 'shop', 'gm_outfits',i, 750
 
 end
 

locations/clothing.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if ARRSIZE('flamingos_outfit') > 0 or ARRSIZE('flamingos_dress') > 0:'<center><a href="exec:$ward_list_store = ''flamingos'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''flamingos''"><img src="images/locations/city/island/flamingos/shop_name.png"></a></center>'
 
-		if ARRSIZE('coco_outfit') > 0 or ARRSIZE('coco_dress') > 0:'<center><a href="exec:$ward_list_store = ''coco'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''coco''"><img src="images/locations/city/residential/coco/shop_name.png"></a></center>'
+		if ARRSIZE('coco_outfits') > 0 or ARRSIZE('coco_dress') > 0:'<center><a href="exec:$ward_list_store = ''coco'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''coco''"><img src="images/locations/city/residential/coco/shop_name.png"></a></center>'
 
 		if ARRSIZE('fashionista') > 0:'<center><a href="exec:$ward_list_store = ''fashionista'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''fashionista''"><img src="images/locations/city/citycenter/mall/fashionista.png"></a></center>'
 
@@ -366,10 +366,10 @@ if $ARGS[0] = 'view_clothing_list':
 			if i <= ARRSIZE('coco_dress'):jump 'loopcoco_dress'
 
 			i = 1
-			:loopcoco_outfit
-				if coco_outfit[i] = 1 and coco_outfitS[i] = cloc and ($clothingworntype ! 'coco_outfit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'coco_outfit', i)
+			:loopcoco_outfits
+				if coco_outfits[i] = 1 and coco_outfitsS[i] = cloc and ($clothingworntype ! 'coco_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'coco_outfits', i)
 				i += 1
-			if i <= ARRSIZE('coco_outfit'):jump 'loopcoco_outfit'
+			if i <= ARRSIZE('coco_outfits'):jump 'loopcoco_outfits'
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
@@ -619,7 +619,7 @@ if $ARGS[0] = 'view_clothing_item':
 						dynamic $ARGS[2] + '[<<ARGS[3]>>] = 1'
 						if $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'office':
 							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 70 + <<h>>'
-						elseif $ARGS[2] = 'cats_dress' or $ARGS[2] = 'cats_outfit' or $ARGS[2] = 'flamingos_dress' or $ARGS[2] = 'flamingos_outfit' or $ARGS[2] = 'coco_dress' or $ARGS[2] = 'coco_outfit':
+						elseif $ARGS[2] = 'cats_dress' or $ARGS[2] = 'cats_outfit' or $ARGS[2] = 'flamingos_dress' or $ARGS[2] = 'flamingos_outfit' or $ARGS[2] = 'coco_dress' or $ARGS[2] = 'coco_outfits':
 							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 90 + <<h>>'
 						elseif $ARGS[2] = 'moncheri':
 							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 15 + <<h>>'
@@ -650,7 +650,7 @@ if $ARGS[0] = 'view_clothing_item':
 						dynamic $ARGS[2] + '[<<ARGS[3]>>] = 1'
 						if $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'office':
 							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 70 + <<h>>'
-						elseif $ARGS[2] = 'cats_dress' or $ARGS[2] = 'cats_outfit' or $ARGS[2] = 'flamingos_dress' or $ARGS[2] = 'flamingos_outfit' or $ARGS[2] = 'coco_dress' or $ARGS[2] = 'coco_outfit':
+						elseif $ARGS[2] = 'cats_dress' or $ARGS[2] = 'cats_outfit' or $ARGS[2] = 'flamingos_dress' or $ARGS[2] = 'flamingos_outfit' or $ARGS[2] = 'coco_dress' or $ARGS[2] = 'coco_outfits':
 							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 90 + <<h>>'
 						elseif $ARGS[2] = 'moncheri':
 							dynamic $ARGS[2] + 'H[<<ARGS[3]>>] = 15 + <<h>>'

locations/clothing_QV.qsrc

@@ -47,6 +47,8 @@ if $ARGS[0] = 'list':
 
 	if ARRSIZE('dolls_outfit') > 0 or ARRSIZE('dolls_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''dolls''"><img src="images/locations/city/island/dolls.png"></a></center>'
 
+	if ARRSIZE('bomba_outfit') > 0 or ARRSIZE('bomba_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''bomba''"><img src="images/locations/old town/bomba/shop_name.png"></a></center>'
+
 	if ARRSIZE('exercise') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
 	if $ARGS[1] = 'gm':
@@ -297,7 +299,7 @@ if $ARGS[0] = 'list':
 		*clr & cla
 		$ward_list_store = $ARGS[1]
 		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
-		'<center><img src="images/locations/city/residential/coco/shop_name.png"></center>'
+		'<center><img src="images/locations/pavlovsk/coco/shop_name.png"></center>'
 		*nl
 		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
 		*nl
@@ -512,7 +514,7 @@ if $ARGS[0] = 'list':
 		*clr & cla
 		$ward_list_store = $ARGS[1]
 		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
-		'<center><img src="images/locations/city/island/bomba.png"></center>'
+		'<center><img src="images/locations/old town/bomba/shop_name.png"></center>'
 		*nl
 		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
 		*nl

locations/gadforest.qsrc

@@ -245,11 +245,11 @@ if $ARGS[0] = 'forest_edge':
 						gt'gaddvor'
 					end
 				else
-					average[520] = 1
-					averageS[520] = 0
-					averageH[520] = 100
-					averageB[520] = pcs_hips
-					gs 'clothing', 'wear', 'average', 520
+					gm_outfits[2] = 1
+					gm_outfitsS[2] = 0
+					gm_outfitsH[2] = 100
+					gm_outfitsB[2] = pcs_hips
+					gs 'clothing', 'wear', 'gm_outfits', 2
 
 					if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
 					if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'

locations/mey_tamara_events.qsrc

@@ -224,13 +224,13 @@ if $args[0] = 'learning1':
 		!by random cloth, modify from :markbuyclomother. original kitty pussy *2 (average clothes), set to 1 moncheri 1 average
 		'<center><table><tr><td>'
 		:markbuyclotamaraaverage
-		newdress_id = rand(1, 522)
+		newdress_id = rand(1, 200)
 
-		if average[newdress_id] = 0:
-			average[newdress_id] = 1
-			averageH[newdress_id] = 100
-			averageB[newdress_id] = pcs_hips
-			*P '<center><img height = 400 src="images/pc/clothing/2average/<<newdress_id>>.jpg"></center>'
+		if cats_dress[newdress_id] = 0:
+			cats_dress[newdress_id] = 1
+			cats_dressH[newdress_id] = 100
+			cats_dressB[newdress_id] = pcs_hips
+			*P '<center><img height = 400 src="images/pc/items/cats/dress/<<newdress_id>>.jpg"></center>'
 		else
 			newdress_loop += 1
 			if newdress_loop > 1000:

locations/mother.qsrc

@@ -450,19 +450,19 @@ if $ARGS[0] = '':
 									if loop_counter = 300:
 										'After 30 minutes of trying on various outfits you are unable to find any that you either don''t already own or that you are willing to wear.'
 									else
-										numrand = rand(1, 413)
+										numrand = rand(1, 150)
 
-										gs 'clothing_attributes', 'cheap', numrand
+										gs 'clothing_attributes', 'gm_outfits', numrand
 										!!not prostitute
 										if CloStyle = 4:jump 'markbuyclomother'
 										!!Sveta can wear it and not too revealing
 										if CloInhibit > pcs_inhib or CloInhibit > 30:jump 'markbuyclomother'
 
-										if cheap[numrand] = 0:
-											cheap[numrand] = 1
-											cheapH[numrand] = 50
-											cheapB[numrand] = pcs_hips
-											'<center><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<numrand>>.jpg"></center>'
+										if gm_outfits[numrand] = 0:
+											gm_outfits[numrand] = 1
+											gm_outfitsH[numrand] = 50
+											gm_outfitsB[numrand] = pcs_hips
+											'<center><img <<$set_imgh>> src="images/pc/items/gm/outfits/<<numrand>>.jpg"></center>'
 										else
 											jump 'markbuyclomother'
 										end

locations/nichTanya.qsrc

@@ -486,19 +486,19 @@ elseif $ARGS[0] = 'date':
 			nichTanyaDateShopping += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/tanya/date/shopping1.jpg"></center>'
 			'The two of you go to a shop for young fashion. You take turns trying on clothes and posing for each other.'
-			'You notice that the clothes Tanya puts on get skimpier every time. The last outfit she puts on only consists of high heels, a blue tanga and a revealing white shirt.'
+			'You notice that the clothes Tanya puts on get skimpier every time. The last outfit she puts on only consists of high heels, a blue tanga and a skin tight white top.'
 			'"What do you think? I think you would gorgeous in this."'
 			'"Wait? Me?"'
-			'Tanya laughs out. "Yes. I would really like you to wear it. And look, I even found a matching skirt. Please let me buy this for you."'
-			gs 'clothing_attributes', 'cheap', 415
+			'Tanya laughs out. "Yes. I would really like you to wear it. And look, I even found a skirt that goes great with it. Please let me buy this for you."'
+			gs 'clothing_attributes', 'gm_dress', 148
 			if CloInhibit <= pcs_inhib:
 				act 'Agree':
-					cheap[415] = 1
-					cheapB[415] = pcs_hips
-					cheapH[415] = 70
-					cheapS[415] = 0
-					$clothingworntype = 'cheap'
-					clothingwornnumber = 415
+					gm_dress[148] = 1
+					gm_dressB[148] = pcs_hips
+					gm_dressH[148] = 70
+					gm_dressS[148] = 0
+					$clothingworntype = 'gm_dress'
+					clothingwornnumber = 148
 					cla
 					'"Okay. Thank you, Tanya."'
 					'Tanya smiles at you as she changes back into her own clothes. Then she walks over to the cashier. After she paid for the outfit she returns to you so you can put it on now.'

locations/pav_train.qsrc

@@ -228,12 +228,12 @@ if kidalob = 0:
 				dynamic '<<$clothingworntype>>[<<clothingwornnumber>>] = 0'
 				dynamic '<<$clothingworntype>>H[<<clothingwornnumber>>] = 0'
 				dynamic '<<$clothingworntype>>S[<<clothingwornnumber>>] = 0'
-				cheap[52] = 1
-				cheapH[52] = 20
-				cheapB[52] = pcs_hips
-				cheapS[52] = 0
+				gm_dress[52] = 1
+				gm_dressH[52] = 20
+				gm_dressB[52] = pcs_hips
+				gm_dressS[52] = 0
 				minut += 10
-				gs 'clothing', 'wear', 'cheap', 52
+				gs 'clothing', 'wear', 'gm_dress', 52
 				KILLVAR '$lastwornclothingtype'
 				KILLVAR 'lastwornclothingnumber'
 				

locations/portnoi.qsrc

@@ -34,10 +34,16 @@ poshvalldrop = 0
 selltot = 0
 
 	i = 1
-	:cheapmet
-	if cheap[i] = 1 and cheapS[i] = 2:dynamic($batch_sell, 'cheap', i)
+	:gm_outfitsmet
+	if gm_outfits[i] = 1 and gm_outfitsS[i] = 2:dynamic($batch_sell, 'gm_outfits', i)
 	i += 1
-	if i <= ARRSIZE('cheap'):jump 'cheapmet'
+	if i <= ARRSIZE('gm_outfits'):jump 'gm_outfitsmet'
+
+	i = 1
+	:gm_dressmet
+	if gm_dress[i] = 1 and gm_dressS[i] = 2:dynamic($batch_sell, 'gm_dress', i)
+	i += 1
+	if i <= ARRSIZE('gm_dress'):jump 'gm_dressmet'
 
 	i = 1
 	:dolls_outfitmet
@@ -52,10 +58,22 @@ selltot = 0
 	if i <= ARRSIZE('dolls_dress'):jump 'dolls_dressmet'
 
 	i = 1
-	:coco_outfitmet
-		if coco_outfit[i] = 1 and coco_outfitS[i] = 2:dynamic($batch_sell, 'coco_outfit', i)
+	:bomba_outfitmet
+		if bomba_outfit[i] = 1 and bomba_outfitS[i] = 2:dynamic($batch_sell, 'bomba_outfit', i)
+		i += 1
+	if i <= ARRSIZE('bomba_outfit'):jump 'bomba_outfitmet'
+
+	i = 1
+	:bomba_dressmet
+		if bomba_dress[i] = 1 and bomba_dressS[i] = 2:dynamic($batch_sell, 'bomba_dress', i)
 		i += 1
-	if i <= ARRSIZE('coco_outfit'):jump 'coco_outfitmet'
+	if i <= ARRSIZE('bomba_dress'):jump 'bomba_dressmet'
+
+	i = 1
+	:coco_outfitsmet
+		if coco_outfits[i] = 1 and coco_outfitsS[i] = 2:dynamic($batch_sell, 'coco_outfits', i)
+		i += 1
+	if i <= ARRSIZE('coco_outfits'):jump 'coco_outfitsmet'
 
 	i = 1
 	:coco_dressmet
@@ -76,16 +94,16 @@ selltot = 0
 	if i <= ARRSIZE('flamingos_dress'):jump 'flamingos_dressmet'
 
 	i = 1
-	:expensivemet
-		if expensive[i] = 1 and expensiveS[i] = 2:dynamic($batch_sell, 'expensive', i)
+	:fashionistamet
+		if fashionista[i] = 1 and fashionistaS[i] = 2:dynamic($batch_sell, 'fashionista', i)
 		i += 1
-	if i <= ARRSIZE('expensive'):jump 'expensivemet'
+	if i <= ARRSIZE('fashionista'):jump 'fashionistamet'
 
 	i = 1
-	:formalmet
-		if formal[i] = 1 and formalS[i] = 2:dynamic($batch_sell, 'formal', i)
+	:moncherimet
+		if moncheri[i] = 1 and moncheriS[i] = 2:dynamic($batch_sell, 'moncheri', i)
 		i += 1
-	if i <= ARRSIZE('formal'):jump 'formalmet'
+	if i <= ARRSIZE('moncheri'):jump 'moncherimet'
 
 	i = 1
 	:officemet
@@ -159,6 +177,18 @@ selltot = 0
 		i += 1
 	if i <= ARRSIZE('dolls_dress'):jump 'dolls_dressmet'
 
+	i = 1
+	:bomba_outfitmet
+		if bomba_outfit[i] = 1 and bomba_outfitS[i] = 2:dynamic($batch_sell, 'bomba_outfit', i)
+		i += 1
+	if i <= ARRSIZE('bomba_outfit'):jump 'bomba_outfitmet'
+
+	i = 1
+	:bomba_dressmet
+		if bomba_dress[i] = 1 and bomba_dressS[i] = 2:dynamic($batch_sell, 'bomba_dress', i)
+		i += 1
+	if i <= ARRSIZE('bomba_dress'):jump 'bomba_dressmet'
+
 killvar 'batch_sell'
 
 'You sold <<poshvalldrop>> items of unwanted clothing for a total of <<selltot>> <b>₽</b>.'

locations/portnoi2.qsrc

@@ -2,10 +2,10 @@
 poshvalldrop = 0
 
 i = 1
-:ycheapmet
-	if cheap[i] = 1 and ((cheapB[i] > pcs_hips + 8) or (cheapB[i] < pcs_hips - 8)):poshvalldrop += 1
+:ygm_outfitsmet
+	if gm_outfits[i] = 1 and ((gm_outfitsB[i] > pcs_hips + 8) or (gm_outfitsB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('cheap'):jump 'ycheapmet'
+if i <= ARRSIZE('gm_outfits'):jump 'ygm_outfitsmet'
 
 i = 1
 :ycats_dressmet
@@ -26,10 +26,10 @@ i = 1
 if i <= ARRSIZE('coco_dress'):jump 'ycoco_dressmet'
 
 i = 1
-:ycoco_outfitmet
-	if coco_outfit[i] = 1 and ((coco_outfitB[i] > pcs_hips + 8) or (coco_outfitB[i] < pcs_hips - 8)):poshvalldrop += 1
+:ycoco_outfitsmet
+	if coco_outfits[i] = 1 and ((coco_outfitsB[i] > pcs_hips + 8) or (coco_outfitsB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('coco_outfit'):jump 'ycoco_outfitmet'
+if i <= ARRSIZE('coco_outfits'):jump 'ycoco_outfitsmet'
 
 i = 1
 :yflamingos_dressmet
@@ -44,16 +44,16 @@ i = 1
 if i <= ARRSIZE('flamingos_outfit'):jump 'yflamingos_outfitmet'
 
 i = 1
-:yexpensivemet
-	if expensive[i] = 1 and ((expensiveB[i] > pcs_hips + 8) or (expensiveB[i] < pcs_hips - 8)):poshvalldrop += 1
+:yfashionistamet
+	if fashionista[i] = 1 and ((fashionistaB[i] > pcs_hips + 8) or (fashionistaB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('expensive'):jump 'yexpensivemet'
+if i <= ARRSIZE('fashionista'):jump 'yfashionistamet'
 
 i = 1
-:yformalmet
-	if formal[i] = 1 and ((formalB[i] > pcs_hips + 8) or (formalB[i] < pcs_hips - 8)):poshvalldrop += 1
+:ymoncherimet
+	if moncheri[i] = 1 and ((moncheriB[i] > pcs_hips + 8) or (moncheriB[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('formal'):jump 'yformalmet'
+if i <= ARRSIZE('moncheri'):jump 'ymoncherimet'
 
 i = 1
 :yofficemet
@@ -116,6 +116,18 @@ i = 1
 	i += 1
 if i <= ARRSIZE('dolls_dress'):jump 'ydolls_dressmet'
 
+i = 1
+:ybomba_outfitmet
+	if bomba_outfit[i] = 1 and ((bomba_outfitB[i] > pcs_hips + 8) or (bomba_outfitB[i] < pcs_hips - 8)):poshvalldrop += 1
+	i += 1
+if i <= ARRSIZE('bomba_outfit'):jump 'ybomba_outfitmet'
+
+i = 1
+:ybomba_dressmet
+	if bomba_dress[i] = 1 and ((bomba_dressB[i] > pcs_hips + 8) or (bomba_dressB[i] < pcs_hips - 8)):poshvalldrop += 1
+	i += 1
+if i <= ARRSIZE('bomba_dress'):jump 'ybomba_dressmet'
+
 poshvalldrop = 500 * poshvalldrop
 
 if money < poshvalldrop:
@@ -126,10 +138,22 @@ elseif money >= poshvalldrop:
 	money -= poshvalldrop
 
 	i = 1
-	:xcheapmet
-		if cheap[i] = 1 and ((cheapB[i] > pcs_hips + 8) or (cheapB[i] < pcs_hips - 8)):cheapB[i] = pcs_hips
+	:xgm_dressmet
+		if gm_dress[i] = 1 and ((gm_dressB[i] > pcs_hips + 8) or (gm_dressB[i] < pcs_hips - 8)):gm_dressB[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('cheap'):jump 'xcheapmet'
+	if i <= ARRSIZE('gm_dress'):jump 'xgm_dressmet'
+
+	i = 1
+	:xgm_outfitsmet
+		if gm_outfits[i] = 1 and ((gm_outfitsB[i] > pcs_hips + 8) or (gm_outfitsB[i] < pcs_hips - 8)):gm_outfitsB[i] = pcs_hips
+		i += 1
+	if i <= ARRSIZE('gm_outfits'):jump 'xgm_outfitsmet'
+
+	i = 1
+	:xcats_dressmet
+		if cats_dress[i] = 1 and ((cats_dressB[i] > pcs_hips + 8) or (cats_dressB[i] < pcs_hips - 8)):cats_dressB[i] = pcs_hips
+		i += 1
+	if i <= ARRSIZE('cats_dress'):jump 'xcats_dressmet'
 
 	i = 1
 	:xcats_dressmet
@@ -150,10 +174,10 @@ elseif money >= poshvalldrop:
 	if i <= ARRSIZE('coco_dress'):jump 'xcoco_dressmet'
 
 	i = 1
-	:xcoco_outfitmet
-		if coco_outfit[i] = 1 and ((coco_outfitB[i] > pcs_hips + 8) or (coco_outfitB[i] < pcs_hips - 8)):coco_outfitB[i] = pcs_hips
+	:xcoco_outfitsmet
+		if coco_outfits[i] = 1 and ((coco_outfitsB[i] > pcs_hips + 8) or (coco_outfitsB[i] < pcs_hips - 8)):coco_outfitsB[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('coco_outfit'):jump 'xcoco_outfitmet'
+	if i <= ARRSIZE('coco_outfits'):jump 'xcoco_outfitsmet'
 
 	i = 1
 	:xflamingos_dressmet
@@ -168,16 +192,16 @@ elseif money >= poshvalldrop:
 	if i <= ARRSIZE('flamingos_outfit'):jump 'xflamingos_outfitmet'
 
 	i = 1
-	:xexpensivemet
-		if expensive[i] = 1 and ((expensiveB[i] > pcs_hips + 8) or (expensiveB[i] < pcs_hips - 8)):expensiveB[i] = pcs_hips
+	:xfashionistamet
+		if fashionista[i] = 1 and ((fashionistaB[i] > pcs_hips + 8) or (fashionistaB[i] < pcs_hips - 8)):fashionistaB[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('expensive'):jump 'xexpensivemet'
+	if i <= ARRSIZE('fashionista'):jump 'xfashionistamet'
 
 	i = 1
-	:xformalmet
-		if formal[i] = 1 and ((formalB[i] > pcs_hips + 8) or (formalB[i] < pcs_hips - 8)):formalB[i] = pcs_hips
+	:xmoncherimet
+		if moncheri[i] = 1 and ((moncheriB[i] > pcs_hips + 8) or (moncheriB[i] < pcs_hips - 8)):moncheriB[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('formal'):jump 'xformalmet'
+	if i <= ARRSIZE('moncheri'):jump 'xmoncherimet'
 
 	i = 1
 	:xofficemet
@@ -240,6 +264,18 @@ elseif money >= poshvalldrop:
 		i += 1
 	if i <= ARRSIZE('dolls_dress'):jump 'xdolls_dressmet'
 
+	i = 1
+	:xbomba_outfitmet
+		if bomba_outfit[i] = 1 and ((bomba_outfitB[i] > pcs_hips + 8) or (bomba_outfitB[i] < pcs_hips - 8)):bomba_outfitB[i] = pcs_hips
+		i += 1
+	if i <= ARRSIZE('bomba_outfit'):jump 'xbomba_outfitmet'
+
+	i = 1
+	:xbomba_dressmet
+		if bomba_dress[i] = 1 and ((bomba_dressB[i] > pcs_hips + 8) or (bomba_dressB[i] < pcs_hips - 8)):bomba_dressB[i] = pcs_hips
+		i += 1
+	if i <= ARRSIZE('bomba_dress'):jump 'xbomba_dressmet'
+
 	'You resize all clothing for <<poshvalldrop>> <b>₽</b>.'
 end
 

locations/reks.qsrc

@@ -160,7 +160,7 @@ if $ARGS[0] = 'skver':
 				*clr & cla
 				minut += 30
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/clothing/3expensive/76.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/items/fashionista/dress/76.jpg"></center>'
 				'You have wandered all the way to the market. At one of the shops there you see a beautiful dress hanging beneath an "On sale" sign. The price is only 1500 <b>₽</b>! Rex sees that this dress has caught your attention.'
 				act 'Look at Rex':
 					cla
@@ -179,20 +179,20 @@ if $ARGS[0] = 'skver':
 						cla
 						*clr
 						minut += 30
-						if expensive[76] = 0:
-							expensive[76] = 1
-							expensiveH[76] = 50
-							expensiveB[76] = pcs_hips
+						if fashionista[76] = 0:
+							fashionista[76] = 1
+							fashionistaH[76] = 50
+							fashionistaB[76] = pcs_hips
 							'Rex buys you the dress.'
 						else
 							'You already have this dress, so Rex buys you something else.'
 							:markbuycloreks
 							numrand = rand(77, 127)
-							if expensive[numrand] = 0:
-								expensive[numrand] = 1
-								expensiveH[numrand] = 50
-								expensiveB[numrand] = pcs_hips
-								'<center><img <<$set_imgh>> src="images/pc/clothing/3expensive/<<numrand>>.jpg"></center>'
+							if fashionista[numrand] = 0:
+								fashionista[numrand] = 1
+								fashionistaH[numrand] = 50
+								fashionistaB[numrand] = pcs_hips
+								'<center><img <<$set_imgh>> src="images/pc/items/fashionista/dress/<<numrand>>.jpg"></center>'
 							else
 								jump 'markbuycloreks'
 							end
@@ -202,7 +202,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', 'expensive', 8
+							gs 'clothing', 'wear', 'fashionista', 8
 							minut += 5
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/newclothes/fpr4.jpg"></center>'

locations/shop_pussycats.qsrc

@@ -523,12 +523,12 @@ end
 
 if $ARGS[0] = '11':
 	*clr & cla
-	i = rand(1, 522)
+	i = rand(1, 200)
 	'<b><center><font size="4"><font color="black">Employee Perks</font></center></b>'
 	'<center><img <<$set_imgh>> src="images/pc/clothing/cats_outfit/<<i>>.jpg"></center>'
 	'"<<$pcs_nickname>>, look here," Nastya approaches you. "I''ve got a nice, new blouse but it got a slight defect. The manager is just going to put it in the <b>70%</b> off discount bin, but maybe you want to take it yourself?"'
 	'The store is selling it for <b>2400 ₽</b> , but you can buy it for <b>720 ₽</b>.'
-	if average[i] = 1:
+	if cats_dress[i] = 1:
 		*nl
 		'You look at the outfit and realize its one you already own. "Thanks hun, but I have that same outfit already..."'
 		act 'Finish your shift':gt 'shop_pussycats', 'endwork'
@@ -537,10 +537,10 @@ if $ARGS[0] = '11':
 			act 'Buy the outfit Kats #<<i>> (<b>720₽</b>)':
 				cla
 				money -= 720
-				average[i] = 1
-				averageH[i] = 50
-				averageB[i] = pcs_hips
-				averageS[i] = 0
+				cats_dress[i] = 1
+				cats_dressH[i] = 50
+				cats_dressB[i] = pcs_hips
+				cats_dressS[i] = 0
 				*nl
 				'You hand over the money for the slightly less than perfect outfit, its not going to last you as long as the stitching has a flaw but you still got quite a bargain.'
 				act 'Finish your shift':gt 'shop_pussycats', 'endwork'
@@ -751,7 +751,7 @@ end
 if $ARGS[0] = '15':
 	*clr & cla
 	'<b><center><font size="4"><font color="black">The Shirt Off Her Back</font></center></b>'
-	'<center><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<i>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/item/gm/outfits/<<i>>.jpg"></center>'
 	'You go to the changing booths and find that someone has left an outfit behind. You remember that it belongs to a girl who just 5 minutes ago bought an outfit and left the store. Apparently, she decided she no longer needs this and just left it in the booth.'
 	'You decide to wait until the end of the shift, as the shopper may return. An hour passes and your shift ends, but nobody comes for it. You carefully look at it, it is an ordinary outfit from G&M, almost new, no holes, fairly clean. Could you just keep it for yourself?'
 
@@ -766,14 +766,14 @@ if $ARGS[0] = '15':
 			'Before leaving, you take the outfit with you. The girl didn''t seem to want it, and you''re not about to throw away fairly new clothing. Your mother raised you better than that!'
 
 			! WD: Uninitialised ~ 'wear_chest_have_'
-			if cheap[i] = 0:
+			if gm_outfits[i] = 0:
 				*nl
 				'<b>However, it occurs to you that you already have this outfit. You decide to leave it behind in the store. Perhaps it could be resold? Your boss will love you for that!</b>'
 			else
-				cheap[i] = 1
-				cheapH[i] = 50
-				cheapB[i] = pcs_hips
-				cheapS[i] = 0
+				gm_outfits[i] = 1
+				gm_outfitsH[i] = 50
+				gm_outfitsB[i] = pcs_hips
+				gm_outfitsS[i] = 0
 			end
 
 			act 'Finish your shift':gt 'shop_pussycats', 'endwork'

locations/succubus.qsrc

@@ -499,43 +499,69 @@ if $args[0] = 'sucwalkinginit':
 	if i <= 240:jump 'loopfetish'
 
 	i = 1
-	:loopexpensive
-		gs 'clothing_attributes', 'expensive', i
+	:loopfashionista
+		gs 'clothing_attributes', 'fashionista', i
 		if CloStyle ! 5:
-			if expensive[i] = 1 and expensiveS[i] = 0 and expensiveH[i] > 0 and expensiveB[i] >= (pcs_hips - 8) and expensiveB[i] <= (pcs_hips + 8):
-				$succlolistn[x] = 'expensive' & succlolisti[x] = i & x += 1
+			if fashionista[i] = 1 and fashionistaS[i] = 0 and fashionistaH[i] > 0 and fashionistaB[i] >= (pcs_hips - 8) and fashionistaB[i] <= (pcs_hips + 8):
+				$succlolistn[x] = 'fashionista' & succlolisti[x] = i & x += 1
 			end
 		else
-			if expensive[i] = 1 and expensiveS[i] = 0 and expensiveH[i] > 0: $succlolistn[x] = 'expensive' & succlolisti[x] = i & x += 1
+			if fashionista[i] = 1 and fashionistaS[i] = 0 and fashionistaH[i] > 0: $succlolistn[x] = 'fashionista' & succlolisti[x] = i & x += 1
 		end
 		i += 1
-	if i <= 425:jump 'loopexpensive'
+	if i <= 200:jump 'loopfashionista'
 
 	i = 1
-	:loopaverage
-		gs 'clothing_attributes', 'average', i
+	:loopcats_dress
+		gs 'clothing_attributes', 'cats_dress', i
 		if CloStyle ! 5:
-			if average[i] = 1 and averageS[i] = 0 and averageH[i] > 0 and averageB[i] >= (pcs_hips - 8) and averageB[i] <= (pcs_hips + 8):
-				$succlolistn[x] = 'average' & succlolisti[x] = i & x += 1
+			if cats_dress[i] = 1 and cats_dressS[i] = 0 and cats_dressH[i] > 0 and cats_dressB[i] >= (pcs_hips - 8) and cats_dressB[i] <= (pcs_hips + 8):
+				$succlolistn[x] = 'cats_dress' & succlolisti[x] = i & x += 1
 			end
 		else
-			if average[i] = 1 and averageS[i] = 0 and averageH[i] > 0: $succlolistn[x] = 'average' & succlolisti[x] = i & x += 1
+			if cats_dress[i] = 1 and cats_dressS[i] = 0 and cats_dressH[i] > 0: $succlolistn[x] = 'cats_dress' & succlolisti[x] = i & x += 1
 		end
 		i += 1
-	if i <= 522:jump 'loopaverage'
+	if i <= 110:jump 'loopcats_dress'
 
 	i = 1
-	:loopcheap
-		gs 'clothing_attributes', 'cheap', i
+	:loopcats_outfit
+		gs 'clothing_attributes', 'cats_outfit', i
 		if CloStyle ! 5:
-			if cheap[i] = 1 and cheapS[i] = 0 and cheapH[i] > 0 and cheapB[i] >= (pcs_hips - 8) and cheapB[i] <= (pcs_hips + 8):
-				$succlolistn[x] = 'cheap' & succlolisti[x] = i & x += 1 
+			if cats_outfit[i] = 1 and cats_outfitS[i] = 0 and cats_outfitH[i] > 0 and cats_outfitB[i] >= (pcs_hips - 8) and cats_outfitB[i] <= (pcs_hips + 8):
+				$succlolistn[x] = 'cats_outfit' & succlolisti[x] = i & x += 1
 			end
 		else
-			if cheap[i] = 1 and cheapS[i] = 0 and cheapH[i] > 0: $succlolistn[x] = 'cheap' & succlolisti[x] = i & x += 1
+			if cats_outfit[i] = 1 and cats_outfitS[i] = 0 and cats_outfitH[i] > 0: $succlolistn[x] = 'cats_outfit' & succlolisti[x] = i & x += 1
 		end
 		i += 1
-	if i <= 413:jump 'loopcheap'
+	if i <= 100:jump 'loopcats_outfit'
+
+	i = 1
+	:loopgm_outfits
+		gs 'clothing_attributes', 'gm_outfits', i
+		if CloStyle ! 5:
+			if gm_outfits[i] = 1 and gm_outfitsS[i] = 0 and gm_outfitsH[i] > 0 and gm_outfitsB[i] >= (pcs_hips - 8) and gm_outfitsB[i] <= (pcs_hips + 8):
+				$succlolistn[x] = 'gm_outfits' & succlolisti[x] = i & x += 1 
+			end
+		else
+			if gm_outfits[i] = 1 and gm_outfitsS[i] = 0 and gm_outfitsH[i] > 0: $succlolistn[x] = 'gm_outfits' & succlolisti[x] = i & x += 1
+		end
+		i += 1
+	if i <= 150:jump 'loopgm_outfits'
+
+	i = 1
+	:loopgm_dress
+		gs 'clothing_attributes', 'gm_dress', i
+		if CloStyle ! 5:
+			if gm_dress[i] = 1 and gm_dressS[i] = 0 and gm_dressH[i] > 0 and gm_dressB[i] >= (pcs_hips - 8) and gm_dressB[i] <= (pcs_hips + 8):
+				$succlolistn[x] = 'gm_dress' & succlolisti[x] = i & x += 1 
+			end
+		else
+			if gm_dress[i] = 1 and gm_dressS[i] = 0 and gm_dressH[i] > 0: $succlolistn[x] = 'gm_dress' & succlolisti[x] = i & x += 1
+		end
+		i += 1
+	if i <= 150:jump 'loopgm_dress'
 
 	i = 1
 	:loopoffice
@@ -561,12 +587,12 @@ if $args[0] = 'sucwalkinginit':
 	if i <= 260:jump 'loopexercise'
 
 	i = 1
-	:loopformal
-		if formal[i] = 1 and formalS[i] = 0 and formalH[i] > 0 and formalB[i] >= (pcs_hips - 8) and formalB[i] <= (pcs_hips + 8):
-			$succlolistn[x] = 'formal' & succlolisti[x] = i & x += 1
+	:loopmoncheri
+		if moncheri[i] = 1 and moncheriS[i] = 0 and moncheriH[i] > 0 and moncheriB[i] >= (pcs_hips - 8) and moncheriB[i] <= (pcs_hips + 8):
+			$succlolistn[x] = 'moncheri' & succlolisti[x] = i & x += 1
 		end
 		i += 1
-	if i <= 185:jump 'loopformal'
+	if i <= 185:jump 'loopmoncheri'
 
 	i = 1
 	:loopuniform
@@ -591,13 +617,15 @@ if $args[0] = 'sucwalkinginit':
 !!	This picks a random outfit by "looks"
 		$succlocat[0] = 'exhibit'
 		$succlocat[1] = 'fetish'
-		$succlocat[2] = 'expensive'
-		$succlocat[3] = 'average'
-		$succlocat[4] = 'cheap'
+		$succlocat[2] = 'fashionista'
+		$succlocat[3] = 'cats_dress'
+		$succlocat[3] = 'cats_outfit'
+		$succlocat[4] = 'gm_outfits'
+		$succlocat[4] = 'gm_dress'
 		$succlocat[5] = 'office'
 		$succlocat[6] = 'school'
 		$succlocat[7] = 'exercise'
-		$succlocat[8] = 'formal'
+		$succlocat[8] = 'moncheri'
 		$succlocat[9] = 'uniform'
 
 		scbimbochk = 1