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/quests/first_class/tu_archer.txt | 2 +- npc/quests/first_class/tu_magician01.txt | 2 +- npc/quests/first_class/tu_merchant.txt | 30 +++++++++++++++--------------- npc/quests/first_class/tu_thief01.txt | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'npc/quests/first_class') diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index 9f0f1e365..247aa0329 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -1591,7 +1591,7 @@ pay_arche,130,113,3 script Alchemist Guildmember#tu 2_M_ALCHE,{ delitem 1032, .@alche_f; //Blossom_Of_Maneater delitem 905, .@alche_s; //Stem } - Zeny +=.@total_zeny; + set Zeny,Zeny+.@total_zeny; close; case 2: mes "[Alchemist Guildmember]"; diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt index dc43a7852..97ac69dcb 100644 --- a/npc/quests/first_class/tu_magician01.txt +++ b/npc/quests/first_class/tu_magician01.txt @@ -786,7 +786,7 @@ geffen,67,180,4 script New Mage Manager#M 8_F,{ mes "again, thanks very much~"; set tu_magician01, 28; getitem 2321,1; //Silk_Robe - Zeny += 3000; + set Zeny, Zeny + 3000; getexp 3000,1000; close; default: diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt index b760831df..8636810bd 100644 --- a/npc/quests/first_class/tu_merchant.txt +++ b/npc/quests/first_class/tu_merchant.txt @@ -710,7 +710,7 @@ prontera,66,111,3 script Sagle 4_KID01,{ mes "There's no way you carry all of this! Why don't you put some of your stuff in Kafra Storage before coming back?"; close; } else { - Zeny -= 420; + set Zeny, Zeny - 420; set tu_merchant, 10; getitem 501,10; //Red_Potion close; @@ -758,7 +758,7 @@ prontera,66,111,3 script Sagle 4_KID01,{ close2; end; } else { - Zeny -= 410; + set Zeny, Zeny - 410; set tu_merchant, 10; getitem 501,10; //Red_Potion close; @@ -805,7 +805,7 @@ prontera,66,111,3 script Sagle 4_KID01,{ mes "There's no way you carry all of this! Why don't you put some of your stuff in Kafra Storage before coming back?"; close; } else { - Zeny -= 390; + set Zeny, Zeny - 390; set tu_merchant, 9; getitem 501,10; //Red_Potion close; @@ -862,7 +862,7 @@ prontera,93,330,3 script Kellion 4W_M_01,{ mes "You better put some of your stuff in Kafra Storage, you can't carry much else!"; close; } else { - Zeny -= 340; + set Zeny, Zeny - 340; set tu_merchant, 10; getitem 569,10; //Novice_Potion close; @@ -901,7 +901,7 @@ prontera,93,330,3 script Kellion 4W_M_01,{ mes "You better put some of your stuff in Kafra Storage, you can't carry much else!"; close; } else { - Zeny -= 390; + set Zeny, Zeny - 390; set tu_merchant, 9; getitem 501,10; //Red_Potion close; @@ -940,7 +940,7 @@ prontera,93,330,3 script Kellion 4W_M_01,{ mes "You better put some of your stuff in Kafra Storage, you can't carry much else!"; close; } else { - Zeny -= 400; + set Zeny, Zeny - 400; set tu_merchant, 10; getitem 501,10; //Red_Potion close; @@ -1000,7 +1000,7 @@ prt_in,169,11,3 script Aigie 4_F_03,{ mes "You can't possibly carry any more items. Why don't you put your things in Kafra Storage first?"; close; } else { - Zeny -= 390; + set Zeny, Zeny - 390; set tu_merchant, 9; getitem 501,10; //Red_Potion close; @@ -1045,7 +1045,7 @@ prt_in,169,11,3 script Aigie 4_F_03,{ mes "You can't possibly carry any more items. Why don't you put your things in Kafra Storage first?"; close; } else { - Zeny -= 420; + set Zeny, Zeny - 420; set tu_merchant, 10; getitem 501,10; //Red_Potion close; @@ -1090,7 +1090,7 @@ prt_in,169,11,3 script Aigie 4_F_03,{ mes "You can't possibly carry any more items. Why don't you put your things in Kafra Storage first?"; close; } else { - Zeny -= 340; + set Zeny, Zeny - 340; set tu_merchant, 10; getitem 569,10; //Novice_Potion close; @@ -1145,7 +1145,7 @@ prontera,247,129,3 script Jayon 4_M_03,{ mes "You ought to free up some of your inventory space when you get the chance."; close; } else { - Zeny -= 410; + set Zeny, Zeny - 410; set tu_merchant, 10; getitem 501,10; //Red_Potion close; @@ -1191,7 +1191,7 @@ prontera,247,129,3 script Jayon 4_M_03,{ mes "You ought to free up some of your inventory space when you get the chance."; close; } else { - Zeny -= 400; + set Zeny, Zeny - 400; set tu_merchant, 10; getitem 501,10; //Red_Potion close; @@ -1238,7 +1238,7 @@ prontera,247,129,3 script Jayon 4_M_03,{ mes "You ought to free up some of your inventory space when you get the chance."; close; } else { - Zeny -= 410; + set Zeny, Zeny - 410; set tu_merchant, 10; getitem 501,10; //Red_Potion close; @@ -1293,7 +1293,7 @@ prt_in,251,129,3 script Maos 4_M_SEAMAN,{ mes "Ooh, but it doesn't look like you've got enough inventory space to carry any more items."; close; } else { - Zeny -= 420; + set Zeny, Zeny - 420; set tu_merchant, 10; getitem 501,10; //Red_Potion close; @@ -1328,7 +1328,7 @@ prt_in,251,129,3 script Maos 4_M_SEAMAN,{ mes "Ooh, but it doesn't look like you've got enough inventory space to carry any more items."; close; } else { - Zeny -= 340; + set Zeny, Zeny - 340; set tu_merchant, 10; getitem 501,10; //Red_Potion close; @@ -1363,7 +1363,7 @@ prt_in,251,129,3 script Maos 4_M_SEAMAN,{ mes "Ooh, but it doesn't look like you've got enough inventory space to carry any more items."; close; } else { - Zeny -= 400; + set Zeny, Zeny - 400; set tu_merchant, 10; getitem 501,10; //Red_Potion close; diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt index 059a76477..0c431951f 100644 --- a/npc/quests/first_class/tu_thief01.txt +++ b/npc/quests/first_class/tu_thief01.txt @@ -570,7 +570,7 @@ moc_ruins,66,164,4 script Thief Trainer#T 4_M_02,{ mes "Hey, this stuff is yours. Think of it as a reward for helping us out. Take care of yourself now~"; set tu_thief01, 27; getitem 2307,1; //Mantle - Zeny += 5000; + set Zeny, Zeny + 5000; getexp 8000,3000; close; } @@ -693,7 +693,7 @@ moc_ruins,66,164,4 script Thief Trainer#T 4_M_02,{ mes "[Yierhan]"; mes "Hey, this stuff is yours. Think of it as a reward for helping us out. Right, and I'll let Mana know you did a great job. Take care of yourself now~"; set tu_magician01, 27; - Zeny += 5000; + set Zeny, Zeny + 5000; getexp 5000,2000; close; } -- cgit v1.2.3-70-g09d2