From 4faa0ec9df7067cee3eb1c1953fccc6c2f842179 Mon Sep 17 00:00:00 2001 From: Taylor Locke Date: Mon, 25 Nov 2013 06:03:06 -0800 Subject: Cleaned up Zeny manipulation in scripts. --- 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 ++++---- 14 files changed, 24 insertions(+), 24 deletions(-) (limited to 'npc/re/merchants') diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index b63fca71c..185aa4e8c 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; } - set Zeny, Zeny - .@total; + 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; } - set Zeny, Zeny - .@total; + 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; - set Zeny, Zeny - .@total; + 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; } - set Zeny, Zeny-(.@amount*200); + 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 fd6602eda..8afe3e152 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; - set Zeny, Zeny-.@price; + 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 7569fe0b3..ed2c0c20a 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."; - set Zeny,Zeny - .@total; + Zeny -= .@total; getitem .@item,.@amount; close; } diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt index c5d198457..a0205a98e 100644 --- a/npc/re/merchants/blessed_refiner.txt +++ b/npc/re/merchants/blessed_refiner.txt @@ -135,7 +135,7 @@ close; } delitem .@material,1; - set Zeny, Zeny-.@price; + 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 933839bec..9954476ca 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; - set Zeny, Zeny - 1000000; + Zeny -= 1000000; break; case 3: if (countitem(6441) == 0) { diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt index 91936bd35..3ef33e953 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."; - set Zeny, Zeny - .@sell; + 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 e3efa5247..eda1740ca 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; - set Zeny, Zeny - 501000000; + Zeny -= 501000000; getitem 6024, 1; next; @@ -220,7 +220,7 @@ mes "come back anytime with 500 million zeny."; emotion e_thx; delitem 6024, 1; - set Zeny, Zeny + 499000000; + Zeny += 499000000; close; } else { diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index d986b047f..a2fe7f3cd 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 - set Zeny, Zeny-100000; + 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 - set Zeny, Zeny-100000; + 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 c72479f38..fd8863776 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."; - set Zeny, Zeny - 100000; + 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 03ef82559..1e20a2001 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."; - set Zeny, Zeny - .@price; + 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 - set Zeny, Zeny-100000; + 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 c55917f4f..3212333f7 100644 --- a/npc/re/merchants/hd_refiner.txt +++ b/npc/re/merchants/hd_refiner.txt @@ -118,7 +118,7 @@ close; } delitem .@material,1; - set Zeny, Zeny-.@price; + 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; - set Zeny, Zeny-.@price; + 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 dcd08ae5e..3d6a2bcb2 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; - set Zeny, Zeny-5000; + 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 1e4c226fb..54a4e221f 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."; - set Zeny, Zeny-.@arrow_zeny01; + 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 fa5bab042..4c1d2b0f0 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; } - set Zeny,Zeny - .@price; + Zeny -= .@price; delitem .@material,1; //custom checks @@ -272,7 +272,7 @@ function script refinenew { mes "Please come back when you have them."; close; } - set Zeny,Zeny - .@fullprice; + 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]; - set Zeny, Zeny - 50000; + 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; - set Zeny, Zeny-.@price; + Zeny -=.@price; if (getequippercentrefinery(.@part) <= rand(100)) { failedrefitem .@part; mes "[Clink]"; -- cgit v1.2.3-60-g2f50