remove .gat from npcs

2 files changed, 30 insertions, 30 deletions

diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt
index 6034af84..18507bc9 100644
--- a/world/map/npc/030-4/mana_battery.txt
+++ b/world/map/npc/030-4/mana_battery.txt
@@ -21,7 +21,7 @@
 //TODO Add an icreasing particle effect to the chest, move it half a tile right
 // and make it one of those lab tables from the slime quests
 
-030-4.gat,32,21,0|script|AniManOMat|400
+030-4,32,21,0|script|AniManOMat|400
 {
     set $@XmasBattleStatusClone, 0;
     callfunc "XmasStates";
@@ -129,8 +129,8 @@ L_Start:
     set $@XmasBattleStatus, @xmas_battle_status;
     set $@XmasBattleStatusClone, $@XmasBattleStatus;
     set $@XmasBossRound, 0;
-    set $@XmasBossPlayerCount, getmapusers("030-4.gat");
-    areamonster "030-4.gat", 20, 21, 40, 40, "", 1114, 1, "AniManOMat::OnGuardDeath";
+    set $@XmasBossPlayerCount, getmapusers("030-4");
+    areamonster "030-4", 20, 21, 40, 40, "", 1114, 1, "AniManOMat::OnGuardDeath";
     initnpctimer;
     goto L_Close;
 
@@ -197,14 +197,14 @@ OnTimer5000:
 
 L_Return_1:
     set $@XmasBossPlayerCount, 0;
-    areatimer "030-4.gat", 0, 0, 60, 60, 10, "AniManOMat::OnTick";
+    areatimer "030-4", 0, 0, 60, 60, 10, "AniManOMat::OnTick";
     end;
 
 L_CaveLogic:
     if ($@XmasBossPlayerCount < 1)
         goto L_AllDead;
     set $@BombTimer, $@BombTimer + 5; // Advance 5 seconds
-    if ((mobcount("030-4.gat", "AniManOMat::OnGuardDeath") + 1) == 0)
+    if ((mobcount("030-4", "AniManOMat::OnGuardDeath") + 1) == 0)
         goto L_NextWave;
     if ($@BombTimer >= 120)
         goto L_NextWave;
@@ -214,14 +214,14 @@ L_NextWave:
     set $@BombTimer, 0;
     set $@DangerCellNumber, rand(8);
     set $@XmasBossRound, $@XmasBossRound + 1;
-    if (($@XmasBossRound > 10)  && ((mobcount("030-4.gat", "AniManOMat::OnGuardDeath") + 1) == 0))
+    if (($@XmasBossRound > 10)  && ((mobcount("030-4", "AniManOMat::OnGuardDeath") + 1) == 0))
         goto L_Finished;
     // Break/LastChance(s)
     if (($@XmasBossRound > 10)  && ($@XmasBossRound <= 16))
         goto L_Return_1;
     //KillerWaves
     if ($@XmasBossRound > 16)
-        areamonster "030-4.gat", 0, 0, 50, 50, "", 1114, $@XmasBossRound*2 + $@XmasBossPlayerCount*3, "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 0, 0, 50, 50, "", 1114, $@XmasBossRound*2 + $@XmasBossPlayerCount*3, "AniManOMat::OnGuardDeath";
     //Normal Waves 1 to 10
     // Guard Amount doubles if on hard mode
     set $@GuardAmount, 1 + (6 + ($@XmasBossRound) + (2 * $@XmasBossPlayerCount)) / 7;
@@ -231,34 +231,34 @@ L_NextWave:
         set $@GuardAmount, 15;
 
     //Obliatory Guard Of Honour in the Southern Hallway
-    areamonster "030-4.gat", 30, 43, 39, 49, "", 1114, $@GuardAmount, "AniManOMat::OnGuardDeath";
+    areamonster "030-4", 30, 43, 39, 49, "", 1114, $@GuardAmount, "AniManOMat::OnGuardDeath";
     //CopperSlimes, I love Copper Slimes anywhere anytime
-    areamonster "030-4.gat", 20, 21, 49, 49, "", 1098, rand(2,7), "AniManOMat::OnGuardDeath";
+    areamonster "030-4", 20, 21, 49, 49, "", 1098, rand(2,7), "AniManOMat::OnGuardDeath";
     //IceSkulls for hard mode in room 3 and 4
     if ($@XmasBattleStatus == 2 || $@XmasBattleStatus == 4)
-        areamonster "030-4.gat", 20, 32, 28, 39, "", 1085, $@SkullAmount / 2, "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 20, 32, 28, 39, "", 1085, $@SkullAmount / 2, "AniManOMat::OnGuardDeath";
     if ($@XmasBattleStatus == 2 || $@XmasBattleStatus == 4)
-        areamonster "030-4.gat", 41, 32, 49, 39, "", 1085, $@SkullAmount / 2 + 1, "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 41, 32, 49, 39, "", 1085, $@SkullAmount / 2 + 1, "AniManOMat::OnGuardDeath";
     //Angry Sea Slimes for Easy Mode in Nice Version in Room 3,4,5,6
     if ($@XmasBattleStatus == 1)
-        areamonster "030-4.gat", 20, 32, 28, 49, "", 1109, $@SkullAmount, "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 20, 32, 28, 49, "", 1109, $@SkullAmount, "AniManOMat::OnGuardDeath";
     if ($@XmasBattleStatus == 1)
-        areamonster "030-4.gat", 41, 32, 49, 49, "", 1109, $@SkullAmount, "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 41, 32, 49, 49, "", 1109, $@SkullAmount, "AniManOMat::OnGuardDeath";
     //Candied Slimes for Nice Mode in Rooms 1 and 2
     if ($@XmasBattleStatus == 1 || $@XmasBattleStatus == 2)
-        areamonster "030-4.gat", 20, 21, 28, 28, "", 1111, ($@XmasBossRound / 2) + 1, "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 20, 21, 28, 28, "", 1111, ($@XmasBossRound / 2) + 1, "AniManOMat::OnGuardDeath";
     if ($@XmasBattleStatus == 1 || $@XmasBattleStatus == 2)
-        areamonster "030-4.gat", 41, 21, 49, 28, "", 1111, ($@XmasBossRound / 2) + 2, "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 41, 21, 49, 28, "", 1111, ($@XmasBossRound / 2) + 2, "AniManOMat::OnGuardDeath";
     //Bluepars for Easy mode in Naughty Variant in Rooms 3,4,5,6
     if ($@XmasBattleStatus == 3)
-        areamonster "030-4.gat", 20, 32, 28, 49, "", 1107, $@SkullAmount, "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 20, 32, 28, 49, "", 1107, $@SkullAmount, "AniManOMat::OnGuardDeath";
     if ($@XmasBattleStatus == 3)
-        areamonster "030-4.gat", 41, 32, 49, 49, "", 1107, $@SkullAmount, "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 41, 32, 49, 49, "", 1107, $@SkullAmount, "AniManOMat::OnGuardDeath";
     // Wicked Mushrooms for Naughty Mode in Rooms 1 and 2
     if ($@XmasBattleStatus == 3 || $@XmasBattleStatus == 4)
-        areamonster "030-4.gat", 20, 21, 28, 28, "", 1106, $@XmasBossRound + ($@XmasBossRound / 2), "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 20, 21, 28, 28, "", 1106, $@XmasBossRound + ($@XmasBossRound / 2), "AniManOMat::OnGuardDeath";
     if ($@XmasBattleStatus == 3 || $@XmasBattleStatus == 4)
-        areamonster "030-4.gat", 41, 21, 49, 28, "", 1106, $@XmasBossRound + ($@XmasBossRound / 2), "AniManOMat::OnGuardDeath";
+        areamonster "030-4", 41, 21, 49, 28, "", 1106, $@XmasBossRound + ($@XmasBossRound / 2), "AniManOMat::OnGuardDeath";
 
     set $@msgnumber, (2 * $@XmasBossRound) + (($@XmasBattleStatus - 1) >> 1);
     set $@msg$, $@XmasBossMes$[ $@msgnumber ];
@@ -270,7 +270,7 @@ L_NextWave:
 OnTick:
     if (isdead()) end;
     set $@XmasBossPlayerCount, $@XmasBossPlayerCount + 1;
-    if(isin("030-4.gat", $@DangerCellX1[$@DangerCellNumber], $@DangerCellY1[$@DangerCellNumber], $@DangerCellX2[$@DangerCellNumber], $@DangerCellY2[$@DangerCellNumber]))
+    if(isin("030-4", $@DangerCellX1[$@DangerCellNumber], $@DangerCellY1[$@DangerCellNumber], $@DangerCellX2[$@DangerCellNumber], $@DangerCellY2[$@DangerCellNumber]))
         goto L_DangerCell;
     end;
 
@@ -294,13 +294,13 @@ L_Finished:
     goto L_CleanUp;
 
 L_CleanUp:
-    areatimer "030-4.gat", 0, 0, 50, 50, 10, "AniManOMat::OnReward";
+    areatimer "030-4", 0, 0, 50, 50, 10, "AniManOMat::OnReward";
     set $@XmasBossPlayerCount, 0;
     set $@XmasBossRound, 0;
     set $@BombTimer, 0;
     set $@GuardAmount, 0;
     set $@SkullAmount, 0;
-    killmonster "030-4.gat", "AniManOMat::OnGuardDeath";
+    killmonster "030-4", "AniManOMat::OnGuardDeath";
     stopnpctimer;
     donpcevent "#XmasChamberCooler::OnCommandCoolDown";
     end;
@@ -338,14 +338,14 @@ L_EndNice:
     end;
 
 OnCommandChamberReset:
-    areatimer "030-4.gat", 0, 0, 50, 50, 10, "AniManOMat::OnReward";
+    areatimer "030-4", 0, 0, 50, 50, 10, "AniManOMat::OnReward";
     set $@XmasBattleStatus, 0;
     set $@XmasBossPlayerCount, 0;
     set $@XmasBossRound, 0;
     set $@BombTimer, 0;
     set $@GuardAmount, 0;
     set $@SkullAmount, 0;
-    killmonster "030-4.gat", "AniManOMat::OnGuardDeath";
+    killmonster "030-4", "AniManOMat::OnGuardDeath";
     stopnpctimer;
     setnpctimer 0;
     goto L_Restart;
@@ -405,9 +405,9 @@ L_Restart:
     end;
 
 S_Announce:
-    mapannounce "030-4.gat", "Danger Cell Activated. Zone " + $@DangerCellNumber + " activated.", 0;
-    mapannounce "030-4.gat", $@msg$, 0;
-    mapannounce "030-2.gat", $@msg$, 0;
+    mapannounce "030-4", "Danger Cell Activated. Zone " + $@DangerCellNumber + " activated.", 0;
+    mapannounce "030-4", $@msg$, 0;
+    mapannounce "030-2", $@msg$, 0;
     set $@msg$, "";
     return;
 
@@ -438,7 +438,7 @@ S_ClearVariables:
     return;
 }
 
-030-4.gat,0,0,0|script|#XmasChamberCooler|-1
+030-4,0,0,0|script|#XmasChamberCooler|-1
 {
     end;
 OnCommandCoolDown:
diff --git a/world/map/npc/030-4/mapflags.txt b/world/map/npc/030-4/mapflags.txt
index 1374efb0..c95a8d5f 100644
--- a/world/map/npc/030-4/mapflags.txt
+++ b/world/map/npc/030-4/mapflags.txt
@@ -1,2 +1,2 @@
-030-4.gat|mapflag|nosave|030-2,151,25
-030-4.gat|mapflag|resave|030-2,151,25
+030-4|mapflag|nosave|030-2,151,25
+030-4|mapflag|resave|030-2,151,25