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/newgears/2004_headgears.txt | 20 ++++++++++---------- npc/quests/newgears/2005_headgears.txt | 12 ++++++------ npc/quests/newgears/2006_headgears.txt | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'npc/quests/newgears') diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 8f5323b92..a9ee31558 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -68,7 +68,7 @@ payon,115,131,3 script Neko Neko#1 4_F_JOB_ASSASSIN,{ delitem 2213,1; //Cat_Hairband delitem 983,1; //Black_Dyestuffs delitem 914,200; //Fluff - Zeny -=10000; + set Zeny, Zeny-10000; getitem 5057,1; //Ear_Of_Black_Cat next; mes "[Neko Neko]"; @@ -250,7 +250,7 @@ geffen,129,148,3 script Argen#1 4_M_YOYOROGUE,{ mes "Hey, that looks pretty smooth! Oh, and uh, you can keep this leftover Stem."; delitem 2269,1; //Centimental_Flower delitem 999,10; //Steel - Zeny -=20000; + set Zeny, Zeny-20000; getitem 5061,1; //Flower_Hairpin getitem 905,1; //Stem next; @@ -524,7 +524,7 @@ comodo,237,217,5 script Meruntei#1 4_M_JOB_HUNTER,{ delitem 5010,1; //Indian_Hair_Piece delitem 5049,1; //Stripe_Band delitem 7101,10; //Peco_Wing_Feather - Zeny -=10000; + set Zeny, Zeny-10000; getitem 5071,1; //Indian_Headband next; mes "[Meruntei]"; @@ -708,7 +708,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ mes "'Angel Wing Ears!'"; delitem 2254,1; //Angelic_Chain delitem 2286,1; //Elven_Ears - Zeny -=20000; + set Zeny, Zeny-20000; getitem 5074,1; //Ear_Of_Angel's_Wing next; mes "[Hatbyr Mhore]"; @@ -763,7 +763,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ mes "There you go, buddy. I am proud to say this is my masterpiece. I call it... 'Devil Wing Ears!'"; delitem 2255,1; //Satanic_Chain delitem 2286,1; //Elven_Ears - Zeny -=20000; + set Zeny, Zeny-20000; getitem 5068,1; //Ear_Of_Devil's_Wing next; mes "[Hatbyr Mhore]"; @@ -833,7 +833,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ mes "I am proud to say this is my masterpiece. Please take this item. I call it... 'Devil Wing Ears!'"; delitem 2255,1; //Satanic_Chain delitem 2286,1; //Elven_Ears - Zeny -=20000; + set Zeny, Zeny-20000; getitem 5068,1; //Ear_Of_Devil's_Wing next; mes "[Hatbyr Mhore]"; @@ -887,7 +887,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ mes "I am proud to say this is my masterpiece. Please take this item. I call it... 'Angel Wing Ears!'"; delitem 2254,1; //Angelic_Chain delitem 2286,1; //Elven_Ears - Zeny -=20000; + set Zeny, Zeny-20000; getitem 5074,1; //Ear_Of_Angel's_Wing next; mes "[Hatbyr Mhore]"; @@ -1778,7 +1778,7 @@ yuno_in03,20,18,6 script Nehris#1 4_F_JOB_BLACKSMITH,{ delitem 10016,1; //Golden_Bell delitem 714,1; //Emperium delitem 969,3; //Gold - Zeny -=20000; + set Zeny, Zeny-20000; getitem 5091,1; //Big_Golden_Bell mes "[Nehris]"; mes "Yoohoo~"; @@ -1816,7 +1816,7 @@ yuno_in03,20,18,6 script Nehris#1 4_F_JOB_BLACKSMITH,{ delitem 10006,1; //Queen's_Hair_Ornament delitem 714,1; //Emperium delitem 969,3; //Gold - Zeny -=20000; + set Zeny, Zeny-20000; getitem 5080,1; //Headgear_Of_Queen mes "[Nehris]"; mes "Tah dah!"; @@ -1866,7 +1866,7 @@ yuno_in03,20,18,6 script Nehris#1 4_F_JOB_BLACKSMITH,{ delitem 2249,1; //Coronet delitem 714,1; //Emperium delitem 969,3; //Gold - Zeny -=40000; + set Zeny, Zeny-40000; getitem 5081,1; //Mistress_Crown mes "[Nehris]"; mes "Yay! You've got a great looking crown!"; diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index c18b0e441..4b6981101 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -572,7 +572,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 1_M_01,{ delitem 7301,1887; delitem 5120,1; delitem 611,10; - Zeny -= 1887; + set Zeny, Zeny - 1887; set DTHATQ,2; getitem 5108,1; next; @@ -730,7 +730,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 1_M_01,{ delitem 7301,1887; delitem 5120,1; delitem 611,10; - Zeny -= 1887; + set Zeny, Zeny - 1887; set DTHATQ,2; getitem 5108,1; next; @@ -917,7 +917,7 @@ einbech,70,222,5 script Metelle#LhzHat 4_F_02,{ delitem 983,1; delitem 7267,999; delitem 749,1; - Zeny -= 50000; + set Zeny,Zeny - 50000; getitem 5115,1; next; mes "..."; @@ -1034,7 +1034,7 @@ lhz_in02,91,38,5 script Margaret Mary#LhzHat 4_F_01,{ delitem 731,10; delitem 748,3; delitem 982,1; - Zeny -= 50000; + set Zeny,Zeny - 50000; getitem 5117,1; close; @@ -1282,7 +1282,7 @@ lighthalzen,182,89,0 script Relaxed-Looking Lady 4_F_02,{ delitem 10007,1; delitem 975,1; delitem 5032,1; - Zeny -= 50000; + set Zeny,Zeny - 50000; getitem 5109,1; set LHZBTQ,3; next; @@ -1355,7 +1355,7 @@ lighthalzen,182,89,0 script Relaxed-Looking Lady 4_F_02,{ delitem 10007,1; delitem 975,1; delitem 5032,1; - Zeny -= 50000; + set Zeny,Zeny - 50000; getitem 5109,1; next; mes "[Achiha]"; diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt index 8575f69cb..8a63503c2 100644 --- a/npc/quests/newgears/2006_headgears.txt +++ b/npc/quests/newgears/2006_headgears.txt @@ -50,7 +50,7 @@ rachel,91,273,8 script ? 4_M_RACHMAN2,{ delitem 983,1; //Black_Dyestuffs delitem 7111,100; //Smooth_Paper delitem 938,99; //Sticky_Mucus - Zeny -=100000; + set Zeny,Zeny-100000; getitem 5175,1; //Anonimity_Request mes "[?]"; mes "Phew...it's done. Well, it was not that difficult to make, but..."; @@ -319,7 +319,7 @@ hugel,147,103,3 script Ghenirhemin 4_M_HUGRANFA,{ delitem 4166,1; //Nightmare_Terror_Card delitem 7511,1000; //Rune_Of_Darkness delitem 7563,1000; //Bloody_Rune - Zeny -=10000000; + set Zeny,Zeny-10000000; set moza_valkylie,3; mes "[Ghenirhemin]"; mes "Now I am all nervous"; -- cgit v1.2.3-60-g2f50