From 94ac9fe3303c4d604485a4784e8f5c99f5457863 Mon Sep 17 00:00:00 2001 From: Taylor Locke Date: Mon, 25 Nov 2013 06:03:06 -0800 Subject: Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179 Cleaned up Zeny manipulation in scripts. - It is now finally safe to re-commit. - Removed some unwanted parts of the original commit, that broke the character set in some scripts. [Haru] - Corrected spacing in some edited lines. [Haru] --- npc/custom/etc/stock_market.txt | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'npc/custom/etc/stock_market.txt') diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt index 7cd284ef9..060228317 100644 --- a/npc/custom/etc/stock_market.txt +++ b/npc/custom/etc/stock_market.txt @@ -278,14 +278,14 @@ S_Sell: input @sellamount; if (@sellamount < 1) goto S_SellInv; if (Zeny < $S_Trans) goto S_NoZeny; - set Zeny,Zeny-$S_Trans; + Zeny -= $S_Trans; SELLS1: if (@sellname$ != $S1N$) goto SELLS2; if (@sellamount > #S1) goto S_SellTooHigh; set @price,@sellamount*$S1; set #S1,#S1-@sellamount; - set Zeny,Zeny+@price; + Zeny += @price; next; mes "Sold " + @sellamount + " " + $S1N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -297,7 +297,7 @@ SELLS2: if (@sellamount > #S2) goto S_SellTooHigh; set @price,@sellamount*$S2; set #S2,#S2-@sellamount; - set Zeny,Zeny+@price; + Zeny += @price; next; mes "Sold " + @sellamount + " " + $S2N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -309,7 +309,7 @@ SELLS3: if (@sellamount > #S3) goto S_SellTooHigh; set @price,@sellamount*$S3; set #S3,#S3-@sellamount; - set Zeny,Zeny+@price; + Zeny += @price; next; mes "Sold " + @sellamount + " " + $S3N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -321,7 +321,7 @@ SELLS4: if (@sellamount > #S4) goto S_SellTooHigh; set @price,@sellamount*$S4; set #S4,#S4-@sellamount; - set Zeny,Zeny+@price; + Zeny += @price; next; mes "Sold " + @sellamount + " " + $S4N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -333,7 +333,7 @@ SELLS5: if (@sellamount > #S5) goto S_SellTooHigh; set @price,@sellamount*$S5; set #S5,#S5-@sellamount; - set Zeny,Zeny+@price; + Zeny += @price; next; mes "Sold " + @sellamount + " " + $S5N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -345,7 +345,7 @@ SELLS6: if (@sellamount > #S6) goto S_SellTooHigh; set @price,@sellamount*$S6; set #S6,#S6-@sellamount; - set Zeny,Zeny+@price; + Zeny += @price; next; mes "Sold " + @sellamount + " " + $S6N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -357,7 +357,7 @@ SELLS7: if (@sellamount > #S7) goto S_SellTooHigh; set @price,@sellamount*$S7; set #S7,#S7-@sellamount; - set Zeny,Zeny+@price; + Zeny += @price; next; mes "Sold " + @sellamount + " " + $S7N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -369,7 +369,7 @@ SELLS8: if (@sellamount > #S8) goto S_SellTooHigh; set @price,@sellamount*$S8; set #S8,#S8-@sellamount; - set Zeny,Zeny+@price; + Zeny += @price; next; mes "Sold " + @sellamount + " " + $S8N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -381,7 +381,7 @@ SELLS9: if (@sellamount > #S9) goto S_SellTooHigh; set @price,@sellamount*$S9; set #S9,#S9-@sellamount; - set Zeny,Zeny+@price; + Zeny += @price; next; mes "Sold " + @sellamount + " " + $S9N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -393,7 +393,7 @@ SELLS10: if (@sellamount > #S10) goto S_SellTooHigh; set @price,@sellamount*$S10; set #S10,#S10-@sellamount; - set Zeny,Zeny+@price; + Zeny += @price; next; mes "Sold " + @sellamount + " " + $S10N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -443,7 +443,7 @@ S_Buy: if (@buyamount < $S_BuyMin) goto S_TooLow; if (@buyamount > $S_BuyMax) goto S_TooHigh; if (Zeny < $S_Trans) goto S_NoZeny; - set Zeny,Zeny-$S_Trans; + Zeny -= $S_Trans; // Purchases the shares // @@ -453,7 +453,7 @@ PURS1: if (Zeny < @price) goto S_NoZeny; set #S1,#S1+@buyamount; set @price,@buyamount*$S1; - set Zeny,Zeny-@price; + Zeny -= @price; mes "Bought " + @buyamount + " " + $S1N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -464,7 +464,7 @@ PURS2: set @price,@buyamount*$S2; if (Zeny < @price) goto S_NoZeny; set #S2,#S2+@buyamount; - set Zeny,Zeny-@price; + Zeny -= @price; mes "Bought " + @buyamount + " " + $S2N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -475,7 +475,7 @@ PURS3: set @price,@buyamount*$S3; if (Zeny < @price) goto S_NoZeny; set #S3,#S3+@buyamount; - set Zeny,Zeny-@price; + Zeny -= @price; mes "Bought " + @buyamount + " " + $S3N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -486,7 +486,7 @@ PURS4: set @price,@buyamount*$S4; if (Zeny < @price) goto S_NoZeny; set #S4,#S4+@buyamount; - set Zeny,Zeny-@price; + Zeny -= @price; mes "Bought " + @buyamount + " " + $S4N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -497,7 +497,7 @@ PURS5: set @price,@buyamount*$S5; if (Zeny < @price) goto S_NoZeny; set #S5,#S5+@buyamount; - set Zeny,Zeny-@price; + Zeny -= @price; mes "Bought " + @buyamount + " " + $S5N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -508,7 +508,7 @@ PURS6: set @price,@buyamount*$S6; if (Zeny < @price) goto S_NoZeny; set #S6,#S6+@buyamount; - set Zeny,Zeny-@price; + Zeny -= @price; mes "Bought " + @buyamount + " " + $S6N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -519,7 +519,7 @@ PURS7: set @price,@buyamount*$S7; if (Zeny < @price) goto S_NoZeny; set #S7,#S7+@buyamount; - set Zeny,Zeny-@price; + Zeny -= @price; mes "Bought " + @buyamount + " " + $S7N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -530,7 +530,7 @@ PURS8: set @price,@buyamount*$S8; if (Zeny < @price) goto S_NoZeny; set #S8,#S8+@buyamount; - set Zeny,Zeny-@price; + Zeny -= @price; mes "Bought " + @buyamount + " " + $S8N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -541,7 +541,7 @@ PURS9: set @price,@buyamount*$S9; if (Zeny < @price) goto S_NoZeny; set #S9,#S9+@buyamount; - set Zeny,Zeny-@price; + Zeny -= @price; mes "Bought " + @buyamount + " " + $S9N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -552,7 +552,7 @@ PURS10: set @price,@buyamount*$S10; if (Zeny < @price) goto S_NoZeny; set #S10,#S10+@buyamount; - set Zeny,Zeny-@price; + Zeny -= @price; mes "Bought " + @buyamount + " " + $S10N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; -- cgit v1.2.3-70-g09d2