summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-14 20:34:13 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-14 20:34:13 +0000
commit9d220e770517b1bd71bc3f1ad2e57ce894661f22 (patch)
treeae1ecf26f0b1f4c95541b426b9c216ff55b4c355 /npc/merchants
parent37e1cf1387107171eb5e8731de69a30503f3d355 (diff)
downloadhercules-9d220e770517b1bd71bc3f1ad2e57ce894661f22.tar.gz
hercules-9d220e770517b1bd71bc3f1ad2e57ce894661f22.tar.bz2
hercules-9d220e770517b1bd71bc3f1ad2e57ce894661f22.tar.xz
hercules-9d220e770517b1bd71bc3f1ad2e57ce894661f22.zip
* Updated cities: Morroc, Jawaii, and Izlude
- Moved an NPC out of Prontera because of the Jawaii update. * Updated Wedding script to official. (Moved previous to custom.) - Updated the Divorce NPC to Official as well. * Changed some dialog in the Kafra Functions. * Updated the Message boards to iRO standards. * Added the Mail box NPCs even though the mail system is not implemented. * Near total rewrite of the shops.txt file. Lots of corrections and such. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10766 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/inn.txt24
-rw-r--r--npc/merchants/milk_trader.txt2
-rw-r--r--npc/merchants/shops.txt404
3 files changed, 201 insertions, 229 deletions
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index e6d1be86c..5eef51dc0 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -4,7 +4,7 @@
//= Darkchild (1.1)
//= Playtester (1.2)
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -28,18 +28,20 @@
//= 1.5 Added "end;" after warping the player. [L0ne_W0lf]
//= - Small corrections to the prontera Inns.
//= - Removed the Cancel dialog.
+//= 1.6 More fixed, changed progression of "Rest"ing.
+//= - Corrected Morroc NPCs. [L0ne_W0lf]
//============================================================
//======================== Prontera ===================================
// West Side Inn -------------------
-prt_in,244,135,2 script Inn Maid::Sammy 53,{
+prt_in,244,135,2 script Inn Employee::Sammy 53,{
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 Maid::Ahlma#01 53,{
+prt_in,61,141,2 script Inn Employee::Ahlma#01 53,{
callfunc "F_InnMaid","[Emplyee Ahlma]","Nenkaras","prt_in",64,136;
warp "prt_in",64,136; end;
@@ -75,16 +77,16 @@ payon_in01,131,62,5 script Inn Maid::SunHee 53,{
//======================== Morocc ====================================
// North East --------------------------
-morocc_in,147,138,5 script Inn Maid::Suzie 53,{
+morocc_in,147,141,3 script Inn Employee::Hasna 53,{
- callfunc "F_InnMaid","[Suzie]","North East Inn","morocc_in",142,140;
- warp "morocc_in",174,144; end;
+ 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 Maid::Shala 53,{
+morocc_in,80,100,5 script Inn Employee::Manar 53,{
- callfunc "F_InnMaid","[Shala]","South Inn","morocc_in",78,95;
- warp "morocc_in",74,128; end;
+ callfunc "F_InnMaid","[Employee Manar]","Morroc Inn","morocc_in",78,95;
+ warp "morocc_in",79,123; end;
}
//======================== Rachel ====================================
@@ -127,12 +129,12 @@ function script F_InnMaid {
mes "in next time, okay?";
close;
}
- set Zeny,Zeny - 5000;
- percentheal 100,100;
mes "Thank you.";
mes "I hope you";
mes "enjoy your rest~";
close2;
+ set Zeny,Zeny - 5000;
+ percentheal 100,100;
return;
Mend:
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index fa0e9b6d9..9e3472843 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -14,7 +14,7 @@
//= 1.1 Negative input bug fixed [Lupus]
//= 1.2 Raised the price to close zeny exploit [Lupus]
//= 1.2a Switched to Lupus's "loopless" technique.[kobra_k88]
-//= 1.3 Rescripted from the ground up. [L0ne_W0lf]
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//============================================================
prontera,73,140,0 script Milk Vendor 86,{
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index bb258d89f..dafee7de8 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 1.9b
+//= 2.0
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -26,258 +26,234 @@
//= 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]
+//= 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.
//============================================================
-
//=======================================================
-//ALBERTA
+// Alberta
//=======================================================
-alb2trea,87,65,1 shop Tool Dealer 83,1750:-1,1751:-1,1752:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1
-alberta_in,94,56,4 shop Tool Dealer 83,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,611:-1,610:-1,645:-1,656:-1
-alberta_in,165,96,1 shop Item Collector 74,909:-1,528:-1
-alberta_in,182,96,1 shop Tool Dealer 73,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1750:-1,2243:-1,645:-1,656:-1
-alberta_in,180,15,1 shop Armor Dealer 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
-alberta_in,188,21,1 shop Weapon Dealer 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,1771:-1
+alb2trea,87,65,5 shop Tool Dealer 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 74,911:-1,528:-1
+alberta_in,182,97,0 shop Tool Dealer 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 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 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 82,1146:-1,1245:-1
-//alberta_in,18,59,5 shop Miner 48,1010:-1,1011:-1
-alberta,167,135,5 shop Chef Assistant 712,579:-1
//=======================================================
-//AL DE BARAN
+// Al De Baran
//=======================================================
-aldeba_in,20,60,5 shop Armor Dealer 101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1,2627:-1
-aldeba_in,28,54,5 shop Weapon Dealer 85,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1771:-1
+aldeba_in,20,60,0 shop Armor Dealer 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 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 713,1146:-1,1245:-1
-aldeba_in,94,56,5 shop Tool Dealer 83,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,611:-1,610:-1,645:-1,656:-1
-//For Homunculus
-alde_alche,38,184,2 shop Homunculus Supplies 755,7143:-1,7141:-1,7140:-1,12040:-1
-aldebaran,165,107,2 shop Chef Assistant 97,7456:-1,7452:-1,580:-1
+aldeba_in,94,56,5 shop Tool Dealer 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
//=======================================================
-//AMATSU
-//=======================================================
-//|Removed the following shops according to RockmanEXe's info. Some were removed anyway.
-//amatsu,176,126,4 shop Fruit Merchant 53,512:-1,513:-1,515:-1,516:-1
-//amatsu,169,111,6 shop Tool Dealer 83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1
-//amatsu,180,102,3 shop Flower Girl 96,712:-1,744:-1,2612:-1
-//amatsu,189,99,7 shop Butcher 49,517:-1,528:-1,540:-1,541:-1
-//amatsu,169,119,6 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1
-//amatsu,183,127,5 shop Milk Merchant 90,519:-1
-//ama_in01,96,28,4 shop Weapon Dealer 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,1157:-1,1129:-1,1116:-1,1301:-1,1771:-1
-//ama_in01,103,24,1 shop Armor Dealer 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
-//ama_in01,101,18,8 shop Weapon Dealer 47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
-//2nd set
-//|<= end of removed shops
-ama_in01,89,28,4 shop Armor Dealer 757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2314:-1,2627:-1
-ama_in01,102,28,4 shop Weapon Dealer 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,4 shop Tool Dealer 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
-amatsu,206,150,3 shop Chef Assistant 83,7453:-1,579:-1
-//| Official Ninja Shops
-que_ng,72,31,2 shop Bunji 83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1
-que_ng,73,26,5 shop Bunrei 83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1
+// Amatsu
+//=======================================================
+ama_in01,89,28,5 shop Armor Dealer 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 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 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
+// Ayothaya
//=======================================================
-ayo_in01,18,182,8 shop Tool Dealer 840,1750:-1,1753:-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,18,182,1 shop Tool Dealer 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 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 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
-ayothaya,203,178,3 shop Chef Assistant 83,7455:-1,577:-1
//=======================================================
-//COMODO
+// Comodo
//=======================================================
cmd_in01,117,165,4 shop Armor Dealer 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,131,165,4 shop Weapon Dealer 49,1901:-1,1903:-1,1905:-1,1907:-1,1950:-1,1952:-1,1954:-1,1956:-1,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
-cmd_in01,79,182,4 shop Tool Dealer 83,1753:-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 Merchant 101,965:-1,964:-1
-comodo,244,296,7 shop Item Collector 74,909:-1
-comodo,225,164,3 shop Chef Assistant 83,7455:-1,7453:-1,7454:-1,579:-1
-
+cmd_in01,128,165,2 shop Weapon Dealer 49,1901:-1,1903:-1,1905:-1,1909:-1,1911:-1,1907:-1,1950:-1,1952:-1,1954:-1,1958:-1,1952:-1,1956:-1
+cmd_in01,79,182,5 shop Tool Dealer 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 101,965:-1,964:-1
cmd_fild07,257,126,5 shop Tool Dealer 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 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 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
//=======================================================
-//EINBECH
+// Einbroch
//=======================================================
-ein_in01,189,15,0 shop Tool Dealer 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
-//=======================================================
-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,1771:-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,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 855,1247:-1,1248:-1,1249:-1,13000:-1
-einbroch,138,66,3 shop Head Gear Dealer 850,5114:-1,2218:-1
-einbroch,82,199,3 shop Paddler 855,512:-1,645:-1,1750:-1,501:-1
-einbroch,224,207,5 shop Chef Assistant 83,7457:-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 Regal 900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
-que_ng,180,79,3 shop Johnny Walker 900,13200:-1,13201:-1,13202:-1
+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
//=======================================================
-geffen_in,25,177,1 shop Armor Dealer 66,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1
-geffen_in,29,177,1 shop Weapon Dealer 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,1771:-1
-geffen_in,22,171,6 shop Weapon Dealer 84,1146:-1,1245:-1
-geffen_in,74,144,1 shop Trader 66,909:-1,911:-1,910:-1,912:-1
-geffen_in,77,167,1 shop Tool Dealer 68,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,2241:-1,645:-1,656:-1
-geffen_in,77,173,1 shop Magical Tool Trader 64,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
-geffen_in,171,123,1 shop Tool Dealer 64,1092:-1,1093:-1
-geffen,193,152,3 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-geffen,196,111,3 shop Chef Assistant 85,7482:-1
+geffen_in,26,178,4 shop Armor Dealer 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 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 84,1146:-1,1245:-1
+geffen_in,74,144,0 shop Trader 66,911:-1,910:-1,912:-1
+geffen_in,77,167,0 shop Tool Dealer 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 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 64,1092:-1,1093:-1
+geffen,193,152,4 shop Pet Groomer 124,537:-1,643:-1,10013:-1,10014:-1
//=======================================================
-//GONRYUN
+// Gonryun
//=======================================================
-gonryun,147,84,4 shop Tool Dealer 777,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
-gonryun,174,101,4 shop Weapon Dealer 774,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-gonryun,173,84,4 shop Armor Dealer 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,101,5 shop Chef Assistant 83,7452:-1,580:-1
+gonryun,147,84,5 shop Tool Dealer 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 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 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
//=======================================================
-hugel,105,169,5 shop Milk Merchant 53,519:-1
-hugel,77,167,3 shop Food Seller 892,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1
+hugel,105,169,5 shop Vendor from Milk Ranch 90,519:-1
+hugel,77,167,3 shop Vegetable Gardener 891,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1
hu_in01,241,368,2 shop Tool Dealer 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,2 shop Tool Trader 90,717:-1,2201:-1,910:-1,528:-1
-hu_in01,100,390,2 shop Bow Dealer 86,1701:-1,1707:-1,1718:-1,1714:-1
-hu_in01,94,390,2 shop Weapon Dealer 898,1116:-1,1154:-1,1354:-1,1201:-1
-hu_in01,94,313,2 shop Armor Dealer 86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1,2401:-1,2501:-1,2307:-1,2105:-1
+hu_in01,252,368,3 shop Tool Dealer 90,717:-1,2201:-1,910:-1,528:-1
+hu_in01,100,390,3 shop Bow Dealer 86,1701:-1,1707:-1,1718:-1,1714:-1
+hu_in01,94,390,3 shop Weapon Dealer 898,1116:-1,1154:-1,1354:-1,1201:-1
+hu_in01,94,313,3 shop Armor Dealer 86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1,2401:-1,2501:-1,2307:-1,2105:-1
//=======================================================
-//IZLUDE
+// Izlude
//=======================================================
-izlude_in,60,127,4 shop Weapon Dealer 98,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,1771:-1
-izlude_in,70,127,4 shop Armor Dealer 101,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
-izlude_in,115,61,1 shop Tool Dealer 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1750:-1,1065:-1,645:-1,656:-1
-izlude,121,138,1 shop Butcher 54,517:-1
-izlude,127,120,1 shop Fruit Merchant 72,512:-1,513:-1,515:-1,516:-1
-izlude,137,126,3 shop Milk Merchant 701,519:-1
-izlude,164,138,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
+izlude_in,60,127,4 shop Weapon Dealer 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 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 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,105,99,0 shop Butcher 54,517:-1
+izlude,94,98,4 shop Fruit Gardener 53,512:-1,513:-1,515:-1,516:-1
+izlude,105,92,7 shop Vendor from Milk Ranch 90,519:-1
+izlude,164,138,4 shop Pet Groomer 124,537:-1,643:-1,10013:-1,10014:-1
//=======================================================
-//LOUYANG
+// Jawaii
//=======================================================
-lou_in02,121,181,5 shop Armor Dealer 818,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2211:-1,2305:-1,2328:-1,2332:-1,2321:-1
-lou_in02,130,182,5 shop Weapon Dealer 774,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 818,1750:-1,1753:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1
-louyang,256,123,5 shop Chef Assistant 820,7454:-1,577:-1
+jawaii,186,174,3 shop Ice Cream Guy 85,563:-1,563:-1,563:-1,563:-1,563:-1,563:-1,563:-1
//=======================================================
-//LIGHTHALZEN
+// Juno
+//=======================================================
+yuno,218,97,5 shop Tool Dealer 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 83,911:-1,910:-1,912:-1
+yuno,197,114,4 shop Pet Groomer 124,537:-1,643:-1,10013:-1,10014:-1
+yuno,205,103,4 shop Mr. King's Shop 125,2340:-1,2341:-1,2411:-1,2222:-1,2230:-1,1721:-1
+yuno,163,187,5 shop Magical Item Seller 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 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 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 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
+
//=======================================================
-lighthalzen,69,75,5 shop Fruit Gardener 102,512:-1,513:-1
-lighthalzen,112,44,8 shop Flower Girl 90,712:-1,744:-1,748:-1
-lighthalzen,126,126,3 shop Chef Assistant 83,7456:-1,7452:-1
-lighthalzen,124,129,8 shop Vegetable Gardener 91,515:-1,516:-1,535:-1
-lighthalzen,222,191,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-lhz_in02,286,95,4 shop Begginer's Merchant 62,1621:-1,5112:-1,2416:-1,2113:-1,2512:-1
-lhz_in02,271,99,4 shop Armor Dealer 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 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,1771:-1
+// Lighthalzen
+//=======================================================
+lighthalzen,69,75,5 shop Fruit Gardener 102,512:-1,513:-1
+lighthalzen,112,44,0 shop Flower Girl 90,712:-1,744:-1,748:-1
+lighthalzen,124,129,0 shop Vegetable Gardener 91,515:-1,516:-1,535:-1
+lighthalzen,220,122,3 shop Vendor from Milk Ranch 90,519:-1
+lighthalzen,222,191,4 shop Pet Groomer 125,537:-1,643:-1,10013:-1,10014:-1
+lhz_in02,286,95,4 shop Beginner's Merchant 62,5112:-1,2416:-1,2113:-1,2512:-1
+lhz_in02,271,99,5 shop Armor Dealer 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 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 854,1601:-1,1604:-1,1607:-1,1617:-1,1619:-1
-lhz_in02,105,21,3 shop Jewel Seller 91,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1
-lhz_in02,17,220,4 shop Vegetable Merchant 91,515:-1,516:-1,535:-1
-lhz_in02,21,220,5 shop Fruit Merchant 102,512:-1,513:-1
-lhz_in02,32,218,6 shop Butcher 54,517:-1
-lhz_in02,38,145,4 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1
-lhz_in02,47,148,5 shop Wedding Goods Merchant 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1
-lhz_in02,31,145,4 shop Tool Dealer 90,611:-1,503:-1,504:-1,506:-1,656:-1,601:-1,602:-1,1065:-1,610:-1,1750:-1
-lhz_in02,85,215,4 shop Doll Merchant 91,740:-1,741:-1,742:-1
-lhz_in02,87,208,2 shop Eyewear Merchant 715,2243:-1,2212:-1,2242:-1,2241:-1
-lhz_in03,239,106,4 shop Tool Dealer 850,501:-1,502:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,611:-1
+lhz_in02,105,21,3 shop Jeweler 91,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1
+lhz_in02,17,220,5 shop Vegetable Gardener 91,515:-1,516:-1,535:-1
+lhz_in02,21,220,5 shop Fruit Gardener 102,512:-1,513:-1
+lhz_in02,32,219,5 shop Butcher 54,517:-1
+lhz_in02,38,145,5 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1
+lhz_in02,47,148,3 shop Wedding Shop Dealer 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1
+lhz_in02,31,145,4 shop Tool Dealer 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 862,740:-1,741:-1,742:-1
+lhz_in02,87,208,3 shop Toy Supplier 715,2243:-1,2212:-1,2242:-1,2241:-1
+lhz_in03,239,106,5 shop Tool Dealer 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 855,1750:-1,1770:-1,1752:-1,1751:-1
+lhz_in03,249,24,4 shop Merchant 855,911:-1,910:-1,912:-1,528:-1
+
+//=======================================================
+// Louyang
+//=======================================================
+lou_in02,121,182,5 shop Armor Dealer 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 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 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
+// Lutie
//=======================================================
-xmas_in,39,38,4 shop Tool Dealer 83,501:-1,502:-1,503:-1,504:-1,506:-1,611:-1,601:-1,602:-1,610:-1
+xmas_in,40,38,5 shop Tool Dealer 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 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 Merchant 702,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1
-xmas_in,174,98,2 shop Weapon Dealer 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1771:-1
-xmas,144,207,4 shop Tool Dealer 83,601:-1,602:-1
-xmas,152,137,5 shop Chef Assistant 83,7457:-1,577:-1
+xmas_in,169,34,2 shop Gift Seller 702,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1
+xmas_in,174,98,2 shop Weapon Dealer 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1
//=======================================================
-//MORROC
-//=======================================================
-morocc_in,141,67,1 shop Weapon Dealer 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,1771:-1
-morocc_in,141,60,1 shop Armor Dealer 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
-morocc,35,69,1 shop Trader 89,2609:-1,1516:-1,1522:-1
-morocc,139,92,1 shop Trader 99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1
-morocc,145,44,1 shop Jewel Seller 99,730:-1,2613:-1
-morocc,147,102,5 shop Tool Dealer 93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,645:-1,656:-1
-morocc,151,243,1 shop Tool Dealer 99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,2242:-1,645:-1,656:-1
-morocc,157,72,6 shop Butcher 49,517:-1
-morocc,166,51,1 shop Jewel Seller 102,721:-1,723:-1,726:-1,728:-1,729:-1
-morocc,170,101,3 shop Tool Dealer 85,911:-1,528:-1,919:-1,925:-1
-morocc,206,250,1 shop Tool Dealer 85,911:-1,528:-1,919:-1,925:-1
-morocc,244,134,1 shop Trader 93,2612:-1
-morocc,259,193,1 shop Trader 99,747:-1
-morocc,268,193,1 shop Trader 93,748:-1
-morocc,269,167,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-morocc,120,97,5 shop Chef Assistant 86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1
-//morocc_in,65,37,4 shop Miner 48,1010:-1,1011:-1
+// Morroc
+//=======================================================
+morocc_in,141,67,0 shop Weapon Dealer 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 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,35,69,6 shop Trader 89,2609:-1,1516:-1,1522:-1
+morocc,139,92,6 shop Trader 99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1
+morocc,145,44,6 shop Jeweler 99,730:-1,2613:-1
+morocc,147,102,4 shop Tool Dealer 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
+morocc,151,243,6 shop Tool Dealer 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
+morocc,157,72,6 shop Butcher 85,517:-1
+morocc,166,51,2 shop Jeweler 102,721:-1,723:-1,726:-1,728:-1,729:-1
+morocc,170,101,2 shop Item Collector 85,911:-1,528:-1,919:-1,925:-1
+morocc,206,250,0 shop Item Collector 85,911:-1,528:-1,919:-1,925:-1
+morocc,244,134,5 shop Trader 93,2612:-1
+morocc,259,193,4 shop Trader 99,747:-1
+morocc,268,193,0 shop Trader 93,748:-1
+morocc,269,167,4 shop Pet Groomer 125,537:-1,643:-1,10013:-1,10014:-1
morocc_in,132,57,0 shop Weapon Dealer 99,1146:-1,1245:-1
+in_moc_16,22,20,7 shop Sepulchral Merchant 880,1771:-1
//=======================================================
-//NIFLHEIM
-//=======================================================
-nif_in,35,84,3 shop Weapon Dealer 795,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1
-nif_in,35,91,3 shop Armor Dealer 796,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1
-nif_in,154,21,3 shop Tool Dealer 798,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1
-//nif_in,35,84,3 shop Weapon Dealer 795,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
-//nif_in,35,91,3 shop Armor Dealer 796,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1
-//nif_in,154,21,3 shop Tool Dealer 798,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1,645:-1,656:-1
-//niflheim,201,209,3 shop Milk Merchant 794,519:-1
-//niflheim,224,185,3 shop Fruit Merchant 795,512:-1,513:-1
-//niflheim,209,161,3 shop Butcher 794,517:-1,528:-1
-//niflheim,205,152,3 shop Gift Merchant 795,734:-1,735:-1,736:-1,737:-1,746:-1
-niflheim,209,180,5 shop Chef Assistant 83,581:-1
-
+// Niflheim
//=======================================================
-//PAYON
-//=======================================================
-payon_in01,7,119,4 shop Weapon Dealer 76,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,1771:-1
-payon_in01,5,129,6 shop Weapon Dealer 703,1146:-1,1245:-1
-payon_in01,15,119,4 shop Armor Dealer 77,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,2309:-1,2330:-1,2628:-1
-payon_in01,5,49,0 shop Tool Dealer 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,1 shop Tool Dealer 98,1750:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,645:-1,656:-1
-payon,159,96,5 shop Tool Dealer 88,1750:-1,501:-1,645:-1,601:-1,602:-1
-payon,209,119,5 shop Chef Assistant 89,7455:-1
-payon,104,63,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-pay_arche,125,108,1 shop Milk Merchant 90,519:-1
-pay_arche,132,101,1 shop Vegetable Merchant 102,515:-1,516:-1
-pay_arche,140,124,1 shop Butcher 87,517:-1,528:-1
+nif_in,37,93,1 shop Axe Dealer 801,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1
+nif_in,37,84,1 shop Armor Dealer 801,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1
+nif_in,145,23,1 shop Tool Dealer 801,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1
//=======================================================
-//PRONTERA
+// Payon
//=======================================================
-prontera,73,134,1 shop Milk Merchant 90,519:-1
-prontera,104,49,1 shop Fruit Merchant 102,512:-1,513:-1
-prontera,64,125,1 shop Butcher 87,517:-1,528:-1
-prontera,58,182,1 shop Flower Girl 96,712:-1,744:-1
-prontera,113,42,1 shop Flower Lady 90,712:-1,744:-1
-prontera,105,87,1 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1
-prontera,218,211,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-prontera,248,153,1 shop Doll Merchant 85,740:-1,741:-1,742:-1
-prontera,156,212,1 shop Chef Assistant 700,7454:-1,7456:-1,7482:-1,580:-1
-prontera,48,58,7 shop Vegetable Gardener 91,515:-1,516:-1,535:-1
-prt_church,108,124,1 shop Nun 79,2608:-1,2216:-1,2323:-1,2325:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,5092:-1
-prt_fild05,290,221,1 shop Tool Dealer 83,1750:-1,611:-1,501:-1,502:-1,506:-1,601:-1,602:-1,645:-1,656:-1
-prt_in,211,169,1 shop Wedding Goods Merchant 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1
-prt_in,126,76,1 shop Tool Dealer 53,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1,645:-1,656:-1
-prt_in,172,130,1 shop Weapon Dealer 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,1157:-1,1129:-1,1116:-1,1301:-1,1771:-1
-prt_in,172,132,1 shop Armor Dealer 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,2627:-1
-prt_in,171,140,1 shop Weapon Dealer 47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
-//prt_in,56,69,4 shop Miner 48,1010:-1,1011:-1
-prt_in,164,140,4 shop Weapon Dealer 66,1146:-1,1245:-1
+payon_in01,15,119,0 shop Weapon Dealer 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 703,1146:-1,1245:-1
+payon_in01,7,119,2 shop Armor Dealer 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 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 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 88,1750:-1,501:-1,645:-1,601:-1,602:-1
+payon,177,131,4 shop Pet Groomer 124,537:-1,643:-1,10013:-1,10014:-1
//=======================================================
-//RACHEL
+// Prontera
+//=======================================================
+prontera,73,134,0 shop Vendor from Milk Ranch 90,519:-1
+prontera,104,49,0 shop Fruit Gardener 102,512:-1,513:-1
+prontera,64,125,0 shop Butcher 87,517:-1,528:-1
+prontera,58,182,0 shop Flower Girl 96,712:-1,744:-1
+prontera,113,42,0 shop Flower Lady 90,712:-1,744:-1
+prontera,105,87,0 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1
+prontera,218,211,4 shop Pet Groomer 125,537:-1,643:-1,10013:-1,10014:-1
+prontera,248,153,0 shop Doll Supplier 85,740:-1,741:-1,742:-1
+prontera,48,58,0 shop Vegetable Gardener 91,515:-1,516:-1,535:-1
+prt_church,108,124,4 shop Nun 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 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 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1
+prt_in,126,76,0 shop Tool Dealer 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 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 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 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 66,1146:-1,1245:-1
+prt_monk,135,263,5 shop Weapon Dealer 726,1801:-1,1803:-1,1805:-1
+
+//=======================================================
+// Rachel
//=======================================================
ra_in01,175,364,3 shop Armor Dealer 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 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
@@ -286,42 +262,36 @@ ra_in01,254,300,3 shop Fruit Gardener 931,512:-1,513:-1
rachel,65,80,0 shop Vegetable Gardener 919,515:-1,535:-1,516:-1
//=======================================================
-//TURTLE ISLAND
+// Turtle Island
//=======================================================
tur_dun01,158,54,6 shop Tool Dealer 99,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,645:-1,656:-1,2242:-1
//=======================================================
-//UMBALA
+// Umbala
//=======================================================
-um_in,104,124,3 shop Item Merchant 788,512:15,515:15,535:15,516:15,513:15,517:50,528:60,537:1000,601:60,602:300,645:800,656:1500,610:4000
-um_in,160,125,3 shop Weapon Merchant 789,1501:120,1504:1600,1507:9000,1510:16000,1513:41000,1519:23000,1807:53000,1811:58000,1809:67000
-um_in,151,125,4 shop Armor Merchant 49,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
-//um_in,159,123,3 shop Weapon Merchant 52,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
-//um_in,98,124,3 shop Tool Merchant 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1750:-1,1065:-1
-//um_in,103,124,4 shop Food Merchant 91,515:-1,516:-1,535:-1,519:-1,517:-1
-umbala,102,154,3 shop Chef Assistant 83,7456:-1,577:-1
+um_in,104,124,3 shop Tool Dealer 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 789,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,1807:-1,1811:-1,1809:-1
//=======================================================
-//YUNO
-//=======================================================
-yuno,65,122,4 shop Fruit Merchant 93,512:-1,513:-1,515:-1,516:-1
-yuno,217,97,4 shop Tool Dealer 83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1
-yuno,226,106,5 shop Trader 97, 911:-1, 910:-1, 912:-1
-yuno,197,115,4 shop Pet Merchant 124, 537:-1, 643:-1, 10013:-1, 10014:-1
-yuno,205,104,4 shop Equip Dealer 84, 2340:-1, 2341:-1, 2411:-1, 2222:-1, 2230:-1, 1721:-1
-yuno,163,187,5 shop Magic Tool Dealer 90,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
-yuno_in01,25,34,4 shop Tool Dealer 83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1
-yuno_in01,104,35,4 shop Weapon Dealer 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,1771:-1
-yuno_in01,112,25,5 shop Armor Dealer 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 Seller 89,7433:-1 //Temp shop in Yuno that sells Blank Scrolls
+// Cooking Addition
+//===========================================================
+prontera,156,212,1 shop Chef Assistant 700,7454:-1,7456:-1,7482:-1,580:-1
+payon,206,119,5 shop Chef Assistant 89,7455:-1
+morocc,120,97,5 shop Chef Assistant 86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1
+geffen,196,111,3 shop Chef Assistant 85,7482:-1
+alberta,167,135,5 shop Chef Assistant 712,:-1
+aldebaran,165,107,2 shop Chef Assistant 97,7456:-1,7452:-1,580:-1
+comodo,225,164,3 shop Chef Assistant 83,7455:-1,7453:-1,7454:-1,:-1
+umbala,102,154,3 shop Chef Assistant 83,7456:-1,577:-1
yuno,130,173,3 shop Chef Assistant 83,7457:-1,7482:-1
-
-//=======================================================
-// ST. CAPITOLINA ABBEY
-//======================================
-//= Monk shop, sells Knuckle weapons)
-//=======================================================
-prt_monk,135,263,3 shop Blacksmith 726,1801:-1,1803:-1,1805:-1
+einbroch,224,207,5 shop Chef Assistant 83,7457:-1
+lighthalzen,126,126,3 shop Chef Assistant 83,7456:-1,7452:-1
+amatsu,206,150,3 shop Chef Assistant 83,7453:-1,:-1
+louyang,256,123,5 shop Chef Assistant 820,7454:-1,577:-1
+gonryun,147,101,5 shop Chef Assistant 83,7452:-1,580:-1
+ayothaya,203,178,3 shop Chef Assistant 83,7455:-1,577:-1
+xmas,152,137,5 shop Chef Assistant 83,7457:-1,577:-1
+niflheim,209,180,5 shop Chef Assistant 83,581:-1
//===== Additional Comments(old): =================================
//= swapped shop titles in GONRYUN, thanks to Kashy