summaryrefslogtreecommitdiff
path: root/npc/re/merchants/shops.txt
diff options
context:
space:
mode:
authordaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-01 04:29:56 +0000
committerdaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-01 04:29:56 +0000
commit8832adba3ec9df0f7f890154f69f0993b8d1d8e5 (patch)
tree0e73afe6a780abf29fe035301f1354f24762da7a /npc/re/merchants/shops.txt
parentfa533907d49c7e288be33efb55fcb094f8e48591 (diff)
downloadhercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.tar.gz
hercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.tar.bz2
hercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.tar.xz
hercules-8832adba3ec9df0f7f890154f69f0993b8d1d8e5.zip
Full npc folder reorganization. (I hope I didn't break anything D:)
-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders. -NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences. -For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates. -All pre-renewal files has been reverted back to their pre-renewal behavior. TODO: -Correct pre-re quest rewards. -Check for pre-re/re differences in mapflags. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16545 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/re/merchants/shops.txt')
-rw-r--r--npc/re/merchants/shops.txt359
1 files changed, 14 insertions, 345 deletions
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 1ef3bc711..fcdd6044b 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -3,379 +3,48 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Current Version: =====================================
-//= 3.2
+//= 1.0
//===== Compatible With: =====================================
-//= rAthena 1.0+
+//= rAthena SVN
//===== Description: =========================================
-//= Town shop NPCs.
+//= Renewal-specific town shop NPCs.
//===== 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]
-//= 3.2 Updated to match the new Izlude Map. [Masao]
+//= 1.0 Moved some merchants to a separate renewal file. [Kenpachi]
//============================================================
//=======================================================
-// 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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
-// 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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
-comodo,106,213,5 shop Tropic Fruit Dealer 724,6258:-1
-comodo,196,162,3 shop Harive#candy 479,11513:-1,6144:-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
-//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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
+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
//=======================================================
// 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,115,61,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
izlude,97,146,0 shop Butcher#iz 54,517:-1
izlude,124,165,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1
izlude,95,145,6 shop Vendor from Milk Ranch#i 90,519:-1
izlude,174,164,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-izlude_in,121,64,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-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
-
-//=======================================================
-// 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,554:-1,6113:-1,6114:-1,6115:-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
-s_atelier,114,117,1 shop Part-Timer#sc_yuno 92,6123:-1,6120:-1
//=======================================================
// 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
-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
-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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
+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
//=======================================================
-// Payon
+// Mid Camp
//=======================================================
-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,6113:-1,6114:-1,6115:-1
-payon,123,109,4 shop Trap Specialist#pay 66,7940:-1,12341:-1
+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
//=======================================================
-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,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
-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_in,109,68,4 shop Trap Specialist#prt 66,7940:-1,12341:-1
-prt_monk,135,263,5 shop Weapon Dealer#prt4 726,1801:-1,1803:-1,1805:-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
+s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-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
-ra_in01,263,281,4 shop Trap Specialist#ra 66,7940:-1,12341:-1
-rachel,65,80,1 shop Vegetable Gardener#ra 919,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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
-
-//=======================================================
-// 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
-
-//===== 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]
-//= 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]
-//= 1.9 Updated Louyang shops thanks to MasterOfMuppets
-//= 1.10 Lutie Tools coords [Yor]
-//= 1.11 Added Belts to Prontera/Aldebaran shops, thanks to reddozen [Lupus]
-//= 1.12 official Ayothaya Shops, thanks to MasterOfMuppets [Lupus]
-//= 1.13 Added 5092 Coif into Prontera Church shop [Lupus]
-//= 1.14 Added Lighthalzen,Einbroch,Einbech shops. Updated Prontera,Morroc,Payon shops [Lupus]
-//= 1.15 Added Venom Knives into every Weapon Shop (that sells Knife[3]) [Lupus]
-//= 1.15a Fixed a small typo in alberta's weapon shop, thanks to reddozen for the fix [MasterOfMuppets]
-//= 1.16 Added a temp shop in Yuno to sell Blank scrolls, thanks to reddozen [MasterOfMuppets]
-//= 1.17 Added wand of hypnotist to the Lighthalzen weapon shop [MasterOfMuppets]
-//= 1.18 Fixed some shops based on kRO shots [Poki#3]
-//= 1.19 Added Hugel and fixed Payon shops based on kRO shots [Poki#3]
-//= 1.19a Added Food Seller selling Mastela Fruit in Hugel (Update item_db for the correct price!) [Poki#3]
-//= 1.20 Added 3 weapons shops, thx2 Muad_Dib [Lupus]
-//= 1.21 Added another weapon dealer to Einbroch, thanks to Muad_Dib [MasterOfMuppets]
-//= - Fixed up the missing sprites for you Lupus :)
-//= - 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]
-//= 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]
-//= 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]
-//= 1.9 Uncommented Homunculus shop, since Homunculus is working on trunk now. [Evera]
-//= 1.9a Pet Merchant -> Lighthalzen [erKURITA]
-//= 1.9b Added items to Chivas Regal
-//= 1.9c Slight update for Rachel shop: Tool Dealer -> Fruit Gardener [L0ne_W0lf]
-//============================================================
+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