17 files changed, 25 insertions, 25 deletions
diff --git a/world/map/npc/002-1/anwar.txt b/world/map/npc/002-1/anwar.txt
index 707e577e..d0c73abf 100644
--- a/world/map/npc/002-1/anwar.txt
+++ b/world/map/npc/002-1/anwar.txt
@@ -16,7 +16,7 @@
 // state 13: Anwar asked to bring present to Eomie
 // state 14: gave present to Eomie
 // state 15: reported back to Anwar and done
-002-1.gat,95,67,0|script|Anwar|156
+002-1,95,67,0|script|Anwar|156
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
diff --git a/world/map/npc/002-1/bard.txt b/world/map/npc/002-1/bard.txt
index c977b136..22c3b113 100644
--- a/world/map/npc/002-1/bard.txt
+++ b/world/map/npc/002-1/bard.txt
@@ -1,6 +1,6 @@
 //
 
-002-1.gat,91,33,0|script|Bard|152
+002-1,91,33,0|script|Bard|152
 {
     setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"",
         "\"At Hurnscald inn, there was a person of fairest skin, declining wedding bands from quite a many hands.\"",
diff --git a/world/map/npc/002-1/dock.txt b/world/map/npc/002-1/dock.txt
index f902006d..db947145 100644
--- a/world/map/npc/002-1/dock.txt
+++ b/world/map/npc/002-1/dock.txt
@@ -1,4 +1,4 @@
-002-1.gat,67,65,0|script|Ferry Schedule#3|396
+002-1,67,65,0|script|Ferry Schedule#3|396
 {
     callfunc "FerryManifest";
     end;
diff --git a/world/map/npc/002-1/elanore.txt b/world/map/npc/002-1/elanore.txt
index fec70d44..da73a88f 100644
--- a/world/map/npc/002-1/elanore.txt
+++ b/world/map/npc/002-1/elanore.txt
@@ -17,7 +17,7 @@ function|script|ElanoreFix
     return;
 }
 
-002-1.gat,75,62,0|script|Elanore#_M|108
+002-1,75,62,0|script|Elanore#_M|108
 {
     set @has_magic, getskilllv(SKILL_MAGIC);
 
diff --git a/world/map/npc/002-1/gaurds.txt b/world/map/npc/002-1/gaurds.txt
index d7fb023f..6700a1b8 100644
--- a/world/map/npc/002-1/gaurds.txt
+++ b/world/map/npc/002-1/gaurds.txt
@@ -1,17 +1,17 @@
 // Guards by the gates to the port
-002-1.gat,100,21,0|script|Guard#port1|104
+002-1,100,21,0|script|Guard#port1|104
 {
     mes "[Guard]";
     mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
     close;
 }
-002-1.gat,61,27,0|script|Guard#port2|104
+002-1,61,27,0|script|Guard#port2|104
 {
     mes "[Guard]";
     mes "\"You wouldn't believe the refuse that comes in from the docks.\"";
     close;
 }
-002-1.gat,83,48,0|script|Guard#east1|104
+002-1,83,48,0|script|Guard#east1|104
 {
     mes "[Guard]";
     mes "\"I make sure less desirables don't bother the Nobles.\"";
diff --git a/world/map/npc/002-1/itka.txt b/world/map/npc/002-1/itka.txt
index fec553d8..54c4a572 100644
--- a/world/map/npc/002-1/itka.txt
+++ b/world/map/npc/002-1/itka.txt
@@ -1,5 +1,5 @@
 // Outside the Hotel
-002-1.gat,66,39,0|script|Itka|114
+002-1,66,39,0|script|Itka|114
 {
     mes "[Itka]";
     mes "\"This hotel is the best!\"";
diff --git a/world/map/npc/002-1/lieutenant_dausen.txt b/world/map/npc/002-1/lieutenant_dausen.txt
index c945a296..38ac6b08 100644
--- a/world/map/npc/002-1/lieutenant_dausen.txt
+++ b/world/map/npc/002-1/lieutenant_dausen.txt
@@ -1,7 +1,7 @@
 // Lieutenant in charge of monitoring the monster threat surrounding the city.
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-1.gat,63,67,0|script|Lieutenant Dausen|122
+002-1,63,67,0|script|Lieutenant Dausen|122
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-1/luca.txt b/world/map/npc/002-1/luca.txt
index 17ac66c7..8db36cf9 100644
--- a/world/map/npc/002-1/luca.txt
+++ b/world/map/npc/002-1/luca.txt
@@ -1,6 +1,6 @@
 //
 
-002-1.gat,112,26,0|script|Luca|102
+002-1,112,26,0|script|Luca|102
 {
     set @EXP_BRAWLING, 2000;
 
diff --git a/world/map/npc/002-1/mapflags.txt b/world/map/npc/002-1/mapflags.txt
index 91b323a1..ac3e9967 100644
--- a/world/map/npc/002-1/mapflags.txt
+++ b/world/map/npc/002-1/mapflags.txt
@@ -1 +1 @@
-002-1.gat|mapflag|resave|001-1,60,105
+002-1|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/002-1/mine_debug.txt b/world/map/npc/002-1/mine_debug.txt
index d9ee55dc..0fdcb9b3 100644
--- a/world/map/npc/002-1/mine_debug.txt
+++ b/world/map/npc/002-1/mine_debug.txt
@@ -39,7 +39,7 @@ S_Update_Var:
     set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT));
     return;
 }
-002-1.gat,61,69,0|script|Mine Debug#1|122
+002-1,61,69,0|script|Mine Debug#1|122
 {
     callfunc "DesertMineDebug";
     end;
@@ -49,7 +49,7 @@ OnInit:
         disablenpc "Mine Debug#1";
     end;
 }
-002-3.gat,45,49,6|script|Mine Debug#2|109
+002-3,45,49,6|script|Mine Debug#2|109
 {
     callfunc "DesertMineDebug";
     end;
@@ -59,7 +59,7 @@ OnInit:
         disablenpc "Mine Debug#2";
     end;
 }
-002-4.gat,88,99,6|script|Mine Debug#3|109
+002-4,88,99,6|script|Mine Debug#3|109
 {
     callfunc "DesertMineDebug";
     end;
@@ -69,7 +69,7 @@ OnInit:
         disablenpc "Mine Debug#3";
     end;
 }
-002-5.gat,43,96,6|script|Mine Debug#4|340
+002-5,43,96,6|script|Mine Debug#4|340
 {
     callfunc "DesertMineDebug";
     end;
diff --git a/world/map/npc/002-1/nickos.txt b/world/map/npc/002-1/nickos.txt
index 2377bbaf..45644cee 100644
--- a/world/map/npc/002-1/nickos.txt
+++ b/world/map/npc/002-1/nickos.txt
@@ -1,7 +1,7 @@
 // Sandstorm mine guard
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-1.gat,46,108,0|script|Nickos|123
+002-1,46,108,0|script|Nickos|123
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-1/nomads.txt b/world/map/npc/002-1/nomads.txt
index 987d10ce..07d10972 100644
--- a/world/map/npc/002-1/nomads.txt
+++ b/world/map/npc/002-1/nomads.txt
@@ -1,6 +1,6 @@
 //
 
-002-1.gat,101,114,0|script|Samuel|132
+002-1,101,114,0|script|Samuel|132
 {
     mes "[Samuel the Nomad]";
     mes "\"This is really a nice place.\"";
@@ -8,7 +8,7 @@
     close;
 }
 
-002-1.gat,105,114,0|script|Elijah|128
+002-1,105,114,0|script|Elijah|128
 {
     mes "[Elijah the Nomad]";
     mes "\"It's nice to find a respite like this...\"";
diff --git a/world/map/npc/002-1/npcs.txt b/world/map/npc/002-1/npcs.txt
index a2ae00ac..e7fa55c2 100644
--- a/world/map/npc/002-1/npcs.txt
+++ b/world/map/npc/002-1/npcs.txt
@@ -1,4 +1,4 @@
-002-1.gat,96,23,0|script|Jeric|214
+002-1,96,23,0|script|Jeric|214
 {
     set @npcname$, "Jeric";
 
@@ -9,7 +9,7 @@
     set @npcname$, "";
     close;
 }
-002-1.gat,112,48,0|script|Silvia|207
+002-1,112,48,0|script|Silvia|207
 {
     set @npcname$, "Silvia";
 
diff --git a/world/map/npc/002-1/sarah.txt b/world/map/npc/002-1/sarah.txt
index 15eeb83b..83fc6558 100644
--- a/world/map/npc/002-1/sarah.txt
+++ b/world/map/npc/002-1/sarah.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 1 of QUEST_SouthTulimshar
 
-002-1.gat,93,43,0|script|Sarah|106
+002-1,93,43,0|script|Sarah|106
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-1/soul-menhir.txt b/world/map/npc/002-1/soul-menhir.txt
index 9fe0c06a..3260e511 100644
--- a/world/map/npc/002-1/soul-menhir.txt
+++ b/world/map/npc/002-1/soul-menhir.txt
@@ -1,9 +1,9 @@
 //
 
-002-1.gat,58,60,0|script|Soul Menhir#tulimshar|345
+002-1,58,60,0|script|Soul Menhir#tulimshar|345
 {
     callfunc "ClearVariables";
-    set @map$, "001-1.gat";
+    set @map$, "001-1";
     setarray @Xs, 57, 58, 59, 57, 59, 57, 59;
     setarray @Ys, 59, 59, 59, 60, 60, 61, 61;
     set @x, 0;
diff --git a/world/map/npc/002-1/stewen.txt b/world/map/npc/002-1/stewen.txt
index 461451fe..4368f590 100644
--- a/world/map/npc/002-1/stewen.txt
+++ b/world/map/npc/002-1/stewen.txt
@@ -1,7 +1,7 @@
 // East sandstorm guard
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-1.gat,116,93,0|script|Stewen|123
+002-1,116,93,0|script|Stewen|123
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-1/traveler.txt b/world/map/npc/002-1/traveler.txt
index 567d8667..0645cce2 100644
--- a/world/map/npc/002-1/traveler.txt
+++ b/world/map/npc/002-1/traveler.txt
@@ -2,7 +2,7 @@
 // Author: Wombat, wushin
 // cost depending on level and adapted to new scripting guidelines: Jenalya
 
-002-1.gat,60,41,0|script|Nina the Traveler|103
+002-1,60,41,0|script|Nina the Traveler|103
 {
     set @NpcName$, "Nina";
     set @NpcTravelBit, $@tulimshar_bit;