Merge branch 'master' of https://github.com/HerculesWS/Hercules

10 files changed, 51 insertions, 51 deletions

diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt
index 7b569a3d5..51e3e7e74 100644
--- a/npc/custom/etc/bank.txt
+++ b/npc/custom/etc/bank.txt
@@ -42,8 +42,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
 			close;
 		}
 		else {
-		Zeny -= @deposit;
-		Zeny -= @cost;
+		set Zeny,Zeny - @deposit;
+		set Zeny,Zeny - @cost;
 		set #bankstorage,#bankstorage + @deposit;
 		mes "[Banker]";
 		mes "Thank you very much... Your zeny is in good hands.";
@@ -80,8 +80,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
 				set #bankstorage,#bankstorage - @cost;
 				set @cost,0;
 				next;
-				Zeny -= @cost;
-				Zeny += @withdrawl;
+				set Zeny,Zeny - @cost;
+				set Zeny,Zeny + @withdrawl;
 				set #bankstorage,#bankstorage - @withdrawl;
 				mes "[Banker]";
 				mes "There's your Zeny. Have a good day.";
@@ -93,8 +93,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's
 			}
 		}
 		else {
-			Zeny -= @cost;
-			Zeny += @withdrawl;
+			set Zeny,Zeny - @cost;
+			set Zeny,Zeny + @withdrawl;
 			set #bankstorage,#bankstorage - @withdrawl;
 			mes "[Banker]";
 			mes "There's your Zeny. Have a good day.";
diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt
index 396d45de2..48086abbd 100644
--- a/npc/custom/etc/bank_kafra.txt
+++ b/npc/custom/etc/bank_kafra.txt
@@ -48,7 +48,7 @@ L_NoIncomeToday:
 
 	if(@kafrabank<1000) goto L_LESS_1000;
 	if(@kafrabank>Zeny) goto L_NOT_ENOUGH;
-	Zeny -=@kafrabank;
+	set Zeny,Zeny-@kafrabank;
 	set #kafrabank,#kafrabank+@kafrabank;
 	mes"[Maniss]";
 	mes "You've made a deposit of ^135445" + @kafrabank + "z^000000.";
@@ -67,7 +67,7 @@ M_WITHDRAW:
 	if(@kafrabank<1) goto B_EXIT2;
 	if(@kafrabank>#kafrabank) goto L_NOT_ENOUGH;
 	set #kafrabank,#kafrabank-@kafrabank;
-	Zeny +=@kafrabank;
+	set Zeny,Zeny+@kafrabank;
 	mes"[Maniss]";
 	mes "Here is your ^135445" + @kafrabank + "z^000000, put your sign here...";
 	//we log these zeny operations into the log db
diff --git a/npc/custom/etc/blackjack.txt b/npc/custom/etc/blackjack.txt
index b86316706..8fe70ad72 100644
--- a/npc/custom/etc/blackjack.txt
+++ b/npc/custom/etc/blackjack.txt
@@ -233,12 +233,12 @@ sL_Win:
 	mes "[Dealer]";
 	mes "Congratulations, you've won!";
 	next;
-	Zeny += @bet;
+	set Zeny, Zeny + @bet;
 	goto L_Play;
 sL_Lose:
 	mes "[Dealer]";
 	mes "I'm sorry but you've lost.";
-	Zeny -= @bet;
+	set Zeny, Zeny - @bet;
 	next;
 	goto L_Play;
 sL_Push:
diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt
index 4ad9ec0d2..26c4afa9f 100644
--- a/npc/custom/etc/lottery.txt
+++ b/npc/custom/etc/lottery.txt
@@ -107,7 +107,7 @@ L_Buy:
 	next;
 	menu "Buy Ticket",-,"Cancel",L_Cancel;
 	if (Zeny < $L_TicketPrice) goto L_NoZeny;
-	Zeny -=$L_TicketPrice;
+	set Zeny,Zeny-$L_TicketPrice;
 	mes "[Lottery]";
 	mes "Would you like your numbers hand picked or computer generated?";
 	next;
@@ -292,7 +292,7 @@ LWinBig:
 	mes "You have matched all six numbers!";
 	mes "Jackpot!";
 	mes "You've won ^0000FF" + $L_Prize_Money + "z^000000.";
-	Zeny +=$L_Prize_Money;
+	set Zeny,Zeny+$L_Prize_Money;
 	announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8;
 	set #LID,0;
 	close;
@@ -302,7 +302,7 @@ LWinSmall:
 	mes "[Lottery]";
 	mes "You have matched at least 4 numbers!";
 	mes "You've won ^0000FF" + $L_Prize_Money_Small + "z^000000.";
-	Zeny +=$L_Prize_Money_Small;
+	set Zeny,Zeny+$L_Prize_Money_Small;
 	announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8;
 	set #LID,0;
 	close;
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 97b6ca8de..f0ec34f0a 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -716,7 +716,7 @@ function SF_TryRegister {
 		mes "Come back once you have collected "+@cost+"z."; 
 		close;
 	}
-	Zeny -=@cost;
+	set Zeny,Zeny-@cost;
 	sc_start SC_WEDDING,3600000,1; //Start Wedding Effect (SC_WEDDING)
 	if (@bride) {
 		set $wed_bride_progress,1;
@@ -911,7 +911,7 @@ function SF_InProgress {
 		emotion e_swt2;
 		close;
 	}
-	Zeny -=$@wed_divorce_fee;
+	set Zeny,Zeny-$@wed_divorce_fee;
 	announce $@divorcer$+" has just divorced "+strcharinfo(0)+"...", 8;
 	mes "["+@name$+"]";
 	mes "Your divorce has been filed. You are no longer wed.";
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 81ac93eab..90fd500f6 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -289,7 +289,7 @@ gon_test,52,103,6	script	Monster Trainer	4_M_BARBER,{
 	menu "Yes",-,"No",L_Exit;
 
 	if (Zeny < 1000) goto L_NoZeny;
-	Zeny -=1000;
+	set Zeny,Zeny-1000;
 	set #monster,10;
 	mes "[Monster Trainer]";
 	mes "Congratulations!";
@@ -327,7 +327,7 @@ L_Sell:
 	if (@sellexp > #monpoints) goto L_NoExp;
 	set #monpoints,#monpoints-@sellexp;
 	set @sellearn,100*@sellexp; // Price of exp
-	Zeny +=@sellearn;
+	set Zeny,Zeny+@sellearn;
 	mes "[Monster Trainer]";
 	mes "You earned ^0000FF" + @sellearn + "^000000z.";
 	close;
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt
index d64cd63d2..d86c9dc94 100644
--- a/npc/custom/etc/penal_servitude.txt
+++ b/npc/custom/etc/penal_servitude.txt
@@ -43,7 +43,7 @@ M_PAY:
 
 M_PAYCASH:
 	if (@MUSTPAY>Zeny) goto L_NOCASH;
-	Zeny -=@MUSTPAY;
+	set Zeny,Zeny-@MUSTPAY;
 	mes "[Saddeus]";
 	mes "OK, sing here and there.";
 	goto L_RELEASE;
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index c1b63ebed..62ea56c93 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -323,11 +323,11 @@ L_town:
 	if (@Tmenuref[@TWMenu-1] == 57005) goto L_End; // 57005='dead' in hex
 
 	if(Zeny<@pTprice[@Tmenuref[@TWMenu-1]]) callsub L_Short_on_zeny,0;
-	Zeny -=@pTprice[@Tmenuref[@TWMenu-1]];
+	set Zeny, Zeny-@pTprice[@Tmenuref[@TWMenu-1]];
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@pTprice[@Tmenuref[@TWMenu-1]]/16);
 	warp @pTmap$[@Tmenuref[@TWMenu-1]],@pTXcoords[@Tmenuref[@TWMenu-1]],@pTYcoords[@Tmenuref[@TWMenu-1]];
 	close2;
-	Zeny +=@pTprice[@Tmenuref[@TWMenu-1]];
+	set Zeny, Zeny+@pTprice[@Tmenuref[@TWMenu-1]];
 	end;
 
 //=========================Dungeons================================
@@ -361,11 +361,11 @@ L_dungeon:
 	set @warpprice, @pDprice[@Dmenuref[@DWMenu-1]]+(getd(@pDfee$[@Dmenuref[@DWMenu-1]])*(@DDepth[@Darrayref]));
 
 	if(Zeny<@warpprice) callsub L_Short_on_zeny,1;
-	Zeny -=(@warpprice);
+	set Zeny, Zeny-(@warpprice);
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@warpprice/16);
 	warp @DGat$[@Darrayref],@DXcoords[@Darrayref],@DYcoords[@Darrayref];
 	close2;
-	Zeny +=@pTprice[@Tmenuref[@DWMenu-1]];
+	set Zeny, Zeny+@pTprice[@Tmenuref[@DWMenu-1]];
 	end;
 
 //=============================Healing=============================
@@ -373,7 +373,7 @@ L_dungeon:
 L_heal_Full:
 	set @healfee, $QW_HF_PRICE;
 	if(Zeny<@healfee) callsub L_Short_on_zeny,4;
-	Zeny -=@healfee;
+	set Zeny, Zeny-@healfee;
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@healfee/500);
 	next;
 	mes "[Warpra]";
@@ -408,7 +408,7 @@ PHeal:
 	if (getarg(0) == 1)&&(getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_Short_Both;
 	if (getarg(0) == 1)&&(Zeny<@healfee) goto Zeny_short_HP;
 	if (getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_short_SP;
-	Zeny -=@healfee;
+	set Zeny, Zeny-@healfee;
 	if (getarg(0) == 1)&&(getarg(1) == 1) percentheal 100,100;
 	if (getarg(0) == 1) percentheal 100,0;
 	if (getarg(1) == 1) percentheal 0,100;
@@ -430,7 +430,7 @@ Zeny_short_HP:
 	set @HpPrice, @Hp*$QW_HP_H_PRICE;
 	if (@Hp == 1) mes "You're not worth the effort.";
 	if (@Hp == 1) goto L_End;
-	Zeny -=@HpPrice;
+	set Zeny, Zeny-@HpPrice;
 	heal @Hp,0;
 	close;
 	end;
@@ -443,7 +443,7 @@ Zeny_short_SP:
 	set @SpPrice, @Sp*$QW_HP_S_PRICE;
 	if (@Sp == 1) mes "You're not worth the effort.";
 	if (@Sp == 1) goto L_End;
-	Zeny -=@SpPrice;
+	set Zeny, Zeny-@SpPrice;
 	heal 0,@Sp;
 	close;
 	end;
@@ -457,7 +457,7 @@ L_Storage:
 	if ($QW_S_PRICE == 60)&&(BaseJob == Job_Novice) set @fee, 30;
 	if ($QW_S_PRICE == 60)&&(BaseJob != Job_Novice) set @fee, 60;
 	if(Zeny<@fee) callsub L_Short_on_zeny,2;
-	Zeny -=@fee;
+	set Zeny, Zeny-@fee;
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@fee/5);
 
 	mes "[Warpra]";
@@ -491,7 +491,7 @@ L_GStorage:
 		end;
 	}
 	if (Zeny<$QW_GS_PRICE) callsub L_Short_on_zeny,3;
-	Zeny -=$QW_GS_PRICE;
+	set Zeny, Zeny-$QW_GS_PRICE;
 	if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + ($QW_GS_PRICE/5);
 	next;
 	mes "[Warpra]";
diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt
index 8c2be6f9f..29b8384fe 100644
--- a/npc/custom/etc/shifty_assassin.txt
+++ b/npc/custom/etc/shifty_assassin.txt
@@ -55,7 +55,7 @@ M_Buy:
 	next;
 	menu "Continue",-,"Cancel",M_Exit;
 
-	Zeny -=@price;
+	set Zeny,Zeny-@price;
 	set #ninjas,#ninjas+@buy;
 	set $ninja_avail,$ninja_avail-@buy;
 
diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt
index 9d5208880..7cd284ef9 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;
-	Zeny -=$S_Trans;
+	set Zeny,Zeny-$S_Trans;
 
 SELLS1:
 	if (@sellname$ != $S1N$) goto SELLS2;
 	if (@sellamount > #S1) goto S_SellTooHigh;
 	set @price,@sellamount*$S1;
 	set #S1,#S1-@sellamount;
-	Zeny +=@price;
+	set Zeny,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;
-	Zeny +=@price;
+	set Zeny,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;
-	Zeny +=@price;
+	set Zeny,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;
-	Zeny +=@price;
+	set Zeny,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;
-	Zeny +=@price;
+	set Zeny,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;
-	Zeny +=@price;
+	set Zeny,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;
-	Zeny +=@price;
+	set Zeny,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;
-	Zeny +=@price;
+	set Zeny,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;
-	Zeny +=@price;
+	set Zeny,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;
-	Zeny +=@price;
+	set Zeny,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;
-	Zeny -=$S_Trans;
+	set Zeny,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;
-	Zeny -=@price;
+	set Zeny,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;
-	Zeny -=@price;
+	set Zeny,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;
-	Zeny -=@price;
+	set Zeny,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;
-	Zeny -=@price;
+	set Zeny,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;
-	Zeny -=@price;
+	set Zeny,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;
-	Zeny -=@price;
+	set Zeny,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;
-	Zeny -=@price;
+	set Zeny,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;
-	Zeny -=@price;
+	set Zeny,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;
-	Zeny -=@price;
+	set Zeny,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;
-	Zeny -=@price;
+	set Zeny,Zeny-@price;
 	mes "Bought " + @buyamount + " " + $S10N$ + " shares.";
 	mes "Lost ^0000FF"+@price+"z^000000.";
 	next;