diff options
Diffstat (limited to 'npc/merchants')
| -rw-r--r-- | npc/merchants/shops.txt | 14 | ||||
| -rw-r--r-- | npc/merchants/shops_re.txt | 67 |
2 files changed, 68 insertions, 13 deletions
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 6e9a794cc..f8ad2529b 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -34,6 +34,7 @@ //= 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] +//= 3.1 Moved some merchants to a separate renewal file. [Kenpachi] //============================================================ //======================================================= @@ -103,7 +104,6 @@ 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 @@ -194,8 +194,6 @@ 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 @@ -213,12 +211,6 @@ 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 @@ -289,9 +281,7 @@ prt_in,172,132,0 shop Armor Dealer#prt 48,2101:-1,2103:-1,2401:-1,2403:-1,2501:- 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 @@ -301,9 +291,7 @@ ra_in01,257,269,3 shop Tool Dealer#ra 919,501:-1,502:-1,503:-1,504:-1,506:-1,645 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 diff --git a/npc/merchants/shops_re.txt b/npc/merchants/shops_re.txt new file mode 100644 index 000000000..a68854aab --- /dev/null +++ b/npc/merchants/shops_re.txt @@ -0,0 +1,67 @@ +//===== rAthena Script =======================================
+//= Shops
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Current Version: =====================================
+//= 3.0
+//===== Compatible With: =====================================
+//= rAthena 1.0+
+//===== Description: =========================================
+//=
+//===== 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.
+//= 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]
+//= 2.2 Added Veins shops. [L0ne_W0lf]
+//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 2.4 Fixed Jawaii Ice cream salesman. [L0ne_W0lf]
+//= 2.5 Updated Morroc shops to episode 12.1. [L0ne_W0lf]
+//= 2.6 Added Brasilis shops. [L0ne_W0lf]
+//= Updated Pet Groomers with four new pet feeds.
+//= 2.7 Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta. [L0ne_W0lf]
+//= Made Brasilis shop names unique, and uncommented.
+//= Changed the whip sold in comodo weapon shop. (1956 ->1960)
+//= Added Fire and Silver arrow to Einbroch tool dealer.
+//= Re-added Bill of Birds to Morroc Item Collectors.
+//= 2.7a Actually applied the right update to the comodo weapon shop. [L0ne_W0lf]
+//= 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]
+//= 3.1 Moved some merchants to a separate renewal file. [Kenpachi]
+//============================================================
+
+//=======================================================
+// Einbroch
+//=======================================================
+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
+
+//=======================================================
+// Lighthalzen
+//=======================================================
+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
+
+//=======================================================
+// 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
+
+//=======================================================
+// Prontera
+//=======================================================
+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
+s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-1
+
+//=======================================================
+// Rachel
+//=======================================================
+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
+s_atelier,137,60,3 shop Part-Timer#sc_ra 70,6123:-1,6120:-1
|