From 4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6 Mon Sep 17 00:00:00 2001 From: Haru Date: Thu, 28 Nov 2013 00:42:20 +0100 Subject: Revert "Cleaned up Zeny manipulation in scripts." Reverted due to a serious regression. I'll commit this again once I fixed the issue in the script engine. Sorry for the inconvenience. This reverts commit 4faa0ec9df7067cee3eb1c1953fccc6c2f842179. Signed-off-by: Haru --- npc/pre-re/jobs/1-1/mage.txt | 2 +- npc/pre-re/jobs/1-1/merchant.txt | 10 +++++----- npc/pre-re/jobs/1-1/thief.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'npc/pre-re') diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 357967e9e..e5f80bd3d 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -207,7 +207,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ next; callfunc "Job_Change",Job_Mage; callfunc "F_ClearJobVar"; - Zeny +=50; + set Zeny,Zeny+50; if(checkquest(1005) != -1) { completequest 1005; } diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 1a470900b..631e29516 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -133,7 +133,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ mes "Please return when you have earned the 500 zeny that you need to become a Merchant."; close; } - Zeny -=500; + set Zeny, Zeny-500; mes "Ah yes...!"; mes "Now your"; mes "membership"; @@ -169,7 +169,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ mes "[Chief Mahnsoo]"; mes "*Ahem* Aaaaand let me give you a little bit of money for delivering that message to Blossom for me."; mes "I hope you'll help me again next time~"; - Zeny +=200; + set Zeny, Zeny+200; set quest_alb_01,2; } else { @@ -341,7 +341,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ mes "[Chief Mahnsoo]"; if (Zeny >= 1000) { set job_merchant_q,2; - Zeny -=1000; + set Zeny, Zeny-1000; mes "Alright~"; mes "That's 1,000 zeny."; mes "Excellent, excellent."; @@ -355,7 +355,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ mes "[Chief Mahnsoo]"; if (Zeny >= 500) { set job_merchant_q,1; - Zeny -=500; + set Zeny, Zeny-500; mes "Let's see..."; mes "That's 500 Zeny. Although I don't think splitting payment is a good idea for any Merchant, it's alright since you're still learning."; } @@ -1058,7 +1058,7 @@ prontera,248,42,0 script Kafra Employee#mer 4_F_KAFRA2,{ cutin "",255; end; } - Zeny -=600; + set Zeny, Zeny-600; set RESRVPTS, RESRVPTS + 37; cutin "",255; warp "izlude",94,103; diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index 8d1491365..389c257f5 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -443,7 +443,7 @@ moc_prydb1,42,133,2 script Comrade 2_M_THIEFMASTER,{ next; mes "[Brad]"; mes "Here is a small subsidy for a Newbie like you. Spend it whereever you want. Alright then, I'll see you around~"; - Zeny +=.@money_thief; + set Zeny, Zeny+.@money_thief; close; } } -- cgit v1.2.3-60-g2f50