summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
authorshennetsind <shennetsind@users.noreply.github.com>2013-10-30 14:48:26 -0700
committershennetsind <shennetsind@users.noreply.github.com>2013-10-30 14:48:26 -0700
commit566529c819bcf9aeb1bd3a4a691c443c2b88d076 (patch)
tree5d3448afe67329cc9d650732425f0152ef242e7b /npc/merchants
parent8039bd169886a4b0583cd1a794fcf61c79626e86 (diff)
parente9b4aec5eae2bc3454636a71953dcb1e1abb5ee7 (diff)
downloadhercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.gz
hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.bz2
hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.xz
hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.zip
Merge pull request #210 from kisuka/npc-constants
NPC Constants
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/advanced_refiner.txt2
-rw-r--r--npc/merchants/alchemist.txt2
-rw-r--r--npc/merchants/ammo_boxes.txt2
-rw-r--r--npc/merchants/ammo_dealer.txt2
-rw-r--r--npc/merchants/buying_shops.txt4
-rw-r--r--npc/merchants/cash_hair.txt2
-rw-r--r--npc/merchants/cash_trader.txt2
-rw-r--r--npc/merchants/cashheadgear_dye.txt2
-rw-r--r--npc/merchants/clothes_dyer.txt2
-rw-r--r--npc/merchants/coin_exchange.txt4
-rw-r--r--npc/merchants/dye_maker.txt2
-rw-r--r--npc/merchants/elemental_trader.txt2
-rw-r--r--npc/merchants/enchan_arm.txt2
-rw-r--r--npc/merchants/gemstone.txt2
-rw-r--r--npc/merchants/hair_dyer.txt4
-rw-r--r--npc/merchants/hair_style.txt8
-rw-r--r--npc/merchants/hd_refine.txt32
-rw-r--r--npc/merchants/icecream.txt6
-rw-r--r--npc/merchants/inn.txt24
-rw-r--r--npc/merchants/kunai_maker.txt2
-rw-r--r--npc/merchants/milk_trader.txt2
-rw-r--r--npc/merchants/novice_exchange.txt10
-rw-r--r--npc/merchants/old_pharmacist.txt2
-rw-r--r--npc/merchants/quivers.txt2
-rw-r--r--npc/merchants/refine.txt74
-rw-r--r--npc/merchants/renters.txt6
-rw-r--r--npc/merchants/shops.txt356
-rw-r--r--npc/merchants/socket_enchant.txt16
-rw-r--r--npc/merchants/socket_enchant2.txt8
-rw-r--r--npc/merchants/wander_pet_food.txt4
30 files changed, 294 insertions, 294 deletions
diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt
index 0ab0e29e8..57528e2b4 100644
--- a/npc/merchants/advanced_refiner.txt
+++ b/npc/merchants/advanced_refiner.txt
@@ -25,7 +25,7 @@
//= 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";
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index e3da99291..af0cbc7d9 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -18,7 +18,7 @@
//= 1.8 Moved Craft Book Merchant to Renewal path. [Euphy]
//============================================================
-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 -";
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index 5cb63a57b..6501a7c6c 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -16,7 +16,7 @@
//= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy]
//============================================================
-alberta,118,157,3 script Magazine Dealer Kenny::mdk 83,{
+alberta,118,157,3 script Magazine Dealer Kenny::mdk 4_M_01,{
if (BaseJob == Job_Gunslinger) {
mes "[Kenny]";
mes "Welcome to my Magazine Shop.";
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 7a13a5fc5..382916b10 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -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.";
diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt
index 02ce3c826..f77a45197 100644
--- a/npc/merchants/buying_shops.txt
+++ b/npc/merchants/buying_shops.txt
@@ -14,7 +14,7 @@
// 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.";
@@ -92,7 +92,7 @@ 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) {
diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt
index 65c181f60..db0b91a66 100644
--- a/npc/merchants/cash_hair.txt
+++ b/npc/merchants/cash_hair.txt
@@ -10,7 +10,7 @@
//= 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 479ccd7cf..28db3e69a 100644
--- a/npc/merchants/cash_trader.txt
+++ b/npc/merchants/cash_trader.txt
@@ -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 c2c91c1a6..f2d739aba 100644
--- a/npc/merchants/cashheadgear_dye.txt
+++ b/npc/merchants/cashheadgear_dye.txt
@@ -12,7 +12,7 @@
//= 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 1395538ae..39a12cbc1 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -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]
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index 1aa28e519..024cdf33e 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -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 \ No newline at end of file
+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 336c0798f..f25954cb3 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -17,7 +17,7 @@
//= 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 -";
diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt
index dde742514..518f782a9 100644
--- a/npc/merchants/elemental_trader.txt
+++ b/npc/merchants/elemental_trader.txt
@@ -12,7 +12,7 @@
//= 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 0375aa15d..a236722fe 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -15,7 +15,7 @@
//= 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 >= 400000) {
diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt
index 40c86a5ff..1d8837f28 100644
--- a/npc/merchants/gemstone.txt
+++ b/npc/merchants/gemstone.txt
@@ -17,7 +17,7 @@
//= 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 8b09afa6c..fc1113603 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -15,7 +15,7 @@
//= 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?";
@@ -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~";
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 040802811..47f273930 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -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?";
@@ -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.";
@@ -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";
@@ -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!";
diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt
index 5371a86a8..84e3adf32 100644
--- a/npc/merchants/hd_refine.txt
+++ b/npc/merchants/hd_refine.txt
@@ -145,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)
//============================================================
@@ -307,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 3c5c1874b..0c23555d2 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -48,34 +48,34 @@
//========================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_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_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_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;
@@ -84,13 +84,13 @@ payon_in01,132,62,5 script Inn Employee#Ahee 53,{
//========================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;
@@ -98,21 +98,21 @@ morocc_in,80,100,5 script Inn Employee#Manar 53,{
*/
//======================Aldebaran ===================================
-aldeba_in,92,58,5 script Inn Maid#Rilim 53,{
+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,{
+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,{
+lhz_in02,230,284,4 script Hotel Employee#01 4_M_04,{
mes "[Hotel Employee]";
mes "Welcome to";
mes "the Royal Dragon,";
@@ -157,14 +157,14 @@ lhz_in02,230,284,4 script Hotel Employee#01 86,{
}
//========================Hugel ====================================
-hu_in01,246,107,3 script Inn Maid#Receptionist 53,{
+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,{
+ve_in,157,219,5 script Inn Master#Receptionist 4_M_SEAMAN,{
mes "[Inn Master]";
mes "Good day~";
mes "Welcome to the";
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index 690353040..b2c624bb0 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -16,7 +16,7 @@
//= 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 1d65418a0..23d144231 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -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";
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index d7f519d1f..5474190e6 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -15,7 +15,7 @@
//= 1.4 Added checkweight, and input min/max values. [L0ne_W0lf]
//============================================================
-prontera,123,102,5 script Merchant#pron 85,{
+prontera,123,102,5 script Merchant#pron 4_M_03,{
if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
mes "[Merchant]";
mes "Haha!";
@@ -71,7 +71,7 @@ prontera,123,102,5 script Merchant#pron 85,{
}
}
-morocc,180,259,3 script Merchant#morroc 85,{
+morocc,180,259,3 script Merchant#morroc 4_M_03,{
if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
mes "[Merchant]";
mes "Haha!";
@@ -128,7 +128,7 @@ morocc,180,259,3 script Merchant#morroc 85,{
}
}
-payon,200,134,5 script Merchant#pay 85,{
+payon,200,134,5 script Merchant#pay 4_M_03,{
if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
mes "[Merchant]";
mes "Haha!";
@@ -182,7 +182,7 @@ payon,200,134,5 script Merchant#pay 85,{
}
}
-aldebaran,152,63,5 script Merchant#alde 85,{
+aldebaran,152,63,5 script Merchant#alde 4_M_03,{
if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
mes "[Merchant]";
mes "Haha!";
@@ -239,7 +239,7 @@ aldebaran,152,63,5 script Merchant#alde 85,{
}
}
-geffen,173,88,5 script Merchant#geff 85,{
+geffen,173,88,5 script Merchant#geff 4_M_03,{
if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
mes "[Merchant]";
mes "Haha!";
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index c62e36479..5384125e1 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -22,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 -";
diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt
index 53ae6d114..6b544c920 100644
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -22,7 +22,7 @@
//= Removed "Holy Arrows" from the list.
//============================================================
-payon_in01,5,134,5 script Inventor Jaax 89,{
+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";
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 3efbe592a..d65fd5c2e 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -63,7 +63,7 @@
// 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?";
@@ -329,7 +329,7 @@ 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 -";
@@ -565,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;
}
@@ -897,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;
}
@@ -1010,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;
}
@@ -1110,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;
}
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index ee9f70952..dc4d67235 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -25,7 +25,7 @@
//============================================================
// 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
@@ -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
@@ -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
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 2e339a59a..b20874ffb 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -41,286 +41,286 @@
//=======================================================
// 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): =================================
//= swapped shop titles in GONRYUN, thanks to Kashy
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 546c7c17b..9d90e31aa 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -334,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]";
@@ -356,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 3ee1b036b..3e7c64808 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -377,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 c985cc4a3..6fb0b41f7 100644
--- a/npc/merchants/wander_pet_food.txt
+++ b/npc/merchants/wander_pet_food.txt
@@ -12,7 +12,7 @@
//= 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;
}