a few more fixes for uniforms (thx Alaratt)

locations/_clothing_image.qsrc

@@ -25,9 +25,9 @@ elseif $ARGS[0] = 'fashionista':
 	$RESULT = 'images/pc/items/fashionista/dress/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'moncheri':
 	$RESULT = 'images/pc/clothing/4formal/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'office':
+elseif $ARGS[0] = 'gm_office':
 	$RESULT = 'images/pc/clothing/5office/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'school':
+elseif $ARGS[0] = 'gm_school':
 	$RESULT = 'images/pc/clothing/6school/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'exercise':
 	$RESULT = 'images/pc/clothing/7exercise/<<ARGS[1]>>.jpg'
@@ -35,7 +35,7 @@ elseif $ARGS[0] = 'fetish':
 	$RESULT = 'images/pc/clothing/8fetish/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'exhibit':
 	$RESULT = 'images/pc/clothing/9exhibit/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'uniform':
+elseif $ARGS[0] = 'gm_uniform':
 	$RESULT = 'images/pc/clothing/10uniform/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'coat':
 	$RESULT = 'images/pc/clothing/11coat/<<ARGS[1]>>.jpg'

locations/budgetclothes.qsrc

@@ -262,7 +262,7 @@ if $ARGS[0] = 'officeclo':
 		gt 'budgetclothes', 'office'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'office',i, 2000
+	gt 'clothing', 'view_clothing_item', 'shop', 'gm_office',i, 2000
 end
 
 if $ARGS[0] = 'uniform':
@@ -317,7 +317,7 @@ if $ARGS[0] = 'uniformclo':
 		gt 'budgetclothes', 'uniform'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'uniform',i, 2000
+	gt 'clothing', 'view_clothing_item', 'shop', 'gm_uniform',i, 2000
 end
 
 if $ARGS[0] = 'school':
@@ -373,7 +373,7 @@ if $ARGS[0] = 'schoolclo':
 		gt 'budgetclothes', 'school'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'school',i, 1500
+	gt 'clothing', 'view_clothing_item', 'shop', 'gm_school',i, 1500
 end
 
 if $ARGS[0] = 'shoes':

locations/clothing.qsrc

@@ -21,7 +21,7 @@ $clothing_list_line = {
 	killvar 'clothing_temp'
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 
-	if $ARGS[1] ! 'school' or ARGS[2] ! 6:
+	if $ARGS[1] ! 'gm_school' or ARGS[2] ! 6:
 		$RESULT += '<TD>' + dyneval '$RESULT += <<$ARGS[1]>>_h[<<ARGS[2]>>]' + '</TD>'
 
 		if $ARGS[1] ! 'exercise' and $ARGS[1] ! 'coat' and CloStyle ! 5:
@@ -57,7 +57,7 @@ $clothing_list_line = {
 	$RESULT += '<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a>'
 
 	if $ARGS[0] ! 'sell' and $ARGS[0] ! 'resize':
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $ARGS[1] = 'school' and ARGS[2] = 6:
+		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $ARGS[1] = 'gm_school' and ARGS[2] = 6:
 			$RESULT += ' <a href="exec:gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Wear</a></TD>'
 		elseif ($ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear' and $ARGS[1] ! 'beach') and dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') > 0:
 			if $ARGS[1] ! 'exercise' and CloStyle ! 5 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < (pcs_hips - 8) or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > (pcs_hips + 8)) or (ARRPOS('$CloLosTyp', $ARGS[1]) ! -1 and ARRPOS('CloLosNum',ARGS[2]) ! -1):
@@ -72,7 +72,7 @@ $clothing_list_line = {
 		$RESULT += '<TD>'
 		if cloc ! 1:$RESULT += ' <a href="exec:gt ''clothing'', ''dest1'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> ">Storage</a><BR>'
 		if cloc ! 0:$RESULT += ' <a href="exec:gt ''clothing'', ''dest0'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> ">Wardrobe</a><BR>'
-		if $ARGS[1] ! 'school' or ARGS[2] ! 6:
+		if $ARGS[1] ! 'gm_school' or ARGS[2] ! 6:
 			if cloc ! 2:$RESULT += ' <a href="exec:gt ''clothing'', ''dest2'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> ">Unwanted</a>'
 		end
 		$RESULT += '</TD>'
@@ -126,7 +126,7 @@ if $ARGS[0] = 'view_clothing_list':
 		'<h3><center><b><font color="maroon">Choose an item to sell</font></b></center></h3>'
 	end
 
-	if $ARGS[2] = 'gm' or $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'office' or $ARGS[2] = 'school' or $ARGS[2] = 'uniform':
+	if $ARGS[2] = 'gm' or $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'gm_office' or $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_uniform':
 		!'<center><b><font color="maroon">Viewing clothes from G&M</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
 	elseif $ARGS[2] = 'kats':
@@ -236,11 +236,11 @@ if $ARGS[0] = 'view_clothing_list':
 
 			if ARRSIZE('gm_dress') > 0:'<center><a href="exec:$ward_list_store = ''gm_dress'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_dress''">G&M Dresses</a></center>'
 
-			if ARRSIZE('gm_office') > 0:'<center><a href="exec:$ward_list_store = ''office'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''office''">Office wear</a></center>'
+			if ARRSIZE('gm_office') > 0:'<center><a href="exec:$ward_list_store = ''gm_office'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_office''">Office wear</a></center>'
 
-			if ARRSIZE('gm_school') > 0:'<center><a href="exec:$ward_list_store = ''school'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''school''">School uniforms</a></center>'
+			if ARRSIZE('gm_school') > 0:'<center><a href="exec:$ward_list_store = ''gm_school'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_school''">School uniforms</a></center>'
 
-			if ARRSIZE('gm_uniform') > 0:'<center><a href="exec:$ward_list_store = ''uniform'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''uniform''">Work uniforms</a></center>'
+			if ARRSIZE('gm_uniform') > 0:'<center><a href="exec:$ward_list_store = ''gm_uniform'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_uniform''">Work uniforms</a></center>'
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 		end
@@ -269,41 +269,41 @@ if $ARGS[0] = 'view_clothing_list':
 			gs 'clothing', 'clothwidth'
 		end
 
-		if $ARGS[2] = 'office':
+		if $ARGS[2] = 'gm_office':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopoffice
-				if gm_office[i] = 1 and gm_office_s[i] = cloc and ($clothingworntype ! 'gm_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 ! 'gm_office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_office', i)
 				i += 1
-			if i <= ARRSIZE('office'):jump 'loopoffice'
+			if i <= ARRSIZE('gm_office'):jump 'loopoffice'
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
 		end
 
-		if $ARGS[2] = 'school':
+		if $ARGS[2] = 'gm_school':
 			$ward_list_store = $ARGS[2]
 
-			if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_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 ! 'gm_school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'gm_school', 6)
 
 			i = 1
 			:loopschool
-				if gm_school[i] = 1 and gm_school_s[i] = cloc and ($clothingworntype ! 'gm_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 ! 'gm_school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_school', i)
 				i += 1
 				if i = 6: i = 7
-			if i <= ARRSIZE('school'):jump 'loopschool'
+			if i <= ARRSIZE('gm_school'):jump 'loopschool'
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
 		end
 
-		if $ARGS[2] = 'uniform':
+		if $ARGS[2] = 'gm_uniform':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopuniform
-				if gm_uniform[i] = 1 and gm_uniform_s[i] = cloc and ($clothingworntype ! 'gm_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 ! 'gm_uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_uniform', i)
 				i += 1
-			if i <= ARRSIZE('uniform'):jump 'loopuniform'
+			if i <= ARRSIZE('gm_uniform'):jump 'loopuniform'
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
@@ -550,7 +550,7 @@ if $ARGS[0] = 'view_clothing_item':
 		if CloInhibit + 10 > pcs_inhib and CloInhibit <= pcs_inhib: 'You find this outfit more revealing than you are completely comfortable with but that makes it quite exciting too.'
 	end
 
-	if $ARGS[2] = 'uniform':
+	if $ARGS[2] = 'gm_uniform':
 		if CloStyle2 = 1:
 			'This outfit is considered to be a maid uniform.'
 		elseif CloStyle2 = 3:
@@ -580,7 +580,7 @@ if $ARGS[0] = 'view_clothing_item':
 		end
 	end
 
-	if $ARGS[1] ! 'shop' and ($ARGS[2] ! 'school' or ARGS[3] ! 6):
+	if $ARGS[1] ! 'shop' and ($ARGS[2] ! 'gm_school' or ARGS[3] ! 6):
 		$RESULT = '(strength '
 		dynamic '$RESULT += <<$ARGS[2]>>_h[<<ARGS[3]>>]'
 		if $ARGS[2] ! 'exercise' and $ARGS[2] ! 'coat' and CloStyle ! 5:
@@ -617,7 +617,7 @@ if $ARGS[0] = 'view_clothing_item':
 						h += (3 * CloQuality)
 						money -= price
 						dynamic $ARGS[2] + '[<<ARGS[3]>>] = 1'
-						if $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'office':
+						if $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'gm_office':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 70 + <<h>>'
 						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>>'
@@ -625,7 +625,7 @@ if $ARGS[0] = 'view_clothing_item':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 15 + <<h>>'
 						elseif $ARGS[2] = 'fetish' or $ARGS[2] = 'exhibit' or $ARGS[2] = 'fancy_burlesque':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 35 + <<h>>'
-						elseif $ARGS[2] = 'school' or $ARGS[2] = 'uniform':
+						elseif $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_uniform':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 120 + <<h>>'
 						elseif $ARGS[2] = 'exercise':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 100 + <<h>>'
@@ -648,7 +648,7 @@ if $ARGS[0] = 'view_clothing_item':
 						h += (3 * CloQuality)
 						karta -= price
 						dynamic $ARGS[2] + '[<<ARGS[3]>>] = 1'
-						if $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'office':
+						if $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'gm_office':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 70 + <<h>>'
 						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>>'
@@ -656,7 +656,7 @@ if $ARGS[0] = 'view_clothing_item':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 15 + <<h>>'
 						elseif $ARGS[2] = 'fetish' or $ARGS[2] = 'exhibit' or $ARGS[2] = 'burlesque':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 35 + <<h>>'
-						elseif $ARGS[2] = 'school' or $ARGS[2] = 'uniform':
+						elseif $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_uniform':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 120 + <<h>>'
 						elseif $ARGS[2] = 'exercise':
 							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 100 + <<h>>'
@@ -676,7 +676,7 @@ if $ARGS[0] = 'view_clothing_item':
 	elseif $ARGS[1] = 'wardrobe':
 		act 'Return':gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 
-		if $ARGS[2] ! 'school' or ARGS[3] ! 6:
+		if $ARGS[2] ! 'gm_school' or ARGS[3] ! 6:
 			!! if the clothing is worn out
 			if dyneval('RESULT = <<$ARGS[2]>>_h[<<ARGS[3]>>]') <= 0:
 				'This item is worn and is not suitable for further wear.'