5 files changed, 15 insertions, 15 deletions
diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt
index 6e78a408..e4eade06 100644
--- a/world/map/npc/011-1/alchemist.txt
+++ b/world/map/npc/011-1/alchemist.txt
@@ -1,5 +1,5 @@
 // This NPC makes potions and dyes
-011-1.gat,117,77,0|script|Rauk|103
+011-1,117,77,0|script|Rauk|103
 {
     // Setzer quest/monster oil quest participation
     set @SETZER_INITIAL, 0;
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 9790e8ef..a99eef70 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -1,7 +1,7 @@
 // Auldsbel the Wizard
 // Transmutation Magic expert
 
-011-1.gat,50,68,0|script|Auldsbel#_M|168
+011-1,50,68,0|script|Auldsbel#_M|168
 {
     set @mexp, MAGIC_EXPERIENCE & 65535;
 
diff --git a/world/map/npc/011-1/mapflags.txt b/world/map/npc/011-1/mapflags.txt
index 75d34ade..0932c5c3 100644
--- a/world/map/npc/011-1/mapflags.txt
+++ b/world/map/npc/011-1/mapflags.txt
@@ -1 +1 @@
-011-1.gat|mapflag|resave|011-1,103,34
+011-1|mapflag|resave|011-1,103,34
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index 0db51330..3cc5c1e3 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -37,7 +37,7 @@ function|script|HalloweenQuestWaterPumpkins
     end;
 }
 
-011-1.gat,94,38,0|script|Oscar|142
+011-1,94,38,0|script|Oscar|142
 {
     // Check we are at the good time of the year
     if (!(gettime(6) == 11 && (gettime(5) >= 4 && gettime(5) <= 30))) goto L_NoEvent;
@@ -331,8 +331,8 @@ L_TimerFunction:
         end;
     callsub S_CheckPlayer;
     set $@HalloweenQuest_PumpkinsTimer, $@HalloweenQuest_PumpkinsTimer + 1;
-    if (mobcount("011-1.gat", "Oscar::OnPD")  < 0 &&
-        mobcount("011-1.gat", "Oscar::OnPDP") < 0 &&
+    if (mobcount("011-1", "Oscar::OnPD")  < 0 &&
+        mobcount("011-1", "Oscar::OnPDP") < 0 &&
         $@HalloweenQuest_PumpkinsCount <= 0)
         goto L_AllPumpkinsDead;
     // A quick "cheer up"
@@ -348,14 +348,14 @@ L_TimerFunction:
 
 L_TrySpawnPumpkin:
     if ($@HalloweenQuest_PumpkinsCount > 0)
-        areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 1, "Oscar::OnPD";
+        areamonster "011-1", 97, 40, 101, 44, "", 1063, 1, "Oscar::OnPD";
     setnpctimer 0;
     end;
 
 OnTimer2500:
     if ($@HalloweenQuest_PumpkinsState != 0)
         end;
-    areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 2, "Oscar::OnPD";
+    areamonster "011-1", 97, 40, 101, 44, "", 1063, 2, "Oscar::OnPD";
     end;
 
 OnTimer6000:
@@ -388,13 +388,13 @@ OnPD:
         getitem "PumpkinHelmet", 1;
     // huntsman spider x1
     if (@halloween_rand < (15*BaseLevel)/100)
-        areamonster "011-1.gat", 97, 40, 101, 44, "", 1083, 1, "Oscar::OnPDP";
+        areamonster "011-1", 97, 40, 101, 44, "", 1083, 1, "Oscar::OnPDP";
     // Or spider x1
     if (@halloween_rand >= (15*BaseLevel)/100 && @halloween_rand < (75*BaseLevel)/100)
-        areamonster "011-1.gat", 97, 40, 101, 44, "", 1012, 1, "Oscar::OnPDP";
+        areamonster "011-1", 97, 40, 101, 44, "", 1012, 1, "Oscar::OnPDP";
     // Or archant x2
     if (@halloween_rand >= (75*BaseLevel)/100)
-        areamonster "011-1.gat", 97, 40, 101, 44, "", 1060, 2, "Oscar::OnPDP";
+        areamonster "011-1", 97, 40, 101, 44, "", 1060, 2, "Oscar::OnPDP";
 
     set @halloween_rand, 0;
     end;
@@ -419,7 +419,7 @@ S_CheckPlayer:
         goto L_PlayerOff;
     if (isdead())
         goto L_PlayerDead;
-    if (isin("011-1.gat",20,5,130,110) == 0)
+    if (isin("011-1",20,5,130,110) == 0)
         goto L_PlayerLeft;
     detachrid;
     return;
@@ -454,8 +454,8 @@ L_Success:
     goto L_Clean;
 
 L_Clean:
-    killmonster "011-1.gat", "Oscar::OnPD";
-    killmonster "011-1.gat", "Oscar::OnPDP";
+    killmonster "011-1", "Oscar::OnPD";
+    killmonster "011-1", "Oscar::OnPDP";
     set $@HalloweenQuest_PumpkinHunter$, "";
     set $@HalloweenQuest_PumpkinsCount, 0;
     set $@HalloweenQuest_PumpkinsState, 0;
diff --git a/world/map/npc/011-1/shops.txt b/world/map/npc/011-1/shops.txt
index 48126fe2..1ccedec6 100644
--- a/world/map/npc/011-1/shops.txt
+++ b/world/map/npc/011-1/shops.txt
@@ -5,4 +5,4 @@
 //#################################################################################
 
 // Shop
-011-1.gat,80,33,0|shop|Fruit Store|400,GreenApple:*1,RedApple:*1,Orange:*1
+011-1,80,33,0|shop|Fruit Store|400,GreenApple:*1,RedApple:*1,Orange:*1