diff options
author | Haru <haru@dotalux.com> | 2013-11-28 00:42:20 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2013-11-28 00:43:49 +0100 |
commit | 4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6 (patch) | |
tree | e2dd2640adb13411dee1982e3a7d13c12d4e04b3 /npc/events | |
parent | c069e2e9b89f712c6ad6ebba983460408f6da198 (diff) | |
download | hercules-4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6.tar.gz hercules-4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6.tar.bz2 hercules-4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6.tar.xz hercules-4cc19ba31eaf1cb20f451ff462e1cf9e5ea3def6.zip |
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 <haru@dotalux.com>
Diffstat (limited to 'npc/events')
-rw-r--r-- | npc/events/bossnia.txt | 2 | ||||
-rw-r--r-- | npc/events/dumplingfestival.txt | 4 | ||||
-rw-r--r-- | npc/events/easter_2008.txt | 2 | ||||
-rw-r--r-- | npc/events/easter_2010.txt | 2 | ||||
-rw-r--r-- | npc/events/event_skill_reset.txt | 2 | ||||
-rw-r--r-- | npc/events/halloween_2006.txt | 6 | ||||
-rw-r--r-- | npc/events/lunar_2008.txt | 2 | ||||
-rw-r--r-- | npc/events/nguild/nguild_managers.txt | 2 | ||||
-rw-r--r-- | npc/events/valentinesday.txt | 2 | ||||
-rw-r--r-- | npc/events/valentinesday_2009.txt | 12 | ||||
-rw-r--r-- | npc/events/whiteday.txt | 2 |
11 files changed, 19 insertions, 19 deletions
diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt index 38e35f2b2..70f4fc21c 100644 --- a/npc/events/bossnia.txt +++ b/npc/events/bossnia.txt @@ -72,7 +72,7 @@ prontera,132,125,4 script Bossnia Staff#1 4_M_PHILMAN,{ mes "Take care, boy~"; mes "Don't hold a grudge against me."; close2; - Zeny -= 5000; + set Zeny, Zeny - 5000; warp "bossnia_0"+.@i,rand(202,204),rand(202,204); end; } diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt index b2dbb02d7..04a8b7f4c 100644 --- a/npc/events/dumplingfestival.txt +++ b/npc/events/dumplingfestival.txt @@ -38,7 +38,7 @@ payon,93,81,4 script Exorcist Master Fahae 4_M_BUDDHIST,{ if(@input==0) close; if(@input>5) goto L_SORRY; if(Zeny< @input*20000) goto L_NoZeny; - Zeny -=20000*@input; + set Zeny,Zeny-20000*@input; getitem 682,@input; mes "[Exorcist Master Fahae]"; mes "Here you go, I hope you may succeed in my quest."; @@ -65,7 +65,7 @@ M_HERB: if(@input==0) close; if(@input>5) goto L_SORRY; if(Zeny< @input*10000) goto L_NoZeny; - Zeny -=10000*@input; + set Zeny,Zeny-10000*@input; getitem 683,@input; mes "[Exorcist Master Fahae]"; mes "Here you go, I hope you may succeed in my quest."; diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt index 6cb226994..6b64df494 100644 --- a/npc/events/easter_2008.txt +++ b/npc/events/easter_2008.txt @@ -118,7 +118,7 @@ prontera,111,99,5 script Egg Salesman#prt::EggVendor 4W_M_02,{ mes "them, but I don't know anything"; mes "about that. Well, have a good"; mes "time, and I'll see you again!"; - Zeny -=.@egg_zeny; + set Zeny, Zeny-.@egg_zeny; getitem 7605,.@input; //Chicken_Egg close; } diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt index 292b91948..50a22aec8 100644 --- a/npc/events/easter_2010.txt +++ b/npc/events/easter_2010.txt @@ -384,7 +384,7 @@ prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{ specialeffect EF_ASPERSIO; delitem 574,1; //Egg delitem 1001,20; //Sparkling_Dust - Zeny -= .@nCharge; + set Zeny, Zeny - .@nCharge; set .@nPercentage, rand(1,100); if (.@nPercentage <= 41) { mes "[Rina's Little Friend]"; diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index 83486a870..7248266ec 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -96,7 +96,7 @@ L_Reset: emotion e_hmm; close; } - Zeny -=@zeny; + set Zeny, Zeny-@zeny; set MISC_QUEST,MISC_QUEST | 1024; resetskill; mes @npcname$; diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index 24a7c5483..5bc7c3332 100644 --- a/npc/events/halloween_2006.txt +++ b/npc/events/halloween_2006.txt @@ -517,7 +517,7 @@ nif_fild01,165,115,3 script Chicken Masta#06_hw 4_M_NFDEADMAN2,{ mes "[Chicken Masta]"; mes "Thanks."; mes "Here are the eggs."; - Zeny -=2000; + set Zeny,Zeny-2000; set halloween, 102; getitem 574,2; //Egg close; @@ -533,7 +533,7 @@ nif_fild01,165,115,3 script Chicken Masta#06_hw 4_M_NFDEADMAN2,{ mes "[Chicken Masta]"; mes "Thanks."; mes "Here are the eggs."; - Zeny -=1000; + set Zeny,Zeny-1000; set halloween, 102; getitem 574,1; //Egg close; @@ -624,7 +624,7 @@ nif_fild01,165,115,3 script Chicken Masta#06_hw 4_M_NFDEADMAN2,{ mes "Here you are."; mes "But no more."; mes "If you want more eggs, find me more chickens."; - Zeny -=@hw_egg; + set Zeny,Zeny-@hw_egg; getitem 574, @input;//Egg set halloween, 102; close; diff --git a/npc/events/lunar_2008.txt b/npc/events/lunar_2008.txt index 793451148..577869be3 100644 --- a/npc/events/lunar_2008.txt +++ b/npc/events/lunar_2008.txt @@ -257,7 +257,7 @@ payon,126,113,4 script Miss Lunar#rat 4_F_NACORURI,{ next; if (select("Yes:No") == 1) { if (Zeny >= 3000) { - Zeny -=3000; + set Zeny,Zeny-3000; getitem 554,10; // Mojji mes "[Lunar]"; mes "Thank you, and I hope you"; diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt index 20e2a18ef..de185213e 100644 --- a/npc/events/nguild/nguild_managers.txt +++ b/npc/events/nguild/nguild_managers.txt @@ -65,7 +65,7 @@ function script F_GldManager { mes "Master, you do not have enough money to employ a Kafra. Employment has been cancelled."; return; } - Zeny -=10000; + set Zeny,Zeny-10000; enablenpc "Kafra Staff#"+getarg(4); setcastledata getarg(1),9,1; mes "You have created a contract with the Kafra Staff Company."; diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt index fd26be298..e7f144102 100644 --- a/npc/events/valentinesday.txt +++ b/npc/events/valentinesday.txt @@ -48,7 +48,7 @@ alberta,26,243,4 script Stephen 1_M_MERCHANT,{ if (Zeny < .@i*5000) { mes "I'm sorry, but it seems you can't afford to buy these off me."; close; } - Zeny -= .@i*5000; + set Zeny, Zeny - .@i*5000; getitem 558,.@i; mes "There you go!"; mes "You can give that to someone as a gift, or enjoy it yourself!"; diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index d6ae15aa3..2e02c124c 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -91,7 +91,7 @@ prontera,164,174,4 script Trader#Val09 1_M_MERCHANT,{ mes "[Marco Bassinio]"; mes "If you want more, you should come back."; mes "Might be a good idea to buy some more while you have a chance...!"; - Zeny -= .@price; + set Zeny,Zeny - .@price; getitem 558,.@input; close; } @@ -140,7 +140,7 @@ prontera,164,174,4 script Trader#Val09 1_M_MERCHANT,{ delitem 7175,1; delitem 7174,1; delitem 7948,1; - Zeny -=500; + set Zeny,Zeny-500; getnameditem 12744,strcharinfo(0); mes "[Marco Bassinio]"; mes "Happy Valentine's Day!"; @@ -206,7 +206,7 @@ prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "[Packs Trader]"; mes "Here they are."; mes "Hope it makes your Valentine's Day more pleasing!"; - Zeny -=.@price; + set Zeny,Zeny-.@price; getitem 7175,.@input; next; break; @@ -247,7 +247,7 @@ prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "[Packs Trader]"; mes "Here they are."; mes "Hope it makes your Valentine's Day more pleasing!"; - Zeny -=.@price; + set Zeny,Zeny-.@price; getitem 7174,.@input; next; break; @@ -288,7 +288,7 @@ prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "[Packs Trader]"; mes "Here they are."; mes "Hope it makes your Valentine's Day more pleasing!"; - Zeny -=.@price; + set Zeny,Zeny-.@price; getitem 7948,.@input; next; break; @@ -376,7 +376,7 @@ prontera,154,185,5 script Event Ring Maker#Val09 4_F_KAFRA7,{ delitem 7175,1; delitem 7174,1; delitem 7948,1; - Zeny -=1000; + set Zeny,Zeny-1000; set iROval09ring,1; if (Sex) { getnameditem 12742,strcharinfo(0); diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt index 4cb6a3815..472f0030b 100644 --- a/npc/events/whiteday.txt +++ b/npc/events/whiteday.txt @@ -72,7 +72,7 @@ L_INPUT: if (@maplenum == 0) goto M_End; set @maplePriceT,@maplePrice*@maplenum; if (Zeny < @maplePriceT) goto L_ERROR2; - Zeny -= @maplePriceT; + set Zeny,Zeny- @maplePriceT; getitem @mapleItemID,@maplenum; mes "[Sugar]"; mes "Thank you!!!"; |