9 files changed, 21 insertions, 21 deletions
diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index 989005f0..3bd79058 100644
--- a/world/map/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
@@ -1,6 +1,6 @@
 // Andra asks for your help to keep the soil fertile. The best way to do it is planting, so she asks for water and seeds. When she plants the seeds, some plants are spawned.
 
-008-1.gat,36,26,0|script|Andra|201
+008-1,36,26,0|script|Andra|201
 {
     set @water_amount, 1;
     set @seeds_amount, 4;
@@ -68,7 +68,7 @@ L_PreSummon:
 
 OnTimer1000:
     set $@plant_id, rand(1029,1032);
-    areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
+    areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
     if (attachrid(getcharid(3,$@farmer$)) == 0)
         goto L_Spawn1000;
     message strcharinfo(0), "Andra: I think some plants will grow almost instantly! Just Watch...";
@@ -80,19 +80,19 @@ L_Spawn1000:
 
 OnTimer3000:
     set $@plant_id, rand(1029,1032);
-    areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
+    areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
     set $@spawned_plants, $@spawned_plants + $@PLANTS_PER_SEED;
     end;
 
 OnTimer5000:
     set $@plant_id, rand(1029,1032);
-    areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
+    areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
     set $@spawned_plants, $@spawned_plants + $@PLANTS_PER_SEED;
     end;
 
 OnTimer7000:
     set $@plant_id, rand(1029,1032);
-    areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
+    areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
     if (attachrid(getcharid(3,$@farmer$)) == 0)
         goto L_Spawn7000;
     message strcharinfo(0), "Andra: Good... Just take a walk and you will be able to see how your seeds turned into some nice looking plants.";
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index a8bbc20b..51c901a3 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -113,21 +113,21 @@ L_End1:
     return;
 }
 
-008-1.gat,65,40,0|script|#TestEgg0|375
+008-1,65,40,0|script|#TestEgg0|375
 {
     set @EasterEggID, 0;
     callfunc("AnnualEasterEvent");
     end;
 }
 
-008-1.gat,65,40,0|script|#TestEgg1|375
+008-1,65,40,0|script|#TestEgg1|375
 {
     set @EasterEggID, 1;
     callfunc("AnnualEasterEvent");
     end;
 }
 
-008-1.gat,65,40,0|script|#TestEgg2|375
+008-1,65,40,0|script|#TestEgg2|375
 {
     set @EasterEggID, 2;
     callfunc("AnnualEasterEvent");
@@ -135,7 +135,7 @@ L_End1:
 }
 
 
-008-1.gat,59,38,0|script|#AnnualEaster|-1
+008-1,59,38,0|script|#AnnualEaster|-1
 {
     end;
 
@@ -170,7 +170,7 @@ OnTimer1000:
 
     // an egg can be 'found' multiple times, make this number of possible findings
     // depend on the number of players currently on the map.
-    set $@AEASTER_mapcount, 1 + getmapusers("008-1.gat") / 3;
+    set $@AEASTER_mapcount, 1 + getmapusers("008-1") / 3;
 
     set $@isEaster, 0;
     if ((gettime(6) == 3 && gettime(5) >= 22) || (gettime(6) == 4 && gettime(5) <= 25))
diff --git a/world/map/npc/008-1/banu.txt b/world/map/npc/008-1/banu.txt
index 957d74d4..4c3a2e7f 100644
--- a/world/map/npc/008-1/banu.txt
+++ b/world/map/npc/008-1/banu.txt
@@ -3,7 +3,7 @@
 // Using bit 10 and 11 of QUEST_NorthTulimshar (second half of nibble 2)
 // author: Jenalya
 
-008-1.gat,70,42,0|script|Banu|154
+008-1,70,42,0|script|Banu|154
 {
     set @state, ((QUEST_NorthTulimshar & TWOBIT_5_MASK) >> TWOBIT_5_SHIFT);
     set @EXP, 100;
diff --git a/world/map/npc/008-1/diryn.txt b/world/map/npc/008-1/diryn.txt
index d0630074..dae18c13 100644
--- a/world/map/npc/008-1/diryn.txt
+++ b/world/map/npc/008-1/diryn.txt
@@ -2,7 +2,7 @@
 // Author: Wombat, wushin
 // cost depending on level and adapted to new scripting guidelines: Jenalya
 
-008-1.gat,81,82,0|script|Diryn the Traveler|103
+008-1,81,82,0|script|Diryn the Traveler|103
 {
     set @NpcName$, "Diryn";
     set @NpcTravelBit, $@hurnscald_bit;
diff --git a/world/map/npc/008-1/dock.txt b/world/map/npc/008-1/dock.txt
index c4c701d3..4be8ad11 100644
--- a/world/map/npc/008-1/dock.txt
+++ b/world/map/npc/008-1/dock.txt
@@ -1,18 +1,18 @@
 // The ferry dock
 
-008-1.gat,134,69,0|script|Ferry Schedule#5|397
+008-1,134,69,0|script|Ferry Schedule#5|397
 {
     callfunc "FerryManifest";
     end;
 }
 
-008-1.gat,147,64,0|script|Hurnscald North Koga|395,8,3
+008-1,147,64,0|script|Hurnscald North Koga|395,8,3
 {
     callfunc "BoardFerry";
     close;
 }
 
-008-1.gat,120,44,0|script|#Hurnscald NorthDock|127
+008-1,120,44,0|script|#Hurnscald NorthDock|127
 {
     end;
 OnCommandArrive:
@@ -24,13 +24,13 @@ OnCommandWarp:
     end;
 }
 
-008-1.gat,147,75,0|script|Hurnscald South Koga|395,8,3
+008-1,147,75,0|script|Hurnscald South Koga|395,8,3
 {
     callfunc "BoardCandorFerry";
     close;
 }
 
-008-1.gat,65,25,0|script|#Hurnscald SouthDock|127
+008-1,65,25,0|script|#Hurnscald SouthDock|127
 {
     end;
 OnCommandArrive:
diff --git a/world/map/npc/008-1/george.txt b/world/map/npc/008-1/george.txt
index 24679b34..8cd95734 100644
--- a/world/map/npc/008-1/george.txt
+++ b/world/map/npc/008-1/george.txt
@@ -1,6 +1,6 @@
 //
 
-008-1.gat,135,62,0|script|George#pirate|138
+008-1,135,62,0|script|George#pirate|138
 {
     set @halloween_npc_id, $@halloween_npc_george;
     callfunc "TrickOrTreat";
diff --git a/world/map/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt
index 36a8d3f5..0213c3cc 100644
--- a/world/map/npc/008-1/hinnak.txt
+++ b/world/map/npc/008-1/hinnak.txt
@@ -5,7 +5,7 @@
 //
 // Variables used: Nibble 1 of QUEST_Hurnscald (previously QUEST_Scythe_state)
 
-008-1.gat,101,30,0|script|Hinnak|142
+008-1,101,30,0|script|Hinnak|142
 {
     callfunc "ClearVariables";
 
diff --git a/world/map/npc/008-1/mapflags.txt b/world/map/npc/008-1/mapflags.txt
index 67199894..95ad83d5 100644
--- a/world/map/npc/008-1/mapflags.txt
+++ b/world/map/npc/008-1/mapflags.txt
@@ -1 +1 @@
-008-1.gat|mapflag|resave|009-2,149,43
+008-1|mapflag|resave|009-2,149,43
diff --git a/world/map/npc/008-1/mikhail.txt b/world/map/npc/008-1/mikhail.txt
index 9de0480c..3c5f7679 100644
--- a/world/map/npc/008-1/mikhail.txt
+++ b/world/map/npc/008-1/mikhail.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 0 of QUEST_SouthTulimshar
 
-008-1.gat,135,25,0|script|Mikhail|120
+008-1,135,25,0|script|Mikhail|120
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";