[changed] arguments order for view_clothing_item to be in line with all other view_type_item functions

locations/clothing.qsrc

@@ -102,7 +102,7 @@ $clothing_list_line = {
 	else
 		clothing_temp = 100 & !clothing widdefault to 100
 	end
-	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[1]>>'', <<ARGS[2]>>, ''<<$ARGS[0]>>''"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"></a></TD>'
+	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"></a></TD>'
 	killvar 'clothing_temp'
 	$swimwear_description = ''
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
@@ -1468,27 +1468,27 @@ end
 
 if $ARGS[0] = 'view_clothing_item':
 	!! ARGS 0 - view_clothing_item
-	!! ARGS 1 - clothing type
-	!! ARGS 2 - clothing index
-	!! ARGS 3 = action type (wardrobe, shop, sell, resize)
+	!! ARGS 1 - action type (wardrobe, shop, sell, resize)
+	!! ARGS 2 - clothing type
+	!! ARGS 3 - clothing index
 
 	$swimwear_description = ''
 
 	cla
-	'<center><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>"></center>'
-	gs 'clothing_attributes', $ARGS[1], ARGS[2]
+	'<center><img src="<<FUNC(''$clothing_image'', $ARGS[2], ARGS[3])>>"></center>'
+	gs 'clothing_attributes', $ARGS[2], ARGS[3]
 
-	$RESULT = FUNC('$short_description', $ARGS[1], CloStyle2)
-	$RESULT += '<<ARGS[2]>>'
+	$RESULT = FUNC('$short_description', $ARGS[2], CloStyle2)
+	$RESULT += '<<ARGS[3]>>'
 	'<<$RESULT>>'
-	if $ARGS[1] = 'misc_outfits' and ARGS[2] = 1:
+	if $ARGS[2] = 'misc_outfits' and ARGS[3] = 1:
 		'A hessian sack the hunters gave you.'
 	elseif $swimwear_description = '':
 		gs 'clothing_descriptions'
 		'<<$description>>'
-		if hypnoClothes > 0 and (CloThinness >= 6 or $ARGS[1] = 'salacious_outfits' or $ARGS[1] = 'salacious_dress' _
-		or (($ARGS[1] = 'eroto_outfits' or $ARGS[1] = 'eroto_dress' or $ARGS[1] = 'eroto_strip') and CloThinness >= 3) _
-		or ($ARGS[1] = 'danilovich_outfits' and CloThinness >= 5)):
+		if hypnoClothes > 0 and (CloThinness >= 6 or $ARGS[2] = 'salacious_outfits' or $ARGS[2] = 'salacious_dress' _
+		or (($ARGS[2] = 'eroto_outfits' or $ARGS[2] = 'eroto_dress' or $ARGS[2] = 'eroto_strip') and CloThinness >= 3) _
+		or ($ARGS[2] = 'danilovich_outfits' and CloThinness >= 5)):
 			nl & '<I>You have a strange feeling about this outfit. You <b>really</b> want to wear it.</i>'
 		end
 	else
@@ -1520,26 +1520,26 @@ if $ARGS[0] = 'view_clothing_item':
 		'This is sport clothing.'
 	end
 
-	if $ARGS[3] ! 'shop' and ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6):
+	if $ARGS[1] ! 'shop' and ($ARGS[2] ! 'gm_school' or ARGS[3] ! 6):
 		$RESULT = '(strength '
-		dynamic '$RESULT += <<$ARGS[1]>>_h[<<ARGS[2]>>]'
-		if $ARGS[1] ! 'danilovich_outfits' and $ARGS[1] ! 'coat' and CloStyle ! 5:
+		dynamic '$RESULT += <<$ARGS[2]>>_h[<<ARGS[3]>>]'
+		if $ARGS[2] ! 'danilovich_outfits' and $ARGS[2] ! 'coat' and CloStyle ! 5:
 			$RESULT += ', hip size '
-			dynamic '$RESULT += <<$ARGS[1]>>_b[<<ARGS[2]>>]'
+			dynamic '$RESULT += <<$ARGS[2]>>_b[<<ARGS[3]>>]'
 		end
 		$RESULT += ')'
 		'<<$RESULT>>'
 	end
 
-	if $ARGS[3] = 'shop':
-		if dyneval('RESULT = <<$ARGS[1]>>[<<ARGS[2]>>]') = 1:
+	if $ARGS[1] = 'shop':
+		if dyneval('RESULT = <<$ARGS[2]>>[<<ARGS[3]>>]') = 1:
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			if $ARGS[1] = 'coat' and ARGS[2] = 5:
+			if $ARGS[2] = 'coat' and ARGS[3] = 5:
 				price = CloPrice
 			else
-				price = (CloPrice * ((5 * CloQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[2]]) * 3 / 2
+				price = (CloPrice * ((5 * CloQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[3]]) * 3 / 2
 				price = price / 50 * 50
 			end
 			'Price: <<price>> <b>₽</b>'
@@ -1556,7 +1556,7 @@ if $ARGS[0] = 'view_clothing_item':
 						if CloStyle = 5:h = 20
 						h += (3 * CloQuality)
 						money -= price
-						gs 'clothing', 'view_clothing_item_buy', $ARGS[3], $ARGS[1], ARGS[2]
+						gs 'clothing', 'view_clothing_item_buy', $ARGS[1], $ARGS[2], ARGS[3]
 					end
 				end
 				if karta >= Price:
@@ -1566,17 +1566,17 @@ if $ARGS[0] = 'view_clothing_item':
 						if CloStyle = 5:h = 20
 						h += (3 * CloQuality)
 						karta -= price
-						gs 'clothing', 'view_clothing_item_buy', $ARGS[3], $ARGS[1], ARGS[2]
+						gs 'clothing', 'view_clothing_item_buy', $ARGS[1], $ARGS[2], ARGS[3]
 					end
 				end
 			end
 		end
-	elseif $ARGS[3] = 'wardrobe':
+	elseif $ARGS[1] = 'wardrobe':
 		act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 
-		if $ARGS[1] ! 'gm_school' or ARGS[2] ! 6:
+		if $ARGS[2] ! 'gm_school' or ARGS[3] ! 6:
 			!! if the clothing is worn out
-			if dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') <= 0:
+			if dyneval('RESULT = <<$ARGS[2]>>_h[<<ARGS[3]>>]') <= 0:
 				'This item is worn and is not suitable for further wear.'
 				if pcs_sewng >= 60 and mc_inventory['sewing_fabric'] > 0:
 					cla
@@ -1587,7 +1587,7 @@ if $ARGS[0] = 'view_clothing_item':
 							cla
 							mc_inventory['sewing_fabric'] -= 1
 							minut += 30
-							dynamic $ARGS[1] + '_h[<<ARGS[2]>>] += 30'
+							dynamic $ARGS[2] + '_h[<<ARGS[3]>>] += 30'
 							'<center><img <<$set_imgh>> src="images/pc/activities/sewing/fix' + rand(1,2) + '.jpg"></center>'
 							'You spend 30 minutes fixing the outfit.'
 							act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
@@ -1596,7 +1596,7 @@ if $ARGS[0] = 'view_clothing_item':
 							cla
 							mc_inventory['sewing_fabric'] += 3
 							minut += 30
-							dynamic $ARGS[1] + '[<<ARGS[2]>>] = 0'
+							dynamic $ARGS[2] + '[<<ARGS[3]>>] = 0'
 							'<center><img <<$set_imgh>> src="images/pc/activities/sewing/fix' + rand(1,2) + '.jpg"></center>'
 							'Despite your skill with a needle, this outfit has proved beyond repair. All that is left of it is only good for your cloth pile.'
 							act 'Return': gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
@@ -1609,9 +1609,9 @@ if $ARGS[0] = 'view_clothing_item':
 			end
 
 			!! if the clothing is a type that checks for hip size
-			if $ARGS[1] ! 'danilovich_outfits' and CloStyle ! 5:
+			if $ARGS[2] ! 'danilovich_outfits' and CloStyle ! 5:
 				!! if the hipsize is too far from your hipsize
-				dynamic 'RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]'
+				dynamic 'RESULT = <<$ARGS[2]>>_b[<<ARGS[3]>>]'
 				if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
 					if RESULT < pcs_hips:
 						'This item is too small for you to wear.'
@@ -1626,7 +1626,7 @@ if $ARGS[0] = 'view_clothing_item':
 							cla
 							mc_inventory['sewing_fabric'] -= 1
 							minut += 30
-							dynamic $ARGS[1] + '_b[<<ARGS[2]>>] = pcs_hips'
+							dynamic $ARGS[2] + '_b[<<ARGS[3]>>] = pcs_hips'
 							'You spend 30 minutes resizing the outfit.'
 							act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 						end
@@ -1637,7 +1637,7 @@ if $ARGS[0] = 'view_clothing_item':
 							act 'Resize item':
 								minut += 15
 								money -= 500
-								dynamic $ARGS[1] + '_b[<<ARGS[2]>>] = pcs_hips'
+								dynamic $ARGS[2] + '_b[<<ARGS[3]>>] = pcs_hips'
 								*nl
 								'You hand the clothing over to the tailor who takes it into the back. Fifteen minutes later, he presents your clothing back to you, adjusted to fit you perfectly.'
 								act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
@@ -1652,73 +1652,73 @@ if $ARGS[0] = 'view_clothing_item':
 			end
 		end
 
-		if $ARGS[1] ! 'danilovich_swimsuit' and $ARGS[1] ! 'scandalicious_bikinis' and $ARGS[1] ! 'scandalicious_swimsuit' and $ARGS[1] ! 'allure_bikinis' and $ARGS[1] ! 'allure_bikinis':
+		if $ARGS[2] ! 'danilovich_swimsuit' and $ARGS[2] ! 'scandalicious_bikinis' and $ARGS[2] ! 'scandalicious_swimsuit' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'allure_bikinis':
 
 			if CloInhibit > pcs_inhib:
 				'You don''t feel daring enough to wear an outfit this revealing.'
-			elseif ARRPOS('$CloLosTyp', $ARGS[1]) ! -1 and ARRPOS('CloLosNum',ARGS[2]) ! -1 :
+			elseif ARRPOS('$CloLosTyp', $ARGS[2]) ! -1 and ARRPOS('CloLosNum',ARGS[3]) ! -1 :
 				'You lost these clothes somewhere, maybe you can find them again?.'
 			else
 				act 'Wear':
-					gs 'clothing', 'wear', $ARGS[1], ARGS[2]
+					gs 'clothing', 'wear', $ARGS[2], ARGS[3]
 
 					gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 				end
 			end
 		end
-	elseif $ARGS[3] = 'store' or $ARGS[3] = 'unwanted':
+	elseif $ARGS[1] = 'store' or $ARGS[1] = 'unwanted':
 		act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 
-		if $ARGS[1] ! 'coat':
+		if $ARGS[2] ! 'coat':
 			act 'Move back to wardrobe':
-				dynamic $ARGS[1] + '_s[<<ARGS[2]>>] = 0'
+				dynamic $ARGS[2] + '_s[<<ARGS[3]>>] = 0'
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		end
 
-	elseif $ARGS[3] = 'sell':
-		$ward_list_page = $ARGS[3]
+	elseif $ARGS[1] = 'sell':
+		$ward_list_page = $ARGS[1]
 		act 'Keep item':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 
 		!! value is based on the strength remaining
-		dynamic 'RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]'
+		dynamic 'RESULT = <<$ARGS[2]>>_h[<<ARGS[3]>>]'
 		if RESULT > 45:
 			'You can sell this item for 500 <b>₽</b>.'
 			act 'Sell':
-				dynamic '<<$ARGS[1]>>[<<ARGS[2]>>] = 0'
+				dynamic '<<$ARGS[2]>>[<<ARGS[3]>>] = 0'
 				money += 500
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		elseif RESULT > 30:
 			'You can sell this item for 300 <b>₽</b>.'
 			act 'Sell':
-				dynamic '<<$ARGS[1]>>[<<ARGS[2]>>] = 0'
+				dynamic '<<$ARGS[2]>>[<<ARGS[3]>>] = 0'
 				money += 300
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		elseif RESULT > 0:
 			'You can sell this item for 100 <b>₽</b>.'
 			act 'Sell':
-				dynamic '<<$ARGS[1]>>[<<ARGS[2]>>] = 0'
+				dynamic '<<$ARGS[2]>>[<<ARGS[3]>>] = 0'
 				money += 100
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		else
 			'This item is too worn to have any sale value.'
 			act 'Throw it away':
-				dynamic '<<$ARGS[1]>>[<<ARGS[2]>>] = 0'
+				dynamic '<<$ARGS[2]>>[<<ARGS[3]>>] = 0'
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		end
-	elseif $ARGS[3] = 'resize':
+	elseif $ARGS[1] = 'resize':
 		act 'Leave item alone':gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 
-		if $ARGS[1] ! 'danilovich_outfits' and $ARGS[1] ! 'coat' and CloStyle ! 5:
-			if dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') ! pcs_hips and money >= 500:
+		if $ARGS[2] ! 'danilovich_outfits' and $ARGS[2] ! 'coat' and CloStyle ! 5:
+			if dyneval('RESULT = <<$ARGS[2]>>_b[<<ARGS[3]>>]') ! pcs_hips and money >= 500:
 				'You can have this resized for 500 <b>₽</b>.'
 				act 'Resize':
 					money -= 500
-					dynamic '<<$ARGS[1]>>_b[<<ARGS[2]>>] = pcs_hips'
+					dynamic '<<$ARGS[2]>>_b[<<ARGS[3]>>] = pcs_hips'
 					gt 'clothing', 'view_clothing_list', 'resize'
 				end
 			end

locations/gad_market.qsrc

@@ -238,8 +238,8 @@ if $ARGS[0] = 'swimsuit_cart':
 	end
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis', i, 'shop'
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swimsuit', i, 'shop'
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_bikinis', i
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_swimsuit', i
 
 
 

locations/shop_utils.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'shop':
 
 			if (clothingfilter['quality'] = 0 and CloQuality = shop_display['clo_i']) or (clothingfilter['inhibition'] = 0 and CloInhibit = shop_display['clo_i']) or clothingfilter['number'] = 0:
 				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
-					$result = '<a href="exec: gt ''clothing'', ''view_clothing_item'', ''<<$shop_display[''variable'']>>'', <<shop_display[''i'']>>, ''shop''"><img height="250" src="<<$shop_display[''item_img_path'']>>/<<shop_display[''i'']>>.jpg"></a>'
+					$result = '<a href="exec: gt ''clothing'', ''view_clothing_item'', ''shop'', ''<<$shop_display[''variable'']>>'', <<shop_display[''i'']>>"><img height="250" src="<<$shop_display[''item_img_path'']>>/<<shop_display[''i'']>>.jpg"></a>'
 				end
 			end
 		end