Преглед изворни кода

[changed] apparel type files now use *Type*Price variable added by anjuna

f95Lok пре 2 недеља
родитељ
комит
12ed5ee4cc

+ 3 - 4
locations/bras.qsrc

@@ -208,7 +208,6 @@ if $ARGS[0] = 'view_bra_item':
 	!! ARGS 1 = action type (wardrobe, bathroom, shop)
 	!! ARGS 2 - bra type
 	!! ARGS 3 - bra index
-	!! ARGS 4 - price for shop
 
 	cla
 	'<center><img src="<<FUNC(''$bra_image'',  $ARGS[2], ARGS[3])>>"></center>'
@@ -225,8 +224,8 @@ if $ARGS[0] = 'view_bra_item':
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = ARGS[4]
-			'Price: <<ARGS[4]>> <b>₽</b>'
+			price = BraPrice
+			'Price: <<BraPrice>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			if money >= price:
 				act 'Buy (cash)':
@@ -253,7 +252,7 @@ if $ARGS[0] = 'view_bra_item':
 					'You own the matching panties buying this bra will complete the set.'
 				else
 					'You do not own the matching panties, you can buy this bra and them as a set.'
-					price_set = ARGS[4]*18/10
+					price_set = BraPrice*18/10
 					'Price for set: <<price_set>> <b>₽</b>'
 					if money >= price_set:
 						act 'Buy set (cash)':

+ 12 - 13
locations/clothing.qsrc

@@ -1470,8 +1470,7 @@ if $ARGS[0] = 'view_clothing_item':
 	!! ARGS 0 - view_clothing_item
 	!! ARGS 1 - clothing type
 	!! ARGS 2 - clothing index
-	!! ARGS 3 - price for shop
-	!! ARGS 4 = action type (wardrobe, shop, sell, resize)
+	!! ARGS 3 = action type (wardrobe, shop, sell, resize)
 
 	$swimwear_description = ''
 
@@ -1521,7 +1520,7 @@ if $ARGS[0] = 'view_clothing_item':
 		'This is sport clothing.'
 	end
 
-	if $ARGS[4] ! 'shop' and ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6):
+	if $ARGS[3] ! 'shop' and ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6):
 		$RESULT = '(strength '
 		dynamic '$RESULT += <<$ARGS[1]>>_h[<<ARGS[2]>>]'
 		if $ARGS[1] ! 'danilovich_outfits' and $ARGS[1] ! 'coat' and CloStyle ! 5:
@@ -1532,15 +1531,15 @@ if $ARGS[0] = 'view_clothing_item':
 		'<<$RESULT>>'
 	end
 
-	if $ARGS[4] = 'shop':
+	if $ARGS[3] = 'shop':
 		if dyneval('RESULT = <<$ARGS[1]>>[<<ARGS[2]>>]') = 1:
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
 		else
 			if $ARGS[1] = 'coat' and ARGS[2] = 5:
-				price = ARGS[3]
+				price = CloPrice
 			else
-				price = (ARGS[3] * ((5 * CloQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[2]]) * 3 / 2
+				price = (CloPrice * ((5 * CloQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[2]]) * 3 / 2
 				price = price / 50 * 50
 			end
 			'Price: <<price>> <b>₽</b>'
@@ -1557,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[4], $ARGS[1], ARGS[2], ARGS[3]
+						gs 'clothing', 'view_clothing_item_buy', $ARGS[3], $ARGS[1], ARGS[2]
 					end
 				end
 				if karta >= Price:
@@ -1567,12 +1566,12 @@ if $ARGS[0] = 'view_clothing_item':
 						if CloStyle = 5:h = 20
 						h += (3 * CloQuality)
 						karta -= price
-						gs 'clothing', 'view_clothing_item_buy', $ARGS[4], $ARGS[1], ARGS[2], ARGS[3]
+						gs 'clothing', 'view_clothing_item_buy', $ARGS[3], $ARGS[1], ARGS[2]
 					end
 				end
 			end
 		end
-	elseif $ARGS[4] = 'wardrobe':
+	elseif $ARGS[3] = 'wardrobe':
 		act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 
 		if $ARGS[1] ! 'gm_school' or ARGS[2] ! 6:
@@ -1667,7 +1666,7 @@ if $ARGS[0] = 'view_clothing_item':
 				end
 			end
 		end
-	elseif $ARGS[4] = 'store' or $ARGS[4] = 'unwanted':
+	elseif $ARGS[3] = 'store' or $ARGS[3] = 'unwanted':
 		act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 
 		if $ARGS[1] ! 'coat':
@@ -1677,8 +1676,8 @@ if $ARGS[0] = 'view_clothing_item':
 			end
 		end
 
-	elseif $ARGS[4] = 'sell':
-		$ward_list_page = $ARGS[4]
+	elseif $ARGS[3] = 'sell':
+		$ward_list_page = $ARGS[3]
 		act 'Keep item':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 
 		!! value is based on the strength remaining
@@ -1711,7 +1710,7 @@ if $ARGS[0] = 'view_clothing_item':
 				gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 			end
 		end
-	elseif $ARGS[4] = 'resize':
+	elseif $ARGS[3] = '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:

+ 3 - 3
locations/coats.qsrc

@@ -144,7 +144,7 @@ if $ARGS[0] = 'view_coat_item':
 	!! ARGS 1 = action type (draw, shop)
 	!! ARGS 2 - coat type
 	!! ARGS 3 - coat index
-	!! ARGS 4 - price for shop
+
 	cla
 	'<center><img src="<<FUNC(''$coat_image'',  $ARGS[2], ARGS[3])>>"></center>'
 	gs 'coat_attributes', $ARGS[2], ARGS[3]
@@ -156,8 +156,8 @@ if $ARGS[0] = 'view_coat_item':
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = ARGS[4]
-			'Price: <<ARGS[4]>> <b>₽</b>'
+			price = CoatPrice
+			'Price: <<CoatPrice>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			if money >= price:
 				act 'Buy (cash)':

+ 4 - 4
locations/panties.qsrc

@@ -209,7 +209,7 @@ if $ARGS[0] = 'view_panty_item':
 	!! ARGS 1 = action type (draw, shop)
 	!! ARGS 2 - panty type
 	!! ARGS 3 - panty index
-	!! ARGS 4 - price for shop
+	
 	cla
 	'<center><img src="<<FUNC(''$panty_image'',  $ARGS[2], ARGS[3])>>"></center>'
 	gs 'underwear_attributes', $ARGS[2]+'_panties', ARGS[3]
@@ -225,8 +225,8 @@ if $ARGS[0] = 'view_panty_item':
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = ARGS[4]
-			'Price: <<ARGS[4]>> <b>₽</b>'
+			price = PanPrice
+			'Price: <<PanPrice>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			if money >= price:
 				act 'Buy (cash)':
@@ -253,7 +253,7 @@ if $ARGS[0] = 'view_panty_item':
 					'You own the matching bra buying these panties will complete the set.'
 				else
 					'You do not own the matching bra, you can buy it and these panties together as a set.'
-					price_set = ARGS[4]*18/10
+					price_set = PanPrice*18/10
 					'Price for set: <<price_set>> <b>₽</b>'
 					if money >= price_set:
 						act 'Buy set (cash)':

+ 2 - 3
locations/purses.qsrc

@@ -149,7 +149,6 @@ if $ARGS[0] = 'view_purse_item':
 	!! ARGS 1 = action type (home, shop)
 	!! ARGS 2 - purse type
 	!! ARGS 3 - purse index
-	!! ARGS 4 - price for shop
 
 	cla
 	'<center><img src="<<FUNC(''$purse_image'',  $ARGS[2], ARGS[3])>>"></center>'
@@ -161,8 +160,8 @@ if $ARGS[0] = 'view_purse_item':
 			'You already own this purse.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = ARGS[4]
-			'Price: <<ARGS[4]>> <b>₽</b>'
+			price = PursePrice
+			'Price: <<PursePrice>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			if money >= price:
 				act 'Buy (cash)':

+ 1 - 2
locations/shoes.qsrc

@@ -305,7 +305,6 @@ if $ARGS[0] = 'view_shoe_item':
 	!! ARGS 1 = action type (wardrobe, shop, sell)
 	!! ARGS 2 - shoes type
 	!! ARGS 3 - shoes index
-	!! ARGS 4 - price for shop
 
 	cla
 	'<center><img src="<<FUNC(''$shoe_image'', $ARGS[2], ARGS[3])>>"></center>'
@@ -326,7 +325,7 @@ if $ARGS[0] = 'view_shoe_item':
 			'You already own these shoes.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = (ARGS[4] * ((5 * ShoQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[3]]) * 3 / 2
+			price = (ShoPrice * ((5 * ShoQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[3]]) * 3 / 2
 			price = price / 50 * 50
 			'Price: <<price>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg

+ 3 - 3
locations/underwear_bodysuits.qsrc

@@ -166,7 +166,7 @@ if $ARGS[0] = 'view_bodysuit_item':
 	!! ARGS 1 = action type (draw, shop)
 	!! ARGS 2 - bodysuit type
 	!! ARGS 3 - bodysuit index
-	!! ARGS 4 - price for shop
+	
 	cla
 	'<center><img src="<<FUNC(''$pcs_outfit_image'', $ARGS[2]+''_bodysuits'', ARGS[3])>>"></center>'
 	gs 'underwear_attributes', $ARGS[2]+'_bodysuits', ARGS[3]
@@ -177,8 +177,8 @@ if $ARGS[0] = 'view_bodysuit_item':
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			price = ARGS[4]
-			'Price: <<ARGS[4]>> <b>₽</b>'
+			price = PanPrice
+			'Price: <<PanPrice>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			if money >= price:
 				act 'Buy (cash)':