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/jobs/2-1/blacksmith.txt | 2 +- npc/jobs/2-1/knight.txt | 2 +- npc/jobs/2-2/alchemist.txt | 2 +- npc/jobs/2-2/dancer.txt | 2 +- npc/jobs/2-2/rogue.txt | 4 ++-- npc/jobs/2-2/sage.txt | 6 +++--- npc/jobs/novice/supernovice.txt | 2 +- npc/jobs/valkyrie.txt | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'npc/jobs') diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 3068f6943..c8cfd8a2d 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -1616,7 +1616,7 @@ geffen_in,109,170,3 script Blacksmith Guildsman#gef 4_F_JOB_BLACKSMITH,{ mes "Excuse me, but you do not have enough money."; close; } - Zeny -=600; + set Zeny, Zeny-600; warp "izlude",94,103; end; case 3: diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index 368cbca45..0b988998e 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -2062,7 +2062,7 @@ prt_in,87,92,4 script Sir Gray#knt 2_M_SWORDMASTER,{ mes "You attained a reliable item."; mes "It'll be a good companion on your adventures."; delitem 999,1; //Steel - Zeny -= 74000; + set Zeny, Zeny - 74000; getitem 1163,1; //Claymore close; } diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index bbf06ba15..59504aadd 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -175,7 +175,7 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 4_F_ALCHE,{ mes "Come back to me when you have 50,000 Zeny, otherwise we can't process your application."; close; } - Zeny -=50000; + set Zeny, Zeny-50000; mes "[Parmy Gianino]"; mes "Let's see."; mes "" + strcharinfo(0); diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index 1a9be3f44..4075ce51f 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -316,7 +316,7 @@ job_duncer,43,93,4 script Aile#da 4_F_07,{ mes "tuition fee."; next; cutin "job_dancer_eir01",2; - Zeny -=10000; + set Zeny, Zeny-10000; mes "[Aile]"; mes "Next, go to ^CD6889Bijou^000000, who is in charge of the interviewing process. She will have a couple of things she'll need to ask you."; set DANC_Q,5; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 1076321c7..4ce7fe424 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -661,7 +661,7 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{ countitem(908) > 4 && countitem(945) > 4) { mes "[Mr. Smith]"; mes "Ummm...let's see..."; - Zeny -=10000; + set Zeny, Zeny-10000; delitem 915,5; //Chrysalis delitem 713,5; //Empty_Bottle delitem 1002,5; //Iron_Ore @@ -974,7 +974,7 @@ S_CheckItems: if (Zeny > 9999 && countitem(getarg(0)) >= getarg(1) && countitem(getarg(2)) >= getarg(3) && countitem(getarg(4)) >= getarg(5) && countitem(getarg(6)) >= getarg(7)) { mes "[Mr. Smith]"; mes "Okay, we've got the application fee, ^FF000010,000 zeny^000000, "+getarg(1)+" "+getitemname(getarg(0))+", "+getarg(3)+" "+getitemname(getarg(2))+", "+getarg(5)+" "+getitemname(getarg(4))+" and "+getarg(7)+" "+getitemname(getarg(6))+"..."; - Zeny -=10000; + set Zeny, Zeny-10000; delitem getarg(0),getarg(1); delitem getarg(2),getarg(3); delitem getarg(4),getarg(5); diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 00a447249..4f93ba7db 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -343,7 +343,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{ next; if (select("Pay 70,000 zeny.:Give him Old Magicbook and Necklace of Wisdom.") == 1) { if (Zeny > 69999) { - Zeny -=70000; + set Zeny, Zeny-70000; mes "[Metheus Sylphe]"; mes "Thank you, your application has been accepted."; mes "Next, you will take an entrance test."; @@ -515,7 +515,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{ next; } else if (Zeny > 69999) { - Zeny -=70000; + set Zeny, Zeny-70000; mes "[Metheus Sylphe]"; mes "Well done. Let me proceed with your application request."; set SAGE_Q,4; @@ -545,7 +545,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{ if (Zeny > 29999) { for (set .@i, 0; .@i < .@size ; set .@i, .@i+1) delitem .@item[.@i], .@count[.@i]; - Zeny -=30000; + set Zeny, Zeny-30000; mes "[Metheus Sylphe]"; mes "Well done. Let me proceed with your application request."; set .@SAGE_Q_T,SAGE_Q; diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt index f6d063a2a..cf9ea7b87 100644 --- a/npc/jobs/novice/supernovice.txt +++ b/npc/jobs/novice/supernovice.txt @@ -431,7 +431,7 @@ aldebaran,54,238,5 script Kafra Employee#sn 4_F_KAFRA1,{ } if (Zeny >= 1899) { set RESRVPTS, RESRVPTS + 190; - Zeny -=1900; + set Zeny, Zeny-1900; if (getskilllv("MC_PUSHCART") > 0) setcart; mes "[Kafra Employee]"; mes "Thank you for using my service."; diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index 582bd1d46..42c27551c 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -231,7 +231,7 @@ yuno_in02,88,164,5 script Metheus Sylphe#Library 2_M_SAGE_B,{ next; if (select("Donate.:Cancel.") == 1) { if (Zeny >= 1285000) { - Zeny -=1285000; + set Zeny, Zeny-1285000; set valkyrie_Q,1; mes "[Metheus Sylphe]"; mes "Thank you, your donation will be used for a good cause. You may"; -- cgit v1.2.3-60-g2f50