summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/alchemist.txt4
-rw-r--r--npc/merchants/ammo_boxes.txt2
-rw-r--r--npc/merchants/ammo_dealer.txt4
-rw-r--r--npc/merchants/clothes_dyer.txt4
-rw-r--r--npc/merchants/dye_maker.txt4
-rw-r--r--npc/merchants/grandpa_pharmacist.txt4
-rw-r--r--npc/merchants/hair_dyer.txt3
-rw-r--r--npc/merchants/hair_style.txt2
-rw-r--r--npc/merchants/icecream.txt6
-rw-r--r--npc/merchants/inn.txt60
-rw-r--r--npc/merchants/kunai_maker.txt6
-rw-r--r--npc/merchants/milk_trader.txt4
-rw-r--r--npc/merchants/novice_exchange.txt10
-rw-r--r--npc/merchants/quivers.txt2
-rw-r--r--npc/merchants/refine.txt52
-rw-r--r--npc/merchants/renters.txt8
-rw-r--r--npc/merchants/scrolls_arrows.txt10
-rw-r--r--npc/merchants/shops.txt380
-rw-r--r--npc/merchants/shuriken_maker.txt2
-rw-r--r--npc/merchants/socket_enchant.txt8
20 files changed, 287 insertions, 288 deletions
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index 9d813fcaf..a0c4f1556 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -16,7 +16,7 @@
//============================================================
-alde_alche.gat,24,188,3 script Gever AI Sharp 740,{
+alde_alche,24,188,3 script Gever AI Sharp 740,{
mes "[Gever AI Sharp]";
mes "Welcome to the Alchemist Union.";
mes "How can I assist you today?";
@@ -126,4 +126,4 @@ alde_alche.gat,24,188,3 script Gever AI Sharp 740,{
mes "[Gever AI Sharp]";
mes "Then come again next time.";
close;
-}
+} \ No newline at end of file
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index c51157a87..16c590ce0 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -12,7 +12,7 @@
//= 1.0 Added the first 8 ammo boxes [Playtester]
//============================================================
-que_ng.gat,187,149,3 script Kenny 83,{
+que_ng,187,149,3 script Kenny 83,{
mes "[Kenny]";
mes "My name is Kenny.";
mes "I can create ^0000FFbullet casings^000000";
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 5a2947928..2e45343d4 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -13,7 +13,7 @@
//============================================================
// Ammo Dealer Tony
-que_ng.gat,187,156,3 script Tony 86,{
+que_ng,187,156,3 script Tony 86,{
mes "[Tony]";
mes "I can make spheres for you.";
mes "Spheres are the ammunition for";
@@ -97,4 +97,4 @@ sF_Make:
mes "enough materials to create the";
mes "spheres.";
close;
-}
+} \ No newline at end of file
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index 8f179ae80..1472a50de 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -24,7 +24,7 @@
// Dyer Ginedin Rephere ---------------------------------------------------
-prt_in.gat,284,168,2 script Dyer Ginedin Rephere 55,{
+prt_in,284,168,2 script Dyer Ginedin Rephere 55,{
mes "[Dyer Ginedin Rephere]";
mes "11... 12... Mmm... good. I think I'll be able to finish before tonight’s party. Oh! I didn't notice that you were here. Anyway how may I assist you?";
M_Menu:
@@ -385,4 +385,4 @@ L_End:
mes "[Dyer Ginedin Rephere]";
mes "Make yourself at home. Even though I don't have time for you.";
close;
-}
+} \ No newline at end of file
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index 02c5ddaae..4fbf1bae4 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -16,7 +16,7 @@
// Dye Maker JavaDullihan =======================
-morocc_in.gat,146,99,2 script Dye Maker JavaDullihan 122,{
+morocc_in,146,99,2 script Dye Maker JavaDullihan 122,{
mes "[Dye Maker JavaDullihan]";
mes "Oh... What a Beautiful day today.";
mes "This is a perfect day to make Dyestuffs";
@@ -274,4 +274,4 @@ morocc_in.gat,146,99,2 script Dye Maker JavaDullihan 122,{
close;
M_End:
close;
-}
+} \ No newline at end of file
diff --git a/npc/merchants/grandpa_pharmacist.txt b/npc/merchants/grandpa_pharmacist.txt
index 869ef036e..94ca91176 100644
--- a/npc/merchants/grandpa_pharmacist.txt
+++ b/npc/merchants/grandpa_pharmacist.txt
@@ -23,7 +23,7 @@
//============================================================
-alberta_in.gat,16,28,4 script Grampa Pharmacist 61,{
+alberta_in,16,28,4 script Grampa Pharmacist 61,{
mes "[Grampa Pharmacist]";
mes "Hmmm... what do you want...?";
next;
@@ -159,4 +159,4 @@ sF_Make:
mes "[Grampa Pharmacist]";
mes "What?! That's not a valid amount!";
return;
-}
+} \ No newline at end of file
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index c4e10f2ca..da8ec57ec 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -17,7 +17,7 @@
// HairDyer Jovovich -----------------------------------------------------
-prt_in.gat,243,168,4 script HairDyer Jovovich 91,{
+prt_in,243,168,4 script HairDyer Jovovich 91,{
mes "[HairDyer Jovovich]";
mes "Welcome to my Hair Dying shop.";
next;
@@ -156,4 +156,3 @@ prt_in.gat,243,168,4 script HairDyer Jovovich 91,{
mes "I think... every human being has the right to become beautiful......";
close;
}
-
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index f79966894..07ae4d592 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -18,7 +18,7 @@
//= 1.1 Removed Duplicates [Silent]
//============================================================
-alberta.gat,137,37,6 script Stylist#01 91,{
+alberta,137,37,6 script Stylist#01 91,{
mes "[Veronica]";
mes "Welcome~~Welcome~~";
mes "Welcome to the one of the best Hair shop, Veronicas Beauty Saloon!!";
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index ca5f72011..633ce689a 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -14,7 +14,7 @@
//============================================================
//ALBERTA
-alberta.gat,120,45,2 script Ice Cream Maker::IceCreamer 85,{
+alberta,120,45,2 script Ice Cream Maker::IceCreamer 85,{
mes "[Ice Cream Maker]";
mes "Fresh Ice Cream made with snow from Lutie!";
mes "Enjoy it now, it won't be on sale for long!";
@@ -55,7 +55,7 @@ alberta.gat,120,45,2 script Ice Cream Maker::IceCreamer 85,{
}
//MORROC FIELD
-moc_fild16.gat,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 85
+moc_fild16,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 85
//MORROC
-//morocc.gat,160,144,4 duplicate(IceCreamer) Ice Cream Maker#3 85
+//morocc,160,144,4 duplicate(IceCreamer) Ice Cream Maker#3 85 \ No newline at end of file
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 494ed8b14..0bafa2e35 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -30,71 +30,71 @@
//======================== Prontera ===================================
// West Side Inn -------------------
-prt_in.gat,244,135,2 script Inn Maid::Sammy 53,{
+prt_in,244,135,2 script Inn Maid::Sammy 53,{
- callfunc "F_InnMaid","[Sammy]","West Inn","prt_in.gat",238,130;
- warp "prt_in.gat",237,102;
+ callfunc "F_InnMaid","[Sammy]","West Inn","prt_in",238,130;
+ warp "prt_in",237,102;
}
// East Side Inn ------------------
-prt_in.gat,61,141,2 script Inn Maid::Ahlma#01 53,{
+prt_in,61,141,2 script Inn Maid::Ahlma#01 53,{
- callfunc "F_InnMaid","[Ahlma]","East Inn","prt_in.gat",64,136;
- warp "prt_in.gat",49,173;
+ callfunc "F_InnMaid","[Ahlma]","East Inn","prt_in",64,136;
+ warp "prt_in",49,173;
}
//======================== Alberta ====================================
// North --------------------------
-alberta_in.gat,32,142,5 script Inn Maid::Moira 53,{
+alberta_in,32,142,5 script Inn Maid::Moira 53,{
- callfunc "F_InnMaid","[Moira]","North Inn","alberta_in.gat",26,138;
- warp "alberta_in.gat",18,188;
+ callfunc "F_InnMaid","[Moira]","North Inn","alberta_in",26,138;
+ warp "alberta_in",18,188;
}
// South -----------------------------
-alberta_in.gat,55,142,8 script Inn Maid::Tina 53,{
+alberta_in,55,142,8 script Inn Maid::Tina 53,{
- callfunc "F_InnMaid","[Tina]","South Inn","alberta_in.gat",60,140;
- warp "alberta_in.gat",68,188;
+ callfunc "F_InnMaid","[Tina]","South Inn","alberta_in",60,140;
+ warp "alberta_in",68,188;
}
//====================== Geffen ======================================
-geffen_in.gat,70,64,5 script Inn Maid::Betty 53,{
+geffen_in,70,64,5 script Inn Maid::Betty 53,{
- callfunc "F_InnMaid","[Betty]","Geffen Inn","geffen_in.gat",74,60;
- warp "geffen_in.gat",106,106;
+ callfunc "F_InnMaid","[Betty]","Geffen Inn","geffen_in",74,60;
+ warp "geffen_in",106,106;
}
//======================= Payon ======================================
-payon_in01.gat,131,62,5 script Inn Maid::SunHee 53,{
+payon_in01,131,62,5 script Inn Maid::SunHee 53,{
- callfunc "F_InnMaid","[Sun Hee]","Payon Inn","payon_in01.gat",132,56;
- warp "payon_in01.gat",140,15;
+ callfunc "F_InnMaid","[Sun Hee]","Payon Inn","payon_in01",132,56;
+ warp "payon_in01",140,15;
}
//======================== Morocc ====================================
// North East --------------------------
-morocc_in.gat,147,138,5 script Inn Maid::Suzie 53,{
+morocc_in,147,138,5 script Inn Maid::Suzie 53,{
- callfunc "F_InnMaid","[Suzie]","North East Inn","morocc_in.gat",142,140;
- warp "morocc_in.gat",174,144;
+ callfunc "F_InnMaid","[Suzie]","North East Inn","morocc_in",142,140;
+ warp "morocc_in",174,144;
}
// South --------------------------------
-morocc_in.gat,80,100,5 script Inn Maid::Shala 53,{
+morocc_in,80,100,5 script Inn Maid::Shala 53,{
- callfunc "F_InnMaid","[Shala]","South Inn","morocc_in.gat",78,95;
- warp "morocc_in.gat",74,128;
+ callfunc "F_InnMaid","[Shala]","South Inn","morocc_in",78,95;
+ warp "morocc_in",74,128;
}
//======================== Rachel ====================================
-ra_in01.gat,376,69,4 script Inn Keeper 931,{
+ra_in01,376,69,4 script Inn Keeper 931,{
- callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01.gat",375,58;
- warp "ra_in01.gat",384,128;
+ callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58;
+ warp "ra_in01",384,128;
}
//======================== Hugel ====================================
-hu_in01.gat,246,107,3 script Inn Maid::Receptionist 53,{
+hu_in01,246,107,3 script Inn Maid::Receptionist 53,{
- callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01.gat",263,95;
+ callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95;
warp "hu_in01",267,5;
}
@@ -135,4 +135,4 @@ function script F_InnMaid {
mes getarg(0);
mes "I am waiting for a job to do.";
close;
-}
+} \ No newline at end of file
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index 9e1d3459c..9d9c65738 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -1,5 +1,5 @@
//===== eAthena Script =======================================
-//= Kunai "Trader" @ que_ng.gat
+//= Kunai "Trader" @ que_ng
//===== By: ==================================================
//= erKURITA
//===== Current Version: =====================================
@@ -14,7 +14,7 @@
//= id of the 2 required items plus the amount. Can trade
//= up to 500 units (5,000 kunais) at once. [erKURITA]
//============================================================
-que_ng.gat,72,29,3 script Kunai Seller 83,{
+que_ng,72,29,3 script Kunai Seller 83,{
mes "[Jin]";
mes "Hi, I sell elemental enchanted kunais. I'll trade you some elemental stones and one kind of shuriken for a determined elemental Kunai";
next;
@@ -94,4 +94,4 @@ function script Kunai_Trade {
}
L_Return:
return;
-}
+} \ No newline at end of file
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index 559c1cc0d..454886e11 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -17,7 +17,7 @@
// Milk Trader -------------------------------------------------------------
-prontera.gat,71,131,7 script Milk Trader 86,{
+prontera,71,131,7 script Milk Trader 86,{
mes "[Milk Trader]";
mes "If you bring me an empty bottle and 20 Zeny, I will exchange it for 1 bottle of milk.";
next;
@@ -58,4 +58,4 @@ prontera.gat,71,131,7 script Milk Trader 86,{
mes "[Milk Trader]";
mes "You need more zeny.";
close;
-}
+} \ No newline at end of file
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index a0e6535b2..dbaee49e6 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -137,23 +137,23 @@ function script F_NMerch {
}
}
-prontera.gat,123,102,5 script Merchant#1 85,{
+prontera,123,102,5 script Merchant#1 85,{
callfunc "F_NMerch","Merchant",935,5,914,10,909,10;
}
-geffen.gat,173,88,5 script Merchant#2 85,{
+geffen,173,88,5 script Merchant#2 85,{
callfunc "F_NMerch","Merchant",935,5,915,6,909,10;
}
-morocc.gat,180,259,3 script Merchant#3 85,{
+morocc,180,259,3 script Merchant#3 85,{
callfunc "F_NMerch","Merchant",935,5,916,7,909,10;
}
-aldebaran.gat,152,63,5 script Merchant#4 85,{
+aldebaran,152,63,5 script Merchant#4 85,{
callfunc "F_NMerch","Merchant",955,1,916,7,909,10;
}
-payon.gat,200,134,5 script Merchant#5 85,{
+payon,200,134,5 script Merchant#5 85,{
//we remove 3rd item, by adding 0,0
callfunc "F_NMerch","Merchant",902,6,909,10,0,0;
} \ No newline at end of file
diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt
index 0d7eba5b3..409513966 100644
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -17,7 +17,7 @@
//============================================================
-payon_in01.gat,5,134,4 script Inventor Jaax 89,{
+payon_in01,5,134,4 script Inventor Jaax 89,{
mes "[Inventor Jaax]";
mes "My name is Jaax.";
mes "Without ego, I can";
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 4b2bca0ee..bcfa8f14d 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -44,7 +44,7 @@
//=========================================================
// Christopher: Geffen Blacksmith
//=========================================================
-geffen_in.gat,110,172,2 script Christopher#1::Chris 63,{
+geffen_in,110,172,2 script Christopher#1::Chris 63,{
mes "[Christopher Guillenrow]";
mes "Welcome to Christopher's Workshop. Ye can find all yer forging equipment here. So what can I help ye with?";
M_Menu:
@@ -178,37 +178,37 @@ ein_in01,38,29,6 duplicate(Chris) Christopher#2 63
//=====================================================================================
// Weapon/Armor Refiners
//=====================================================================================
-prt_in.gat,63,60,4 script Hollengrhen 85,{
+prt_in,63,60,4 script Hollengrhen 85,{
set @name$,"Hollengrhen";
callfunc "refinemain";
end;
}
-morocc_in.gat,73,38,4 script Aragham 99,{
+morocc_in,73,38,4 script Aragham 99,{
set @name$,"Aragham";
callfunc "refinemain";
end;
}
-payon.gat,144,173,4 script Antonio 88,{
+payon,144,173,4 script Antonio 88,{
set @name$,"Antonio";
callfunc "refinemain";
end;
}
-alberta_in.gat,28,58,4 script Fredrik 85,{
+alberta_in,28,58,4 script Fredrik 85,{
set @name$,"Fredrik";
callfunc "refinemain";
end;
}
-yuno_in01.gat,164,26,6 script Disturb 88,{
+yuno_in01,164,26,6 script Disturb 88,{
set @name$,"Disturb";
callfunc "refinemain";
end;
}
-ein_in01.gat,24,87,6 script Manthasman 826,{
+ein_in01,24,87,6 script Manthasman 826,{
set @name$,"Manthasman Pruhag";
callfunc "refinemain";
end;
}
-lhz_in02.gat,282,20,7 script Fulerr 869,{
+lhz_in02,282,20,7 script Fulerr 869,{
set @name$,"Fulerr";
callfunc "refinemain";
end;
@@ -565,37 +565,37 @@ L_refinenumber:
//==============================================================================
// Material Salesmen
//==============================================================================
-prt_in.gat,56,69,4 script Vurewell 86,{
+prt_in,56,69,4 script Vurewell 86,{
set @name$,"Vurewell";
callfunc "phramain";
end;
}
-payon.gat,145,178,4 script Begnahd 88,{
+payon,145,178,4 script Begnahd 88,{
set @name$,"Begnahd";
callfunc "phramain";
end;
}
-morocc_in.gat,65,37,4 script Sade 99,{
+morocc_in,65,37,4 script Sade 99,{
set @name$,"Sade";
callfunc "phramain";
end;
}
-alberta_in.gat,18,59,5 script Kahlamanlith 86,{
+alberta_in,18,59,5 script Kahlamanlith 86,{
set @name$,"Kahlamanlith";
callfunc "phramain";
end;
}
-yuno_in01.gat,171,26,6 script Dillemat 88,{
+yuno_in01,171,26,6 script Dillemat 88,{
set @name$,"Dillemat";
callfunc "phramain";
end;
}
-ein_in01.gat,15,87,7 script Tirehaus 86,{
+ein_in01,15,87,7 script Tirehaus 86,{
set @name$,"Tirehaus";
callfunc "phramain";
end;
}
-lhz_in02.gat,278,24,3 script Krugg 86,{
+lhz_in02,278,24,3 script Krugg 86,{
set @name$,"Krugg";
callfunc "phramain";
end;
@@ -658,37 +658,37 @@ L_ABOVE:
//==============================================================================
// Ori/Elu Refiners
//==============================================================================
-prt_in.gat,63,69,4 script Dietrich 84,{
+prt_in,63,69,4 script Dietrich 84,{
set @name$,"Dietrich";
callfunc "orimain";
end;
}
-payon.gat,137,178,4 script Hakhim 88,{
+payon,137,178,4 script Hakhim 88,{
set @name$,"Hakhim";
callfunc "orimain";
end;
}
-morocc_in.gat,72,32,4 script Abdul 99,{
+morocc_in,72,32,4 script Abdul 99,{
set @name$,"Abdul";
callfunc "orimain";
end;
}
-alberta_in.gat,21,63,5 script Xenophon 84,{
+alberta_in,21,63,5 script Xenophon 84,{
set @name$,"Xenophon";
callfunc "orimain";
end;
}
-yuno_in01.gat,171,22,6 script Delayt 88,{
+yuno_in01,171,22,6 script Delayt 88,{
set @name$,"Delayt";
callfunc "orimain";
end;
}
-ein_in01.gat,18,82,6 script Matestein 84,{
+ein_in01,18,82,6 script Matestein 84,{
set @name$,"Matestein";
callfunc "orimain";
end;
}
-lhz_in02.gat,281,24,5 script Fruel 84,{
+lhz_in02,281,24,5 script Fruel 84,{
set @name$,"Fruel";
callfunc "orimain";
end;
@@ -758,23 +758,23 @@ function script orimain {
//=====================================================================================
// Equipment Repairmen
//=====================================================================================
-prt_in.gat,62,54,2 script Grendal 84,{
+prt_in,62,54,2 script Grendal 84,{
set @name$,"Grendal";
callfunc "repairmain";
end;
}
//Temp Spot, Not Sure Where To place
-payon.gat,149,182,2 script Repairman#01 88,{
+payon,149,182,2 script Repairman#01 88,{
set @name$,"Repairman";
callfunc "repairmain";
end;
}
-morocc_in.gat,71,40,2 script Repairman#02 99,{
+morocc_in,71,40,2 script Repairman#02 99,{
set @name$,"Repairman";
callfunc "repairmain";
end;
}
-lhz_in02.gat,284,14,3 script Repairman#03 86,{
+lhz_in02,284,14,3 script Repairman#03 86,{
set @name$,"Repairman";
callfunc "repairmain";
end;
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index a225f736e..218bd2270 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -21,7 +21,7 @@
//============================================================
// PecoPeco Breeder (for Knights)-------------------------------------------
-prontera.gat,61,338,3 script PecoPeco Breeder 86,{
+prontera,61,338,3 script PecoPeco Breeder 86,{
if(Upper==0) set @price,2500; //Normal Peco - default price
if(Upper==1) set @price,4000; //Armored Peco
if(Upper==2) set @price,2000; //Baby Peco
@@ -74,7 +74,7 @@ L_Start:
}
// Grand PecoPeco Breeder (for Crusaders)-------------------------------------------
-prontera.gat,238,312,5 script Grand PecoPeco Breeder 86,{
+prontera,238,312,5 script Grand PecoPeco Breeder 86,{
if(Upper==0) set @price,3000; //Normal Peco - default price
if(Upper==1) set @price,5000; //Armored Peco
if(Upper==2) set @price,2500; //Baby Peco
@@ -127,7 +127,7 @@ L_Start:
}
// Falcon Master--------------------------------------------------------------
-hu_in01.gat,375,318,5 script Falcon Master 59,{
+hu_in01,375,318,5 script Falcon Master 59,{
if(Upper==0) set @price,800; //Normal Falcon - default price
if(Upper==1) set @price,1000; //Scarf Falcon
if(Upper==2) set @price,600; //Baby Falcon
@@ -179,4 +179,4 @@ hu_in01.gat,375,318,5 script Falcon Master 59,{
mes "[Falcon Master]";
mes "Have a nice day.";
close;
-}
+} \ No newline at end of file
diff --git a/npc/merchants/scrolls_arrows.txt b/npc/merchants/scrolls_arrows.txt
index 163de45f7..7f70056b7 100644
--- a/npc/merchants/scrolls_arrows.txt
+++ b/npc/merchants/scrolls_arrows.txt
@@ -27,12 +27,12 @@
// All Magic Scrolls + Crest of the Horse
//=======================================================
// don't lower the price
-geffen.gat,125,91,2 shop Magic Scrolls 735, 686:650, 687:1300, 688:500, 689:1000, 690:500, 691:1000, 692:500, 693:1000, 694:500, 695:1000, 696:500, 697:1000, 698:350, 699:700, 700:350, 12000:700, 12001:1000, 12002:2000, 12003:100
-//prt_in.gat,121,65,3 shop Magic Scrolls 735, 686:1300, 687:2600, 688:1000, 689:2000, 690:1000, 691:2000, 692:1000, 693:2000, 694:1000, 695:2000, 696:1000, 697:2000, 698:700, 699:1400, 700:700, 12000:1700, 12001:2000, 12002:4000, 12003:110
+geffen,125,91,2 shop Magic Scrolls 735, 686:650, 687:1300, 688:500, 689:1000, 690:500, 691:1000, 692:500, 693:1000, 694:500, 695:1000, 696:500, 697:1000, 698:350, 699:700, 700:350, 12000:700, 12001:1000, 12002:2000, 12003:100
+//prt_in,121,65,3 shop Magic Scrolls 735, 686:1300, 687:2600, 688:1000, 689:2000, 690:1000, 691:2000, 692:1000, 693:2000, 694:1000, 695:2000, 696:1000, 697:2000, 698:700, 699:1400, 700:700, 12000:1700, 12001:2000, 12002:4000, 12003:110
//=======================================================
// Arrows
//=======================================================
-//payon_in03.gat,159,10,4 shop Arrow Quivers 727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1
-//geffen.gat,123,107,4 shop Arrow Quivers 727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1
-//prt_in.gat,163,141,5 shop Arrow Quivers 727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1
+//payon_in03,159,10,4 shop Arrow Quivers 727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1
+//geffen,123,107,4 shop Arrow Quivers 727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1
+//prt_in,163,141,5 shop Arrow Quivers 727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1 \ No newline at end of file
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 4a2d2b1ca..2514f78e3 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -30,289 +30,289 @@
//=======================================================
//ALBERTA
//=======================================================
-alb2trea.gat,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.gat,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.gat,165,96,1 shop Item Collector 74,909:-1,528:-1
-alberta_in.gat,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.gat,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.gat,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
-alberta_in.gat,175,97,4 shop Weapon Dealer 82,1146:-1,1245:-1
-//alberta_in.gat,18,59,5 shop Miner 48,1010:-1,1011:-1
-alberta.gat,167,135,4 shop Ingredient Seller 712,579:-1
+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
+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,4 shop Ingredient Seller 712,579:-1
//=======================================================
//AL DE BARAN
//=======================================================
-aldeba_in.gat,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.gat,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.gat,22,47,4 shop Weapon Dealer 713,1146:-1,1245:-1
-aldeba_in.gat,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
+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,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
//Uncommented for homunculus on trunk
-alde_alche.gat,38,184,2 shop Homunculus Supplies 755,7143:-1,7141:-1,7140:-1,12040:-1
-aldebaran.gat,166,109,7 shop Ingredient Seller 750,580:-1,7482:-1 //temp goods
+alde_alche,38,184,2 shop Homunculus Supplies 755,7143:-1,7141:-1,7140:-1,12040:-1
+aldebaran,166,109,7 shop Ingredient Seller 750,580:-1,7482:-1 //temp goods
//=======================================================
//AMATSU
//=======================================================
//|Removed the following shops according to RockmanEXe's info. Some were removed anyway.
-//amatsu.gat,176,126,4 shop Fruit Merchant 53,512:-1,513:-1,515:-1,516:-1
-//amatsu.gat,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.gat,180,102,3 shop Flower Girl 96,712:-1,744:-1,2612:-1
-//amatsu.gat,189,99,7 shop Butcher 49,517:-1,528:-1,540:-1,541:-1
-//amatsu.gat,169,119,6 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1
-//amatsu.gat,183,127,5 shop Milk Merchant 90,519:-1
-//ama_in01.gat,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.gat,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.gat,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
+//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.gat,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.gat,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.gat,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.gat,205,150,2 shop Ingredient Seller 83,7453:-1,579:-1
+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,205,150,2 shop Ingredient Seller 83,7453:-1,579:-1
//| Official Ninja Shops
-que_ng.gat,72,31,2 shop Shuriken Dealer 83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1
-que_ng.gat,73,26,5 shop Tool Dealer 83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1
+que_ng,72,31,2 shop Shuriken Dealer 83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1
+que_ng,73,26,5 shop Tool Dealer 83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1
//=======================================================
//AYOTHAYA
//=======================================================
-ayo_in01.gat,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.gat,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.gat,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.gat,202,178,4 shop Food Seller 750,7456:-1,577:-1
+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,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,202,178,4 shop Food Seller 750,7456:-1,577:-1
//=======================================================
//COMODO
//=======================================================
-cmd_in01.gat,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.gat,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.gat,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.gat,296,125,4 shop Souvenir Merchant 101,965:-1,964:-1
-comodo.gat,244,296,7 shop Item Collector 74,909:-1
-comodo.gat,224,164,4 shop Food Seller 750,7455:-1
+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,224,164,4 shop Food Seller 750,7455:-1
-cmd_fild07.gat,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.gat,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.gat,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
+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
//=======================================================
-ein_in01.gat,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
+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.gat,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.gat,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.gat,119,26,4 shop Weapon Dealer 855,1247:-1,1248:-1,1249:-1,13000:-1
-einbroch.gat,138,66,3 shop Head Gear Dealer 850,5114:-1,2218:-1
-einbroch.gat,82,199,3 shop Paddler 855,512:-1,645:-1,1750:-1,501:-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,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,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
//Official Gunslingers shops.
-que_ng.gat,179,91,4 shop Gunner#Gun Seller 900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1
-que_ng.gat,180,79,4 shop Gunner#Ammo Seller 900,13200:-1,13201:-1,13202:-1
+que_ng,179,91,4 shop Gunner#Gun Seller 900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1
+que_ng,180,79,4 shop Gunner#Ammo Seller 900,13200:-1,13201:-1,13202:-1
//=======================================================
//GEFFEN
//=======================================================
-geffen_in.gat,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.gat,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.gat,22,171,6 shop Weapon Dealer 84,1146:-1,1245:-1
-geffen_in.gat,74,144,1 shop Trader 66,909:-1,911:-1,910:-1,912:-1
-geffen_in.gat,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.gat,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.gat,171,123,1 shop Tool Dealer 64,1092:-1,1093:-1
-geffen.gat,193,152,3 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-geffen.gat,135,64,3 shop Ingredient Seller 750,580:-1,7482:-1 //temp coords, temp goods
+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,135,64,3 shop Ingredient Seller 750,580:-1,7482:-1 //temp coords, temp goods
//=======================================================
//GONRYUN
//=======================================================
-gonryun.gat,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.gat,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.gat,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.gat,148,101,4 shop Food Seller 750,580:-1,7452:-1
+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,148,101,4 shop Food Seller 750,580:-1,7452:-1
//=======================================================
//HUGEL
//=======================================================
-hugel.gat,105,169,5 shop Milk Merchant 53,519:-1
-hugel.gat,77,167,3 shop Food Seller 892,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1
-hu_in01.gat,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.gat,252,368,2 shop Tool Trader 90,717:-1,2201:-1,910:-1,528:-1
-hu_in01.gat,100,390,2 shop Bow Dealer 86,1701:-1,1707:-1,1718:-1,1714:-1
-hu_in01.gat,94,390,2 shop Weapon Dealer 898,1116:-1,1154:-1,1354:-1,1201:-1
-hu_in01.gat,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
+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
+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
//=======================================================
//IZLUDE
//=======================================================
-izlude_in.gat,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.gat,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.gat,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.gat,121,138,1 shop Butcher 54,517:-1
-izlude.gat,127,120,1 shop Fruit Merchant 72,512:-1,513:-1,515:-1,516:-1
-izlude.gat,137,126,3 shop Milk Merchant 701,519:-1
-izlude.gat,164,138,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
+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
//=======================================================
//LOUYANG
//=======================================================
-lou_in02.gat,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.gat,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.gat,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.gat,255,123,4 shop Food Seller 750,7454:-1,577:-1
+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,255,123,4 shop Food Seller 750,7454:-1,577:-1
//=======================================================
//LIGHTHALZEN
//=======================================================
-lighthalzen.gat,69,75,5 shop Fruit Gardener 102,512:-1,513:-1
-lighthalzen.gat,112,44,8 shop Flower Girl 90,712:-1,744:-1,748:-1
-lighthalzen.gat,126,126,4 shop Food Seller 83,7456:-1,7452:-1
-lighthalzen.gat,124,129,8 shop Vegetable Gardener 91,515:-1,516:-1,535:-1
-lighthalzen.gat,222,191,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-lhz_in02.gat,286,95,4 shop Begginer's Merchant 62,1621:-1,5112:-1,2416:-1,2113:-1,2512:-1
-lhz_in02.gat,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.gat,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
-lhz_in02.gat,273,35,4 shop Wand Dealer 854,1601:-1,1604:-1,1607:-1,1617:-1,1619:-1
-lhz_in02.gat,105,21,3 shop Jewel Seller 91,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1
-lhz_in02.gat,17,220,4 shop Vegetable Merchant 91,515:-1,516:-1,535:-1
-lhz_in02.gat,21,220,5 shop Fruit Merchant 102,512:-1,513:-1
-lhz_in02.gat,32,218,6 shop Butcher 54,517:-1
-lhz_in02.gat,38,145,4 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1
-lhz_in02.gat,47,148,5 shop Wedding Goods Merchant 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1
-lhz_in02.gat,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.gat,85,215,4 shop Doll Merchant 91,740:-1,741:-1,742:-1
-lhz_in02.gat,87,208,2 shop Eyewear Merchant 715,2243:-1,2212:-1,2242:-1,2241:-1
-lhz_in03.gat,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
+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,4 shop Food Seller 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
+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
//=======================================================
//LUTIE
//=======================================================
-xmas_in.gat,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.gat,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.gat,169,34,2 shop Gift Merchant 702,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1
-xmas_in.gat,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.gat,144,207,4 shop Tool Dealer 83,601:-1,602:-1
+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,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
//=======================================================
//MORROC
//=======================================================
-morocc_in.gat,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.gat,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.gat,35,69,1 shop Trader 89,2609:-1,1516:-1,1522:-1
-morocc.gat,139,92,1 shop Trader 99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1
-morocc.gat,145,44,1 shop Jewel Seller 99,730:-1,2613:-1
-morocc.gat,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.gat,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.gat,157,72,6 shop Butcher 49,517:-1
-morocc.gat,166,51,1 shop Jewel Seller 102,721:-1,723:-1,726:-1,728:-1,729:-1
-morocc.gat,170,101,3 shop Tool Dealer 85,911:-1,528:-1,919:-1,925:-1
-morocc.gat,206,250,1 shop Tool Dealer 85,911:-1,528:-1,919:-1,925:-1
-morocc.gat,244,134,1 shop Trader 93,2612:-1
-morocc.gat,259,193,1 shop Trader 99,747:-1
-morocc.gat,268,193,1 shop Trader 93,748:-1
-morocc.gat,269,167,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-morocc.gat,120,97,5 shop Ingredient Seller 86,7452:-1,7453:-1,7454:-1,7455:-1,7456:-1
-//morocc_in.gat,65,37,4 shop Miner 48,1010:-1,1011:-1
-morocc_in.gat,132,57,0 shop Weapon Dealer 99,1146:-1,1245:-1
+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 Ingredient Seller 86,7452:-1,7453:-1,7454:-1,7455:-1,7456:-1
+//morocc_in,65,37,4 shop Miner 48,1010:-1,1011:-1
+morocc_in,132,57,0 shop Weapon Dealer 99,1146:-1,1245:-1
//=======================================================
//NIFLHEIM
//=======================================================
-nif_in.gat,35,84,3 shop Weapon Dealer 795,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1
-nif_in.gat,35,91,3 shop Armor Dealer 796,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1
-nif_in.gat,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.gat,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.gat,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.gat,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.gat,201,209,3 shop Milk Merchant 794,519:-1
-//niflheim.gat,224,185,3 shop Fruit Merchant 795,512:-1,513:-1
-//niflheim.gat,209,161,3 shop Butcher 794,517:-1,528:-1
-//niflheim.gat,205,152,3 shop Gift Merchant 795,734:-1,735:-1,736:-1,737:-1,746:-1
-niflheim.gat,205,158,1 shop Ingredient Seller 795,581:-1 //temp coords, temp spr ID
+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,205,158,1 shop Ingredient Seller 795,581:-1 //temp coords, temp spr ID
//=======================================================
//PAYON
//=======================================================
-payon_in01.gat,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.gat,5,129,6 shop Weapon Dealer 703,1146:-1,1245:-1
-payon_in01.gat,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.gat,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.gat,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.gat,159,96,5 shop Tool Dealer 88,1750:-1,501:-1,645:-1,601:-1,602:-1
-payon.gat,205,119,4 shop Food Seller 750,7455:-1
+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,205,119,4 shop Food Seller 750,7455:-1
//Not Shure About Pet Shop
-payon.gat,104,63,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-pay_arche.gat,125,108,1 shop Milk Merchant 90,519:-1
-pay_arche.gat,132,101,1 shop Vegetable Merchant 102,515:-1,516:-1
-pay_arche.gat,140,124,1 shop Butcher 87,517:-1,528:-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
//=======================================================
//PRONTERA
//=======================================================
-prontera.gat,73,134,1 shop Milk Merchant 90,519:-1
-prontera.gat,104,49,1 shop Fruit Merchant 102,512:-1,513:-1
-prontera.gat,64,125,1 shop Butcher 87,517:-1,528:-1
-prontera.gat,58,182,1 shop Flower Girl 96,712:-1,744:-1
-prontera.gat,113,42,1 shop Flower Lady 90,712:-1,744:-1
-prontera.gat,105,87,1 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1
-prontera.gat,218,211,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
-prontera.gat,248,153,1 shop Doll Merchant 85,740:-1,741:-1,742:-1
-prontera.gat,156,212,2 shop Food Seller 700,7454:-1,7452:-1,7482:-1,580:-1
-prontera.gat,48,58,7 shop Vegetable Gardener 91,515:-1,516:-1,535:-1
-prt_church.gat,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.gat,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.gat,211,169,1 shop Wedding Goods Merchant 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1
-prt_in.gat,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.gat,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.gat,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.gat,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.gat,56,69,4 shop Miner 48,1010:-1,1011:-1
-prt_in.gat,164,140,4 shop Weapon Dealer 66,1146:-1,1245:-1
+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,2 shop Food Seller 700,7454:-1,7452:-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
//=======================================================
//RACHEL
//=======================================================
-ra_in01.gat,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.gat,254,300,3 shop Tool Dealer 931,512:-1,513:-1
-ra_in01.gat,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
-ra_in01.gat,176,389,3 shop Weapon Dealer 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
-rachel.gat,65,80,0 shop Vegetable Gardener 919,515:-1,535:-1,516:-1
+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,254,300,3 shop Tool Dealer 931,512:-1,513:-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
+ra_in01,176,389,3 shop Weapon Dealer 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
+rachel,65,80,0 shop Vegetable Gardener 919,515:-1,535:-1,516:-1
//=======================================================
//TURTLE ISLAND
//=======================================================
-tur_dun01.gat,158,54,6 shop Tool Dealer 99,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,645:-1,656:-1
+tur_dun01,158,54,6 shop Tool Dealer 99,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,645:-1,656:-1
// Spectacles: missing as second item in list
// Luxury Sunglases: not sure of item/price.
//=======================================================
//UMBALA
//=======================================================
-um_in.gat,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.gat,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.gat,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.gat,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.gat,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.gat,103,124,4 shop Food Merchant 91,515:-1,516:-1,535:-1,519:-1,517:-1
-umbala.gat,101,154,4 shop Food Seller 750,7456:-1,577:-1
+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,101,154,4 shop Food Seller 750,7456:-1,577:-1
//=======================================================
//YUNO
//=======================================================
-yuno.gat,65,122,4 shop Fruit Merchant 93,512:-1,513:-1,515:-1,516:-1
-yuno.gat,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.gat,226,106,5 shop Trader 97, 911:-1, 910:-1, 912:-1
-yuno.gat,197,115,4 shop Pet Merchant 124, 537:-1, 643:-1, 10013:-1, 10014:-1
-yuno.gat,205,104,4 shop Equip Dealer 84, 2340:-1, 2341:-1, 2411:-1, 2222:-1, 2230:-1, 1721:-1
-yuno.gat,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.gat,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.gat,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.gat,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.gat,176,22,3 shop Scroll Seller 89,7433:-1 //Temp shop in Yuno that sells Blank Scrolls
-yuno.gat,133,171,2 shop Ingredient Seller 750,7457:-1,7482:-1
+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
+yuno,133,171,2 shop Ingredient Seller 750,7457:-1,7482:-1
//=======================================================
@@ -320,7 +320,7 @@ yuno.gat,133,171,2 shop Ingredient Seller 750,7457:-1,7482:-1
//======================================
//= Monk shop, sells Knuckle weapons)
//=======================================================
-prt_monk.gat,135,263,3 shop Blacksmith 726,1801:-1,1803:-1,1805:-1
+prt_monk,135,263,3 shop Blacksmith 726,1801:-1,1803:-1,1805:-1
//===== Additional Comments(old): =================================
//= swapped shop titles in GONRYUN, thanks to Kashy
diff --git a/npc/merchants/shuriken_maker.txt b/npc/merchants/shuriken_maker.txt
index 2e09ff24a..8921c44ca 100644
--- a/npc/merchants/shuriken_maker.txt
+++ b/npc/merchants/shuriken_maker.txt
@@ -17,7 +17,7 @@
//= 1.2b Thanks to $ephiroth, fixed wrong ingredient lists
//============================================================
-que_ng.gat,22,62,3 script Taitsu 709,{
+que_ng,22,62,3 script Taitsu 709,{
mes "[Taitsu]";
if(Class!=Job_Ninja){
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 20f6b0c21..d046e7227 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -18,7 +18,7 @@
//============================================================
-lhz_in02.gat,281,35,5 script Socket Enchant 84,{
+lhz_in02,281,35,5 script Socket Enchant 84,{
mes "[Socket Enchant]";
mes "Hello.";
@@ -840,6 +840,6 @@ function script f_armor_s2 {
}
-prt_in.gat,33,70,5 duplicate(Socket Enchant) Socket Enchant#2 84
-payon.gat,140,151,5 duplicate(Socket Enchant) Socket Enchant#3 84
-morocc.gat,51,41,5 duplicate(Socket Enchant) Socket Enchant#4 84 \ No newline at end of file
+prt_in,33,70,5 duplicate(Socket Enchant) Socket Enchant#2 84
+payon,140,151,5 duplicate(Socket Enchant) Socket Enchant#3 84
+morocc,51,41,5 duplicate(Socket Enchant) Socket Enchant#4 84 \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-11 02:14:53 +0000