20 files changed, 44 insertions, 44 deletions
diff --git a/world/map/npc/001-1/adrian.txt b/world/map/npc/001-1/adrian.txt
index 4f9722d0..dba78c21 100644
--- a/world/map/npc/001-1/adrian.txt
+++ b/world/map/npc/001-1/adrian.txt
@@ -5,7 +5,7 @@
 // state 2: Adrian gave the luggage to the player
 // state 3: player gave luggage to Kylian and Kylian asks who to talk to for the shop license
 
-001-1.gat,113,64,0|script|Adrian|213
+001-1,113,64,0|script|Adrian|213
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
 
diff --git a/world/map/npc/001-1/ched.txt b/world/map/npc/001-1/ched.txt
index 7dfc4ed7..b6159583 100644
--- a/world/map/npc/001-1/ched.txt
+++ b/world/map/npc/001-1/ched.txt
@@ -1,6 +1,6 @@
 // Student at Tulimshar's magic academy
 
-001-1.gat,43,48,0|script|Ched|113
+001-1,43,48,0|script|Ched|113
 {
     mes "[Ched]";
     mes "\"I'm trying to get a spell to work. It's supposed to combine two potions, but I can't seem to figure out which two those are...\"";
diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt
index 3ce987c1..6749f0e3 100644
--- a/world/map/npc/001-1/children.txt
+++ b/world/map/npc/001-1/children.txt
@@ -1,6 +1,6 @@
 // Aisha
 
-001-1.gat,102,27,0|script|Aisha|108
+001-1,102,27,0|script|Aisha|108
 {
     set @TEMP,rand(10);
     if(@TEMP == 1) goto L_1;
diff --git a/world/map/npc/001-1/constable.txt b/world/map/npc/001-1/constable.txt
index 0d8bc06c..73a74a2f 100644
--- a/world/map/npc/001-1/constable.txt
+++ b/world/map/npc/001-1/constable.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,50,74,0|script|Constable Perry Graf|150
+001-1,50,74,0|script|Constable Perry Graf|150
 {
     mes "[Constable Perry Graf]";
     mes "\"Hello, make sure the rules are followed.\"";
diff --git a/world/map/npc/001-1/dock.txt b/world/map/npc/001-1/dock.txt
index 941e222a..05402b94 100644
--- a/world/map/npc/001-1/dock.txt
+++ b/world/map/npc/001-1/dock.txt
@@ -2,19 +2,19 @@
 // Author: Wushin
 
 // Ferry Sign
-001-1.gat,61,71,0|script|Ferry Schedule#2|396
+001-1,61,71,0|script|Ferry Schedule#2|396
 {
     callfunc "FerryManifest";
     end;
 }
 
-001-1.gat,75,70,0|script|Tulimshar Koga|395,8,3
+001-1,75,70,0|script|Tulimshar Koga|395,8,3
 {
     callfunc "BoardFerry";
     close;
 }
 
-001-1.gat,70,70,0|script|#TulimsharDock|127
+001-1,70,70,0|script|#TulimsharDock|127
 {
     end;
 OnCommandArrive:
diff --git a/world/map/npc/001-1/eomie.txt b/world/map/npc/001-1/eomie.txt
index ab6a72bc..6528ddbe 100644
--- a/world/map/npc/001-1/eomie.txt
+++ b/world/map/npc/001-1/eomie.txt
@@ -18,7 +18,7 @@
 // state 14: gave present to Eomie
 // state 15: reported back to Anwar and done
 
-001-1.gat,71,23,0|script|Eomie|164
+001-1,71,23,0|script|Eomie|164
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
diff --git a/world/map/npc/001-1/ferry_master.txt b/world/map/npc/001-1/ferry_master.txt
index 6454d310..9cfb1e74 100644
--- a/world/map/npc/001-1/ferry_master.txt
+++ b/world/map/npc/001-1/ferry_master.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,64,75,0|script|Ferry Master#tulimshar|138
+001-1,64,75,0|script|Ferry Master#tulimshar|138
 {
     mes "[Ferry Master]";
     mes "\"Hello! Do you need something?\"";
diff --git a/world/map/npc/001-1/gate_guards.txt b/world/map/npc/001-1/gate_guards.txt
index 5eb44e36..dea801ef 100644
--- a/world/map/npc/001-1/gate_guards.txt
+++ b/world/map/npc/001-1/gate_guards.txt
@@ -1,24 +1,24 @@
 // Guard near the magic school
-001-1.gat,39,33,0|script|Guard#school|104
+001-1,39,33,0|script|Guard#school|104
 {
     mes "[Guard]";
     mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
     close;
 }
-001-1.gat,56,47,0|script|Guard#castle|104
+001-1,56,47,0|script|Guard#castle|104
 {
     mes "[Guard]";
     mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\"";
     close;
 }
 
-001-1.gat,61,99,0|script|Guard#east3|104
+001-1,61,99,0|script|Guard#east3|104
 {
     mes "[Guard]";
     mes "\"The Palace is North of here. That is where you will find the Council of Wizards.\"";
     close;
 }
-001-1.gat,53,72,0|script|Guard#govt_out|123
+001-1,53,72,0|script|Guard#govt_out|123
 {
     mes "[Guard]";
     mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
diff --git a/world/map/npc/001-1/gossip.txt b/world/map/npc/001-1/gossip.txt
index 5d3bb671..283de9d7 100644
--- a/world/map/npc/001-1/gossip.txt
+++ b/world/map/npc/001-1/gossip.txt
@@ -1,6 +1,6 @@
 // NPC to provide hints on progression of linear quest chain in Tulimshar
 
-001-1.gat,66,104,0|script|Gladys|154
+001-1,66,104,0|script|Gladys|154
 {
     mes "[Gladys, Town Gossip]";
     mes "\"Hello deary!  I hear some of the most fascinating rumors and bits of news. I just heard a bit more today!\"";
diff --git a/world/map/npc/001-1/guards.txt b/world/map/npc/001-1/guards.txt
index 358604eb..0167510e 100644
--- a/world/map/npc/001-1/guards.txt
+++ b/world/map/npc/001-1/guards.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,103,99,0|script|Ekinu|104
+001-1,103,99,0|script|Ekinu|104
 {
     mes "[Ekinu the Town Guard]";
     mes "\"What a disaster... I can't believe that we managed to rebuild the town so quickly.\"";
@@ -75,7 +75,7 @@ L_Close:
     close;
 }
 
-001-1.gat,107,42,0|script|Ryan|104
+001-1,107,42,0|script|Ryan|104
 {
     if (getskilllv(SKILL_MAGIC)) goto L_message;
 
diff --git a/world/map/npc/001-1/inac.txt b/world/map/npc/001-1/inac.txt
index 7d5f6e4d..2eb6e0a5 100644
--- a/world/map/npc/001-1/inac.txt
+++ b/world/map/npc/001-1/inac.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,58,81,0|script|Inac|156
+001-1,58,81,0|script|Inac|156
 {
     set @halloween_npc_id, $@halloween_npc_inac;
     callfunc "TrickOrTreat";
diff --git a/world/map/npc/001-1/mapflags.txt b/world/map/npc/001-1/mapflags.txt
index 896cff6a..5815d542 100644
--- a/world/map/npc/001-1/mapflags.txt
+++ b/world/map/npc/001-1/mapflags.txt
@@ -1,2 +1,2 @@
-001-1.gat|mapflag|town
-001-1.gat|mapflag|resave|001-1,60,105
+001-1|mapflag|town
+001-1|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/001-1/north_shops.txt b/world/map/npc/001-1/north_shops.txt
index 592e351c..a99e09ff 100644
--- a/world/map/npc/001-1/north_shops.txt
+++ b/world/map/npc/001-1/north_shops.txt
@@ -1,7 +1,7 @@
 // Northern shopping plaza
-001-1.gat,106,105,0|shop|Neko|101,TonoriDelight:*10,CactusDrink:*1,CactusPotion:*1,RoastedMaggot:*1,Beer:*1,ChickenLeg:*2
-001-1.gat,111,108,0|shop|Inar|108,CottonShirt:*1,SerfHat:*1,CottonShorts:*1,CottonBoots:*1,DesertShirt:*1,CottonHeadband:*1,DesertHat:*4
-001-1.gat,48,79,0|script|Well|400
+001-1,106,105,0|shop|Neko|101,TonoriDelight:*10,CactusDrink:*1,CactusPotion:*1,RoastedMaggot:*1,Beer:*1,ChickenLeg:*2
+001-1,111,108,0|shop|Inar|108,CottonShirt:*1,SerfHat:*1,CottonShorts:*1,CottonBoots:*1,DesertShirt:*1,CottonHeadband:*1,DesertHat:*4
+001-1,48,79,0|script|Well|400
 {
     callfunc "WaterBottle";
     end;
diff --git a/world/map/npc/001-1/npcs.txt b/world/map/npc/001-1/npcs.txt
index add8cd90..2e10dbd1 100644
--- a/world/map/npc/001-1/npcs.txt
+++ b/world/map/npc/001-1/npcs.txt
@@ -1,4 +1,4 @@
-001-1.gat,49,82,0|script|Cyndala|210
+001-1,49,82,0|script|Cyndala|210
 {
     set @npcname$, "Cyndala";
 
@@ -9,7 +9,7 @@
     set @npcname$, "";
     close;
 }
-001-1.gat,100,79,0|script|Marikel|211
+001-1,100,79,0|script|Marikel|211
 {
     set @npcname$, "Marikel";
 
@@ -36,7 +36,7 @@ L_Marikel_2:
     close;
 }
 
-001-1.gat,105,53,0|script|Joelin|212
+001-1,105,53,0|script|Joelin|212
 {
     set @npcname$, "Joelin";
 
@@ -47,7 +47,7 @@ L_Marikel_2:
     close;
 }
 
-001-1.gat,107,53,0|script|Harper|213
+001-1,107,53,0|script|Harper|213
 {
     set @npcname$, "Harper";
 
@@ -55,7 +55,7 @@ L_Marikel_2:
     mes "\"My captain knows an awlful lot about the world's continents.\"";
     close;
 }
-001-1.gat,75,99,0|script|Swezanne|206
+001-1,75,99,0|script|Swezanne|206
 {
     set @npcname$, "Swezanne";
 
@@ -63,7 +63,7 @@ L_Marikel_2:
     mes "\"Just through over this bridge is the bazaar. I go to the Bazaar and shop at Neko's.\"";
     close;
 }
-001-1.gat,92,107,0|script|Michel|215
+001-1,92,107,0|script|Michel|215
 {
     set @npcname$, "Michel";
 
diff --git a/world/map/npc/001-1/sewer_east.txt b/world/map/npc/001-1/sewer_east.txt
index 2b1e7bc4..70a10cfc 100644
--- a/world/map/npc/001-1/sewer_east.txt
+++ b/world/map/npc/001-1/sewer_east.txt
@@ -1,6 +1,6 @@
 // The Sewer Grate
 
-001-1.gat,117,110,0|script|#tulimsharsewer2|45,0,0
+001-1,117,110,0|script|#tulimsharsewer2|45,0,0
 {
     mes "Descend into the sewers?";
     next;
diff --git a/world/map/npc/001-1/sewer_north.txt b/world/map/npc/001-1/sewer_north.txt
index ce33cca3..1e2419d3 100644
--- a/world/map/npc/001-1/sewer_north.txt
+++ b/world/map/npc/001-1/sewer_north.txt
@@ -1,6 +1,6 @@
 // The Sewer Grate
 
-001-1.gat,58,83,0|script|#tulimsharsewer1|45,0,0
+001-1,58,83,0|script|#tulimsharsewer1|45,0,0
 {
     mes "Descend into the sewers?";
     next;
diff --git a/world/map/npc/001-1/stat_reset.txt b/world/map/npc/001-1/stat_reset.txt
index 61d1328b..1ad2bc4e 100644
--- a/world/map/npc/001-1/stat_reset.txt
+++ b/world/map/npc/001-1/stat_reset.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,117,105,0|script|Malivox|103
+001-1,117,105,0|script|Malivox|103
 {
     set @NpcName$, "Malivox";
     callfunc "StatReset";
diff --git a/world/map/npc/001-1/tinris.txt b/world/map/npc/001-1/tinris.txt
index c2b52d85..1a6aab33 100644
--- a/world/map/npc/001-1/tinris.txt
+++ b/world/map/npc/001-1/tinris.txt
@@ -17,7 +17,7 @@
 // state 14: gave present to Eomie
 // state 15: reported back to Anwar and done
 
-001-1.gat,69,29,0|script|Tinris|160
+001-1,69,29,0|script|Tinris|160
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
diff --git a/world/map/npc/001-1/tombstones.txt b/world/map/npc/001-1/tombstones.txt
index 2dfd3178..39c98ade 100644
--- a/world/map/npc/001-1/tombstones.txt
+++ b/world/map/npc/001-1/tombstones.txt
@@ -1,6 +1,6 @@
 // RIPs in Noble memorial
 
-001-1.gat,56,103,0|script|RIP#1|400
+001-1,56,103,0|script|RIP#1|400
 {
 
     mes "~ wushin ~";
@@ -8,7 +8,7 @@
     close;
 }
 
-001-1.gat,57,103,0|script|RIP#2|400
+001-1,57,103,0|script|RIP#2|400
 {
 
     mes "~ Nard ~";
@@ -16,7 +16,7 @@
     close;
 }
 
-001-1.gat,58,103,0|script|RIP#3|400
+001-1,58,103,0|script|RIP#3|400
 {
 
     mes "~ tux9th ~";
@@ -24,7 +24,7 @@
     close;
 }
 
-001-1.gat,59,103,0|script|RIP#4|400
+001-1,59,103,0|script|RIP#4|400
 {
 
     mes "~ o11c ~";
@@ -32,14 +32,14 @@
     close;
 }
 
-001-1.gat,60,103,0|script|RIP#5|400
+001-1,60,103,0|script|RIP#5|400
 {
 
     mes "~ " + strcharinfo(0) + " ~";
     mes "The tombstone is blank and the grave freshly dug.";
     close;
 }
-001-1.gat,56,106,0|script|RIP#6|400
+001-1,56,106,0|script|RIP#6|400
 {
 
     mes "~ Cassy ~";
@@ -47,28 +47,28 @@
     close;
 }
 
-001-1.gat,57,106,0|script|RIP#7|400
+001-1,57,106,0|script|RIP#7|400
 {
     mes "~ George ~";
     mes "Eaten by Snakes.";
     close;
 }
 
-001-1.gat,58,106,0|script|RIP#8|400
+001-1,58,106,0|script|RIP#8|400
 {
     mes "~ Kieron ~";
     mes "He was right, monsters were in the cave.";
     close;
 }
 
-001-1.gat,59,106,0|script|RIP#9|400
+001-1,59,106,0|script|RIP#9|400
 {
     mes "~ William ~";
     mes "Kieron was definitely right.";
     close;
 }
 
-001-1.gat,60,106,0|script|RIP#10|400
+001-1,60,106,0|script|RIP#10|400
 {
     mes "~ Tyer ~";
     mes "An experiement went wrong.";
diff --git a/world/map/npc/001-1/weellos.txt b/world/map/npc/001-1/weellos.txt
index b2a89aed..ae5604f5 100644
--- a/world/map/npc/001-1/weellos.txt
+++ b/world/map/npc/001-1/weellos.txt
@@ -1,7 +1,7 @@
 // A historian
 // takes part in quest given by 021-2/kylian.txt
 
-001-1.gat,55,25,0|script|Weellos|103
+001-1,55,25,0|script|Weellos|103
 {
     set @halloween_npc_id, $@halloween_npc_weellos;
     callfunc "TrickOrTreat";
@@ -9,7 +9,7 @@
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowWeellosNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
 
-    if (isin("001-1.gat", 48, 20, 61, 28)) goto L_In;
+    if (isin("001-1", 48, 20, 61, 28)) goto L_In;
 
     mes "[Weellos]";
     mes "\"This is a very historic building. One of the oldest in the area.\"";