From eeafd81624cf754acded818f5538f911ed716dfb Mon Sep 17 00:00:00 2001 From: Taylor Locke Date: Wed, 27 Nov 2013 05:32:04 -0800 Subject: The contributors of Athena through the ages. Sorry if I missed anyone. --- AUTHORS | 273 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 273 insertions(+) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..5d45198a2 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,273 @@ +The following people & communities have contributed to the development of Athena through the years. + +Thank you for all your hard work. + +3CeAM Dev Team +Athena Dev Team +eAthena Dev Team +Hercules Dev Team +Project YARE +rAthena Dev Team + +(Pepermint) +(ruhu) +(凸) +[Lance] +$ephiroth +Aerie +ai4rei +ajarn +akrus +Alan +Aleos +amber +ancyker +AnnieRuru +Antarea +AppleGirl +Aria +arutema +Asong +Au{R}oN +Avethes +Aya +Aの人 +Banned +battousai90 +BDPQ銀 +blackhole89 +Brainstorm +BrianL +brianluau +celest +CG +chloe +CHRIS +Chunglyeng +CLOWNISIUS +code +codemaster +css25 +Curax +Cydh +Cyxult +Daegaladh +Dark Light +Darkchild +davidchak +davidsiaw +Deltaanime +Dest +Diex +Dino9021 +Dizzy +DNett123 +DracoRPG +DRG +dusk +DZeroX +eigen +ElFinLazz +Elias +End_of_exam +erKURITA +Euphy +Eurydice +evangelion33 +Evera +Flaid +flaviojs +Flippy +foruken +Fredzilla +fritz +Fyrien +Gepard +giggster +GorthexTiger +GreenBox +hack +Harbin +Harp +Haruna +Hikaru +hoenny +hogefuga3 +huge +ICO +Ind +Inkfish +J +jaBote +Jazz +Jman +jmanfffreak +Joint Beat +Joseph +jTynne +kag +kai +Kalen +Kargha +KarghaCIA-2 +KarLaeda +Kashy +Katrinn +Kayla +Kenpachi +Kevin +kisuka +KitsuneStarwind +kobra_k88 +Komurka +Kuro +kyeme +L0ne_W0lf +lapis +last +latte +Lighta +LightFighter +Lilith +littlewolf +lizorett +ll3y +LP@@ +Lupus +LuzZza +Maki +malufett +mare +Martin +Masao +Mass +Mass Zero +massdriller +MasterOfMuppets +mc_cameri +Michael +Michael_Huang +Michieru +Mind Twist +mk +mkbu95 +mosya +mousejstr +Mr.NO NAME +mrmagoo +Muad_Dib +Munin +musashiden +Mysterious +nabe +Nameless +Nameless2you +nana +Nasedo +netwarrior +Nexon +Ni+S +Nikita +nini +NOCTURNE +nokia +non +npc +nsstrunks +nyankochan +p +Paradox924X +Peter Kieser +pizza +PKGINGO +Plala +Playtester +Poki#3 +PRevEv +reddozen +ree_ron +reia +robert +rowla +RR +Rytech +samuray22 +Sanasol +Sapientia +Sara +Sel +shadow +shadoweathena +shadowlady +Shinigami +shinomori +Shinryo +shuto +Silent +Sin +SinSloth +sirius_black +sirius_white +sk +sketchyphoenix +Skotlex +spamrat +SPDFMember +spira +Spre +Susu +SVN +sylpheed +TEILU +Terces +Tharis +Theia +theultramage +tk44 +toms +Toshi^2 +Trojal +Tsuyuki +V&S +valaris +veider +Vicious +Vicious_Pucca +whitedog +Wizputer +Wolf +Xgear +Yommy +Yor +Yuuki +zalem +zapbomb +Zephiris +zephyrus +zephyrus_cr +Zido +ZoDIaC +あゆみ +いど +な。 +パイン +ぴざまん +ぽぽぽ +ゆう +るるる +れあ +七誌 +中の人 +南 +名無し様@ｇ＠ｍｅ +引退人 +死神 +波浪 +獅子o^.^o +管理人 +紅葉 +聖 +胡 +胡蝶蘭 +過去の人i1 +釈尊 \ No newline at end of file -- cgit v1.2.3-70-g09d2 From c069e2e9b89f712c6ad6ebba983460408f6da198 Mon Sep 17 00:00:00 2001 From: Taylor Locke Date: Wed, 27 Nov 2013 14:51:26 -0800 Subject: Some fixes to AUTHORS file. --- AUTHORS | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/AUTHORS b/AUTHORS index 5d45198a2..24405d990 100644 --- a/AUTHORS +++ b/AUTHORS @@ -6,7 +6,7 @@ Thank you for all your hard work. Athena Dev Team eAthena Dev Team Hercules Dev Team -Project YARE +Project YARE Team rAthena Dev Team (Pepermint) @@ -15,13 +15,14 @@ rAthena Dev Team [Lance] $ephiroth Aerie -ai4rei +Ai4rei ajarn +Akaru akrus Alan Aleos amber -ancyker +Ancyker AnnieRuru Antarea AppleGirl @@ -37,13 +38,13 @@ battousai90 BDPQ銀 blackhole89 Brainstorm -BrianL brianluau celest CG chloe CHRIS Chunglyeng +CIA-2 CLOWNISIUS code codemaster @@ -76,7 +77,7 @@ Eurydice evangelion33 Evera Flaid -flaviojs +FlavioJS Flippy foruken Fredzilla @@ -109,14 +110,14 @@ kag kai Kalen Kargha -KarghaCIA-2 KarLaeda Kashy Katrinn Kayla Kenpachi Kevin -kisuka +killercube +Kisuka KitsuneStarwind kobra_k88 Komurka @@ -141,21 +142,22 @@ mare Martin Masao Mass -Mass Zero +MaSs ZeRo massdriller MasterOfMuppets mc_cameri -Michael Michael_Huang Michieru Mind Twist mk mkbu95 +mksm mosya mousejstr Mr.NO NAME mrmagoo Muad_Dib +Mumbles Munin musashiden Mysterious @@ -206,10 +208,10 @@ shuto Silent Sin SinSloth -sirius_black -sirius_white +Sirius_Black +Sirius_White sk -sketchyphoenix +SketchyPhoenix Skotlex spamrat SPDFMember @@ -231,7 +233,6 @@ Tsuyuki V&S valaris veider -Vicious Vicious_Pucca whitedog Wizputer @@ -243,7 +244,6 @@ Yuuki zalem zapbomb Zephiris -zephyrus zephyrus_cr Zido ZoDIaC -- cgit v1.2.3-70-g09d2 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/airports/airships.txt | 4 +-- npc/airports/einbroch.txt | 2 +- npc/airports/hugel.txt | 2 +- npc/airports/izlude.txt | 2 +- npc/airports/lighthalzen.txt | 2 +- npc/airports/rachel.txt | 2 +- npc/airports/yuno.txt | 2 +- npc/cities/alberta.txt | 6 ++--- npc/cities/aldebaran.txt | 2 +- npc/cities/amatsu.txt | 2 +- npc/cities/ayothaya.txt | 2 +- npc/cities/comodo.txt | 4 +-- npc/cities/einbech.txt | 2 +- npc/cities/einbroch.txt | 8 +++--- npc/cities/geffen.txt | 6 ++--- npc/cities/gonryun.txt | 2 +- npc/cities/hugel.txt | 2 +- npc/cities/izlude.txt | 4 +-- npc/cities/jawaii.txt | 20 +++++++-------- npc/cities/lighthalzen.txt | 4 +-- npc/cities/louyang.txt | 4 +-- npc/cities/morocc.txt | 4 +-- npc/cities/moscovia.txt | 2 +- npc/cities/payon.txt | 2 +- npc/cities/umbala.txt | 6 ++--- npc/cities/yuno.txt | 8 +++--- npc/custom/card_remover.txt | 2 +- npc/custom/etc/bank.txt | 12 ++++----- npc/custom/etc/bank_kafra.txt | 4 +-- npc/custom/etc/blackjack.txt | 4 +-- npc/custom/etc/lottery.txt | 6 ++--- npc/custom/etc/marriage.txt | 4 +-- npc/custom/etc/monster_arena.txt | 4 +-- npc/custom/etc/penal_servitude.txt | 2 +- npc/custom/etc/quest_warper.txt | 20 +++++++-------- npc/custom/etc/shifty_assassin.txt | 2 +- npc/custom/etc/stock_market.txt | 44 ++++++++++++++++---------------- npc/custom/events/valentinesdayexp.txt | 4 +-- npc/custom/healer.txt | 2 +- npc/custom/item_signer.txt | 2 +- npc/custom/quests/hunting_missions.txt | 4 +-- npc/custom/quests/kaho_balmung.txt | 2 +- npc/custom/quests/kahohorn.txt | 2 +- npc/custom/quests/quest_shop.txt | 2 +- npc/custom/quests/questboard.txt | 4 +-- npc/custom/quests/sphinx_mask.txt | 2 +- npc/custom/quests/sunglasses.txt | 4 +-- npc/custom/quests/thq/THQS_GuildNPC.txt | 2 +- npc/custom/quests/thq/THQS_QuestNPC.txt | 2 +- npc/custom/quests/thq/THQS_TTShop.txt | 6 ++--- npc/custom/resetnpc.txt | 6 ++--- npc/events/bossnia.txt | 2 +- npc/events/dumplingfestival.txt | 4 +-- npc/events/easter_2008.txt | 2 +- npc/events/easter_2010.txt | 2 +- npc/events/event_skill_reset.txt | 2 +- npc/events/halloween_2006.txt | 6 ++--- npc/events/lunar_2008.txt | 2 +- npc/events/nguild/nguild_managers.txt | 2 +- npc/events/valentinesday.txt | 2 +- npc/events/valentinesday_2009.txt | 12 ++++----- npc/events/whiteday.txt | 2 +- npc/guild/agit_main.txt | 12 ++++----- npc/guild2/agit_main_se.txt | 10 ++++---- npc/instances/EndlessTower.txt | 4 +-- npc/instances/SealedShrine.txt | 2 +- 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 +- npc/kafras/cool_event_corp.txt | 16 ++++++------ npc/kafras/dts_warper.txt | 24 ++++++++--------- npc/kafras/functions_kafras.txt | 10 ++++---- npc/kafras/kafras.txt | 2 +- npc/merchants/advanced_refiner.txt | 2 +- npc/merchants/alchemist.txt | 4 +-- npc/merchants/ammo_boxes.txt | 2 +- npc/merchants/buying_shops.txt | 6 ++--- npc/merchants/clothes_dyer.txt | 2 +- npc/merchants/dye_maker.txt | 2 +- npc/merchants/enchan_arm.txt | 2 +- npc/merchants/hair_dyer.txt | 4 +-- npc/merchants/hair_style.txt | 8 +++--- npc/merchants/hd_refine.txt | 4 +-- npc/merchants/icecream.txt | 2 +- npc/merchants/inn.txt | 6 ++--- npc/merchants/milk_trader.txt | 2 +- npc/merchants/old_pharmacist.txt | 8 +++--- npc/merchants/quivers.txt | 4 +-- npc/merchants/refine.txt | 38 +++++++++++++-------------- npc/merchants/renters.txt | 6 ++--- npc/merchants/socket_enchant.txt | 4 +-- npc/merchants/socket_enchant2.txt | 8 +++--- npc/other/acolyte_warp.txt | 4 +-- npc/other/arena/arena_party.txt | 2 +- npc/other/comodo_gambling.txt | 6 ++--- npc/other/divorce.txt | 2 +- npc/other/fortune.txt | 4 +-- npc/other/mail.txt | 2 +- npc/other/marriage.txt | 4 +-- npc/other/mercenary_rent.txt | 4 +-- npc/other/monster_race.txt | 12 ++++----- npc/other/poring_war.txt | 2 +- npc/other/powernpc.txt | 2 +- npc/other/pvp.txt | 4 +-- npc/other/turbo_track.txt | 2 +- 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 +- npc/quests/bard_quest.txt | 2 +- npc/quests/cooking_quest.txt | 6 ++--- npc/quests/counteragent_mixture.txt | 4 +-- npc/quests/dandelion_request.txt | 8 +++--- npc/quests/eye_of_hellion.txt | 2 +- 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 +-- npc/quests/gunslinger_quests.txt | 10 ++++---- npc/quests/juice_maker.txt | 2 +- npc/quests/kiel_hyre_quest.txt | 4 +-- npc/quests/mage_solution.txt | 4 +-- npc/quests/monstertamers.txt | 2 +- npc/quests/newgears/2004_headgears.txt | 20 +++++++-------- npc/quests/newgears/2005_headgears.txt | 12 ++++----- npc/quests/newgears/2006_headgears.txt | 4 +-- npc/quests/ninja_quests.txt | 32 +++++++++++------------ npc/quests/quests_13_1.txt | 18 ++++++------- npc/quests/quests_13_2.txt | 8 +++--- npc/quests/quests_alberta.txt | 2 +- npc/quests/quests_aldebaran.txt | 8 +++--- npc/quests/quests_amatsu.txt | 10 ++++---- npc/quests/quests_ayothaya.txt | 10 ++++---- npc/quests/quests_ein.txt | 10 ++++---- npc/quests/quests_geffen.txt | 2 +- npc/quests/quests_hugel.txt | 14 +++++----- npc/quests/quests_izlude.txt | 4 +-- npc/quests/quests_lighthalzen.txt | 20 +++++++-------- npc/quests/quests_louyang.txt | 10 ++++---- npc/quests/quests_morocc.txt | 14 +++++----- npc/quests/quests_moscovia.txt | 38 +++++++++++++-------------- npc/quests/quests_nameless.txt | 16 ++++++------ npc/quests/quests_payon.txt | 2 +- npc/quests/quests_prontera.txt | 4 +-- npc/quests/quests_rachel.txt | 4 +-- npc/quests/quests_veins.txt | 8 +++--- npc/quests/quests_yuno.txt | 4 +-- npc/quests/seals/brisingamen_seal.txt | 6 ++--- npc/quests/skills/bard_skills.txt | 4 +-- npc/quests/skills/blacksmith_skills.txt | 2 +- npc/quests/thana_quest.txt | 6 ++--- npc/quests/the_sign_quest.txt | 22 ++++++++-------- npc/re/cities/brasilis.txt | 4 +-- npc/re/cities/dewata.txt | 6 ++--- npc/re/cities/dicastes.txt | 2 +- npc/re/cities/eclage.txt | 2 +- npc/re/cities/malangdo.txt | 4 +-- npc/re/cities/malaya.txt | 4 +-- npc/re/cities/mora.txt | 10 ++++---- npc/re/guild/invest_main.txt | 4 +-- npc/re/jobs/3-1/guillotine_cross.txt | 18 ++++++------- npc/re/jobs/3-2/shadow_chaser.txt | 8 +++--- npc/re/jobs/novice/supernovice_ex.txt | 2 +- npc/re/merchants/3rd_trader.txt | 8 +++--- npc/re/merchants/advanced_refiner.txt | 2 +- npc/re/merchants/alchemist.txt | 2 +- npc/re/merchants/blessed_refiner.txt | 2 +- npc/re/merchants/card_separation.txt | 2 +- npc/re/merchants/catalog.txt | 2 +- npc/re/merchants/diamond.txt | 4 +-- npc/re/merchants/enchan_mora.txt | 4 +-- npc/re/merchants/enchan_upg.txt | 2 +- npc/re/merchants/flute.txt | 4 +-- npc/re/merchants/hd_refiner.txt | 4 +-- npc/re/merchants/inn.txt | 2 +- npc/re/merchants/quivers.txt | 2 +- npc/re/merchants/refine.txt | 8 +++--- npc/re/quests/eden/eden_iro.txt | 4 +-- npc/re/quests/eden/eden_quests.txt | 16 ++++++------ npc/re/quests/eden/eden_service.txt | 2 +- npc/re/quests/homun_s.txt | 2 +- npc/re/quests/magic_books.txt | 10 ++++---- npc/re/quests/quests_brasilis.txt | 2 +- npc/re/quests/quests_dewata.txt | 2 +- npc/re/quests/quests_dicastes.txt | 8 +++--- npc/re/quests/quests_eclage.txt | 2 +- npc/re/quests/quests_malangdo.txt | 10 ++++---- npc/re/quests/quests_malaya.txt | 4 +-- npc/re/quests/quests_morocc.txt | 2 +- 193 files changed, 572 insertions(+), 572 deletions(-) diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index a4048cd5f..bf2a17acf 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -531,7 +531,7 @@ airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{ close; } else { - Zeny -= .@pay; + set Zeny, Zeny - .@pay; getitem 512,.@input; //Apple mes "[Fruitz]"; mes "Thanks for stopping by"; @@ -895,7 +895,7 @@ airplane_01,50,66,5 script Apple Merchant#air01 4_M_04,{ close; } else { - Zeny -= .@pay; + set Zeny, Zeny - .@pay; getitem 512,.@input; //Apple mes "[Meltz]"; mes "Thanks for stopping by"; diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt index 774bd14b3..bd6b72fcc 100644 --- a/npc/airports/einbroch.txt +++ b/npc/airports/einbroch.txt @@ -31,7 +31,7 @@ airport,143,43,5 script Airport Staff#airport1a::airport1 4_F_01,{ end; } if (Zeny >= 1200) { - Zeny -= 1200; + set Zeny, Zeny - 1200; warp "airport",148,51; end; } diff --git a/npc/airports/hugel.txt b/npc/airports/hugel.txt index 7d4b3f85a..015bf8efd 100644 --- a/npc/airports/hugel.txt +++ b/npc/airports/hugel.txt @@ -21,7 +21,7 @@ OnTouch: end; } if (Zeny >= 1200) { - Zeny -= 1200; + set Zeny, Zeny - 1200; warp "airplane",244,58; end; } diff --git a/npc/airports/izlude.txt b/npc/airports/izlude.txt index aaf08b9a7..fe46c1169 100644 --- a/npc/airports/izlude.txt +++ b/npc/airports/izlude.txt @@ -30,7 +30,7 @@ end; } if (Zeny >= 1200) { - Zeny -= 1200; + set Zeny, Zeny - 1200; warp "airplane_01",244,58; end; } diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt index de26fb0cc..e2c5f67b4 100644 --- a/npc/airports/lighthalzen.txt +++ b/npc/airports/lighthalzen.txt @@ -29,7 +29,7 @@ lhz_airport,143,43,5 script Airport Staff#lhz_air1a::lhz_airport1 4_F_01,{ end; } if (Zeny >= 1200) { - Zeny -= 1200; + set Zeny, Zeny - 1200; warp "lhz_airport",148,51; end; } diff --git a/npc/airports/rachel.txt b/npc/airports/rachel.txt index 65ea35425..f157f5f6b 100644 --- a/npc/airports/rachel.txt +++ b/npc/airports/rachel.txt @@ -21,7 +21,7 @@ OnTouch: end; } if (Zeny >= 1200) { - Zeny -= 1200; + set Zeny, Zeny - 1200; warp "airplane_01",245,60; end; } diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt index 2146dc671..4e697918b 100644 --- a/npc/airports/yuno.txt +++ b/npc/airports/yuno.txt @@ -28,7 +28,7 @@ y_airport,143,43,5 script Airport Staff#y_air1a::y_airport1 4_F_01,{ end; } if (Zeny >= 1200) { - Zeny -= 1200; + set Zeny, Zeny - 1200; warp "y_airport",148,51; end; } diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 232fb5da3..0fb5ce2f2 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -205,7 +205,7 @@ alberta,189,151,5 script Fisk 4W_SAILOR,{ mes "Hey now, don't try to cheat me! I said 250 zeny!"; close; } - Zeny -= 250; + set Zeny,Zeny - 250; warp "alb2trea",43,53; end; case 2: @@ -214,7 +214,7 @@ alberta,189,151,5 script Fisk 4W_SAILOR,{ mes "Ain't no way yer getting there without the 500 zeny first!"; close; } - Zeny -= 500; + set Zeny,Zeny - 500; if(checkre(0)) warp "izlude",195,212; else @@ -262,7 +262,7 @@ alberta,195,151,2 script Paul 4_M_04,{ mes "It seems you don't have the money, my friend. But please come back when you're able to pay."; close; } else { - Zeny -= 200; + set Zeny,Zeny - 200; warp "alb2trea",62,69; close; } diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index f96893c80..cbd79a50b 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -800,7 +800,7 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{ end; } delitem 1084,countitem(1084); //Kapra's_Pass - Zeny +=.@kafrapassmoney; + set Zeny,Zeny+.@kafrapassmoney; mes "[Kafra Pavianne]"; mes "Thank you."; } diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index 79a0fd264..c86db8a67 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -96,7 +96,7 @@ mes "[Walter Moers]"; mes "Alright, I will start the engine!"; close2; - Zeny -=10000; + set Zeny, Zeny-10000; warp "amatsu",197,83; end; } diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt index 2b59d828a..e04a00ee1 100644 --- a/npc/cities/ayothaya.txt +++ b/npc/cities/ayothaya.txt @@ -56,7 +56,7 @@ mes "Let us be off! Back to my"; mes "beautiful Ayotaya!"; close2; - Zeny -=10000; + set Zeny, Zeny-10000; warp "ayothaya",149,71; end; } diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt index 7c1fc87d7..cb36c38c1 100644 --- a/npc/cities/comodo.txt +++ b/npc/cities/comodo.txt @@ -349,12 +349,12 @@ cmd_fild07,299,83,4 script Zain#cmd 4W_SAILOR,{ switch(select("Alberta - 600 Zeny:Izlude - 800 Zeny:Cancel")) { case 1: if (Zeny < 600) break; - Zeny -=600; + set Zeny, Zeny-600; warp "alberta",192,169; end; case 2: if (Zeny < 800) break; - Zeny -=800; + set Zeny, Zeny-800; if(checkre(0)) warp "izlude",195,212; else diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt index 011a8fd0a..e1395e701 100644 --- a/npc/cities/einbech.txt +++ b/npc/cities/einbech.txt @@ -212,7 +212,7 @@ einbech,39,215,5 script Train Station Staff#ein3 4_M_EIN_SOLDIER,{ mes "we hope you enjoy"; mes "the ride. All aboard!"; close2; - Zeny -=200; + set Zeny, Zeny-200; warp "einbroch",226,276; end; } diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt index 0afcecf58..9d1c1dcad 100644 --- a/npc/cities/einbroch.txt +++ b/npc/cities/einbroch.txt @@ -128,7 +128,7 @@ function script EinTower { mes "using our services."; mes "Let me guide you to"; mes "the tower right away."; - Zeny -=10; + set Zeny, Zeny-10; close2; warp "einbroch",181,196; end; @@ -155,7 +155,7 @@ function script EinTower { mes "using our services."; mes "Let me guide you to"; mes "the tower right away."; - Zeny -=20; + set Zeny, Zeny-20; getitem 512,1; //Apple close2; warp "einbroch",174,204; @@ -203,7 +203,7 @@ einbroch,232,272,3 script Train Station Staff#ein1::EinbrochTrain 4_M_EIN_SOLDIE mes "Have a safe trip."; mes "^333333*Ahem*^000000 All aboard!"; close2; - Zeny -=200; + set Zeny, Zeny-200; warp "einbech",43,215; end; } @@ -834,7 +834,7 @@ ein_in01,206,224,3 script Hotel Employee#ein 4_M_EINMAN,{ mes "Please enjoy"; mes "your rest~"; close2; - Zeny -=5000; + set Zeny, Zeny-5000; percentheal 100,100; warp "ein_in01",272,167; end; diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index fb488a3ad..d755af8b6 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -286,7 +286,7 @@ OnTouch: mes "^333333Now I gotta find some other sucker to dump this junk on!^000000 *Ahem* I mean, come again!"; close; } - Zeny -=.@Red_potion_hap; + set Zeny, Zeny-.@Red_potion_hap; getitem 501,.@input; //Red_Potion break; case 2: @@ -351,7 +351,7 @@ OnTouch: mes "When the greatest deal in your life is right before your eyes?! Tragic, truly tragic..."; close; } - Zeny -=.@Main_gauche_hap; + set Zeny, Zeny-.@Main_gauche_hap; getitem 1207,.@input; //Main_Gauche break; case 3: @@ -403,7 +403,7 @@ OnTouch: mes "Short on zeny, eh?"; close; } - Zeny -=.@Hood__hap; + set Zeny, Zeny-.@Hood__hap; getitem 2501,.@input; //Hood break; case 4: diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt index 665263f67..7aa0f5e70 100644 --- a/npc/cities/gonryun.txt +++ b/npc/cities/gonryun.txt @@ -100,7 +100,7 @@ mes "[Wa Bai Hu]"; mes "Thank you, let me guide you there immediately."; close2; - Zeny -=10000; + set Zeny, Zeny-10000; warp "gon_fild01",258,82; end; } diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt index 9f0cd2413..eb000b1ed 100644 --- a/npc/cities/hugel.txt +++ b/npc/cities/hugel.txt @@ -154,7 +154,7 @@ hu_in01,23,311,4 script Party Supplies Shop 4_M_HUMAN_01,{ mes "enough money~"; close; } - Zeny -=500; + set Zeny,Zeny-500; getitem 12018,5; // Fire_Cracker mes "[Shopkeeper]"; mes "Here you go!"; diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt index 5aaceb709..000b0893e 100644 --- a/npc/cities/izlude.txt +++ b/npc/cities/izlude.txt @@ -48,7 +48,7 @@ mes "Only 150 Zeny to ride!"; close; } - Zeny -= 150; + set Zeny, Zeny - 150; warp "izlu2dun",107,50; end; case 2: @@ -58,7 +58,7 @@ mes "Only 500 Zeny to ride!"; close; } - Zeny -= 500; + set Zeny, Zeny - 500; warp "alberta",188,169; end; case 3: diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 579930f5a..501e0f336 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -245,7 +245,7 @@ jawaii,141,200,3 script Employee#sroom 4_M_NFMAN,{ mes "ffffor you. Thank y-you."; mes "Ha-have a good time."; close2; - Zeny -=1000; + set Zeny, Zeny-1000; warp "jawaii_in",116,64; end; } @@ -294,7 +294,7 @@ jawaii,108,199,5 script Employee#antroom 1_F_MERCHANT_02,{ mes "Make yourself"; mes "comfortable."; close2; - Zeny -=1000; + set Zeny, Zeny-1000; warp "jawaii_in",129,110; end; } @@ -325,7 +325,7 @@ jawaii,107,189,5 script Employee#horoom 4_F_04,{ mes "Eh, alright."; mes "Let's get going."; close2; - Zeny -=1000; + set Zeny, Zeny-1000; warp "jawaii_in",86,117; end; } @@ -368,7 +368,7 @@ jawaii,112,173,7 script Employee#villroom 4_F_04,{ mes "Thank you~"; mes "Enjoy your stay."; close2; - Zeny -=1000; + set Zeny, Zeny-1000; warp "jawaii_in",87,75; end; } @@ -413,7 +413,7 @@ jawaii,214,168,5 script Honeymoon Helper#Jawaii 1_F_LIBRARYGIRL,{ if (select("I shall buy it.:No, thanks.") == 1) { mes "[Helper]"; if (Zeny > 49999) { - Zeny -=50000; + set Zeny, Zeny-50000; getitem 681,1; //Memory_Of_Wedding mes "Thank you very much~!"; mes "Please remember, you"; @@ -737,7 +737,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{ if (select("Yes.:Wha--! It's too expensive!") == 1) { mes "[Waitress]"; if (Zeny > 999) { - Zeny -=1000; + set Zeny, Zeny-1000; getitem 517,1; //Meat mes "There you go~"; mes "Enjoy your meal~!"; @@ -763,7 +763,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{ if (select("Yes.:Wha--! It's too expensive!") == 1) { mes "[Waitress]"; if (Zeny > 999) { - Zeny -=1000; + set Zeny, Zeny-1000; getitem 503,1; //Yelow_Potion mes "There you go~"; mes "Enjoy your meal~!"; @@ -895,7 +895,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{ percentheal -100,0; end; } - if (Zeny > 99) Zeny -=100; + if (Zeny > 99) set Zeny, Zeny-100; switch(rand(4)) { case 1: mes "[Bartender]"; @@ -1105,7 +1105,7 @@ S_KillChar: percentheal -100,0; end; } - if (Zeny > 99) Zeny -=100; + if (Zeny > 99) set Zeny, Zeny-100; set .@roof_jaw,.@roof_jaw+getarg(0); mes "[Bartender]"; mes "There you go."; @@ -1431,7 +1431,7 @@ prt_in,170,14,0 script Customer#Bachewcca 4_M_ORIENT02,{ close; } else if (Zeny > 99999) { - Zeny -=100000; + set Zeny, Zeny-100000; mes "Bon Voyage...!!"; mes "Let me guide"; mes "you to 'Jawaii!'"; diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index af4cb15ae..d4e66a334 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -563,7 +563,7 @@ lighthalzen,182,102,3 script Lucius#zen5 4_M_LGTGRAND,{ mes "as much as you possibly can..."; close; } - Zeny -=.@input; + set Zeny, Zeny-.@input; set $donatedzeny,$donatedzeny + .@input; mes "[Lucius]"; mes "So far, I've received"; @@ -1020,7 +1020,7 @@ OnTouch: mes "[" + strcharinfo(0) + "]"; mes "Here you go,"; mes "take this."; - Zeny -=50; + set Zeny, Zeny-50; next; mes "[Beggar]"; mes "Thank you so much."; diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt index 87d7b4b35..adb01b867 100644 --- a/npc/cities/louyang.txt +++ b/npc/cities/louyang.txt @@ -70,7 +70,7 @@ mes "Ready!"; mes "Have fun!"; close2; - Zeny -=10000; + set Zeny, Zeny-10000; warp "lou_fild01",190,101; end; } @@ -292,7 +292,7 @@ lou_in01,25,23,5 script Friendly Looking Lady#lo 4_F_CHNDRESS3,{ mes "We are trying to provide you with the best of service. Please"; mes "come again."; next; - Zeny -=500; + set Zeny, Zeny-500; warp "lou_in01",17,19; end; case 3: diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index 8bcb8fa2b..d2afe9d8d 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -722,7 +722,7 @@ morocc_in,166,76,3 script Bartender#02 1_ETC_01,{ switch(select("Tropical Sograt:Vemillion the Beach:Nothing.")) { case 1: if (Zeny >= 1000 ) { - Zeny -=1000; + set Zeny, Zeny-1000; getitem 12112,1; mes "[Bartender]"; mes "Here you go."; @@ -733,7 +733,7 @@ morocc_in,166,76,3 script Bartender#02 1_ETC_01,{ break; case 2: if (Zeny >= 1000 ) { - Zeny -=1000; + set Zeny, Zeny-1000; getitem 12113,1; mes "[Bartender]"; mes "Here you go."; diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt index ac6ef0bb4..4872f94e0 100644 --- a/npc/cities/moscovia.txt +++ b/npc/cities/moscovia.txt @@ -77,7 +77,7 @@ mes "[Moscovia P.R. Officer]"; mes "Ok then, we're leaving now."; close2; - Zeny -= 10000; + set Zeny,Zeny - 10000; warp "moscovia",163,55; end; } diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt index 3bbe52908..5a4bb811d 100644 --- a/npc/cities/payon.txt +++ b/npc/cities/payon.txt @@ -253,7 +253,7 @@ payon,210,110,1 script Drunkard#payon 2_M_PHARMACIST,{ next; switch(select("Alright, but only one drink.:No thanks, pal.:Oh my God! Hell no!")) { case 1: - Zeny = (Zeny < 100) ? 0 : (Zeny - 100); + set Zeny, (Zeny < 100)?0:(Zeny - 100); mes "[Drunkard]"; mes "Thanks...!"; mes "..Brother!"; diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt index 8e1181486..88bbcb36f 100644 --- a/npc/cities/umbala.txt +++ b/npc/cities/umbala.txt @@ -76,7 +76,7 @@ comodo,171,137,1 script Haith#um 4_F_03,{ next; if (select("Pay 1,000 zeny:Refuse to pay") == 1) { if (Zeny > 999) { - Zeny -=1000; + set Zeny, Zeny-1000; mes "[Haith]"; mes "Hahahaha! You the man!"; next; @@ -273,7 +273,7 @@ umbala,70,106,3 script Utan Kid#um 4_F_UMGIRL,{ mes "You the man~!"; mes "Thank you so much, yay~!"; if (Zeny > 1000) { - Zeny -=1000; + set Zeny, Zeny-1000; if (checkweight(517,1)) { getitem 517,1; //Meat } @@ -334,7 +334,7 @@ umbala,70,106,3 script Utan Kid#um 4_F_UMGIRL,{ mes "Um~bahumbah~ Um~baumbah~"; mes "Um~baumbah~ um~baumbah~"; if (Zeny > 1000) { - Zeny -=1000; + set Zeny, Zeny-1000; if (checkweight(517,1)) { getitem 517,1; //Meat } diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt index eda2b8c1a..c1432c4c2 100644 --- a/npc/cities/yuno.txt +++ b/npc/cities/yuno.txt @@ -76,7 +76,7 @@ yuno,337,227,4 script Juno Granny#juno 8_F_GRANDMOTHER,{ mes "[Granny]"; mes "*Giggle*"; mes "There you go~"; - Zeny -=1000; + set Zeny, Zeny-1000; getitem 529,1; //Candy next; mes "[Granny]"; @@ -167,7 +167,7 @@ yuno,165,111,4 script Juno Sage#juno 2_F_MAGICMASTER,,{ if (select("Choose ^FF3355Red Herb^000000:Choose ^3355FFBlue Herb^000000.") == 1) { mes "[Le Morpheus]"; mes "As you have chosen, you will forget everything, and remain in this virtual reality."; - Zeny -=5000; + set Zeny, Zeny-5000; getitem 507,1; //Red_Herb close2; warp "prontera",182,206; @@ -175,7 +175,7 @@ yuno,165,111,4 script Juno Sage#juno 2_F_MAGICMASTER,,{ } mes "[Le Morpheus]"; mes "You will see the truth."; - Zeny -=5000; + set Zeny, Zeny-5000; getitem 510,1; //Blue_Herb close2; warp "pay_dun03",200,222; @@ -378,7 +378,7 @@ yuno,142,183,5 script Airship Representative 4W_SAILOR,{ S_Warp: if (Zeny >= 1800) { - Zeny -=1800; + set Zeny, Zeny-1800; warp getarg(0),getarg(1),getarg(2); end; } diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt index e1a74936b..887e03404 100644 --- a/npc/custom/card_remover.txt +++ b/npc/custom/card_remover.txt @@ -88,7 +88,7 @@ prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{ } mes "[Wise Old Woman]"; mes "Very well. I shall begin."; - Zeny -= (.zenycost+(.@cardcount * .percardcost)); + set Zeny,Zeny - (.zenycost+(.@cardcount * .percardcost)); delitem 1000,1; delitem 715,1; diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt index 7b569a3d5..51e3e7e74 100644 --- a/npc/custom/etc/bank.txt +++ b/npc/custom/etc/bank.txt @@ -42,8 +42,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's close; } else { - Zeny -= @deposit; - Zeny -= @cost; + set Zeny,Zeny - @deposit; + set Zeny,Zeny - @cost; set #bankstorage,#bankstorage + @deposit; mes "[Banker]"; mes "Thank you very much... Your zeny is in good hands."; @@ -80,8 +80,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's set #bankstorage,#bankstorage - @cost; set @cost,0; next; - Zeny -= @cost; - Zeny += @withdrawl; + set Zeny,Zeny - @cost; + set Zeny,Zeny + @withdrawl; set #bankstorage,#bankstorage - @withdrawl; mes "[Banker]"; mes "There's your Zeny. Have a good day."; @@ -93,8 +93,8 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's } } else { - Zeny -= @cost; - Zeny += @withdrawl; + set Zeny,Zeny - @cost; + set Zeny,Zeny + @withdrawl; set #bankstorage,#bankstorage - @withdrawl; mes "[Banker]"; mes "There's your Zeny. Have a good day."; diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt index 396d45de2..48086abbd 100644 --- a/npc/custom/etc/bank_kafra.txt +++ b/npc/custom/etc/bank_kafra.txt @@ -48,7 +48,7 @@ L_NoIncomeToday: if(@kafrabank<1000) goto L_LESS_1000; if(@kafrabank>Zeny) goto L_NOT_ENOUGH; - Zeny -=@kafrabank; + set Zeny,Zeny-@kafrabank; set #kafrabank,#kafrabank+@kafrabank; mes"[Maniss]"; mes "You've made a deposit of ^135445" + @kafrabank + "z^000000."; @@ -67,7 +67,7 @@ M_WITHDRAW: if(@kafrabank<1) goto B_EXIT2; if(@kafrabank>#kafrabank) goto L_NOT_ENOUGH; set #kafrabank,#kafrabank-@kafrabank; - Zeny +=@kafrabank; + set Zeny,Zeny+@kafrabank; mes"[Maniss]"; mes "Here is your ^135445" + @kafrabank + "z^000000, put your sign here..."; //we log these zeny operations into the log db diff --git a/npc/custom/etc/blackjack.txt b/npc/custom/etc/blackjack.txt index b86316706..8fe70ad72 100644 --- a/npc/custom/etc/blackjack.txt +++ b/npc/custom/etc/blackjack.txt @@ -233,12 +233,12 @@ sL_Win: mes "[Dealer]"; mes "Congratulations, you've won!"; next; - Zeny += @bet; + set Zeny, Zeny + @bet; goto L_Play; sL_Lose: mes "[Dealer]"; mes "I'm sorry but you've lost."; - Zeny -= @bet; + set Zeny, Zeny - @bet; next; goto L_Play; sL_Push: diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt index 4ad9ec0d2..26c4afa9f 100644 --- a/npc/custom/etc/lottery.txt +++ b/npc/custom/etc/lottery.txt @@ -107,7 +107,7 @@ L_Buy: next; menu "Buy Ticket",-,"Cancel",L_Cancel; if (Zeny < $L_TicketPrice) goto L_NoZeny; - Zeny -=$L_TicketPrice; + set Zeny,Zeny-$L_TicketPrice; mes "[Lottery]"; mes "Would you like your numbers hand picked or computer generated?"; next; @@ -292,7 +292,7 @@ LWinBig: mes "You have matched all six numbers!"; mes "Jackpot!"; mes "You've won ^0000FF" + $L_Prize_Money + "z^000000."; - Zeny +=$L_Prize_Money; + set Zeny,Zeny+$L_Prize_Money; announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8; set #LID,0; close; @@ -302,7 +302,7 @@ LWinSmall: mes "[Lottery]"; mes "You have matched at least 4 numbers!"; mes "You've won ^0000FF" + $L_Prize_Money_Small + "z^000000."; - Zeny +=$L_Prize_Money_Small; + set Zeny,Zeny+$L_Prize_Money_Small; announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8; set #LID,0; close; diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt index 97b6ca8de..f0ec34f0a 100644 --- a/npc/custom/etc/marriage.txt +++ b/npc/custom/etc/marriage.txt @@ -716,7 +716,7 @@ function SF_TryRegister { mes "Come back once you have collected "+@cost+"z."; close; } - Zeny -=@cost; + set Zeny,Zeny-@cost; sc_start SC_WEDDING,3600000,1; //Start Wedding Effect (SC_WEDDING) if (@bride) { set $wed_bride_progress,1; @@ -911,7 +911,7 @@ function SF_InProgress { emotion e_swt2; close; } - Zeny -=$@wed_divorce_fee; + set Zeny,Zeny-$@wed_divorce_fee; announce $@divorcer$+" has just divorced "+strcharinfo(0)+"...", 8; mes "["+@name$+"]"; mes "Your divorce has been filed. You are no longer wed."; diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt index 81ac93eab..90fd500f6 100644 --- a/npc/custom/etc/monster_arena.txt +++ b/npc/custom/etc/monster_arena.txt @@ -289,7 +289,7 @@ gon_test,52,103,6 script Monster Trainer 4_M_BARBER,{ menu "Yes",-,"No",L_Exit; if (Zeny < 1000) goto L_NoZeny; - Zeny -=1000; + set Zeny,Zeny-1000; set #monster,10; mes "[Monster Trainer]"; mes "Congratulations!"; @@ -327,7 +327,7 @@ L_Sell: if (@sellexp > #monpoints) goto L_NoExp; set #monpoints,#monpoints-@sellexp; set @sellearn,100*@sellexp; // Price of exp - Zeny +=@sellearn; + set Zeny,Zeny+@sellearn; mes "[Monster Trainer]"; mes "You earned ^0000FF" + @sellearn + "^000000z."; close; diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt index d64cd63d2..d86c9dc94 100644 --- a/npc/custom/etc/penal_servitude.txt +++ b/npc/custom/etc/penal_servitude.txt @@ -43,7 +43,7 @@ M_PAY: M_PAYCASH: if (@MUSTPAY>Zeny) goto L_NOCASH; - Zeny -=@MUSTPAY; + set Zeny,Zeny-@MUSTPAY; mes "[Saddeus]"; mes "OK, sing here and there."; goto L_RELEASE; diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index c1b63ebed..62ea56c93 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/npc/custom/etc/quest_warper.txt @@ -323,11 +323,11 @@ L_town: if (@Tmenuref[@TWMenu-1] == 57005) goto L_End; // 57005='dead' in hex if(Zeny<@pTprice[@Tmenuref[@TWMenu-1]]) callsub L_Short_on_zeny,0; - Zeny -=@pTprice[@Tmenuref[@TWMenu-1]]; + set Zeny, Zeny-@pTprice[@Tmenuref[@TWMenu-1]]; if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@pTprice[@Tmenuref[@TWMenu-1]]/16); warp @pTmap$[@Tmenuref[@TWMenu-1]],@pTXcoords[@Tmenuref[@TWMenu-1]],@pTYcoords[@Tmenuref[@TWMenu-1]]; close2; - Zeny +=@pTprice[@Tmenuref[@TWMenu-1]]; + set Zeny, Zeny+@pTprice[@Tmenuref[@TWMenu-1]]; end; //=========================Dungeons================================ @@ -361,11 +361,11 @@ L_dungeon: set @warpprice, @pDprice[@Dmenuref[@DWMenu-1]]+(getd(@pDfee$[@Dmenuref[@DWMenu-1]])*(@DDepth[@Darrayref])); if(Zeny<@warpprice) callsub L_Short_on_zeny,1; - Zeny -=(@warpprice); + set Zeny, Zeny-(@warpprice); if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@warpprice/16); warp @DGat$[@Darrayref],@DXcoords[@Darrayref],@DYcoords[@Darrayref]; close2; - Zeny +=@pTprice[@Tmenuref[@DWMenu-1]]; + set Zeny, Zeny+@pTprice[@Tmenuref[@DWMenu-1]]; end; //=============================Healing============================= @@ -373,7 +373,7 @@ L_dungeon: L_heal_Full: set @healfee, $QW_HF_PRICE; if(Zeny<@healfee) callsub L_Short_on_zeny,4; - Zeny -=@healfee; + set Zeny, Zeny-@healfee; if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@healfee/500); next; mes "[Warpra]"; @@ -408,7 +408,7 @@ PHeal: if (getarg(0) == 1)&&(getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_Short_Both; if (getarg(0) == 1)&&(Zeny<@healfee) goto Zeny_short_HP; if (getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_short_SP; - Zeny -=@healfee; + set Zeny, Zeny-@healfee; if (getarg(0) == 1)&&(getarg(1) == 1) percentheal 100,100; if (getarg(0) == 1) percentheal 100,0; if (getarg(1) == 1) percentheal 0,100; @@ -430,7 +430,7 @@ Zeny_short_HP: set @HpPrice, @Hp*$QW_HP_H_PRICE; if (@Hp == 1) mes "You're not worth the effort."; if (@Hp == 1) goto L_End; - Zeny -=@HpPrice; + set Zeny, Zeny-@HpPrice; heal @Hp,0; close; end; @@ -443,7 +443,7 @@ Zeny_short_SP: set @SpPrice, @Sp*$QW_HP_S_PRICE; if (@Sp == 1) mes "You're not worth the effort."; if (@Sp == 1) goto L_End; - Zeny -=@SpPrice; + set Zeny, Zeny-@SpPrice; heal 0,@Sp; close; end; @@ -457,7 +457,7 @@ L_Storage: if ($QW_S_PRICE == 60)&&(BaseJob == Job_Novice) set @fee, 30; if ($QW_S_PRICE == 60)&&(BaseJob != Job_Novice) set @fee, 60; if(Zeny<@fee) callsub L_Short_on_zeny,2; - Zeny -=@fee; + set Zeny, Zeny-@fee; if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@fee/5); mes "[Warpra]"; @@ -491,7 +491,7 @@ L_GStorage: end; } if (Zeny<$QW_GS_PRICE) callsub L_Short_on_zeny,3; - Zeny -=$QW_GS_PRICE; + set Zeny, Zeny-$QW_GS_PRICE; if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + ($QW_GS_PRICE/5); next; mes "[Warpra]"; diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt index 8c2be6f9f..29b8384fe 100644 --- a/npc/custom/etc/shifty_assassin.txt +++ b/npc/custom/etc/shifty_assassin.txt @@ -55,7 +55,7 @@ M_Buy: next; menu "Continue",-,"Cancel",M_Exit; - Zeny -=@price; + set Zeny,Zeny-@price; set #ninjas,#ninjas+@buy; set $ninja_avail,$ninja_avail-@buy; diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt index 9d5208880..7cd284ef9 100644 --- a/npc/custom/etc/stock_market.txt +++ b/npc/custom/etc/stock_market.txt @@ -278,14 +278,14 @@ S_Sell: input @sellamount; if (@sellamount < 1) goto S_SellInv; if (Zeny < $S_Trans) goto S_NoZeny; - Zeny -=$S_Trans; + set Zeny,Zeny-$S_Trans; SELLS1: if (@sellname$ != $S1N$) goto SELLS2; if (@sellamount > #S1) goto S_SellTooHigh; set @price,@sellamount*$S1; set #S1,#S1-@sellamount; - Zeny +=@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S1N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -297,7 +297,7 @@ SELLS2: if (@sellamount > #S2) goto S_SellTooHigh; set @price,@sellamount*$S2; set #S2,#S2-@sellamount; - Zeny +=@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S2N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -309,7 +309,7 @@ SELLS3: if (@sellamount > #S3) goto S_SellTooHigh; set @price,@sellamount*$S3; set #S3,#S3-@sellamount; - Zeny +=@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S3N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -321,7 +321,7 @@ SELLS4: if (@sellamount > #S4) goto S_SellTooHigh; set @price,@sellamount*$S4; set #S4,#S4-@sellamount; - Zeny +=@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S4N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -333,7 +333,7 @@ SELLS5: if (@sellamount > #S5) goto S_SellTooHigh; set @price,@sellamount*$S5; set #S5,#S5-@sellamount; - Zeny +=@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S5N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -345,7 +345,7 @@ SELLS6: if (@sellamount > #S6) goto S_SellTooHigh; set @price,@sellamount*$S6; set #S6,#S6-@sellamount; - Zeny +=@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S6N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -357,7 +357,7 @@ SELLS7: if (@sellamount > #S7) goto S_SellTooHigh; set @price,@sellamount*$S7; set #S7,#S7-@sellamount; - Zeny +=@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S7N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -369,7 +369,7 @@ SELLS8: if (@sellamount > #S8) goto S_SellTooHigh; set @price,@sellamount*$S8; set #S8,#S8-@sellamount; - Zeny +=@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S8N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -381,7 +381,7 @@ SELLS9: if (@sellamount > #S9) goto S_SellTooHigh; set @price,@sellamount*$S9; set #S9,#S9-@sellamount; - Zeny +=@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S9N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -393,7 +393,7 @@ SELLS10: if (@sellamount > #S10) goto S_SellTooHigh; set @price,@sellamount*$S10; set #S10,#S10-@sellamount; - Zeny +=@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S10N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -443,7 +443,7 @@ S_Buy: if (@buyamount < $S_BuyMin) goto S_TooLow; if (@buyamount > $S_BuyMax) goto S_TooHigh; if (Zeny < $S_Trans) goto S_NoZeny; - Zeny -=$S_Trans; + set Zeny,Zeny-$S_Trans; // Purchases the shares // @@ -453,7 +453,7 @@ PURS1: if (Zeny < @price) goto S_NoZeny; set #S1,#S1+@buyamount; set @price,@buyamount*$S1; - Zeny -=@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S1N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -464,7 +464,7 @@ PURS2: set @price,@buyamount*$S2; if (Zeny < @price) goto S_NoZeny; set #S2,#S2+@buyamount; - Zeny -=@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S2N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -475,7 +475,7 @@ PURS3: set @price,@buyamount*$S3; if (Zeny < @price) goto S_NoZeny; set #S3,#S3+@buyamount; - Zeny -=@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S3N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -486,7 +486,7 @@ PURS4: set @price,@buyamount*$S4; if (Zeny < @price) goto S_NoZeny; set #S4,#S4+@buyamount; - Zeny -=@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S4N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -497,7 +497,7 @@ PURS5: set @price,@buyamount*$S5; if (Zeny < @price) goto S_NoZeny; set #S5,#S5+@buyamount; - Zeny -=@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S5N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -508,7 +508,7 @@ PURS6: set @price,@buyamount*$S6; if (Zeny < @price) goto S_NoZeny; set #S6,#S6+@buyamount; - Zeny -=@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S6N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -519,7 +519,7 @@ PURS7: set @price,@buyamount*$S7; if (Zeny < @price) goto S_NoZeny; set #S7,#S7+@buyamount; - Zeny -=@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S7N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -530,7 +530,7 @@ PURS8: set @price,@buyamount*$S8; if (Zeny < @price) goto S_NoZeny; set #S8,#S8+@buyamount; - Zeny -=@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S8N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -541,7 +541,7 @@ PURS9: set @price,@buyamount*$S9; if (Zeny < @price) goto S_NoZeny; set #S9,#S9+@buyamount; - Zeny -=@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S9N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -552,7 +552,7 @@ PURS10: set @price,@buyamount*$S10; if (Zeny < @price) goto S_NoZeny; set #S10,#S10+@buyamount; - Zeny -=@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S10N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt index 5a94bc913..7f12e5325 100644 --- a/npc/custom/events/valentinesdayexp.txt +++ b/npc/custom/events/valentinesdayexp.txt @@ -105,7 +105,7 @@ M_CHOCO: if (@flag_num > 5) goto L_ERR; set @needmon,@flag_num*5000; if (Zeny < @needmon) goto L_NOTENO; - Zeny -= @needmon; + set Zeny,Zeny - @needmon; getitem 558,@flag_num; mes "[Stephen]"; mes "There you go!"; @@ -167,7 +167,7 @@ M_CHOCO: set @needmon,@flag_num*4500; if (Zeny < @needmon) goto L_NOTENO; if (countitem(519) < @flag_num) goto L_NOMILK; - Zeny -= @needmon; + set Zeny,Zeny - @needmon; delitem 519,@flag_num; getitem 561,@flag_num; mes "[Jainie]"; diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt index 211b7c023..e11e2a647 100644 --- a/npc/custom/healer.txt +++ b/npc/custom/healer.txt @@ -22,7 +22,7 @@ message strcharinfo(0),"Healing costs "+.@price+" Zeny."; if (Zeny < .@price) end; if(select("^0055FFHeal^000000:^777777Cancel^000000") == 2) end; - Zeny -=.@price; + set Zeny, Zeny-.@price; } specialeffect2 EF_HEAL2; percentheal 100,100; if (.@Buffs) { diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt index 6796a21c8..3cd66234b 100644 --- a/npc/custom/item_signer.txt +++ b/npc/custom/item_signer.txt @@ -121,7 +121,7 @@ prt_in,24,61,7 script Perchik 1_M_01,{ emotion e_wah; close; } - if (.@price) Zeny -=.@price; + if (.@price) set Zeny, Zeny-.@price; if (getarraysize(.@item)) for(set .@i,0; .@i 9) goto N_GetZeny10k; @@ -59,7 +59,7 @@ N_10T: close; N_GetZeny10k: set #Treasure_Token,#Treasure_Token-10; - Zeny +=10000; + set Zeny,Zeny+10000; close; N_100T: if (#Treasure_Token > 99) goto N_GetZeny100k; @@ -67,7 +67,7 @@ N_100T: close; N_GetZeny100k: set #Treasure_Token,#Treasure_Token-100; - Zeny +=100000; + set Zeny,Zeny+100000; close; N_BuyWeps: diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt index bd8f5e930..ae86ea035 100644 --- a/npc/custom/resetnpc.txt +++ b/npc/custom/resetnpc.txt @@ -33,7 +33,7 @@ prontera,150,193,4 script Reset Girl 4_F_TELEPORTER,{ mes "Sorry, you don't have enough Zeny."; close; } - Zeny -=.@ResetSkill; + set Zeny, Zeny-.@ResetSkill; sc_end SC_ALL; resetskill; mes "There you go!"; @@ -44,7 +44,7 @@ prontera,150,193,4 script Reset Girl 4_F_TELEPORTER,{ mes "Sorry, you don't have enough Zeny."; close; } - Zeny -=.@ResetStat; + set Zeny, Zeny-.@ResetStat; resetstatus; mes "There you go!"; close; @@ -54,7 +54,7 @@ prontera,150,193,4 script Reset Girl 4_F_TELEPORTER,{ mes "Sorry, you don't have enough Zeny."; close; } - Zeny -=.@ResetBoth; + set Zeny, Zeny-.@ResetBoth; sc_end SC_ALL; resetskill; resetstatus; 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!!!"; diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index 7bc672ee5..f47beaf33 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -383,7 +383,7 @@ OnRecvCastle: cutin "",255; end; } - Zeny -= 200; + set Zeny, Zeny - 200; set RESRVPTS,RESRVPTS+2; close2; warp .@destination$[1],.@coordinates[0],.@coordinates[1]; @@ -435,7 +435,7 @@ OnRecvCastle: end; } set RESRVPTS,RESRVPTS+8; - Zeny -= 800; + set Zeny, Zeny - 800; setcart; close2; cutin "",255; @@ -689,7 +689,7 @@ OnRecvCastle: mes "I'm sorry but there is not enough zeny to invest. You will have to try again when you have the funds, Master."; close; } - Zeny -= .@eco_invest; + set Zeny, Zeny - .@eco_invest; setcastledata strnpcinfo(2),4,getcastledata(strnpcinfo(2),4)+1; mes "[ "+strnpcinfo(1)+"]"; mes "We finished the investment safely. I expect that our growth level will be increased by tomorrow."; @@ -755,7 +755,7 @@ OnRecvCastle: mes "I'm sorry but there is not enough zeny to invest. You will have to try again when you have the funds, Master."; close; } - Zeny -= .@def_invest; + set Zeny, Zeny - .@def_invest; setcastledata strnpcinfo(2),5,getcastledata(strnpcinfo(2),5)+1; mes "[ "+strnpcinfo(1)+"]"; mes "We finished the investment safely. I expect that our Castle Defense level will be increased by tomorrow."; @@ -803,7 +803,7 @@ OnRecvCastle: mes "Well... I'm sorry but we don't have funds to summon the Guardian. We failed to summon the Guardian."; close; } - Zeny -= 10000; + set Zeny, Zeny - 10000; setcastledata strnpcinfo(2),.@GDnum,1; // mark as 'installed' set .@UseGID,.@GDnum - 10; if (.@guardiantype[.@UseGID] == 1) { set .@type,1287; } @@ -870,7 +870,7 @@ OnRecvCastle: mes "Well... I'm sorry but we don't have enough funds to hire a Kafra Employee."; close; } - Zeny -= 10000; + set Zeny, Zeny - 10000; enablenpc "Kafra Staff#"+strnpcinfo(2); setcastledata strnpcinfo(2),9,1; mes "["+strnpcinfo(1)+"]"; diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index 7a8793523..685900792 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -330,7 +330,7 @@ OnTreasureDied: mes "for the guild today."; close; } - Zeny -=.@eco_invest; + set Zeny, Zeny-.@eco_invest; setcastledata strnpcinfo(4),4,getcastledata(strnpcinfo(4),4)+1; mes "[ Steward ]"; mes "A wise use of the guild's"; @@ -418,7 +418,7 @@ OnTreasureDied: mes "for the guild today."; close; } - Zeny -=.@def_invest; + set Zeny, Zeny-.@def_invest; setcastledata strnpcinfo(4),5,getcastledata(strnpcinfo(4),5)+1; mes "[ Steward ]"; mes "A wise use of the guild's"; @@ -510,7 +510,7 @@ OnTreasureDied: mes "funds to pay the contract fee."; close; } - Zeny -=10000; + set Zeny, Zeny-10000; enablenpc "Kafra Employee#"+strnpcinfo(2); setcastledata strnpcinfo(4),9,1; mes "[ Steward ]"; @@ -871,7 +871,7 @@ OnInit: cutin "kafra_01",255; end; } - Zeny -=200; + set Zeny, Zeny-200; warp "rachel",115,125; end; case 2: @@ -909,7 +909,7 @@ OnInit: cutin "kafra_01",255; end; } - Zeny -=800; + set Zeny, Zeny-800; setcart; break; case 2: diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index 0d7993dac..536edcce8 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -159,7 +159,7 @@ alberta,214,77,6 script Captain Janssen 4_M_SEAMAN,{ else { mes "[Captain Janssen]"; mes "Excellent! Now we're good to go. Let's pull up the anchor again!"; - Zeny -=10000; + set Zeny, Zeny-10000; close2; warp "e_tower",70,114; end; @@ -199,7 +199,7 @@ alberta,214,77,6 script Captain Janssen 4_M_SEAMAN,{ next; mes "[Captain Janssen]"; mes "Thank you so much! Now I can stock up on food and materials for my ship. You're kind, very kind!"; - Zeny -=10000; + set Zeny, Zeny-10000; set in_102tower,1; close; } diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index bf02d3438..ffa2d979d 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -289,7 +289,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ delitem 2256,1; //Magestic_Goat delitem 7799,30; //Dark_Crystal delitem 7798,50; //Dark_Debris - Zeny -=990000; + set Zeny, Zeny-990000; completequest 3043; getitem 5374,1; //L_Magestic_Goat mes "[Rust Blackhand]"; 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"; diff --git a/npc/kafras/cool_event_corp.txt b/npc/kafras/cool_event_corp.txt index 4f0f88329..e06f0dedc 100644 --- a/npc/kafras/cool_event_corp.txt +++ b/npc/kafras/cool_event_corp.txt @@ -56,7 +56,7 @@ hugel,88,168,4 script Cool Event Corp. Staff::CoolEventCorpStaffHugel 4_M_ZONDAM close2; break; } - Zeny -= 40; + set Zeny, Zeny - 40; mes "Let me open your personal"; mes "storage for you right away."; mes "Thanks for supporting Cool"; @@ -110,7 +110,7 @@ hugel,88,168,4 script Cool Event Corp. Staff::CoolEventCorpStaffHugel 4_M_ZONDAM mes "Zeny to pay the Pushcart"; mes "rental fee of 800 Zeny."; } else { - Zeny -= 800; + set Zeny, Zeny - 800; setcart; } } @@ -172,7 +172,7 @@ rachel,109,138,5 script Cool Event Corp. Staff::CoolEventCorpStaffRachel 4_M_ZON close2; break; } - Zeny -= 40; + set Zeny, Zeny - 40; mes "Let me open your personal"; mes "storage for you right away."; mes "Thanks for supporting Cool"; @@ -192,7 +192,7 @@ rachel,109,138,5 script Cool Event Corp. Staff::CoolEventCorpStaffRachel 4_M_ZON delitem 7060,1; } else { - Zeny -=2200; + set Zeny,Zeny-2200; } warp "veins",205,101; cutin "",255; @@ -252,7 +252,7 @@ rachel,109,138,5 script Cool Event Corp. Staff::CoolEventCorpStaffRachel 4_M_ZON mes "Zeny to pay the Pushcart"; mes "rental fee of 800 Zeny."; } else { - Zeny -= 800; + set Zeny, Zeny - 800; setcart; } } @@ -314,7 +314,7 @@ veins,208,128,5 script Cool Event Corp. Staff::CoolEventCorpStaffVeins 4_M_ZONDA close2; break; } - Zeny -= 40; + set Zeny, Zeny - 40; mes "Let me open your personal"; mes "storage for you right away."; mes "Thanks for supporting Cool"; @@ -334,7 +334,7 @@ veins,208,128,5 script Cool Event Corp. Staff::CoolEventCorpStaffVeins 4_M_ZONDA delitem 7060,1; } else { - Zeny -=2200; + set Zeny,Zeny-2200; } warp "rachel",115,125; cutin "",255; @@ -395,7 +395,7 @@ veins,208,128,5 script Cool Event Corp. Staff::CoolEventCorpStaffVeins 4_M_ZONDA mes "rental fee of 800 Zeny."; close2; } else { - Zeny -= 800; + set Zeny, Zeny - 800; setcart; } } diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index 1547d4b0f..3a76e8259 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -534,7 +534,7 @@ function script F_VoteKafra { case 1: if (Zeny >= 4000) { cutin "",255; - Zeny -=4000; + set Zeny, Zeny-4000; warp "xmas_dun02",130,123; end; } @@ -558,7 +558,7 @@ function script F_VoteKafra { switch(select("Toy Factory, Level 2 -> 4,000 z:Clock Tower, Level 3 -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "xmas_dun02",130,123; end; @@ -574,7 +574,7 @@ function script F_VoteKafra { break; case 2: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "alde_dun03",265,22; end; @@ -599,7 +599,7 @@ function script F_VoteKafra { switch(select("Toy Factory, Level 2 -> 4,000 z:Clock Tower, Level 3 -> 4,000 z:Lava Dungeon, Level 2 -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "xmas_dun02",130,123; end; @@ -615,7 +615,7 @@ function script F_VoteKafra { break; case 2: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "alde_dun03",265,22; end; @@ -631,7 +631,7 @@ function script F_VoteKafra { break; case 3: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "kafra_09",255; warp "mag_dun02",47,40; end; @@ -933,7 +933,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "iz_dun02",234,206; end; @@ -961,7 +961,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Clock Tower, 3rd Floor -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "iz_dun02",234,206; end; @@ -976,7 +976,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ break; case 2: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "c_tower3",64,143; end; @@ -1011,7 +1011,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Clock Tower, 3rd Floor -> 4,000 z:Glast Heim Entrance -> 4,000 z:Cancel")) { case 1: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "iz_dun02",234,206; end; @@ -1026,7 +1026,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ break; case 2: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "c_tower3",64,143; end; @@ -1041,7 +1041,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{ break; case 3: if (Zeny >= 4000) { - Zeny -=4000; + set Zeny, Zeny-4000; cutin "zonda_01",255; warp "glast_01",368,303; end; diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index e53e71696..2edf0990b 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -251,7 +251,7 @@ function script F_KafStor { mes "Storage access fee is "+getarg(1)+" zeny."; return; } - Zeny -=getarg(1); + set Zeny, Zeny-getarg(1); set RESRVPTS, RESRVPTS + (getarg(1)/5); } } @@ -308,7 +308,7 @@ function script F_KafTele { cutin "", 255; end; } - Zeny -= @wrpP[.@j]; + set Zeny, Zeny - @wrpP[.@j]; set RESRVPTS, RESRVPTS + (@wrpP[.@j]/16); } cutin "", 255; @@ -371,7 +371,7 @@ function script F_KafCart { mes "rental fee of "+getarg(1)+" zeny."; return 1; } - Zeny -=getarg(1); + set Zeny,Zeny-getarg(1); set RESRVPTS, RESRVPTS + 48; } setcart; @@ -504,7 +504,7 @@ function script F_SetKafCode { emotion e_cash; break; } - Zeny -=1000; + set Zeny,Zeny-1000; if(@code == #kafra_code) { set #kafra_code,0; mes "You've successfully cleared your storage password."; @@ -548,7 +548,7 @@ S_SET: emotion e_cash; return; } - Zeny -=5000; + set Zeny,Zeny-5000; set #kafra_code,@code; mes "You've protected your storage with a secret password."; mes "Thank you for using "+getarg(1)+"."; diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt index 2858af7b3..acdff608d 100644 --- a/npc/kafras/kafras.txt +++ b/npc/kafras/kafras.txt @@ -66,7 +66,7 @@ aldeba_in,96,181,4 script Kafra Service 4_F_KAFRA5,{ mes "and administrative functions,"; mes "I'll access your Storage for you."; next; - Zeny -=20; + set Zeny, Zeny-20; set RESRVPTS, RESRVPTS + (20/5); mes "[Kafra Leilah]"; mes "In the future, please"; diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt index 853e82f5e..57528e2b4 100644 --- a/npc/merchants/advanced_refiner.txt +++ b/npc/merchants/advanced_refiner.txt @@ -147,7 +147,7 @@ S_RefineValidate: } if (countitem(getarg(1)) > 0 && Zeny > getarg(2)) { delitem getarg(1),1; - Zeny -= getarg(2); + set Zeny, Zeny - getarg(2); return; } mes "[Suhnbi]"; diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index 9ae092fa8..af0cbc7d9 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -78,7 +78,7 @@ alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{ mes "in your inventory."; close; } - Zeny -=.@sell; + set Zeny, Zeny-.@sell; getitem 7134,.@input; //Medicine_Bowl mes "[Gever Al Sharp]"; mes "Thank you."; @@ -151,7 +151,7 @@ S_SellManual: mes "That'll be "+getarg(1)+" zeny."; next; if (select("Purchase.:Quit.") == 1) { - Zeny -=getarg(1); + set Zeny, Zeny-getarg(1); getitem getarg(0),1; mes "[Gever Al Sharp]"; mes "Thank you for"; diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index 2d30e81de..6501a7c6c 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -107,7 +107,7 @@ function script Func_Casing { mes "for visiting my shop, and"; mes "I hope that you use all"; mes "of your ammo wisely."; - Zeny -=500*.@amount; + set Zeny,Zeny-500*.@amount; delitem getarg(0),500*.@amount; getitem getarg(1),.@amount; close; diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index ce9896ad9..f77a45197 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -62,7 +62,7 @@ que_job01,68,84,1 script Black Marketeer#Buying 4_M_SITDOWN,{ mes "Mr. Hugh, I'll take over your license business. You'll see!"; mes "*Giggle Giggle*"; getitem 12548,.@input; //Shabby_Purchase_Street - Zeny -=(.@input*500); + set Zeny,Zeny-(.@input*500); } close; } @@ -126,7 +126,7 @@ alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{ } else { mes "Thank you for your patronage."; getitem 6377,.@input; //Buy_Stall_Permit - Zeny -=(.@input*200); + set Zeny,Zeny-(.@input*200); } close; } @@ -210,7 +210,7 @@ alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{ mes .@name$+"...."; mes "I like your handwriting."; mes "Okay, you're now approved to open the Bulk Buyer Shop."; - Zeny -=10000; + set Zeny,Zeny-10000; getitem 6377,5; //Buy_Stall_Permit skill "ALL_BUYING_STORE",1,3; next; diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index 1af1cfd4e..39a12cbc1 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -166,7 +166,7 @@ function Dyes { close; } delitem .@DyeItems[getarg((.@s-1)*2)],1; - Zeny -=10000; + set Zeny, Zeny-10000; setlook 7, ((.@s)?(getarg((.@s-1)*2+1)):0); mes "Your clothes have been dyed "+((.@s)?.@DyeName$[getarg((.@s-1)*2)]:.@DyeName$[0])+"."; close; diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt index 69475bf71..f25954cb3 100644 --- a/npc/merchants/dye_maker.txt +++ b/npc/merchants/dye_maker.txt @@ -182,7 +182,7 @@ S_MakeDye: // delete items for (set .@i, 0; .@i < .@size ; set .@i, .@i+1) delitem .@item[.@i], .@count[.@i]; - Zeny -=.@cost; + set Zeny, Zeny-.@cost; // get dyestuff getitem .@dyestuff,1; diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt index 02fd749fe..2de5a6fe5 100644 --- a/npc/merchants/enchan_arm.txt +++ b/npc/merchants/enchan_arm.txt @@ -93,7 +93,7 @@ S_EnchantArmor: close; } progressbar "ffff00",7; - Zeny -=400000; + set Zeny, Zeny-400000; delitem .@itemid,1; switch (rand(1,.@failrate)) { case 1: set .@addpart,4702;break; diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt index e5fd3ab27..fc1113603 100644 --- a/npc/merchants/hair_dyer.txt +++ b/npc/merchants/hair_dyer.txt @@ -109,7 +109,7 @@ prt_in,243,168,4 script Jovovich 4_F_02,{ case 7: delitem 983,1; break; //Black_Dyestuffs case 8: delitem 975,1; break; //Scarlet_Dyestuffs } - Zeny -=1000; + set Zeny, Zeny-1000; setlook VAR_HEADPALETTE,.@headpalette; set .@choose_success,1; break; @@ -367,7 +367,7 @@ lhz_in02,100,134,3 script Hair Dyer#lich 4_F_EINWOMAN,{ else if (.@headpalette == 5) delitem 978,1; //Cobaltblue_Dyestuffs else if (.@headpalette == 6) delitem 982,1; //White_Dyestuffs else if (.@headpalette == 7) delitem 983,1; //Black_Dyestuffs - Zeny -=1000; + set Zeny, Zeny-1000; setlook VAR_HEADPALETTE,.@headpalette; set .@choose_success,1; break; diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index d1e5e0bc9..47f273930 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -470,7 +470,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "- *snip snip snip snip* -"; mes "- *bzzzzzzz bzzzzzzz bzzzzzzz bzzzzzzz* -"; next; - Zeny -=99800; + set Zeny, Zeny-99800; delitem 973,3; // Counteragent delitem 974,3; // Mixture delitem 901,100; // Danggie @@ -656,7 +656,7 @@ alberta,33,141,7 script Roving Hair Dresser 4_M_BARBER,{ mes "Once more I've outdone myself."; mes "It's such a unique and talented"; mes "style! Yes, I am the best! Wooohahahahahaha!"; - Zeny -=199800; + set Zeny, Zeny-199800; setlook 1,rand(1,19); setlook 6,rand(1,8); close; @@ -1042,7 +1042,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "*Clip clip clip clip*"; mes "*Bzzzzzzzzzzzzzzzzzzzz*^000000"; next; - Zeny -=99800; + set Zeny, Zeny-99800; delitem 973,3; //Counteragent delitem 974,3; //Mixture delitem 901,100; //Danggie @@ -1249,7 +1249,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ mes "[Assistant Beautician]"; mes "^333333*Pant Pant Pant*^000000"; next; - Zeny -=250000; + set Zeny, Zeny-250000; setlook VAR_HEAD,.@style_r; setlook VAR_HEADPALETTE,.@color_r; mes "[Assistant Beautician]"; diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt index e3ec4f762..84e3adf32 100644 --- a/npc/merchants/hd_refine.txt +++ b/npc/merchants/hd_refine.txt @@ -123,7 +123,7 @@ close; } delitem .@material,1; - Zeny -=.@price; + set Zeny, Zeny-.@price; mes "[Blacksmith Mighty Hammer]"; mes "Tac! Tac! Tac!"; if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) { @@ -280,7 +280,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF close; } delitem .@material,1; - Zeny -=.@price; + set Zeny, Zeny-.@price; mes "Pow! Pow! Pow! Pow!"; if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) { successrefitem .@part; diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index 8c48d8a60..29d49c948 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -69,7 +69,7 @@ mes "before making a purchase."; close; } - Zeny -=100*.@input; + set Zeny,Zeny-100*.@input; getitem 536,.@input; // Ice_Cream close; } diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index 56d8533cf..0c23555d2 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -137,7 +137,7 @@ lhz_in02,230,284,4 script Hotel Employee#01 4_M_04,{ mes "in order to check in."; close; } - Zeny -= 5000; + set Zeny,Zeny - 5000; mes "[Hotel Employee]"; mes "Thank you~"; mes "I hope you enjoy"; @@ -190,7 +190,7 @@ ve_in,157,219,5 script Inn Master#Receptionist 4_M_SEAMAN,{ } mes "Enjoy your stay~"; close2; - Zeny -= 5000; + set Zeny,Zeny - 5000; percentheal 100,100; warp "ve_in",184,228; end; @@ -227,7 +227,7 @@ function script F_InnMaid { mes "I hope you"; mes "enjoy your rest~"; close2; - Zeny -= 5000; + set Zeny,Zeny - 5000; percentheal 100,100; return; case 3: diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt index 4a2b52e4b..0fabb9876 100644 --- a/npc/merchants/milk_trader.txt +++ b/npc/merchants/milk_trader.txt @@ -69,7 +69,7 @@ prontera,73,140,0 script Milk Vendor 4_M_04,{ mes "all of this milk?"; close; } - Zeny -=.@total_cost; + set Zeny, Zeny-.@total_cost; delitem 713,.@bottles; //Empty Bottles getitem 519,.@bottles; //Milk close; diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt index 785529a70..5384125e1 100644 --- a/npc/merchants/old_pharmacist.txt +++ b/npc/merchants/old_pharmacist.txt @@ -83,7 +83,7 @@ alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{ mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; close; } - Zeny -=(.@max*5); + set Zeny,Zeny-(.@max*5); delitem 507,.@max; //Red_Herb delitem 508,.@max; //Yellow_Herb delitem 713,.@max; //Empty_Bottle @@ -113,7 +113,7 @@ alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{ close; } next; - Zeny -=(.@amount*5); + set Zeny,Zeny-(.@amount*5); delitem 507,.@amount; //Red_Herb delitem 508,.@amount; //Yellow_Herb delitem 713,.@amount; //Empty_Bottle @@ -209,7 +209,7 @@ L_Making: mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; close; } - Zeny -=(.@max*getarg(1)); + set Zeny,Zeny-(.@max*getarg(1)); delitem getarg(0),.@max*2; delitem 713,.@max; //Empty_Bottle getitem getarg(2),.@max; @@ -235,7 +235,7 @@ L_Making: mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; close; } - Zeny -=(.@amount*getarg(1)); + set Zeny,Zeny-(.@amount*getarg(1)); delitem getarg(0),.@amount*2; delitem 713,.@amount; //Empty_Bottle getitem getarg(2),.@amount; diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt index ff4493b54..6b544c920 100644 --- a/npc/merchants/quivers.txt +++ b/npc/merchants/quivers.txt @@ -98,7 +98,7 @@ S_BuyQuiver: mes "[Inventor Jaax]"; mes "There you go!"; mes "Just remember, ^FF0000you won't be able to use the Quiver when your carried weight is 90% of your maximum weight limit^000000."; - Zeny -=.@arrow_zeny01; + set Zeny, Zeny-.@arrow_zeny01; delitem getarg(0),.@arrows_used; //Arrow getitem getarg(3),.@quiver; //Quiver next; @@ -128,7 +128,7 @@ S_BuyQuiver: mes "[Inventor Jaax]"; mes "There you go!"; mes "Just remember, ^FF0000you won't be able to use the Quiver when your carried weight is 90% of your maximum weight limit^000000."; - Zeny -=getarg(2); + set Zeny, Zeny-getarg(2); delitem getarg(0),getarg(1); //Arrow getitem getarg(3),1; //Quiver next; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index fc1e683b9..d65fd5c2e 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -81,7 +81,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ close; } getitem 986,1; // Anvil - Zeny -=30000; + set Zeny, Zeny-30000; mes "[Christopher Guillenrow]"; mes "This is the cheapest one, but efficient enough to forge most items. Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need."; close; @@ -92,7 +92,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ close; } getitem 987,1; // Oridecon_Anvil - Zeny -=120000; + set Zeny, Zeny-120000; mes "[Christopher Guillenrow]"; mes "Aye, friend ye have an eye for the anvil. This must be the proper anvil for a Blacksmith, eh? Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need."; close; @@ -103,7 +103,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ close; } getitem 988,1; // Golden_Anvil - Zeny -=300000; + set Zeny, Zeny-300000; mes "[Christopher Guillenrow]"; mes "This one is the best among all me stuffs in me workshop! With this, ye can rule the Blacksmith world! Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need."; close; @@ -156,7 +156,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ close; } getitem 612,.@input; // Portable_Furnace - Zeny -=.@sell; + set Zeny, Zeny-.@sell; mes "[Christopher Guillenrow]"; mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need."; close; @@ -167,7 +167,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ close; } getitem 613,1; // Iron_Hammer - Zeny -=1000; + set Zeny, Zeny-1000; mes "[Christopher Guillenrow]"; mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need."; close; @@ -178,7 +178,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ close; } getitem 614,1; // Golden_Hammer - Zeny -=3000; + set Zeny, Zeny-3000; mes "[Christopher Guillenrow]"; mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need."; close; @@ -189,7 +189,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ close; } getitem 615,1; // Oridecon_Hammer - Zeny -=5000; + set Zeny, Zeny-5000; mes "[Christopher Guillenrow]"; mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need."; close; @@ -237,7 +237,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ close; } getitem 1010,.@input; // Phracon - Zeny -=.@sell; + set Zeny, Zeny-.@sell; mes "[Christopher Guillenrow]"; mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need."; close; @@ -275,7 +275,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ close; } getitem 1011,.@input; // Emveretarcon - Zeny -=.@sell; + set Zeny, Zeny-.@sell; mes "[Christopher Guillenrow]"; mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need, whenever ye want."; close; @@ -357,7 +357,7 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ close; } getitem 986,1; //Anvil - Zeny -=30000; + set Zeny, Zeny-30000; mes "[Paul Spanner]"; mes "It is the cheapest anvil which has the most basic ability."; mes "Thank you for using my shop. If you need anything, just let me know."; @@ -369,7 +369,7 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ close; } getitem 987,1; //Oridecon_Anvil - Zeny -=120000; + set Zeny, Zeny-120000; mes "[Paul Spanner]"; mes "Ah, you have an eye for anvil. A Blacksmith needs an anvil at least as good as this."; mes "Thank you for using my shop. If you need anything, just let me know."; @@ -381,7 +381,7 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ close; } getitem 988,1; //Golden_Anvil - Zeny -=300000; + set Zeny, Zeny-300000; mes "[Paul Spanner]"; mes "I can tell your ambition to become a good Blacksmith just by looking at you to choose this Golden Anvil!"; mes "This anvil will surely aid you in creating the best weapons."; @@ -460,7 +460,7 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ mes "Hey, you look pale. Why don't you go lighten your weight first."; close; } - Zeny -=.@sell; + set Zeny, Zeny-.@sell; getitem .@item,.@input; mes "[Paul Spanner]"; mes "Thank you for using my shop. If you need anything, just let me know."; @@ -515,7 +515,7 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ close; } getitem .@item,.@input; - Zeny -=.@sell; + set Zeny, Zeny-.@sell; mes "[Paul Spanner]"; mes "Thank you for using my shop. If you need anything, just let me know."; close; @@ -735,7 +735,7 @@ function script refinemain { mes "here all day if you need me."; close; } - Zeny -=.@price; + set Zeny, Zeny-.@price; delitem .@material,1; //custom checks @@ -856,7 +856,7 @@ function script refinemain { mes "Is that all you got? Unfortunately I can't work for you at a lower price. Try putting yourself in my shoes."; close; } - Zeny -= .@fullprice; + set Zeny, Zeny - .@fullprice; delitem .@material,.@refinecnt; while(.@refinecnt){ if (getequipisequiped(.@part) == 0) { @@ -882,7 +882,7 @@ function script refinemain { mes "Here's the unused Zeny and materials back..."; getitem .@material,.@refinecnt; set .@fullprice,.@refinecnt * .@price; - Zeny += .@fullprice; + set Zeny, Zeny + .@fullprice; close; } successrefitem .@part; @@ -1000,7 +1000,7 @@ function script phramain { close; } getitem .@material,.@input; - Zeny -=.@sell; + set Zeny, Zeny-.@sell; mes "[" + getarg(0) + "]"; mes "Here you are!"; mes "Thank you for"; @@ -1238,7 +1238,7 @@ function script repairmain { } set .@checkitem2,.@checkitem2-1; if (.@checkitem == .@checkitem2) { - Zeny -=.@totalcost; + set Zeny, Zeny-.@totalcost; while (.@checkitem) { repair(.@checkitem); set .@checkitem,.@checkitem-1; diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index f9d9a54cc..dc4d67235 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -68,7 +68,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ mes "Please remove your cash mount."; close; } - Zeny -=.@price; + set Zeny, Zeny-.@price; setriding; close; case 2: @@ -131,7 +131,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ mes "Please remove your cash mount."; close; } - Zeny -=.@price; + set Zeny, Zeny-.@price; setriding; close; case 2: @@ -205,7 +205,7 @@ hu_in01,381,304,5 script Falcon Breeder#hnt 8W_SOLDIER,{ mes "there, can't you see it?"; close; } - Zeny -=.@price; + set Zeny, Zeny-.@price; setfalcon; close; case 2: diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index 4c806a819..d76562783 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -292,7 +292,7 @@ function script Func_Socket { delitem getarg(5),getarg(6); if (getarg(7,0) != 0 && getarg(8,0) != 0) delitem getarg(7),getarg(8); - Zeny -= getarg(4)*1000; + set Zeny, Zeny - getarg(4)*1000; getitem getarg(1),1; next; mes "[Seiyablem]"; @@ -311,7 +311,7 @@ function script Func_Socket { delitem getarg(5),getarg(6); if (getarg(7,0) != 0 && getarg(8,0) != 0) delitem getarg(7),getarg(8); - Zeny -= getarg(4)*1000; + set Zeny, Zeny - getarg(4)*1000; next; mes "[Seiyablem]"; mes "I wish you good luck next time!"; diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt index dbdcfe379..3e7c64808 100644 --- a/npc/merchants/socket_enchant2.txt +++ b/npc/merchants/socket_enchant2.txt @@ -287,7 +287,7 @@ mes "Congratulations."; delitem 5022,1; //Helm_Of_Sun delitem 969,2; //Gold - Zeny -= 200000000; + set Zeny, Zeny - 200000000; getitem 5353,1; //Helm_Of_Sun_ next; mes "[Leablem]"; @@ -306,7 +306,7 @@ mes "I didn't want to do in the first place!"; delitem 5022,1; //Helm_Of_Sun delitem 969,2; //Gold - Zeny -= 200000000; + set Zeny, Zeny - 200000000; next; mes "[Leablem]"; mes "No, don't ever ask me to do such a risky thing again!"; @@ -428,7 +428,7 @@ function script Func_Socket2 { delitem getarg(5),getarg(6); if (getarg(7,0) != 0 && getarg(8,0) != 0) delitem getarg(7),getarg(8); - Zeny -= getarg(4)*1000; + set Zeny, Zeny - getarg(4)*1000; getitem getarg(1),1; next; mes "[Leablem]"; @@ -448,7 +448,7 @@ function script Func_Socket2 { delitem getarg(5),getarg(6); if (getarg(7,0) != 0 && getarg(8,0) != 0) delitem getarg(7),getarg(8); - Zeny -= getarg(4)*1000; + set Zeny, Zeny - getarg(4)*1000; next; mes "[Leablem]"; mes "See you again, buddy!"; diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt index 10cd72124..2b6e102cb 100644 --- a/npc/other/acolyte_warp.txt +++ b/npc/other/acolyte_warp.txt @@ -59,7 +59,7 @@ prontera,98,121,4 script Acolyte#Prtclear 4_F_01,{ specialeffect2 EF_TELEPORTATION; specialeffect2 EF_PORTAL; next; - Zeny -= .@cost[.@i]; + set Zeny, Zeny - .@cost[.@i]; switch(.@i) { case 0: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; break; case 1: warp "geffen",120,39; break; @@ -122,7 +122,7 @@ yuno,142,184,6 script Acolyte#Junoclear 4_F_01,{ specialeffect2 EF_TELEPORTATION; specialeffect2 EF_PORTAL; next; - Zeny -= .@cost[.@i]; + set Zeny, Zeny - .@cost[.@i]; switch(.@i) { case 0: warp "einbroch",67,195; break; case 1: warp "lighthalzen",159,90; break; diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index 4a3d68843..2be12b02e 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -93,7 +93,7 @@ OnTouch: if(Zeny < 1000) warp "arena_room",100,75; else { - Zeny -=1000; + set Zeny,Zeny -1000; set $arn_partywait,0; donpcevent "toout#party::OnStop"; warp "force_1-2",99,26; diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index b023422f5..548e1e68d 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -8,7 +8,7 @@ //= Comodo Gambling: Win random Items with 3 Carat Diamonds. //===== Additional Comments: ================================= //= 0.1- so far just a basic setup, and working on the function -//= 0.2- fixed some spelling errors and Zeny -= (@amount * 55000)[Cypress] +//= 0.2- fixed some spelling errors and set zeny,zeny - (@amount * 55000)[Cypress] //= 0.3- Revised the gambling NPC using the official Aegis script [MasterOfMuppets] //= for information. Thanks to Zefris for doing it for me. //= 0.4- Fixed an exploit. thanks to reddozen [MasterOfMuppets] @@ -474,7 +474,7 @@ comodo,210,154,2 script Suspicious Guy#cmd 2_M_THIEFMASTER,{ next; mes "[Cain]"; mes "I guess it can't hurt to gather some Diamonds there and try to exchange them for whatever the old lady's got. Take care, pal~"; - Zeny -=500; + set Zeny,Zeny-500; close; } mes "[Cain]"; @@ -554,7 +554,7 @@ mjolnir_02,85,362,3 script Blacksmith Miner 4_F_JOB_BLACKSMITH,{ mes "I don't think give you anything if there's no room in your inventory. Why don't you put some of your stuff into Kafra Storage?"; close; } - Zeny -= .@cost; + set Zeny,Zeny - .@cost; getitem 732,.@amount; mes "[Dwayne]"; mes "Thank you for"; diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt index 654387042..ef10f9734 100644 --- a/npc/other/divorce.txt +++ b/npc/other/divorce.txt @@ -194,7 +194,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ specialeffect EF_MAGICROD; specialeffect2 EF_DEVIL; set wedding_sign,0; - Zeny -=2500000; + set Zeny, Zeny-2500000; percentheal -100,-100; divorce; mes "[Deviruchi]"; diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt index 596a20042..b0274f620 100644 --- a/npc/other/fortune.txt +++ b/npc/other/fortune.txt @@ -45,7 +45,7 @@ payon_in03,117,128,5 script Fortune Teller 4_M_BIBI,{ else { mes "[Lhimetorra]"; mes "I accept your heart and your devotion with my gratitude. Thoughts are more important than the amount when paying a fortune teller."; - Zeny -=.@input; + set Zeny, Zeny-.@input; } next; mes "[Lhimetorra]"; @@ -2753,7 +2753,7 @@ payon_in03,75,129,5 script Poring Fortune Teller 4_M_BIBI,{ mes "Nope!"; close; } - Zeny -=1000; + set Zeny, Zeny-1000; mes "[Chocarle]"; mes " Thank you~! Then we shall look into your fortune! "; mes " First, clear your mind! Just like washing when you wash dishes! "; diff --git a/npc/other/mail.txt b/npc/other/mail.txt index bc7825e6e..658337a98 100644 --- a/npc/other/mail.txt +++ b/npc/other/mail.txt @@ -38,7 +38,7 @@ close; } mes "Thank you, please come again."; - Zeny -= 130; + set Zeny, Zeny - 130; close2; openmail; end; diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 6fc3a1a73..0cfc8c8a6 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -351,7 +351,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "finished, it will be your"; mes "bride's turn to speak to"; mes "Bishop Vomars."; - Zeny -=1300000; + set Zeny, Zeny-1300000; delitem 7170,1; //Tuxedo } else { @@ -361,7 +361,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "Vomars first. When he's"; mes "finished, it'll be your turn"; mes "to speak to Bishop Vomars."; - Zeny -=1200000; + set Zeny, Zeny-1200000; delitem 2338,1; //Wedding_Dress } delitem 2613,1; //Diamond_Ring diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt index 7b2a47d0a..ac1a532f5 100644 --- a/npc/other/mercenary_rent.txt +++ b/npc/other/mercenary_rent.txt @@ -94,7 +94,7 @@ mes "Summoned Mercenaries will"; mes "offer their support to you for"; mes "30 minutes. Take care now."; - Zeny -= (.@ZenyCost * 1000); + set Zeny, Zeny - (.@ZenyCost * 1000); getitem .@item[.@type] - 10 + .@Grade, 1; } close; @@ -280,7 +280,7 @@ pay_arche,99,167,4 duplicate(Mercenary Manager#main) Mercenary Manager#Bow 4_M_J mes "Thank you, and please come"; mes "again when you need more"; mes "potions for your Mercenaries."; - Zeny -= .@total_po; + set Zeny, Zeny - .@total_po; getitem .@item[.@m], .@input; close; } diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 0ae53d832..950656b6e 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -657,7 +657,7 @@ hugel,58,72,6 script Eckar Ellebird#single 4_M_NFMAN,{ mes "that you enjoy the race~"; mes "Let me guide you inside"; mes "the Monster Race Arena now."; - Zeny -=2000; + set Zeny, Zeny-2000; set monster_race_1,0; close2; warp "p_track01",75,41; @@ -678,7 +678,7 @@ hugel,58,72,6 script Eckar Ellebird#single 4_M_NFMAN,{ mes "you enjoy this race."; mes "Let me guide you now"; mes "to the Monster Race Arena."; - Zeny -=2000; + set Zeny, Zeny-2000; set monster_race_1,0; close2; warp "p_track01",75,41; @@ -715,7 +715,7 @@ hugel,58,72,6 script Eckar Ellebird#single 4_M_NFMAN,{ mes "Thank you~"; mes "I hope you enjoy"; mes "watching this race!"; - Zeny -=500; + set Zeny, Zeny-500; set monster_race_1,0; close2; warp "p_track01",75,41; @@ -1281,7 +1281,7 @@ hugel,62,69,1 script Eckar Erenes#double 4_M_NFMAN,{ mes "that you enjoy the race~"; mes "Let me guide you inside"; mes "the Monster Race Arena now."; - Zeny -=2000; + set Zeny, Zeny-2000; set monster_race_2_1,0; set monster_race_2_2,0; close2; @@ -1304,7 +1304,7 @@ hugel,62,69,1 script Eckar Erenes#double 4_M_NFMAN,{ mes "you enjoy this race."; mes "Let me guide you now"; mes "to the Monster Race Arena."; - Zeny -=2000; + set Zeny, Zeny-2000; set monster_race_2_1,0; set monster_race_2_2,0; close2; @@ -1342,7 +1342,7 @@ hugel,62,69,1 script Eckar Erenes#double 4_M_NFMAN,{ mes "Thank you~"; mes "I hope you enjoy"; mes "watching this race!"; - Zeny -=500; + set Zeny, Zeny-500; set monster_race_2_1,0; set monster_race_2_2,0; close2; diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index 750d78e78..3cd36dbfe 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -41,7 +41,7 @@ prt_fild08,159,371,3 script Poring War Recruiter#wop 4_PORING,{ mes "Oh, and there's an entrance fee of 500 zeny, ring."; mes "Have a good time, ring."; delitem 7773,countitem(7773); - Zeny -=500; + set Zeny,Zeny-500; close2; warp "poring_w01",112,138; end; diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt index 33c6980dd..0428eca36 100644 --- a/npc/other/powernpc.txt +++ b/npc/other/powernpc.txt @@ -137,7 +137,7 @@ gon_test,50,14,4 script Administrator#gnp 8_M_TWSOLDIER,{ mes "I'm sorry but you don't have enough zeny."; close; } - Zeny -= 500; + set Zeny,Zeny - 500; set in_battle,1; warp "gon_test",42,86; set $@in_battle,1; diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 779f332ae..bf98fb55a 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -198,7 +198,7 @@ geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 4_M_02 switch(select("Move:Cancel")) { case 1: if ((Zeny > 499) && (BaseLevel > 30)) { - Zeny -= 500; + set Zeny, Zeny - 500; callsub L_Warp,"pvp_y_room"; } else { @@ -237,7 +237,7 @@ geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 4_M_02 } mes "[Gate Keeper]"; mes "Yes, thank you for participating. Have fun!"; - if (Zeny >= 500) Zeny -= 500; + if (Zeny >= 500) set Zeny, Zeny - 500; callsub L_Warp,"pvp_room"; break; case 4: diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index 579232eb7..dea910aa3 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -4777,7 +4777,7 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{ if (countitem(7310) > 0) delitem 7310,1; //Free_Peco_Ticket else - Zeny -=.@zeny; + set Zeny, Zeny-.@zeny; } } switch(.@i) { 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; } } diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt index ace9eaaf3..630b15196 100644 --- a/npc/quests/bard_quest.txt +++ b/npc/quests/bard_quest.txt @@ -1127,7 +1127,7 @@ S_StorySong: case 1: mes "[Errende]"; if (Zeny > 499) { - Zeny -=500; + set Zeny, Zeny-500; cutin "bard_eland03",2; mes "Alright."; mes "Here we go~"; diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index c453c49cb..28f5e26b0 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -2108,7 +2108,7 @@ S_SellSets: mes getitemname(getarg(0))+"..."; close; } - Zeny -=.@total_cost; + set Zeny, Zeny-.@total_cost; getitem getarg(0),.@sell; mes "[Madeleine Chu]"; mes "Here you are~"; @@ -2196,7 +2196,7 @@ payon,209,127,3 script Servant 4_M_ORIENT01,{ mes "raise 200 zeny, right?"; close; } - Zeny -=200; + set Zeny, Zeny-200; getitem 555,1; //Rice_Cake mes "[Chulsoo]"; mes "Thank you very"; @@ -2367,7 +2367,7 @@ payon,209,127,3 script Servant 4_M_ORIENT01,{ mes "raise 200 zeny, right?"; close; } - Zeny -=200; + set Zeny, Zeny-200; getitem 555,1; //Rice_Cake mes "[Chulsoo]"; mes "Thank you very"; diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt index ec6a9b60b..9d5b82ae4 100644 --- a/npc/quests/counteragent_mixture.txt +++ b/npc/quests/counteragent_mixture.txt @@ -469,7 +469,7 @@ geffen_in,141,140,3 script Molgenstein#cm 2_M_MOLGENSTEIN,{ delitem 970,1; //Alchol delitem 971,1; //Detrimindexta delitem 713,1; //Empty_Bottle - Zeny -=3000; + set Zeny, Zeny-3000; getitem 973,1; //Counteragent mes "[Chemist Molgenstein]"; mes "Hee hee hee..."; @@ -513,7 +513,7 @@ geffen_in,141,140,3 script Molgenstein#cm 2_M_MOLGENSTEIN,{ delitem 970,1; //Alchol delitem 972,1; //Karvodailnirol delitem 713,1; //Empty_Bottle - Zeny -=4000; + set Zeny, Zeny-4000; getitem 974,1; //Mixture mes "[Chemist Molgenstein]"; mes "Hee hee hee..."; diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt index d733a374b..e278a4773 100644 --- a/npc/quests/dandelion_request.txt +++ b/npc/quests/dandelion_request.txt @@ -2190,7 +2190,7 @@ OnTouch: mes "tired. Let me take a"; mes "freakin' 20 second yawn."; mes "*Yaaaaaaaaaaaaaaaaaaaaaaaaaawn*"; - Zeny -= 1000; + set Zeny,Zeny - 1000; close2; warp "que_job01",9,94; end; @@ -2309,7 +2309,7 @@ OnTouch: mes "Hey, bartender! Gimme"; mes "the usual! I like your"; mes "style, adventurer..."; - Zeny -= 1000; + set Zeny,Zeny - 1000; next; mes "[Litheron]"; mes "Alright, you can come"; @@ -2473,7 +2473,7 @@ que_job01,82,95,3 script Bar Master 1_ETC_01,{ mes "ask you for 800. Enjoy it,"; mes "my friend, and drink it as"; mes "deeply as you would life."; - Zeny -= 800; + set Zeny,Zeny - 800; if(.@maodrink) getitem 12112,1; else getitem 12113,1; close; @@ -2495,7 +2495,7 @@ que_job01,82,95,3 script Bar Master 1_ETC_01,{ mes "hard feelings, but you're"; mes "already lucky to be here."; mes "Hey, enjoy your drink~"; - Zeny -= 1000; + set Zeny,Zeny - 1000; if(.@maodrink) getitem 12112,1; else getitem 12113,1; close; diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index 86adf8fa7..135fc768b 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -1371,7 +1371,7 @@ payon,182,132,3 script Grout'he Tuccok#hellion 1_M_02,{ mes "clean and pure Skirt of Virgin."; mes "If you got any more questions,"; mes "I guess you can ask me later~"; - Zeny -=10000; + set Zeny, Zeny-10000; set HELLIONQ,48; getitem 953,1; //Stone_Heart getitem 511,1; //Green_Herb 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; } diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt index 5cb9e3b8a..a37841f89 100644 --- a/npc/quests/gunslinger_quests.txt +++ b/npc/quests/gunslinger_quests.txt @@ -311,7 +311,7 @@ SubGarrison: delitem 999,50; //Steel delitem 1003,50; //Coal delitem 7317,20; //Rusty Screw - Zeny -=30000; + set Zeny,Zeny-30000; getitem 13104,1; //Garrison close; @@ -586,7 +586,7 @@ SubInferno: mes "I see you have the proper amount of materials and Zeny."; mes "Here is the Inferno I've created for you."; mes "Use it well."; - Zeny -=200000; + set Zeny,Zeny-200000; delitem 7319,100; delitem 984,10; delitem 7317,50; @@ -859,7 +859,7 @@ SubDestroyer: mes "You've got the perfect materials and Zeny~"; mes "Here's the Destroyer I made ahead of time for you."; mes "Use it well."; - Zeny -=100000; + set Zeny,Zeny-100000; delitem 7319,50; delitem 984,5; delitem 7317,70; @@ -993,7 +993,7 @@ que_ng,149,178,4 script Lab Director 4_F_ALCHE,{ mes "Please clear your inventory."; close; } - Zeny -=100000; + set Zeny,Zeny-100000; set gun_na,0; getitem 13158,1; mes "[N. A]"; @@ -1022,7 +1022,7 @@ que_ng,149,178,4 script Lab Director 4_F_ALCHE,{ delitem 984,3; delitem 1003,70; delitem 7317,50; - Zeny -=50000; + set Zeny,Zeny-50000; set gun_na,11; mes "[N. A]"; mes "Aha, you got me all the"; diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt index f7d436105..3920de4b9 100644 --- a/npc/quests/juice_maker.txt +++ b/npc/quests/juice_maker.txt @@ -269,7 +269,7 @@ payon_in03,188,146,5 script Marx Hansen#juice 4_M_04,{ } delitem .@fruit,.@make; delitem 713,.@make; - Zeny -=.@total_zeny; + set Zeny, Zeny-.@total_zeny; getitem .@juice,.@make; mes "[Merchant Marx Hansen]"; diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt index 53091fc34..ef15a7539 100644 --- a/npc/quests/kiel_hyre_quest.txt +++ b/npc/quests/kiel_hyre_quest.txt @@ -412,7 +412,7 @@ yuno_in01,35,179,4 script Pub Master#kh 1_ETC_01,5,5,{ mes "Thank you so much"; mes "for helping me out~"; getitem 7487,1; //Tavern_Wine - Zeny +=1000; + set Zeny, Zeny+1000; close; } else { @@ -2226,7 +2226,7 @@ kh_vila,16,175,0 script Box#khp1 HIDDEN_NPC,{ mes "special about it"; mes "at all! It's just"; mes "normal Pet Food!"; - Zeny -=1100; + set Zeny, Zeny-1100; getitem 537,1; //Pet_Food close; } diff --git a/npc/quests/mage_solution.txt b/npc/quests/mage_solution.txt index b88bf04fd..8513ae8bf 100644 --- a/npc/quests/mage_solution.txt +++ b/npc/quests/mage_solution.txt @@ -27,7 +27,7 @@ pay_arche,122,100,0 script Dollshoi 4_M_ORIENT01,{ close; } delitem 1092,1; //Empty_Cylinder - Zeny -=50; + set Zeny, Zeny-50; getitem 1089,1; //Payon_Potion } close; @@ -48,7 +48,7 @@ moc_ruins,91,150,0 script Ponka-Hontas 4_F_04,{ close; } delitem 1092,1; //Empty_Cylinder - Zeny -=50; + set Zeny, Zeny-50; getitem 1088,1; //Morocc_Potion } close; diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt index c8418dccb..10f02435e 100644 --- a/npc/quests/monstertamers.txt +++ b/npc/quests/monstertamers.txt @@ -436,7 +436,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{ mes "Rocker Glasses!"; delitem 912,2; //Zargon delitem 2208,1; //Ribbon - Zeny -=400; + set Zeny,Zeny-400; getitem 10014,1; // Rocker_Glasses close; } 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"; diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt index a1efd4520..10757a60e 100644 --- a/npc/quests/ninja_quests.txt +++ b/npc/quests/ninja_quests.txt @@ -181,7 +181,7 @@ que_ng,28,50,3 script Boshuu 4_M_SEAMAN,{ mes "Come and find me whenever you're ready to request more."; delitem 2102,1; delitem 2117,1; - Zeny -=10000; + set Zeny,Zeny-10000; set ninbo,0; set MISC_QUEST,MISC_QUEST | 2048; getitem 2118,1; @@ -249,7 +249,7 @@ que_ng,28,50,3 script Boshuu 4_M_SEAMAN,{ mes "If you ever want to ask me to make you more items, feel free to come back anytime."; delitem 2102,1; delitem 2117,1; - Zeny -=10000; + set Zeny,Zeny-10000; getitem 2118,1; close; } @@ -351,7 +351,7 @@ que_ng,28,50,3 script Boshuu 4_M_SEAMAN,{ mes "If you ever want to ask me to make you more items, feel free to come back anytime."; delitem 2102,1; delitem 2117,1; - Zeny -=10000; + set Zeny,Zeny-10000; set MISC_QUEST,MISC_QUEST | 2048; getitem 2118,1; close; @@ -521,7 +521,7 @@ que_ng,28,45,3 script Basshu 4_M_04,{ mes "If you ever want me to create more items, come and ask me anytime."; delitem 2107,1; delitem 2117,1; - Zeny -=20000; + set Zeny,Zeny-20000; set ninbot,0; set MISC_QUEST,MISC_QUEST | 4096; getitem 2119,1; @@ -594,7 +594,7 @@ que_ng,28,45,3 script Basshu 4_M_04,{ mes "If you ever want me to create more items, come and ask me anytime."; delitem 2107,1; delitem 2117,1; - Zeny -=20000; + set Zeny,Zeny-20000; getitem 2119,1; close; } @@ -702,7 +702,7 @@ que_ng,28,45,3 script Basshu 4_M_04,{ mes "If you ever want me to create more items, come and ask me anytime."; delitem 2107,1; delitem 2117,1; - Zeny -=20000; + set Zeny,Zeny-20000; set MISC_QUEST,MISC_QUEST | 4096; getitem 2119,1; close; @@ -801,7 +801,7 @@ que_ng,27,18,3 script Toshu 4_M_SEAMAN,{ } delitem 2104,1; delitem 2119,1; - Zeny -=40000; + set Zeny,Zeny-40000; switch (rand(5)) { case 1: @@ -905,7 +905,7 @@ que_ng,72,34,3 script Craftsman Kaibara 4_M_EINOLD,{ delitem 1036,400; delitem 984,5; delitem 7123,30; - Zeny -=200000; + set Zeny,Zeny-200000; getitem 13006,1; mes "[Kaibara]"; mes "Hmm, looks good."; @@ -956,7 +956,7 @@ que_ng,72,34,3 script Craftsman Kaibara 4_M_EINOLD,{ } delitem 999,30; delitem 7022,1; - Zeny -=20000; + set Zeny,Zeny-20000; getitem 13007,1; mes "[Kaibara]"; mes "Hmm, very well."; @@ -1004,7 +1004,7 @@ que_ng,72,34,3 script Craftsman Kaibara 4_M_EINOLD,{ } delitem 999,25; delitem 7099,5; - Zeny -=32000; + set Zeny,Zeny-32000; getitem 13011,1; mes "[Kaibara]"; mes "Hmm, very well."; @@ -1053,7 +1053,7 @@ que_ng,72,34,3 script Craftsman Kaibara 4_M_EINOLD,{ } delitem 999,30; delitem 720,10; - Zeny -=48000; + set Zeny,Zeny-48000; getitem 13012,1; mes "[Kaibara]"; mes "Hmm, very well."; @@ -1104,7 +1104,7 @@ que_ng,72,34,3 script Craftsman Kaibara 4_M_EINOLD,{ delitem 932,500; delitem 12001,10; delitem 722,5; - Zeny -=120000; + set Zeny,Zeny-120000; getitem 13014,1; mes "[Kaibara]"; mes "Hmm, very well."; @@ -1191,7 +1191,7 @@ M_BENEKI: delitem 999,50; delitem 7115,20; delitem 984,5; - Zeny -=90000; + set Zeny,Zeny-90000; getitem 13300,1; mes "[Tetsu]"; mes "Hmm, very well."; @@ -1239,7 +1239,7 @@ M_DAIS: delitem 999,30; delitem 7301,100; delitem 984,2; - Zeny -=40000; + set Zeny,Zeny-40000; getitem 13301,1; mes "[Tetsu]"; mes "Hmm, very well."; @@ -1291,7 +1291,7 @@ M_DAIS4: } delitem 733,20; delitem 984,3; - Zeny -=40000; + set Zeny,Zeny-40000; delitem 13301,1; getitem 13302,1; mes "[Tetsu]"; @@ -1340,7 +1340,7 @@ M_REKKA: delitem 7098,100; delitem 7097,100; delitem 7521,50; - Zeny -=78000; + set Zeny,Zeny-78000; getitem 13303,1; mes "[Tetsu]"; mes "Hmm, very well."; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 9439361c5..b176b4081 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -7661,7 +7661,7 @@ function Catwarp; close; } else if (Zeny >= 60) { - Zeny -=60; + set Zeny, Zeny-60; mes "[Cat Hand Agent]"; mes "Thank you."; mes "Your storage will"; @@ -7708,7 +7708,7 @@ function Catwarp; close; } else if (Zeny >= 60) { - Zeny -=60; + set Zeny, Zeny-60; mes "[Cat Hand Agent]"; mes "Thank you."; mes "Your storage will"; @@ -7830,7 +7830,7 @@ function Catwarp; close; } else if (Zeny >= 60) { - Zeny -=60; + set Zeny, Zeny-60; mes "[Cat Hand Agent]"; mes "Thank you."; mes "Your storage will"; @@ -7943,7 +7943,7 @@ function Catwarp { close; } close2; - Zeny -=getarg(0); + set Zeny, Zeny-getarg(0); switch(getarg(1)) { case 1: warp "alberta",117,56; end; case 2: warp "prontera",116,72; end; @@ -12064,7 +12064,7 @@ que_job01,82,95,3 script Bar Master#moc2_01 1_ETC_01,{ mes "Here, drink up."; mes "This drink is mainly made of fruit juice,"; mes "but you still shouldn't drink too much."; - Zeny -=800; + set Zeny, Zeny-800; getitem 12112,1; //Tropical_Sograt } close; @@ -12082,7 +12082,7 @@ que_job01,82,95,3 script Bar Master#moc2_01 1_ETC_01,{ mes "There you go."; mes "This drink is mainly made of fruit juice,"; mes "but you still shouldn't drink too much."; - Zeny -=1000; + set Zeny, Zeny-1000; getitem 12112,1; //Tropical_Sograt close; } @@ -12108,7 +12108,7 @@ que_job01,82,95,3 script Bar Master#moc2_01 1_ETC_01,{ mes "[Karred]"; mes "I'll give you a special discount."; mes "Here, enjoy."; - Zeny -=800; + set Zeny, Zeny-800; getitem 12113,1; //Vermilion_The_Beach } close; @@ -12125,7 +12125,7 @@ que_job01,82,95,3 script Bar Master#moc2_01 1_ETC_01,{ mes "[Karred]"; mes "There you go."; mes "Don't drink too much, alright?"; - Zeny -=1000; + set Zeny, Zeny-1000; getitem 12113,1; //Vermilion_The_Beach close; } @@ -12273,7 +12273,7 @@ OnTouch: mes "Hey, bartender! Gimme"; mes "the usual! I like your"; mes "style, adventurer..."; - Zeny -=1000; + set Zeny, Zeny-1000; next; mes "[Litheron]"; mes "Alright, you can come"; diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index 4bf149533..16a4a6aa6 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -106,7 +106,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{ close; } else if (Zeny >= 60) { - Zeny -=60; + set Zeny, Zeny-60; mes "[Cat Hand Agent]"; mes "Thank you."; mes "Your storage will be opened shortly."; @@ -153,7 +153,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{ close; } else if (Zeny >= 60) { - Zeny -=60; + set Zeny, Zeny-60; mes "[Cat Hand Agent]"; mes "Thank you."; mes "Your storage will be opened shortly."; @@ -274,7 +274,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{ close; } else if (Zeny >= 60) { - Zeny -=60; + set Zeny, Zeny-60; mes "[Cat Hand Agent]"; mes "Thank you."; mes "Your storage will be opened shortly."; @@ -395,7 +395,7 @@ function Catwarp { close; } close2; - Zeny -=getarg(0); + set Zeny, Zeny-getarg(0); switch(getarg(1)) { case 1: warp "alberta",117,56; end; case 2: warp "prontera",116,72; end; diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index e3e447488..bde9e8841 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -1196,7 +1196,7 @@ alberta_in,23,104,4 script Grandpa Turtle#tur 2_M_PHARMACIST,{ mes "You've made your choice! With my experience, we will arrive without fail! I appreciate your spirit!"; next; mes "^3355FF*Choo Choo*^000000"; - Zeny -=10000; + set Zeny, Zeny-10000; warp "tur_dun01",157,39; close; } diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt index 00490940d..17fd9190e 100644 --- a/npc/quests/quests_aldebaran.txt +++ b/npc/quests/quests_aldebaran.txt @@ -41,7 +41,7 @@ aldeba_in,152,166,4 script Trader#01 4_M_04,{ delitem 2275,1; //Red_Bandana delitem 998,50; //Iron delitem 733,1; //Crystal_Jewel___ - Zeny -=3500; + set Zeny, Zeny-3500; mes "[Trader]"; mes "Hm! You don't have a medical license, do you? It's alright, I've heard about a rogue, unlicensed physician who performed medical miracles! But... That might have been a comic book."; next; @@ -61,7 +61,7 @@ aldeba_in,152,166,4 script Trader#01 4_M_04,{ if ((countitem(2247) > 0) && (countitem(916) > 299) && (Zeny > 499)) { delitem 2247,1; //Oldman's_Romance delitem 916,300; //Feather_Of_Birds - Zeny -=500; + set Zeny, Zeny-500; mes "[Trader]"; mes "Ooh~! You have good fashion sense. I know you've had a hard time collecting this stuff, but this hat is worth it. Take it. All you need now is a fur coat and a cane!"; getitem 5018,1; //Feather_Bonnet @@ -77,7 +77,7 @@ aldeba_in,152,166,4 script Trader#01 4_M_04,{ if ((countitem(998) > 19) && (countitem(707) > 0) && (Zeny > 4999)){ //Iron Singing_Plant delitem 998,20; //Iron delitem 707,1; //Singing_Plant - Zeny -=5000; + set Zeny, Zeny-5000; mes "[Trader]"; mes "This one? It's a little bit scary, though it has some sort of romantic quality. What do you think? You like it? Alright, take it, it's yours!"; getitem 2281,1; //Phantom_Of_Opera @@ -91,7 +91,7 @@ aldeba_in,152,166,4 script Trader#01 4_M_04,{ case 4: if ((countitem(1019) > 119) && (Zeny > 9999)){ //Wooden_Block delitem 1019,120; //Wooden_Block - Zeny -=10000; + set Zeny, Zeny-10000; mes "[Trader]"; mes "If you have a chance to visit the Uplander Village, Payon, please go and meet the Sakkat Craftsman."; next; diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt index 7f88b46e4..53a11d0b8 100644 --- a/npc/quests/quests_amatsu.txt +++ b/npc/quests/quests_amatsu.txt @@ -1127,7 +1127,7 @@ ama_in01,162,17,1 script Sushi Master#ama 4_M_JPNOJI2,{ mes "If you want to eat delicious fish slices, you better bring more money."; close; } - Zeny -=700; + set Zeny, Zeny-700; getitem 551,10; //Shusi mes "[Magumagu]"; mes "There you go. If you like the taste, please order some more."; @@ -1140,7 +1140,7 @@ ama_in01,162,17,1 script Sushi Master#ama 4_M_JPNOJI2,{ mes "you better bring more money."; close; } - Zeny -=74; + set Zeny, Zeny-74; getitem 551,1; //Shusi mes "[Magumagu]"; mes "There you go. If you like the taste, please order some more."; @@ -1168,7 +1168,7 @@ ama_in01,162,17,1 script Sushi Master#ama 4_M_JPNOJI2,{ mes "If you want to eat delicious fish slices, you better bring more money."; close; } - Zeny -=350; + set Zeny, Zeny-350; getitem 544,10; //Fish_Slice mes "[Magumagu]"; mes "There you go. If you like the taste, please order some more."; @@ -1181,7 +1181,7 @@ ama_in01,162,17,1 script Sushi Master#ama 4_M_JPNOJI2,{ mes ""; close; } - Zeny -=37; + set Zeny, Zeny-37; getitem 544,1; //Fish_Slice mes "[Magumagu]"; mes "There you go. If you like the taste, please order some more."; @@ -1474,7 +1474,7 @@ ama_in02,170,62,4 script Soldier#ama2 8_M_JPNSOLDIER,{ mes "to issue another Transit Permit."; next; if (select("Issue one:Talk to you later") == 1) { - Zeny -=10000; + set Zeny, Zeny-10000; getitem 7160,1; //Lord's_Passable_Ticket mes "[Jiro]"; mes "There you go."; diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt index 39b5f0bbb..954c532a1 100644 --- a/npc/quests/quests_ayothaya.txt +++ b/npc/quests/quests_ayothaya.txt @@ -862,7 +862,7 @@ ayothaya,253,99,3 script Fisherman 4_M_THAIONGBAK,{ mes "^3355FFYou've hooked a Phen!^000000"; next; delitem 528,1; //Monster's_Feed - Zeny -=50; + set Zeny, Zeny-50; set .@randfish,rand(1,100); if (.@randfish > 0 && .@randfish < 40) { mes "^3355FFWhile cooking the Phen, you"; @@ -2546,7 +2546,7 @@ ayothaya,153,86,5 script Thongpool#ayo 4_M_THAIONGBAK,{ if (select("I will take them.:I could get 100 Jellopies for that much!") == 1) { if (Zeny > 10999) { if (MaxWeight - Weight > 3999) { - Zeny -=11000; + set Zeny, Zeny-11000; set tomyumgoong,3; getitem 567,20; //Prawn emotion e_no1; @@ -2590,7 +2590,7 @@ ayothaya,153,86,5 script Thongpool#ayo 4_M_THAIONGBAK,{ if (select("Yes!:No, thanks.") == 1) { if (Zeny > 10999) { if (MaxWeight - Weight > 3999) { - Zeny -=11000; + set Zeny, Zeny-11000; getitem 567,20; //Prawn mes "[Thongpool]"; mes "There you go~"; @@ -2941,7 +2941,7 @@ ayothaya,213,94,7 script Merchant#ayo 4_M_THAIAYO,{ emotion e_thx; if (Zeny > 1999) { if (MaxWeight - Weight > 1199) { - Zeny -=2000; + set Zeny, Zeny-2000; set tomyumgoong,7; getitem 7286,30; //Chilli mes "[Merchant Thongdum]"; @@ -2997,7 +2997,7 @@ ayothaya,213,94,7 script Merchant#ayo 4_M_THAIAYO,{ } if (Zeny > 1999) { if (MaxWeight - Weight > 1199) { - Zeny -=2000; + set Zeny, Zeny-2000; getitem 7286,30; //Chilli mes "[Merchant Thongdum]"; mes "Thank you,"; diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index cbef14b72..51d7e5869 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -274,7 +274,7 @@ einbech,97,167,5 script Cavitar 4_M_EINOLD,{ mes "you a small present"; mes "as a token of my gratitute."; mes "If you would, please take this."; - Zeny -=1000; + set Zeny,Zeny-1000; set ein_gear1,2; switch(rand(1,7)) { case 1: @@ -331,7 +331,7 @@ einbech,97,167,5 script Cavitar 4_M_EINOLD,{ next; switch(select("Sure~!:No, thanks.")) { case 1: - Zeny -=1000; + set Zeny,Zeny-1000; set ein_gear1,1; mes "[Cavitar]"; mes "Great...!"; @@ -355,7 +355,7 @@ einbech,97,167,5 script Cavitar 4_M_EINOLD,{ mes "this small gift"; mes "as a token of"; mes "my gratitude."; - Zeny -=1000; + set Zeny,Zeny-1000; getitem 1010,1; // Phracon close; } @@ -384,7 +384,7 @@ einbech,97,167,5 script Cavitar 4_M_EINOLD,{ next; switch(select("Sure~!:No, thanks.")) { case 1: - Zeny -=1000; + set Zeny,Zeny-1000; set $einamanoama,$einamanoama + 1; set ein_gear1,1; mes "[Cavitar]"; @@ -409,7 +409,7 @@ einbech,97,167,5 script Cavitar 4_M_EINOLD,{ mes "this small gift"; mes "as a token of"; mes "my gratitude."; - Zeny -=1000; + set Zeny,Zeny-1000; getitem 1010,1; // Phracon close; } diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt index e3a2e6323..54e57218f 100644 --- a/npc/quests/quests_geffen.txt +++ b/npc/quests/quests_geffen.txt @@ -49,7 +49,7 @@ geffen_in,144,166,4 script Blacksmith 1_M_SMITH,{ mes "Ah, I see that you appreciate a Blacksmith's work! Alright, I'll do it right away !!"; next; delitem 999,50; //Steel - Zeny -=2000; + set Zeny,Zeny-2000; getitem 2292,1; // Welding_Mask mes "[Blacksmith]"; mes "Hahaha~! Make good use of that!"; diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index e554216e4..6c8a8978f 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -3461,7 +3461,7 @@ einbech,208,124,3 script Bomb Maker 4_M_REPAIR,{ mes "[Boomer]"; mes "Just make sure that you are not going to"; mes "blow yourself away with this bomb, hahah!"; - Zeny -=3000; + set Zeny,Zeny-3000; getitem 7138,1; //Marine Sphere Bottle close; case 2: @@ -5567,7 +5567,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "bowl of Fish Cake Soup."; mes "I hope you come and "; mes "visit me again, okay?"; - Zeny -=100; + set Zeny,Zeny-100; getitem 584,1; //Fish_Ball_Soup close; } else { @@ -5625,7 +5625,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "There, I took 100 zeny"; mes "from you. That's fair, so"; mes "please don't lose it this time."; - Zeny -=100; + set Zeny,Zeny-100; getitem 584,1; //Fish_Ball_Soup close; } else { @@ -5666,7 +5666,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "There, I took 100 zeny"; mes "from you. That's fair, so"; mes "please don't lose it this time."; - Zeny -=100; + set Zeny,Zeny-100; getitem 584,1; //Fish_Ball_Soup close; } else { @@ -5708,7 +5708,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "There, I took 100 zeny"; mes "from you. That's fair, so"; mes "please don't lose it this time."; - Zeny -=100; + set Zeny,Zeny-100; getitem 584,1; //Fish_Ball_Soup close; } else { @@ -5749,7 +5749,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "There, I took 100 zeny"; mes "from you. That's fair, so"; mes "please don't lose it this time."; - Zeny -=100; + set Zeny,Zeny-100; getitem 584,1; //Fish_Ball_Soup close; } else { @@ -9525,7 +9525,7 @@ hugel,209,109,2 script Boatman#hugel 4_M_SEAMAN,{ mes "We'll arrive near"; mes "the Odin Shrine soon~"; close2; - Zeny -=800; + set Zeny,Zeny -800; if (hg_odin == 2) set hg_odin,3; else if (hg_odin == 4) set hg_odin,5; else if (hg_odin == 12) set hg_odin,13; diff --git a/npc/quests/quests_izlude.txt b/npc/quests/quests_izlude.txt index 6f813c85c..e95b8b2b7 100644 --- a/npc/quests/quests_izlude.txt +++ b/npc/quests/quests_izlude.txt @@ -32,7 +32,7 @@ mes "get some more cash?"; close ; } - Zeny -=250; + set Zeny, Zeny-250; warp "alberta",195,164; end; } @@ -79,7 +79,7 @@ mes "some more."; close; } - Zeny -=250; + set Zeny, Zeny-250; warp "alberta",195,164; end; } diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 4f7e3bc1d..03f38edd9 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -1720,7 +1720,7 @@ OnTouch: mes "^3355FF*SHHHHHHUK!*^000000"; specialeffect EF_STEAL; if (Zeny >= 100) { - Zeny -=100; + set Zeny, Zeny-100; } next; mes "[" + strcharinfo(0) + "]"; @@ -1736,7 +1736,7 @@ OnTouch: mes "^3355FF*SHHHHHHUK!*^000000"; specialeffect EF_STEAL; if (Zeny >= 200) { - Zeny -=200; + set Zeny, Zeny-200; } next; mes "[" + strcharinfo(0) + "]"; @@ -1753,7 +1753,7 @@ OnTouch: mes "^3355FF*SHHHHHHUK!*^000000"; specialeffect EF_STEAL; if (Zeny >= 10) { - Zeny -=10; + set Zeny, Zeny-10; } next; mes "[" + strcharinfo(0) + "]"; @@ -1793,7 +1793,7 @@ OnTouch: mes "^3355FF*SHHHHHHUK!*^000000"; specialeffect EF_STEAL; if (Zeny >= 100) { - Zeny -=100; + set Zeny, Zeny-100; } next; mes "[" + strcharinfo(0) + "]"; @@ -1809,7 +1809,7 @@ OnTouch: mes "^3355FF*SHHHHHHUK!*^000000"; specialeffect EF_STEAL; if (Zeny >= 200) { - Zeny -=200; + set Zeny, Zeny-200; } next; mes "[" + strcharinfo(0) + "]"; @@ -1826,7 +1826,7 @@ OnTouch: mes "^3355FF*SHHHHHHUK!*^000000"; specialeffect EF_STEAL; if (Zeny >= 10) { - Zeny -=10; + set Zeny, Zeny-10; } next; mes "[" + strcharinfo(0) + "]"; @@ -1866,7 +1866,7 @@ OnTouch: mes "^3355FF*SHHHHHHUK!*^000000"; specialeffect EF_STEAL; if (Zeny >= 100) { - Zeny -=100; + set Zeny, Zeny-100; } next; mes "[" + strcharinfo(0) + "]"; @@ -1883,7 +1883,7 @@ OnTouch: mes "^3355FF*SHHHHHHUK!*^000000"; specialeffect EF_STEAL; if (Zeny >= 200) { - Zeny -=200; + set Zeny, Zeny-200; } next; mes "[" + strcharinfo(0) + "]"; @@ -1900,7 +1900,7 @@ OnTouch: mes "^3355FF*SHHHHHHUK!*^000000"; specialeffect EF_STEAL; if (Zeny >= 10) { - Zeny -=10; + set Zeny, Zeny-10; } next; mes "[" + strcharinfo(0) + "]"; @@ -2017,7 +2017,7 @@ OnTouch: mes "but I hope we never bump"; mes "into each other ever again!"; } - Zeny -=.@price; + set Zeny, Zeny-.@price; getitem 12016,.@number; //Speed_Up_Potion } } diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index 74e670846..b9f086264 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -1885,7 +1885,7 @@ lou_in02,210,47,0 script City Hall Officer#lou 4_M_CHNSOLDIER,{ mes "[Jin Chiyuan]"; mes "^666666*Whispers*^000000"; mes "^333333When you go up stairs, another officer will give you the document you want.^000000 ^666666*Ahem*^000000 Louyang thanks you!"; - Zeny -=.@input; + set Zeny, Zeny-.@input; if (ch_par == 5) { set ch_par,11; changequest 11046,11051; @@ -4124,7 +4124,7 @@ lou_fild01,224,348,0 script Lady#delivery 4_F_CHNDRESS3,{ mes "[Lady]"; mes "Alright, there you go!"; if (Zeny > 99) { - Zeny -=100; + set Zeny, Zeny-100; } close2; specialeffect EF_BLASTMINEBOMB,AREA," #fire"; @@ -4146,7 +4146,7 @@ lou_fild01,224,348,0 script Lady#delivery 4_F_CHNDRESS3,{ mes "Alright,"; mes "there you go!"; if (Zeny > 99) { - Zeny -=100; + set Zeny, Zeny-100; } close2; donpcevent " #fire::OnClaymore"; @@ -4176,7 +4176,7 @@ lou_fild01,224,348,0 script Lady#delivery 4_F_CHNDRESS3,{ mes "delivery fee of 1,000 zeny."; next; if (Zeny > 999) { - Zeny -=1000; + set Zeny, Zeny-1000; getitem 7126,1; //Large_Jellopy mes "[Lady]"; mes "Thank you~"; @@ -4234,7 +4234,7 @@ lou_fild01,224,348,0 script Lady#delivery 4_F_CHNDRESS3,{ mes "Alright~"; mes "There you go!"; if (Zeny > 99) { - Zeny -=100; + set Zeny, Zeny-100; } close2; donpcevent " #fire::OnClaymore"; diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index fe5c11dea..6a5f452cf 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -67,7 +67,7 @@ moc_ruins,113,181,4 script William 4_M_ORIENT02,{ if ((countitem(1019) > 49) && (countitem(983) > 0) && (Zeny > 91099)) { delitem 1019,50; //Wooden_Block delitem 983,1; //Black_Dyestuffs - Zeny -=91100; + set Zeny, Zeny-91100; mes "[William]"; mes "Here you are~!"; mes "This ^3355FFStop Post^000000 has"; @@ -134,7 +134,7 @@ moc_ruins,118,176,4 script Alchemist 1_M_WIZARD,{ next; delitem 2243,1; //Spinning_Eyes delitem 999,100; //Steel - Zeny -=50000; + set Zeny, Zeny-50000; mes "[Marius]"; mes "Here you are!"; mes "Binoculars !"; @@ -261,7 +261,7 @@ OnTouch: mes "Hey, bartender! Gimme"; mes "the usual! I like your"; mes "style, adventurer..."; - Zeny -=1000; + set Zeny, Zeny-1000; next; mes "[Litheron]"; mes "Alright, you can come"; @@ -406,7 +406,7 @@ que_job01,82,95,3 script Bar Master#moc_main01 1_ETC_01,{ mes "ask you for 800. Enjoy it,"; mes "my friend, and drink it as"; mes "deeply as you would life."; - Zeny -=800; + set Zeny, Zeny-800; getitem 12112,1; //Tropical_Sograt } close; @@ -429,7 +429,7 @@ que_job01,82,95,3 script Bar Master#moc_main01 1_ETC_01,{ mes "hard feelings, but you're"; mes "already lucky to be here."; mes "Hey, enjoy your drink~"; - Zeny -=1000; + set Zeny, Zeny-1000; getitem 12112,1; //Tropical_Sograt close; } @@ -465,7 +465,7 @@ que_job01,82,95,3 script Bar Master#moc_main01 1_ETC_01,{ mes "ask you for 800. Enjoy it,"; mes "my friend, and drink it as"; mes "deeply as you would life."; - Zeny -=800; + set Zeny, Zeny-800; getitem 12113,1; //Vermilion_The_Beach } close; @@ -488,7 +488,7 @@ que_job01,82,95,3 script Bar Master#moc_main01 1_ETC_01,{ mes "hard feelings, but you're"; mes "already lucky to be here."; mes "Hey, enjoy your drink~"; - Zeny -=1000; + set Zeny, Zeny-1000; getitem 12113,1; //Vermilion_The_Beach close; } diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index f40d21ab9..fd68f6663 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -3185,7 +3185,7 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{ mes "Ok, I'll bring you the best room."; mes "Please have a rest, young adventurer."; close2; - Zeny -=5000; + set Zeny,Zeny-5000; percentheal 100,100; warp "mosk_in",215,181; end; @@ -3242,7 +3242,7 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{ mes "I wish you a good night's rest. Hohoho."; set mos_swan,4; close2; - Zeny -=5000; + set Zeny,Zeny-5000; percentheal 100,100; warp "mosk_in",215,181; end; @@ -3332,7 +3332,7 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{ mes "[Landlord]"; mes "Please be comfortable."; close2; - Zeny -=5000; + set Zeny,Zeny-5000; percentheal 100,100; warp "mosk_in",215,181; end; @@ -3399,7 +3399,7 @@ mosk_in,141,212,3 script Pub Owner#mos 4_M_RUSBALD,{ close; } if (Zeny > 999) { - Zeny -=1000; + set Zeny,Zeny-1000; set mos_swan,9; if (!.@j) getitem 519,1; else getitem 531,1; mes "[Pub Owner]"; @@ -3462,7 +3462,7 @@ mosk_in,141,212,3 script Pub Owner#mos 4_M_RUSBALD,{ switch(select("Milk - 1000z:Apple juice - 1000z:They are all expensive!")) { case 1: if (Zeny > 999) { - Zeny -=1000; + set Zeny,Zeny-1000; set mos_swan,9; getitem 519,1; mes "[Pub Owner]"; @@ -3476,7 +3476,7 @@ mosk_in,141,212,3 script Pub Owner#mos 4_M_RUSBALD,{ close; case 2: if (Zeny > 999) { - Zeny -=1000; + set Zeny,Zeny-1000; set mos_swan,9; getitem 531,1; mes "[Pub Owner]"; @@ -3999,7 +3999,7 @@ moscovia,208,182,7 script Acorn Dealer#mos 4_M_RUSMAN1,{ mes "[Acorn Dealer]"; mes "Oh, thank you..."; mes "What do you think of them? They're fresh, aren't they?"; - Zeny -= .@price; + set Zeny,Zeny - .@price; getitem 1026,.@input; close; } @@ -10241,7 +10241,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ delitem 1092,.@redtube_send; delitem 7134,.@redcup_send; delitem 512,.@redapple_send; - Zeny -=.@redzeny_send; + set Zeny,Zeny-.@redzeny_send; getitem 545,.@total_red01; close; } @@ -10328,7 +10328,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ delitem 1092,.@yelltube_send; delitem 7134,.@yellcup_send; delitem 513,.@yellbanana_send; - Zeny -=.@yellzeny_send; + set Zeny,Zeny-.@yellzeny_send; getitem 546,.@total_yell01; close; } @@ -11184,7 +11184,7 @@ amatsu,233,234,3 script Momotoro Publisher#rus42 4_F_JPN2,{ } mes "[Momotoro Publisher]"; mes "Thank you for buying our books. If you need more books, contact us please."; - Zeny -=5000; + set Zeny,Zeny-5000; set rhea_rus_main,27; getitem 7881,1; close; @@ -11312,7 +11312,7 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ mes "One! Two! Three!!"; next; if (.@rucard_game01 == 1) { - cutin "????????",4; // Poring Card + cutin "ī",4; // Poring Card emotion e_gasp; emotion e_ic,1; next; @@ -11325,9 +11325,9 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ next; } else { if (.@rucard_game01 == 2) - cutin "??????????",4; // Angeling Card + cutin "ī",4; // Angeling Card else - cutin "????????????",4; // Ghostring Card + cutin "Ʈī",4; // Ghostring Card emotion e_gasp; emotion e_omg,1; next; @@ -11348,7 +11348,7 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ mes "One! Two! Three!!"; next; if (.@rucard_game01 == 2) { - cutin "????????????",4; // Angeling Card + cutin "Ʈī",4; // Angeling Card emotion e_gasp; emotion e_ic,1; next; @@ -11361,9 +11361,9 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ next; } else { if (.@rucard_game01 == 1) - cutin "????????",4; // Poring Card + cutin "ī",4; // Poring Card else - cutin "????????????",4; // Ghostring Card + cutin "Ʈī",4; // Ghostring Card emotion e_gasp; emotion e_omg,1; next; @@ -11384,7 +11384,7 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ mes "One! Two! Three!!"; next; if (.@rucard_game01 == 3) { - cutin "????????????",4; // Ghostring Card + cutin "Ʈī",4; // Ghostring Card emotion e_gasp; emotion e_ic,1; next; @@ -11397,9 +11397,9 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ next; } else { if (.@rucard_game01 == 1) - cutin "????????",4; // Poring Card + cutin "ī",4; // Poring Card else - cutin "????????????",4; // Angeling Card + cutin "Ʈī",4; // Angeling Card emotion e_gasp; emotion e_omg,1; next; diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index c9f639fe8..258f01bc6 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -437,7 +437,7 @@ OnTouch: set aru_monas,8; changequest 17003,17004; if (Zeny > 3000) { - Zeny -=3000; + set Zeny, Zeny-3000; getitem 12052,4; //Vit_Dish02 } close; @@ -6114,7 +6114,7 @@ in_rogue,366,46,3 script Rogue Investigator 4_M_ROGUE,{ switch(select("Sounds good!:Never mind, I'll find it myself...")) { case 1: if (Zeny > 9999) { - Zeny -=10000; + set Zeny, Zeny-10000; mes "[Investigator]"; mes "Thanks for the money~"; mes "Of course, if you became"; @@ -6192,7 +6192,7 @@ in_rogue,366,46,3 script Rogue Investigator 4_M_ROGUE,{ switch(select("Sounds good!:Forget it...")) { case 1: if (Zeny > 9999) { - Zeny -=10000; + set Zeny, Zeny-10000; mes "[Investigator]"; mes "Right on, right on."; mes "Alright, I didn't charge"; @@ -7390,7 +7390,7 @@ payon,244,62,3 script Moonho Ahn 4_M_HUGRANFA,{ switch(select("Yes, let's play!:How does this game work again?")) { case 1: if (Zeny > 500) { - Zeny -=500; + set Zeny, Zeny-500; mes "[Moonho Ahn]"; mes "Good, let's get started!"; mes "I'll let you go first~"; @@ -9380,7 +9380,7 @@ morocc,143,63,3 script Ragged Man#nd 4_M_MIDDLE,{ close; } else { - Zeny -=1200; + set Zeny, Zeny-1200; mes "[Ragged Man]"; mes "Let's see... I just need"; mes "1,200 zeny. That's enough"; @@ -9459,7 +9459,7 @@ morocc,143,63,3 script Ragged Man#nd 4_M_MIDDLE,{ mes "up the funds. I'll be waiting."; close; } else { - Zeny -=1200; + set Zeny, Zeny-1200; mes "[Ragged Man]"; mes "Remember that hidden"; mes "treasure I was looking for?"; @@ -10499,7 +10499,7 @@ alberta_in,70,109,5 script Shaman 4_M_UMOLDMAN,{ mes "If all goes well, you'll be"; mes "free of your curse, and I can"; mes "buy some Prontera real estate."; - Zeny -=200000; + set Zeny, Zeny-200000; set jewel_nd,14; next; mes "[Shaman]"; @@ -10550,7 +10550,7 @@ alberta_in,70,109,5 script Shaman 4_M_UMOLDMAN,{ mes "Hopefully, the"; mes "spirits will be more"; mes "cooperative this time."; - Zeny -=100000; + set Zeny, Zeny-100000; set jewel_nd,16; next; mes "[Shaman]"; diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt index d1c741892..d412c9615 100644 --- a/npc/quests/quests_payon.txt +++ b/npc/quests/quests_payon.txt @@ -90,7 +90,7 @@ payon_in01,18,10,4 script Mystic Lady 1_F_ORIENT_02,{ delitem 724,1; //Cardinal_Jewel_ delitem 949,200; //Feather delitem 5001,1; //Headset - Zeny -=5000; + set Zeny,Zeny-5000; mes "Here, I will give you this pre-made one."; getitem 2283,1; //Ear_Mufs next; diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index cc2cf7091..d2a15064c 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -2894,7 +2894,7 @@ prt_church,185,106,3 script Father Bamph 1_M_PASTOR,{ mes "to cover your Airship fee."; mes "Thank you, and good luck."; set aru_monas,6; - Zeny += (checkre(0)?5000:1500); + set Zeny, Zeny + (checkre(0)?5000:1500); changequest 17002,17003; close; } @@ -3639,7 +3639,7 @@ prt_in,162,99,4 script Librarian#curse 1_F_02,{ mes "replacement copies,"; mes "and try not to lose"; mes "them again. Thank you."; - Zeny -=700; + set Zeny, Zeny-700; getitem 7431,1; //Books close; } diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 1bc20da99..715cbe7ee 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -3478,7 +3478,7 @@ rachel,113,96,5 script Mohadian 4_M_MIDDLE,10,10,{ mes "It's always a pleasure"; mes "doing business with you~"; delitem 7561,.@hearts; //Glacial Hearts - Zeny +=.@totalprice; + set Zeny, Zeny+.@totalprice; close; } @@ -4194,7 +4194,7 @@ S_Donate: } set $rachel_donate,$rachel_donate+getarg(0); getitem 7570,getarg(0); //Temple_Lottery_Ticket - Zeny -=getarg(0)*50000; + set Zeny, Zeny-getarg(0)*50000; set ra_have_donated,1; if ($rachel_donate > 9999) { cutin "ra_nemma03",2; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index b679789e6..4b35a132c 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -722,7 +722,7 @@ prontera,202,122,0 script Kid#sch 4_F_KID2,{ mes "[Rooney]"; mes "Hey, alright! Thanks"; mes "for the cash! Heh heh~"; - Zeny -=100; + set Zeny, Zeny-100; set que_sch,3; close; } @@ -818,7 +818,7 @@ prt_church,89,108,6 script Bard#sch 2_M_BARD_ORIENT,{ mes "kid that was supposed"; mes "to come find me here."; set que_sch,2; - Zeny +=100; + set Zeny, Zeny+100; next; mes "[Lasda]"; mes "I'd like you to come"; @@ -1581,7 +1581,7 @@ job_duncer,93,106,6 script Dance Instructor#sch 4_F_HUGRANMA,{ mes "your Megaphone. Thanks"; mes "for everything, and I'll see"; mes "you around, adventurer~"; - Zeny -=500000; + set Zeny, Zeny-500000; set que_sch,18; getitem 7040,1; //Megaphone close; @@ -1627,7 +1627,7 @@ job_duncer,93,106,6 script Dance Instructor#sch 4_F_HUGRANMA,{ mes "so I'm not supposed to let"; mes "you have this. Don't let"; mes "anyone know I gave you this!"; - Zeny -=500000; + set Zeny, Zeny-500000; getitem 7040,1; //Megaphone close; } diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt index 45ec896b9..50cca4535 100644 --- a/npc/quests/quests_yuno.txt +++ b/npc/quests/quests_yuno.txt @@ -529,7 +529,7 @@ S_DelItems: delitem 7043,5; //Fine_Sand delitem 757,3; //Elunium_Stone delitem 756,3; //Oridecon_Stone - Zeny -=2000; + set Zeny, Zeny-2000; getitem getarg(0),getarg(1); //Gold mes "[Bain]"; mes "AHHH, it is a success!"; @@ -657,7 +657,7 @@ S_DelItems: delitem 7043,5; //Fine_Sand delitem 757,3; //Elunium_Stone delitem 756,3; //Oridecon_Stone - Zeny -=2000; + set Zeny, Zeny-2000; getitem getarg(0),getarg(1); //Gold mes "[Bajin]"; mes "AHHH, it is a success!"; diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index 716434891..72f4b9ddb 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -784,7 +784,7 @@ prt_fild08,175,374,3 script Bard#brising 1_M_BARD,{ mes "represents the"; mes "heart of a poet!"; soundeffect "bragis_poem.wav",1; - Zeny -=500; + set Zeny,Zeny-500; close2; } else { @@ -802,7 +802,7 @@ prt_fild08,175,374,3 script Bard#brising 1_M_BARD,{ mes "and energetic music, eh?"; mes "As you wish~"; soundeffect "chaos_of_eternity.wav",1; - Zeny -=500; + set Zeny,Zeny-500; close2; } else { @@ -822,7 +822,7 @@ prt_fild08,175,374,3 script Bard#brising 1_M_BARD,{ mes "well with Assassins."; mes "Don't you agree?"; soundeffect "assassin_of_sunset.wav",1; - Zeny -=500; + set Zeny,Zeny-500; close2; } else { diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt index 70378e191..ccafb4b2a 100644 --- a/npc/quests/skills/bard_skills.txt +++ b/npc/quests/skills/bard_skills.txt @@ -1202,7 +1202,7 @@ morocc_in,166,76,7 script Bartender#bard_qskill 1_ETC_01,{ mes "mild, but if you're not"; mes "careful, you'll pass out"; mes "in no time flat. Take it easy."; - Zeny -=1000; + set Zeny, Zeny-1000; getitem 12112,1; //Tropical_Sograt close; @@ -1232,7 +1232,7 @@ morocc_in,166,76,7 script Bartender#bard_qskill 1_ETC_01,{ mes "Be sure that you"; mes "enjoy your drinking"; mes "without going crazy."; - Zeny -=1000; + set Zeny, Zeny-1000; getitem 12113,1; //Vermilion_The_Beach close; diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt index df2ec0905..ba7bf82cf 100644 --- a/npc/quests/skills/blacksmith_skills.txt +++ b/npc/quests/skills/blacksmith_skills.txt @@ -184,7 +184,7 @@ geffen,178,72,3 script Akkie#qsk_bs 4_F_JOB_BLACKSMITH,{ delitem 999,1; //Steel delitem 971,1; //Detrimindexta delitem 613,1; //Iron_Hammer - Zeny -=500; + set Zeny, Zeny-500; set BLACK_SK,2; close; } diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index 408a200ce..634b50308 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -92,7 +92,7 @@ hu_fild01,140,163,5 script Tower Keeper 4_M_EIN_SOLDIER,3,3,{ mes "good work. Ah, and don't"; mes "forget: safety first when"; mes "you fight those monsters!"; - Zeny -= 3000; + set Zeny, Zeny - 3000; close2; warp "tha_scene01",131,220; end; @@ -119,7 +119,7 @@ hu_fild01,140,163,5 script Tower Keeper 4_M_EIN_SOLDIER,3,3,{ mes "you enjoy your visit"; mes "to Thanatos Tower~"; close2; - Zeny -= 5000; + set Zeny, Zeny - 5000; warp "tha_scene01",131,220; end; } @@ -496,7 +496,7 @@ tha_t01,140,78,4 script Guide#reward 4_F_ZONDAGIRL,{ mes "and please keep up"; mes "the good work~"; delitem .@items[.@i], countitem(.@items[.@i]); - Zeny += .@zeny_tt; + set Zeny, Zeny + .@zeny_tt; //getexp .@exp_tt,0; close; case 2: diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 41c9f346f..4c97821aa 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -3093,7 +3093,7 @@ OnTouch: /* Currently broken. prt_maze02,25,161,0 script #music -1,7,7,{ OnTouch: - soundeffect "effect\\???????????? ????????????.wav",1; + soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1; end; } */ @@ -4438,7 +4438,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{ else { mes "me. It also looks like you got zeny to spare! I think I'll help myself and borrow some of your cash!"; mes "^FF0000Yoink!^000000"; - Zeny -=10000; + set Zeny, Zeny-10000; specialeffect EF_COIN; close; } @@ -4520,7 +4520,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{ mes "to me tomorrow night and"; mes "we'll start your test..."; set sign_q,27; - Zeny -=30000; + set Zeny, Zeny-30000; } close; case 2: @@ -4768,7 +4768,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{ mes "um, ''Bakerlan'' in Alberta."; set sign_q,35; getitem 7177,1; //Part_Of_Star's_Sob - Zeny +=20000; + set Zeny, Zeny+20000; if (checkre(3)) { if (BaseLevel < 60) getexp 300,0; else if (BaseLevel < 70) getexp 700,0; @@ -4813,7 +4813,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{ mes "me. It also looks like you got zeny to spare! I think I'll help myself and borrow some of your cash!"; mes "^FF0000Yoink!^000000"; mes "Giggle giggle.."; - Zeny -=10000; + set Zeny, Zeny-10000; close; } } @@ -4826,7 +4826,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{ mes "cash. You know, for old"; mes "time's sake. ^FF0000Yoink!^000000"; emotion e_gg; - Zeny -=10000; + set Zeny, Zeny-10000; } else { mes "I got nothin' for you and"; @@ -6339,7 +6339,7 @@ alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{ mes "just one bottle, but this"; mes "stuff is extremely potent!"; next; - Zeny -=10000; + set Zeny, Zeny-10000; delitem 526,10; //Royal_Jelly delitem 518,20; //Honey delitem 948,30; //Bear's_Foot @@ -11370,7 +11370,7 @@ niflheim,102,54,4 script Mad Man#s 8_DOPPEL,{ mes "Heh heh!"; close; } - Zeny -=40000; + set Zeny, Zeny-40000; close; case 2: mes "[Laichin]"; @@ -11389,7 +11389,7 @@ niflheim,102,54,4 script Mad Man#s 8_DOPPEL,{ mes "crawling back when"; mes "you can't figure out"; mes "where the soul pieces are!"; - Zeny -=40000; + set Zeny, Zeny-40000; if (.@select_s == 1) set sign_q,97; else if (.@select_s == 2) set sign_q,98; else if (.@select_s == 3) set sign_q,99; @@ -11425,7 +11425,7 @@ niflheim,102,54,4 script Mad Man#s 8_DOPPEL,{ mes "than the borders of the map."; mes "For very small, you gotta"; mes "look near the center. Got it?"; - Zeny -=60000; + set Zeny, Zeny-60000; if (.@select_s == 1) set sign_q,101; else if (.@select_s == 2) set sign_q,102; else if (.@select_s == 3) set sign_q,103; @@ -11486,7 +11486,7 @@ niflheim,102,54,4 script Mad Man#s 8_DOPPEL,{ mes "than the borders of the map."; mes "For very small, you gotta"; mes "look near the center. Got it?"; - Zeny -=20000; + set Zeny, Zeny-20000; if (sign_q == 97) set sign_q,101; else if (sign_q == 98) set sign_q,102; else if (sign_q == 99) set sign_q,103; diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index 4bd42661f..fe9f768c4 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -31,7 +31,7 @@ alberta,246,82,3 script Crewman#bra2 4W_SAILOR,{ if (Zeny > 9999) { mes "[Crewman]"; mes "Cool~!! Let's go~!"; - Zeny -=10000; + set Zeny, Zeny-10000; close2; warp "brasilis",314,60; end; @@ -145,7 +145,7 @@ brasilis,137,77,5 script Ice-Cream Maker 4_M_03,{ mes "Lighten your pack before buying this."; close; } - Zeny -=.@icecream_hap; + set Zeny, Zeny-.@icecream_hap; getitem 536,.@input; //Ice_Cream close; case 2: diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index 1205a4de1..a0fa10275 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -29,7 +29,7 @@ alberta,212,202,4 script Dewata Sailor#alberta 4_M_DEWMAN,{ mes "^8B4513Dewata^000000 is a beautiful and peaceful island country."; mes "Have a nice trip~"; close2; - Zeny -= 10000; + set Zeny, Zeny - 10000; warp "dewata",232,53; end; } else { @@ -296,7 +296,7 @@ dewata,146,109,5 script Restauranteur#dew 4_COOK,{ } mes "[Restauranteur]"; mes "Here's your "+getitemname(.@food)+", you won't regret it!"; - Zeny -= 5000; + set Zeny, Zeny - 5000; getitem .@food,1; close; case 2: @@ -509,7 +509,7 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ mes "You make a wish for ^0000FF" + .@wish$ + "^000000 to the small shrine."; next; callsub L_Wish; - Zeny -= .@input; + set Zeny, Zeny - .@input; if (.@stat & 1 && .@bonus) consumeitem 12043; //Str_Dish03 else if (.@stat & 2 && .@bonus) diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt index 09397c0e5..f46ce2651 100644 --- a/npc/re/cities/dicastes.txt +++ b/npc/re/cities/dicastes.txt @@ -653,7 +653,7 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 4_MAN_BENKUNI,{ close; close; } - Zeny -=5000; + set Zeny, Zeny-5000; mes "[Crazy Venknick]"; mes "Thanks."; emotion e_gg,0,"Complaining Galten#fihs"; diff --git a/npc/re/cities/eclage.txt b/npc/re/cities/eclage.txt index e637b67d5..009f87ab3 100644 --- a/npc/re/cities/eclage.txt +++ b/npc/re/cities/eclage.txt @@ -438,7 +438,7 @@ ecl_in02,164,56,2 script Receptionist#Laphine 4_F_FAIRYKID2,{ mes "It seems like you don't have enough zeny. Would you check your account again, please?"; close; } - Zeny -=5000; + set Zeny, Zeny-5000; break; case 3: close; diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index ae5d8b48c..6e6e8749a 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -199,7 +199,7 @@ mora,57,150,4 duplicate(Dolangmal) Dolangmal#9 4_CAT_DOWN mes "Money? Where is the money? You can't go anywhere without the money. Shame on you."; close; } - Zeny -= .@price; + set Zeny, Zeny - .@price; mes "[Odgnalam]"; mes "Let me send you right away. Let's go~"; warp "malangdo",217,85; @@ -273,7 +273,7 @@ malangdo,219,86,4 script Kong#malang 4_CAT_SAILOR2,{ mes .@no_money$; close; } - Zeny -= .@price; + set Zeny, Zeny - .@price; mes .@yes_money$; if (.@i == 1) warp "izlude",195,212; diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index 8eb9ad77e..ae746e7d2 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -49,7 +49,7 @@ alberta,196,202,3 script Optamara Crew#alberta 4W_SAILOR,{ mes "[Optamara Crew]"; mes "Great!"; mes "Heading for Port Malaya!!"; - Zeny -=10000; + set Zeny, Zeny-10000; close2; warp "malaya",271,55; end; @@ -124,7 +124,7 @@ ma_in01,30,94,4 script Inn Keeper#ma 4_F_MALAYA,{ mes "[Inn Keeper]"; mes "Hope you enjoy your stay."; close2; - Zeny -=5000; + set Zeny, Zeny-5000; percentheal 100,100; warp "ma_in01",43,98; end; diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt index 91b1e132f..64f315fa9 100644 --- a/npc/re/cities/mora.txt +++ b/npc/re/cities/mora.txt @@ -453,7 +453,7 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{ mes "[Raffle Philosopher]"; mes "The quote I'm going to tell you is..."; mes "Let's see... Wait a second."; - Zeny -=.@input; + set Zeny, Zeny-.@input; next; mes ". . . . . . . . ."; next; @@ -1021,9 +1021,9 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{ next; mes "You feel somebody rummaging through your pockets before you pass out."; if (Zeny >= 5000) - Zeny -=5000; + set Zeny, Zeny-5000; else - Zeny = 0; + set Zeny, 0; close2; percentheal -99,0; warp "mora",31,132; @@ -1120,7 +1120,7 @@ mora,43,127,3 script Innkeeper#mora_inn 4_M_RAFLE_OR,{ mes "[Innkeeper]"; mes "Make yourself at home."; close2; - Zeny -=5000; + set Zeny, Zeny-5000; percentheal 100,100; warp "mora",32,123; end; @@ -1176,7 +1176,7 @@ mora,48,128,0 script Drawer#mora_warehouse HIDDEN_NPC,{ mes "- You don't seem to have 100 zeny with you. -"; close; } - Zeny -=100; + set Zeny, Zeny-100; openstorage; close; case 2: diff --git a/npc/re/guild/invest_main.txt b/npc/re/guild/invest_main.txt index 438947271..0a9e4105b 100644 --- a/npc/re/guild/invest_main.txt +++ b/npc/re/guild/invest_main.txt @@ -163,7 +163,7 @@ function script F_Invest_Abyss { mes getarg(1); mes "You've invested "+.@units+" unit"+((.@units == 1)?"":"s")+" "+((.@units < 100)?.@units:insertchar(""+.@units,",",1))+"0,000 Zeny"+getarg(2,"")+"."; mes "Not much but this is a small gift. You can exchange it with items in Malangdo."; - Zeny -=.@zeny; + set Zeny, Zeny-.@zeny; setd getarg(0), getd(getarg(0)) + .@units; getitem 6488,.@units; //Thanks_Invest_Ticket close; @@ -990,7 +990,7 @@ OnAgitInvest: } mes .@n$; mes "I'm sending you to the "+.@realm$+" Agit Dungeon "+.@i+"F."; - Zeny -=10000; + set Zeny, Zeny-10000; setd "$fund_"+.@npc$+"_extra", getd("$fund_"+.@npc$+"_extra") + 1; close2; if (compare(strnpcinfo(2),"alde")) diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index df51c3496..2d106dc4a 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -243,7 +243,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 799) { mes "Here you are, take it."; - Zeny -= 800; + set Zeny, Zeny - 800; getitem 12112,1; //Tropical_Sograt close; } @@ -253,7 +253,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 799) { mes "Here you are, take it."; - Zeny -= 800; + set Zeny, Zeny - 800; getitem 12113,1; //Vermilion_The_Beach close; } @@ -697,7 +697,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ if (Zeny > 499) { mes "Here you are. Milk."; mes "Then take a rest."; - Zeny -= 500; + set Zeny, Zeny - 500; getitem 519,1; //Milk close; } @@ -737,7 +737,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 799) { mes "Here you are, take it."; - Zeny -= 800; + set Zeny, Zeny - 800; getitem 12112,1; //Tropical_Sograt close; } @@ -747,7 +747,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 799) { mes "Here you are, take it."; - Zeny -= 800; + set Zeny, Zeny - 800; getitem 12113,1; //Vermilion_The_Beach close; } @@ -764,7 +764,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ if (Zeny > 499) { mes "I feel sorry to take 500 zeny per bottle, but I have to."; mes "It's very hard to get milk in Veins."; - Zeny -= 500; + set Zeny, Zeny - 500; getitem 519,1; //Milk close; } @@ -799,7 +799,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 999) { mes "Here you are, take it."; - Zeny -= 1000; + set Zeny, Zeny - 1000; getitem 12112,1; //Tropical_Sograt close; } @@ -809,7 +809,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Zeny > 999) { mes "Here you are, take it."; - Zeny -= 1000; + set Zeny, Zeny - 1000; getitem 12113,1; //Vermilion_The_Beach close; } @@ -1289,7 +1289,7 @@ ve_in,228,108,3 script Waitress#3rdgc04 1_F_PUBGIRL,{ mes "[Waitress]"; mes "Oh by the way, my name is Madelle."; mes "I hope you remember my name."; - Zeny -= 5000; + set Zeny, Zeny - 5000; setquest 7112; next; mes "- Madelle's information is attached to a quest board. What information have I collected? -"; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index 230d5b49c..772570cca 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -2304,7 +2304,7 @@ s_atelier,29,119,3 script Max#sc05_prt 4W_M_01,{ mes "Good luck!"; delitem 7150,.@i[2]; //Bamboo_Cut delitem 949,.@i[3]; //Feather - Zeny -= .@i[4]; + set Zeny, Zeny - .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; } @@ -2357,7 +2357,7 @@ s_atelier,136,70,3 script Titika#sc09_ra 4_F_CHILD,{ mes "I'll exchange it with the goods that I made."; delitem 7150,.@i[2]; //Bamboo_Cut delitem 949,.@i[3]; //Feather - Zeny -= .@i[4]; + set Zeny, Zeny - .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; } @@ -2407,7 +2407,7 @@ s_atelier,124,128,3 script RimiGX#sc07_yuno 4_F_LGTGIRL,{ mes "It will be fast when I exchange the stuff made?"; delitem 7150,.@i[2]; //Bamboo_Cut delitem 949,.@i[3]; //Feather - Zeny -= .@i[4]; + set Zeny, Zeny - .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; } @@ -2457,7 +2457,7 @@ s_atelier,26,68,3 script Vito#sc11_lgt 4_M_KHMAN,{ mes "I'm going to exchange the blush I made before."; delitem 7150,.@i[2]; //Bamboo_Cut delitem 949,.@i[3]; //Feather - Zeny -= .@i[4]; + set Zeny, Zeny - .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; } diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 05d98dc96..3a8dad744 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -653,7 +653,7 @@ airplane,33,47,5 script Nudor#sp2 4_F_NOVICE,{ mes "Woa~!! "+.@n+" Zeny! This helped me so much~ Tehee~"; mes "I can't believe it..."; changequest 5099,5100; - Zeny -= .@n; + set Zeny, Zeny - .@n; if (.@i < 5) set EXSUPNOV_Q_, .@i; else { if (.@n > 1000000) set EXSUPNOV_Q_,4; diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index 185aa4e8c..b63fca71c 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -73,7 +73,7 @@ mes "Check how much money you have first."; close; } - Zeny -= .@total; + set Zeny, Zeny - .@total; getitem .@item, .@amount; mes "[Poison Herb Merchant]"; mes "Thank you. Come back again~!"; @@ -141,7 +141,7 @@ lhz_in02,16,205,4 duplicate(phs) Poison Herb Merchant#lhz 4_F_YUNYANG mes "It doesn't seem like you are able to carry it all, why are you trying it?!"; close; } - Zeny -= .@total; + set Zeny, Zeny - .@total; getitem .@item, .@amount; mes "[Rune Merchant]"; mes "Thank you."; @@ -204,7 +204,7 @@ job3_guil01,91,93,3 script Rare Herb Collector 1_M_03,{ mes "[Rare Poison Herb Collector]"; mes "Good. I've received the money and the special item."; delitem .@item, .@amount; - Zeny -= .@total; + set Zeny, Zeny - .@total; getitem 709, .@amount; //Izidor close; } @@ -254,7 +254,7 @@ job3_guil01,91,93,3 script Rare Herb Collector 1_M_03,{ mes "You don't have enough space in your inventory to buy this amount."; close; } - Zeny -=(.@amount*200); + set Zeny, Zeny-(.@amount*200); getitem .@itemid[.@i],.@amount; mes "Thank you very much. See you~!"; close; diff --git a/npc/re/merchants/advanced_refiner.txt b/npc/re/merchants/advanced_refiner.txt index 8afe3e152..fd6602eda 100644 --- a/npc/re/merchants/advanced_refiner.txt +++ b/npc/re/merchants/advanced_refiner.txt @@ -154,7 +154,7 @@ malangdo,221,174,6 script Holink#mal_cash 4_CAT_ADV1,{ close; } delitem .@material,1; - Zeny -=.@price; + set Zeny, Zeny-.@price; if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) { successrefitem .@part; mes "[Holink]"; diff --git a/npc/re/merchants/alchemist.txt b/npc/re/merchants/alchemist.txt index ed2c0c20a..7569fe0b3 100644 --- a/npc/re/merchants/alchemist.txt +++ b/npc/re/merchants/alchemist.txt @@ -106,7 +106,7 @@ alde_alche,31,186,3 script Craft Book Merchant#alde 4_M_ALCHE_D,{ } mes "[Craft Book Merchant]"; mes "Thank you for your patronage."; - Zeny -= .@total; + set Zeny,Zeny - .@total; getitem .@item,.@amount; close; } diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt index a0205a98e..c5d198457 100644 --- a/npc/re/merchants/blessed_refiner.txt +++ b/npc/re/merchants/blessed_refiner.txt @@ -135,7 +135,7 @@ close; } delitem .@material,1; - Zeny -=.@price; + set Zeny, Zeny-.@price; mes "[Blacksmith Dister]"; mes "Tac! Tac! Tac!"; if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) { diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt index 9954476ca..933839bec 100644 --- a/npc/re/merchants/card_separation.txt +++ b/npc/re/merchants/card_separation.txt @@ -200,7 +200,7 @@ set .@sf_c_num,150; set .@sf_r_num,150; set .@sf_w_num,150; - Zeny -= 1000000; + set Zeny, Zeny - 1000000; break; case 3: if (countitem(6441) == 0) { diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt index 3ef33e953..91936bd35 100644 --- a/npc/re/merchants/catalog.txt +++ b/npc/re/merchants/catalog.txt @@ -74,7 +74,7 @@ moc_para01,22,16,5 script Catalog Magician#catal01 4_M_BIBI,{ close; } mes "Ok, here you go."; - Zeny -= .@sell; + set Zeny, Zeny - .@sell; getitem 12580,.@input; //Vending_Search_Scroll close; case 2: diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt index eda1740ca..e3efa5247 100644 --- a/npc/re/merchants/diamond.txt +++ b/npc/re/merchants/diamond.txt @@ -140,7 +140,7 @@ mes "501,000,000 zeny."; mes "Amount has been confirmed."; emotion e_loud; - Zeny -= 501000000; + set Zeny, Zeny - 501000000; getitem 6024, 1; next; @@ -220,7 +220,7 @@ mes "come back anytime with 500 million zeny."; emotion e_thx; delitem 6024, 1; - Zeny += 499000000; + set Zeny, Zeny + 499000000; close; } else { diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index a2fe7f3cd..d986b047f 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -1100,7 +1100,7 @@ L_Socket: close; } delitem 6380,1; //Mora_Coin - Zeny -=100000; + set Zeny, Zeny-100000; delequip .@part; if (.@enchant == 9) { specialeffect2 EF_SUI_EXPLOSION; @@ -1135,7 +1135,7 @@ L_Socket: mes "[Artifact Researcher]"; mes "The ability to enhance remains."; delitem 6380,1; //Mora_Coin - Zeny -=100000; + set Zeny, Zeny-100000; delequip .@part; // GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3] diff --git a/npc/re/merchants/enchan_upg.txt b/npc/re/merchants/enchan_upg.txt index fd8863776..c72479f38 100644 --- a/npc/re/merchants/enchan_upg.txt +++ b/npc/re/merchants/enchan_upg.txt @@ -250,7 +250,7 @@ prt_in,28,73,3 script Devil Enchant Master#prq 1_M_SMITH,{ } specialeffect EF_REPAIRWEAPON; mes "I initialized the enchant effects."; - Zeny -= 100000; + set Zeny, Zeny - 100000; delequip .@part; // GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] 0 diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt index 1e20a2001..03ef82559 100644 --- a/npc/re/merchants/flute.txt +++ b/npc/re/merchants/flute.txt @@ -63,7 +63,7 @@ mes "[Falcon Flute Trader]"; mes "Here, take this flute."; mes "With it you can whistle for your Falcon from anywhere."; - Zeny -= .@price; + set Zeny, Zeny - .@price; getitem 12848,1; //Falcon_Flute next; mes "[Falcon Flute Trader]"; @@ -115,7 +115,7 @@ tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{ mes "Here's the new Wolf Flute."; mes "Hope you are ready to use it."; delitem 7150,1; //Bamboo_Cut - Zeny -=100000; + set Zeny, Zeny-100000; getitem 6124,1; //Wolf's_Flute close; } diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt index 3212333f7..c55917f4f 100644 --- a/npc/re/merchants/hd_refiner.txt +++ b/npc/re/merchants/hd_refiner.txt @@ -118,7 +118,7 @@ close; } delitem .@material,1; - Zeny -=.@price; + set Zeny, Zeny-.@price; mes "[Blacksmith Mighty Hammer]"; mes "Tac! Tac! Tac!"; if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) { @@ -270,7 +270,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF close; } delitem .@material,1; - Zeny -=.@price; + set Zeny, Zeny-.@price; mes "Pow! Pow! Pow! Pow!"; if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) { successrefitem .@part; diff --git a/npc/re/merchants/inn.txt b/npc/re/merchants/inn.txt index 3d6a2bcb2..dcd08ae5e 100644 --- a/npc/re/merchants/inn.txt +++ b/npc/re/merchants/inn.txt @@ -38,7 +38,7 @@ bra_in01,27,24,3 script Hotel Keeper#bra1 4_F_BRZ_WOMAN,{ mes "[Hotel Keeper]"; mes "I will show you a great room."; close2; - Zeny -=5000; + set Zeny, Zeny-5000; percentheal 100,100; warp "bra_in01",144,69; end; diff --git a/npc/re/merchants/quivers.txt b/npc/re/merchants/quivers.txt index 54a4e221f..1e4c226fb 100644 --- a/npc/re/merchants/quivers.txt +++ b/npc/re/merchants/quivers.txt @@ -113,7 +113,7 @@ S_BuyQuiver: mes "There is ^3131FFsomething you need to know^000000 - try to remember it."; mes "^FF0000You can't use quivers when your encumbrance is over 70%.^000000"; mes "You'd better keep that in mind, or you might be in trouble later."; - Zeny -=.@arrow_zeny01; + set Zeny, Zeny-.@arrow_zeny01; delitem getarg(0),.@arrows_used; getitem getarg(3),.@quiver; close; diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index 4c1d2b0f0..fa5bab042 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -156,7 +156,7 @@ function script refinenew { mes "Please come back when you have them."; close; } - Zeny -= .@price; + set Zeny,Zeny - .@price; delitem .@material,1; //custom checks @@ -272,7 +272,7 @@ function script refinenew { mes "Please come back when you have them."; close; } - Zeny -= .@fullprice; + set Zeny,Zeny - .@fullprice; delitem .@material,.@refinecnt; while(.@refinecnt){ if (getequipisequiped(.@part) == 0) { @@ -368,7 +368,7 @@ function script refinenew { } if (countitem(.@i[0]) >= .@i[1] && Zeny >= 50000) { delitem .@i[0],.@i[1]; - Zeny -= 50000; + set Zeny, Zeny - 50000; getitem .@i[2],1; mes "[Austri]"; if (.@i[0] == 6090) { @@ -517,7 +517,7 @@ malangdo,224,172,6 script Clink#mal_normal 4_CAT_SAILOR1,{ close; } delitem .@material,1; - Zeny -=.@price; + set Zeny, Zeny-.@price; if (getequippercentrefinery(.@part) <= rand(100)) { failedrefitem .@part; mes "[Clink]"; diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 904cd670f..b4400854f 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -63,7 +63,7 @@ moc_para01,14,32,5 script Aperture#acolytewarp 4_F_01,{ specialeffect2 EF_TELEPORTATION; specialeffect2 EF_PORTAL; next; - Zeny -= .@cost[.@i]; + set Zeny, Zeny - .@cost[.@i]; switch(.@i) { case 0: warp "prontera",116,72; break; case 1: warp "izlude",128,98; break; @@ -585,7 +585,7 @@ moc_para01,174,33,3 script Bathory#2012spirits BATHORY,{ mes "[Bathory]"; mes "Alright, hold on tight!"; close2; - Zeny -=1000; + set Zeny, Zeny-1000; warp "niflheim",194,185; end; case 2: diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index cebd70b87..c96d5a049 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -3622,7 +3622,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ next; mes "- After eating the meal, You feel a little bit full."; mes "You've recovered some HP and SP. -"; - Zeny -= 2700; + set Zeny, Zeny - 2700; percentheal 50,0; percentheal 0,50; close; @@ -3639,7 +3639,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ next; mes "- After eating the meal, You feel a little bit full."; mes "You've recovered some HP and SP. -"; - Zeny -= 3000; + set Zeny, Zeny - 3000; percentheal 50,0; percentheal 0,50; close; @@ -3661,7 +3661,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ next; mes "- After eating the meal, You feel a little bit full."; mes "You've recovered some HP and SP. -"; - Zeny -= 3600; + set Zeny, Zeny - 3600; percentheal 75,0; percentheal 0,75; close; @@ -3678,7 +3678,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ next; mes "- After eating the meal, You feel a little bit full."; mes "You've recovered some HP and SP. -"; - Zeny -= 4000; + set Zeny, Zeny - 4000; percentheal 75,0; percentheal 0,75; close; @@ -3697,7 +3697,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "- The Rib Eye Roll is grilled on the oak."; mes "- After eating the meal, You feel a little bit full."; mes "You've recovered your HP and SP. -"; - Zeny -= 4500; + set Zeny, Zeny - 4500; percentheal 100,0; percentheal 0,100; close; @@ -3716,7 +3716,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "- The Rib Eye Roll is grilled on the oak."; mes "- After eating the meal, You feel a little bit full."; mes "You've recovered your HP and SP. -"; - Zeny -= 5000; + set Zeny, Zeny - 5000; percentheal 100,0; percentheal 0,100; close; @@ -4580,7 +4580,7 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{ mes "You dont have enough zeny."; close; } - Zeny -= 250000; + set Zeny, Zeny - 250000; getitem .@check[.@i],1; mes "[Toren]"; mes "These advanced gears are not easy to make, please take better care of this one."; @@ -4764,7 +4764,7 @@ moc_para01,112,79,3 script Weapons Expert 4_M_REPAIR,{ mes "Wait... Your Class doesn't have a weapon."; close; } - Zeny -= 250000; + set Zeny, Zeny - 250000; if (BaseClass == Job_Swordman) { mes "Swordman Class gets a choice of weapons, would you like to have a sword or a spear?"; callsub L_Select, diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt index 544c7b11a..8335b9fbe 100644 --- a/npc/re/quests/eden/eden_service.txt +++ b/npc/re/quests/eden/eden_service.txt @@ -41,7 +41,7 @@ mes "Maybe I am not yet qualified to use Cabinet."; close; } - Zeny -= 500; + set Zeny, Zeny - 500; close2; openstorage; end; diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt index d5abca9fd..9ef1a2b6e 100644 --- a/npc/re/quests/homun_s.txt +++ b/npc/re/quests/homun_s.txt @@ -510,7 +510,7 @@ que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ mes "Good. Almost done!"; next; specialeffect2 EF_SUI_EXPLOSION; - Zeny -= 50000; + set Zeny, Zeny - 50000; hommutate .@Homunculus; break; case 2: diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt index 0fd885d8f..de846567a 100644 --- a/npc/re/quests/magic_books.txt +++ b/npc/re/quests/magic_books.txt @@ -334,7 +334,7 @@ geffen_in,175,112,4 script Lea 2_F_MAGICMASTER,{ next; mes "[Lea]"; mes "Please try not to lose or damage the book to avoid paying any extra charges."; - if (.@Payment == 1) Zeny -= 10000; + if (.@Payment == 1) set Zeny, Zeny - 10000; else if (.@Payment == 2) delitem 1006,2; //Old_Magic_Book else delitem 1097,50; //Worn_Out_Page getitem 6188+.@i,1; //Magic_Book_FB, Magic_Book_CB, Magic_Book_LB @@ -379,7 +379,7 @@ geffen_in,175,112,4 script Lea 2_F_MAGICMASTER,{ next; mes "[Lea]"; mes "The Intermediate and Superior Magic Books must be returned upon borrowing the Ultimate Magic Book. Remember that you're just borrowing them, so make sure you take good care of those books."; - if (.@Payment == 1) Zeny -= 50000; + if (.@Payment == 1) set Zeny, Zeny - 50000; else if (.@Payment == 2) delitem 603,2; //Old_Blue_Box else delitem 985,9; //Elunium getitem .@Books[.@i-1],1; //Magic_Book_SG, Magic_Book_LOV, Magic_Book_MS, Magic_Book_TS, Magic_Book_JT, Magic_Book_WB, Magic_Book_HD, Magic_Book_ES @@ -451,11 +451,11 @@ geffen_in,175,112,4 script Lea 2_F_MAGICMASTER,{ next; mes "[Lea]"; mes "The Intermediate and Superior Magic Books must be returned upon borrowing the Ultimate Magic Book. Remember that you're just borrowing them, so make sure you take good care of those books."; - if (.@Payment == 1) Zeny -= 200000; + if (.@Payment == 1) set Zeny, Zeny - 200000; else if (.@Payment == 2) delitem 7094,12; //Mystery_Piece else if (.@Payment == 3) delitem 984,7; //Oridecon else delitem 617,1; //Old_Violet_Box - if (.@Payment > 1) Zeny -= 100000; + if (.@Payment > 1) set Zeny, Zeny - 100000; getitem 6201+.@i,1; //Magic_Book_ES_, Magic_Book_CL, Magic_Book_CR, Magic_Book_DL close; } @@ -647,7 +647,7 @@ mid_camp,255,244,4 script Galfos 4_M_JOB_WIZARD,{ specialeffect2 EF_DISPELL; progressbar "ffff00",4; specialeffect2 EF_LORD; - Zeny -= 1000000; + set Zeny, Zeny - 1000000; getitem 6194+.@i,1; //Magic_Book_CM, Magic_Book_TV mes "[Galfos]"; mes "Man, I almost lost my control to the incredible magic energy! Here's your Magic Book."; diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index f7e4a2418..7c5ccbc7b 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -471,7 +471,7 @@ brasilis,187,162,5 script Candy Maker 4_M_BRZ_MAN1,{ if (Zeny > 3999) { mes "[Candy Maker]"; mes "Here is a delicious guarana candy."; - Zeny -=4000; + set Zeny, Zeny-4000; getitem 12414,1; //Guarana_Candy close; } diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index e3d1a7302..7cb41b0af 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -2097,7 +2097,7 @@ dew_fild01,127,240,4 script Gatti#weapon 2_M_OLDBLSMITH,{ } specialeffect2 EF_REPAIRWEAPON; progressbar "0xFFFF00",3; - Zeny -= 100000; + set Zeny, Zeny - 100000; // Socket 3 set .@i, rand(4300); diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index b83acd793..c3ecc7f70 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -137,7 +137,7 @@ dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 4_MAN_BENKUNI,{ mes "You changed your mind?"; close; } - Zeny -= .@deal; + set Zeny, Zeny - .@deal; getitem 6437,.@input; //Scaraba_Perfume mes "[Curious Sapha]"; mes "Here you go. Scaraba might flock around you so don't use it near Scaraba Hall."; @@ -430,7 +430,7 @@ dic_in01,254,119,0 script Item Storage#01 CLEAR_NPC,{ mes "Not enough Zeny."; close; } - Zeny -=500; + set Zeny, Zeny-500; close2; openstorage; end; @@ -3704,7 +3704,7 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ if (Zeny > 1999) { mes "[Shay]"; mes "Here is your "+.@str$[@menu]+"."; - Zeny -= 2000; + set Zeny, Zeny - 2000; getitem .@item[@menu],1; //Tropical_Sograt break; } @@ -7540,7 +7540,7 @@ moc_para01,44,19,3 script Cat Hand Agent#gekk 4_M_MERCAT2,{ mes "[Agent Geck]"; mes "With this, our contract is now complete."; mes "Geck will help you to get to Ash-Vacuum in one piece."; - Zeny -= 50000; + set Zeny, Zeny - 50000; set ep13_start, 100; next; mes "[Agent Geck]"; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index 3e7b6d381..bb5619c58 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -67,7 +67,7 @@ mes "I'm afraid it's not enough. Sorry, but it can't be done for free~"; close; } - Zeny -=.@price; + set Zeny, Zeny-.@price; } else { if (countitem(12636) < .@price) { mes "[Teleport Cat]"; diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 651390e54..dbf405542 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -345,7 +345,7 @@ malangdo,184,139,4 script Storekeeper#mal 4_CAT_ADV2,{ mes "You don't have enough zeny..."; close; } - Zeny -=.@zeny; + set Zeny, Zeny-.@zeny; break; } mes "[Storekeeper]"; @@ -807,7 +807,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 4_CAT_MERMASTER,{ mes "If you see the words on the first page of this book, there's a sentence seeming like short conversation."; next; mes "[Linguist Devore]"; - mes "It's like this, for the question, ?????? ?????, it says, ???? ?????? ??????????, ??????????????????. ?? ???????"; + mes "It's like this, for the question, Ѭ ?, it says, լҬ, ҬݬѬԬլѬ. ڬ?"; next; mes "[Linguist Devore]"; mes "Though I tried talking to Biscuit like this, there was no feedback."; @@ -9637,7 +9637,7 @@ mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{ case 1: // Attack mes "How would you like to attack?"; mes " "; - mes "?? Tip !!"; + mes " Tip !!"; mes "Choose back: ^FF0000You win if the cat shows the back of its paw.^000000"; mes "Choose palm: ^FF0000You win if the cat shows the palm of its paw.^000000"; next; @@ -9683,7 +9683,7 @@ mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{ case 2: // Defend mes "How would you like to defend?"; mes " "; - mes "?? Tip !!"; + mes " Tip !!"; mes "Choose back: ^FF0000You win if the cat shows the back of its paw.^000000"; mes "Choose palm: ^FF0000You win if the cat shows the palm of its paw.^000000"; next; @@ -10624,7 +10624,7 @@ mal_in01,15,16,3 script Fallen Angel#mal 4_F_VALKYRIE2,{ else if (.@i < 854) set .@enchant,4710; //Inteligence1 else set .@enchant,0; - Zeny -= 1000000; + set Zeny, Zeny - 1000000; delequip EQI_GARMENT; if (.@enchant == 0) { mes "[Fallen Angel]"; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 26ede25c0..edc964053 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -2403,7 +2403,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ mes "[Pedro the Sailor]"; mes "Thank you~"; mes "Let's go before the ghosts come back!"; - Zeny -= 1000; + set Zeny, Zeny - 1000; close2; warp "izlude",195,180; end; @@ -3359,7 +3359,7 @@ ma_fild01,166,214,6 script Old Man in Dilemma#GA 4_F_BARYO_OLD,{ if (countitem(6497) >= 3 && Zeny >= 1000) { specialeffect2 EF_CONE; specialeffect EF_FORESTLIGHT2; - Zeny -=1000; + set Zeny, Zeny-1000; getitem 12775,1; //Ancient_Spirit_Agimat } else { mes "[Old Man in Dilemma]"; diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt index 6ee595af1..5c062bdf4 100644 --- a/npc/re/quests/quests_morocc.txt +++ b/npc/re/quests/quests_morocc.txt @@ -93,7 +93,7 @@ moc_prydb1,103,54,3 script Suspicious Cat#night 4_CAT_SAILOR4,{ mes "Where do you think you're going! You're so broke!"; close; } - Zeny -=5000; + set Zeny, Zeny-5000; mes "[Suspicious Cat]"; mes "Bah, what's up with this old money... you don't have anything sparkly or shiny?!"; mes "Ahh, just follow me!"; -- cgit v1.2.3-70-g09d2 From 83d2d9343ab965c22816ac231973205ee67035e1 Mon Sep 17 00:00:00 2001 From: Haru Date: Sat, 14 Sep 2013 08:11:53 +0200 Subject: Removed meaningless '~=' operator. - [ This commit is part of a larger script engine related update ] - Since: c18f438 Signed-off-by: Haru --- src/map/script.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/map/script.c b/src/map/script.c index 777179507..fd16bdbad 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -857,7 +857,6 @@ const char* parse_variable(const char* p) { || ( p[0] == '*' && p[1] == '=' && (type = C_MUL) ) // *= || ( p[0] == '/' && p[1] == '=' && (type = C_DIV) ) // /= || ( p[0] == '%' && p[1] == '=' && (type = C_MOD) ) // %= - || ( p[0] == '~' && p[1] == '=' && (type = C_NOT) ) // ~= || ( p[0] == '+' && p[1] == '+' && (type = C_ADD_PP) ) // ++ || ( p[0] == '-' && p[1] == '-' && (type = C_SUB_PP) ) // -- || ( p[0] == '<' && p[1] == '<' && p[2] == '=' && (type = C_L_SHIFT) ) // <<= -- cgit v1.2.3-70-g09d2 From ac6ae8c932efbca30ef1650fa5d7bd94ead336f5 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 9 Sep 2013 12:47:48 +0200 Subject: Added pre de/increment operators. Fixed post de/increment operators. - [ This commit is part of a larger script engine related update ] - Suffix ++ and -- operators now behave like in other languages (updating the variable *after* its value is returned.) - Prefix ++ and -- operators are added for parity with other scripting/programming languages. They update the variable they're applied to *before* returning its value. - Please note that the implementation of the prefix form of those operators (like it happens in most languages) is more efficient than the suffix form. '++.@i' is (slightly) faster than '.@i++', or at least not slower. - Fixed some outdated script debug functions. - Follow-up to c18f438. Signed-off-by: Haru --- src/map/script.c | 246 +++++++++++++++++++++++++++++++++---------------------- src/map/script.h | 6 +- 2 files changed, 150 insertions(+), 102 deletions(-) diff --git a/src/map/script.c b/src/map/script.c index fd16bdbad..2c4178d9b 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -66,11 +66,9 @@ static inline void SETVALUE(unsigned char* buf, int i, int n) { struct script_interface script_s; -const char* script_op2name(int op) -{ +const char* script_op2name(int op) { #define RETURN_OP_NAME(type) case type: return #type - switch( op ) - { + switch( op ) { RETURN_OP_NAME(C_NOP); RETURN_OP_NAME(C_POS); RETURN_OP_NAME(C_INT); @@ -85,6 +83,8 @@ const char* script_op2name(int op) RETURN_OP_NAME(C_USERFUNC); RETURN_OP_NAME(C_USERFUNC_POS); + RETURN_OP_NAME(C_REF); + // operators RETURN_OP_NAME(C_OP3); RETURN_OP_NAME(C_LOR); @@ -108,6 +108,10 @@ const char* script_op2name(int op) RETURN_OP_NAME(C_NOT); RETURN_OP_NAME(C_R_SHIFT); RETURN_OP_NAME(C_L_SHIFT); + RETURN_OP_NAME(C_ADD_POST); + RETURN_OP_NAME(C_SUB_POST); + RETURN_OP_NAME(C_ADD_PRE); + RETURN_OP_NAME(C_SUB_PRE); default: ShowDebug("script_op2name: unexpected op=%d\n", op); @@ -819,6 +823,38 @@ void parse_nextline(bool first, const char* p) script->str_data[LABEL_NEXTLINE].label = -1; } +/** + * Pushes a variable into stack, processing its array index if needed. + * @see parse_variable + */ +void parse_variable_sub_push(int word, const char *p2) { + const char* p3 = NULL; + + if( p2 ) { + // process the variable index + + // push the getelementofarray method into the stack + script->addl(script->buildin_getelementofarray_ref); + script->addc(C_ARG); + script->addl(word); + + // process the sub-expression for this assignment + p3 = script->parse_subexpr(p2 + 1, 1); + p3 = script->skip_space(p3); + + if( *p3 != ']' ) {// closing parenthesis is required for this script + disp_error_message("Missing closing ']' parenthesis for the variable assignment.", p3); + } + + // push the closing function stack operator onto the stack + script->addc(C_FUNC); + p3++; + } else { + // No array index, simply push the variable or value onto the stack + script->addl(word); + } +} + /// Parse a variable assignment using the direct equals operator /// @param p script position where the function should run from /// @return NULL if not a variable assignment, the new position otherwise @@ -828,21 +864,30 @@ const char* parse_variable(const char* p) { const char *p2 = NULL; const char *var = p; + if( ( p[0] == '+' && p[1] == '+' && (type = C_ADD_PRE) ) // pre ++ + || ( p[1] == '-' && p[1] == '-' && (type = C_SUB_PRE) ) // pre -- + ) { + var = p = script->skip_space(&p[2]); + } + // skip the variable where applicable p = script->skip_word(p); p = script->skip_space(p); - if( p == NULL ) {// end of the line or invalid buffer + if( p == NULL ) { + // end of the line or invalid buffer return NULL; } - if( *p == '[' ) {// array variable so process the array as appropriate + if( *p == '[' ) { + // array variable so process the array as appropriate for( p2 = p, i = 0, j = 1; p; ++ i ) { if( *p ++ == ']' && --(j) == 0 ) break; if( *p == '[' ) ++ j; } - if( !(p = script->skip_space(p)) ) {// end of line or invalid characters remaining + if( !(p = script->skip_space(p)) ) { + // end of line or invalid characters remaining disp_error_message("Missing right expression or closing bracket for variable.", p); } } @@ -857,8 +902,8 @@ const char* parse_variable(const char* p) { || ( p[0] == '*' && p[1] == '=' && (type = C_MUL) ) // *= || ( p[0] == '/' && p[1] == '=' && (type = C_DIV) ) // /= || ( p[0] == '%' && p[1] == '=' && (type = C_MOD) ) // %= - || ( p[0] == '+' && p[1] == '+' && (type = C_ADD_PP) ) // ++ - || ( p[0] == '-' && p[1] == '-' && (type = C_SUB_PP) ) // -- + || ( p[0] == '+' && p[1] == '+' && (type = C_ADD_POST) ) // post ++ + || ( p[0] == '-' && p[1] == '-' && (type = C_SUB_POST) ) // post -- || ( p[0] == '<' && p[1] == '<' && p[2] == '=' && (type = C_L_SHIFT) ) // <<= || ( p[0] == '>' && p[1] == '>' && p[2] == '=' && (type = C_R_SHIFT) ) // >>= ) ) @@ -867,23 +912,26 @@ const char* parse_variable(const char* p) { } switch( type ) { - case C_EQ: {// incremental modifier + case C_ADD_PRE: // pre ++ + case C_SUB_PRE: // pre -- + // (nothing more to skip) + break; + + case C_EQ: // = p = script->skip_space( &p[1] ); - } - break; + break; - case C_L_SHIFT: - case C_R_SHIFT: {// left or right shift modifier + case C_L_SHIFT: // <<= + case C_R_SHIFT: // >>= p = script->skip_space( &p[3] ); - } - break; + break; - default: {// normal incremental command + default: // everything else p = script->skip_space( &p[2] ); - } } - if( p == NULL ) {// end of line or invalid buffer + if( p == NULL ) { + // end of line or invalid buffer return NULL; } @@ -897,56 +945,44 @@ const char* parse_variable(const char* p) { script->syntax.curly[script->syntax.curly_count].flag = ARGLIST_PAREN; // increment the total curly count for the position in the script - ++ script->syntax.curly_count; + ++script->syntax.curly_count; // parse the variable currently being modified word = script->add_word(var); - if( script->str_data[word].type == C_FUNC || script->str_data[word].type == C_USERFUNC || script->str_data[word].type == C_USERFUNC_POS ) - {// cannot assign a variable which exists as a function or label + if( script->str_data[word].type == C_FUNC + || script->str_data[word].type == C_USERFUNC + || script->str_data[word].type == C_USERFUNC_POS + ) { + // cannot assign a variable which exists as a function or label disp_error_message("Cannot modify a variable which has the same name as a function or label.", p); } - if( p2 ) {// process the variable index - const char* p3 = NULL; - - // push the getelementofarray method into the stack - script->addl(script->buildin_getelementofarray_ref); - script->addc(C_ARG); - script->addl(word); - - // process the sub-expression for this assignment - p3 = script->parse_subexpr(p2 + 1, 1); - p3 = script->skip_space(p3); - - if( *p3 != ']' ) {// closing parenthesis is required for this script - disp_error_message("Missing closing ']' parenthesis for the variable assignment.", p3); - } - - // push the closing function stack operator onto the stack - script->addc(C_FUNC); - p3 ++; - } else {// simply push the variable or value onto the stack - script->addl(word); - } + parse_variable_sub_push(word, p2); // Push variable onto the stack if( type != C_EQ ) script->addc(C_REF); - if( type == C_ADD_PP || type == C_SUB_PP ) {// incremental operator for the method + if( type == C_ADD_POST || type == C_SUB_POST ) { // post ++ / -- + script->addi(1); + script->addc(type == C_ADD_POST ? C_ADD : C_SUB); + + parse_variable_sub_push(word, p2); // Push variable onto the stack (third argument of setr) + } else if( type == C_ADD_PRE || type == C_SUB_PRE ) { // pre ++ / -- script->addi(1); - script->addc(type == C_ADD_PP ? C_ADD : C_SUB); - } else {// process the value as an expression + script->addc(type == C_ADD_PRE ? C_ADD : C_SUB); + } else { + // process the value as an expression p = script->parse_subexpr(p, -1); - if( type != C_EQ ) - {// push the type of modifier onto the stack + if( type != C_EQ ) { + // push the type of modifier onto the stack script->addc(type); } } // decrement the curly count for the position within the script - -- script->syntax.curly_count; + --script->syntax.curly_count; // close the script by appending the function operator script->addc(C_FUNC); @@ -1104,48 +1140,51 @@ const char* parse_simpleexpr(const char *p) { /*========================================== * Analysis of the expression *------------------------------------------*/ -const char* script_parse_subexpr(const char* p,int limit) -{ +const char* script_parse_subexpr(const char* p,int limit) { int op,opl,len; const char* tmpp; p=script->skip_space(p); - if( *p == '-' ){ + if( *p == '-' ) { tmpp = script->skip_space(p+1); - if( *tmpp == ';' || *tmpp == ',' ){ + if( *tmpp == ';' || *tmpp == ',' ) { script->addl(LABEL_NEXTLINE); p++; return p; } } - if((op=C_NEG,*p=='-') || (op=C_LNOT,*p=='!') || (op=C_NOT,*p=='~')){ + if( (op=C_ADD_PRE,p[0]=='+'&&p[1]=='+') || (op=C_SUB_PRE,p[0]=='-'&&p[1]=='-') ) { // Pre ++ -- operators + p=script->parse_variable(p); + } else if( (op=C_NEG,*p=='-') || (op=C_LNOT,*p=='!') || (op=C_NOT,*p=='~') ) { // Unary - ! ~ operators p=script->parse_subexpr(p+1,10); script->addc(op); - } else + } else { p=script->parse_simpleexpr(p); + } p=script->skip_space(p); while(( - (op=C_OP3,opl=0,len=1,*p=='?') || - (op=C_ADD,opl=8,len=1,*p=='+') || - (op=C_SUB,opl=8,len=1,*p=='-') || - (op=C_MUL,opl=9,len=1,*p=='*') || - (op=C_DIV,opl=9,len=1,*p=='/') || - (op=C_MOD,opl=9,len=1,*p=='%') || - (op=C_LAND,opl=2,len=2,*p=='&' && p[1]=='&') || - (op=C_AND,opl=6,len=1,*p=='&') || - (op=C_LOR,opl=1,len=2,*p=='|' && p[1]=='|') || - (op=C_OR,opl=5,len=1,*p=='|') || - (op=C_XOR,opl=4,len=1,*p=='^') || - (op=C_EQ,opl=3,len=2,*p=='=' && p[1]=='=') || - (op=C_NE,opl=3,len=2,*p=='!' && p[1]=='=') || - (op=C_R_SHIFT,opl=7,len=2,*p=='>' && p[1]=='>') || - (op=C_GE,opl=3,len=2,*p=='>' && p[1]=='=') || - (op=C_GT,opl=3,len=1,*p=='>') || - (op=C_L_SHIFT,opl=7,len=2,*p=='<' && p[1]=='<') || - (op=C_LE,opl=3,len=2,*p=='<' && p[1]=='=') || - (op=C_LT,opl=3,len=1,*p=='<')) && opl>limit){ + (op=C_OP3, opl=0,len=1,*p=='?') // ?: + || (op=C_ADD, opl=8,len=1,*p=='+') // + + || (op=C_SUB, opl=8,len=1,*p=='-') // - + || (op=C_MUL, opl=9,len=1,*p=='*') // * + || (op=C_DIV, opl=9,len=1,*p=='/') // / + || (op=C_MOD, opl=9,len=1,*p=='%') // % + || (op=C_LAND, opl=2,len=2,*p=='&' && p[1]=='&') // && + || (op=C_AND, opl=6,len=1,*p=='&') // & + || (op=C_LOR, opl=1,len=2,*p=='|' && p[1]=='|') // || + || (op=C_OR, opl=5,len=1,*p=='|') // | + || (op=C_XOR, opl=4,len=1,*p=='^') // ^ + || (op=C_EQ, opl=3,len=2,*p=='=' && p[1]=='=') // == + || (op=C_NE, opl=3,len=2,*p=='!' && p[1]=='=') // != + || (op=C_R_SHIFT,opl=7,len=2,*p=='>' && p[1]=='>') // >> + || (op=C_GE, opl=3,len=2,*p=='>' && p[1]=='=') // >= + || (op=C_GT, opl=3,len=1,*p=='>') // > + || (op=C_L_SHIFT,opl=7,len=2,*p=='<' && p[1]=='<') // << + || (op=C_LE, opl=3,len=2,*p=='<' && p[1]=='=') // <= + || (op=C_LT, opl=3,len=1,*p=='<') // < + ) && opl>limit) { p+=len; if(op == C_OP3) { p=script->parse_subexpr(p,-1); @@ -2329,7 +2368,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o i += 3; break; case C_STR: - j = strlen(script->buf + i); + j = strlen((char*)script->buf + i); ShowMessage(" %s", script->buf + i); i += j+1; break; @@ -5120,8 +5159,7 @@ BUILDIN(copyarray); /// The value is converted to the type of the variable. /// /// set(,) -> -BUILDIN(set) -{ +BUILDIN(setr) { TBL_PC* sd = NULL; struct script_data* data; //struct script_data* datavalue; @@ -5131,8 +5169,7 @@ BUILDIN(set) data = script_getdata(st,2); //datavalue = script_getdata(st,3); - if( !data_isreference(data) ) - { + if( !data_isreference(data) ) { ShowError("script:set: not a variable\n"); script->reportdata(script_getdata(st,2)); st->state = END; @@ -5143,31 +5180,30 @@ BUILDIN(set) name = reference_getname(data); prefix = *name; - if( not_server_variable(prefix) ) - { + if( not_server_variable(prefix) ) { sd = script->rid2sd(st); - if( sd == NULL ) - { + if( sd == NULL ) { ShowError("script:set: no player attached for player variable '%s'\n", name); return true; } } #if 0 - if( data_isreference(datavalue) ) - {// the value being referenced is a variable + // TODO: see de43fa0f73be01080bd11c08adbfb7c158324c81 + if( data_isreference(datavalue) ) { + // the value being referenced is a variable const char* namevalue = reference_getname(datavalue); - if( !not_array_variable(*namevalue) ) - {// array variable being copied into another array variable - if( sd == NULL && not_server_variable(*namevalue) && !(sd = script->rid2sd(st)) ) - {// player must be attached in order to copy a player variable + if( !not_array_variable(*namevalue) ) { + // array variable being copied into another array variable + if( sd == NULL && not_server_variable(*namevalue) && !(sd = script->rid2sd(st)) ) { + // player must be attached in order to copy a player variable ShowError("script:set: no player attached for player variable '%s'\n", namevalue); return true; } - if( is_string_variable(namevalue) != is_string_variable(name) ) - {// non-matching array value types + if( is_string_variable(namevalue) != is_string_variable(name) ) { + // non-matching array value types ShowWarning("script:set: two array variables do not match in type.\n"); return true; } @@ -5181,14 +5217,23 @@ BUILDIN(set) } #endif + if( script_hasdata(st, 4) ) { + // Optional argument used by post-increment/post-decrement constructs to return the previous value + if( is_string_variable(name) ) { + script_pushstrcopy(st, script_getstr(st, 4)); + } else { + script_pushint(st, script_getnum(st, 4)); + } + } else { + // return a copy of the variable reference + script_pushcopy(st,2); + } + if( is_string_variable(name) ) script->set_reg(st,sd,num,name,(void*)script_getstr(st,3),script_getref(st,2)); else script->set_reg(st,sd,num,name,(void*)__64BPTRSIZE(script_getnum(st,3)),script_getref(st,2)); - // return a copy of the variable reference - script_pushcopy(st,2); - return true; } @@ -17993,7 +18038,8 @@ void script_parse_builtin(void) { BUILDIN_DEF(warpguild,"siii"), // [Fredzilla] BUILDIN_DEF(setlook,"ii"), BUILDIN_DEF(changelook,"ii"), // Simulates but don't Store it - BUILDIN_DEF(set,"rv"), + BUILDIN_DEF2(setr,"set","rv"), + BUILDIN_DEF(setr,"rv?"), // Not meant to be used directly, required for var++/var-- BUILDIN_DEF(setarray,"rv*"), BUILDIN_DEF(cleararray,"rvi"), BUILDIN_DEF(copyarray,"rri"), @@ -18486,10 +18532,10 @@ void script_parse_builtin(void) { int slen = strlen(BUILDIN[i].arg), offset = start + i; n = script->add_str(BUILDIN[i].name); - if (!strcmp(BUILDIN[i].name, "set")) script->buildin_set_ref = n; - else if (!strcmp(BUILDIN[i].name, "callsub")) script->buildin_callsub_ref = n; - else if (!strcmp(BUILDIN[i].name, "callfunc")) script->buildin_callfunc_ref = n; - else if (!strcmp(BUILDIN[i].name, "getelementofarray") ) script->buildin_getelementofarray_ref = n; + if (!strcmp(BUILDIN[i].name, "setr")) script->buildin_set_ref = n; + else if (!strcmp(BUILDIN[i].name, "callsub")) script->buildin_callsub_ref = n; + else if (!strcmp(BUILDIN[i].name, "callfunc")) script->buildin_callfunc_ref = n; + else if (!strcmp(BUILDIN[i].name, "getelementofarray") ) script->buildin_getelementofarray_ref = n; if( script->str_data[n].func && script->str_data[n].func != BUILDIN[i].func ) continue;/* something replaced it, skip. */ diff --git a/src/map/script.h b/src/map/script.h index e0e5f9ea9..75a57d82b 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -196,8 +196,10 @@ typedef enum c_op { C_NOT, // ~ a C_R_SHIFT, // a >> b C_L_SHIFT, // a << b - C_ADD_PP, // ++a - C_SUB_PP, // --a + C_ADD_POST, // a++ + C_SUB_POST, // a-- + C_ADD_PRE, // ++a + C_SUB_PRE, // --a } c_op; enum hQueueOpt { -- cgit v1.2.3-70-g09d2 From 9a802b9147221ec1f31109242be2919f53401fd3 Mon Sep 17 00:00:00 2001 From: Haru Date: Sat, 14 Sep 2013 08:13:28 +0200 Subject: Corrected operator precedence table. - [ This commit is part of a larger script engine related update ] - Operator precedence rules now closely follow those of languages such as C and derivates/related (C++, Java, PHP, etc.) - Please note that if you had custom scripts with non parenthesized expressions containing bitwise |, &, ^ operators, they may behave incorrectly now (or perhaps they were already behaving incorrectly, since the previous behavior was undocumented). - Added an up to date operator precedence/associativity table in the script documentation. - Added an operator/keyword self-test script in the npc/custom folder, in case if may be of some use for future regression-testing. --- doc/script_commands.txt | 91 +++++++++ npc/custom/breeder.txt | 6 +- npc/custom/test.txt | 416 ++++++++++++++++++++++++++++++++++++++++++ npc/other/arena/arena_aco.txt | 2 +- npc/scripts_custom.conf | 4 + src/map/script.c | 40 ++-- 6 files changed, 535 insertions(+), 24 deletions(-) create mode 100644 npc/custom/test.txt diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 0912cb556..9186ba714 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -578,6 +578,29 @@ Operators section described below. All operators listed there may be placed in-front of the '=' sign when modifying variables to perform the action as required. +Increment and decrement operators are also provided, for your convenience. +Pre-increment and pre-decrement operators: + + ++@x; // same as @x = @x + 1 + --@x; // same as @x = @x - 1 + +Post-increment and post-decrement operators: + + @x++; // similar to @x = @x + 1 + @x--; // similar to @x = @x - 1 + +The difference between pre- and post- increment/decrement operators is that, +when used in an expression, the pre- ones will be executed before evaluating +the expression, while the post- ones will be executed after. For example: + + @x = 1; + @y = ++@x; // After this line is executed, both @y and @x will be 2 + @x = 1; + @y = @x++; // After this line is executed, @y will be 1, @x will be 2 + +Note: The pre-increment/pre-decrement operators are, by design, faster (or at +least not slower) than their respective post- equivalent. + Note: !! Currently the scripting engine does not support directly copying array @@ -854,6 +877,74 @@ and are the following: mentioning that ?: has low priority and has to be enclosed with parenthesis in most (if not all) cases. +Operator Precedence and Associativity + +Operator precedence and associativity work more or less like they do in +mathematics. The rules can be summarized with the following table: + +Precedence | Description | Associativity +--------------------------------------------------------------------------- +1 (highest) | [] Array subscripting | None +--------------------------------------------------------------------------- +2 | ++ Increment | None + | -- Decrement | +--------------------------------------------------------------------------- +2 | - Unary minus | Right to left + | ! Logical NOT | + | ~ Bitwise NOT (One's Complement) | +--------------------------------------------------------------------------- +3 | * Multiplication | Left to right + | / Division | + | % Modulo (remainder) | +--------------------------------------------------------------------------- +4 | + Addition | Left to right + | - Subtraction | +--------------------------------------------------------------------------- +5 | << Bitwise left shift | Left to right + | >> Bitwise right shift | +--------------------------------------------------------------------------- +6 | < Less than | Left to right + | <= Less than or equal to | + | > Greater than | + | >= Greater than or equal to | +--------------------------------------------------------------------------- +7 | == Equal to | Left to right + | != Not equal to | +--------------------------------------------------------------------------- +8 | & Bitwise AND | Left to right +--------------------------------------------------------------------------- +9 | ^ Bitwise XOR (exclusive or) | Left to right +--------------------------------------------------------------------------- +10 | | Bitwise OR (inclusive or) | Left to right +--------------------------------------------------------------------------- +11 | && Logical AND | Left to right +--------------------------------------------------------------------------- +12 | || Logical OR | Left to right +--------------------------------------------------------------------------- +13 | ?: Ternary conditional | Right to left +--------------------------------------------------------------------------- +14 | = Direct assignment | Right to left +(lowest) | += Assignment by sum | + | -= Assignment by difference | + | *= Assignment by product | + | /= Assignment by quotient | + | %= Assignment by remainder | + | <<= Assignment by bitwise left shift | + | >>= Assignment by bitwise right shift | + | &= Assignment by bitwise AND | + | ^= Assignment by bitwise XOR | + | |= Assignment by bitwise OR | + +Operator precedence means some operators are evaluated before others. For +example, in 2 + 4 * 5 , the multiplication has higher precedence so 4 * 5 is +evaluated first yielding 2 + 20 == 22 and not 6 * 5 == 30 . + +Operator associativity defines what happens if a sequence of the same +operators is used one after another: whether the evaluator will evaluate the +left operations first or the right. For example, in 8 - 4 - 2 , subtraction is +left associative so the expression is evaluated left to right. 8 - 4 is +evaluated first making the expression 4 - 2 == 2 and not 8 - 2 == 6 . + Labels ------ diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index 3eef8af0a..0222f5b3a 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -15,7 +15,7 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ message strcharinfo(0),"You must first remove your mount."; end; } - else if ((eaclass()&EAJ_THIRDMASK==EAJ_RANGER) && !countitem(6124)) { + else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(6124)) { if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) { if(select(" ~ Falcon: ~ Warg")==1) setfalcon; else getitem 6124,1; @@ -24,7 +24,7 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ } else getitem 6124,1; } - else if ((eaclass()&EAJ_THIRDMASK==EAJ_MECHANIC) && !checkcart() && getskilllv("MC_PUSHCART")) { + else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv("MC_PUSHCART")) { if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) { if(select(" ~ Cart: ~ Mado")==1) setcart; else setmadogear; @@ -36,7 +36,7 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ else if (!checkcart() && getskilllv("MC_PUSHCART")) setcart; else if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) setfalcon; else if (!checkriding() && getskilllv("KN_RIDING")) { - if (eaclass()&EAJ_THIRDMASK==EAJ_RUNE_KNIGHT) setdragon; + if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) setdragon; else setriding; } else if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) setmadogear; diff --git a/npc/custom/test.txt b/npc/custom/test.txt new file mode 100644 index 000000000..bfd297f5d --- /dev/null +++ b/npc/custom/test.txt @@ -0,0 +1,416 @@ +//===== Hercules Script ====================================== +//= Script engine self-tests +//===== By: ================================================== +//= Haru +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Script to test operators and possibly other elements of +//= the script engine, useful for regression testing. + +- script HerculesSelfTest -1,{ + end; +OnCheck: + .@msg$ = getarg(0,"Unknown Error"); + .@val = getarg(1,0); + .@ref = getarg(2,1); + if (.@val != .@ref) { + debugmes "Error: "+.@msg$+": '"+.@val+"' != '"+.@ref+"'"; + //end; + } + return; +OnInit: + // Array subscript + setarray .@a, 3, 2, 1; + callsub(OnCheck, "Array subscript", .@a[2]); + + + // Increment and decrement operators ++, -- + .@x = 1; + .@y = .@x++; // .@y = .@x; .@x = .@x + 1; + callsub(OnCheck, "Suffix increment ++", .@y); + callsub(OnCheck, "Suffix increment ++", .@x, 2); + .@x = 1; + .@y = .@x--; // .@y = .@x; .@x = .@x - 1; + callsub(OnCheck, "Suffix decrement --", .@y); + callsub(OnCheck, "Suffix decrement --", .@x, 0); + .@x = 0; + .@y = ++.@x; // .@x = .@x + 1; .@y = .@x; + callsub(OnCheck, "Prefix increment ++", .@y); + callsub(OnCheck, "Prefix increment ++", .@x); + .@x = 2; + .@y = --.@x; // .@x = .@x - 1; .@y = .@x; + callsub(OnCheck, "Prefix decrement --", .@y); + callsub(OnCheck, "Prefix decrement --", .@x); + + // Order of [] and --/++ + .@a[1] = 0; + .@a[1]++; // .@a[1] = .@a[1] + 1; + callsub(OnCheck, "Order of [] and ++", .@a[1]); + .@a[1] = 2; + .@a[1]--; // .@a[1] = .@a[1] - 1; + callsub(OnCheck, "Order of [] and --", .@a[1]); + + + // Unary operators -, !, ~ + .@x = 1; + .@y = -.@x; // .@y = 0 - .@x; + callsub(OnCheck, "Unary operator -", .@y, -1); + .@x = 1; + .@y = !.@x; // if(.@x == 0) .@y = 1; else .@y = 0; + callsub(OnCheck, "Unary operator !", .@y, 0); + .@x = 0x00000001; + .@y = ~.@x; // One's complement of 0x00000001 is 0xfffffffe, which is -2 + callsub(OnCheck, "Unary operator ~", .@y, -2); + + // Associativity of unary operators -, !, ~ + .@x = 1; + .@y = ~ ! .@x; // .@y = ~(!.@x); + callsub(OnCheck, "Associativity of unary ~ and !", .@y, -1); + .@x = 0; + .@y = - ! .@x; // .@y = -(!.@x); + callsub(OnCheck, "Associativity of unary - and !", .@y, -1); + .@x = 1; + .@y = ~ - .@x; // .@y = ~(-.@x); + callsub(OnCheck, "Associativity of unary ~ and -", .@y, 0); + .@x = 1; + .@y = - ~ .@x; // .@y = -(~.@x); + callsub(OnCheck, "Associativity of unary - and ~", .@y, 2); + + // Order of unary -, !, ~ and prefix/suffix ++/-- + .@x = 2; + .@y = - --.@x; // .@y = -(--.@x); + callsub(OnCheck, "Order of unary - and prefix --", .@y, -1); + callsub(OnCheck, "Order of unary - and prefix --", .@x); + .@x = 1; + .@y = - .@x--; // .@y = -(.@x--); + callsub(OnCheck, "Order of unary - and suffix --", .@y, -1); + callsub(OnCheck, "Order of unary - and suffix --", .@x, 0); + .@x = 0; + .@y = - ++.@x; // .@y = -(++.@x); + callsub(OnCheck, "Order of unary - and prefix ++", .@y, -1); + callsub(OnCheck, "Order of unary - and prefix ++", .@x); + .@x = 1; + .@y = - .@x++; // .@y = -(.@x++); + callsub(OnCheck, "Order of unary - and suffix ++", .@y, -1); + callsub(OnCheck, "Order of unary - and suffix ++", .@x, 2); + .@x = 1; + .@y = !--.@x; // .@y = !(--.@x); + callsub(OnCheck, "Order of unary ! and prefix --", .@y); + callsub(OnCheck, "Order of unary ! and prefix --", .@x, 0); + .@x = 1; + .@y = !.@x--; // .@y = !(.@x--); + callsub(OnCheck, "Order of unary ! and suffix --", .@y, 0); + callsub(OnCheck, "Order of unary ! and suffix --", .@x, 0); + .@x = 0; + .@y = !++.@x; // .@y = !(++.@x); + callsub(OnCheck, "Order of unary ! and prefix ++", .@y, 0); + callsub(OnCheck, "Order of unary ! and prefix ++", .@x); + .@x = 0; + .@y = !.@x++; // .@y = !(.@x++); + callsub(OnCheck, "Order of unary ! and suffix ++", .@y); + callsub(OnCheck, "Order of unary ! and suffix ++", .@x); + .@x = 2; + .@y = ~--.@x; // .@y = ~(--.@x); + callsub(OnCheck, "Order of unary ~ and prefix --", .@y, -2); + callsub(OnCheck, "Order of unary ~ and prefix --", .@x, 1); + .@x = 1; + .@y = ~.@x--; // .@y = ~(.@x--); + callsub(OnCheck, "Order of unary ~ and suffix --", .@y, -2); + callsub(OnCheck, "Order of unary ~ and suffix --", .@x, 0); + .@x = 0; + .@y = ~++.@x; // .@y = ~(++.@x); + callsub(OnCheck, "Order of unary ~ and prefix ++", .@y, -2); + callsub(OnCheck, "Order of unary ~ and prefix ++", .@x, 1); + .@x = 1; + .@y = ~.@x++; // .@y = ~(.@x++); + callsub(OnCheck, "Order of unary ~ and suffix ++", .@y, -2); + callsub(OnCheck, "Order of unary ~ and suffix ++", .@x, 2); + + // Binary *, /, % operators + .@x = 2 * 3; // .@x = 6; + callsub(OnCheck, "Binary * operator", .@x, 6); + .@x = 7 / 2; // .@x = 3; + callsub(OnCheck, "Binary / operator", .@x, 3); + .@x = 7 % 2; // .@x = 1; + callsub(OnCheck, "Binary % operator", .@x, 1); + + // Associativity of *, /, % + .@x = 8 * 3 / 2; // .@x = (8 * 3) / 2; + callsub(OnCheck, "Associativity of * and /", .@x, 12); + + // Order of binary *%/ and unary !-~ + .@x = 2 * ! 3; // .@x = 2 * (!3); + callsub(OnCheck, "Order of binary * and unary !", .@x, 0); + .@x = ~ 1 * 2; // .@x = (~1) * 2; + callsub(OnCheck, "Order of unary ~ and binary *", .@x, -4); + + + // Binary +, - operators + .@x = 1 + 3; // .@x = 4; + callsub(OnCheck, "Binary + operator", .@x, 4); + .@x = 1 - 3; // .@x = -2; + callsub(OnCheck, "Binary - operator", .@x, -2); + + // Associativity of +,- + .@x = 0x7fffffff - 0x7ffffff0 + 1; // .@x = (0x7fffffff - 0x7ffffff0) + 1; (without overflow) + callsub(OnCheck, "Associativity of + and -", .@x, 16); + + // Order of +, - and *, /, % + .@x = 1 + 3 * 2; // .@x = 1 + (3 * 2); + callsub(OnCheck, "Order of + and *", .@x, 7); + + + // << and >> operators + .@x = 1<<3; // .@x = 1*2*2*2; + callsub(OnCheck, "Left shift << operator", .@x, 8); + .@x = 12>>2; // .@x = 12/2/2; + callsub(OnCheck, "Right shift >> operator", .@x, 3); + + // Associativity of << and >> + .@x = 0x40000000 >> 4 << 2; // .@x = (0x40000000 >> 4) << 2 + callsub(OnCheck, "Associativity of >> and <<", .@x, 0x10000000); + + // Order of <> and +/- + .@x = 4 << 2 + 1; // .@x = 4 << (2+1); + callsub(OnCheck, "Order of << and +", .@x, 32); + + + // <, <=, >, >= operators + .@x = (1 < 2); // true + .@y = (2 < 2); // false + callsub(OnCheck, "< operator", .@x); + callsub(OnCheck, "< operator", .@y, 0); + .@x = (1 <= 2); // true + .@y = (2 <= 2); // true + callsub(OnCheck, "<= operator", .@x); + callsub(OnCheck, "<= operator", .@y); + .@x = (2 > 1); // true + .@y = (2 > 2); // false + callsub(OnCheck, "> operator", .@x); + callsub(OnCheck, "> operator", .@y, 0); + .@x = (2 >= 1); // true + .@y = (2 >= 2); // true + callsub(OnCheck, ">= operator", .@x); + callsub(OnCheck, ">= operator", .@y); + + // Associativity of <,<=,>,>= + .@x = 1 > 0 > 0; // (1 > 0) > 0 --> 1 > 0 --> true + callsub(OnCheck, "Associativity of > operators", .@x); + + // Order of >>/<< and />= + .@x = 1 < 1 << 2; // .@x = 1 < (1<<2); + callsub(OnCheck, "Order of < and <<", .@x); + + + // ==, != operators + .@x = (0 == 0); // true + .@y = (1 == 0); // false + callsub(OnCheck, "== operator", .@x); + callsub(OnCheck, "== operator", .@y, 0); + .@x = (1 != 0); // true + .@y = (1 != 1); // false + callsub(OnCheck, "!= operator", .@x); + callsub(OnCheck, "!= operator", .@y, 0); + + // Associativity of ==, != + .@x = (1 == 0 == 0); // (1 == 0) == 0 --> 0 == 0 --> 1 + .@y = (1 != 0 == 0); // (1 != 0) == 0 --> 1 == 0 --> 0 + callsub(OnCheck, "Associativity of != and == operators", .@x); + callsub(OnCheck, "Associativity of != and == operators", .@y, 0); + + // Order of />= and ==/!= + .@x = (1 == 2 > 1); // true + .@y = (1 < 2 == 1); // true + callsub(OnCheck, "Order of <,>,==", .@x); + callsub(OnCheck, "Order of <,>,==", .@y); + + + // Bitwise & operator + .@x = (7&4); // 0111 & 0100 --> 0100 + .@y = (4&1); // 0100 & 0001 --> 0000 + callsub(OnCheck, "Bitwise & operator", .@x, 4); + callsub(OnCheck, "Bitwise & operator", .@y, 0); + + // Order of & and ==/!= + .@x = (4 == 7 & 4); // (4 == 7)&4 + .@y = (1 & 3 != 1); // 1 & (3 != 1) + callsub(OnCheck, "Order of ==/!= and &", .@x, 0); + callsub(OnCheck, "Order of ==/!= and &", .@y); + + + // Bitwise ^ operator + .@x = (3^1); // 0011 ^ 0001 --> 0010 + callsub(OnCheck, "Bitwise ^ operator", .@x, 2); + + // Order of ^ and & + .@x = (0 & 2 ^ 2); // (0 & 2) ^ 2 --> (0000 & 0010) | 0010 --> 0000 ^ 0010 --> 0010 + .@y = (2 ^ 2 & 0); // 2 ^ (2 & 0) --> 0010 | (0010 & 0000) --> 0010 ^ 0000 --> 0010 + callsub(OnCheck, "Order of ^ and &", .@x, 2); + callsub(OnCheck, "Order of ^ and &", .@y, 2); + + + // Bitwise | operator + .@x = (3|4); // 0011 | 0100 --> 0111 + .@y = (4|1); // 0100 | 0001 --> 0101 + callsub(OnCheck, "Bitwise | operator", .@x, 7); + callsub(OnCheck, "Bitwise | operator", .@y, 5); + + // Order of ^ and | + .@x = (2 ^ 2 | 2); // (2 ^ 1) | 4 --> (0010 ^ 0010) | 0010 --> 0000 | 0010 --> 0010 + .@y = (2 | 2 ^ 2); // 4 | (1 ^ 2) --> 0010 | (0010 ^ 0010) --> 0010 | 0000 --> 0010 + callsub(OnCheck, "Order of | and ^", .@x, 2); + callsub(OnCheck, "Order of | and ^", .@y, 2); + + + // Logical && operator + .@x = (1 && 1); // true + .@y = (0 && 1); // false + callsub(OnCheck, "Logical && operator", .@x); + callsub(OnCheck, "Logical && operator", .@y, 0); + + // Associativity of && and short-circuit + .@x = 0; + .@y = (1 && 0 && (.@x = 1)); // should short circuit as false before evaluating the assignment + //FIXME callsub(OnCheck, "Short-circuit of &&", .@x, 0); + callsub(OnCheck, "Associativity of &&", .@y, 0); + + // Order of bitwise | and logical && + .@x = (1 && 0 | 4); // 1 && (0|4) + .@y = (4 | 0 && 1); // (4|0) && 1 + callsub(OnCheck, "Order of && and |", .@x); + callsub(OnCheck, "Order of && and |", .@y); + + + // Logical || operator + .@x = (1 || 1); // true + .@y = (0 || 1); // true + callsub(OnCheck, "Logical || operator", .@x); + callsub(OnCheck, "Logical || operator", .@y); + + // Associativity of || and short-circuit + .@x = 0; + .@y = (1 || 0 || (.@x = 1)); // should short circuit as true before evaluating the assignment + //FIXME callsub(OnCheck, "Short-circuit of ||", .@x, 0); + callsub(OnCheck, "Associativity of ||", .@y); + + // Order of logical && and || + .@x = (0 && 1 || 1); // (0 && 1) || 1 + .@y = (1 || 1 && 0); // 1 || (1 && 0) + callsub(OnCheck, "Order of && and ||", .@x); + callsub(OnCheck, "Order of && and ||", .@y); + + // Ternary conditional operator ?: + .@x = (1 ? 2 : 3); // 2 + .@y = (0 ? 2 : 3); // 3 + callsub(OnCheck, "Ternary conditional operator", .@x, 2); + callsub(OnCheck, "Ternary conditional operator", .@y, 3); + + // Associativity of ?: + .@x = (1 ? 2 : 0 ? 3 : 4); + .@y = (1 ? 1 ? 2 : 3 : 5); + callsub(OnCheck, "Associativity of ?:", .@x, 2); + callsub(OnCheck, "Associativity of ?:", .@y, 2); + + // Order of logical || and ternary ?: + .@x = (1 ? 0 : 0 || 1); // 1 ? 0 : (0 || 1) --> false + callsub(OnCheck, "Order of || and ?:", .@x, 0); + + + // Assignment operators + .@x = 1; + callsub(OnCheck, "Direct assignment operator =", .@x); + .@x += 7; // 1 + 7 + callsub(OnCheck, "Assignment by sum +=", .@x, 8); + .@x -= 1; // 8 - 1 + callsub(OnCheck, "Assignment by difference -=", .@x, 7); + .@x *= 2; // 7 * 2 + callsub(OnCheck, "Assignment by product *=", .@x, 14); + .@x /= 2; // 14 / 2 + callsub(OnCheck, "Assignment by quotient /=", .@x, 7); + .@x %= 4; // 7 % 4 + callsub(OnCheck, "Assignment by remainder %=", .@x, 3); + .@x <<= 2; // 3 << 2 + callsub(OnCheck, "Assignment by bitwise left shift <<=", .@x, 12); + .@x >>= 1; // 12 >> 1 + callsub(OnCheck, "Assignment by bitwise right shift >>=", .@x, 6); + .@x &= 5; // 6 & 5 (0110 & 0101 --> 0100) + callsub(OnCheck, "Assignment by bitwise and &=", .@x, 4); + .@x ^= 5; // 4 ^ 5 (0100 ^ 0101 --> 0001) + callsub(OnCheck, "Assignment by bitwise xor ^=", .@x, 1); + .@x |= 2; // 1 | 2 (0001 | 0010 --> 0011) + callsub(OnCheck, "Assignment by bitwise or |=", .@x, 3); + + // Associativity of assignment operators + .@x = 0; .@y = 0; + .@x = .@y = 1; + callsub(OnCheck, "1Associativity of =", .@x); + callsub(OnCheck, "2Associativity of =", .@y); + .@x = 0; .@y = 1; + .@x = .@y += 4; + callsub(OnCheck, "3Associativity of =", .@x, 5); + callsub(OnCheck, "4Associativity of =", .@y, 5); + .@x = 5; .@y = 3; + .@z = 8; +/* + * 0001b4 C_NAME setr + * 0001b8 C_ARG + * 0001b9 C_NAME .@x + * 0001bd C_REF + * 0001bd C_INT 16 + * 0001bf C_MUL + * 0001c0 C_FUNC + * 0001c1 C_EOL + */ + /* FIXME + .@x *= (.@y += 1); + //set(.@x, .@x * set(.@y, .@y + 1)); + //.@x = (.@x * (.@y = .@y + 1)); + */ +/* + * 0001c2 C_NAME setr + * 0001c6 C_ARG + * 0001c7 C_NAME .@x + * 0001cb C_REF + * 0001cc C_NAME setr + * 0001d0 C_ARG + * 0001d1 C_NAME .@y + * 0001d5 C_REF + * 0001d5 C_INT 1 + * 0001d7 C_ADD + * 0001d8 C_FUNC + * 0001d9 C_MUL + * 0001da C_FUNC + * 0001db C_EOL + */ +/* + * 0001c2 C_NAME setr + * 0001c6 C_ARG + * 0001c7 C_NAME .@x + * 0001cb C_REF + * 0001cc C_NAME setr + * 0001d0 C_ARG + * 0001d1 C_NAME .@y + * 0001d4 C_INT 2 + * 0001d6 C_FUNC + * 0001d7 C_MUL + * 0001d8 C_FUNC + * 0001d9 C_EOL + */ + /* + callsub(OnCheck, "5Associativity of =", .@x, 20); + callsub(OnCheck, "6Associativity of =", .@y, 4); + */ + + .@x = 0; + if (0) + if (1) + .@x = 2; + else + .@x = 3; + callsub(OnCheck, "Dangling else", .@x, 0); + + debugmes "Script engine self-test [ PASSED ]"; +} + +// vim: set ft=ath : diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt index 725e8c58f..cc0b4b640 100644 --- a/npc/other/arena/arena_aco.txt +++ b/npc/other/arena/arena_aco.txt @@ -1084,7 +1084,7 @@ prt_are_in,25,31,3 script Staff#aco-2 1_F_02,{ set .@hour_endaco, .@end_timeaco / 10000; set .@min_endaco, ((.@end_timeaco % 10000) / 100); set .@sec_endaco, .@end_timeaco % 100; - if ((.@hour_startaco == 23) & (.@hour_endaco == 0)) { + if ((.@hour_startaco == 23) && (.@hour_endaco == 0)) { set .@hour_endaco,24; } set .@st_to_secaco, ((.@hour_startaco * 3600) + (.@min_startaco * 60) + (.@sec_startaco)); diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf index aeae9e22f..b4283502c 100644 --- a/npc/scripts_custom.conf +++ b/npc/scripts_custom.conf @@ -104,3 +104,7 @@ //npc: npc/custom/battleground/bg_kvm01.txt //npc: npc/custom/battleground/bg_kvm02.txt //npc: npc/custom/battleground/bg_kvm03.txt + +// ----------------------- Misc Scripts ----------------------------- +// Self-test script (for development use only) +//npc: npc/custom/test.txt diff --git a/src/map/script.c b/src/map/script.c index 2c4178d9b..73aaafab2 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -1158,32 +1158,32 @@ const char* script_parse_subexpr(const char* p,int limit) { if( (op=C_ADD_PRE,p[0]=='+'&&p[1]=='+') || (op=C_SUB_PRE,p[0]=='-'&&p[1]=='-') ) { // Pre ++ -- operators p=script->parse_variable(p); } else if( (op=C_NEG,*p=='-') || (op=C_LNOT,*p=='!') || (op=C_NOT,*p=='~') ) { // Unary - ! ~ operators - p=script->parse_subexpr(p+1,10); + p=script->parse_subexpr(p+1,11); script->addc(op); } else { p=script->parse_simpleexpr(p); } p=script->skip_space(p); while(( - (op=C_OP3, opl=0,len=1,*p=='?') // ?: - || (op=C_ADD, opl=8,len=1,*p=='+') // + - || (op=C_SUB, opl=8,len=1,*p=='-') // - - || (op=C_MUL, opl=9,len=1,*p=='*') // * - || (op=C_DIV, opl=9,len=1,*p=='/') // / - || (op=C_MOD, opl=9,len=1,*p=='%') // % - || (op=C_LAND, opl=2,len=2,*p=='&' && p[1]=='&') // && - || (op=C_AND, opl=6,len=1,*p=='&') // & - || (op=C_LOR, opl=1,len=2,*p=='|' && p[1]=='|') // || - || (op=C_OR, opl=5,len=1,*p=='|') // | - || (op=C_XOR, opl=4,len=1,*p=='^') // ^ - || (op=C_EQ, opl=3,len=2,*p=='=' && p[1]=='=') // == - || (op=C_NE, opl=3,len=2,*p=='!' && p[1]=='=') // != - || (op=C_R_SHIFT,opl=7,len=2,*p=='>' && p[1]=='>') // >> - || (op=C_GE, opl=3,len=2,*p=='>' && p[1]=='=') // >= - || (op=C_GT, opl=3,len=1,*p=='>') // > - || (op=C_L_SHIFT,opl=7,len=2,*p=='<' && p[1]=='<') // << - || (op=C_LE, opl=3,len=2,*p=='<' && p[1]=='=') // <= - || (op=C_LT, opl=3,len=1,*p=='<') // < + (op=C_OP3, opl=0, len=1,*p=='?') // ?: + || (op=C_ADD, opl=9, len=1,*p=='+') // + + || (op=C_SUB, opl=9, len=1,*p=='-') // - + || (op=C_MUL, opl=10,len=1,*p=='*') // * + || (op=C_DIV, opl=10,len=1,*p=='/') // / + || (op=C_MOD, opl=10,len=1,*p=='%') // % + || (op=C_LAND, opl=2, len=2,*p=='&' && p[1]=='&') // && + || (op=C_AND, opl=5, len=1,*p=='&') // & + || (op=C_LOR, opl=1, len=2,*p=='|' && p[1]=='|') // || + || (op=C_OR, opl=3, len=1,*p=='|') // | + || (op=C_XOR, opl=4, len=1,*p=='^') // ^ + || (op=C_EQ, opl=6, len=2,*p=='=' && p[1]=='=') // == + || (op=C_NE, opl=6, len=2,*p=='!' && p[1]=='=') // != + || (op=C_R_SHIFT,opl=8, len=2,*p=='>' && p[1]=='>') // >> + || (op=C_GE, opl=7, len=2,*p=='>' && p[1]=='=') // >= + || (op=C_GT, opl=7, len=1,*p=='>') // > + || (op=C_L_SHIFT,opl=8, len=2,*p=='<' && p[1]=='<') // << + || (op=C_LE, opl=7, len=2,*p=='<' && p[1]=='=') // <= + || (op=C_LT, opl=7, len=1,*p=='<') // < ) && opl>limit) { p+=len; if(op == C_OP3) { -- cgit v1.2.3-70-g09d2 From 09dd2097b77bf3dda4c5eb1ee6eb2a60f05bbec8 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 15 Sep 2013 20:24:41 +0200 Subject: Added support for automatic concatenation of adjacent string literals - [ This commit is part of a larger script engine related update ] - Adjacent string literals are now automatically concatenated into one string upon parsing. - Adjacent string literals are string literals (i.e. "such as this", with only whitespace (including line breaks and/or comments) between them. For example, the lines: mes "this will be concatenated " /* skipping this comment */ " into one string"; // at parse time will produce an output of "this will be concatenated into one string". - The feature brings parity with other languages (i.e. C), and makes it easier to split long strings in multiple lines, without having to resort to a, slower, run-time string concatenation operator ('+') - Special thanks to Trojal for the idea. Signed-off-by: Haru --- npc/custom/test.txt | 14 ++++++++++++++ src/map/script.c | 39 +++++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/npc/custom/test.txt b/npc/custom/test.txt index bfd297f5d..0fffecf73 100644 --- a/npc/custom/test.txt +++ b/npc/custom/test.txt @@ -19,6 +19,15 @@ OnCheck: //end; } return; +OnCheckStr: + .@msg$ = getarg(0,"Unknown Error"); + .@val$ = getarg(1,""); + .@ref$ = getarg(2,""); + if (.@val$ != .@ref$) { + debugmes "Error: "+.@msg$+": '"+.@val$+"' != '"+.@ref$+"'"; + //end; + } + return; OnInit: // Array subscript setarray .@a, 3, 2, 1; @@ -226,6 +235,11 @@ OnInit: callsub(OnCheck, "Order of <,>,==", .@y); + .@x$ = "string " + "concatenation" /* test */ " succeeded"; + callsub(OnCheckStr, "String concatenation", .@x$, "string concatenation succeeded"); + + // Bitwise & operator .@x = (7&4); // 0111 & 0100 --> 0100 .@y = (4&1); // 0100 & 0001 --> 0000 diff --git a/src/map/script.c b/src/map/script.c index 73aaafab2..007a3a3d3 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -1070,26 +1070,29 @@ const char* parse_simpleexpr(const char *p) { p=np; } else if(*p=='"') { script->addc(C_STR); - p++; - while( *p && *p != '"' ) { - if( (unsigned char)p[-1] <= 0x7e && *p == '\\' ) { - char buf[8]; - size_t len = sv->skip_escaped_c(p) - p; - size_t n = sv->unescape_c(buf, p, len); - if( n != 1 ) - ShowDebug("parse_simpleexpr: unexpected length %d after unescape (\"%.*s\" -> %.*s)\n", (int)n, (int)len, p, (int)n, buf); - p += len; - script->addb(*buf); - continue; - } else if( *p == '\n' ) { - disp_error_message("parse_simpleexpr: unexpected newline @ string",p); + do { + p++; + while( *p && *p != '"' ) { + if( (unsigned char)p[-1] <= 0x7e && *p == '\\' ) { + char buf[8]; + size_t len = sv->skip_escaped_c(p) - p; + size_t n = sv->unescape_c(buf, p, len); + if( n != 1 ) + ShowDebug("parse_simpleexpr: unexpected length %d after unescape (\"%.*s\" -> %.*s)\n", (int)n, (int)len, p, (int)n, buf); + p += len; + script->addb(*buf); + continue; + } else if( *p == '\n' ) { + disp_error_message("parse_simpleexpr: unexpected newline @ string",p); + } + script->addb(*p++); } - script->addb(*p++); - } - if(!*p) - disp_error_message("parse_simpleexpr: unexpected end of file @ string",p); + if(!*p) + disp_error_message("parse_simpleexpr: unexpected end of file @ string",p); + p++; //'"' + p = script->skip_space(p); + } while( *p && *p == '"' ); script->addb(0); - p++; //'"' } else { int l; const char* pv; -- cgit v1.2.3-70-g09d2