remove .gat suffix everywhere

21 files changed, 85 insertions, 85 deletions

diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index 5e8f3867..5805994c 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -65,8 +65,8 @@ OnTalk:
     restorecam;
     adddefaultskills;
     setq General_Narrator, 0;
-    warp "000-2-1.gat", 50, 38;
-    savepoint "000-2-1.gat", 50, 38;
+    warp "000-2-1", 50, 38;
+    savepoint "000-2-1", 50, 38;
     closedialog;
     close;
 
diff --git a/npc/000-0-1/narrator.txt b/npc/000-0-1/narrator.txt
index 4445a549..c83dbac7 100644
--- a/npc/000-0-1/narrator.txt
+++ b/npc/000-0-1/narrator.txt
@@ -26,8 +26,8 @@
     if (countitem(JohanneKey) == 1) delitem JohanneKey, 1;
     setq General_Narrator, 1;
     setq ShipQuests_Nard, 6;
-    savepoint "001-2-22.gat", 50, 38;
-    warp "001-2-22.gat", 50, 38;
+    savepoint "001-2-22", 50, 38;
+    warp "001-2-22", 50, 38;
     closedialog;
     close;
 
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index cac7ff8c..a8b9a820 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -69,7 +69,7 @@ OnTouch:
     mes col(l("Click on the NPCs (Non-Player Characters) around you to continue the introduction."), 9);
     next;
 
-    warp "000-0-0.gat", 26, 28;
+    warp "000-0-0", 26, 28;
 
     closedialog;
     close;
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index e9f79e3b..b72e0b63 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -40,13 +40,13 @@
     doevent "Magic Arpan::OnClothNotTaken";
 
 L_Equip:
-    warp "000-2-1.gat", 49, 32;
+    warp "000-2-1", 49, 32;
     doevent "Magic Arpan::OnEquip";
 
     close;
 
 L_GetCloth:
-    warp "000-2-1.gat", 49, 32;
+    warp "000-2-1", 49, 32;
     doevent "Magic Arpan::OnClothNotTaken";
 
     close;
@@ -67,13 +67,13 @@ L_EquipDone:
     doevent "Magic Arpan::OnClothNotTaken";
 
 L_Equip:
-    warp "000-2-1.gat", 55, 32;
+    warp "000-2-1", 55, 32;
     doevent "Magic Arpan::OnEquip";
 
     close;
 
 L_GetCloth:
-    warp "000-2-1.gat", 55, 32;
+    warp "000-2-1", 55, 32;
     doevent "Magic Arpan::OnClothNotTaken";
 
     close;
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 49f3575e..6eec52f6 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -22,7 +22,7 @@
 //    6   Did not start the quest.
 // Others:
 // .@peter = Peter variable.
-// "000-2-2.gat" - map with mobs.
+// "000-2-2" - map with mobs.
 // "$@RAT_SAILOR_HELPER$" - Name of the participant.
 // "$@RAT_SAILOR_DEATHS - Number of deaths when the participant starts the fight.
 // "$@RAT_SAILOR_CONTROL" - Explanation of each index of the array.
@@ -211,7 +211,7 @@ OnStartOutside:
     $@RAT_SAILOR_HELPER$ = strcharinfo(0);
     $@RAT_SAILOR_DEATHS = PC_DIE_COUNTER;
     initnpctimer;
-    warp "000-2-2.gat", 48, 28;
+    warp "000-2-2", 48, 28;
     doevent "RattosControl::OnSpawn";
 
     goto L_Quit;
@@ -222,7 +222,7 @@ OnTimer2000:
     if ($@RAT_SAILOR_CONTROL[9] > 100) goto L_Timeout;
     if (PC_DIE_COUNTER > $@RAT_SAILOR_DEATHS) goto L_Dead;
     if ($@RAT_SAILOR_CONTROL[1] && $@RAT_SAILOR_CONTROL[2] && $@RAT_SAILOR_CONTROL[3] && $@RAT_SAILOR_CONTROL[4]) goto L_Done;
-    if (getmapusers("000-2-2.gat") == 0) goto L_CleaningEnd;
+    if (getmapusers("000-2-2") == 0) goto L_CleaningEnd;
     goto L_CheckRattos;
 
     end;
@@ -262,7 +262,7 @@ L_Logoff:
 
 L_Dead:
 // Warps the dead body outside, so it does not interfere with the getmapusers check.
-    if (getmapusers("000-2-2.gat") > 0) warp "000-2-1", 72, 36;
+    if (getmapusers("000-2-2") > 0) warp "000-2-1", 72, 36;
 
     goto L_CleaningEnd;
 
@@ -271,7 +271,7 @@ L_Done:
     if($@RAT_SAILOR_CONTROL[10] < 5) goto L_NotYet;
     .@peter = getq(ShipQuests_Peter);
     if (.@peter == 2 || .@peter == 4) goto L_Reward;
-    warp "000-2-1.gat", 72, 36;
+    warp "000-2-1", 72, 36;
 
     goto L_Thanks;
 
@@ -280,10 +280,10 @@ L_CleaningEnd:
     $@RAT_SAILOR_HELPER$ = "";
     $@RAT_SAILOR_DEATHS = 0;
     cleararray $@RAT_SAILOR_CONTROL, 0, 11;
-    killmonster "000-2-2.gat", "RattosControl::OnRatto1Death";
-    killmonster "000-2-2.gat", "RattosControl::OnRatto2Death";
-    killmonster "000-2-2.gat", "RattosControl::OnRatto3Death";
-    killmonster "000-2-2.gat", "RattosControl::OnRatto4Death";
+    killmonster "000-2-2", "RattosControl::OnRatto1Death";
+    killmonster "000-2-2", "RattosControl::OnRatto2Death";
+    killmonster "000-2-2", "RattosControl::OnRatto3Death";
+    killmonster "000-2-2", "RattosControl::OnRatto4Death";
 
     end;
 
@@ -293,16 +293,16 @@ L_CleaningClose:
     $@RAT_SAILOR_HELPER$ = "";
     $@RAT_SAILOR_DEATHS = 0;
     cleararray $@RAT_SAILOR_CONTROL, 0, 11;
-    killmonster "000-2-2.gat", "RattosControl::OnRatto1Death";
-    killmonster "000-2-2.gat", "RattosControl::OnRatto2Death";
-    killmonster "000-2-2.gat", "RattosControl::OnRatto3Death";
-    killmonster "000-2-2.gat", "RattosControl::OnRatto4Death";
+    killmonster "000-2-2", "RattosControl::OnRatto1Death";
+    killmonster "000-2-2", "RattosControl::OnRatto2Death";
+    killmonster "000-2-2", "RattosControl::OnRatto3Death";
+    killmonster "000-2-2", "RattosControl::OnRatto4Death";
     $@RAT_SAILOR_COUNTDOWN = gettimetick(2);
 
     close;
 
 L_Reward:
-    warp "000-2-1.gat", 72, 36;
+    warp "000-2-1", 72, 36;
     setq ShipQuests_Peter, 5;
     .@peter = getq(ShipQuests_Peter);
     mesn;
diff --git a/npc/000-2-1/story_save.txt b/npc/000-2-1/story_save.txt
index e46841c1..de2c1693 100644
--- a/npc/000-2-1/story_save.txt
+++ b/npc/000-2-1/story_save.txt
@@ -20,7 +20,7 @@ OnClick:
     }
     else
     {
-        savepointparticle "000-2-1.gat", 50, 38;
+        savepointparticle "000-2-1", 50, 38;
     }
     close;
 
diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt
index 5c57b66f..1dbef832 100644
--- a/npc/000-2-2/doors.txt
+++ b/npc/000-2-2/doors.txt
@@ -9,7 +9,7 @@
 000-2-2,48,29,0	script	DoorUpwards	NPC_HIDDEN,0,0,{
 
 OnTouch:
-    if (mobcount("000-2-2.gat","all") > 0) goto L_Warn;
+    if (mobcount("000-2-2","all") > 0) goto L_Warn;
 
     goto L_Warp;
 
diff --git a/npc/000-2-2/ratto.txt b/npc/000-2-2/ratto.txt
index 2ff5c572..1392d571 100644
--- a/npc/000-2-2/ratto.txt
+++ b/npc/000-2-2/ratto.txt
@@ -20,32 +20,32 @@
 000-2-2,47,30,0	script	RattosControl	NPC_HIDDEN,{
 
 OnSpawn:
-    areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
-    areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
-    areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
-    areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
+    areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
+    areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
+    areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
+    areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
     close;
 
 OnRatto1Respawn:
-    areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
+    areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
     $@RAT_SAILOR_CONTROL[1] = 0;
     $@RAT_SAILOR_CONTROL[5] = 0;
     end;
 
 OnRatto2Respawn:
-    areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
+    areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
     $@RAT_SAILOR_CONTROL[2] = 0;
     $@RAT_SAILOR_CONTROL[6] = 0;
     end;
 
 OnRatto3Respawn:
-    areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
+    areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
     $@RAT_SAILOR_CONTROL[3] = 0;
     $@RAT_SAILOR_CONTROL[7] = 0;
     end;
 
 OnRatto4Respawn:
-    areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
+    areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
     $@RAT_SAILOR_CONTROL[4] = 0;
     $@RAT_SAILOR_CONTROL[8] = 0;
     end;
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index 66fc2a80..0526b790 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -238,14 +238,14 @@ L_GoBackArtis:
             speech 5,
                 l("Let's set sail then!");
 
-            savepoint "001-2-22.gat", 50, 38;
+            savepoint "001-2-22", 50, 38;
             if (!getmapxy(.@map$, .@x, .@y, 0))
             {
-                warp "001-2-24.gat", .@x, .@y;
+                warp "001-2-24", .@x, .@y;
             }
             else
             {
-                warp "001-2-24.gat", 22, 27;
+                warp "001-2-24", 22, 27;
             }
 
             closedialog;
diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt
index 118d7377..77f95baa 100644
--- a/npc/001-1/cookiemaster.txt
+++ b/npc/001-1/cookiemaster.txt
@@ -208,7 +208,7 @@ L_Kick:
     closedialog;
 
     npctalk3 l("No cookie for you!");
-    warp "001-1.gat", 39, 41;
+    warp "001-1", 39, 41;
 
     close;
 
diff --git a/npc/001-2-22/note.txt b/npc/001-2-22/note.txt
index c330ecf5..36d62029 100644
--- a/npc/001-2-22/note.txt
+++ b/npc/001-2-22/note.txt
@@ -4,7 +4,7 @@
 // Description:
 //    
 
-001-2-22.gat,22,33,0	script	Note#001-2-22	NPC_NO_SPRITE,{
+001-2-22,22,33,0	script	Note#001-2-22	NPC_NO_SPRITE,{
     mesn;
     mesq l("This note was left by somebody.");
     next;
diff --git a/npc/001-2-22/peter.txt b/npc/001-2-22/peter.txt
index c71fc446..14a79020 100644
--- a/npc/001-2-22/peter.txt
+++ b/npc/001-2-22/peter.txt
@@ -22,7 +22,7 @@
 //    6   Did not start the quest.
 // Others:
 // .@peter = Peter#001-2-22 variable.
-// "001-2-23.gat" - map with mobs.
+// "001-2-23" - map with mobs.
 // "$@ARTIS_RAT1_HELPER$" - Name of the participant.
 // "$@ARTIS_RAT1_DEATHS - Number of deaths when the participant starts the fight.
 // "$@ARTIS_RAT1_CONTROL" - Explanation of each index of the array.
@@ -207,7 +207,7 @@ OnStartOutside:
     $@ARTIS_RAT1_HELPER$ = strcharinfo(0);
     $@ARTIS_RAT1_DEATHS = PC_DIE_COUNTER;
     initnpctimer;
-    warp "001-2-23.gat", 48, 28;
+    warp "001-2-23", 48, 28;
     doevent "RattosControl#001-2-23::OnSpawn";
 
     goto L_Quit;
@@ -218,7 +218,7 @@ OnTimer2000:
     if ($@ARTIS_RAT1_CONTROL[9] > 100) goto L_Timeout;
     if (PC_DIE_COUNTER > $@ARTIS_RAT1_DEATHS) goto L_Dead;
     if ($@ARTIS_RAT1_CONTROL[1] && $@ARTIS_RAT1_CONTROL[2] && $@ARTIS_RAT1_CONTROL[3] && $@ARTIS_RAT1_CONTROL[4]) goto L_Done;
-    if (getmapusers("001-2-23.gat") == 0) goto L_CleaningEnd;
+    if (getmapusers("001-2-23") == 0) goto L_CleaningEnd;
     goto L_CheckRattos;
 
     end;
@@ -258,7 +258,7 @@ L_Logoff:
 
 L_Dead:
 // Warps the dead body outside, so it does not interfere with the getmapusers check.
-    if (getmapusers("001-2-23.gat") > 0) warp "001-2-22", 72, 36;
+    if (getmapusers("001-2-23") > 0) warp "001-2-22", 72, 36;
 
     goto L_CleaningEnd;
 
@@ -267,7 +267,7 @@ L_Done:
     if($@ARTIS_RAT1_CONTROL[10] < 5) goto L_NotYet;
     .@peter = getq(ShipQuests_Peter);
     if (.@peter == 2 || .@peter == 4) goto L_Reward;
-    warp "001-2-22.gat", 72, 36;
+    warp "001-2-22", 72, 36;
 
     goto L_Thanks;
 
@@ -276,10 +276,10 @@ L_CleaningEnd:
     $@ARTIS_RAT1_HELPER$ = "";
     $@ARTIS_RAT1_DEATHS = 0;
     cleararray $@ARTIS_RAT1_CONTROL, 0, 11;
-    killmonster "001-2-23.gat", "RattosControl#001-2-23::OnRatto1Death";
-    killmonster "001-2-23.gat", "RattosControl#001-2-23::OnRatto2Death";
-    killmonster "001-2-23.gat", "RattosControl#001-2-23::OnRatto3Death";
-    killmonster "001-2-23.gat", "RattosControl#001-2-23::OnRatto4Death";
+    killmonster "001-2-23", "RattosControl#001-2-23::OnRatto1Death";
+    killmonster "001-2-23", "RattosControl#001-2-23::OnRatto2Death";
+    killmonster "001-2-23", "RattosControl#001-2-23::OnRatto3Death";
+    killmonster "001-2-23", "RattosControl#001-2-23::OnRatto4Death";
 
     end;
 
@@ -289,16 +289,16 @@ L_CleaningClose:
     $@ARTIS_RAT1_HELPER$ = "";
     $@ARTIS_RAT1_DEATHS = 0;
     cleararray $@ARTIS_RAT1_CONTROL, 0, 11;
-    killmonster "001-2-23.gat", "RattosControl#001-2-23::OnRatto1Death";
-    killmonster "001-2-23.gat", "RattosControl#001-2-23::OnRatto2Death";
-    killmonster "001-2-23.gat", "RattosControl#001-2-23::OnRatto3Death";
-    killmonster "001-2-23.gat", "RattosControl#001-2-23::OnRatto4Death";
+    killmonster "001-2-23", "RattosControl#001-2-23::OnRatto1Death";
+    killmonster "001-2-23", "RattosControl#001-2-23::OnRatto2Death";
+    killmonster "001-2-23", "RattosControl#001-2-23::OnRatto3Death";
+    killmonster "001-2-23", "RattosControl#001-2-23::OnRatto4Death";
     $@ARTIS_RAT1_COUNTDOWN = gettimetick(2);
 
     close;
 
 L_Reward:
-    warp "001-2-22.gat", 72, 36;
+    warp "001-2-22", 72, 36;
     setq ShipQuests_Peter, 5;
     .@peter = getq(ShipQuests_Peter);
     mesn;
diff --git a/npc/001-2-23/doors.txt b/npc/001-2-23/doors.txt
index e7a7bbea..bb192082 100644
--- a/npc/001-2-23/doors.txt
+++ b/npc/001-2-23/doors.txt
@@ -9,7 +9,7 @@
 001-2-23,48,29,0	script	DoorUpwards#001-2-23	NPC_HIDDEN,0,0,{
 
 OnTouch:
-    if (mobcount("001-2-23.gat","all") > 0) goto L_Warn;
+    if (mobcount("001-2-23","all") > 0) goto L_Warn;
 
     goto L_Warp;
 
diff --git a/npc/001-2-23/ratto.txt b/npc/001-2-23/ratto.txt
index 3b5e6e8d..91a822d3 100644
--- a/npc/001-2-23/ratto.txt
+++ b/npc/001-2-23/ratto.txt
@@ -20,32 +20,32 @@
 001-2-23,47,30,0	script	RattosControl#001-2-23	NPC_HIDDEN,{
 
 OnSpawn:
-    areamonster "001-2-23.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto1Death";
-    areamonster "001-2-23.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto2Death";
-    areamonster "001-2-23.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto3Death";
-    areamonster "001-2-23.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto4Death";
+    areamonster "001-2-23", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto1Death";
+    areamonster "001-2-23", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto2Death";
+    areamonster "001-2-23", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto3Death";
+    areamonster "001-2-23", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto4Death";
     close;
 
 OnRatto1Respawn:
-    areamonster "001-2-23.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto1Death";
+    areamonster "001-2-23", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto1Death";
     $@ARTIS_RAT1_CONTROL[1] = 0;
     $@ARTIS_RAT1_CONTROL[5] = 0;
     end;
 
 OnRatto2Respawn:
-    areamonster "001-2-23.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto2Death";
+    areamonster "001-2-23", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto2Death";
     $@ARTIS_RAT1_CONTROL[2] = 0;
     $@ARTIS_RAT1_CONTROL[6] = 0;
     end;
 
 OnRatto3Respawn:
-    areamonster "001-2-23.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto3Death";
+    areamonster "001-2-23", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto3Death";
     $@ARTIS_RAT1_CONTROL[3] = 0;
     $@ARTIS_RAT1_CONTROL[7] = 0;
     end;
 
 OnRatto4Respawn:
-    areamonster "001-2-23.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto4Death";
+    areamonster "001-2-23", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#001-2-23::OnRatto4Death";
     $@ARTIS_RAT1_CONTROL[4] = 0;
     $@ARTIS_RAT1_CONTROL[8] = 0;
     end;
diff --git a/npc/001-2-24/nard.txt b/npc/001-2-24/nard.txt
index f999e542..422eca36 100644
--- a/npc/001-2-24/nard.txt
+++ b/npc/001-2-24/nard.txt
@@ -54,14 +54,14 @@
             speech 5,
                 l("Let's set sail then!");
 
-            savepoint "000-2-1.gat", 50, 38;
+            savepoint "000-2-1", 50, 38;
             if (!getmapxy(.@map$, .@x, .@y, 0))
             {
-                warp "000-2-3.gat", .@x, .@y;
+                warp "000-2-3", .@x, .@y;
             }
             else
             {
-                warp "000-2-3.gat", 22, 27;
+                warp "000-2-3", 22, 27;
             }
 
             closedialog;
diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt
index 1bfb097d..3c6fd5ea 100644
--- a/npc/001-2-28/plush.txt
+++ b/npc/001-2-28/plush.txt
@@ -35,7 +35,7 @@
                 lg("I registered you on the @@ room of the upper level.",
                     (Sex == G_FEMALE) ? "4th" : "2nd"),
                 l("You can go upstairs and choose a different room if you want.");
-            savepoint "001-2-29.gat", 29, (Sex == G_FEMALE) ? 49 : 35;
+            savepoint "001-2-29", 29, (Sex == G_FEMALE) ? 49 : 35;
         }
     }
 
diff --git a/npc/001-2-29/savepoint.txt b/npc/001-2-29/savepoint.txt
index 01af2b8b..a3206b12 100644
--- a/npc/001-2-29/savepoint.txt
+++ b/npc/001-2-29/savepoint.txt
@@ -5,7 +5,7 @@
 //    Saves locations in 001-2-29 map.
 
 001-2-29,29,28,0	script	#001-2-29-1	NPC_SAVE_POINT,0,0,{
-    bedClic ("001-2-29.gat", 29, 28, REDPLUSH_INN);
+    bedClic ("001-2-29", 29, 28, REDPLUSH_INN);
 
 OnInit:
     .distance = 2;
@@ -20,7 +20,7 @@ OnPCDieEvent:
 }
 
 001-2-29,29,35,0	script	#001-2-29-2	NPC_SAVE_POINT,0,0,{
-    bedClic ("001-2-29.gat", 29, 35, REDPLUSH_INN);
+    bedClic ("001-2-29", 29, 35, REDPLUSH_INN);
 
 OnInit:
     .distance = 2;
@@ -31,7 +31,7 @@ OnTouch:
 }
 
 001-2-29,29,42,0	script	#001-2-29-3	NPC_SAVE_POINT,0,0,{
-    bedClic ("001-2-29.gat", 29, 42, REDPLUSH_INN);
+    bedClic ("001-2-29", 29, 42, REDPLUSH_INN);
 
 OnInit:
     .distance = 2;
@@ -42,7 +42,7 @@ OnTouch:
 }
 
 001-2-29,29,49,0	script	#001-2-29-4	NPC_SAVE_POINT,0,0,{
-    bedClic ("001-2-29.gat", 29, 49, REDPLUSH_INN);
+    bedClic ("001-2-29", 29, 49, REDPLUSH_INN);
 
 OnInit:
     .distance = 2;
diff --git a/npc/001-2-32/doors.txt b/npc/001-2-32/doors.txt
index 45d7415a..59ee35eb 100644
--- a/npc/001-2-32/doors.txt
+++ b/npc/001-2-32/doors.txt
@@ -7,7 +7,7 @@
 001-2-32,33,29,0	script	ToFightRoom#001-2-32	NPC_HIDDEN,0,0,{
 
 OnTouch:
-    if (mobcount("001-2-35.gat","all") > 0)
+    if (mobcount("001-2-35","all") > 0)
     {
         narrator
         l("You hear some sound behind the door."),
diff --git a/npc/001-2-34/doors.txt b/npc/001-2-34/doors.txt
index b4a483e9..2791598f 100644
--- a/npc/001-2-34/doors.txt
+++ b/npc/001-2-34/doors.txt
@@ -10,11 +10,11 @@ OnTouch:
 	if ((getmapusers($@MAP_NAME$) == 0) && ($@FightingIsActive > 0))
 	{
 		set $@FightingIsActive, 0;
-		killmonsterall "001-2-36.gat";
+		killmonsterall "001-2-36";
 		
 	}
 
-    if (mobcount("001-2-36.gat","all") > 0 && $@FightingIsActive > 0)
+    if (mobcount("001-2-36","all") > 0 && $@FightingIsActive > 0)
     {
         narrator
         l("You hear some sound behind the door."),
diff --git a/npc/001-2-36/training_room_npc.txt b/npc/001-2-36/training_room_npc.txt
index d7ec9690..ce56651c 100644
--- a/npc/001-2-36/training_room_npc.txt
+++ b/npc/001-2-36/training_room_npc.txt
@@ -30,7 +30,7 @@
     //Room and Mobspawn Coordinates 
     // TL        BR
     setarray $@MOB_SPAWN_COORDINATES,     24,    34,    31,    41;
-    setarray $@MAP_NAME$, "001-2-36.gat";
+    setarray $@MAP_NAME$, "001-2-36";
 
     set @roomPlayers, getmapusers($@MAP_NAME$);
 
diff --git a/npc/functions/masks.txt b/npc/functions/masks.txt
index 23ecfcde..98e8bdf8 100644
--- a/npc/functions/masks.txt
+++ b/npc/functions/masks.txt
@@ -9,9 +9,9 @@
 // Artis Aemil's Legion 
 
 function	script	artisALRemTopMask	{
-    if ((getareausers("001-2-33.gat", 23, 27, 45, 31) >= 1) ||
-        (getareausers("001-2-33.gat", 23, 32, 26, 38) >= 1) ||
-        (getareausers("001-2-33.gat", 42, 32, 45, 38) >= 1))
+    if ((getareausers("001-2-33", 23, 27, 45, 31) >= 1) ||
+        (getareausers("001-2-33", 23, 32, 26, 38) >= 1) ||
+        (getareausers("001-2-33", 42, 32, 45, 38) >= 1))
     {
         removemapmask "001-2-33", 4;
     }
@@ -19,9 +19,9 @@ function	script	artisALRemTopMask	{
 }
 
 function	script	artisALAddTopMask	{
-    if ((getareausers("001-2-33.gat", 23, 27, 45, 31) == 0) &&
-        (getareausers("001-2-33.gat", 23, 32, 26, 38) == 0) &&
-        (getareausers("001-2-33.gat", 42, 32, 45, 38) == 0))
+    if ((getareausers("001-2-33", 23, 27, 45, 31) == 0) &&
+        (getareausers("001-2-33", 23, 32, 26, 38) == 0) &&
+        (getareausers("001-2-33", 42, 32, 45, 38) == 0))
     {
         addmapmask "001-2-33", 4;
     }
@@ -29,7 +29,7 @@ function	script	artisALAddTopMask	{
 }
 
 function	script	artisALRemBotMask	{
-    if (getareausers("001-2-33.gat", 23, 32, 45, 46) >= 1)
+    if (getareausers("001-2-33", 23, 32, 45, 46) >= 1)
     {
         removemapmask "001-2-33", 8;
     }
@@ -37,7 +37,7 @@ function	script	artisALRemBotMask	{
 }
 
 function	script	artisALAddBotMask	{
-    if (getareausers("001-2-33.gat", 23, 32, 45, 46) == 0)
+    if (getareausers("001-2-33", 23, 32, 45, 46) == 0)
     {
         addmapmask "001-2-33", 8;
     }
@@ -45,7 +45,7 @@ function	script	artisALAddBotMask	{
 }
 
 function	script	artisALUpdateMask	{
-    if (getareausers("001-2-33.gat", 23, 32, 45, 46) >= 1)
+    if (getareausers("001-2-33", 23, 32, 45, 46) >= 1)
     {
         removemapmask "001-2-33", 8;
     }
@@ -53,9 +53,9 @@ function	script	artisALUpdateMask	{
     {
         addmapmask "001-2-33", 8;
     }
-    if ((getareausers("001-2-33.gat", 23, 27, 45, 31) >= 1) ||
-        (getareausers("001-2-33.gat", 23, 32, 26, 38) >= 1) ||
-        (getareausers("001-2-33.gat", 42, 32, 45, 38) >= 1))
+    if ((getareausers("001-2-33", 23, 27, 45, 31) >= 1) ||
+        (getareausers("001-2-33", 23, 32, 26, 38) >= 1) ||
+        (getareausers("001-2-33", 42, 32, 45, 38) >= 1))
     {
         removemapmask "001-2-33", 4;
     }