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/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 +- 37 files changed, 88 insertions(+), 88 deletions(-) (limited to 'npc/re') 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