diff options
Diffstat (limited to 'npc/merchants')
30 files changed, 850 insertions, 968 deletions
diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt index 7b7825492..57528e2b4 100644 --- a/npc/merchants/advanced_refiner.txt +++ b/npc/merchants/advanced_refiner.txt @@ -3,9 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4b -//===== Compatible With: ===================================== -//= Hercules Git +//= 1.5 //===== Description: ========================================= //= [Official Conversion] //= Refiner that uses Enriched ores to increase upgrade success. @@ -24,9 +22,10 @@ //= 1.4 Removed unnecessary dialogs [Zephyrus] //= 1.4a Added 'disable_items' command. [Euphy] //= 1.4b Fixed coordinates. [Euphy] +//= 1.5 Some official script updates. [Euphy] //============================================================ -payon,157,146,6 script Suhnbi#cash 85,{ +payon,157,146,6 script Suhnbi#cash 4_M_03,{ disable_items; mes "[Suhnbi]"; mes "I am the Armsmith"; @@ -34,37 +33,39 @@ payon,157,146,6 script Suhnbi#cash 85,{ mes "armor and equipment, so let me"; mes "know what you want to refine."; next; + setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3"; set .@menu$,""; - for( set .@i,1; .@i <= 10; set .@i,.@i+1 ) - { - if( getequipisequiped(.@i) ) + for(set .@i,1; .@i<=10; set .@i,.@i+1) { + if (getequipisequiped(.@i)) { set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]"; - + set .@equipped,1; + } set .@menu$, .@menu$ + ":"; } - set .@part,select(.@menu$); - - if( !getequipisequiped(.@part) ) + if (.@equipped == 0) { + mes "[Suhnbi]"; + mes "I don't think I can refine any items you have..."; close; + } + set .@part, select(.@menu$); - if( !getequipisenableref(.@part) ) - { + if (!getequipisequiped(.@part)) //custom check + close; + if (!getequipisenableref(.@part)) { mes "[Suhnbi]"; - mes "I don't think I can refine this item at all."; + mes "Go find another Blacksmith. You can't refine this thing."; close; } - if( getequiprefinerycnt(.@part) >= 10 ) - { + if (getequiprefinerycnt(.@part) >= 10) { mes "[Suhnbi]"; - mes "This item cannot be refined because it has already reached its maximum level..."; + mes "Hmm... someone perfected this already. I don't think I can work on it further."; close; } // Make sure you have the neccessary items and Zeny to refine your items // Determines chance of failure and verifies that you want to continue. - switch( getequipweaponlv(.@part) ) - { + switch(getequipweaponlv(.@part)) { case 1: callsub S_RefineValidate,1,7620,50,.@part; break; case 2: callsub S_RefineValidate,2,7620,200,.@part; break; case 3: callsub S_RefineValidate,3,7620,5000,.@part; break; @@ -72,85 +73,89 @@ payon,157,146,6 script Suhnbi#cash 85,{ default: callsub S_RefineValidate,0,7619,2000,.@part; break; } - if( getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100) ) - { - mes "[Suhnbi]"; - mes "Clink! Clank! Clunk!"; - SuccessRefItem .@part; + mes "[Suhnbi]"; + mes "Clang! Clang! Clang!"; + if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) { + successrefitem .@part; next; - Emotion e_no1; + emotion e_no1; mes "[Suhnbi]"; - mes "Here you are! It's done."; - mes "It's been a while since I've made such a fine weapon. You must be happy because it has become stronger!"; + mes "There you go! It's done."; + mes "It's been a while since I've made such a fine "+((getequipweaponlv(.@part))?"weapon":"armor")+". You must be happy because it has become stronger!"; close; } - mes "[Suhnbi]"; - mes "Clink! Clank! Clunk!"; - FailedRefItem .@part; + failedrefitem .@part; next; - if (rand(5) == 1){ - Emotion e_cash; - } else { - Emotion e_omg; - } + emotion (!rand(5))?e_cash:e_omg; mes "[Suhnbi]"; - mes "Cough!!!!"; + mes "Uuuuuuuuuummmmmph!!!"; next; mes "[Suhnbi]"; - mes "Cough...Cough.."; - mes "What a shame..."; - mes "Your equipment broke during the refining process. I had told you earlier this might happen!"; + mes "..."; + mes "....."; + mes ".......Huhuhuhuhu~"; + mes "........It was your choice and my ability, no regret."; close; S_RefineValidate: mes "[Suhnbi]"; if (getarg(0)) - mes "A level " + getarg(0) + " weapon..."; - mes "To refine this I need one ^ff9999" + getitemname(getarg(1)) + "^000000 and a service fee of " + getarg(2) + " Zeny."; - mes "Do you wish to continue?"; + mes "You want to refine a level " + getarg(0) + " weapon?"; + mes "To refine that, you'll need to have one ^ff9999" + getitemname(getarg(1)) + "^000000 and " + getarg(2) + " zeny."; + mes "Would you like to continue?"; next; - if( select("Yes:No") == 1 ) - { - if( getequippercentrefinery(getarg(3)) < 100 ) - { - mes "[Suhnbi]"; - mes "Wow!!"; - mes "This weapon, probably"; - mes "looks like it's been refined..."; - mes "many times..."; - mes "It may break if"; - mes "you refine it again."; - next; - mes "And if it breaks,"; - mes "you can't use it anymore!"; - mes "All the cards in it and the"; - mes "properties"; - mes "^ff0000will be lost^000000!!"; - mes "^ff0000 besides, the equipment will break!^000000"; - mes " "; - mes "Are you sure you still want to continue?"; - next; - if( select("Yes:No") == 2 ) - { + if(select("Yes:No") == 1) { + if (getequippercentrefinery(getarg(3)) < 100) { + if (getarg(0)) { + mes "[Suhnbi]"; + mes "Wow!!"; + mes "This weapon probably"; + mes "looks like it's been refined..."; + mes "many times..."; + mes "It may break if"; + mes "you refine it again."; + next; + mes "And if it breaks,"; + mes "you can't use it anymore!"; + mes "All the cards in it and the properties ^ff0000will be lost^000000!"; + mes "^ff0000Besides, the equipment will break!^000000"; + mes "Are you sure you still want to continue?"; + next; + if(select("Yes:No") == 2) { + mes "[Suhnbi]"; + mes "Good."; + mes "Because if the weapon breaks from unreasonable refining, then I get a bad mood, too."; + close; + } + } else { mes "[Suhnbi]"; - mes "I completely agree..."; - mes "I might be a great refiner, but sometimes even I make mistakes."; - close; + mes "Giggle. Giggle. Oh, you have guts, daring to refine this."; + mes "You know it's pretty risky, don't you?"; + next; + mes "If your defensive equipment is broken, you'll never be able to use it again."; + mes "Even your cards and your modifications will ^ff0000completely disappear^000000."; + //mes "Everything will disappear. As in... GONE!"; + mes "Do you really wish to continue?"; + next; + if(select("Yes:No") == 2) { + mes "[Suhnbi]"; + mes "What nonsense. You waste my precious time."; + mes "Get lost, punk."; + close; + } } } - if( countitem(getarg(1)) > 0 && Zeny > getarg(2) ) - { - delitem getarg(1), 1; + if (countitem(getarg(1)) > 0 && Zeny > getarg(2)) { + delitem getarg(1),1; set Zeny, Zeny - getarg(2); return; } mes "[Suhnbi]"; - mes "You don't seem to have enough Zeny or " + getitemname(getarg(1)) + "..."; - mes "Go get some more. I'll be here all day if you need me."; + mes "Are these all you have?"; + mes "I'm very sorry, but I can't do anything without all the materials. Besides, I deserve some payments for my work, don't I?"; close; } mes "[Suhnbi]"; - mes "Yeah... There's no need to rush."; - mes "Take your time."; + mes "I can't help it even if you're not happy about it..."; close; } diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index d48ee68bb..af0cbc7d9 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -1,133 +1,24 @@ //===== Hercules Script ====================================== //= Alchemist Shop -//===== By: ================================================== -//= rAthena Team -//===== Current Version: ===================================== -//= 1.7 -//===== Description: ========================================= -//= Selling Alchemist Materials and Manuals -//===== Additional Comments: ================================= +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 1.8 +//===== Description: ========================================= +//= Merchants for Alchemist Materials and Manuals. +//===== Additional Comments: ================================= //= 1.1 fixed Medicine Bowl issue, thanx 2 MasterOfMuppets //= 1.2 Reddozen's fixes of typos. added optional Elemental -//= Potion Guide. [Lupus] +//= Potion Guide. [Lupus] //= 1.3 Deleted Elemental Potions Guide due to original quest [Lupus] //= 1.4 Alchemists can now purchase 2000 Medicine Bowls at once. [SinSloth] //= 1.5 Updated to Aegis 10.3 Standards. [L0ne_W0lf] //= 1.6 Corrected canceling purchase. [L0ne_W0lf] //= 1.7 Updated to match AEGIS script. [Masao] -//============================================================ +//= 1.8 Moved Craft Book Merchant to Renewal path. [Euphy] +//============================================================ -alde_alche,31,186,3 script Craft Book Salesman#alde 883,{ - - mes "[Craft Book Salesman]"; - mes "Welcome."; - mes "I'm here to sell"; - mes "^0000FFspecial craft books^000000 for Geneticists."; - next; - mes "[Craft Book Salesman]"; - mes "Geneticists have some skills"; - mes "that require craft books to activate."; - next; - mes "[Craft Book Salesman]"; - mes "The more craft books you have,"; - mes "the more skills you can use."; - next; - mes "[Craft Book Salesman]"; - mes "Please understand that"; - mes "I specialize in the sale of these special books and"; - mes "I ^FF0000don't sell other items^000000."; - next; - mes "[Craft Book Salesman]"; - mes "Okay then, here's the list of available craft books."; - next; - switch(select("[Apple Bomb Craft Book] 100,000 zeny:[Pineapple Bomb Craft Book] 100,000 zeny:[Coconut Bomb Craft Book] 100,000 zeny:[Melon Bomb Craft Book] 100,000 zeny:[Banana Bomb Craft Book] 100,000 zeny:[Plant Gene Cultivation Method] 100,000 zeny:[Superior Potion Craft Manual] 100,000 zeny:[Mix Cooking Book] 100,000 zeny:[Health Improvement Research Book] 100,000 zeny:[Vigor Drink Recipe] 100,000 zeny:Close")){ - case 1: - callsub S_SellManual,6279,100000; - break; - case 2: - callsub S_SellManual,6280,100000; - break; - case 3: - callsub S_SellManual,6281,100000; - break; - case 4: - callsub S_SellManual,6282,100000; - break; - case 5: - callsub S_SellManual,6283,100000; - break; - case 6: - callsub S_SellManual,6284,100000; - break; - case 7: - callsub S_SellManual,6285,100000; - break; - case 8: - callsub S_SellManual,11022,100000; - break; - case 9: - callsub S_SellManual,11023,100000; - break; - case 10: - callsub S_SellManual,11024,100000; - break; - case 11: - mes "[Craft Book Salesman]"; - mes "Thank you for your patronage."; - mes "Please come again."; - close; - } - -S_SellManual: - mes "[Craft Book Salesman]"; - mes ""+getitemname(getarg(0))+"?"; - mes "That'll be "+getarg(1)+" zeny ea."; - mes "How many of these books would you like to purchase?"; - next; - input .@amount; - if (.@amount == 0) { - mes "[Craft Book Salesman]"; - mes "Would you like to see some different books?"; - close; - } - if (.@amount < 1 || .@amount > 99 ){ - mes "[Craft Book Salesman]"; - mes "You cannot purchase more than 100 at a time."; - close; - } - mes "[Craft Book Salesman]"; - mes "You've entered "+.@amount+"x "+getitemname(getarg(0))+"."; - mes "That'll be "+getarg(1) * .@amount+" Zeny."; - mes "Would you like to continue?"; - next; - if (select("Yes:No") == 1) { - if (Zeny < getarg(1) * .@amount) { - mes "[Craft Book Salesman]"; - mes "You don't"; - mes "have enough zeny."; - mes "Check how much zeny"; - mes "you have first."; - close; - } - if (checkweight(getarg(0),.@amount) == 0){ - mes "[Craft Book Salesman]"; - mes "It doesn't seem like you can carry everything."; - mes "Please check the space in your inventory."; - close; - } - mes "[Craft Book Salesman]"; - mes "Thank you for your patronage."; - set Zeny,Zeny - getarg(1) * .@amount; - getitem getarg(0),.@amount; - close; - } - mes "[Craft Book Salesman]"; - mes "Please take your time"; - mes "before you make your decision."; - close; -} - -alde_alche,24,188,3 script Guild Dealer 740,{ +alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{ if (checkweight(1201,1) == 0) { mes "- Wait a minute! -"; mes "- Currently you are carrying -"; @@ -187,7 +78,7 @@ alde_alche,24,188,3 script Guild Dealer 740,{ mes "in your inventory."; close; } - set zeny,zeny-.@sell; + set Zeny, Zeny-.@sell; getitem 7134,.@input; //Medicine_Bowl mes "[Gever Al Sharp]"; mes "Thank you."; @@ -260,7 +151,7 @@ S_SellManual: mes "That'll be "+getarg(1)+" zeny."; next; if (select("Purchase.:Quit.") == 1) { - set zeny,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 f4df03a0a..6501a7c6c 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -1,5 +1,5 @@ //===== Hercules Script ====================================== -//= Magazine Dealer Kenny +//= Magazine Dealers //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== @@ -16,10 +16,9 @@ //= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy] //============================================================ -alberta,118,157,3 script Magazine Dealer Tonny::mdk 83,{ - set .n$, compare(strnpcinfo(1),"Tonny")?"[Tonny]":"[Kenny]"; - if(BaseJob == Job_Gunslinger) { - mes .n$; +alberta,118,157,3 script Magazine Dealer Kenny::mdk 4_M_01,{ + if (BaseJob == Job_Gunslinger) { + mes "[Kenny]"; mes "Welcome to my Magazine Shop."; mes "As you may know, large numbers"; mes "of bullets can be carried more"; @@ -36,7 +35,7 @@ alberta,118,157,3 script Magazine Dealer Tonny::mdk 83,{ case 7: callfunc "Func_Casing",13202,12150; break; case 8: callfunc "Func_Casing",13201,12151; break; case 9: - mes .n$; + mes "[Kenny]"; mes "Well, if you ever find"; mes "that you have too many"; mes "bullets, come and see me."; @@ -45,7 +44,7 @@ alberta,118,157,3 script Magazine Dealer Tonny::mdk 83,{ close; } } - mes .n$; + mes "[Kenny]"; mes "Welcome to my shop."; mes "Here, I provide Magazines"; mes "and Cartridges for Gunslingers."; @@ -53,7 +52,7 @@ alberta,118,157,3 script Magazine Dealer Tonny::mdk 83,{ mes "my services would be of any"; mes "use to you, adventurer."; next; - mes .n$; + mes "[Kenny]"; mes "Eh, but if you happen to"; mes "know any Gunslingers, send"; mes "them my way. You can never"; @@ -62,18 +61,18 @@ alberta,118,157,3 script Magazine Dealer Tonny::mdk 83,{ } function script Func_Casing { - mes .n$; + mes "[Kenny]"; mes "Now, you can trade"; mes "500 "+getitemname(getarg(0))+"s"; mes "and 500 zeny for 1 "+getitemname(getarg(1))+", so make sure"; mes "you have sufficient bullets"; mes "and zeny for this exchange."; next; - mes .n$; + mes "[Kenny]"; mes "You can exchange 500 "+getitemname(getarg(0))+"s and 500 zeny"; mes "with 1 "+getitemname(getarg(1))+"."; next; - mes .n$; + mes "[Kenny]"; mes "Remember that I can't give"; mes "you more than 50 Magazines"; mes "at a time. Now please enter"; @@ -81,8 +80,8 @@ function script Func_Casing { mes "want to receive. If you want to cancel, then just enter ''0.''"; next; input .@amount; - if(.@amount > 50 || .@amount == 0) { - mes .n$; + if (.@amount > 50 || .@amount == 0) { + mes "[Kenny]"; mes "Hey, I can't give you"; mes "that many Magazines."; mes "Please try again, and"; @@ -93,7 +92,7 @@ function script Func_Casing { if (countitem(getarg(0)) >= (500*.@amount)) { if (Zeny >= (500*.@amount)) { if (checkweight(getarg(1),.@amount) == 0) { - mes .n$; + mes "[Kenny]"; mes "Hey, you've got a lot"; mes "of junk crammed in your"; mes "Inventory. Free up some"; @@ -102,7 +101,7 @@ function script Func_Casing { mes "some Magazines later, okay?"; close; }else{ - mes .n$; + mes "[Kenny]"; mes "Alright, here are"; mes "your Magazines. Thanks"; mes "for visiting my shop, and"; @@ -113,8 +112,8 @@ function script Func_Casing { getitem getarg(1),.@amount; close; } - }else{ - mes .n$; + } else { + mes "[Kenny]"; mes "Sorry, but you don't"; mes "have enough zeny for"; mes "this Magazine exchange."; @@ -123,8 +122,8 @@ function script Func_Casing { mes "some more money."; close; } - }else{ - mes .n$; + } else { + mes "[Kenny]"; mes "Sorry, but you don't"; mes "have enough bullets for"; mes "this Magazine exchange."; diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index b9d515ad4..382916b10 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -1,5 +1,5 @@ -//===== Hercules Script ======================================= -//= Bullet Dealer Tony +//===== Hercules Script ====================================== +//= Bullet Dealers //===== By =================================================== //= Playtester, Paradox924X //===== Version ============================================== @@ -17,7 +17,7 @@ //= 1.6 Moved Izlude duplicate to pre-re/re paths. [Euphy] //============================================================ -alberta,118,160,3 script Bullet Dealer Tony#alb::bdt 86,{ +alberta,118,160,3 script Bullet Dealer Tony#alb::bdt 4_M_04,{ if (BaseJob == Job_Gunslinger) { mes "[Tony]"; mes "I'm Tony, the Bullet Dealer."; @@ -97,7 +97,7 @@ function script Bullet_Trade { mes "available. Try putting some of"; mes "your things into Kafra Storage."; close; - }else{ + } else { mes "[Tony]"; mes "Great, everything seems"; mes "to be in order. Let me take"; @@ -110,7 +110,7 @@ function script Bullet_Trade { getitem getarg(2),.@amount * 30; close; } - }else{ + } else { mes "[Tony]"; mes "Huh. It looks like you"; mes "don't have enough materials"; diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index c8c001902..f77a45197 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -10,11 +10,11 @@ //= 1.0 First version. [Kisuka] //= 1.1 Added Catalog Magician. [Euphy] //= 1.1a Moved Catalog Magician to Renewal path. [Euphy] -//============================================================ +//============================================================ // Black Marketeer (Buy Licenses - Non-Merchant Classes) -//============================================================ -que_job01,68,84,1 script Black Marketeer#Buying 881,{ +//============================================================ +que_job01,68,84,1 script Black Marketeer#Buying 4_M_SITDOWN,{ if (getskilllv("ALL_BUYING_STORE") == 1) { mes "[Mr. Jass]"; mes "Hey, you already made a contract with Hugh."; @@ -91,8 +91,8 @@ que_job01,68,84,1 script Black Marketeer#Buying 881,{ } // Purchasing Team (Learn Skill - Merchant Classes) -//============================================================ -alberta_in,58,52,4 script Purchasing Team#Buying 59,{ +//============================================================ +alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{ mes "[Mr. Hugh]"; if (BaseClass == Job_Merchant && getskilllv("MC_VENDING") >= 1) { if (getskilllv("ALL_BUYING_STORE") == 1) { @@ -236,4 +236,4 @@ alberta_in,58,52,4 script Purchasing Team#Buying 59,{ mes "[Mr. Hugh]"; mes "My time is solely dedicated to our customers in the Merchant industry."; close; -}
\ No newline at end of file +} diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt index dfde86a4d..db0b91a66 100644 --- a/npc/merchants/cash_hair.txt +++ b/npc/merchants/cash_hair.txt @@ -1,16 +1,16 @@ //===== Hercules Script ====================================== //= Cash Hair Stylist -//===== By: ================================================== +//===== By: ================================================== //= Kisuka -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Description: ========================================= +//===== Description: ========================================= //= Exchange cash item, New_Style_Coupon, for new hair styles. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //============================================================ -itemmall,19,74,5 script Stylist#cash 91,{ +itemmall,19,74,5 script Stylist#cash 4_F_02,{ mes "[Stylist]"; mes "Hey, I'm Kaniki."; mes "I'm here to start a new"; diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt index b61120dea..28db3e69a 100644 --- a/npc/merchants/cash_trader.txt +++ b/npc/merchants/cash_trader.txt @@ -1,13 +1,13 @@ //===== Hercules Script ====================================== //= Cash Shop NPCs -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Description: ========================================= +//===== Description: ========================================= //= Sell Cash shop items. //= Based on iRO's Cash shop. Headgears omitted. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. Sample shop per-say. //= 1.1 FIxed typo. (bugreport:1078) [L0ne_W0lf] //============================================================ @@ -22,4 +22,4 @@ // Blessing and Increase Agility Scroll boxes, Dungeon // Teleport Scroll Box, Stat Food boxes, and Gym Passes. -payon,171,142,4 cashshop Kafra Shop Employee 116,12900:1000,12901:200,12902:1000,12909:100,12910:100,12911:1500,12922:150,7619:100,7620:100,12916:150,12917:150,12915:100,12918:100,12913:125,12914:125,13553:50,12903:100,12904:100,12905:100,12906:100,12907:100,12908:100,7776:50 +payon,171,142,4 cashshop Kafra Shop Employee 4_F_KAFRA2,12900:1000,12901:200,12902:1000,12909:100,12910:100,12911:1500,12922:150,7619:100,7620:100,12916:150,12917:150,12915:100,12918:100,12913:125,12914:125,13553:50,12903:100,12904:100,12905:100,12906:100,12907:100,12908:100,7776:50 diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt index 3d9fd89d8..f2d739aba 100644 --- a/npc/merchants/cashheadgear_dye.txt +++ b/npc/merchants/cashheadgear_dye.txt @@ -6,13 +6,13 @@ //===== Current Version: ===================================== //= 1.0 //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Change headgear's color. Cost is a Mysterious Dyestuff //===== Additional Comments: ================================= -//= v1.0 First / Optimized Version +//= 1.0 First / Optimized Version //============================================================ -prt_in,253,168,4 script Alora 862,{ +prt_in,253,168,4 script Alora 4_F_LGTGIRL,{ // Mysterious Dyestuff set .@dyeID, 6220; diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index 253e849a7..39a12cbc1 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -1,12 +1,12 @@ //===== Hercules Script ====================================== //= Clothes Dyer -//===== By: ================================================== +//===== By: ================================================== //= Usnul -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.5 -//===== Description: ========================================= +//===== Description: ========================================= //= Clothes dyer with standard palletes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= Fully working //= 2.1 Shortened some labels to make this script loading, //= Added Black+White Colors desc [Lupus] @@ -19,7 +19,7 @@ //= 2.5 Optimized. [Euphy] //============================================================ -prt_in,284,168,2 script Dyer Ginedin Rephere 55,{ +prt_in,284,168,2 script Dyer Ginedin Rephere 1_M_JOBTESTER,{ function Dyes; set .@EnableDyes,1; // Disable (set to 0) if palettes cause errors [see note v2.4] @@ -171,4 +171,4 @@ function Dyes { mes "Your clothes have been dyed "+((.@s)?.@DyeName$[getarg((.@s-1)*2)]:.@DyeName$[0])+"."; close; } -} +}
\ No newline at end of file diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt index 04c4f793c..024cdf33e 100644 --- a/npc/merchants/coin_exchange.txt +++ b/npc/merchants/coin_exchange.txt @@ -1,5 +1,5 @@ //===== Hercules Script ====================================== -//= Manuk & Splendide Coin Merchants +//= Coin Merchants //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== @@ -43,7 +43,7 @@ if (.@i == 1) { mes "Here are the item descriptions."; close2; - ReadBook .@Book,1; + readbook .@Book,1; end; } else if (.@i < 5) { @@ -83,5 +83,5 @@ close; } } -man_in01,286,16,1 duplicate(merchant_13_2) Merchant of Manuk 454 -spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 439 +man_in01,286,16,1 duplicate(merchant_13_2) Merchant of Manuk 4_MAN_PIOM +spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 4_F_FAIRYKID4
\ No newline at end of file diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt index c4bc2f5f8..f25954cb3 100644 --- a/npc/merchants/dye_maker.txt +++ b/npc/merchants/dye_maker.txt @@ -1,12 +1,13 @@ //===== Hercules Script ====================================== //= Dye Maker -//===== By: ================================================== +//===== By: ================================================== //= rAthena Dev Team -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Description: ========================================= -//= [Aegis Conversion] -//===== Additional Comments: ================================= +//===== Description: ========================================= +//= [Official Conversion] +//= Quests to create the eight colored Dyestuffs. +//===== Additional Comments: ================================= //= 1.0 Fully working [kobra_k88] //= 1.1 Spell Checked [Nexon] //= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf] @@ -14,9 +15,9 @@ //= 1.3 Made the checks more dynamic [ultramage] //= 1.3b Fixed incorrect checking loop structure [ultramage] //= 1.4 Added a checkweight. [L0ne_W0lf] -//============================================================ +//============================================================ -morocc_in,146,99,3 script Java Dullihan 58,{ +morocc_in,146,99,3 script Java Dullihan 1_M_MERCHANT,{ if ((MaxWeight-Weight) < 200 || checkweight(1201,1) == 0) { mes "- Wait a moment! -"; mes "- Currently you're carrying -"; @@ -181,7 +182,7 @@ S_MakeDye: // delete items for (set .@i, 0; .@i < .@size ; set .@i, .@i+1) delitem .@item[.@i], .@count[.@i]; - set zeny,zeny-.@cost; + set Zeny, Zeny-.@cost; // get dyestuff getitem .@dyestuff,1; diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt index 10dcec3e4..518f782a9 100644 --- a/npc/merchants/elemental_trader.txt +++ b/npc/merchants/elemental_trader.txt @@ -1,18 +1,18 @@ //===== Hercules Script ====================================== //= Elemental Stone Trader -//===== By: ================================================== -//= MasterOfMuppets, rAthena Dev Team -//===== Current Version: ===================================== +//===== By: ================================================== +//= rAthena Team & MasterOfMuppets +//===== Current Version: ===================================== //= 1.1 -//===== Description: ========================================= -//= [Aegis Conversion] +//===== Description: ========================================= +//= [Official Conversion] //= Trade impure types of elemental stones for pure ones. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 1.1 Optimized. [Euphy] -//============================================================ +//============================================================ -ama_in02,61,27,7 script Alchemist#ama 749,{ +ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{ mes "[Laspuchin Gregory]"; mes "KeekeekeeKeheheh."; mes "This is amazing!"; diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt index 5bb9a7d7d..a236722fe 100644 --- a/npc/merchants/enchan_arm.txt +++ b/npc/merchants/enchan_arm.txt @@ -1,26 +1,24 @@ //=====Hercules Script ======================================= //= Armor Enchanter -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3a -//===== Compatible With: ===================================== -//= Hercules Git -//===== Description: ========================================= -//= [Aegis Conversion] +//===== Description: ========================================= +//= [Official Conversion] //= Add a +1, +2, or +3 random stat to a specified armor. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Corrected typo (Sit -> Suit) (bugreport:4586) //= 1.2 Optimized. [Euphy] //= 1.3 Fixed some typos and optimized a little more. [Daegaladh] //= 1.3a Added 'disable_items' command. [Euphy] -//============================================================ +//============================================================ -prontera,165,60,2 script Apprentice Craftsman 73,{ +prontera,165,60,2 script Apprentice Craftsman 1_F_MERCHANT_01,{ disable_items; mes "[Apprentice Craftsman]"; - if (Zeny > 399999) { + if (Zeny >= 400000) { mes "I've been studying ways to enhance an armor to maximize its capability."; next; mes "[Apprentice Craftsman]"; @@ -35,24 +33,24 @@ prontera,165,60,2 script Apprentice Craftsman 73,{ mes "[Apprentice Craftsman]"; mes "I'm not responsible for what would happen if you have more than one of the same kind in your inventory."; next; - switch(select("Armor with no Slots:Armor with Slots:High Grade Armor:Maybe next time")) { - case 1: - setarray .@Items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396; - set .@j,50; - break; - case 2: - setarray .@Items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351; - set .@j,55; - set .@k,1; - break; - case 3: - setarray .@Items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390; - set .@j,60; - break; - case 4: - mes "[Apprentice Craftsman]"; - mes "Please come back when you have any interest in enchanting your armor."; - close; + switch(select("Non Slotted Armor.:Slotted Armor.:High Grade Armor.:Maybe next time.")) { + case 1: + setarray .@Items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396; + set .@j,50; + break; + case 2: + setarray .@Items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351; + set .@j,55; + set .@k,1; + break; + case 3: + setarray .@Items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390; + set .@j,60; + break; + case 4: + mes "[Apprentice Craftsman]"; + mes "Please come back when you have any interest in enchanting your armor."; + close; } set .@menu$,""; for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+1) @@ -60,19 +58,17 @@ prontera,165,60,2 script Apprentice Craftsman 73,{ callsub S_EnchantArmor, .@Items[select(.@menu$)-1], .@j; end; } - else { - mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor."; - next; - mes "[Apprentice Craftsman]"; - mes "If by any chance, you would want to enchant your armor, bring me 400,000 zeny and the armor you want to enchant and you are all set to go."; - close; - } + mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor."; + next; + mes "[Apprentice Craftsman]"; + mes "If by any chance, you would want to enchant your armor, bring me 400,000 zeny and the armor you want to enchant and you are all set to go."; + close; S_EnchantArmor: set .@itemid,getarg(0); set .@failrate,getarg(1); mes "[Apprentice Craftsman]"; - if ((countitem(.@itemid) > 0) && (countitem(.@itemid) < 2)) { + if (countitem(.@itemid) == 1) { mes "Socket enchant will cost you 400,000 zeny. And there will be a random option enchanted. Of course, there is a chance of breaking your armor."; next; mes "[Apprentice Craftsman]"; @@ -81,7 +77,7 @@ S_EnchantArmor: mes "and Cards will be GONE.^000000"; mes "Do you still want to try an Enchant?"; next; - if(select("Hmm... Let me think it over.:I've made up my mind already. Give it a shot.")==1) { + if(select("Hmm... Let me think it over.:Go ahead.") == 1) { mes "[Apprentice Craftsman]"; mes "Well, I can't blame you. Safety first, eh?"; mes "Now you have a nice day."; @@ -97,7 +93,7 @@ S_EnchantArmor: close; } progressbar "ffff00",7; - set zeny,zeny-400000; + set Zeny, Zeny-400000; delitem .@itemid,1; switch (rand(1,.@failrate)) { case 1: set .@addpart,4702;break; diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt index 74962fef2..1d8837f28 100644 --- a/npc/merchants/gemstone.txt +++ b/npc/merchants/gemstone.txt @@ -1,23 +1,23 @@ //===== Hercules Script ====================================== //= Gemstone Trader -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== Description: ========================================= -//= [Aegis Conversion] +//===== Description: ========================================= +//= [Official Conversion] //= Trade various colors of gemstones for other color gemstones. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] -//= Any notes pertaining to the prior trader may be found -//= in the cities/payon.txt +//= Any notes pertaining to the prior trader may be found +//= in the cities/payon.txt //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 1.2 Updated input with min/max values. [L0ne_W0lf] -//= Added a checkweight. +//= Added a checkweight. //= 1.3 Fixed checks. [Euphy] -//============================================================ +//============================================================ -payon,173,238,5 script Jade#pay 754,{ +payon,173,238,5 script Jade#pay 4_M_SAGE_A,{ if (checkweight(1201,1) == 0) { mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000"; close; diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt index c3479cbbe..fc1113603 100644 --- a/npc/merchants/hair_dyer.txt +++ b/npc/merchants/hair_dyer.txt @@ -1,27 +1,27 @@ //===== Hercules Script ====================================== //= Hair Dyer -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.5 -//===== Description: ========================================= +//===== Description: ========================================= //= Hair Dyer with standard palletes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= Fully working //= 1.1 Bugfix: fixed missing menu label LEnd->M_End [Lupus] //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 1.3 Fixed problem what "freezes" the NPC. (bugreport:509) [Samuray22] //= 1.4 Fixed getlook checking the wrong color. (bugreport:2392) [L0ne_W0lf] //= 1.5 Added Lighthalzen Hair Dying NPC. [L0ne_W0lf] -//============================================================ +//============================================================ -prt_in,243,168,4 script Jovovich 91,{ +prt_in,243,168,4 script Jovovich 4_F_02,{ mes "[Hairdresser Jovovich]"; mes "Welcome~!"; mes "How may I help you?"; next; mes "[Hairdresser Jovovich]"; - if (sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come."; + if (Sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come."; else { if (rand(20) > 11) { mes "Eh!? Oh my! Oh no no no no! Your hair is sooo damaged! It's not good if you leave your hair like this."; @@ -91,9 +91,9 @@ prt_in,243,168,4 script Jovovich 91,{ case 5: callsub S_NoDye,981,"blue"; break; case 6: callsub S_NoDye,982,"white"; break; case 7: callsub S_NoDye,983,"black"; break; - Case 8: callsub S_NoDye,975,"red"; break; + case 8: callsub S_NoDye,975,"red"; break; } - if (zeny < 1000) { + if (Zeny < 1000) { mes "[Hairdresser Jovovich]"; mes "The fee is 1000 zeny. Do you not have enough...?"; close; @@ -109,7 +109,7 @@ prt_in,243,168,4 script Jovovich 91,{ case 7: delitem 983,1; break; //Black_Dyestuffs case 8: delitem 975,1; break; //Scarlet_Dyestuffs } - set Zeny,Zeny-1000; + set Zeny, Zeny-1000; setlook VAR_HEADPALETTE,.@headpalette; set .@choose_success,1; break; @@ -154,7 +154,7 @@ S_NoDye: } // Lighthalzen -lhz_in02,100,134,3 script Hair Dyer#lich 850,{ +lhz_in02,100,134,3 script Hair Dyer#lich 4_F_EINWOMAN,{ mes "[Rossa]"; if (Sex == 1) { mes "Welcome, come in~"; @@ -367,7 +367,7 @@ lhz_in02,100,134,3 script Hair Dyer#lich 850,{ 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 - set zeny,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 cf4db6333..47f273930 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 1.4 //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Allows you to change your hairstyle. //===== Additional Comments: ================================= //= 1.2 Rescripted to the Aegis 10.3 Standards. [Samuray22] @@ -15,7 +15,7 @@ // Hair Dresser Veronica // ============================================================ -alberta_in,55,142,7 script Hair Dresser 91,{ +alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "[Veronica]"; mes "Welcome to Veronica's hair salon."; mes "How can I help you?"; @@ -470,7 +470,7 @@ alberta_in,55,142,7 script Hair Dresser 91,{ mes "- *snip snip snip snip* -"; mes "- *bzzzzzzz bzzzzzzz bzzzzzzz bzzzzzzz* -"; next; - set Zeny,Zeny-99800; + set Zeny, Zeny-99800; delitem 973,3; // Counteragent delitem 974,3; // Mixture delitem 901,100; // Danggie @@ -522,7 +522,7 @@ L_cutin: // Roving Hair Dresser // ============================================================ -alberta,33,141,7 script Roving Hair Dresser 87,{ +alberta,33,141,7 script Roving Hair Dresser 4_M_BARBER,{ mes "[Rui Vishop]"; mes "That Veronica..."; mes "Hah! Best hair dresser my ass."; @@ -656,7 +656,7 @@ alberta,33,141,7 script Roving Hair Dresser 87,{ mes "Once more I've outdone myself."; mes "It's such a unique and talented"; mes "style! Yes, I am the best! Wooohahahahahaha!"; - set Zeny,Zeny-199800; + set Zeny, Zeny-199800; setlook 1,rand(1,19); setlook 6,rand(1,8); close; @@ -683,7 +683,7 @@ alberta,33,141,7 script Roving Hair Dresser 87,{ // Lighthalzen -lhz_in02,100,143,3 script Hair Dresser#li 122,{ +lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "[Prince Shammi]"; mes "Welcome to Prince Shammi's"; mes "Beauty Shop, the place to go"; @@ -1042,7 +1042,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{ mes "*Clip clip clip clip*"; mes "*Bzzzzzzzzzzzzzzzzzzzz*^000000"; next; - set zeny,zeny-99800; + set Zeny, Zeny-99800; delitem 973,3; //Counteragent delitem 974,3; //Mixture delitem 901,100; //Danggie @@ -1096,7 +1096,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{ } } -lhz_in02,91,155,5 script Assistant Beautician#li 862,{ +lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ mes "[Assistant Beautician]"; mes "Wah?! Sweet Jiminy,"; mes "you freaked me out!"; @@ -1249,7 +1249,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 862,{ mes "[Assistant Beautician]"; mes "^333333*Pant Pant Pant*^000000"; next; - set zeny,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 dd7b0a813..84e3adf32 100644 --- a/npc/merchants/hd_refine.txt +++ b/npc/merchants/hd_refine.txt @@ -1,11 +1,9 @@ -//===== Hercules Script ====================================== +//===== Hercules Script ====================================== //= HD Refiners //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= [Official Conversion] //= Refiners that use HD ores to refine equipment. Upon @@ -147,17 +145,17 @@ mes "I am sure a person like you would never blame me for a decrease in refine level by 1. Hmm."; close; } -prt_in,59,54,3 duplicate(MightyHammer) Mighty Hammer#prt 826 -morocc_in,65,30,3 duplicate(MightyHammer) Mighty Hammer#morocc 826 -payon,148,176,3 duplicate(MightyHammer) Mighty Hammer#pay 826 -alberta_in,16,56,3 duplicate(MightyHammer) Mighty Hammer#alb 826 -yuno_in01,171,18,3 duplicate(MightyHammer) Mighty Hammer#yuno 826 -ein_in01,22,82,3 duplicate(MightyHammer) Mighty Hammer#ein 826 -lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826 +prt_in,59,54,3 duplicate(MightyHammer) Mighty Hammer#prt 4_M_DWARF +morocc_in,65,30,3 duplicate(MightyHammer) Mighty Hammer#morocc 4_M_DWARF +payon,148,176,3 duplicate(MightyHammer) Mighty Hammer#pay 4_M_DWARF +alberta_in,16,56,3 duplicate(MightyHammer) Mighty Hammer#alb 4_M_DWARF +yuno_in01,171,18,3 duplicate(MightyHammer) Mighty Hammer#yuno 4_M_DWARF +ein_in01,22,82,3 duplicate(MightyHammer) Mighty Hammer#ein 4_M_DWARF +lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF // iRO NPC locations: -// moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 826 -// payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 826 +// moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 4_M_DWARF +// payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 4_M_DWARF // Basta (+10 and up) //============================================================ @@ -309,10 +307,10 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826 mes "I'll do better next time! Don't worry!"; close; } -prt_in,57,54,3 duplicate(Basta) Basta#prt 826 -morocc_in,68,30,3 duplicate(Basta) Basta#morocc 826 -payon,148,174,3 duplicate(Basta) Basta#payon 826 -alberta_in,18,56,3 duplicate(Basta) Basta#alberta 826 -yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 826 -ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 826 -lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 826 +prt_in,57,54,3 duplicate(Basta) Basta#prt 4_M_DWARF +morocc_in,68,30,3 duplicate(Basta) Basta#morocc 4_M_DWARF +payon,148,174,3 duplicate(Basta) Basta#payon 4_M_DWARF +alberta_in,18,56,3 duplicate(Basta) Basta#alberta 4_M_DWARF +yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 4_M_DWARF +ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 4_M_DWARF +lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 4_M_DWARF diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index f126b723e..29d49c948 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -75,10 +75,10 @@ } // Alberta -alberta,120,45,2 duplicate(IceCreamer) Ice Cream Maker#1 85 +alberta,120,45,2 duplicate(IceCreamer) Ice Cream Maker#1 4_M_03 // Morroc Field -moc_fild16,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 85 +moc_fild16,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 4_M_03 // Morroc -//morocc,160,144,4 duplicate(IceCreamer) Ice Cream Maker#3 85 +//morocc,160,144,4 duplicate(IceCreamer) Ice Cream Maker#3 4_M_03 diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index 7c4935942..0c23555d2 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -1,5 +1,5 @@ //===== Hercules Script ====================================== -//= Inn NPCs +//= Inn Npcs //===== By: ================================================== //= Darkchild (1.1) //= Playtester (1.2) @@ -21,7 +21,7 @@ //= to arguments.[kobra_k88] //= 1.2 Rewrote inn script [Playtester] //= 1.3 Added (finally) Rachel Inn Maid. Official warp -//= and save points[erKURITA] +//= and save points[erKURITA] //= 1.4 Added Hugel inn [erKurita] //= 1.5 Added "end;" after warping the player. [L0ne_W0lf] //= - Small corrections to the prontera Inns. @@ -46,73 +46,73 @@ //============================================================ -//======================== Prontera =================================== +//========================Prontera =================================== // West Side Inn ------------------- -prt_in,244,135,2 script Inn Employee#Sammy 53,{ +prt_in,244,135,2 script Inn Employee#Sammy 1_M_INNKEEPER,{ callfunc "F_InnMaid","[Employee Sammy]","Nenkaras","prt_in",238,130; warp "prt_in",247,104; end; } // East Side Inn ------------------ -prt_in,61,141,2 script Inn Employee#Ahlma 53,{ +prt_in,61,141,2 script Inn Employee#Ahlma 1_M_INNKEEPER,{ callfunc "F_InnMaid","[Employee Ahlma]","Nenkaras","prt_in",64,136; warp "prt_in",60,166; end; } -//======================== Alberta ==================================== -alberta_in,32,142,3 script Inn Employee#Jennie 53,{ +//========================Alberta ==================================== +alberta_in,32,142,3 script Inn Employee#Jennie 1_M_INNKEEPER,{ callfunc "F_InnMaid","[Employee Jennie]","'Fisherman Inn'!","alberta_in",26,142; warp "alberta_in",18,188; end; } -//====================== Geffen ====================================== -geffen_in,70,64,5 script Inn Employee#Cena 53,{ +//======================Geffen ====================================== +geffen_in,70,64,5 script Inn Employee#Cena 1_M_INNKEEPER,{ callfunc "F_InnMaid","[Employee Cena]","'Ifrit,' the only Inn in the city of Geffen.","geffen_in",70,59; warp "geffen_in",31,31; end; } -//======================= Payon ====================================== -payon_in01,132,62,5 script Inn Employee#Ahee 53,{ +//=======================Payon ====================================== +payon_in01,132,62,5 script Inn Employee#Ahee 1_M_INNKEEPER,{ callfunc "F_InnMaid","[Employee Ahee]","Payon Inn","payon_in01",136,61; warp "payon_in01",132,11; end; } -//======================== Morocc ==================================== +//========================Morocc ==================================== // North East -------------------------- /* -morocc_in,147,141,3 script Inn Employee#Hasna 53,{ +morocc_in,147,141,3 script Inn Employee#Hasna 1_M_INNKEEPER,{ callfunc "F_InnMaid","[Employee Hasna]","Morroc Inn","morocc_in",142,140; warp "morocc_in",173,135; end; } // South -------------------------------- -morocc_in,80,100,5 script Inn Employee#Manar 53,{ +morocc_in,80,100,5 script Inn Employee#Manar 1_M_INNKEEPER,{ callfunc "F_InnMaid","[Employee Manar]","Morroc Inn","morocc_in",78,95; warp "morocc_in",79,123; end; } */ -//====================== Aldebaran =================================== -aldeba_in,92,58,5 script Inn Maid#Rilim 53,{ +//======================Aldebaran =================================== +aldeba_in,92,58,5 script Inn Maid#Rilim 1_M_INNKEEPER,{ callfunc "F_InnMaid","[Rilim]","Al De Baran Inn","aldeba_in",92,50; warp "aldeba_in",92,112; end; } -//======================== Rachel ==================================== -ra_in01,376,69,4 script Inn Keeper#Annie 931,{ +//========================Rachel ==================================== +ra_in01,376,69,4 script Inn Keeper#Annie 4_M_RACHMAN1,{ callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58; warp "ra_in01",384,128; end; } -//====================== Lighthalzen ================================= -lhz_in02,230,284,4 script Hotel Employee#01 86,{ +//======================Lighthalzen ================================= +lhz_in02,230,284,4 script Hotel Employee#01 4_M_04,{ mes "[Hotel Employee]"; mes "Welcome to"; mes "the Royal Dragon,"; @@ -156,15 +156,15 @@ lhz_in02,230,284,4 script Hotel Employee#01 86,{ } } -//======================== Hugel ==================================== -hu_in01,246,107,3 script Inn Maid#Receptionist 53,{ +//========================Hugel ==================================== +hu_in01,246,107,3 script Inn Maid#Receptionist 1_M_INNKEEPER,{ callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95; warp "hu_in01",267,5; end; } -//======================== Veins ==================================== -ve_in,157,219,5 script Inn Master#Receptionist 709,{ +//========================Veins ==================================== +ve_in,157,219,5 script Inn Master#Receptionist 4_M_SEAMAN,{ mes "[Inn Master]"; mes "Good day~"; mes "Welcome to the"; @@ -201,7 +201,7 @@ ve_in,157,219,5 script Inn Master#Receptionist 709,{ } } -//======================= Inn Function ============================== +//=======================Inn Function ============================== function script F_InnMaid { mes getarg(0); mes "Welcome to"; diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt index 6f5fd953b..b2c624bb0 100644 --- a/npc/merchants/kunai_maker.txt +++ b/npc/merchants/kunai_maker.txt @@ -8,15 +8,15 @@ //= Trades a few shurikens + ninja stones for elemental kunai. //===== Additional Comments: ================================= //= 1.0 Added the npc. It uses a function that sends the item -//= id of the 2 required items plus the amount. Can trade -//= up to 500 units (5,000 kunais) at once. [erKURITA] +//= id of the 2 required items plus the amount. Can trade +//= up to 500 units (5,000 kunais) at once. [erKURITA] //= 1.1 Officialized script [Playtester] //= 1.2a Optimized/cleaned up a bit [ultramage] //= 1.3 Updated to match AEGIS script. [Kisuka] //= 1.3a Kagerou/Oboro support (BaseJob -> BaseClass) [Euphy] //============================================================ -que_ng,72,29,3 script Kunai Merchant Kashin 83,{ +que_ng,72,29,3 script Kunai Merchant Kashin 4_M_01,{ if(BaseClass == Job_Ninja) { mes "[Kashin]"; mes "I am Kashin, distributor"; diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt index 15fe3c497..23d144231 100644 --- a/npc/merchants/milk_trader.txt +++ b/npc/merchants/milk_trader.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 1.5 //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Trades bottles for milk //===== Additional Comments: ================================= //= Fully working @@ -17,7 +17,7 @@ //= 1.5 Fixed missed variable. (bugreport:1523) [L0ne_W0lf] //============================================================ -prontera,73,140,0 script Milk Vendor 86,{ +prontera,73,140,0 script Milk Vendor 4_M_04,{ if (checkweight(1201,1) == 0) { mes "^3355FFJust a minute!"; mes "I can't offer any of my"; @@ -49,7 +49,7 @@ prontera,73,140,0 script Milk Vendor 86,{ set .@bottles,countitem(713); set .@total_weight,.@bottles * 50; set .@total_cost,.@bottles * 15; - if (zeny < .@Total_cost) { + if (Zeny < .@Total_cost) { mes "[Milk Vendor]"; mes "Oh, whoa~!"; mes "You don't have enough"; @@ -59,7 +59,7 @@ prontera,73,140,0 script Milk Vendor 86,{ mes "at least " + .@total_cost + " zeny."; close; } - if ((maxweight-weight) < .@total_weight) { + if (MaxWeight - Weight < .@total_weight) { mes "[Milk Vendor]"; mes "Hmm..."; mes "Would you make"; @@ -69,7 +69,7 @@ prontera,73,140,0 script Milk Vendor 86,{ mes "all of this milk?"; close; } - set zeny,zeny-.@total_cost; + set Zeny, Zeny-.@total_cost; delitem 713,.@bottles; //Empty Bottles getitem 519,.@bottles; //Milk close; diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index cd8cede0e..5474190e6 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -1,23 +1,22 @@ //===== Hercules Script ====================================== //= Novice Goods Exchanger //===== By: ================================================== -//= ???, rAthena Dev Team +//= ???, rAthena Team //===== Current Version: ===================================== //= 1.4 //===== Description: ========================================= -//= [Aegis COnversion] +//= [Official Conversion] //= Exchanges your Basic Monster drops for Red Potions. //===== Additional Comments: ================================= //= 1.2 Rescripted to Aegis 10.standards. [L0ne_W0lf[ -//= Made it easier to add new items to exhange list -//= meaning only the exchange is done in a function now. +//= Made it easier to add new items to exhange list +//= meaning only the exchange is done in a function now. //= 1.3 Fixed dialog mix-up in function. [L0ne_W0lf] //= 1.4 Added checkweight, and input min/max values. [L0ne_W0lf] //============================================================ -prontera,123,102,5 script Merchant#pron 85,{ - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 6301 || checkweight(1201,1) == 0) { +prontera,123,102,5 script Merchant#pron 4_M_03,{ + if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; mes "What are you, superhuman?"; @@ -72,9 +71,8 @@ prontera,123,102,5 script Merchant#pron 85,{ } } -morocc,180,259,3 script Merchant#morroc 85,{ - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 6301 || checkweight(1201,1) == 0) { +morocc,180,259,3 script Merchant#morroc 4_M_03,{ + if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; mes "What are you, superhuman?"; @@ -130,9 +128,8 @@ morocc,180,259,3 script Merchant#morroc 85,{ } } -payon,200,134,5 script Merchant#pay 85,{ - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 6301 || checkweight(1201,1) == 0) { +payon,200,134,5 script Merchant#pay 4_M_03,{ + if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; mes "What are you, superhuman?"; @@ -185,9 +182,8 @@ payon,200,134,5 script Merchant#pay 85,{ } } -aldebaran,152,63,5 script Merchant#alde 85,{ - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 6301 || checkweight(1201,1) == 0) { +aldebaran,152,63,5 script Merchant#alde 4_M_03,{ + if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; mes "What are you, superhuman?"; @@ -243,9 +239,8 @@ aldebaran,152,63,5 script Merchant#alde 85,{ } } -geffen,173,88,5 script Merchant#geff 85,{ - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 6301 || checkweight(1201,1) == 0) { +geffen,173,88,5 script Merchant#geff 4_M_03,{ + if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; mes "What are you, superhuman?"; @@ -384,9 +379,9 @@ function script F_PotExchange { } } -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.1 Made it as a function. U can add your own Merchs [Lupus] //= 1.1a Fixed item select [KarLaeda] -//============================================================ +//============================================================ diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt index f913b0eec..5384125e1 100644 --- a/npc/merchants/old_pharmacist.txt +++ b/npc/merchants/old_pharmacist.txt @@ -5,17 +5,16 @@ //===== Current Version: ===================================== //= 1.4 //===== Description: ========================================= -//= Trade in items for potions -//=============================== -//= Breakdown of arguments used +//= Trade in items for potions. +//= Breakdown of arguments used: //= arg(0): Herb required. //= arg(1): Zeny cost. //= arg(2): Potion given. //===== Additional Comments: ================================= -//= 1.0 - Fully working. [DZeroX] -//= 1.0a - Minor fixes [Lupus] -//= 1.1 - Added changed the dialogs and name to fit the -//= the official information. [DZeroX] +//= 1.0 Fully working. [DZeroX] +//= 1.0a Minor fixes [Lupus] +//= 1.1 Added changed the dialogs and name to fit the +//= the official information. [DZeroX] //= 1.1a Removed .GATs [Lupus] //= 1.1b Fixed a bug in Orange Potion creating. Copy&Pasting = bad. [L0ne_W0lf] //= 1.2 Added checkweight, and input min/max values. [L0ne_W0lf] @@ -23,7 +22,7 @@ //= 1.4 Updated to match AEGIS script. [Kisuka] //============================================================ -alberta_in,16,28,4 script Pharmacist 61,{ +alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{ if (checkweight(1201,1) == 0) { mes "- Wait a moment! -"; mes "- Currently you're carrying -"; @@ -35,156 +34,155 @@ alberta_in,16,28,4 script Pharmacist 61,{ mes "[Old Pharmacist]"; mes "Ummmm..."; mes "What brings you here...?"; - switch(select("Make Potion","Talk.","Mixing Information","Cancel")) { - case 1: + switch(select("Make Potion:Talk.:Mixing Information:Cancel")) { + case 1: + next; + if (MaxWeight - Weight < 5000) { + mes "[Old Pharmacist]"; + mes "Why are you carrying these so many!"; + mes "Don't be greedy, carry only as much you need!"; next; - set .@weight,MaxWeight-Weight; - if ((.@weight) < 5000) { - mes "[Old Pharmacist]"; - mes "Why are you carrying these so many!"; - mes "Don't be greedy, carry only as much you need!"; + mes "[Old Pharmacist]"; + mes "You are too heavy to receive potions from me..."; + mes "Go store some items in your storage first!"; + close; + } else { + mes "[Old Pharmacist]"; + mes "You have all the stuff ready, right? Which one would you like?"; + switch(select("Red Potion.:Orange Potion.:Yellow Potion.:White Potion.:Blue Potion.:Green Potion.:Actually, I don't want anything.")) { + case 1: + callsub L_Making,507,3,501; + case 2: next; mes "[Old Pharmacist]"; - mes "You are too heavy to receive potions from me..."; - mes "Go store some items in your storage first!"; - close; - } else { - mes "[Old Pharmacist]"; - mes "You have all the stuff ready, right? Which one would you like?"; - switch(select("Red Potion.","Orange Potion.","Yellow Potion.","White Potion.","Blue Potion.","Green Potion.","Actually, I don't want anything.")) { - case 1: - callsub L_making,507,3,501; - case 2: + if (countitem(507) < countitem(713)) { + set .@max,countitem(507); + } + else if (countitem(508) < countitem(713)) { + set .@max,countitem(508); + } + else { + set .@max,countitem(713); + } + if ((countitem(507) < 1) || (countitem(508) < 1) || (countitem(713) == 0)) { + mes "You rascal! What did you expect?! Coming here with nothing. Tsk!"; + mes "Get lost!"; + close; + } + if (Zeny < 3) { + mes "You rascal! What did you expect?! Coming here with nothing. Tsk!"; + mes "Get lost!"; + close; + } + mes "How many?"; + switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) { + case 1: + next; + if ((countitem(507) < .@max) || (countitem(508) < .@max) || (countitem(713) < .@max) || (Zeny < .@max*3)) { + mes "[Old Pharmacist]"; + mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; + close; + } + set Zeny,Zeny-(.@max*5); + delitem 507,.@max; //Red_Herb + delitem 508,.@max; //Yellow_Herb + delitem 713,.@max; //Empty_Bottle + getitem 502,.@max; //Orange_Potion + break; + case 2: + next; + mes "[Old Pharmacist]"; + mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions."; + input .@amount,0,101; + if (.@amount == 0) { next; mes "[Old Pharmacist]"; - if (countitem(507) < countitem(713)) { - set .@max,countitem(507); - } - else if (countitem(508) < countitem(713)) { - set .@max,countitem(508); - } - else { - set .@max,countitem(713); - } - if ((countitem(507) < 1) || (countitem(508) < 1) || (countitem(713) == 0)) { - mes "You rascal! What did you expect?! Coming here with nothing. Tsk!"; - mes "Get lost!"; - close; - } - if (Zeny < 3) { - mes "You rascal! What did you expect?! Coming here with nothing. Tsk!"; - mes "Get lost!"; - close; - } - mes "How many?"; - switch(select("Make as many as I can.","I want to choose an amount.","Actually, I don't want anything.")) { - case 1: - next; - if ((countitem(507) < .@max) || (countitem(508) < .@max) || (countitem(713) < .@max) || (Zeny < .@max*3)) { - mes "[Old Pharmacist]"; - mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; - close; - } - set Zeny,Zeny-(.@max*5); - delitem 507,.@max; // Red_Herb - delitem 508,.@max; // Yellow_Herb - delitem 713,.@max; // Empty_Bottle - getitem 502,.@max; // Orange_Potion - break; - case 2: - next; - mes "[Old Pharmacist]"; - mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions."; - input .@amount,0,101; - if (.@amount == 0) { - next; - mes "[Old Pharmacist]"; - mes "Make up your mind, will you?!"; - close; - } - if (.@amount > 100) { - next; - mes "[Old Pharmacist]"; - mes "Are you deaf? I said less than 100!"; - close; - } - if ((countitem(507) < .@amount) || (countitem(508) < .@amount) || (countitem(713) < .@amount) || (Zeny < .@amount*3)) { - next; - mes "[Old Pharmacist]"; - mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; - close; - } - next; - set Zeny,Zeny-(.@amount*5); - delitem 507,.@amount; // Red_Herb - delitem 508,.@amount; // Yellow_Herb - delitem 713,.@amount; // Empty_Bottle - getitem 502,.@amount; // Orange_Potion - break; - case 3: - next; - mes "[Old Pharmacist]"; - mes "What?!"; - mes "Grrr..."; - mes "Bleh!"; - mes "Get lost!"; - close; - } - mes "[Old Pharmacist]"; - mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good."; - close; - case 3: - callsub L_making,508,10,503; - case 4: - callsub L_making,509,20,504; - case 5: - callsub L_making,510,30,505; - case 6: - callsub L_making,511,3,506; - case 7: + mes "Make up your mind, will you?!"; + close; + } + if (.@amount > 100) { + next; + mes "[Old Pharmacist]"; + mes "Are you deaf? I said less than 100!"; + close; + } + if ((countitem(507) < .@amount) || (countitem(508) < .@amount) || (countitem(713) < .@amount) || (Zeny < .@amount*3)) { + next; mes "[Old Pharmacist]"; - mes "What?!"; - mes "Grrr..."; - mes "Bleh!"; - mes "Get lost!"; + mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; close; + } + next; + set Zeny,Zeny-(.@amount*5); + delitem 507,.@amount; //Red_Herb + delitem 508,.@amount; //Yellow_Herb + delitem 713,.@amount; //Empty_Bottle + getitem 502,.@amount; //Orange_Potion + break; + case 3: + next; + mes "[Old Pharmacist]"; + mes "What?!"; + mes "Grrr..."; + mes "Bleh!"; + mes "Get lost!"; + close; } + mes "[Old Pharmacist]"; + mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good."; + close; + case 3: + callsub L_Making,508,10,503; + case 4: + callsub L_Making,509,20,504; + case 5: + callsub L_Making,510,30,505; + case 6: + callsub L_Making,511,3,506; + case 7: + mes "[Old Pharmacist]"; + mes "What?!"; + mes "Grrr..."; + mes "Bleh!"; + mes "Get lost!"; + close; } - case 2: - mes "[Old Pharmacist]"; - mes "With medicine, you can increase a person's ability to regenerate. But, they're only good up to a point. *Sigh* I'm starting to think of the days when I was young. I must be getting old."; - next; - mes "[Old Pharmacist]"; - mes "Anyways, a potion is merely a potion. Nothing more and nothing less."; - close; - case 3: - mes "[Old Pharmacist]"; - mes "Hrrrmm..."; - mes "You young ones can be quite annoying. But, since you asked, I'll explain."; - next; - mes "[Old Pharmacist]"; - mes "Herbs work well by themselves, but if you use my special techniques and skills to make potions out of them, the effect is much much greater."; - next; - mes "[Old Pharmacist]"; - mes "If you ask eagerly and politely, I will make them for you. But, not for free... Don't worry though, I only charge a small fee, so it's not that expensive."; - next; - mes "[Old Pharmacist]"; - mes "Red Potion - ^0098E52 Red Herbs, 1 Empty Bottle, 2 zeny fee.^000000"; - mes "Orange Potion - ^0098E51 Red Herb, 1 Yellow Herb, 1 Empty Bottle, 5 zeny fee.^000000"; - mes "Yellow Potion - ^0098E52 Yellow Herbs, 1 Empty Bottle, 10 zeny.^000000"; - next; - mes "[Old Pharmacist]"; - mes "White Potion - ^0098E52 White Herbs, 1 Empty Bottle, 20 zeny fee.^000000"; - mes "Blue Potion - ^0098E52 Blue Herbs, 1 Empty Bottle, 30 zeny fee.^000000"; - mes "Green Potion - ^0098E52 Green Herbs, 1 Empty Bottle, 3 zeny fee.^000000"; - close; - case 4: - mes "[Old Pharmacist]"; - mes "What a boring person. If you have something to say, why don't you say it?!"; - close; + } + case 2: + mes "[Old Pharmacist]"; + mes "With medicine, you can increase a person's ability to regenerate. But, they're only good up to a point. *Sigh* I'm starting to think of the days when I was young. I must be getting old."; + next; + mes "[Old Pharmacist]"; + mes "Anyways, a potion is merely a potion. Nothing more and nothing less."; + close; + case 3: + mes "[Old Pharmacist]"; + mes "Hrrrmm..."; + mes "You young ones can be quite annoying. But, since you asked, I'll explain."; + next; + mes "[Old Pharmacist]"; + mes "Herbs work well by themselves, but if you use my special techniques and skills to make potions out of them, the effect is much much greater."; + next; + mes "[Old Pharmacist]"; + mes "If you ask eagerly and politely, I will make them for you. But, not for free... Don't worry though, I only charge a small fee, so it's not that expensive."; + next; + mes "[Old Pharmacist]"; + mes "Red Potion - ^0098E52 Red Herbs, 1 Empty Bottle, 2 zeny fee.^000000"; + mes "Orange Potion - ^0098E51 Red Herb, 1 Yellow Herb, 1 Empty Bottle, 5 zeny fee.^000000"; + mes "Yellow Potion - ^0098E52 Yellow Herbs, 1 Empty Bottle, 10 zeny.^000000"; + next; + mes "[Old Pharmacist]"; + mes "White Potion - ^0098E52 White Herbs, 1 Empty Bottle, 20 zeny fee.^000000"; + mes "Blue Potion - ^0098E52 Blue Herbs, 1 Empty Bottle, 30 zeny fee.^000000"; + mes "Green Potion - ^0098E52 Green Herbs, 1 Empty Bottle, 3 zeny fee.^000000"; + close; + case 4: + mes "[Old Pharmacist]"; + mes "What a boring person. If you have something to say, why don't you say it?!"; + close; } -L_making: +L_Making: next; mes "[Old Pharmacist]"; if ((countitem(getarg(0))/2) < countitem(713)) { @@ -203,55 +201,55 @@ L_making: close; } mes "How many?"; - switch(select("Make as many as I can.","I want to choose an amount.","Actually, I don't want anything.")) { - case 1: - next; - if ((countitem(getarg(0)) < .@max*2) || (countitem(713) < .@max) || (Zeny < .@max*getarg(1))) { - mes "[Old Pharmacist]"; - mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; - close; - } - set Zeny,Zeny-(.@max*getarg(1)); - delitem getarg(0),.@max*2; - delitem 713,.@max; // Empty_Bottle - getitem getarg(2),.@max; - break; - case 2: - next; + switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) { + case 1: + next; + if ((countitem(getarg(0)) < .@max*2) || (countitem(713) < .@max) || (Zeny < .@max*getarg(1))) { mes "[Old Pharmacist]"; - mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions."; - input .@amount; - next; - if (.@amount == 0) { - mes "[Old Pharmacist]"; - mes "Make up your mind, will you?!"; - close; - } - if (.@amount > 100) { - mes "[Old Pharmacist]"; - mes "Are you deaf? I said less than 100!"; - close; - } - if ((countitem(getarg(0)) < .@amount*2) || (countitem(713) < .@amount) || (Zeny < .@amount*getarg(1))) { - mes "[Old Pharmacist]"; - mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; - close; - } - set Zeny,Zeny-(.@amount*getarg(1)); - delitem getarg(0),.@amount*2; - delitem 713,.@amount; // Empty_Bottle - getitem getarg(2),.@amount; - break; - case 3: - next; + mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; + close; + } + set Zeny,Zeny-(.@max*getarg(1)); + delitem getarg(0),.@max*2; + delitem 713,.@max; //Empty_Bottle + getitem getarg(2),.@max; + break; + case 2: + next; + mes "[Old Pharmacist]"; + mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions."; + input .@amount; + next; + if (.@amount == 0) { mes "[Old Pharmacist]"; - mes "What?!"; - mes "Grrr..."; - mes "Bleh!"; - mes "Get lost!"; + mes "Make up your mind, will you?!"; close; - } + } + if (.@amount > 100) { + mes "[Old Pharmacist]"; + mes "Are you deaf? I said less than 100!"; + close; + } + if ((countitem(getarg(0)) < .@amount*2) || (countitem(713) < .@amount) || (Zeny < .@amount*getarg(1))) { + mes "[Old Pharmacist]"; + mes "You rascal! You don't even have all the materials and you want me to make you potions?!"; + close; + } + set Zeny,Zeny-(.@amount*getarg(1)); + delitem getarg(0),.@amount*2; + delitem 713,.@amount; //Empty_Bottle + getitem getarg(2),.@amount; + break; + case 3: + next; mes "[Old Pharmacist]"; - mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good."; + mes "What?!"; + mes "Grrr..."; + mes "Bleh!"; + mes "Get lost!"; close; + } + mes "[Old Pharmacist]"; + mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good."; + close; } diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt index 30a4788a8..6b544c920 100644 --- a/npc/merchants/quivers.txt +++ b/npc/merchants/quivers.txt @@ -5,13 +5,13 @@ //===== Current Version: ===================================== //= 1.2 //===== Description: ========================================= -//= [Aegis COnversion] +//= [Official Conversion] //= Turns arrows into Arrow Quivers. -// Breakdown of Subroutine "S_BuyQuiver" -// arg(0): Type of Arrow to be packaged (item ID) -// arg(1): How many of each 'getarg(0)' arrow per quiver -// arg(2): The cost of making a 'getarg(0)' quiver. -// arg(3): The quiver given by the NPC. (item ID) +//= Breakdown of Subroutine "S_BuyQuiver" +//= arg(0): Type of Arrow to be packaged (item ID). +//= arg(1): How many of each 'getarg(0)' arrow per quiver. +//= arg(2): The cost of making a 'getarg(0)' quiver. +//= arg(3): The quiver given by the NPC (item ID). //===== Additional Comments: ================================= //= 07/06/05 : Added 1st Version. [Muad_Dib] //= Converted to rAthena format by Dr.Evil @@ -19,18 +19,11 @@ //= Fixed a few spelling errors. [Nexon] //= 1.1 Added Holy Arrow Quivers [Playtester] //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] -//= Removed "Holy Arrows" from the list. +//= Removed "Holy Arrows" from the list. //============================================================ -payon_in01,5,134,5 script Inventor Jaax 89,{ - if (checkweight(1201,1) == 0) { - mes "[Inventor Jaax]"; - mes "Hey, you're carrying"; - mes "way too much stuff. Why don't you stash it away in Kafra Storage? We can talk after you do that, right?"; - close; - } - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 2000) { +payon_in01,5,134,5 script Inventor Jaax 4_M_ORIENT02,{ + if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) { mes "[Inventor Jaax]"; mes "Hey, you're carrying"; mes "way too much stuff. Why don't you stash it away in Kafra Storage? We can talk after you do that, right?"; @@ -47,7 +40,7 @@ payon_in01,5,134,5 script Inventor Jaax 89,{ mes "created something"; mes "truly extraordinary. I call them... ^663300Magic Quivers^000000 !! This will be remembered in history as an"; mes "arrow revolution!"; - Emotion e_no1; + emotion e_no1; next; mes "[Inventor Jaax]"; mes "I've studied magic and quivers for years, working night and day until I finally figured how to condense arrows with magic! With magic quivers, you'll be carrying more arrows, but with less weight!"; @@ -76,7 +69,7 @@ payon_in01,5,134,5 script Inventor Jaax 89,{ //close; S_BuyQuiver: - if (countitem(getarg(0)) > 499) { + if (countitem(getarg(0)) >= getarg(1)) { mes "[Inventor Jaax]"; mes "Excellent!"; mes "Are you carrying any Arrows with you? I'll provide you with a quiver that can carry "+getarg(1)+" of your "+getitemname(getarg(0))+"s for only ^FF3131"+getarg(2)+" Zeny^000000."; @@ -105,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."; - set zeny,zeny-.@arrow_zeny01; + set Zeny, Zeny-.@arrow_zeny01; delitem getarg(0),.@arrows_used; //Arrow getitem getarg(3),.@quiver; //Quiver next; @@ -131,11 +124,11 @@ S_BuyQuiver: mes "a quiver is so close?"; close; case 2: - if (zeny > getarg(2)) { + if (Zeny > getarg(2)) { 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."; - set zeny,zeny-getarg(2); + set Zeny, Zeny-getarg(2); delitem getarg(0),getarg(1); //Arrow getitem getarg(3),1; //Quiver next; @@ -166,11 +159,11 @@ S_BuyQuiver: } else { mes "[Inventor Jaax]"; - mes "You can carry a maximum of 500 Arrows within this quiver. It was made using my secret method,"; + mes "You can carry a maximum of "+getarg(1)+" Arrows within this quiver. It was made using my secret method,"; mes "so the total weight of the Arrows and Quiver is less than carrying the Arrows alone."; next; mes "[Inventor Jaax]"; - mes "It's a miracle of science! One that you can experience for yourself if you bring me at least 500 Arrows and 500 Zeny for each Quiver."; + mes "It's a miracle of science! One that you can experience for yourself if you bring me at least "+getarg(1)+" Arrows and "+getarg(2)+" Zeny for each Quiver."; close; } } diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index db4910d7e..d65fd5c2e 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -3,45 +3,43 @@ //===== By: ================================================== //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5) //===== Current Version: ===================================== -//= 3.2a -//===== Compatible With: ===================================== -//= Hercules Git +//= 3.3 //===== Description: ========================================= //= Refining NPCs and Metal Salesmen. //===== Additional Comments: ================================= -//= 1.0 - by A bunch of people! -//= Syrus22 - Completely redid the script using functions... also -//= added the option for auto safe refining and multiple refining. -//= 1.1 - Negative input bug fixed [Lupus] -//= 1.2 - Added additional reparimen in morroc and payon. Added -//= Christopher the blacksmith in Geffen. Edited some dialogue [kobra_k88] -//= 1.3 - New Payon Locations [Darkchild] -//= Corrected zeny subtraction thx to jpnmania77.[kobra_k88] -//= 1.3a - Temporary corrected an exploit. Need to check sources -//= to fully fix bug [Shinigami] -//= Fixed repairman prices [shadowlady] -//= Fixed bug that skips requirements thanks to sir_loon [massdriller] -//= Fixed itemid error thanks to -Vitamin- [massdriller] -//= 1.4 - check again item in refining procedure to avoid -//= hacker that can change item [dafide18] -//= 1.5 - Fixed crashing due to badly used callfunc's [Skotlex] -// Lupus, don't rollback this important fix again! >.< -//= 1.5a - Corrected an unneeded callfunc, fixed the anti-bot -//= exploit ruining the safe refine loop. [Skotlex] -//= 1.5b - Fixed Spelling mistakes. [Nexon] -//= 1.6 - Replaced all breaks for ends as per the new script engine [Skotlex] -//= 1.7 - Added Einbroch Refiners (Custom names ^^;) and a duplicated BS Shop. [Poki#3] -//= 1.8 - Added Lighthalzen Refiners (Custom names again ^^;) [Poki#3] -//= 1.8a - Fixed wrong indication thanks to NeoSaro [Lupus] -//= 1.9 - Rewrote repairman, removed the Steel from repair cost [DracoRPG] -//= 2.0 - Fixed missed equppment presence check. Thx2 Coltaro [Lupus] -//= 2.0a - Added weight checks thanks to Neouni [Playtester] -//= 2.0b - Fixed the names of Lighthalzen and Einbroch refiners thanks to Maud_Dib [Kargha] -//= 2.1 - Removed Duplicates [Silent] -//= 2.2 - Changed name from "Emvertacon" to "Emveretarcon". [Samuray22] -// - Thanks to Barron-Monster. -//= 2.2b - Changed name from "Pharacon" to "Phracon". [Samuray22] -// - Thanks to Barron-Monster. +//= 1.0 by A bunch of people! +//= Syrus22 - Completely redid the script using functions... also +//= added the option for auto safe refining and multiple refining. +//= 1.1 Negative input bug fixed [Lupus] +//= 1.2 Added additional reparimen in morroc and payon. Added +//= Christopher the blacksmith in Geffen. Edited some dialogue [kobra_k88] +//= 1.3 New Payon Locations [Darkchild] +//= Corrected zeny subtraction thx to jpnmania77.[kobra_k88] +//= 1.3a Temporary corrected an exploit. Need to check sources +//= to fully fix bug [Shinigami] +//= Fixed repairman prices [shadowlady] +//= Fixed bug that skips requirements thanks to sir_loon [massdriller] +//= Fixed itemid error thanks to -Vitamin- [massdriller] +//= 1.4 check again item in refining procedure to avoid +//= hacker that can change item [dafide18] +//= 1.5 Fixed crashing due to badly used callfunc's [Skotlex] +//= Lupus, don't rollback this important fix again! >.< +//= 1.5a Corrected an unneeded callfunc, fixed the anti-bot +//= exploit ruining the safe refine loop. [Skotlex] +//= 1.5b Fixed Spelling mistakes. [Nexon] +//= 1.6 Replaced all breaks for ends as per the new script engine [Skotlex] +//= 1.7 Added Einbroch Refiners (Custom names ^^;) and a duplicated BS Shop. [Poki#3] +//= 1.8 Added Lighthalzen Refiners (Custom names again ^^;) [Poki#3] +//= 1.8a Fixed wrong indication thanks to NeoSaro [Lupus] +//= 1.9 Rewrote repairman, removed the Steel from repair cost [DracoRPG] +//= 2.0 Fixed missed equppment presence check. Thx2 Coltaro [Lupus] +//= 2.0a Added weight checks thanks to Neouni [Playtester] +//= 2.0b Fixed the names of Lighthalzen and Einbroch refiners thanks to Maud_Dib [Kargha] +//= 2.1 Removed Duplicates [Silent] +//= 2.2 Changed name from "Emvertacon" to "Emveretarcon". [Samuray22] +//= Thanks to Barron-Monster. +//= 2.2b Changed name from "Pharacon" to "Phracon". [Samuray22] +//= Thanks to Barron-Monster. //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 2.4 Updated Refiner function. cleaner, and less dated. [L0ne_w0lf] //= 2.5 Rather large update to the refiner and merchants. :D [L0ne_W0lf] @@ -56,15 +54,16 @@ //= 2.8a Small bugfix. (bugreport:2418) [Paradox924X] //= 2.9 Moved Morroc repairman to Morroc Ruins. [L0ne_W0lf] //= 3.0 Updated several NPC names and locations. [Xantara] -// Added WoE map Refiners. +//= Added WoE map Refiners. //= 3.1 Added the new refinement & Ore creation NPC's for +11 and above Refinement. [Masao] //= 3.2 Moved some scripts to Renewal file, other minor changes. [Euphy] //= 3.2a Added 'disable_items' command. [Euphy] +//= 3.3 Some official script updates. [Euphy] //============================================================ // Christopher: Geffen Blacksmith //============================================================ -geffen_in,110,172,0 script Christopher#1 63,{ +geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ mes "[Christopher Guillenrow]"; mes "Welcome to Christopher's Workshop. Ye can get all yer stuff for forging here. What business"; mes "brings ye to me?"; @@ -82,7 +81,7 @@ geffen_in,110,172,0 script Christopher#1 63,{ close; } getitem 986,1; // Anvil - set Zeny,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; @@ -93,7 +92,7 @@ geffen_in,110,172,0 script Christopher#1 63,{ close; } getitem 987,1; // Oridecon_Anvil - set Zeny,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; @@ -104,7 +103,7 @@ geffen_in,110,172,0 script Christopher#1 63,{ close; } getitem 988,1; // Golden_Anvil - set Zeny,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; @@ -157,7 +156,7 @@ geffen_in,110,172,0 script Christopher#1 63,{ close; } getitem 612,.@input; // Portable_Furnace - set Zeny,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; @@ -168,7 +167,7 @@ geffen_in,110,172,0 script Christopher#1 63,{ close; } getitem 613,1; // Iron_Hammer - set Zeny,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; @@ -179,7 +178,7 @@ geffen_in,110,172,0 script Christopher#1 63,{ close; } getitem 614,1; // Golden_Hammer - set Zeny,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; @@ -190,7 +189,7 @@ geffen_in,110,172,0 script Christopher#1 63,{ close; } getitem 615,1; // Oridecon_Hammer - set Zeny,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; @@ -238,7 +237,7 @@ geffen_in,110,172,0 script Christopher#1 63,{ close; } getitem 1010,.@input; // Phracon - set Zeny,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; @@ -276,7 +275,7 @@ geffen_in,110,172,0 script Christopher#1 63,{ close; } getitem 1011,.@input; // Emveretarcon - set Zeny,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; @@ -330,13 +329,13 @@ geffen_in,110,172,0 script Christopher#1 63,{ // Paul Spanner: Einbroch Blacksmith Supplier //============================================================ -ein_in01,38,29,0 script Paul Spanner 63,{ +ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ if (checkweight(1201,1) == 0) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; mes "- too many items with you. -"; mes "- Please try again -"; - mes "- after you loose some weight. -"; + mes "- after you lose some weight. -"; close; } mes "[Paul Spanner]"; @@ -352,37 +351,37 @@ ein_in01,38,29,0 script Paul Spanner 63,{ next; switch(select("Anvil - 30,000z.:Oridecon Anvil - 120,000z.:Golden Anvil - 300,000z.:I need a better anvil.:Cancel.")) { case 1: - if (zeny < 30000) { + if (Zeny < 30000) { mes "[Paul Spanner]"; mes "With that much of money, you cannot even buy a toy anvil!"; close; } getitem 986,1; //Anvil - set zeny,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."; close; case 2: - if (zeny < 120000) { + if (Zeny < 120000) { mes "[Paul Spanner]"; mes "With that much of money, you cannot even buy a toy anvil!"; close; } getitem 987,1; //Oridecon_Anvil - set zeny,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."; close; case 3: - if (zeny < 300000) { + if (Zeny < 300000) { mes "[Paul Spanner]"; mes "With that much of money, you cannot even buy a toy anvil!"; close; } getitem 988,1; //Golden_Anvil - set zeny,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."; @@ -451,7 +450,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{ } } set .@sell,.@input * .@item_cost; - if (zeny < .@sell) { + if (Zeny < .@sell) { mes "[Paul Spanner]"; mes "You don't have enough money. Sorry, I cannot sell them at a loss."; close; @@ -461,7 +460,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{ mes "Hey, you look pale. Why don't you go lighten your weight first."; close; } - set zeny,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."; @@ -505,7 +504,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{ } } set .@sell,.@input * .@item_price; - if (zeny < .@sell) { + if (Zeny < .@sell) { mes "[Paul Spanner]"; mes "You don't have enough money. Sorry, I cannot sell them at a loss."; close; @@ -516,7 +515,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{ close; } getitem .@item,.@input; - set zeny,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; @@ -566,31 +565,31 @@ ein_in01,38,29,0 script Paul Spanner 63,{ // Weapon/Armor Refiners //============================================================ -prt_in,63,60,0 script Hollgrehenn 85,{ +prt_in,63,60,0 script Hollgrehenn 4_M_03,{ callfunc "refinemain","Hollgrehenn",0; end; } -morocc_in,73,38,6 script Aragham 99,{ +morocc_in,73,38,6 script Aragham 4W_M_03,{ callfunc "refinemain","Aragham",0; end; } -payon,144,173,5 script Antonio 88,{ +payon,144,173,5 script Antonio 4_M_ORIENT01,{ callfunc "refinemain","Antonio",0; end; } -alberta_in,28,58,0 script Fredrik 85,{ +alberta_in,28,58,0 script Fredrik 4_M_03,{ callfunc "refinemain","Fredrik",0; end; } -yuno_in01,171,21,4 script Lambert 88,{ +yuno_in01,171,21,4 script Lambert 4_M_ORIENT01,{ callfunc "refinemain","Lambert",0; end; } -ein_in01,24,87,5 script Manthasman 826,{ +ein_in01,24,87,5 script Manthasman 4_M_DWARF,{ callfunc "refinemain","Manthasman Pruhag",0; end; } -lhz_in02,282,20,7 script Fulerr 869,{ +lhz_in02,282,20,7 script Fulerr 4_M_LGTMAN,{ callfunc "refinemain","Fulerr",0; end; } @@ -615,12 +614,20 @@ function script refinemain { setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3"; set .@menu$,""; for(set .@i,1; .@i<=10; set .@i,.@i+1) { - if(getequipisequiped(.@i)) + if(getequipisequiped(.@i)) { set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]"; + set .@equipped,1; + } set .@menu$, .@menu$ + ":"; } - set .@part,select(.@menu$); - if(!getequipisequiped(.@part)) { + if (.@equipped == 0) { + mes "[" + getarg(0) + "]"; + mes "I don't think I can refine any items you have..."; + close; + } + set .@part, select(.@menu$); + + if(!getequipisequiped(.@part)) { //custom check mes "[" + getarg(0) + "]"; mes "You're not wearing"; mes "anything there that"; @@ -728,8 +735,10 @@ function script refinemain { mes "here all day if you need me."; close; } - set Zeny,Zeny-.@price; + set Zeny, Zeny-.@price; delitem .@material,1; + + //custom checks if(getequipisequiped(.@part) == 0) { // hacker has removed the item (not changed, why?) mes "[" + getarg(0) + "]"; mes "Look here... you don't have any Items on..."; @@ -743,6 +752,7 @@ function script refinemain { mes "You switched the item while I wasn't looking! Get out of here!"; close; } + if(getequippercentrefinery(.@part) <= rand(100)) { failedrefitem .@part; mes "[" + getarg(0) + "]"; @@ -846,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; } - set Zeny,Zeny - .@fullprice; + set Zeny, Zeny - .@fullprice; delitem .@material,.@refinecnt; while(.@refinecnt){ if (getequipisequiped(.@part) == 0) { @@ -872,7 +882,7 @@ function script refinemain { mes "Here's the unused Zeny and materials back..."; getitem .@material,.@refinecnt; set .@fullprice,.@refinecnt * .@price; - set Zeny,Zeny + .@fullprice; + set Zeny, Zeny + .@fullprice; close; } successrefitem .@part; @@ -887,31 +897,31 @@ function script refinemain { // Material Salesmen //============================================================ -prt_in,56,68,5 script Vurewell 86,{ +prt_in,56,68,5 script Vurewell 4_M_04,{ callfunc "phramain","Vurewell"; end; } -payon,145,178,3 script Begnahd 88,{ +payon,145,178,3 script Begnahd 4_M_ORIENT01,{ callfunc "phramain","Begnahd"; end; } -morocc_in,63,32,6 script Sade 99,{ +morocc_in,63,32,6 script Sade 4W_M_03,{ callfunc "phramain","Sade"; end; } -alberta_in,13,71,3 script Kahlamanlith 86,{ +alberta_in,13,71,3 script Kahlamanlith 4_M_04,{ callfunc "phramain","Kahlamanlith"; end; } -yuno_in01,171,27,4 script Dilemma 88,{ +yuno_in01,171,27,4 script Dilemma 4_M_ORIENT01,{ callfunc "phramain","Dilemma"; end; } -ein_in01,15,87,3 script Tirehaus 86,{ +ein_in01,15,87,3 script Tirehaus 4_M_04,{ callfunc "phramain","Tirehaus"; end; } -lhz_in02,278,24,3 script Krugg 86,{ +lhz_in02,278,24,3 script Krugg 4_M_04,{ callfunc "phramain","Krugg"; end; } @@ -924,7 +934,7 @@ function script phramain { mes "- Currently you're carrying -"; mes "- too many items with you. -"; mes "- Please try again -"; - mes "- after you loose some weight. -"; + mes "- after you lose some weight. -"; close; } mes "[" + getarg(0) + "]"; @@ -990,7 +1000,7 @@ function script phramain { close; } getitem .@material,.@input; - set Zeny,Zeny-.@sell; + set Zeny, Zeny-.@sell; mes "[" + getarg(0) + "]"; mes "Here you are!"; mes "Thank you for"; @@ -1000,31 +1010,31 @@ function script phramain { // Ori/Elu Refiners //============================================================ -prt_in,63,69,3 script Dietrich 84,{ +prt_in,63,69,3 script Dietrich 4_M_02,{ callfunc "orimain","Dietrich"; end; } -payon,137,178,5 script Hakhim 88,{ +payon,137,178,5 script Hakhim 4_M_ORIENT01,{ callfunc "orimain","Hakhim"; end; } -morocc_in,72,32,6 script Abdula 99,{ +morocc_in,72,32,6 script Abdula 4W_M_03,{ callfunc "orimain","Abdula"; end; } -alberta_in,21,63,5 script Xenophon 84,{ +alberta_in,21,63,5 script Xenophon 4_M_02,{ callfunc "orimain","Xenophon Zolotas"; end; } -yuno_in01,164,27,4 script Delight 88,{ +yuno_in01,164,27,4 script Delight 4_M_ORIENT01,{ callfunc "orimain","Delight"; end; } -ein_in01,18,82,6 script Matestein 84,{ +ein_in01,18,82,6 script Matestein 4_M_02,{ callfunc "orimain","Matestein"; end; } -lhz_in02,281,24,5 script Fruel 84,{ +lhz_in02,281,24,5 script Fruel 4_M_02,{ callfunc "orimain","Fruel"; end; } @@ -1037,7 +1047,7 @@ function script orimain { mes "- Currently you're carrying -"; mes "- too many items with you. -"; mes "- Please try again -"; - mes "- after you loose some weight. -"; + mes "- after you lose some weight. -"; close; } mes "[" + getarg(0) + "]"; @@ -1100,72 +1110,72 @@ function script orimain { // Equipment Repairmen //============================================================ -alberta_in,31,65,4 script Repairman#alb 86,{ +alberta_in,31,65,4 script Repairman#alb 4_M_04,{ callfunc "repairmain","Repairman"; end; } -moc_ruins,107,94,4 script Repairman#moc 99,{ +moc_ruins,107,94,4 script Repairman#moc 4W_M_03,{ callfunc "repairmain","Repairman"; end; } -payon,143,165,4 script Repairman#pay 88,{ +payon,143,165,4 script Repairman#pay 4_M_ORIENT01,{ callfunc "repairmain","Repairman"; end; } -prt_in,63,54,2 script Repairman#prt 86,{ +prt_in,63,54,2 script Repairman#prt 4_M_04,{ callfunc "repairmain","Grendal"; end; } -yuno_in01,175,28,3 script Repairman#juno 86,{ +yuno_in01,175,28,3 script Repairman#juno 4_M_04,{ callfunc "repairmain","Repairman"; end; } -geffen_in,34,166,3 script Repairman#gef 99,{ +geffen_in,34,166,3 script Repairman#gef 4W_M_03,{ callfunc "repairmain","Repairman"; end; } -aldeba_in,38,60,3 script Repairman#alde 86,{ +aldeba_in,38,60,3 script Repairman#alde 4_M_04,{ callfunc "repairmain","Repairman"; end; } -lhz_in02,284,14,3 script Repairman#lhz 86,{ +lhz_in02,284,14,3 script Repairman#lhz 4_M_04,{ callfunc "repairmain","Repairman"; end; } -prt_gld,139,117,4 script Repairman#prt_gld 86,{ +prt_gld,139,117,4 script Repairman#prt_gld 4_M_04,{ callfunc "repairmain","Repairman"; end; } -gef_fild13,263,117,4 script Repairman#gef_fild 86,{ +gef_fild13,263,117,4 script Repairman#gef_fild 4_M_04,{ callfunc "repairmain","Repairman"; end; } -pay_gld,295,183,4 script Repairman#pay_gld 86,{ +pay_gld,295,183,4 script Repairman#pay_gld 4_M_04,{ callfunc "repairmain","Repairman"; end; } -alde_gld,220,152,4 script Repairman#alde_gld 86,{ +alde_gld,220,152,4 script Repairman#alde_gld 4_M_04,{ callfunc "repairmain","Repairman"; end; } -aru_gld,189,336,4 script Repairman#aru_gld 86,{ +aru_gld,189,336,4 script Repairman#aru_gld 4_M_04,{ callfunc "repairmain","Repairman"; end; } -sch_gld,340,80,7 script Repairman#sch_gld 86,{ +sch_gld,340,80,7 script Repairman#sch_gld 4_M_04,{ callfunc "repairmain","Repairman"; end; } @@ -1228,7 +1238,7 @@ function script repairmain { } set .@checkitem2,.@checkitem2-1; if (.@checkitem == .@checkitem2) { - set zeny,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 8f9410eda..dc4d67235 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -1,12 +1,12 @@ //===== Hercules Script ====================================== //= Renters -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88, mod by Lupus -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.2 -//===== Description: ========================================= +//===== Description: ========================================= //= Knight and Crusader Peco Peco Breeders, Falcon Breeder scripts -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= Fully working //= Added another Falcon Master into the Hunters Guild [Lupus] //= 1.2: replaced checkoption(x) with checkriding,checkfalcon [Lupus] @@ -22,10 +22,10 @@ //= 2.0 Fixed problems with third classes and new mounts. [Euphy] //= 2.1 Moved some renters to a separate renewal file. [Daegaladh] //= 2.2 Added warg checks. [Euphy] -//============================================================ +//============================================================ // PecoPeco Breeder (for Knights)------------------------------------------- -prontera,55,350,5 script Peco Peco Breeder#knt 105,{ +prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ if(Upper==0) set .@price,2500; //Normal Peco - default price if(Upper==1) set .@price,2500; //Armored Peco if(Upper==2) set .@price,2500; //Baby Peco @@ -40,7 +40,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 105,{ next; switch(select("Rent Peco Peco:Cancel")) { case 1: - if (zeny < .@price) { + if (Zeny < .@price) { mes "[Peco Peco Breeder]"; mes "You do not"; mes "have enough zeny."; @@ -68,7 +68,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 105,{ mes "Please remove your cash mount."; close; } - set zeny,zeny-.@price; + set Zeny, Zeny-.@price; setriding; close; case 2: @@ -88,7 +88,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 105,{ } // Grand PecoPeco Breeder (for Crusaders)------------------------------------------- -prontera,232,318,3 script Peco Peco Breeder#cru 105,{ +prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ if(Upper==0) set .@price,3500; //Normal Peco - default price if(Upper==1) set .@price,3500; //Armored Peco if(Upper==2) set .@price,3500; //Baby Peco @@ -104,7 +104,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 105,{ next; switch(select("Rent a PecoPeco:Quit")) { case 1: - if (zeny < .@price) { + if (Zeny < .@price) { mes "[Peco Peco Breeder]"; mes "You do not"; mes "have enough zeny."; @@ -131,7 +131,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 105,{ mes "Please remove your cash mount."; close; } - set zeny,zeny-.@price; + set Zeny, Zeny-.@price; setriding; close; case 2: @@ -150,7 +150,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 105,{ } // Falcon Master-------------------------------------------------------------- -hu_in01,381,304,5 script Falcon Breeder#hnt 105,{ +hu_in01,381,304,5 script Falcon Breeder#hnt 8W_SOLDIER,{ if(Upper==0) set .@price,2500; //Normal Falcon - default price if(Upper==1) set .@price,2500; //Scarf Falcon if(Upper==2) set .@price,2500; //Baby Falcon @@ -177,7 +177,7 @@ hu_in01,381,304,5 script Falcon Breeder#hnt 105,{ mes "until you dismiss your warg first!"; close; } - if (zeny < .@price) { + if (Zeny < .@price) { mes "[Falcon Breeder]"; mes "What is this?"; mes "You don't have"; @@ -205,7 +205,7 @@ hu_in01,381,304,5 script Falcon Breeder#hnt 105,{ mes "there, can't you see it?"; close; } - set zeny,zeny-.@price; + set Zeny, Zeny-.@price; setfalcon; close; case 2: @@ -224,4 +224,4 @@ hu_in01,381,304,5 script Falcon Breeder#hnt 105,{ mes "...Heh heh, jealous?"; close; } -} +}
\ No newline at end of file diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index b9c47b659..b20874ffb 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -1,18 +1,18 @@ //===== Hercules Script ====================================== //= Shops -//===== By: ================================================== +//===== By: ================================================== //= rAthena Dev Team -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 3.4 -//===== Description: ========================================= +//===== Description: ========================================= //= Town shop NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= For earlier update notes see the bottom. //= 2.0 updated several shop npcs. [L0ne_W0lf] -//= Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers. -//= Moved all Cooking related NPCs to their own section. -//= Re-alphabetized sections. Some of them were out of place. -//= Removed commented out shops. +//= Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers. +//= Moved all Cooking related NPCs to their own section. +//= Re-alphabetized sections. Some of them were out of place. +//= Removed commented out shops. //= 2.0b Einbech tool dealer got lost somewhere along the way, re-added. [L0ne_W0lf] //= 2.1 Fixed missing item from "Fresh Fish" from cooking addition shops. [L0ne_W0lf] //= 2.1a Fixed the second "Line" selling in Comodo Weapon shop. (Should have been Whip) [L0ne_W0lf] @@ -35,299 +35,299 @@ //= 3.1 Moved some merchants to a separate renewal file. [Kenpachi] //= 3.2 Added Missing Items to the pet Groomers in prontera, payon, and yuno. BugReport:6680[Spre] //= 3.3 Moved more shops to Renewal file. [Euphy] -//= 3.4 Removed some Izlude shops [Streusel] -//============================================================ +//= 3.4 Moved Izlude shops to pre-re/re paths. [Streusel] +//============================================================ //======================================================= // Alberta //======================================================= -alb2trea,87,65,5 shop Tool Dealer#alb 83,1750:-1,1751:-1,1752:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1 -alberta_in,165,96,0 shop Item Collector#alb 74,911:-1,528:-1 -alberta_in,182,97,0 shop Tool Dealer#alb2 73,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2243:-1 -alberta_in,180,15,0 shop Armor Dealer#alb 101,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2203:-1,2201:-1,2205:-1,2226:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1 -alberta_in,188,21,0 shop Weapon Dealer#alb 49,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1 -alberta_in,175,97,4 shop Weapon Dealer#alb2 82,1146:-1,1245:-1 -alberta_in,176,81,3 shop Trading Merchant#alb 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 +alb2trea,87,65,5 shop Tool Dealer#alb 4_M_01,1750:-1,1751:-1,1752:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1 +alberta_in,165,96,0 shop Item Collector#alb 1_F_MERCHANT_02,911:-1,528:-1 +alberta_in,182,97,0 shop Tool Dealer#alb2 1_F_MERCHANT_01,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2243:-1 +alberta_in,180,15,0 shop Armor Dealer#alb 4W_F_01,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2203:-1,2201:-1,2205:-1,2226:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1 +alberta_in,188,21,0 shop Weapon Dealer#alb 1_M_03,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1 +alberta_in,175,97,4 shop Weapon Dealer#alb2 4_KID01,1146:-1,1245:-1 +alberta_in,176,81,3 shop Trading Merchant#alb 4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 //======================================================= // Al De Baran //======================================================= -aldeba_in,20,60,0 shop Armor Dealer#alde 101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1,2628:-1,2627:-1 -aldeba_in,28,54,0 shop Weapon Dealer#alde 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1 -aldeba_in,22,47,4 shop Weapon Dealer#alde2 713,1146:-1,1245:-1 -aldeba_in,94,56,5 shop Tool Dealer#alde 83,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1 -alde_alche,38,184,3 shop Material Seller#alche 755,7143:-1,7141:-1,7140:-1,6248:-1,6250:-1,6251:-1,6255:-1,6261:-1,6262:-1,6297:-1 +aldeba_in,20,60,0 shop Armor Dealer#alde 4W_F_01,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1,2628:-1,2627:-1 +aldeba_in,28,54,0 shop Weapon Dealer#alde 1_M_03,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1 +aldeba_in,22,47,4 shop Weapon Dealer#alde2 4_M_06,1146:-1,1245:-1 +aldeba_in,94,56,5 shop Tool Dealer#alde 4_M_01,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1 +alde_alche,38,184,3 shop Material Seller#alche 4_M_SAGE_C,7143:-1,7141:-1,7140:-1,6248:-1,6250:-1,6251:-1,6255:-1,6261:-1,6262:-1,6297:-1 //======================================================= // Amatsu //======================================================= -ama_in01,89,28,5 shop Armor Dealer#ama 757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 -ama_in01,102,28,3 shop Weapon Dealer#ama 766,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 -ama_in01,24,30,5 shop Tool Dealer#ama 763,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +ama_in01,89,28,5 shop Armor Dealer#ama 4_F_JPN2,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 +ama_in01,102,28,3 shop Weapon Dealer#ama 4_M_JPNOJI,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 +ama_in01,24,30,5 shop Tool Dealer#ama 4_M_JPN,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 // Ninja Shops -que_ng,72,31,2 shop Boonji#nin 83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1 -que_ng,73,26,5 shop Boonray#nin 83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1 +que_ng,72,31,2 shop Boonji#nin 4_M_01,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1 +que_ng,73,26,5 shop Boonray#nin 4_M_01,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1 //======================================================= // Ayothaya //======================================================= -ayo_in01,18,182,1 shop Tool Dealer#ayo 840,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -ayo_in01,90,192,3 shop Weapon Dealer#ayo 843,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 -ayo_in01,90,160,1 shop Armor Dealer#ayo 842,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 +ayo_in01,18,182,1 shop Tool Dealer#ayo 4_F_THAISHAMAN,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +ayo_in01,90,192,3 shop Weapon Dealer#ayo 4_M_THAIONGBAK,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 +ayo_in01,90,160,1 shop Armor Dealer#ayo 4_M_THAIOLD,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 //======================================================= // Brasilis //======================================================= -brasilis,252,257,3 shop Tool Dealer#bra 478,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1 -brasilis,244,243,3 shop Weapon Dealer#bra 477,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1 -brasilis,201,309,3 shop Pet Groomer#bra 476,537:-1,643:-1 -brasilis,221,128,3 shop Fruit Gardener#bra 477,11515:-1,513:-1,11516:-1 +brasilis,252,257,3 shop Tool Dealer#bra 4_F_BRZ_WOMAN,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1 +brasilis,244,243,3 shop Weapon Dealer#bra 4_M_BRZ_MAN2,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1 +brasilis,201,309,3 shop Pet Groomer#bra 4_M_BRZ_MAN1,537:-1,643:-1 +brasilis,221,128,3 shop Fruit Gardener#bra 4_M_BRZ_MAN2,11515:-1,513:-1,11516:-1 //======================================================= // Comodo //======================================================= -cmd_in01,117,165,4 shop Armor Dealer#cmd 101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1 -cmd_in01,128,165,2 shop Weapon Dealer#cmd 49,1901:-1,1903:-1,1905:-1,1909:-1,1911:-1,1907:-1,1950:-1,1952:-1,1954:-1,1958:-1,1960:-1,1956:-1 -cmd_in01,79,182,5 shop Tool Dealer#cmd 83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,657:-1,601:-1,602:-1,611:-1,1065:-1 -comodo,296,125,4 shop Souvenir Vendor#cmd 101,965:-1,964:-1 -cmd_fild07,257,126,5 shop Tool Dealer#cmd2 83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1 -cmd_fild07,250,98,2 shop Weapon Dealer#cmd2 49,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 -cmd_fild07,277,85,4 shop Armor Dealer#cmd2 101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1 +cmd_in01,117,165,4 shop Armor Dealer#cmd 4W_F_01,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1 +cmd_in01,128,165,2 shop Weapon Dealer#cmd 1_M_03,1901:-1,1903:-1,1905:-1,1909:-1,1911:-1,1907:-1,1950:-1,1952:-1,1954:-1,1958:-1,1960:-1,1956:-1 +cmd_in01,79,182,5 shop Tool Dealer#cmd 4_M_01,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,657:-1,601:-1,602:-1,611:-1,1065:-1 +comodo,296,125,4 shop Souvenir Vendor#cmd 4W_F_01,965:-1,964:-1 +cmd_fild07,257,126,5 shop Tool Dealer#cmd2 4_M_01,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1 +cmd_fild07,250,98,2 shop Weapon Dealer#cmd2 1_M_03,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 +cmd_fild07,277,85,4 shop Armor Dealer#cmd2 4W_F_01,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1 //======================================================= // Einbroch //======================================================= -ein_in01,106,27,4 shop One Hand Weapon Dealer 850,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1119:-1,1122:-1,1123:-1,1126:-1,1129:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1301:-1,1401:-1,1404:-1,1407:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1516:-1,1519:-1,1522:-1,1801:-1,1803:-1,1805:-1,1807:-1,1809:-1,1811:-1 -ein_in01,109,27,4 shop Two Hand Weapon Dealer 850,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1351:-1,1354:-1,1357:-1,1360:-1,1410:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1250:-1,1252:-1,1254:-1 -ein_in01,119,26,4 shop Weapon Dealer#ein 855,1247:-1,1248:-1,1249:-1,13000:-1 -ein_in01,189,15,1 shop Tool Dealer#ein 850,1750:-1,1752:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -einbroch,138,66,4 shop Flu Mask Dealer#ein 850,5114:-1,2218:-1 -einbroch,82,199,4 shop Paddler#ein 855,512:-1,645:-1,1750:-1,501:-1 +ein_in01,106,27,4 shop One Hand Weapon Dealer 4_F_EINWOMAN,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1119:-1,1122:-1,1123:-1,1126:-1,1129:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1301:-1,1401:-1,1404:-1,1407:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1516:-1,1519:-1,1522:-1,1801:-1,1803:-1,1805:-1,1807:-1,1809:-1,1811:-1 +ein_in01,109,27,4 shop Two Hand Weapon Dealer 4_F_EINWOMAN,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1351:-1,1354:-1,1357:-1,1360:-1,1410:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1250:-1,1252:-1,1254:-1 +ein_in01,119,26,4 shop Weapon Dealer#ein 4_M_EINMAN,1247:-1,1248:-1,1249:-1,13000:-1 +ein_in01,189,15,1 shop Tool Dealer#ein 4_F_EINWOMAN,1750:-1,1752:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +einbroch,138,66,4 shop Flu Mask Dealer#ein 4_F_EINWOMAN,5114:-1,2218:-1 +einbroch,82,199,4 shop Paddler#ein 4_M_EINMAN,512:-1,645:-1,1750:-1,501:-1 //Official Gunslingers shops. -que_ng,179,91,3 shop Chivas Lugal 900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 -que_ng,180,79,3 shop Johnny Waiker 900,13200:-1,13201:-1,13202:-1 +que_ng,179,91,3 shop Chivas Lugal 4_M_HUMERCHANT,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 +que_ng,180,79,3 shop Johnny Waiker 4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1 //======================================================= // Geffen //======================================================= -geffen_in,26,178,4 shop Armor Dealer#gef 66,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 -geffen_in,30,178,4 shop Weapon Dealer#gef2 47,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 -geffen_in,22,171,7 shop Weapon Dealer#gef 84,1146:-1,1245:-1 -geffen_in,74,144,0 shop Trader#gef 66,911:-1,910:-1,912:-1 -geffen_in,77,167,0 shop Tool Dealer#gef 68,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2241:-1 -geffen_in,77,173,0 shop Magical Item Seller#gef 64,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 -geffen_in,171,123,4 shop Tool Dealer#gef2 64,1092:-1,1093:-1 -geffen,193,152,4 shop Pet Groomer#gef 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 +geffen_in,26,178,4 shop Armor Dealer#gef 1_F_01,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 +geffen_in,30,178,4 shop Weapon Dealer#gef2 1_M_01,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 +geffen_in,22,171,7 shop Weapon Dealer#gef 4_M_02,1146:-1,1245:-1 +geffen_in,74,144,0 shop Trader#gef 1_F_01,911:-1,910:-1,912:-1 +geffen_in,77,167,0 shop Tool Dealer#gef 1_F_03,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2241:-1 +geffen_in,77,173,0 shop Magical Item Seller#gef 1_M_WIZARD,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 +geffen_in,171,123,4 shop Tool Dealer#gef2 1_M_WIZARD,1092:-1,1093:-1 +geffen,193,152,4 shop Pet Groomer#gef 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 //======================================================= // Gonryun //======================================================= -gonryun,147,84,5 shop Tool Dealer#gon 777,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -gonryun,174,101,3 shop Weapon Dealer#gon 774,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 -gonryun,173,84,3 shop Armor Dealer#gon 770,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 +gonryun,147,84,5 shop Tool Dealer#gon 4_M_TWOLDMAN,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +gonryun,174,101,3 shop Weapon Dealer#gon 4_M_TWBOY,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 +gonryun,173,84,3 shop Armor Dealer#gon 4_F_TWGIRL,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 //======================================================= // Hugel //======================================================= -hugel,105,169,5 shop Vendor from Milk Ranch#h 90,519:-1 -hugel,77,167,3 shop Vegetable Gardener#hu 892,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1 -hu_in01,241,368,2 shop Tool Dealer#hu 53,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -hu_in01,252,368,3 shop Tool Dealer#hu2 90,717:-1,2201:-1,910:-1,528:-1 -hu_in01,100,390,3 shop Bow Dealer#hu 86,1701:-1,1707:-1,1718:-1,1714:-1 -hu_in01,94,390,3 shop Weapon Dealer#hu 898,1116:-1,1154:-1,1354:-1,1201:-1 -hu_in01,94,313,3 shop Armor Dealer#hu 86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1,2401:-1,2501:-1,2307:-1,2105:-1 +hugel,105,169,5 shop Vendor from Milk Ranch#h 4_F_01,519:-1 +hugel,77,167,3 shop Vegetable Gardener#hu 4_F_HUGRANMA,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1 +hu_in01,241,368,2 shop Tool Dealer#hu 1_M_INNKEEPER,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +hu_in01,252,368,3 shop Tool Dealer#hu2 4_F_01,717:-1,2201:-1,910:-1,528:-1 +hu_in01,100,390,3 shop Bow Dealer#hu 4_M_04,1701:-1,1707:-1,1718:-1,1714:-1 +hu_in01,94,390,3 shop Weapon Dealer#hu 4_M_HUMAN_01,1116:-1,1154:-1,1354:-1,1201:-1 +hu_in01,94,313,3 shop Armor Dealer#hu 4_M_04,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1,2401:-1,2501:-1,2307:-1,2105:-1 //======================================================= // Izlude //======================================================= -izlude_in,60,127,4 shop Weapon Dealer#iz 72,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1 -izlude_in,70,127,4 shop Armor Dealer#iz 62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1 +izlude_in,60,127,4 shop Weapon Dealer#iz 1_F_MARIA,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1 +izlude_in,70,127,4 shop Armor Dealer#iz 1_M_SIZ,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1 //======================================================= // Jawaii //======================================================= -jawaii,186,174,3 shop Ice Cream Guy#ja 85,536:-1,536:-1,536:-1,536:-1,536:-1,536:-1,536:-1 +jawaii,186,174,3 shop Ice Cream Guy#ja 4_M_03,536:-1,536:-1,536:-1,536:-1,536:-1,536:-1,536:-1 //======================================================= // Juno //======================================================= -yuno,218,97,5 shop Tool Dealer#yuno 84,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1 -yuno,226,107,5 shop Tool Dealer#yuno1 83,911:-1,910:-1,912:-1 -yuno,197,114,4 shop Pet Groomer#yuno 124,537:-1,643:-1,10013:-1,10014:-1,6115:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1 -yuno,205,103,4 shop Mr. King's Shop#yuno 125,2340:-1,2341:-1,2411:-1,2222:-1,2230:-1,1721:-1 -yuno,163,187,5 shop Magical Item Seller#yuno 90,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 -yuno_in01,25,34,5 shop Tool Dealer#yuno2 83,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1 -yuno_in01,103,35,2 shop Weapon Dealer#yuno 49,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 -yuno_in01,112,26,4 shop Armor Dealer#yuno 101,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 -yuno_in03,176,22,3 shop Scroll Merchant#yuno03 89,7433:-1 //Temp shop in Yuno that sells Blank Scrolls +yuno,218,97,5 shop Tool Dealer#yuno 4_M_02,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1 +yuno,226,107,5 shop Tool Dealer#yuno1 4_M_01,911:-1,910:-1,912:-1 +yuno,197,114,4 shop Pet Groomer#yuno 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,6115:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1 +yuno,205,103,4 shop Mr. King's Shop#yuno 4_M_TELEPORTER,2340:-1,2341:-1,2411:-1,2222:-1,2230:-1,1721:-1 +yuno,163,187,5 shop Magical Item Seller#yuno 4_F_01,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 +yuno_in01,25,34,5 shop Tool Dealer#yuno2 4_M_01,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1 +yuno_in01,103,35,2 shop Weapon Dealer#yuno 1_M_03,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 +yuno_in01,112,26,4 shop Armor Dealer#yuno 4W_F_01,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 +yuno_in03,176,22,3 shop Scroll Merchant#yuno03 4_M_ORIENT02,7433:-1 //Temp shop in Yuno that sells Blank Scrolls //======================================================= // Lighthalzen //======================================================= -lighthalzen,69,75,5 shop Fruit Gardener#lhz 102,512:-1,513:-1 -lighthalzen,112,44,0 shop Flower Girl#lhz 90,712:-1,744:-1,748:-1 -lighthalzen,124,129,0 shop Vegetable Gardener#lhz 91,515:-1,516:-1,535:-1 -lighthalzen,220,122,3 shop Vendor from Milk Ranch#l 90,519:-1 -lighthalzen,222,191,4 shop Pet Groomer#lhz 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 -lhz_in02,286,95,4 shop Beginner's Merchant#lhz 62,5112:-1,2416:-1,2113:-1,2512:-1 -lhz_in02,271,99,5 shop Armor Dealer#lhz 851,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 -lhz_in02,276,99,4 shop Weapon Dealer#lhz 851,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1 -lhz_in02,273,35,4 shop Wand Dealer#lhz 854,1601:-1,1604:-1,1607:-1,1617:-1,1619:-1 -lhz_in02,105,21,3 shop Jeweler#lhz 91,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1 -lhz_in02,17,220,5 shop Vegetable Gardener#lhz2 91,515:-1,516:-1,535:-1 -lhz_in02,21,220,5 shop Fruit Gardener#lhz2 102,512:-1,513:-1 -lhz_in02,32,219,5 shop Butcher#lhz 54,517:-1 -lhz_in02,38,145,5 shop Gift Merchant#lhz 91,734:-1,735:-1,736:-1,737:-1,746:-1 -lhz_in02,47,148,3 shop Wedding Shop Dealer#lhz 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1 -lhz_in02,31,145,4 shop Tool Dealer#lhz 90,611:-1,503:-1,504:-1,506:-1,657:-1,656:-1,601:-1,602:-1,1065:-1,610:-1,1770:-1 -lhz_in02,85,216,5 shop Doll Supplier#lhz 862,740:-1,741:-1,742:-1 -lhz_in02,87,208,3 shop Toy Supplier#lhz 715,2243:-1,2212:-1,2242:-1,2241:-1 -lhz_in03,239,106,5 shop Tool Dealer#lhz2 850,501:-1,502:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,611:-1 -lhz_in03,258,101,3 shop Arrow Merchant#lhz 855,1750:-1,1770:-1,1752:-1,1751:-1 -lhz_in03,249,24,4 shop Merchant#lhz 855,911:-1,910:-1,912:-1,528:-1 +lighthalzen,69,75,5 shop Fruit Gardener#lhz 8_F,512:-1,513:-1 +lighthalzen,112,44,0 shop Flower Girl#lhz 4_F_01,712:-1,744:-1,748:-1 +lighthalzen,124,129,0 shop Vegetable Gardener#lhz 4_F_02,515:-1,516:-1,535:-1 +lighthalzen,220,122,3 shop Vendor from Milk Ranch#l 4_F_01,519:-1 +lighthalzen,222,191,4 shop Pet Groomer#lhz 4_M_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 +lhz_in02,286,95,4 shop Beginner's Merchant#lhz 1_M_SIZ,5112:-1,2416:-1,2113:-1,2512:-1 +lhz_in02,271,99,5 shop Armor Dealer#lhz 4_M_REPAIR,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 +lhz_in02,276,99,4 shop Weapon Dealer#lhz 4_M_REPAIR,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1 +lhz_in02,273,35,4 shop Wand Dealer#lhz 4_M_EINMAN2,1601:-1,1604:-1,1607:-1,1617:-1,1619:-1 +lhz_in02,105,21,3 shop Jeweler#lhz 4_F_02,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1 +lhz_in02,17,220,5 shop Vegetable Gardener#lhz2 4_F_02,515:-1,516:-1,535:-1 +lhz_in02,21,220,5 shop Fruit Gardener#lhz2 8_F,512:-1,513:-1 +lhz_in02,32,219,5 shop Butcher#lhz 1_M_JOBGUIDER,517:-1 +lhz_in02,38,145,5 shop Gift Merchant#lhz 4_F_02,734:-1,735:-1,736:-1,737:-1,746:-1 +lhz_in02,47,148,3 shop Wedding Shop Dealer#lhz 1_F_LIBRARYGIRL,744:-1,745:-1,2338:-1,2206:-1,7170:-1 +lhz_in02,31,145,4 shop Tool Dealer#lhz 4_F_01,611:-1,503:-1,504:-1,506:-1,657:-1,656:-1,601:-1,602:-1,1065:-1,610:-1,1770:-1 +lhz_in02,85,216,5 shop Doll Supplier#lhz 4_F_LGTGIRL,740:-1,741:-1,742:-1 +lhz_in02,87,208,3 shop Toy Supplier#lhz 4_M_PIERROT,2243:-1,2212:-1,2242:-1,2241:-1 +lhz_in03,239,106,5 shop Tool Dealer#lhz2 4_F_EINWOMAN,501:-1,502:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,611:-1 +lhz_in03,258,101,3 shop Arrow Merchant#lhz 4_M_EINMAN,1750:-1,1770:-1,1752:-1,1751:-1 +lhz_in03,249,24,4 shop Merchant#lhz 4_M_EINMAN,911:-1,910:-1,912:-1,528:-1 //======================================================= // Louyang //======================================================= -lou_in02,121,182,5 shop Armor Dealer#lou 818,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 -lou_in02,130,182,5 shop Weapon Dealer#lou 822,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 -lou_in02,239,176,5 shop Tool Dealer#lou 818,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +lou_in02,121,182,5 shop Armor Dealer#lou 4_F_CHNWOMAN,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 +lou_in02,130,182,5 shop Weapon Dealer#lou 4_M_CHNMAN,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 +lou_in02,239,176,5 shop Tool Dealer#lou 4_F_CHNWOMAN,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 //======================================================= // Lutie //======================================================= -xmas_in,40,38,5 shop Tool Dealer#xmas 83,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1 -xmas_in,168,104,4 shop Armor Dealer#xmas 101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1 -xmas_in,169,34,2 shop Gift Seller#xmas 702,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1 -xmas_in,174,98,2 shop Weapon Dealer#xmas 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1 +xmas_in,40,38,5 shop Tool Dealer#xmas 4_M_01,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1 +xmas_in,168,104,4 shop Armor Dealer#xmas 4W_F_01,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1 +xmas_in,169,34,2 shop Gift Seller#xmas 4_F_GON,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1 +xmas_in,174,98,2 shop Weapon Dealer#xmas 1_M_03,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1 //======================================================= // Morroc - Post Ep. 12.1 //======================================================= -in_moc_16,22,20,7 shop Sepulchral Merchant#moc 880,1771:-1 -moc_ruins,91,128,4 shop Tool Dealer#moc1 93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -moc_ruins,114,63,6 shop Tool Dealer#moc2 99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2242:-1 -moc_ruins,93,53,2 shop Item Collector#moc1 85,911:-1,528:-1,919:-1,925:-1 -moc_ruins,81,113,0 shop Item Collector#moc2 85,911:-1,528:-1,919:-1,925:-1 -moc_ruins,110,105,2 shop Jeweler#moc1 102,721:-1,723:-1,726:-1,728:-1,729:-1 -moc_ruins,52,85,6 shop Jeweler#moc2 99,730:-1,2613:-1 -moc_ruins,113,126,4 shop Trader#moc1 99,747:-1 -moc_ruins,131,138,0 shop Trader#moc2 93,748:-1 -moc_ruins,71,139,5 shop Trader#moc3 93,2612:-1 -moc_ruins,125,135,6 shop Trader#moc4 89,2609:-1,1516:-1,1522:-1 -moc_ruins,87,109,0 shop Butcher#moc 58,517:-1 -moc_ruins,90,149,6 shop Trader#moc5 99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1 -moc_ruins,118,170,4 shop Pet Groomer#moc 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 -morocc_in,141,67,0 shop Weapon Dealer#moc1 58,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1250:-1,1252:-1,1254:-1 -morocc_in,141,60,0 shop Armor Dealer#moc 58,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2218:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2335:-1,2628:-1 -morocc_in,132,57,0 shop Weapon Dealer#moc2 99,1146:-1,1245:-1 +in_moc_16,22,20,7 shop Sepulchral Merchant#moc 4_M_MASKMAN,1771:-1 +moc_ruins,91,128,4 shop Tool Dealer#moc1 4_F_04,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +moc_ruins,114,63,6 shop Tool Dealer#moc2 4W_M_03,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2242:-1 +moc_ruins,93,53,2 shop Item Collector#moc1 4_M_03,911:-1,528:-1,919:-1,925:-1 +moc_ruins,81,113,0 shop Item Collector#moc2 4_M_03,911:-1,528:-1,919:-1,925:-1 +moc_ruins,110,105,2 shop Jeweler#moc1 8_F,721:-1,723:-1,726:-1,728:-1,729:-1 +moc_ruins,52,85,6 shop Jeweler#moc2 4W_M_03,730:-1,2613:-1 +moc_ruins,113,126,4 shop Trader#moc1 4W_M_03,747:-1 +moc_ruins,131,138,0 shop Trader#moc2 4_F_04,748:-1 +moc_ruins,71,139,5 shop Trader#moc3 4_F_04,2612:-1 +moc_ruins,125,135,6 shop Trader#moc4 4_M_ORIENT02,2609:-1,1516:-1,1522:-1 +moc_ruins,87,109,0 shop Butcher#moc 1_M_MERCHANT,517:-1 +moc_ruins,90,149,6 shop Trader#moc5 4W_M_03,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1 +moc_ruins,118,170,4 shop Pet Groomer#moc 4_M_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 +morocc_in,141,67,0 shop Weapon Dealer#moc1 1_M_MERCHANT,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1250:-1,1252:-1,1254:-1 +morocc_in,141,60,0 shop Armor Dealer#moc 1_M_MERCHANT,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2218:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2335:-1,2628:-1 +morocc_in,132,57,0 shop Weapon Dealer#moc2 4W_M_03,1146:-1,1245:-1 //======================================================= // Moscovia //======================================================= -mosk_in,21,254,5 shop Tool Dealer#mosk 968,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 -mosk_in,31,180,3 shop Weapon Dealer#mosk 968,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 -mosk_in,79,178,1 shop Armor Dealer#mosk 961,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 -moscovia,152,71,4 shop Fruit Gardener#mosk 968,512:-1,513:-1,515:-1,516:-1 -moscovia,199,110,3 shop Vendor from Milk Ranch#m 959,519:-1 +mosk_in,21,254,5 shop Tool Dealer#mosk 4_M_RUSMAN2,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 +mosk_in,31,180,3 shop Weapon Dealer#mosk 4_M_RUSMAN2,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 +mosk_in,79,178,1 shop Armor Dealer#mosk 4_F_RUSWOMAN3,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 +moscovia,152,71,4 shop Fruit Gardener#mosk 4_M_RUSMAN2,512:-1,513:-1,515:-1,516:-1 +moscovia,199,110,3 shop Vendor from Milk Ranch#m 4_F_RUSWOMAN1,519:-1 //======================================================= // Niflheim //======================================================= -nif_in,37,93,1 shop Axe Dealer#nif 801,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1 -nif_in,37,84,1 shop Armor Dealer#nif 801,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1 -nif_in,145,23,1 shop Tool Dealer#nif 801,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1 +nif_in,37,93,1 shop Axe Dealer#nif 4_NFCOFFIN,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1 +nif_in,37,84,1 shop Armor Dealer#nif 4_NFCOFFIN,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1 +nif_in,145,23,1 shop Tool Dealer#nif 4_NFCOFFIN,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1 //======================================================= // Payon //======================================================= -payon_in01,15,119,0 shop Weapon Dealer#pay 77,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1704:-1,1707:-1,1710:-1,1713:-1,1714:-1,1718:-1 -payon_in01,5,129,7 shop Weapon Dealer#pay2 703,1146:-1,1245:-1 -payon_in01,7,119,2 shop Armor Dealer#pay 76,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2208:-1,2211:-1,2212:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2330:-1,2628:-1 -payon_in01,5,49,7 shop Tool Dealer#pay 88,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -payon_in02,87,34,0 shop Tool Dealer#pay2 75,1750:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -payon,159,96,4 shop Tool Dealer#pay3 88,1750:-1,501:-1,645:-1,601:-1,602:-1 -payon,177,131,4 shop Pet Groomer#pay 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1 +payon_in01,15,119,0 shop Weapon Dealer#pay 1_F_ORIENT_03,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1704:-1,1707:-1,1710:-1,1713:-1,1714:-1,1718:-1 +payon_in01,5,129,7 shop Weapon Dealer#pay2 4_F_KID2,1146:-1,1245:-1 +payon_in01,7,119,2 shop Armor Dealer#pay 1_F_ORIENT_02,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2208:-1,2211:-1,2212:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2330:-1,2628:-1 +payon_in01,5,49,7 shop Tool Dealer#pay 4_M_ORIENT01,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +payon_in02,87,34,0 shop Tool Dealer#pay2 1_F_ORIENT_01,1750:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +payon,159,96,4 shop Tool Dealer#pay3 4_M_ORIENT01,1750:-1,501:-1,645:-1,601:-1,602:-1 +payon,177,131,4 shop Pet Groomer#pay 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1 //======================================================= // Prontera //======================================================= -prontera,73,134,0 shop Vendor from Milk Ranch#p 90,519:-1 -prontera,104,49,0 shop Fruit Gardener#prt 102,512:-1,513:-1 -prontera,64,125,0 shop Butcher#prt 87,517:-1,528:-1 -prontera,58,182,0 shop Flower Girl#prt 96,712:-1,744:-1 -prontera,113,42,0 shop Flower Lady#prt 90,712:-1,744:-1 -prontera,105,87,0 shop Gift Merchant#prt 91,734:-1,735:-1,736:-1,737:-1,746:-1 -prontera,218,211,4 shop Pet Groomer#prt 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1 -prontera,248,153,0 shop Doll Supplier#prt 85,740:-1,741:-1,742:-1 -prontera,48,58,0 shop Vegetable Gardener#prt 91,515:-1,516:-1,535:-1 -prt_church,108,124,4 shop Nun#prt 79,2608:-1,2216:-1,5092:-1,2323:-1,2325:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1 -prt_fild05,290,221,2 shop Tool Dealer#prt 83,1750:-1,611:-1,501:-1,502:-1,506:-1,645:-1,601:-1,602:-1 -prt_in,211,169,0 shop Wedding Shop Dealer#prt 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1 -prt_in,126,76,0 shop Tool Dealer#prt1 53,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1 -prt_in,172,130,0 shop Weapon Dealer#prt 54,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1129:-1,1116:-1,1301:-1 -prt_in,172,132,0 shop Armor Dealer#prt 48,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2220:-1,2226:-1,2301:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1,2627:-1 -prt_in,171,140,0 shop Weapon Dealer#prt2 47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 -prt_in,165,140,4 shop Weapon Dealer#prt3 66,1146:-1,1245:-1 -prt_monk,135,263,5 shop Weapon Dealer#prt4 726,1801:-1,1803:-1,1805:-1 +prontera,73,134,0 shop Vendor from Milk Ranch#p 4_F_01,519:-1 +prontera,104,49,0 shop Fruit Gardener#prt 8_F,512:-1,513:-1 +prontera,64,125,0 shop Butcher#prt 4_M_BARBER,517:-1,528:-1 +prontera,58,182,0 shop Flower Girl#prt 4W_KID,712:-1,744:-1 +prontera,113,42,0 shop Flower Lady#prt 4_F_01,712:-1,744:-1 +prontera,105,87,0 shop Gift Merchant#prt 4_F_02,734:-1,735:-1,736:-1,737:-1,746:-1 +prontera,218,211,4 shop Pet Groomer#prt 4_M_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1 +prontera,248,153,0 shop Doll Supplier#prt 4_M_03,740:-1,741:-1,742:-1 +prontera,48,58,0 shop Vegetable Gardener#prt 4_F_02,515:-1,516:-1,535:-1 +prt_church,108,124,4 shop Nun#prt 1_F_PRIEST,2608:-1,2216:-1,5092:-1,2323:-1,2325:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1 +prt_fild05,290,221,2 shop Tool Dealer#prt 4_M_01,1750:-1,611:-1,501:-1,502:-1,506:-1,645:-1,601:-1,602:-1 +prt_in,211,169,0 shop Wedding Shop Dealer#prt 1_F_LIBRARYGIRL,744:-1,745:-1,2338:-1,2206:-1,7170:-1 +prt_in,126,76,0 shop Tool Dealer#prt1 1_M_INNKEEPER,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1 +prt_in,172,130,0 shop Weapon Dealer#prt 1_M_JOBGUIDER,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1129:-1,1116:-1,1301:-1 +prt_in,172,132,0 shop Armor Dealer#prt 1_M_02,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2220:-1,2226:-1,2301:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1,2627:-1 +prt_in,171,140,0 shop Weapon Dealer#prt2 1_M_01,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 +prt_in,165,140,4 shop Weapon Dealer#prt3 1_F_01,1146:-1,1245:-1 +prt_monk,135,263,5 shop Weapon Dealer#prt4 4_F_JOB_BLACKSMITH,1801:-1,1803:-1,1805:-1 //======================================================= // Rachel //======================================================= -ra_in01,175,364,3 shop Armor Dealer#ra 919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 -ra_in01,257,269,3 shop Tool Dealer#ra 919,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1 -ra_in01,176,389,3 shop Weapon Dealer#ra 931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1601:-1,1604:-1,1607:-1 -ra_in01,254,300,3 shop Fruit Gardener#ra 931,512:-1,513:-1 -rachel,65,80,1 shop Vegetable Gardener#ra 919,515:-1,535:-1,516:-1 +ra_in01,175,364,3 shop Armor Dealer#ra 4_F_SHABBY,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 +ra_in01,257,269,3 shop Tool Dealer#ra 4_F_SHABBY,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1 +ra_in01,176,389,3 shop Weapon Dealer#ra 4_M_RACHMAN1,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1601:-1,1604:-1,1607:-1 +ra_in01,254,300,3 shop Fruit Gardener#ra 4_M_RACHMAN1,512:-1,513:-1 +rachel,65,80,1 shop Vegetable Gardener#ra 4_F_SHABBY,515:-1,535:-1,516:-1 //======================================================= // Turtle Island //======================================================= -tur_dun01,158,54,6 shop Tool Dealer#tu 99,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,645:-1,656:-1,2242:-1 +tur_dun01,158,54,6 shop Tool Dealer#tu 4W_M_03,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,645:-1,656:-1,2242:-1 //======================================================= // Umbala //======================================================= -um_in,104,124,3 shop Tool Dealer#um 788,512:-1,515:-1,535:-1,516:-1,513:-1,517:-1,528:-1,537:-1,601:-1,602:-1,645:-1,656:-1,610:-1 -um_in,160,125,3 shop Weapon Dealer#um 789,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,1807:-1,1811:-1,1809:-1 +um_in,104,124,3 shop Tool Dealer#um 4_M_UMOLDMAN,512:-1,515:-1,535:-1,516:-1,513:-1,517:-1,528:-1,537:-1,601:-1,602:-1,645:-1,656:-1,610:-1 +um_in,160,125,3 shop Weapon Dealer#um 4_M_UMSOLDIER,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,1807:-1,1811:-1,1809:-1 //======================================================= // Veins //======================================================= -ve_in,386,245,3 shop Weapon Dealer#ve 931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1 -ve_in,336,243,3 shop Weapon Dealer#ve2 931,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1 -ve_in,374,230,3 shop Armor Dealer#ve 919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 -ve_in,243,303,5 shop Tool Dealer#ve 943,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1 -ve_in,253,304,5 shop Fruit Gardener#ve 941,512:-1,513:-1 -ve_in,252,313,0 shop Magical Item Seller#ve 942,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 +ve_in,386,245,3 shop Weapon Dealer#ve 4_M_RACHMAN1,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1 +ve_in,336,243,3 shop Weapon Dealer#ve2 4_M_RACHMAN1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1 +ve_in,374,230,3 shop Armor Dealer#ve 4_F_SHABBY,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 +ve_in,243,303,5 shop Tool Dealer#ve 4_M_DESERT,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1 +ve_in,253,304,5 shop Fruit Gardener#ve 4_F_DST_CHILD,512:-1,513:-1 +ve_in,252,313,0 shop Magical Item Seller#ve 4_F_DST_GRAND,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 //======================================================= // Cooking Addition //======================================================= -prontera,156,212,1 shop Chef Assistant#prt 700,7454:-1,7456:-1,7482:-1,580:-1 -payon,206,119,5 shop Chef Assistant#pay 89,7455:-1 -moc_ruins,115,123,5 shop Chef Assistant#moc 86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1 -geffen,196,111,3 shop Chef Assistant#gef 85,7482:-1 -alberta,167,135,5 shop Chef Assistant#alb 712,579:-1 -aldebaran,165,107,2 shop Chef Assistant#alde 97,7456:-1,7452:-1,580:-1 -comodo,225,164,3 shop Chef Assistant#cmd 83,7455:-1,7453:-1,7454:-1,579:-1 -umbala,102,154,3 shop Chef Assistant#um 83,7456:-1,577:-1 -yuno,130,173,3 shop Chef Assistant#yuno 83,7457:-1,7482:-1 -einbroch,224,207,5 shop Chef Assistant#ein 83,7457:-1 -lighthalzen,126,126,3 shop Chef Assistant#lhz 83,7456:-1,7452:-1 -amatsu,206,150,3 shop Chef Assistant#ama 83,7453:-1,579:-1 -louyang,256,123,5 shop Chef Assistant#lou 820,7454:-1,577:-1 -gonryun,147,101,5 shop Chef Assistant#gon 83,7452:-1,580:-1 -ayothaya,203,178,3 shop Chef Assistant#ayo 83,7455:-1,577:-1 -xmas,152,137,5 shop Chef Assistant#xmas 83,7457:-1,577:-1 -niflheim,209,180,5 shop Chef Assistant#nif 83,581:-1 +prontera,156,212,1 shop Chef Assistant#prt 8_F_GIRL,7454:-1,7456:-1,7482:-1,580:-1 +payon,206,119,5 shop Chef Assistant#pay 4_M_ORIENT02,7455:-1 +moc_ruins,115,123,5 shop Chef Assistant#moc 4_M_04,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1 +geffen,196,111,3 shop Chef Assistant#gef 4_M_03,7482:-1 +alberta,167,135,5 shop Chef Assistant#alb 4_M_05,579:-1 +aldebaran,165,107,2 shop Chef Assistant#alde 4W_M_01,7456:-1,7452:-1,580:-1 +comodo,225,164,3 shop Chef Assistant#cmd 4_M_01,7455:-1,7453:-1,7454:-1,579:-1 +umbala,102,154,3 shop Chef Assistant#um 4_M_01,7456:-1,577:-1 +yuno,130,173,3 shop Chef Assistant#yuno 4_M_01,7457:-1,7482:-1 +einbroch,224,207,5 shop Chef Assistant#ein 4_M_01,7457:-1 +lighthalzen,126,126,3 shop Chef Assistant#lhz 4_M_01,7456:-1,7452:-1 +amatsu,206,150,3 shop Chef Assistant#ama 4_M_01,7453:-1,579:-1 +louyang,256,123,5 shop Chef Assistant#lou 4_M_CHNCOOK,7454:-1,577:-1 +gonryun,147,101,5 shop Chef Assistant#gon 4_M_01,7452:-1,580:-1 +ayothaya,203,178,3 shop Chef Assistant#ayo 4_M_01,7455:-1,577:-1 +xmas,152,137,5 shop Chef Assistant#xmas 4_M_01,7457:-1,577:-1 +niflheim,209,180,5 shop Chef Assistant#nif 4_M_01,581:-1 -//===== Additional Comments(old): ================================= +//===== Additional Comments(old): ================================= //= swapped shop titles in GONRYUN, thanks to Kashy //= 1.3a Fixed Louyang map name. Added additional shops in Yuno. [kobra_k88] //= 1.4 Added Niflheim Shops //= 1.5 New Payon Locations [Darkchild] -//= Moved shops in Umbala.txt here. Commented out the duplicate ones.[kobra_k88] +//= Moved shops in Umbala.txt here. Commented out the duplicate ones.[kobra_k88] //= 1.6 Removed GRAPE ID 514 from shops (caused exploits) //= 1.7 Removed juices from custom amatsu shops (it's a quest item + levelup exploit) //= 1.8 Corrected Niflheim Shops and Morroc Jewel Merchant [celest] @@ -350,13 +350,13 @@ niflheim,209,180,5 shop Chef Assistant#nif 83,581:-1 //= - Guys, I suggest we crop these comments and put them at the bottom soon //= 1.22 Thx8) Removed Berserk Potions from all shops but Comodo [Lupus] //= 1.3 Added Gunslinger shops. Credits goes to RockmanEXE for the info [erKURITA] -//= Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA] +//= Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA] //= 1.4 Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets] //= a Removed doubled Morocc Ing.Seller, arranged the rest Ing.Sellers according to the city names [Lupus] //= 1.4b Commented out temp Gunslinger shops. [Lupus] //= 1.5 Removed Temp gunslinger shops and moved up the official ones. [erKURITA] -//= Added Official Ninja shops in their correct location and commented a few -//= shops. Thanks to RockmanEXE and Muad_Dib [erKURITA] +//= Added Official Ninja shops in their correct location and commented a few +//= shops. Thanks to RockmanEXE and Muad_Dib [erKURITA] //= 1.6 Implemented a missing Tool Shop in Lighthalzen [MasterOfMuppets] //= 1.7 Added some missing iRO - Lighthalzen NPCs [Musashiden] //= 1.8 Added Rachel Official shops. Special Thanks to RockmanEXE. [erKURITA] diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index 7ace07bee..9d90e31aa 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -4,18 +4,16 @@ //= rAthena Dev Team //===== Current Version: ===================================== //= 2.0a -//===== Compatible With: ===================================== -//= Hercules Git //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Adds slots to selected weapons and armor. //===== Additional Comments: ================================= //= 0.1a added missing L_No: to 2 funcs [Lupus] //= 0.1b Removed duplicates [Toms] -//= 0.2 Added missing next;'s [Evera] +//= 0.2 Added missing next;'s [Evera] //= 0.3 Fixed Zweihander[+] id [Lupus] //= 1.0 Fixed ingredients check [Lupus] -//= 1.1 Updated to official. [SinSloth] +//= 1.1 Updated to official. [SinSloth] //= 1.1b Optimized/cleaned [ultramage] //= 1.2 Fixed some typos and a nasty bug. [SinSloth] //= 1.3 Fixed a wrong item ID with Sphinx Hat. [SinSloth] @@ -336,10 +334,10 @@ function script Func_Socket { } } -payon,140,151,5 duplicate(SocketEnchant) Seiyablem#pay 84 -lhz_in02,281,35,5 duplicate(SocketEnchant) Seiyablem#lhz 84 -prt_in,33,70,5 duplicate(SocketEnchant) Seiyablem#prt 84 -morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 84 +payon,140,151,5 duplicate(SocketEnchant) Seiyablem#pay 4_M_02 +lhz_in02,281,35,5 duplicate(SocketEnchant) Seiyablem#lhz 4_M_02 +prt_in,33,70,5 duplicate(SocketEnchant) Seiyablem#prt 4_M_02 +morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 4_M_02 - script Young Man#dummy::SocketMan -1,{ mes "[Young Man]"; @@ -358,7 +356,7 @@ morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 84 close; } -prt_in,31,57,1 duplicate(SocketMan) Young Man#prt 97 -payon,143,143,7 duplicate(SocketMan) Young Man#pay 97 -morocc,60,42,3 duplicate(SocketMan) Young Man#moc 97 -lhz_in02,269,33,5 duplicate(SocketMan) Young Man#lhz 97 +prt_in,31,57,1 duplicate(SocketMan) Young Man#prt 4W_M_01 +payon,143,143,7 duplicate(SocketMan) Young Man#pay 4W_M_01 +morocc,60,42,3 duplicate(SocketMan) Young Man#moc 4W_M_01 +lhz_in02,269,33,5 duplicate(SocketMan) Young Man#lhz 4W_M_01 diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt index 6c21bdcf7..3e7c64808 100644 --- a/npc/merchants/socket_enchant2.txt +++ b/npc/merchants/socket_enchant2.txt @@ -1,19 +1,17 @@ //===== Hercules Script ====================================== //= Episode 12 Socket Enchant NPC -//===== By: ================================================== +//===== By: ================================================== //= Gepard -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1a -//===== Compatible With: ===================================== -//= Hercules Git -//===== Description: ========================================= -//= [Aegis Conversion] +//===== Description: ========================================= +//= [Official Conversion] //= Adds slots to selected weapons and armor. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Duplicates now spawn from floating NPCs. [L0ne_W0lf] //= 1.1a Added 'disable_items' command. [Euphy] -//============================================================ +//============================================================ - script Leablem#dummy::SocketEnchant2 -1,{ if (checkweight(1201,1) == 0) @@ -379,10 +377,10 @@ } } -payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 86 -lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 86 -prt_in,22,60,6 duplicate(SocketEnchant2) Leablem#prt 86 -moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 86 +payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 4_M_04 +lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 4_M_04 +prt_in,22,60,6 duplicate(SocketEnchant2) Leablem#prt 4_M_04 +moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 4_M_04 function script Func_Socket2 { diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt index 8be6ed276..6fb0b41f7 100644 --- a/npc/merchants/wander_pet_food.txt +++ b/npc/merchants/wander_pet_food.txt @@ -5,14 +5,14 @@ //===== Current Version: ===================================== //= 1.0 //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Trade Broken Liquor Jars and alcohol for wanderer //= pet food, 'Spirit Liquor' //===== Additional Comments: ================================= //= 1.0 First version //============================================================ -prontera,218,218,3 script Pet Enthusiast 96,{ +prontera,218,218,3 script Pet Enthusiast 4W_KID,{ mes "[Pet Enthusiast Jenny]"; mes "Oh, Hi there!"; mes "Are you a lover of animals like I am?"; @@ -67,7 +67,7 @@ prontera,218,218,3 script Pet Enthusiast 96,{ } } -prontera,220,218,3 script Berry Toe 955,{ +prontera,220,218,3 script Berry Toe 4_DONKEY,{ specialeffect EF_CHANGEDARK; end; } |