diff options
| -rw-r--r-- | npc/merchants/shops.txt | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 9f49c05f5..6e9a794cc 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 2.9 +//= 3.0 //===== Compatible With: ===================================== //= rAthena 1.0+ //===== Description: ========================================= @@ -33,6 +33,7 @@ //= 2.7b Corrected Brasilis Fruit Merchant. (bugreport:4278) [L0ne_W0lf] //= 2.8 Updates to Brasilis Merchants. [L0ne_W0lf] //= 2.9 Added missing Cooking Items for Material Seller. [tr0n] +//= 3.0 Added all new Shops which were available in the latest available official files. [Masao] //============================================================ //======================================================= @@ -102,6 +103,7 @@ 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 +einbroch,122,250,4 shop Black Marketeer#ein 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-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 @@ -165,6 +167,7 @@ yuno_in01,25,34,5 shop Tool Dealer#yuno2 83,1750:-1,611:-1,501:-1,502:-1,503:-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 +s_atelier,114,117,1 shop Part-Timer#sc_yuno 92,6123:-1,6120:-1 //======================================================= // Lighthalzen @@ -174,6 +177,7 @@ 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 +lighthalzen,337,240,4 shop Trap Specialist#lhz 66,7940:-1,12341:-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 @@ -190,6 +194,8 @@ 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 +lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 +s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1 //======================================================= // Louyang @@ -207,6 +213,12 @@ xmas_in,169,34,2 shop Gift Seller#xmas 702,2612:-1,744:-1,748:-1,736:-1,746:-1,7 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 //======================================================= +// Mid Camp +//======================================================= +mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1 +mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 + +//======================================================= // Morroc - Post Ep. 12.1 //======================================================= in_moc_16,22,20,7 shop Sepulchral Merchant#moc 880,1771:-1 @@ -253,6 +265,7 @@ payon_in01,5,49,7 shop Tool Dealer#pay 88,1750:-1,611:-1,501:-1,502:-1,503:-1,50 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,6113:-1,6114:-1,6115:-1 +payon,123,109,4 shop Trap Specialist#pay 66,7940:-1,12341:-1 //======================================================= // Prontera @@ -266,6 +279,7 @@ 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,6113:-1,6114:-1,6115:-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 +//prontera,104,88,5 shop Stuff Gimme 880,616:-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 @@ -274,7 +288,10 @@ prt_in,172,130,0 shop Weapon Dealer#prt 54,1750:-1,1751:-1,1701:-1,1201:-1,1204: 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_in,109,68,4 shop Trap Specialist#prt 66,7940:-1,12341:-1 +prt_in,175,137,4 shop Black Marketeer#prt 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 prt_monk,135,263,5 shop Weapon Dealer#prt4 726,1801:-1,1803:-1,1805:-1 +s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-1 //======================================================= // Rachel @@ -283,7 +300,10 @@ ra_in01,175,364,3 shop Armor Dealer#ra 919,2101:-1,2103:-1,2403:-1,2405:-1,2503: 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 +ra_in01,263,281,4 shop Trap Specialist#ra 66,7940:-1,12341:-1 +ra_in01,257,266,4 shop Black Marketeer#ra 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 rachel,65,80,1 shop Vegetable Gardener#ra 919,515:-1,535:-1,516:-1 +s_atelier,137,60,3 shop Part-Timer#sc_ra 70,6123:-1,6120:-1 //======================================================= // Turtle Island |