Jelajahi Sumber

[changed] clothing variable changes that will break all of the existing clothing. All use of _outfit is now _outfits. The postfixes for clothing strength, size and wardrobe location now standardized to rest of game code formatting

KevinSmarts 3 tahun lalu
induk
melakukan
727f5b62df

+ 1 - 1
glife.qproj

@@ -126,7 +126,7 @@
 		<Location name="$attributes_cats_dress"/>
 		<Location name="$attributes_bomba_outfits"/>
 		<Location name="$attributes_bomba_dress"/>
-		<Location name="$attributes_misc_outfit"/>
+		<Location name="$attributes_misc_outfits"/>
 		<Location name="lost_clothes_here"/>
 		<Location name="portnoi"/>
 		<Location name="portnoi2"/>

+ 2 - 2
locations/_attributes_misc_outfit.qsrc → locations/_attributes_misc_outfits.qsrc

@@ -1,4 +1,4 @@
-# $attributes_misc_outfit
+# $attributes_misc_outfits
 
 if ARGS[1] = 1:
     CloQuality = 1
@@ -8,5 +8,5 @@ if ARGS[1] = 1:
     CloExhibit = 0
 end
 
---- $attributes_misc_outfit ---------------------------------
+--- $attributes_misc_outfits ---------------------------------
 

+ 1 - 1
locations/_body_image.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'clothes':
 	elseif $clothingworntype = 'nude' and $pantyworntype = 'none':
 		$RESULT = 'images/pc/body/nude1.jpg'
 		$body_image_msg += 'You are completely naked.'
-	elseif $clothingworntype = 'misc_outfit' and clothingwornnumber = 1:
+	elseif $clothingworntype = 'misc_outfits' and clothingwornnumber = 1:
 		$RESULT = FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
 		$body_image_msg += 'You are wearing a hessian sack the hunters gave you.'
 	else

+ 5 - 5
locations/_clothing_image.qsrc

@@ -7,13 +7,13 @@ if $ARGS[0] = 'gm_outfits':
 	$RESULT = 'images/pc/items/gm/outfits/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'gm_dress':
 	$RESULT = 'images/pc/items/gm/dress/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'misc_outfit':
+elseif $ARGS[0] = 'misc_outfits':
 	$RESULT = 'images/pc/items/misc/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'cats_dress':
 	$RESULT = 'images/pc/items/cats/dress/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'cats_outfit':
+elseif $ARGS[0] = 'cats_outfits':
 	$RESULT = 'images/pc/items/cats/outfits/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'flamingos_outfit':
+elseif $ARGS[0] = 'flamingos_outfits':
 	$RESULT = 'images/pc/items/flamingos/outfits/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'flamingos_dress':
 	$RESULT = 'images/pc/items/flamingos/dress/<<ARGS[1]>>.jpg'
@@ -45,11 +45,11 @@ elseif $ARGS[0] = 'fancy_burlesque':
 	$RESULT = 'images/pc/items/fancy/burlesque/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'dolls_dress':
 	$RESULT = 'images/pc/items/dolls/dress/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'dolls_outfit':
+elseif $ARGS[0] = 'dolls_outfits':
 	$RESULT = 'images/pc/items/dolls/outfits/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'bomba_dress':
 	$RESULT = 'images/pc/items/bomba/goth_dress/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'bomba_outfit':
+elseif $ARGS[0] = 'bomba_outfits':
 	$RESULT = 'images/pc/items/bomba/goth_outfits/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'beach':
 	$RESULT = 'images/pc/clothing/15beachbabe/<<ARGS[1]>>.jpg'

+ 5 - 5
locations/_short_description.qsrc

@@ -4,13 +4,13 @@ if $ARGS[0] = 'gm_dress':
 	$RESULT = 'G&M dress number '
 elseif $ARGS[0] = 'gm_outfits':
 	$RESULT = 'G&M outfit number '
-elseif $ARGS[0] = 'misc_outfit':
+elseif $ARGS[0] = 'misc_outfits':
 	$RESULT = 'Outfit that is not in a shop number '
 elseif $ARGS[0] = 'cats_dress':
 	$RESULT = 'Pussy-Cats dress number '
-elseif $ARGS[0] = 'cats_outfit':
+elseif $ARGS[0] = 'cats_outfits':
 	$RESULT = 'Pussy-Cats outfit number '
-elseif $ARGS[0] = 'flamingos_outfit':
+elseif $ARGS[0] = 'flamingos_outfits':
 	$RESULT = 'Flamingos outfit number '
 elseif $ARGS[0] = 'flamingos_dress':
 	$RESULT = 'Flamingos dress number '
@@ -50,11 +50,11 @@ elseif $ARGS[0] = 'fancy_burlesque':
 	$RESULT = 'Burlesque outfit number '
 elseif $ARGS[0] = 'dolls_dress':
 	$RESULT = 'Patchwork Dolls dress number '
-elseif $ARGS[0] = 'dolls_outfit':
+elseif $ARGS[0] = 'dolls_outfits':
 	$RESULT = 'Patchwork Dolls outfit number '
 elseif $ARGS[0] = 'bomba_dress':
 	$RESULT = 'Tsar Bomba dress number '
-elseif $ARGS[0] = 'bomba_outfit':
+elseif $ARGS[0] = 'bomba_outfits':
 	$RESULT = 'Tsar Bomba outfit number '
 end
 

+ 6 - 6
locations/budgetclothes.qsrc

@@ -240,7 +240,7 @@ if $ARGS[0] = 'office':
 		end
 
 		:loopoffice
-			if office[i] = 0:
+			if gm_office[i] = 0:
 				gs 'clothing_attributes', 'office', i
 				gs 'clothing_QV', 'shop_filter'
 
@@ -257,7 +257,7 @@ end
 if $ARGS[0] = 'officeclo':
 	cla
 	menu_off = 1
-	if office[i] ! 0:
+	if gm_office[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'budgetclothes', 'office'
 	end
@@ -295,7 +295,7 @@ if $ARGS[0] = 'uniform':
 		end
 
 		:loopuniform
-			if uniform[i] = 0:
+			if gm_uniform[i] = 0:
 				gs 'clothing_attributes', 'uniform', i
 				gs 'clothing_QV', 'shop_filter'
 
@@ -312,7 +312,7 @@ end
 if $ARGS[0] = 'uniformclo':
 	cla
 	menu_off = 1
-	if uniform[i] ! 0:
+	if gm_uniform[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'budgetclothes', 'uniform'
 	end
@@ -350,7 +350,7 @@ if $ARGS[0] = 'school':
 		end
 
 		:loopschool
-			if school[i] = 0:
+			if gm_school[i] = 0:
 				gs 'clothing_attributes', 'school', i
 				gs 'clothing_QV', 'shop_filter'
 
@@ -368,7 +368,7 @@ end
 if $ARGS[0] = 'schoolclo':
 	cla
 	menu_off = 1
-	if school[i] ! 0:
+	if gm_school[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'budgetclothes', 'school'
 	end

+ 4 - 4
locations/burger.qsrc

@@ -193,8 +193,8 @@ if $ARGS[0] = 'dishes':
 						BurgerQW['Level'] = 50
 						guy += 1
 						cats_dress[23] = 1
-						cats_dressH[23] = 160
-						cats_dressB[23] = pcs_hips
+						cats_dress_h[23] = 160
+						cats_dress_b[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.'
@@ -231,8 +231,8 @@ if $ARGS[0] = 'dishes':
 							BurgerQW['Level'] = 50
 							guy += 1
 							cats_dress[24] = 1
-							cats_dressH[24] = 160
-							cats_dressB[24] = pcs_hips
+							cats_dress_h[24] = 160
+							cats_dress_b[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."'

+ 47 - 47
locations/clothing.qsrc

@@ -33,7 +33,7 @@ $clothing_list_line = {
 		$RESULT += '<TD colspan="2"></TD>'
 	end
 
-	if $ARGS[1] = 'misc_outfit' and ARGS[2] = 1:
+	if $ARGS[1] = 'misc_outfits' and ARGS[2] = 1:
 		$RESULT += '<TD>A hessian sack the hunters gave you.</TD>'
 	elseif $ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear' and $ARGS[1] ! 'beach':
 		gs 'clothing_descriptions'
@@ -186,11 +186,11 @@ if $ARGS[0] = 'view_clothing_list':
 	if $ARGS[2] = '':
 		'<center><a href="exec:$ward_list_store = ''gm'' & gt ''clothing'', ''view_clothing_list'', ''<<$ARGS[1]>>'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
 
-		if ARRSIZE('misc_outfit') > 0:'<center><a href="exec:$ward_list_store = ''misc'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''misc''"><img src="images/pc/items/misc/misc.png"></a></center>'
+		if ARRSIZE('misc_outfits') > 0:'<center><a href="exec:$ward_list_store = ''misc'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''misc''"><img src="images/pc/items/misc/misc.png"></a></center>'
 
-		if ARRSIZE('cats_outfit') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:$ward_list_store = ''kats'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
+		if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:$ward_list_store = ''kats'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
 
-		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('flamingos_outfits') > 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_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>'
 
@@ -206,9 +206,9 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if ARRSIZE('exhibit') > 0:'<center><a href="exec:$ward_list_store = ''exhibitshop'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''exhibitshop''"><img src="images/locations/oldtown/exhibitshop/shop_name.png"></a></center>'
 
-		if ARRSIZE('dolls_outfit') > 0 or ARRSIZE('dolls_dress') > 0:'<center><a href="exec:$ward_list_store = ''dolls'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''dolls''"><img src="images/locations/city/island/dolls.png"></a></center>'
+		if ARRSIZE('dolls_outfits') > 0 or ARRSIZE('dolls_dress') > 0:'<center><a href="exec:$ward_list_store = ''dolls'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''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:$ward_list_store = ''bomba'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''bomba''"><img src="images/locations/oldtown/tsar/shop_name.png"></a></center>'
+		if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('bomba_dress') > 0:'<center><a href="exec:$ward_list_store = ''bomba'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''bomba''"><img src="images/locations/oldtown/tsar/shop_name.png"></a></center>'
 
 		if ARRSIZE('exercise') > 0:'<center><a href="exec:$ward_list_store = ''sports'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
@@ -249,7 +249,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopgm_outfits
-				if gm_outfits[i] = 1 and gm_outfitsS[i] = cloc and ($clothingworntype ! 'gm_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_outfits', i)
+				if gm_outfits[i] = 1 and gm_outfits_s[i] = cloc and ($clothingworntype ! 'gm_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_outfits', i)
 				i += 1
 			if i <= ARRSIZE('gm_outfits'):jump 'loopgm_outfits'
 
@@ -261,7 +261,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopgm_dress
-				if gm_dress[i] = 1 and gm_dressS[i] = cloc and ($clothingworntype ! 'gm_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_dress', i)
+				if gm_dress[i] = 1 and gm_dress_s[i] = cloc and ($clothingworntype ! 'gm_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_dress', i)
 				i += 1
 			if i <= ARRSIZE('gm_dress'):jump 'loopgm_dress'
 
@@ -273,7 +273,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopoffice
-				if office[i] = 1 and officeS[i] = cloc and ($clothingworntype ! 'office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'office', i)
+				if gm_office[i] = 1 and gm_office_s[i] = cloc and ($clothingworntype ! 'office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'office', i)
 				i += 1
 			if i <= ARRSIZE('office'):jump 'loopoffice'
 
@@ -284,11 +284,11 @@ if $ARGS[0] = 'view_clothing_list':
 		if $ARGS[2] = 'school':
 			$ward_list_store = $ARGS[2]
 
-			if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and schoolS[6] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
+			if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
 
 			i = 1
 			:loopschool
-				if school[i] = 1 and schoolS[i] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'school', i)
+				if gm_school[i] = 1 and gm_school_s[i] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'school', i)
 				i += 1
 				if i = 6: i = 7
 			if i <= ARRSIZE('school'):jump 'loopschool'
@@ -301,7 +301,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopuniform
-				if uniform[i] = 1 and uniformS[i] = cloc and ($clothingworntype ! 'uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'uniform', i)
+				if gm_uniform[i] = 1 and gm_uniform_s[i] = cloc and ($clothingworntype ! 'uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'uniform', i)
 				i += 1
 			if i <= ARRSIZE('uniform'):jump 'loopuniform'
 
@@ -312,10 +312,10 @@ if $ARGS[0] = 'view_clothing_list':
 		if $ARGS[2] = 'misc':
 			$ward_list_store = $ARGS[2]
 			i = 1
-			:loopmisc_outfit
-				if misc_outfit[i] = 1 and misc_outfitS[i] = cloc and ($clothingworntype ! 'misc_outfit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'misc_outfit', i)
+			:loopmisc_outfits
+				if misc_outfits[i] = 1 and misc_outfitsS[i] = cloc and ($clothingworntype ! 'misc_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'misc_outfits', i)
 				i += 1
-			if i <= ARRSIZE('misc_outfit'):jump 'loopmisc_outfit'
+			if i <= ARRSIZE('misc_outfits'):jump 'loopmisc_outfits'
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
@@ -325,15 +325,15 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopcats_dress
-				if cats_dress[i] = 1 and cats_dressS[i] = cloc and ($clothingworntype ! 'cats_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cats_dress', i)
+				if cats_dress[i] = 1 and cats_dress_s[i] = cloc and ($clothingworntype ! 'cats_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cats_dress', i)
 				i += 1
 			if i <= ARRSIZE('cats_dress'):jump 'loopcats_dress'
 
 			i = 1
-			:loopcats_outfit
-				if cats_outfit[i] = 1 and cats_outfitS[i] = cloc and ($clothingworntype ! 'cats_outfit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cats_outfit', i)
+			:loopcats_outfits
+				if cats_outfits[i] = 1 and cats_outfits_s[i] = cloc and ($clothingworntype ! 'cats_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cats_outfits', i)
 				i += 1
-			if i <= ARRSIZE('cats_outfit'):jump 'loopcats_outfit'
+			if i <= ARRSIZE('cats_outfits'):jump 'loopcats_outfits'
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
@@ -343,15 +343,15 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopflamingos_dress
-				if flamingos_dress[i] = 1 and flamingos_dressS[i] = cloc and ($clothingworntype ! 'flamingos_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'flamingos_dress', i)
+				if flamingos_dress[i] = 1 and flamingos_dress_s[i] = cloc and ($clothingworntype ! 'flamingos_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'flamingos_dress', i)
 				i += 1
 			if i <= ARRSIZE('flamingos_dress'):jump 'loopflamingos_dress'
 
 			i = 1
-			:loopflamingos_outfit
-				if flamingos_outfit[i] = 1 and flamingos_outfitS[i] = cloc and ($clothingworntype ! 'flamingos_outfit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'flamingos_outfit', i)
+			:loopflamingos_outfits
+				if flamingos_outfits[i] = 1 and flamingos_outfits_s[i] = cloc and ($clothingworntype ! 'flamingos_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'flamingos_outfits', i)
 				i += 1
-			if i <= ARRSIZE('flamingos_outfit'):jump 'loopflamingos_outfit'
+			if i <= ARRSIZE('flamingos_outfits'):jump 'loopflamingos_outfits'
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
@@ -361,13 +361,13 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopcoco_dress
-				if coco_dress[i] = 1 and coco_dressS[i] = cloc and ($clothingworntype ! 'coco_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'coco_dress', i)
+				if coco_dress[i] = 1 and coco_dress_s[i] = cloc and ($clothingworntype ! 'coco_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'coco_dress', i)
 				i += 1
 			if i <= ARRSIZE('coco_dress'):jump 'loopcoco_dress'
 
 			i = 1
 			: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)
+				if coco_outfits[i] = 1 and coco_outfits_s[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_outfits'):jump 'loopcoco_outfits'
 
@@ -379,7 +379,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopfashionista
-				if fashionista[i] = 1 and fashionistaS[i] = cloc and ($clothingworntype ! 'fashionista' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fashionista', i)
+				if fashionista[i] = 1 and fashionista_s[i] = cloc and ($clothingworntype ! 'fashionista' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fashionista', i)
 				i += 1
 			if i <= ARRSIZE('fashionista'):jump 'loopfashionista'
 
@@ -415,7 +415,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopfetish
-				if fetish[i] = 1 and fetishS[i] = cloc and ($clothingworntype ! 'fetish' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fetish', i)
+				if fetish[i] = 1 and fetish_s[i] = cloc and ($clothingworntype ! 'fetish' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fetish', i)
 				i += 1
 			if i <= ARRSIZE('fetish'):jump 'loopfetish'
 
@@ -427,7 +427,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopexhibit
-				if exhibit[i] = 1 and exhibitS[i] = cloc and ($clothingworntype ! 'exhibit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'exhibit', i)
+				if exhibit[i] = 1 and exhibit_s[i] = cloc and ($clothingworntype ! 'exhibit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'exhibit', i)
 				i += 1
 			if i <= ARRSIZE('exhibit'):jump 'loopexhibit'
 
@@ -439,7 +439,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopfancy_burlesque
-				if fancy_burlesque[i] = 1 and burlesqueS[i] = cloc and ($clothingworntype ! 'fancy_burlesque' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fancy_burlesque', i)
+				if fancy_burlesque[i] = 1 and burlesque_s[i] = cloc and ($clothingworntype ! 'fancy_burlesque' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fancy_burlesque', i)
 				i += 1
 			if i <= ARRSIZE('fancy_burlesque'):jump 'loopfancy_burlesque'
 
@@ -451,15 +451,15 @@ if $ARGS[0] = 'view_clothing_list':
 			cla
 			$ward_list_store = $ARGS[2]
 			i = 1
-			:loopdolls_outfit
-				if dolls_outfit[i] = 1 and dolls_outfitS[i] = cloc and ($clothingworntype ! 'dolls_outfit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'dolls_outfit', i)
+			:loopdolls_outfits
+				if dolls_outfits[i] = 1 and dolls_outfits_s[i] = cloc and ($clothingworntype ! 'dolls_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'dolls_outfits', i)
 				i += 1
-			if i <= ARRSIZE('dolls_outfit'):jump 'loopdolls_outfit'
+			if i <= ARRSIZE('dolls_outfits'):jump 'loopdolls_outfits'
 
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopdolls_dress
-				if dolls_dress[i] = 1 and dolls_dressS[i] = cloc and ($clothingworntype ! 'dolls_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'dolls_dress', i)
+				if dolls_dress[i] = 1 and dolls_dress_s[i] = cloc and ($clothingworntype ! 'dolls_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'dolls_dress', i)
 				i += 1
 			if i <= ARRSIZE('dolls_dress'):jump 'loopdolls_dress'
 
@@ -471,14 +471,14 @@ if $ARGS[0] = 'view_clothing_list':
 			cla
 			$ward_list_store = $ARGS[2]
 			i = 1
-			:loopbomba_outfit
-				if bomba_outfit[i] = 1 and bomba_outfitS[i] = cloc and ($clothingworntype ! 'bomba_outfit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'bomba_outfit', i)
+			:loopbomba_outfits
+				if bomba_outfits[i] = 1 and bomba_outfits_s[i] = cloc and ($clothingworntype ! 'bomba_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'bomba_outfits', i)
 				i += 1
-			if i <= ARRSIZE('bomba_outfit'):jump 'loopbomba_outfit'
+			if i <= ARRSIZE('bomba_outfits'):jump 'loopbomba_outfits'
 
 			i = 1
 			:loopbomba_dress
-				if bomba_dress[i] = 1 and bomba_dressS[i] = cloc and ($clothingworntype ! 'bomba_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'bomba_dress', i)
+				if bomba_dress[i] = 1 and bomba_dress_s[i] = cloc and ($clothingworntype ! 'bomba_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'bomba_dress', i)
 				i += 1
 			if i <= ARRSIZE('bomba_dress'):jump 'loopbomba_dress'
 
@@ -490,7 +490,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopexercise
-				if exercise[i] = 1 and exerciseS[i] = cloc and ($clothingworntype ! 'exercise' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'exercise', i)
+				if exercise[i] = 1 and exercise_s[i] = cloc and ($clothingworntype ! 'exercise' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'exercise', i)
 				i += 1
 			if i <= ARRSIZE('exercise'):jump 'loopexercise'
 
@@ -533,7 +533,7 @@ if $ARGS[0] = 'view_clothing_item':
 	$RESULT = FUNC('$short_description', $ARGS[2], CloStyle2)
 	$RESULT += '<<ARGS[3]>>'
 	'<<$RESULT>>'
-	if $ARGS[1] = 'misc_outfit' and ARGS[2] = 1:
+	if $ARGS[1] = 'misc_outfits' and ARGS[2] = 1:
 		'A hessian sack the hunters gave you.'
 	elseif $ARGS[2] ! 'coat' and $ARGS[2] ! 'swimwear' and $ARGS[2] ! 'beach':
 		gs 'clothing_descriptions'
@@ -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_outfits':
+						elseif $ARGS[2] = 'cats_dress' or $ARGS[2] = 'cats_outfits' or $ARGS[2] = 'flamingos_dress' or $ARGS[2] = 'flamingos_outfits' 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_outfits':
+						elseif $ARGS[2] = 'cats_dress' or $ARGS[2] = 'cats_outfits' or $ARGS[2] = 'flamingos_dress' or $ARGS[2] = 'flamingos_outfits' 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>>'
@@ -1072,16 +1072,16 @@ end
 if $ARGS[0] = 'swamp_clothes':
 	if ARGS[1] = 1:
 	!hessian clothing to owned, sets size and equipped.
-		misc_outfit[1] = 1
-		misc_outfitS[1] = 0
-		misc_outfitH[1] = 100
-		misc_outfitB[1] = pcs_hips
+		misc_outfits[1] = 1
+		misc_outfitsS[1] = 0
+		misc_outfitsH[1] = 100
+		misc_outfitsB[1] = pcs_hips
 		swamp_clothes = 1
-		gs 'clothing', 'wear', 'misc_outfit', 1
+		gs 'clothing', 'wear', 'misc_outfits', 1
 	end
 	if ARGS[1] = 0:
 	!hessian clothing no longer owned, but not unequipped.
-		misc_outfit[1] = 0
+		misc_outfits[1] = 0
 		swamp_clothes = 0
 	end
 end

+ 60 - 60
locations/clothing_QV.qsrc

@@ -29,9 +29,9 @@ if $ARGS[0] = 'list':
 
 	if ARRSIZE('school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''school''"><img src="images/locations/city/citycenter/mall/s.uniform2.png"></a></center>'
  
-	if ARRSIZE('cats_outfit') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
+	if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
 
-	if ARRSIZE('flamingos_outfit') > 0 or ARRSIZE('flamingos_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''flamingos''"><img src="images/locations/city/island/flamingos/shop_name.png"></a></center>'
+	if ARRSIZE('flamingos_outfits') > 0 or ARRSIZE('flamingos_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''flamingos''"><img src="images/locations/city/island/flamingos/shop_name.png"></a></center>'
 
 	if ARRSIZE('coco_outfits') > 0 or ARRSIZE('coco_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''coco''"><img src="images/locations/pavlovsk/coco/shop_name.png"></a></center>'
 
@@ -45,9 +45,9 @@ if $ARGS[0] = 'list':
 
 	if ARRSIZE('exhibit') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''exhibitshop''"><img src="images/locations/oldtown/exhibitshop/shop_name.png"></a></center>'
 
-	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('dolls_outfits') > 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('bomba_outfits') > 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>'
 
@@ -86,9 +86,9 @@ if $ARGS[0] = 'list':
 			gs 'clothing_attributes', 'gm_outfits', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if gm_outfitsS[i] = 0 and gm_outfitsH[i] > 0 and gm_outfitsB[i] >= (pcs_hips - 8) and gm_outfitsB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_outfits'', <<i>>"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if gm_outfits_s[i] = 0 and gm_outfits_h[i] > 0 and gm_outfits_b[i] >= (pcs_hips - 8) and gm_outfits_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_outfits'', <<i>>"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if gm_outfitsS[i] = 0 and gm_outfitsH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_outfits'', <<i>>"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if gm_outfits_s[i] = 0 and gm_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_outfits'', <<i>>"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
@@ -116,9 +116,9 @@ if $ARGS[0] = 'list':
 			gs 'clothing_attributes', 'gm_dress', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if gm_dressS[i] = 0 and gm_dressH[i] > 0 and gm_dressB[i] >= (pcs_hips - 8) and gm_dressB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_dress'', <<i>>"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
+					if gm_dress_s[i] = 0 and gm_dress_h[i] > 0 and gm_dress_b[i] >= (pcs_hips - 8) and gm_dress_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_dress'', <<i>>"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if gm_dressS[i] = 0 and gm_dressH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_dress'', <<i>>"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
+					if gm_dress_s[i] = 0 and gm_dress_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_dress'', <<i>>"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
@@ -141,10 +141,10 @@ if $ARGS[0] = 'list':
 		*nl
 		i = 1
 		:loopoffice
-		if office[i] = 1:
+		if gm_office[i] = 1:
 			gs 'clothing_attributes', 'office', i
 			if CloInhibit <= pcs_inhib:
-				if officeS[i] = 0 and officeH[i] > 0 and officeB[i] >= (pcs_hips - 8) and officeB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''office'', <<i>>"><img src="images/pc/clothing/5office/<<i>>.jpg" 	height="250" /></a>'
+				if gm_office_s[i] = 0 and gm_office_h[i] > 0 and gm_office_b[i] >= (pcs_hips - 8) and gm_office_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''office'', <<i>>"><img src="images/pc/clothing/5office/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
@@ -166,10 +166,10 @@ if $ARGS[0] = 'list':
 		*nl
 		i = 1
 		:loopuniform
-		if uniform[i] = 1:
+		if gm_uniform[i] = 1:
 			gs 'clothing_attributes', 'uniform', i
 			if CloInhibit <= pcs_inhib:
-				if uniformS[i] = 0 and uniformH[i] > 0 and uniformB[i] >= (pcs_hips - 8) and uniformB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''uniform'', <<i>>"><img src="images/pc/clothing/10uniform/<<i>>.jpg" 	height="250" /></a>'
+				if gm_uniform_s[i] = 0 and gm_uniform_h[i] > 0 and gm_uniform_b[i] >= (pcs_hips - 8) and gm_uniform_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''uniform'', <<i>>"><img src="images/pc/clothing/10uniform/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
@@ -190,14 +190,14 @@ if $ARGS[0] = 'list':
 		'<center>These are the school uniforms you own that are currently available for you to wear.</center><br>'
 		*nl
 
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and schoolS[6] = 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', 6"><img src="images/pc/clothing/6school/6.jpg" 	height="250" /></a>'
+		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', 6"><img src="images/pc/clothing/6school/6.jpg" 	height="250" /></a>'
 
 		i = 1
 		:loopschool
-		if school[i] = 1:
+		if gm_school[i] = 1:
 			gs 'clothing_attributes', 'school', i
 			if CloInhibit <= pcs_inhib:
-				if schoolS[i] = 0 and schoolH[i] > 0 and schoolB[i] >= (pcs_hips - 8) and schoolB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', <<i>>"><img src="images/pc/clothing/6school/<<i>>.jpg" 	height="250" /></a>'
+				if gm_school_s[i] = 0 and gm_school_h[i] > 0 and gm_school_b[i] >= (pcs_hips - 8) and gm_school_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', <<i>>"><img src="images/pc/clothing/6school/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
@@ -219,19 +219,19 @@ if $ARGS[0] = 'list':
 		*nl
 
 		i = 1
-		:loopcats_outfit
-		if cats_outfit[i] = 1:
-			gs 'clothing_attributes', 'cats_outfit', i
+		:loopcats_outfits
+		if cats_outfits[i] = 1:
+			gs 'clothing_attributes', 'cats_outfits', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if cats_outfitS[i] = 0 and cats_outfitH[i] > 0 and cats_outfitB[i] >= (pcs_hips - 8) and cats_outfitB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cats_outfit'', <<i>>"><img src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if cats_outfits_s[i] = 0 and cats_outfits_h[i] > 0 and cats_outfits_b[i] >= (pcs_hips - 8) and cats_outfits_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cats_outfits'', <<i>>"><img src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if cats_outfitS[i] = 0 and cats_outfitH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cats_outfit'', <<i>>"><img src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if cats_outfits_s[i] = 0 and cats_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cats_outfits'', <<i>>"><img src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('cats_outfit'):jump 'loopcats_outfit'
+		if i <= ARRSIZE('cats_outfits'):jump 'loopcats_outfits'
 
 		i = 1
 		:loopcats_dress
@@ -239,9 +239,9 @@ if $ARGS[0] = 'list':
 			gs 'clothing_attributes', 'cats_dress', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if cats_dressS[i] = 0 and cats_dressH[i] > 0 and cats_dressB[i] >= (pcs_hips - 8) and cats_dressB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cats_dress'', <<i>>"><img src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
+					if cats_dress_s[i] = 0 and cats_dress_h[i] > 0 and cats_dress_b[i] >= (pcs_hips - 8) and cats_dress_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cats_dress'', <<i>>"><img src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if cats_dressS[i] = 0 and cats_dressH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cats_dress'', <<i>>"><img src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
+					if cats_dress_s[i] = 0 and cats_dress_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''cats_dress'', <<i>>"><img src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
@@ -263,19 +263,19 @@ if $ARGS[0] = 'list':
 		*nl
 
 		i = 1
-		:loopflamingos_outfit
-		if flamingos_outfit[i] = 1:
-			gs 'clothing_attributes', 'flamingos_outfit', i
+		:loopflamingos_outfits
+		if flamingos_outfits[i] = 1:
+			gs 'clothing_attributes', 'flamingos_outfits', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if flamingos_outfitS[i] = 0 and flamingos_outfitH[i] > 0 and flamingos_outfitB[i] >= (pcs_hips - 8) and flamingos_outfitB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''flamingos_outfit'', <<i>>"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if flamingos_outfits_s[i] = 0 and flamingos_outfits_h[i] > 0 and flamingos_outfits_b[i] >= (pcs_hips - 8) and flamingos_outfits_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''flamingos_outfits'', <<i>>"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if flamingos_outfitS[i] = 0 and flamingos_outfitH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''flamingos_outfit'', <<i>>"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if flamingos_outfits_s[i] = 0 and flamingos_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''flamingos_outfits'', <<i>>"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('flamingos_outfit'):jump 'loopflamingos_outfit'
+		if i <= ARRSIZE('flamingos_outfits'):jump 'loopflamingos_outfits'
 
 		i = 1
 		:loopflamingos_dress
@@ -283,9 +283,9 @@ if $ARGS[0] = 'list':
 			gs 'clothing_attributes', 'flamingos_dress', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if flamingos_dressS[i] = 0 and flamingos_dressH[i] > 0 and flamingos_dressB[i] >= (pcs_hips - 8) and flamingos_dressB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''flamingos_dress'', <<i>>"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
+					if flamingos_dress_s[i] = 0 and flamingos_dress_h[i] > 0 and flamingos_dress_b[i] >= (pcs_hips - 8) and flamingos_dress_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''flamingos_dress'', <<i>>"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if flamingos_dressS[i] = 0 and flamingos_dressH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''flamingos_dress'', <<i>>"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
+					if flamingos_dress_s[i] = 0 and flamingos_dress_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''flamingos_dress'', <<i>>"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
@@ -312,9 +312,9 @@ if $ARGS[0] = 'list':
 			gs 'clothing_attributes', 'coco_outfits', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if coco_outfitsS[i] = 0 and coco_outfitsH[i] > 0 and coco_outfitsB[i] >= (pcs_hips - 8) and coco_outfitsB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coco_outfits'', <<i>>"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if coco_outfits_s[i] = 0 and coco_outfits_h[i] > 0 and coco_outfits_b[i] >= (pcs_hips - 8) and coco_outfits_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coco_outfits'', <<i>>"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if coco_outfitsS[i] = 0 and coco_outfitsH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coco_outfits'', <<i>>"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if coco_outfits_s[i] = 0 and coco_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coco_outfits'', <<i>>"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
@@ -327,9 +327,9 @@ if $ARGS[0] = 'list':
 			gs 'clothing_attributes', 'coco_dress', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if coco_dressS[i] = 0 and coco_dressH[i] > 0 and coco_dressB[i] >= (pcs_hips - 8) and coco_dressB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coco_dress'', <<i>>"><img src="images/pc/items/coco/dress/<<i>>.jpg" 	height="250" /></a>'
+					if coco_dress_s[i] = 0 and coco_dress_h[i] > 0 and coco_dress_b[i] >= (pcs_hips - 8) and coco_dress_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coco_dress'', <<i>>"><img src="images/pc/items/coco/dress/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if coco_dressS[i] = 0 and coco_dressH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coco_dress'', <<i>>"><img src="images/pc/items/coco/dress/<<i>>.jpg" 	height="250" /></a>'
+					if coco_dress_s[i] = 0 and coco_dress_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coco_dress'', <<i>>"><img src="images/pc/items/coco/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
@@ -356,9 +356,9 @@ if $ARGS[0] = 'list':
 			gs 'clothing_attributes', 'fashionista', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if fashionistaS[i] = 0 and fashionistaH[i] > 0 and fashionistaB[i] >= (pcs_hips - 8) and fashionistaB[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_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>'
 				else
-					if fashionistaS[i] = 0 and fashionistaH[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_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>'
 				end
 			end
 		end
@@ -384,7 +384,7 @@ if $ARGS[0] = 'list':
 		if moncheri[i] = 1:
 			gs 'clothing_attributes', 'moncheri', i
 			if CloInhibit <= pcs_inhib:
-				if moncheriS[i] = 0 and moncheriH[i] > 0 and moncheriB[i] >= (pcs_hips - 8) and moncheriB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''moncheri'', <<i>>"><img src="images/pc/clothing/4formal/<<i>>.jpg" 	height="250" /></a>'
+				if moncheri_s[i] = 0 and moncheri_h[i] > 0 and moncheri_b[i] >= (pcs_hips - 8) and moncheri_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''moncheri'', <<i>>"><img src="images/pc/clothing/4formal/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
@@ -409,7 +409,7 @@ if $ARGS[0] = 'list':
 		if fetish[i] = 1:
 			gs 'clothing_attributes', 'fetish', i
 			if CloInhibit <= pcs_inhib:
-				if fetishS[i] = 0 and fetishH[i] > 0 and fetishB[i] >= (pcs_hips - 8) and fetishB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''fetish'', <<i>>"><img src="images/pc/clothing/8fetish/<<i>>.jpg" 	height="250" /></a>'
+				if fetish_s[i] = 0 and fetish_h[i] > 0 and fetish_b[i] >= (pcs_hips - 8) and fetish_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''fetish'', <<i>>"><img src="images/pc/clothing/8fetish/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
@@ -433,7 +433,7 @@ if $ARGS[0] = 'list':
 		if burlesque[i] = 1:
 			gs 'clothing_attributes', 'burlesque', i
 			if CloInhibit <= pcs_inhib:
-				if burlesqueS[i] = 0 and burlesqueH[i] > 0 and burlesqueB[i] >= (pcs_hips - 8) and burlesqueB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''burlesque'', <<i>>"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
+				if burlesque_s[i] = 0 and burlesque_h[i] > 0 and burlesque_b[i] >= (pcs_hips - 8) and burlesque_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''burlesque'', <<i>>"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
@@ -457,7 +457,7 @@ if $ARGS[0] = 'list':
 		if exhibit[i] = 1:
 			gs 'clothing_attributes', 'exhibit', i
 			if CloInhibit <= pcs_inhib:
-				if exhibitS[i] = 0 and exhibitH[i] > 0 and exhibitB[i] >= (pcs_hips - 8) and exhibitB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exhibit'', <<i>>"><img src="images/pc/clothing/9exhibit/<<i>>.jpg" 	height="250" /></a>'
+				if exhibit_s[i] = 0 and exhibit_h[i] > 0 and exhibit_b[i] >= (pcs_hips - 8) and exhibit_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exhibit'', <<i>>"><img src="images/pc/clothing/9exhibit/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
@@ -478,19 +478,19 @@ if $ARGS[0] = 'list':
 		*nl
 
 		i = 1
-		:loopdolls_outfit
-		if dolls_outfit[i] = 1:
-			gs 'clothing_attributes', 'dolls_outfit', i
+		:loopdolls_outfits
+		if dolls_outfits[i] = 1:
+			gs 'clothing_attributes', 'dolls_outfits', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if dolls_outfitS[i] = 0 and dolls_outfitH[i] > 0 and dolls_outfitB[i] >= (pcs_hips - 8) and dolls_outfitB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''dolls_outfit'', <<i>>"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if dolls_outfits_s[i] = 0 and dolls_outfits_h[i] > 0 and dolls_outfits_b[i] >= (pcs_hips - 8) and dolls_outfits_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''dolls_outfits'', <<i>>"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if dolls_outfitS[i] = 0 and dolls_outfitH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''dolls_outfit'', <<i>>"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if dolls_outfits_s[i] = 0 and dolls_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''dolls_outfits'', <<i>>"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('dolls_outfit'):jump 'loopdolls_outfit'
+		if i <= ARRSIZE('dolls_outfits'):jump 'loopdolls_outfits'
 
 		i = 1
 		:loopdolls_dress
@@ -498,9 +498,9 @@ if $ARGS[0] = 'list':
 			gs 'clothing_attributes', 'dolls_dress', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if dolls_dressS[i] = 0 and dolls_dressH[i] > 0 and dolls_dressB[i] >= (pcs_hips - 8) and dolls_dressB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''dolls_dress'', <<i>>"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
+					if dolls_dress_s[i] = 0 and dolls_dress_h[i] > 0 and dolls_dress_b[i] >= (pcs_hips - 8) and dolls_dress_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''dolls_dress'', <<i>>"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if dolls_dressS[i] = 0 and dolls_dressH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''dolls_dress'', <<i>>"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
+					if dolls_dress_s[i] = 0 and dolls_dress_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''dolls_dress'', <<i>>"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
@@ -522,19 +522,19 @@ if $ARGS[0] = 'list':
 		*nl
 
 		i = 1
-		:loopbomba_outfit
-		if bomba_outfit[i] = 1:
-			gs 'clothing_attributes', 'bomba_outfit', i
+		:loopbomba_outfits
+		if bomba_outfits[i] = 1:
+			gs 'clothing_attributes', 'bomba_outfits', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if bomba_outfitS[i] = 0 and bomba_outfitH[i] > 0 and bomba_outfitB[i] >= (pcs_hips - 8) and bomba_outfitB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''bomba_outfit'', <<i>>"><img src="images/pc/items/bomba/outfit/<<i>>.jpg" 	height="250" /></a>'
+					if bomba_outfits_s[i] = 0 and bomba_outfits_h[i] > 0 and bomba_outfits_b[i] >= (pcs_hips - 8) and bomba_outfits_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''bomba_outfits'', <<i>>"><img src="images/pc/items/bomba/outfit/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if bomba_outfitS[i] = 0 and bomba_outfitH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''bomba_outfit'', <<i>>"><img src="images/pc/items/bomba/outfit/<<i>>.jpg" 	height="250" /></a>'
+					if bomba_outfits_s[i] = 0 and bomba_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''bomba_outfits'', <<i>>"><img src="images/pc/items/bomba/outfit/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('bomba_outfit'):jump 'loopbomba_outfit'
+		if i <= ARRSIZE('bomba_outfits'):jump 'loopbomba_outfits'
 
 		i = 1
 		:loopbomba_dress
@@ -542,9 +542,9 @@ if $ARGS[0] = 'list':
 			gs 'clothing_attributes', 'bomba_dress', i
 			if CloInhibit <= pcs_inhib:
 				if CloStyle ! 5:
-					if bomba_dressS[i] = 0 and bomba_dressH[i] > 0 and bomba_dressB[i] >= (pcs_hips - 8) and bomba_dressB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''bomba_dress'', <<i>>"><img src="images/pc/items/bomba/dress/<<i>>.jpg" 	height="250" /></a>'
+					if bomba_dress_s[i] = 0 and bomba_dress_h[i] > 0 and bomba_dress_b[i] >= (pcs_hips - 8) and bomba_dress_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''bomba_dress'', <<i>>"><img src="images/pc/items/bomba/dress/<<i>>.jpg" 	height="250" /></a>'
 				else
-					if bomba_dressS[i] = 0 and bomba_dressH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''bomba_dress'', <<i>>"><img src="images/pc/items/bomba/dress/<<i>>.jpg" 	height="250" /></a>'
+					if bomba_dress_s[i] = 0 and bomba_dress_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''bomba_dress'', <<i>>"><img src="images/pc/items/bomba/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 		end
@@ -570,7 +570,7 @@ if $ARGS[0] = 'list':
 		if exercise[i] = 1:
 			gs 'clothing_attributes', 'exercise', i
 			if CloInhibit <= pcs_inhib:
-				if exerciseS[i] = 0 and exerciseH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exercise'', <<i>>"><img src="images/pc/clothing/7exercise/<<i>>.jpg" 	height="250" /></a>'
+				if exercise_s[i] = 0 and exercise_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exercise'', <<i>>"><img src="images/pc/clothing/7exercise/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
@@ -597,7 +597,7 @@ if $ARGS[0] = 'gym':
 	if exercise[i] = 1:
 		gs 'clothing_attributes', 'exercise', i
 		if CloInhibit <= pcs_inhib:
-			if exerciseS[i] = 0 and exerciseH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exercise'', <<i>>"><img src="images/pc/clothing/7exercise/<<i>>.jpg" 	height="250" /></a>'
+			if exercise_s[i] = 0 and exercise_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exercise'', <<i>>"><img src="images/pc/clothing/7exercise/<<i>>.jpg" 	height="250" /></a>'
 		end
 	end
 	i += 1
@@ -661,7 +661,7 @@ if $ARGS[0] = 'change':
 	cla
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 	'<center><img src="<<FUNC(''$clothing_image'',  $ARGS[1], ARGS[2])>>"></center>'
-	if $ARGS[1] = 'misc_outfit' and ARGS[2] = 1:
+	if $ARGS[1] = 'misc_outfits' and ARGS[2] = 1:
 		'A hessian sack the hunters gave you.'
 	else
 		$RESULT = FUNC('$short_description', $ARGS[1], CloStyle2)

+ 6 - 6
locations/clothing_attributes.qsrc

@@ -93,13 +93,13 @@ if $ARGS[0] = 'gm_outfits':
 	*P FUNC('$attributes_gm_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'gm_dress':
 	*P FUNC('$attributes_gm_dress', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'misc_outfit':
-	*P FUNC('$attributes_misc_outfit', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'misc_outfits':
+	*P FUNC('$attributes_misc_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'cats_dress':
 	*P FUNC('$attributes_cats_dress', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'cats_outfit':
+elseif $ARGS[0] = 'cats_outfits':
 	*P FUNC('$attributes_cats_outfits', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'flamingos_outfit':
+elseif $ARGS[0] = 'flamingos_outfits':
 	*P FUNC('$attributes_flamingos_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'flamingos_dress':
 	*P FUNC('$attributes_flamingos_dress', $ARGS[0], ARGS[1])
@@ -133,11 +133,11 @@ elseif $ARGS[0] = 'fancy_burlesque':
 	*P FUNC('$attributes_fancy_burlesque', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'dolls_dress':
 	*P FUNC('$attributes_dolls_dress', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'dolls_outfit':
+elseif $ARGS[0] = 'dolls_outfits':
 	*P FUNC('$attributes_dolls_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'bomba_dress':
 	*P FUNC('$attributes_bomba_dress', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'bomba_outfit':
+elseif $ARGS[0] = 'bomba_outfits':
 	*P FUNC('$attributes_bomba_outfits', $ARGS[0], ARGS[1])
 end
 

+ 3 - 3
locations/gadforest.qsrc

@@ -246,9 +246,9 @@ if $ARGS[0] = 'forest_edge':
 					end
 				else
 					gm_outfits[2] = 1
-					gm_outfitsS[2] = 0
-					gm_outfitsH[2] = 100
-					gm_outfitsB[2] = pcs_hips
+					gm_outfits_s[2] = 0
+					gm_outfits_h[2] = 100
+					gm_outfits_b[2] = pcs_hips
 					gs 'clothing', 'wear', 'gm_outfits', 2
 
 					if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'

+ 6 - 9
locations/glake.qsrc

@@ -145,9 +145,8 @@ if month >= 5 and month <= 9:
 						*clr & cla
 						money -= 3000
 						exercise[1] = 1
-						exerciseS[1] = 0
-						exerciseH[1] = 100
-						exerciseB[1] = pcs_hips
+						exercise_s[1] = 0
+						exercise_h[1] = 100
 						gs 'clothing', 'wear', 'exercise', 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
 						'So... there''s the catch. The guy looks at your naked body while you mull over his proposition, and you come to the conclusion that you really don''t have any other choice. You can''t walk home through town naked! You silently nod and give him the money, quickly putting the clothes on when he hands them over. You feel relieved in the knowledge that at least you won''t have to go home naked... hopefully your clothes will turn up later.'
@@ -188,9 +187,8 @@ if month >= 5 and month <= 9:
 								*clr & cla
 								money -= 3000
 								exercise[1] = 1
-								exerciseS[1] = 0
-								exerciseH[1] = 100
-								exerciseB[1] = pcs_hips
+								exercise_s[1] = 0
+								exercise_h[1] = 100
 								gs 'clothing', 'wear', 'exercise', 1
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
 								'You don''t want to have sex with him... but you also don''t want to go home naked! Not seeing any other option, you decide to pay him the 3,000 <b>₽</b> after all. You quickly put on the clothes as he hands them over, feeling relieved in the knowledge that at least you don''t have to walk through town in the nude. Now that you''re clothed, you feel more confident in searching the beach a bit more; hopefully your clothes will turn up after all.'
@@ -434,9 +432,8 @@ end
 if $ARGS[0] = 'car_sex': 
 	*clr & cla
 	exercise[1] = 1
-	exerciseS[1] = 0
-	exerciseH[1] = 100
-	exerciseB[1] = pcs_hips
+	exercise_s[1] = 0
+	exercise_h[1] = 100
 	gs 'clothing', 'wear', 'exercise', 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar1.jpg"></center>'
 	'He wastes no time for you to second guess yourself, and immediately throws you down on the back seat of his car when you agree. He quickly pulls down his pants and, after quickly putting a condom on, quickly guides his cock to your pussy lips. He obviously doesn''t plan on spending a lot of time with you and sinks it in one firm thrust, fucking you with rapid, short strokes. Soon he shoots his load in the condom, ties a knot in it and throws it away. Seconds after he hands you the clothes as promised, he drives off.'

+ 12 - 12
locations/gschool_break.qsrc

@@ -1362,10 +1362,10 @@ if $ARGS[0] = 'naked_bathroom':
 				'You take a deep breath and decided they need to be punished and tell her. "Some of the girls stripped me and stole my clothes."'
 				'Ms Volkov frowns at that but her expression softens every so slightly. "Which ones?"'
 				*nl
-				if money >= 2000 or (school[35] = 1 and money >= 200):
+				if money >= 2000 or (gm_school[35] = 1 and money >= 200):
 					'She sighs and gives you a final moment to tell the truth, when you don''t, gets up and opens up a closet, looks around in it a moment and finally pulls out a cheap, conservative looking school uniform and hands it over to you. "Here is a replacement, your parents will be sent a bill for it. Now get dressed and be on your way."'
 					*nl
-					if school[35] = 0:
+					if gm_school[35] = 0:
 						money -= 2000
 						'You open your purse and pull out enough money to pay for the uniform, you would rather your mother not know about this. "Here Ms Volkov, I have the money for it." You tell her as you had over enough money. She raises a eyebrow but says nothing as she takes the money.'
 					else
@@ -1378,10 +1378,10 @@ if $ARGS[0] = 'naked_bathroom':
 					'You take the uniform and get dressed, thanking her for helping you out. Once fully dressed you leave the office and head out.'
 				end
 				gs 'stat'
-				if school[35] = 0:
-					school[35] = 1
-					schoolH[35] = 50
-					schoolB[35] = pcs_hips
+				if gm_school[35] = 0:
+					gm_school[35] = 1
+					gm_school_h[35] = 50
+					gm_school_b[35] = pcs_hips
 				end
 				gs 'clothing', 'wear', 'school', 35
 				act 'Leave her office': 
@@ -1404,10 +1404,10 @@ if $ARGS[0] = 'naked_bathroom':
 					'Ms Volkov frowns at that and her expression hardens every so slightly. "If you don''t tell me who is bullying you, I can''t help. Don''t think they will stop just because you don''t tell me who it was."'
 					'You shake your head. "No one did this to me, at least no one I seen I don''t know what happened to my clothes, they were just gone." You tell her sticking to your story.'
 					*nl
-					if money >= 2000 or (school[35] = 1 and money >= 200):
+					if money >= 2000 or (gm_school[35] = 1 and money >= 200):
 						'She sighs and gives you a final moment to tell the truth, when you don''t, gets up and opens up a closet, looks around in it a moment and finally pulls out a cheap, conservative looking school uniform and hands it over to you. "Here is a replacement one, your parents will be sent a bill for it. Now get dressed and be on your way."'
 						*nl
-						if school[35] = 0:
+						if gm_school[35] = 0:
 							money -= 2000
 							'You open your purse and pull out enough money to pay for the uniform, you would rather your mother not know about this. "Here Ms Volkov, I have the money for it." You tell her as you had over enough money. She raises a eyebrow but says nothing as she takes the money.'
 						else
@@ -1420,10 +1420,10 @@ if $ARGS[0] = 'naked_bathroom':
 						'You take the uniform and get dressed, thanking her for helping you out. Once fully dressed you leave the office and head out.'
 					end
 					gs 'stat'
-					if school[35] = 0:
-						school[35] = 1
-						schoolH[35] = 50
-						schoolB[35] = pcs_hips
+					if gm_school[35] = 0:
+						gm_school[35] = 1
+						gm_school_h[35] = 50
+						gm_school_b[35] = pcs_hips
 					end
 					gs 'clothing', 'wear', 'school', 35
 					act 'Leave her office': 

+ 6 - 6
locations/gschool_grounds.qsrc

@@ -141,7 +141,7 @@ if $ARGS[0] = 'main':
 
 !!	act 'Go to the Principals Office': gt
 
-	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and schoolBlock = 0:
+	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and gm_school_block = 0:
 		if CloStyle2 = 4 or Enable_sforma = 1:
 			gs 'gschool_socialchg', 'group_student_rel_change_2'
 			if hour = 6:
@@ -190,7 +190,7 @@ if $ARGS[0] = 'main':
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint behind the school building': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
-	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and schoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
+	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and gm_school_block = 0: act 'Go to detention': gt 'gschool_detention', 'start'
 
 	if zverRageQW = 1: gt 'gschool_grounds', 'KristinaFight'
 
@@ -374,7 +374,7 @@ if $ARGS[0] = 'sports':
 
 	if hour >= 9 and hour < 18 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0: 'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 
-	if week = 6 and schoolSorev = 2 and hour = 10 and SchoolBlock = 0:
+	if week = 6 and gm_school_sorev = 2 and hour = 10 and SchoolBlock = 0:
 		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
@@ -384,7 +384,7 @@ if $ARGS[0] = 'sports':
 		end
 	end
 
-	if week = 6 and schoolSorev = 1 and hour = 10 and SchoolBlock = 0:
+	if week = 6 and gm_school_sorev = 1 and hour = 10 and SchoolBlock = 0:
 		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 
@@ -499,7 +499,7 @@ if $ARGS[0] = 'SchoolRun':
 	act 'Go to the start':
 		*clr & cla
 		minut += 30
-		schoolSorev = 0
+		gm_school_sorev = 0
 		kolsorev += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/begsor.jpg"></center>'
@@ -602,7 +602,7 @@ if $ARGS[0] = 'SchoolRun2':
 		*clr & cla
 		kolsorev += 1
 		minut += 30
-		schoolSorev = 0
+		gm_school_sorev = 0
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/begsor.jpg"></center>'
 		'The 400m sprint event for girls is up next. You take off your jacket and go the starting line, mentally preparing yourself for the race.'

+ 1 - 1
locations/gschool_lessons.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'morning':
 		if pcs_grades < 0: pcs_grades = 0
 		lernSkill += 1
 		lernHome += 1
-		if schoolSorev = 1: schoolSorev = 0
+		if gm_school_sorev = 1: gm_school_sorev = 0
 		gs 'gschool_socialchg', 'test'
 	end
 		

+ 2 - 2
locations/gschool_lessons4.qsrc

@@ -668,10 +668,10 @@ if $ARGS[0] = 'pe':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra.jpg"></center>'
 	'You arrive in the gym and head straight to the girls locker room. Once inside, you quickly change into your athletic clothes before heading back out into the hall. Once everyone is ready, Coach Pavlovich conducts a roll call to ensure everyone is here.'
 	if week = 5 and LocalRun = 0:
-		if schoolSorev = 0:schoolSorev = 1
+		if gm_school_sorev = 0:gm_school_sorev = 1
 		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
 	elseif week = 5 and LocalRun = 1:
-		if schoolSorev = 0:schoolSorev = 2
+		if gm_school_sorev = 0:gm_school_sorev = 2
 		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
 	end
 	act 'Continue':

+ 9 - 9
locations/mey_tamara_events.qsrc

@@ -228,8 +228,8 @@ if $args[0] = 'learning1':
 
 		if cats_dress[newdress_id] = 0:
 			cats_dress[newdress_id] = 1
-			cats_dressH[newdress_id] = 100
-			cats_dressB[newdress_id] = pcs_hips
+			cats_dress_h[newdress_id] = 100
+			cats_dress_b[newdress_id] = pcs_hips
 			*P '<center><img height = 400 src="images/pc/items/cats/dress/<<newdress_id>>.jpg"></center>'
 		else
 			newdress_loop += 1
@@ -245,8 +245,8 @@ if $args[0] = 'learning1':
 
 		if moncheri[newdress_id] = 0:
 			moncheri[newdress_id] = 1
-			moncheriH[newdress_id] = 35
-			moncheriB[newdress_id] = pcs_hips
+			moncheri_h[newdress_id] = 35
+			moncheri_b[newdress_id] = pcs_hips
 			*P '<center><img height = 400 src="images/pc/clothing/moncheri/<<newdress_id>>.jpg"></center>'
 		else
 			newdress_loop += 1
@@ -290,7 +290,7 @@ if $args[0] = 'learning1':
 					:looptamaraschool
 					if newdress_loop = 6: newdress_loop = 7
 					!skip default uniform 6
-					if school[newdress_loop] = 1:
+					if gm_school[newdress_loop] = 1:
 						!'<center><img height = 400 src="images/pc/clothing/6school/school<<newdress_loop>>.jpg"></center>'
 						newdress_id += 1
 					else
@@ -328,10 +328,10 @@ if $args[0] = 'learning1':
 						:markbuyclotamaraschool
 						newdress_id = rand(1, 36)
 
-						if school[newdress_id] = 0:
-							school[newdress_id] = 1
-							schoolH[newdress_id] = 130
-							schoolB[newdress_id] = pcs_hips
+						if gm_school[newdress_id] = 0:
+							gm_school[newdress_id] = 1
+							gm_school_h[newdress_id] = 130
+							gm_school_b[newdress_id] = pcs_hips
 							'<center><img height = 400 src="images/pc/clothing/6school/<<newdress_id>>.jpg"></center>'
 						else
 							newdress_loop += 1

+ 2 - 2
locations/mother.qsrc

@@ -460,8 +460,8 @@ if $ARGS[0] = '':
 
 										if gm_outfits[numrand] = 0:
 											gm_outfits[numrand] = 1
-											gm_outfitsH[numrand] = 50
-											gm_outfitsB[numrand] = pcs_hips
+											gm_outfits_h[numrand] = 50
+											gm_outfits_b[numrand] = pcs_hips
 											'<center><img <<$set_imgh>> src="images/pc/items/gm/outfits/<<numrand>>.jpg"></center>'
 										else
 											jump 'markbuyclomother'

+ 10 - 10
locations/nichTanya.qsrc

@@ -494,9 +494,9 @@ elseif $ARGS[0] = 'date':
 			if CloInhibit <= pcs_inhib:
 				act 'Agree':
 					gm_dress[148] = 1
-					gm_dressB[148] = pcs_hips
-					gm_dressH[148] = 70
-					gm_dressS[148] = 0
+					gm_dress_b[148] = pcs_hips
+					gm_dress_h[148] = 70
+					gm_dress_s[148] = 0
 					$clothingworntype = 'gm_dress'
 					clothingwornnumber = 148
 					cla
@@ -1350,7 +1350,7 @@ elseif $ARGS[0] = 'shoppingUniform':
 	
 	:nichTanyaShopUniLoop
 	nichRand = rand(1,49)
-	if uniform[nichRand] = 1 and nichLoopAttempt < 100: nichLoopAttempt += 1 & jump 'nichTanyaShopUniLoop'
+	if gm_uniform[nichRand] = 1 and nichLoopAttempt < 100: nichLoopAttempt += 1 & jump 'nichTanyaShopUniLoop'
 	
 	gs 'clothing_attributes', 'uniform', nichRand
 	
@@ -1385,9 +1385,9 @@ elseif $ARGS[0] = 'shoppingUniform':
 				'"Thank you, Tanya. That would be great."'
 				'Tanya smiles and hugs you. She heads to the cashier and pays your new uniform with her credit card.'
 				
-				uniform[nichRand] = 1
-				uniformH[nichRand] = 50
-				uniformB[nichRand] = pcs_hips
+				gm_uniform[nichRand] = 1
+				gm_uniform_h[nichRand] = 50
+				gm_uniform_b[nichRand] = pcs_hips
 				cla
 				act 'Return to her apartment':
 					gt 'nichTanya','prepareInterview'
@@ -1407,9 +1407,9 @@ elseif $ARGS[0] = 'shoppingUniform':
 			'"That looks great. I will take it"'
 			'Tanya smiles and hugs you.'
 			money -= price
-			uniform[nichRand] = 1
-			uniformH[nichRand] = 50
-			uniformB[nichRand] = pcs_hips
+			gm_uniform[nichRand] = 1
+			gm_uniform_h[nichRand] = 50
+			gm_uniform_b[nichRand] = pcs_hips
 			
 			gs 'stat'
 			

+ 3 - 3
locations/pav_train.qsrc

@@ -229,9 +229,9 @@ if kidalob = 0:
 				dynamic '<<$clothingworntype>>H[<<clothingwornnumber>>] = 0'
 				dynamic '<<$clothingworntype>>S[<<clothingwornnumber>>] = 0'
 				gm_dress[52] = 1
-				gm_dressH[52] = 20
-				gm_dressB[52] = pcs_hips
-				gm_dressS[52] = 0
+				gm_dress_h[52] = 20
+				gm_dress_b[52] = pcs_hips
+				gm_dress_s[52] = 0
 				minut += 10
 				gs 'clothing', 'wear', 'gm_dress', 52
 				KILLVAR '$lastwornclothingtype'

+ 32 - 32
locations/portnoi.qsrc

@@ -35,67 +35,67 @@ selltot = 0
 
 	i = 1
 	:gm_outfitsmet
-	if gm_outfits[i] = 1 and gm_outfitsS[i] = 2:dynamic($batch_sell, 'gm_outfits', i)
+	if gm_outfits[i] = 1 and gm_outfits_s[i] = 2:dynamic($batch_sell, 'gm_outfits', i)
 	i += 1
 	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)
+	if gm_dress[i] = 1 and gm_dress_s[i] = 2:dynamic($batch_sell, 'gm_dress', i)
 	i += 1
 	if i <= ARRSIZE('gm_dress'):jump 'gm_dressmet'
 
 	i = 1
-	:dolls_outfitmet
-		if dolls_outfit[i] = 1 and dolls_outfitS[i] = 2:dynamic($batch_sell, 'dolls_outfit', i)
+	:dolls_outfitsmet
+		if dolls_outfits[i] = 1 and dolls_outfits_s[i] = 2:dynamic($batch_sell, 'dolls_outfits', i)
 		i += 1
-	if i <= ARRSIZE('dolls_outfit'):jump 'dolls_outfitmet'
+	if i <= ARRSIZE('dolls_outfits'):jump 'dolls_outfitsmet'
 
 	i = 1
 	:dolls_dressmet
-		if dolls_dress[i] = 1 and dolls_dressS[i] = 2:dynamic($batch_sell, 'dolls_dress', i)
+		if dolls_dress[i] = 1 and dolls_dress_s[i] = 2:dynamic($batch_sell, 'dolls_dress', i)
 		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)
+	:bomba_outfitsmet
+		if bomba_outfits[i] = 1 and bomba_outfits_s[i] = 2:dynamic($batch_sell, 'bomba_outfits', i)
 		i += 1
-	if i <= ARRSIZE('bomba_outfit'):jump 'bomba_outfitmet'
+	if i <= ARRSIZE('bomba_outfits'):jump 'bomba_outfitsmet'
 
 	i = 1
 	:bomba_dressmet
-		if bomba_dress[i] = 1 and bomba_dressS[i] = 2:dynamic($batch_sell, 'bomba_dress', i)
+		if bomba_dress[i] = 1 and bomba_dress_s[i] = 2:dynamic($batch_sell, 'bomba_dress', i)
 		i += 1
 	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)
+		if coco_outfits[i] = 1 and coco_outfits_s[i] = 2:dynamic($batch_sell, 'coco_outfits', i)
 		i += 1
 	if i <= ARRSIZE('coco_outfits'):jump 'coco_outfitsmet'
 
 	i = 1
 	:coco_dressmet
-		if coco_dress[i] = 1 and coco_dressS[i] = 2:dynamic($batch_sell, 'coco_dress', i)
+		if coco_dress[i] = 1 and coco_dress_s[i] = 2:dynamic($batch_sell, 'coco_dress', i)
 		i += 1
 	if i <= ARRSIZE('coco_dress'):jump 'coco_dressmet'
 
 	i = 1
-	:flamingos_outfitmet
-		if flamingos_outfit[i] = 1 and flamingos_outfitS[i] = 2:dynamic($batch_sell, 'flamingos_outfit', i)
+	:flamingos_outfitsmet
+		if flamingos_outfits[i] = 1 and flamingos_outfits_s[i] = 2:dynamic($batch_sell, 'flamingos_outfits', i)
 		i += 1
-	if i <= ARRSIZE('flamingos_outfit'):jump 'flamingos_outfitmet'
+	if i <= ARRSIZE('flamingos_outfits'):jump 'flamingos_outfitsmet'
 
 	i = 1
 	:flamingos_dressmet
-		if flamingos_dress[i] = 1 and flamingos_dressS[i] = 2:dynamic($batch_sell, 'flamingos_dress', i)
+		if flamingos_dress[i] = 1 and flamingos_dress_s[i] = 2:dynamic($batch_sell, 'flamingos_dress', i)
 		i += 1
 	if i <= ARRSIZE('flamingos_dress'):jump 'flamingos_dressmet'
 
 	i = 1
 	:fashionistamet
-		if fashionista[i] = 1 and fashionistaS[i] = 2:dynamic($batch_sell, 'fashionista', i)
+		if fashionista[i] = 1 and fashionista_s[i] = 2:dynamic($batch_sell, 'fashionista', i)
 		i += 1
 	if i <= ARRSIZE('fashionista'):jump 'fashionistamet'
 
@@ -107,37 +107,37 @@ selltot = 0
 
 	i = 1
 	:officemet
-		if office[i] = 1 and officeS[i] = 2:dynamic($batch_sell, 'office', i)
+		if gm_office[i] = 1 and gm_office_s[i] = 2:dynamic($batch_sell, 'office', i)
 		i += 1
 	if i <= ARRSIZE('office'):jump 'officemet'
 
 	i = 1
 	:schoolmet
-		if school[i] = 1 and schoolS[i] = 2:dynamic($batch_sell, 'school', i)
+		if gm_school[i] = 1 and gm_school_s[i] = 2:dynamic($batch_sell, 'school', i)
 		i += 1
 	if i <= ARRSIZE('school'):jump 'schoolmet'
 
 	i = 1
 	:exercisemet
-		if exercise[i] = 1 and exerciseS[i] = 2:dynamic($batch_sell, 'exercise', i)
+		if exercise[i] = 1 and exercise_s[i] = 2:dynamic($batch_sell, 'exercise', i)
 		i += 1
 	if i <= ARRSIZE('exercise'):jump 'exercisemet'
 
 	i = 1
 	:fetishmet
-		if fetish[i] = 1 and fetishS[i] = 2:dynamic($batch_sell, 'fetish', i)
+		if fetish[i] = 1 and fetish_s[i] = 2:dynamic($batch_sell, 'fetish', i)
 		i += 1
 	if i <= ARRSIZE('fetish'):jump 'fetishmet'
 
 	i = 1
 	:exhibitmet
-		if exhibit[i] = 1 and exhibitS[i] = 2:dynamic($batch_sell, 'exhibit', i)
+		if exhibit[i] = 1 and exhibit_s[i] = 2:dynamic($batch_sell, 'exhibit', i)
 		i += 1
 	if i <= ARRSIZE('exhibit'):jump 'exhibitmet'
 
 	i = 1
 	:uniformmet
-		if uniform[i] = 1 and uniformS[i] = 2:dynamic($batch_sell, 'uniform', i)
+		if gm_uniform[i] = 1 and gm_uniform_s[i] = 2:dynamic($batch_sell, 'uniform', i)
 		i += 1
 	if i <= ARRSIZE('uniform'):jump 'uniformmet'
 
@@ -161,31 +161,31 @@ selltot = 0
 
 	i = 1
 	:fancy_burlesquemet
-		if fancy_burlesque[i] = 1 and fancy_burlesqueS[i] = 2:dynamic($batch_sell, 'fancy_burlesque', i)
+		if fancy_burlesque[i] = 1 and fancy_burlesque_s[i] = 2:dynamic($batch_sell, 'fancy_burlesque', i)
 		i += 1
 	if i <= ARRSIZE('fancy_burlesque'):jump 'fancy_burlesquemet'
 
 	i = 1
-	:dolls_outfitmet
-		if dolls_outfit[i] = 1 and dolls_outfitS[i] = 2:dynamic($batch_sell, 'dolls_outfit', i)
+	:dolls_outfitsmet
+		if dolls_outfits[i] = 1 and dolls_outfits_s[i] = 2:dynamic($batch_sell, 'dolls_outfits', i)
 		i += 1
-	if i <= ARRSIZE('dolls_outfit'):jump 'dolls_outfitmet'
+	if i <= ARRSIZE('dolls_outfits'):jump 'dolls_outfitsmet'
 
 	i = 1
 	:dolls_dressmet
-		if dolls_dress[i] = 1 and dolls_dressS[i] = 2:dynamic($batch_sell, 'dolls_dress', i)
+		if dolls_dress[i] = 1 and dolls_dress_s[i] = 2:dynamic($batch_sell, 'dolls_dress', i)
 		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)
+	:bomba_outfitsmet
+		if bomba_outfits[i] = 1 and bomba_outfits_s[i] = 2:dynamic($batch_sell, 'bomba_outfits', i)
 		i += 1
-	if i <= ARRSIZE('bomba_outfit'):jump 'bomba_outfitmet'
+	if i <= ARRSIZE('bomba_outfits'):jump 'bomba_outfitsmet'
 
 	i = 1
 	:bomba_dressmet
-		if bomba_dress[i] = 1 and bomba_dressS[i] = 2:dynamic($batch_sell, 'bomba_dress', i)
+		if bomba_dress[i] = 1 and bomba_dress_s[i] = 2:dynamic($batch_sell, 'bomba_dress', i)
 		i += 1
 	if i <= ARRSIZE('bomba_dress'):jump 'bomba_dressmet'
 

+ 56 - 56
locations/portnoi2.qsrc

@@ -3,86 +3,86 @@ poshvalldrop = 0
 
 i = 1
 :ygm_outfitsmet
-	if gm_outfits[i] = 1 and ((gm_outfitsB[i] > pcs_hips + 8) or (gm_outfitsB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if gm_outfits[i] = 1 and ((gm_outfits_b[i] > pcs_hips + 8) or (gm_outfits_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('gm_outfits'):jump 'ygm_outfitsmet'
 
 i = 1
 :ycats_dressmet
-	if cats_dress[i] = 1 and ((cats_dressB[i] > pcs_hips + 8) or (cats_dressB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if cats_dress[i] = 1 and ((cats_dress_b[i] > pcs_hips + 8) or (cats_dress_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('cats_dress'):jump 'ycats_dressmet'
 
 i = 1
-:ycats_outfitmet
-	if cats_outfit[i] = 1 and ((cats_outfitB[i] > pcs_hips + 8) or (cats_outfitB[i] < pcs_hips - 8)):poshvalldrop += 1
+:ycats_outfitsmet
+	if cats_outfits[i] = 1 and ((cats_outfits_b[i] > pcs_hips + 8) or (cats_outfits_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('cats_outfit'):jump 'ycats_outfitmet'
+if i <= ARRSIZE('cats_outfits'):jump 'ycats_outfitsmet'
 
 i = 1
 :ycoco_dressmet
-	if coco_dress[i] = 1 and ((coco_dressB[i] > pcs_hips + 8) or (coco_dressB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if coco_dress[i] = 1 and ((coco_dress_b[i] > pcs_hips + 8) or (coco_dress_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('coco_dress'):jump 'ycoco_dressmet'
 
 i = 1
 :ycoco_outfitsmet
-	if coco_outfits[i] = 1 and ((coco_outfitsB[i] > pcs_hips + 8) or (coco_outfitsB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if coco_outfits[i] = 1 and ((coco_outfits_b[i] > pcs_hips + 8) or (coco_outfits_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('coco_outfits'):jump 'ycoco_outfitsmet'
 
 i = 1
 :yflamingos_dressmet
-	if flamingos_dress[i] = 1 and ((flamingos_dressB[i] > pcs_hips + 8) or (flamingos_dressB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if flamingos_dress[i] = 1 and ((flamingos_dress_b[i] > pcs_hips + 8) or (flamingos_dress_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('flamingos_dress'):jump 'yflamingos_dressmet'
 
 i = 1
-:yflamingos_outfitmet
-	if flamingos_outfit[i] = 1 and ((flamingos_outfitB[i] > pcs_hips + 8) or (flamingos_outfitB[i] < pcs_hips - 8)):poshvalldrop += 1
+:yflamingos_outfitsmet
+	if flamingos_outfits[i] = 1 and ((flamingos_outfits_b[i] > pcs_hips + 8) or (flamingos_outfits_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('flamingos_outfit'):jump 'yflamingos_outfitmet'
+if i <= ARRSIZE('flamingos_outfits'):jump 'yflamingos_outfitsmet'
 
 i = 1
 :yfashionistamet
-	if fashionista[i] = 1 and ((fashionistaB[i] > pcs_hips + 8) or (fashionistaB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if fashionista[i] = 1 and ((fashionista_b[i] > pcs_hips + 8) or (fashionista_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('fashionista'):jump 'yfashionistamet'
 
 i = 1
 :ymoncherimet
-	if moncheri[i] = 1 and ((moncheriB[i] > pcs_hips + 8) or (moncheriB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if moncheri[i] = 1 and ((moncheri_b[i] > pcs_hips + 8) or (moncheri_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('moncheri'):jump 'ymoncherimet'
 
 i = 1
 :yofficemet
-	if office[i] = 1 and ((officeB[i] > pcs_hips + 8) or (officeB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if gm_office[i] = 1 and ((gm_office_b[i] > pcs_hips + 8) or (gm_office_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('office'):jump 'yofficemet'
 
 i = 1
 :yschoolmet
-	if school[i] = 1 and ((schoolB[i] > pcs_hips + 8) or (schoolB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if gm_school[i] = 1 and ((gm_school_b[i] > pcs_hips + 8) or (gm_school_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 	if i = 6: i = 7
 if i <= ARRSIZE('school'):jump 'yschoolmet'
 
 i = 1
 :yfetishmet
-	if fetish[i] = 1 and ((fetishB[i] > pcs_hips + 8) or (fetishB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if fetish[i] = 1 and ((fetish_b[i] > pcs_hips + 8) or (fetish_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('fetish'):jump 'yfetishmet'
 
 i = 1
 :yexhibitmet
-	if exhibit[i] = 1 and ((exhibitB[i] > pcs_hips + 8) or (exhibitB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if exhibit[i] = 1 and ((exhibit_b[i] > pcs_hips + 8) or (exhibit_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('exhibit'):jump 'yexhibitmet'
 
 i = 1
 :yuniformmet
-	if uniform[i] = 1 and ((uniformB[i] > pcs_hips + 8) or (uniformB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if gm_uniform[i] = 1 and ((gm_uniform_b[i] > pcs_hips + 8) or (gm_uniform_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('uniform'):jump 'yuniformmet'
 
@@ -100,31 +100,31 @@ if i <= ARRSIZE('beach'):jump 'ybeachmet'
 
 i = 1
 :yfancy_burlesquemet
-	if fancy_burlesque[i] = 1 and ((fancy_burlesqueB[i] > pcs_hips + 8) or (fancy_burlesqueB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if fancy_burlesque[i] = 1 and ((fancy_burlesque_b[i] > pcs_hips + 8) or (fancy_burlesque_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('fancy_burlesque'):jump 'yfancy_burlesquemet'
 
 i = 1
-:ydolls_outfitmet
-	if dolls_outfit[i] = 1 and ((dolls_outfitB[i] > pcs_hips + 8) or (dolls_outfitB[i] < pcs_hips - 8)):poshvalldrop += 1
+:ydolls_outfitsmet
+	if dolls_outfits[i] = 1 and ((dolls_outfits_b[i] > pcs_hips + 8) or (dolls_outfits_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('dolls_outfit'):jump 'ydolls_outfitmet'
+if i <= ARRSIZE('dolls_outfits'):jump 'ydolls_outfitsmet'
 
 i = 1
 :ydolls_dressmet
-	if dolls_dress[i] = 1 and ((dolls_dressB[i] > pcs_hips + 8) or (dolls_dressB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if dolls_dress[i] = 1 and ((dolls_dress_b[i] > pcs_hips + 8) or (dolls_dress_b[i] < pcs_hips - 8)):poshvalldrop += 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
+:ybomba_outfitsmet
+	if bomba_outfits[i] = 1 and ((bomba_outfits_b[i] > pcs_hips + 8) or (bomba_outfits_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('bomba_outfit'):jump 'ybomba_outfitmet'
+if i <= ARRSIZE('bomba_outfits'):jump 'ybomba_outfitsmet'
 
 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
+	if bomba_dress[i] = 1 and ((bomba_dress_b[i] > pcs_hips + 8) or (bomba_dress_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('bomba_dress'):jump 'ybomba_dressmet'
 
@@ -139,98 +139,98 @@ elseif money >= poshvalldrop:
 
 	i = 1
 	: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
+		if gm_dress[i] = 1 and ((gm_dress_b[i] > pcs_hips + 8) or (gm_dress_b[i] < pcs_hips - 8)):gm_dress_b[i] = pcs_hips
 		i += 1
 	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
+		if gm_outfits[i] = 1 and ((gm_outfits_b[i] > pcs_hips + 8) or (gm_outfits_b[i] < pcs_hips - 8)):gm_outfits_b[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
+		if cats_dress[i] = 1 and ((cats_dress_b[i] > pcs_hips + 8) or (cats_dress_b[i] < pcs_hips - 8)):cats_dress_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('cats_dress'):jump 'xcats_dressmet'
 
 	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
+		if cats_dress[i] = 1 and ((cats_dress_b[i] > pcs_hips + 8) or (cats_dress_b[i] < pcs_hips - 8)):cats_dress_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('cats_dress'):jump 'xcats_dressmet'
 
 	i = 1
-	:xcats_outfitmet
-		if cats_outfit[i] = 1 and ((cats_outfitB[i] > pcs_hips + 8) or (cats_outfitB[i] < pcs_hips - 8)):cats_outfitB[i] = pcs_hips
+	:xcats_outfitsmet
+		if cats_outfits[i] = 1 and ((cats_outfits_b[i] > pcs_hips + 8) or (cats_outfits_b[i] < pcs_hips - 8)):cats_outfits_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('cats_outfit'):jump 'xcats_outfitmet'
+	if i <= ARRSIZE('cats_outfits'):jump 'xcats_outfitsmet'
 
 	i = 1
 	:xcoco_dressmet
-		if coco_dress[i] = 1 and ((coco_dressB[i] > pcs_hips + 8) or (coco_dressB[i] < pcs_hips - 8)):coco_dressB[i] = pcs_hips
+		if coco_dress[i] = 1 and ((coco_dress_b[i] > pcs_hips + 8) or (coco_dress_b[i] < pcs_hips - 8)):coco_dress_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('coco_dress'):jump 'xcoco_dressmet'
 
 	i = 1
 	: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
+		if coco_outfits[i] = 1 and ((coco_outfits_b[i] > pcs_hips + 8) or (coco_outfits_b[i] < pcs_hips - 8)):coco_outfits_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('coco_outfits'):jump 'xcoco_outfitsmet'
 
 	i = 1
 	:xflamingos_dressmet
-		if flamingos_dress[i] = 1 and ((flamingos_dressB[i] > pcs_hips + 8) or (flamingos_dressB[i] < pcs_hips - 8)):flamingos_dressB[i] = pcs_hips
+		if flamingos_dress[i] = 1 and ((flamingos_dress_b[i] > pcs_hips + 8) or (flamingos_dress_b[i] < pcs_hips - 8)):flamingos_dress_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('flamingos_dress'):jump 'xflamingos_dressmet'
 
 	i = 1
-	:xflamingos_outfitmet
-		if flamingos_outfit[i] = 1 and ((flamingos_outfitB[i] > pcs_hips + 8) or (flamingos_outfitB[i] < pcs_hips - 8)):flamingos_outfitB[i] = pcs_hips
+	:xflamingos_outfitsmet
+		if flamingos_outfits[i] = 1 and ((flamingos_outfits_b[i] > pcs_hips + 8) or (flamingos_outfits_b[i] < pcs_hips - 8)):flamingos_outfits_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('flamingos_outfit'):jump 'xflamingos_outfitmet'
+	if i <= ARRSIZE('flamingos_outfits'):jump 'xflamingos_outfitsmet'
 
 	i = 1
 	:xfashionistamet
-		if fashionista[i] = 1 and ((fashionistaB[i] > pcs_hips + 8) or (fashionistaB[i] < pcs_hips - 8)):fashionistaB[i] = pcs_hips
+		if fashionista[i] = 1 and ((fashionista_b[i] > pcs_hips + 8) or (fashionista_b[i] < pcs_hips - 8)):fashionista_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('fashionista'):jump 'xfashionistamet'
 
 	i = 1
 	:xmoncherimet
-		if moncheri[i] = 1 and ((moncheriB[i] > pcs_hips + 8) or (moncheriB[i] < pcs_hips - 8)):moncheriB[i] = pcs_hips
+		if moncheri[i] = 1 and ((moncheri_b[i] > pcs_hips + 8) or (moncheri_b[i] < pcs_hips - 8)):moncheri_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('moncheri'):jump 'xmoncherimet'
 
 	i = 1
 	:xofficemet
-		if office[i] = 1 and ((officeB[i] > pcs_hips + 8) or (officeB[i] < pcs_hips - 8)):officeB[i] = pcs_hips
+		if gm_office[i] = 1 and ((gm_office_b[i] > pcs_hips + 8) or (gm_office_b[i] < pcs_hips - 8)):gm_office_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('office'):jump 'xofficemet'
 
 	i = 1
 	:xschoolmet
-		if school[i] = 1 and ((schoolB[i] > pcs_hips + 8) or (schoolB[i] < pcs_hips - 8)):schoolB[i] = pcs_hips
+		if gm_school[i] = 1 and ((gm_school_b[i] > pcs_hips + 8) or (gm_school_b[i] < pcs_hips - 8)):gm_school_b[i] = pcs_hips
 		i += 1
 		if i = 6: i = 7
 	if i <= ARRSIZE('school'):jump 'xschoolmet'
 
 	i = 1
 	:xfetishmet
-		if fetish[i] = 1 and ((fetishB[i] > pcs_hips + 8) or (fetishB[i] < pcs_hips - 8)):fetishB[i] = pcs_hips
+		if fetish[i] = 1 and ((fetish_b[i] > pcs_hips + 8) or (fetish_b[i] < pcs_hips - 8)):fetish_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('fetish'):jump 'xfetishmet'
 
 	i = 1
 	:xexhibitmet
-		if exhibit[i] = 1 and ((exhibitB[i] > pcs_hips + 8) or (exhibitB[i] < pcs_hips - 8)):exhibitB[i] = pcs_hips
+		if exhibit[i] = 1 and ((exhibit_b[i] > pcs_hips + 8) or (exhibit_b[i] < pcs_hips - 8)):exhibit_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('exhibit'):jump 'xexhibitmet'
 
 	i = 1
 	:xuniformmet
-		if uniform[i] = 1 and ((uniformB[i] > pcs_hips + 8) or (uniformB[i] < pcs_hips - 8)):uniformB[i] = pcs_hips
+		if gm_uniform[i] = 1 and ((gm_uniform_b[i] > pcs_hips + 8) or (gm_uniform_b[i] < pcs_hips - 8)):gm_uniform_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('uniform'):jump 'xuniformmet'
 
@@ -248,31 +248,31 @@ elseif money >= poshvalldrop:
 
 	i = 1
 	:xfancy_burlesquemet
-		if fancy_burlesque[i] = 1 and ((fancy_burlesqueB[i] > pcs_hips + 8) or (fancy_burlesqueB[i] < pcs_hips - 8)):fancy_burlesqueB[i] = pcs_hips
+		if fancy_burlesque[i] = 1 and ((fancy_burlesque_b[i] > pcs_hips + 8) or (fancy_burlesque_b[i] < pcs_hips - 8)):fancy_burlesque_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('fancy_burlesque'):jump 'xfancy_burlesquemet'
 
 	i = 1
-	:xdolls_outfitmet
-		if dolls_outfit[i] = 1 and ((dolls_outfitB[i] > pcs_hips + 8) or (dolls_outfitB[i] < pcs_hips - 8)):dolls_outfitB[i] = pcs_hips
+	:xdolls_outfitsmet
+		if dolls_outfits[i] = 1 and ((dolls_outfits_b[i] > pcs_hips + 8) or (dolls_outfits_b[i] < pcs_hips - 8)):dolls_outfits_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('dolls_outfit'):jump 'xdolls_outfitmet'
+	if i <= ARRSIZE('dolls_outfits'):jump 'xdolls_outfitsmet'
 
 	i = 1
 	:xdolls_dressmet
-		if dolls_dress[i] = 1 and ((dolls_dressB[i] > pcs_hips + 8) or (dolls_dressB[i] < pcs_hips - 8)):dolls_dressB[i] = pcs_hips
+		if dolls_dress[i] = 1 and ((dolls_dress_b[i] > pcs_hips + 8) or (dolls_dress_b[i] < pcs_hips - 8)):dolls_dress_b[i] = pcs_hips
 		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
+	:xbomba_outfitsmet
+		if bomba_outfits[i] = 1 and ((bomba_outfits_b[i] > pcs_hips + 8) or (bomba_outfits_b[i] < pcs_hips - 8)):bomba_outfits_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('bomba_outfit'):jump 'xbomba_outfitmet'
+	if i <= ARRSIZE('bomba_outfits'):jump 'xbomba_outfitsmet'
 
 	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
+		if bomba_dress[i] = 1 and ((bomba_dress_b[i] > pcs_hips + 8) or (bomba_dress_b[i] < pcs_hips - 8)):bomba_dress_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('bomba_dress'):jump 'xbomba_dressmet'
 

+ 1 - 1
locations/post_events.qsrc

@@ -679,7 +679,7 @@ if $ARGS[0] = '3-2':
 		'"I don''t know what it is about you, but..." he whispers, and kisses your neck. "If you''re a good little slut for me, everything in that closet could be yours. And more. I treat my sluts well."'
 		'Then he suddenly pulls away from you and dismisses you: "Anyway, I have to go now, more work to do. When I want you to come over, I''ll send a letter to my own house on Saturday. I assume you''ll be the one delivering it."'
 		'With that, he enters the bathroom. Figuring he expects you to see yourself out, you quickly change back into your normal clothes and put your new outfit in a bag.'
-		if school[11] = 0: school[11] = 1 & schoolH[11] = 150 & schoolB[11] = pcs_hips & schoolS[11] = 0
+		if gm_school[11] = 0: gm_school[11] = 1 & gm_school_h[11] = 150 & gm_school_b[11] = pcs_hips & gm_school_s[11] = 0
 		
 		act 'Leave his apartment': gt 'pav_residential'
 	end	

+ 95 - 95
locations/preCUST.qsrc

@@ -307,7 +307,7 @@ if $ARGS[0] = 'Done':
 !!	SG Start Specific Variable Setting
 	if $ARGS[1] = 'CSB': money = 5000
 	if $ARGS[1] = 'SGS' or $ARGS[1] = 'CSB':
-		school[6] = 1
+		gm_school[6] = 1
 		sisboyday = -2
 		home_owned[1] = 0
 		cltarelka = 0
@@ -386,13 +386,13 @@ if $ARGS[0] = 'Done':
 !!	Starting clothing set
 	if NTstart = 1:
 		gm_outfits[161] = 1
-		gm_outfitsH[161] = 100
-		gm_outfitsB[161] = pcs_hips
+		gm_outfits_h[161] = 100
+		gm_outfits_b[161] = pcs_hips
 		exercise[29] = 1
-		exerciseH[29] = 100
+		exercise_h[29] = 100
 		gm_dress[370] = 1
-		gm_dressH[370] = 100
-		gm_dressB[370] = pcs_hips
+		gm_dress_h[370] = 100
+		gm_dress_b[370] = pcs_hips
 		swimwear[3] = 1
 		swimwearH[3] = 60
 		swimwearB[3] = pcs_hips
@@ -406,19 +406,19 @@ if $ARGS[0] = 'Done':
 		$braworntype = 'kats'
 		brawornnumber = 28
 		exercise[45] = 1
-		exerciseH[45] = 100
+		exercise_h[45] = 100
 		strainers[21] = 1
 		sgandm[43] = 1
 		shoewornnumber = 43
 		$shoeworntype = 'gandm'
-		bomba_outfit[16] = 1
-		bomba_outfitH[16] = 100
-		bomba_outfitB[16] = pcs_hips
-		bomba_outfit[37] = 1
-		bomba_outfitH[37] = 100
-		bomba_outfitB[37] = pcs_hips
+		bomba_outfits[16] = 1
+		bomba_outfits_h[16] = 100
+		bomba_outfits_b[16] = pcs_hips
+		bomba_outfits[37] = 1
+		bomba_outfits_h[37] = 100
+		bomba_outfits_b[37] = pcs_hips
 		sportsclothingnumber = 45
-		gs 'clothing', 'wear', 'bomba_outfit', 37
+		gs 'clothing', 'wear', 'bomba_outfits', 37
 	elseif $ARGS[1] = 'CSB':
 		cheap_panties[5] = 1
 		cheap_bras[12] = 1
@@ -427,138 +427,138 @@ if $ARGS[0] = 'Done':
 		$braworntype = 'cheap'
 		brawornnumber = 12
 		exercise[4] = 1
-		exerciseH[4] = 100
+		exercise_h[4] = 100
 		strainers[21] = 1
 		sgandm[43] = 1
 		shoewornnumber = 43
 		$shoeworntype = 'gandm'
 		gm_outfits[7] = 1
-		gm_outfitsH[7] = 100
-		gm_outfitsB[7] = pcs_hips
+		gm_outfits_h[7] = 100
+		gm_outfits_b[7] = pcs_hips
 		gm_dress[12] = 1
-		gm_dressH[12] = 100
-		gm_dressB[12] = pcs_hips
+		gm_dress_h[12] = 100
+		gm_dress_b[12] = pcs_hips
 		sportsclothingnumber = 4
 		gs 'clothing', 'wear', 'gm_dress', 12
 	elseif pcs_inhib < 5:
 		gm_outfits[7] = 1
-		gm_outfitsH[7] = 100
-		gm_outfitsB[7] = pcs_hips
+		gm_outfits_h[7] = 100
+		gm_outfits_b[7] = pcs_hips
 		exercise[4] = 1
-		exerciseH[4] = 100
+		exercise_h[4] = 100
 		gm_dress[12] = 1
-		gm_dressH[12] = 100
-		gm_dressB[12] = pcs_hips
+		gm_dress_h[12] = 100
+		gm_dress_b[12] = pcs_hips
 		sportsclothingnumber = 4
 		gs 'clothing', 'wear', 'gm_dress', 12
 	elseif pcs_inhib < 10:
 		gm_outfits[15] = 1
-		gm_outfitsH[15] = 100
-		gm_outfitsB[15] = pcs_hips
+		gm_outfits_h[15] = 100
+		gm_outfits_b[15] = pcs_hips
 		exercise[4] = 1
-		exerciseH[4] = 100
+		exercise_h[4] = 100
 		gm_dress[4] = 1
-		gm_dressH[4] = 100
-		gm_dressB[4] = pcs_hips
+		gm_dress_h[4] = 100
+		gm_dress_b[4] = pcs_hips
 		sportsclothingnumber = 4
 		gs 'clothing', 'wear', 'gm_dress', 4
 	elseif pcs_inhib < 15:
 		gm_outfits[58] = 1
-		gm_outfitsH[58] = 100
-		gm_outfitsB[58] = pcs_hips
+		gm_outfits_h[58] = 100
+		gm_outfits_b[58] = pcs_hips
 		exercise[4] = 1
-		exerciseH[4] = 100
+		exercise_h[4] = 100
 		gm_dress[7] = 1
-		gm_dressH[7] = 100
-		gm_dressB[7] = pcs_hips
+		gm_dress_h[7] = 100
+		gm_dress_b[7] = pcs_hips
 		sportsclothingnumber = 4
 		gs 'clothing', 'wear', 'gm_dress', 7
 	elseif pcs_inhib < 20:
 		gm_outfits[55] = 1
-		gm_outfitsH[55] = 100
-		gm_outfitsB[55] = pcs_hips
+		gm_outfits_h[55] = 100
+		gm_outfits_b[55] = pcs_hips
 		exercise[4] = 1
-		exerciseH[4] = 100
+		exercise_h[4] = 100
 		gm_dress[7] = 1
-		gm_dressH[7] = 100
-		gm_dressB[7] = pcs_hips
+		gm_dress_h[7] = 100
+		gm_dress_b[7] = pcs_hips
 		sportsclothingnumber = 4
 		gs 'clothing', 'wear', 'gm_dress', 7
 	elseif pcs_inhib < 25:
 		gm_outfits[58] = 1
-		gm_outfitsH[58] = 100
-		gm_outfitsB[58] = pcs_hips
+		gm_outfits_h[58] = 100
+		gm_outfits_b[58] = pcs_hips
 		exercise[4] = 1
-		exerciseH[4] = 100
+		exercise_h[4] = 100
 		gm_dress[39] = 1
-		gm_dressH[39] = 100
-		gm_dressB[39] = pcs_hips
+		gm_dress_h[39] = 100
+		gm_dress_b[39] = pcs_hips
 		sportsclothingnumber = 4
 		gs 'clothing', 'wear', 'gm_dress', 39
 	elseif pcs_inhib < 30:
 		gm_outfits[91] = 1
-		gm_outfitsH[91] = 100
-		gm_outfitsB[91] = pcs_hips
+		gm_outfits_h[91] = 100
+		gm_outfits_b[91] = pcs_hips
 		exercise[4] = 1
-		exerciseH[4] = 100
+		exercise_h[4] = 100
 		gm_dress[57] = 1
-		gm_dressH[57] = 100
-		gm_dressB[57] = pcs_hips
+		gm_dress_h[57] = 100
+		gm_dress_b[57] = pcs_hips
 		sportsclothingnumber = 4
 		gs 'clothing', 'wear', 'gm_dress', 57
 	elseif pcs_inhib < 35:
 		gm_outfits[95] = 1
-		gm_outfitsH[95] = 100
-		gm_outfitsB[95] = pcs_hips
+		gm_outfits_h[95] = 100
+		gm_outfits_b[95] = pcs_hips
 		exercise[4] = 1
-		exerciseH[4] = 100
+		exercise_h[4] = 100
 		gm_dress[63] = 1
-		gm_dressH[63] = 100
-		gm_dressB[63] = pcs_hips
+		gm_dress_h[63] = 100
+		gm_dress_b[63] = pcs_hips
 		sportsclothingnumber = 4
 		gs 'clothing', 'wear', 'gm_dress', 63
 	elseif pcs_inhib < 40:
 		gm_outfits[124] = 1
-		gm_outfitsH[124] = 100
-		gm_outfitsB[124] = pcs_hips
+		gm_outfits_h[124] = 100
+		gm_outfits_b[124] = pcs_hips
 		exercise[4] = 1
-		exerciseH[4] = 100
+		exercise_h[4] = 100
 		gm_dress[89] = 1
-		gm_dressH[89] = 100
-		gm_dressB[89] = pcs_hips
+		gm_dress_h[89] = 100
+		gm_dress_b[89] = pcs_hips
 		sportsclothingnumber = 4
 		gs 'clothing', 'wear', 'gm_dress', 89
 	elseif pcs_inhib < 45:
 		gm_outfits[131] = 1
-		gm_outfitsH[131] = 100
-		gm_outfitsB[131] = pcs_hips
+		gm_outfits_h[131] = 100
+		gm_outfits_b[131] = pcs_hips
 		exercise[95] = 1
-		exerciseH[95] = 100
+		exercise_h[95] = 100
 		gm_dress[109] = 1
-		gm_dressH[109] = 100
-		gm_dressB[109] = pcs_hips
+		gm_dress_h[109] = 100
+		gm_dress_b[109] = pcs_hips
 		sportsclothingnumber = 95
 		gs 'clothing', 'wear', 'gm_dress', 109
 	elseif pcs_inhib < 50:
 		gm_outfits[145] = 1
-		gm_outfitsH[145] = 100
-		gm_outfitsB[145] = pcs_hips
+		gm_outfits_h[145] = 100
+		gm_outfits_b[145] = pcs_hips
 		exercise[94] = 1
-		exerciseH[94] = 100
+		exercise_h[94] = 100
 		gm_dress[123] = 1
-		gm_dressH[123] = 100
-		gm_dressB[123] = pcs_hips
+		gm_dress_h[123] = 100
+		gm_dress_b[123] = pcs_hips
 		sportsclothingnumber = 94
 		gs 'clothing', 'wear', 'gm_dress', 123
 	else
 		gm_outfits[149] = 1
-		gm_outfitsH[149] = 100
-		gm_outfitsB[149] = pcs_hips
+		gm_outfits_h[149] = 100
+		gm_outfits_b[149] = pcs_hips
 		exercise[58] = 1
-		exerciseH[58] = 100
+		exercise_h[58] = 100
 		gm_dress[149] = 1
-		gm_dressH[149] = 100
-		gm_dressB[149] = pcs_hips
+		gm_dress_h[149] = 100
+		gm_dress_b[149] = pcs_hips
 		swimwear[24] = 1
 		swimwearH[24] = 60
 		swimwearB[24] = pcs_hips
@@ -582,9 +582,9 @@ if $ARGS[0] = 'Done':
 !!setting default exercise outfit and setting coats
 	if school_clothing = 1:
 		killvar 'school_clothing'
-		bomba_outfit[29] = 1
-		bomba_outfitH[29] = 120
-		bomba_outfitB[29] = pcs_hips
+		bomba_outfits[29] = 1
+		bomba_outfits_h[29] = 120
+		bomba_outfits_b[29] = pcs_hips
 		sportspantynumber = 44
 		sportsbranumber = 28
 		$sportsbratype = 'kats'
@@ -608,31 +608,31 @@ if $ARGS[0] = 'Done':
 		defaultcoat = 5
 		sportscoat = 5
 		if school_clothing = 2:
-			school[10] = 1
-			schoolH[10] = 120
-			schoolB[10] = pcs_hips
+			gm_school[10] = 1
+			gm_school_h[10] = 120
+			gm_school_b[10] = pcs_hips
 		elseif school_clothing = 3:
-			school[63] = 1
-			schoolH[63] = 120
-			schoolB[63] = pcs_hips
+			gm_school[63] = 1
+			gm_school_h[63] = 120
+			gm_school_b[63] = pcs_hips
 		elseif school_clothing = 4:
 			dolls_dress[40] = 1
-			dolls_dressH[40] = 120
-			dolls_dressB[40] = pcs_hips
+			dolls_dress_h[40] = 120
+			dolls_dress_b[40] = pcs_hips
 		elseif school_clothing = 5:
-			school[25] = 1
-			schoolH[25] = 120
-			schoolB[25] = pcs_hips
+			gm_school[25] = 1
+			gm_school_h[25] = 120
+			gm_school_b[25] = pcs_hips
 		elseif school_clothing = 6:
-			school[26] = 1
-			schoolH[26] = 120
-			schoolB[26] = pcs_hips
+			gm_school[26] = 1
+			gm_school_h[26] = 120
+			gm_school_b[26] = pcs_hips
 		elseif school_clothing = 7:
-			school[26] = 1
-			schoolH[26] = 120
-			schoolB[26] = pcs_hips
+			gm_school[26] = 1
+			gm_school_h[26] = 120
+			gm_school_b[26] = pcs_hips
 			exercise[32] = 1
-			exerciseH[32] = 100			
+			exercise_h[32] = 100			
 			sportsclothingnumber = 32
 			strainers[17] = 1
 			strainers[21] = 0

+ 4 - 4
locations/reks.qsrc

@@ -181,8 +181,8 @@ if $ARGS[0] = 'skver':
 						minut += 30
 						if fashionista[76] = 0:
 							fashionista[76] = 1
-							fashionistaH[76] = 50
-							fashionistaB[76] = pcs_hips
+							fashionista_h[76] = 50
+							fashionista_b[76] = pcs_hips
 							'Rex buys you the dress.'
 						else
 							'You already have this dress, so Rex buys you something else.'
@@ -190,8 +190,8 @@ if $ARGS[0] = 'skver':
 							numrand = rand(77, 127)
 							if fashionista[numrand] = 0:
 								fashionista[numrand] = 1
-								fashionistaH[numrand] = 50
-								fashionistaB[numrand] = pcs_hips
+								fashionista_h[numrand] = 50
+								fashionista_b[numrand] = pcs_hips
 								'<center><img <<$set_imgh>> src="images/pc/items/fashionista/dress/<<numrand>>.jpg"></center>'
 							else
 								jump 'markbuycloreks'

+ 1 - 1
locations/shoes.qsrc

@@ -120,7 +120,7 @@ if $ARGS[0] = 'view_shoe_list':
 
 	i = 1
 	:loopsfetish
-		if sfetish[i] = 1 and sfetishS[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'fetish', i)
+		if sfetish[i] = 1 and sfetish_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'fetish', i)
 		i += 1
 	if i <= 27:jump 'loopsfetish'
 

+ 6 - 6
locations/shop_dolls.qsrc

@@ -147,13 +147,13 @@ if $ARGS[0] = 'clothing':
 		end
 
 		:loopdolls
-			if dolls_outfit[i] = 0:
-				gs 'clothing_attributes', 'dolls_outfit', i
+			if dolls_outfits[i] = 0:
+				gs 'clothing_attributes', 'dolls_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_outfit''"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_outfits''"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
@@ -161,15 +161,15 @@ if $ARGS[0] = 'clothing':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 
-if $ARGS[0] = 'dolls_outfit':
+if $ARGS[0] = 'dolls_outfits':
 	cla
 
-	if dolls_outfit[i] ! 0:
+	if dolls_outfits[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'shop_dolls', 'clothing'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'dolls_outfit',i, 3500
+	gt 'clothing', 'view_clothing_item', 'shop', 'dolls_outfits',i, 3500
 
 end
 

+ 6 - 6
locations/shop_flamingos.qsrc

@@ -98,13 +98,13 @@ if $ARGS[0] = 'clothes':
 		end
 
 		:loopflamingos
-			if flamingos_outfit[i] = 0:
-				gs 'clothing_attributes', 'flamingos_outfit', i
+			if flamingos_outfits[i] = 0:
+				gs 'clothing_attributes', 'flamingos_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_outfit''"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_outfits''"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
@@ -112,15 +112,15 @@ if $ARGS[0] = 'clothes':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 
-if $ARGS[0] = 'flamingos_outfit':
+if $ARGS[0] = 'flamingos_outfits':
 	cla
 	menu_off = 1
-	if flamingos_outfit[i] ! 0:
+	if flamingos_outfits[i] ! 0:
 		msg 'You already own this outfit.'
 		gt 'shop_flamingos', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'flamingos_outfit',i, 3000
+	gt 'clothing', 'view_clothing_item', 'shop', 'flamingos_outfits',i, 3000
 
 end
 

+ 12 - 12
locations/shop_pussycats.qsrc

@@ -525,7 +525,7 @@ if $ARGS[0] = '11':
 	*clr & cla
 	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>'
+	'<center><img <<$set_imgh>> src="images/pc/clothing/cats_outfits/<<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 cats_dress[i] = 1:
@@ -538,9 +538,9 @@ if $ARGS[0] = '11':
 				cla
 				money -= 720
 				cats_dress[i] = 1
-				cats_dressH[i] = 50
-				cats_dressB[i] = pcs_hips
-				cats_dressS[i] = 0
+				cats_dress_h[i] = 50
+				cats_dress_b[i] = pcs_hips
+				cats_dress_s[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'
@@ -771,9 +771,9 @@ if $ARGS[0] = '15':
 				'<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
 				gm_outfits[i] = 1
-				gm_outfitsH[i] = 50
-				gm_outfitsB[i] = pcs_hips
-				gm_outfitsS[i] = 0
+				gm_outfits_h[i] = 50
+				gm_outfits_b[i] = pcs_hips
+				gm_outfits_s[i] = 0
 			end
 
 			act 'Finish your shift':gt 'shop_pussycats', 'endwork'
@@ -1104,9 +1104,9 @@ if $ARGS[0] = 'clothes':
 			i = 2
 		end
 
-		:loopcats_outfit
-			if cats_outfit[i] = 0:
-				gs 'clothing_attributes', 'cats_outfit', i
+		:loopcats_outfits
+			if cats_outfits[i] = 0:
+				gs 'clothing_attributes', 'cats_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
@@ -1115,11 +1115,11 @@ if $ARGS[0] = 'clothes':
 				end
 			end
 			i += 3
-		if i <= 100:jump 'loopcats_outfit'
+		if i <= 100:jump 'loopcats_outfits'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 
-if $ARGS[0] = 'yshopclo_outfit': gt 'clothing', 'view_clothing_item', 'shop', 'cats_outfit',i, 3000
+if $ARGS[0] = 'yshopclo_outfit': gt 'clothing', 'view_clothing_item', 'shop', 'cats_outfits',i, 3000
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = 'shoes'

+ 6 - 6
locations/shop_tsar_bomba.qsrc

@@ -100,13 +100,13 @@ if $ARGS[0] = 'clothes':
 		end
 
 		:loopbomba
-			if bomba_outfit[i] = 0:
-				gs 'clothing_attributes', 'bomba_outfit', i
+			if bomba_outfits[i] = 0:
+				gs 'clothing_attributes', 'bomba_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_outfit''"><img src="images/pc/items/bomba/goth_outfits/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_outfits''"><img src="images/pc/items/bomba/goth_outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
@@ -114,15 +114,15 @@ if $ARGS[0] = 'clothes':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 
-if $ARGS[0] = 'bomba_outfit':
+if $ARGS[0] = 'bomba_outfits':
 	cla
 	menu_off = 1
-	if bomba_outfit[i] ! 0:
+	if bomba_outfits[i] ! 0:
 		msg 'You already own these clothes.'
 		gt 'shop_tsar_bomba', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'bomba_outfit',i, 3500
+	gt 'clothing', 'view_clothing_item', 'shop', 'bomba_outfits',i, 3500
 end
 
 if $ARGS[0] = 'purses':

+ 1 - 1
locations/stat_display.qsrc

@@ -620,7 +620,7 @@ elseif PCloStyle2 = 4:
 		$stat_clothes_tooltip = 'Normal school uniform.'
 		$stat_clothes_style = 'uniform'
 	end
-elseif $clothingworntype = 'misc_outfit' and clothingwornnumber = '1':
+elseif $clothingworntype = 'misc_outfits' and clothingwornnumber = '1':
 	$stat_clothes_text = '<BR><b><font color = "yellow">You are wearing an old hessian sack the hunters gave you.</font></b>'
 	$stat_clothes_tooltip = 'You''re wearing an hessian sack.'
 	$stat_clothes_msg = 'You are wearing an old hessian sack the hunters gave you.'

+ 33 - 33
locations/succubus.qsrc

@@ -484,7 +484,7 @@ if $args[0] = 'sucwalkinginit':
 	x = 0
 	i = 1
 	:loopexhibit
-		if exhibit[i] = 1 and exhibitS[i] = 0 and exhibitH[i] > 0 and exhibitB[i] >= (pcs_hips - 8) and exhibitB[i] <= (pcs_hips + 8):
+		if exhibit[i] = 1 and exhibit_s[i] = 0 and exhibit_h[i] > 0 and exhibit_b[i] >= (pcs_hips - 8) and exhibit_b[i] <= (pcs_hips + 8):
 			$succlolistn[x] = 'exhibit' & succlolisti[x] = i & x += 1
 		end
 		i += 1
@@ -492,7 +492,7 @@ if $args[0] = 'sucwalkinginit':
 
 	i = 1
 	:loopfetish
-		if fetish[i] = 1 and fetishS[i] = 0 and fetishH[i] > 0 and fetishB[i] >= (pcs_hips - 8) and fetishB[i] <= (pcs_hips + 8):
+		if fetish[i] = 1 and fetish_s[i] = 0 and fetish_h[i] > 0 and fetish_b[i] >= (pcs_hips - 8) and fetish_b[i] <= (pcs_hips + 8):
 			$succlolistn[x] = 'fetish' & succlolisti[x] = i & x += 1
 		end
 		i += 1
@@ -502,11 +502,11 @@ if $args[0] = 'sucwalkinginit':
 	:loopfashionista
 		gs 'clothing_attributes', 'fashionista', i
 		if CloStyle ! 5:
-			if fashionista[i] = 1 and fashionistaS[i] = 0 and fashionistaH[i] > 0 and fashionistaB[i] >= (pcs_hips - 8) and fashionistaB[i] <= (pcs_hips + 8):
+			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
 			end
 		else
-			if fashionista[i] = 1 and fashionistaS[i] = 0 and fashionistaH[i] > 0: $succlolistn[x] = 'fashionista' & succlolisti[x] = i & x += 1
+			if fashionista[i] = 1 and fashionista_s[i] = 0 and fashionista_h[i] > 0: $succlolistn[x] = 'fashionista' & succlolisti[x] = i & x += 1
 		end
 		i += 1
 	if i <= 200:jump 'loopfashionista'
@@ -515,37 +515,37 @@ if $args[0] = 'sucwalkinginit':
 	:loopcats_dress
 		gs 'clothing_attributes', 'cats_dress', i
 		if CloStyle ! 5:
-			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):
+			if cats_dress[i] = 1 and cats_dress_s[i] = 0 and cats_dress_h[i] > 0 and cats_dress_b[i] >= (pcs_hips - 8) and cats_dress_b[i] <= (pcs_hips + 8):
 				$succlolistn[x] = 'cats_dress' & succlolisti[x] = i & x += 1
 			end
 		else
-			if cats_dress[i] = 1 and cats_dressS[i] = 0 and cats_dressH[i] > 0: $succlolistn[x] = 'cats_dress' & succlolisti[x] = i & x += 1
+			if cats_dress[i] = 1 and cats_dress_s[i] = 0 and cats_dress_h[i] > 0: $succlolistn[x] = 'cats_dress' & succlolisti[x] = i & x += 1
 		end
 		i += 1
 	if i <= 110:jump 'loopcats_dress'
 
 	i = 1
-	:loopcats_outfit
-		gs 'clothing_attributes', 'cats_outfit', i
+	:loopcats_outfits
+		gs 'clothing_attributes', 'cats_outfits', i
 		if CloStyle ! 5:
-			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
+			if cats_outfits[i] = 1 and cats_outfits_s[i] = 0 and cats_outfits_h[i] > 0 and cats_outfits_b[i] >= (pcs_hips - 8) and cats_outfits_b[i] <= (pcs_hips + 8):
+				$succlolistn[x] = 'cats_outfits' & succlolisti[x] = i & x += 1
 			end
 		else
-			if cats_outfit[i] = 1 and cats_outfitS[i] = 0 and cats_outfitH[i] > 0: $succlolistn[x] = 'cats_outfit' & succlolisti[x] = i & x += 1
+			if cats_outfits[i] = 1 and cats_outfits_s[i] = 0 and cats_outfits_h[i] > 0: $succlolistn[x] = 'cats_outfits' & succlolisti[x] = i & x += 1
 		end
 		i += 1
-	if i <= 100:jump 'loopcats_outfit'
+	if i <= 100:jump 'loopcats_outfits'
 
 	i = 1
 	:loopcoco_dress
 		gs 'clothing_attributes', 'coco_dress', i
 		if CloStyle ! 5:
-			if coco_dress[i] = 1 and coco_dressS[i] = 0 and coco_dressH[i] > 0 and coco_dressB[i] >= (pcs_hips - 8) and coco_dressB[i] <= (pcs_hips + 8):
+			if coco_dress[i] = 1 and coco_dress_s[i] = 0 and coco_dress_h[i] > 0 and coco_dress_b[i] >= (pcs_hips - 8) and coco_dress_b[i] <= (pcs_hips + 8):
 				$succlolistn[x] = 'coco_dress' & succlolisti[x] = i & x += 1
 			end
 		else
-			if coco_dress[i] = 1 and coco_dressS[i] = 0 and coco_dressH[i] > 0: $succlolistn[x] = 'coco_dress' & succlolisti[x] = i & x += 1
+			if coco_dress[i] = 1 and coco_dress_s[i] = 0 and coco_dress_h[i] > 0: $succlolistn[x] = 'coco_dress' & succlolisti[x] = i & x += 1
 		end
 		i += 1
 	if i <= 100:jump 'loopcoco_dress'
@@ -564,27 +564,27 @@ if $args[0] = 'sucwalkinginit':
 	if i <= 90:jump 'loopcoco_outfit'
 
 	i = 1
-	:loopflamingos_outfit
-		gs 'clothing_attributes', 'flamingos_outfit', i
+	:loopflamingos_outfits
+		gs 'clothing_attributes', 'flamingos_outfits', i
 		if CloStyle ! 5:
-			if flamingos_outfit[i] = 1 and flamingos_outfitS[i] = 0 and flamingos_outfitH[i] > 0 and flamingos_outfitB[i] >= (pcs_hips - 8) and flamingos_outfitB[i] <= (pcs_hips + 8):
-				$succlolistn[x] = 'flamingos_outfit' & succlolisti[x] = i & x += 1
+			if flamingos_outfits[i] = 1 and flamingos_outfits_s[i] = 0 and flamingos_outfits_h[i] > 0 and flamingos_outfits_b[i] >= (pcs_hips - 8) and flamingos_outfits_b[i] <= (pcs_hips + 8):
+				$succlolistn[x] = 'flamingos_outfits' & succlolisti[x] = i & x += 1
 			end
 		else
-			if flamingos_outfit[i] = 1 and flamingos_outfitS[i] = 0 and flamingos_outfitH[i] > 0: $succlolistn[x] = 'flamingos_outfit' & succlolisti[x] = i & x += 1
+			if flamingos_outfits[i] = 1 and flamingos_outfits_s[i] = 0 and flamingos_outfits_h[i] > 0: $succlolistn[x] = 'flamingos_outfits' & succlolisti[x] = i & x += 1
 		end
 		i += 1
-	if i <= 50:jump 'loopflamingos_outfit'
+	if i <= 50:jump 'loopflamingos_outfits'
 
 	i = 1
 	:loopflamingos_dress
 		gs 'clothing_attributes', 'flamingos_dress', i
 		if CloStyle ! 5:
-			if flamingos_dress[i] = 1 and flamingos_dressS[i] = 0 and flamingos_dressH[i] > 0 and flamingos_dressB[i] >= (pcs_hips - 8) and flamingos_dressB[i] <= (pcs_hips + 8):
+			if flamingos_dress[i] = 1 and flamingos_dress_s[i] = 0 and flamingos_dress_h[i] > 0 and flamingos_dress_b[i] >= (pcs_hips - 8) and flamingos_dress_b[i] <= (pcs_hips + 8):
 				$succlolistn[x] = 'flamingos_dress' & succlolisti[x] = i & x += 1
 			end
 		else
-			if flamingos_dress[i] = 1 and flamingos_dressS[i] = 0 and flamingos_dressH[i] > 0: $succlolistn[x] = 'flamingos_dress' & succlolisti[x] = i & x += 1
+			if flamingos_dress[i] = 1 and flamingos_dress_s[i] = 0 and flamingos_dress_h[i] > 0: $succlolistn[x] = 'flamingos_dress' & succlolisti[x] = i & x += 1
 		end
 		i += 1
 	if i <= 90:jump 'loopflamingos_dress'
@@ -593,11 +593,11 @@ if $args[0] = 'sucwalkinginit':
 	: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):
+			if gm_outfits[i] = 1 and gm_outfits_s[i] = 0 and gm_outfits_h[i] > 0 and gm_outfits_b[i] >= (pcs_hips - 8) and gm_outfits_b[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
+			if gm_outfits[i] = 1 and gm_outfits_s[i] = 0 and gm_outfits_h[i] > 0: $succlolistn[x] = 'gm_outfits' & succlolisti[x] = i & x += 1
 		end
 		i += 1
 	if i <= 150:jump 'loopgm_outfits'
@@ -606,18 +606,18 @@ if $args[0] = 'sucwalkinginit':
 	: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):
+			if gm_dress[i] = 1 and gm_dress_s[i] = 0 and gm_dress_h[i] > 0 and gm_dress_b[i] >= (pcs_hips - 8) and gm_dress_b[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
+			if gm_dress[i] = 1 and gm_dress_s[i] = 0 and gm_dress_h[i] > 0: $succlolistn[x] = 'gm_dress' & succlolisti[x] = i & x += 1
 		end
 		i += 1
 	if i <= 150:jump 'loopgm_dress'
 
 	i = 1
 	:loopoffice
-		if office[i] = 1 and officeS[i] = 0 and officeH[i] > 0 and officeB[i] >= (pcs_hips - 8) and officeB[i] <= (pcs_hips + 8):
+		if gm_office[i] = 1 and gm_office_s[i] = 0 and gm_office_h[i] > 0 and gm_office_b[i] >= (pcs_hips - 8) and gm_office_b[i] <= (pcs_hips + 8):
 			$succlolistn[x] = 'office' & succlolisti[x] = i & x += 1
 		end
 		i += 1
@@ -625,7 +625,7 @@ if $args[0] = 'sucwalkinginit':
 
 	i = 1
 	:loopschool
-		if school[i] = 1 and schoolS[i] = 0 and schoolH[i] > 0 and schoolB[i] >= (pcs_hips - 8) and schoolB[i] <= (pcs_hips + 8):
+		if gm_school[i] = 1 and gm_school_s[i] = 0 and gm_school_h[i] > 0 and gm_school_b[i] >= (pcs_hips - 8) and gm_school_b[i] <= (pcs_hips + 8):
 			$succlolistn[x] = 'school' & succlolisti[x] = i & x += 1
 		end
 		i += 1
@@ -634,13 +634,13 @@ if $args[0] = 'sucwalkinginit':
 
 	i = 1
 	:loopexercise
-		if exercise[i] = 1 and exerciseS[i] = 0 and exerciseH[i] > 0: $succlolistn[x] = 'exercise' & succlolisti[x] = i & x += 1
+		if exercise[i] = 1 and exercise_s[i] = 0 and exercise_h[i] > 0: $succlolistn[x] = 'exercise' & succlolisti[x] = i & x += 1
 		i += 1
 	if i <= 260:jump 'loopexercise'
 
 	i = 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):
+		if moncheri[i] = 1 and moncheriS[i] = 0 and moncheri_h[i] > 0 and moncheri_b[i] >= (pcs_hips - 8) and moncheri_b[i] <= (pcs_hips + 8):
 			$succlolistn[x] = 'moncheri' & succlolisti[x] = i & x += 1
 		end
 		i += 1
@@ -648,7 +648,7 @@ if $args[0] = 'sucwalkinginit':
 
 	i = 1
 	:loopuniform
-		if uniform[i] = 1 and uniformS[i] = 0 and uniformH[i] > 0 and uniformB[i] >= (pcs_hips - 8) and uniformB[i] <= (pcs_hips + 8):
+		if gm_uniform[i] = 1 and gm_uniform_s[i] = 0 and gm_uniform_h[i] > 0 and gm_uniform_b[i] >= (pcs_hips - 8) and gm_uniform_b[i] <= (pcs_hips + 8):
 			$succlolistn[x] = 'uniform' & succlolisti[x] = i & x += 1
 		end
 		i += 1
@@ -671,11 +671,11 @@ if $args[0] = 'sucwalkinginit':
 		$succlocat[1] = 'fetish'
 		$succlocat[2] = 'fashionista'
 		$succlocat[3] = 'cats_dress'
-		$succlocat[4] = 'cats_outfit'
+		$succlocat[4] = 'cats_outfits'
 		$succlocat[5] = 'coco_dress'
 		$succlocat[6] = 'coco_outfit'
 		$succlocat[7] = 'flamingos_dress'
-		$succlocat[8] = 'flamingos_outfit'
+		$succlocat[8] = 'flamingos_outfits'
 		$succlocat[9] = 'gm_outfits'
 		$succlocat[10] = 'gm_dress'
 		$succlocat[11] = 'office'

+ 1 - 1
locations/wardrobe.qsrc

@@ -502,7 +502,7 @@ if $ARGS[0] = 'sports_entry_wear':
 		gs 'clothing', 'strip'
 		gs 'stat'
 	!! strength of clothing is less than or equal to 0
-	elseif dyneval('RESULT = exerciseH[<<sportsclothingnumber>>]') <= 0:
+	elseif dyneval('RESULT = exercise_h[<<sportsclothingnumber>>]') <= 0:
 		cls
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
 		'Your sports outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'