Merge pull request #267 from mekolat/gat

remove .gat

1 files changed, 30 insertions, 30 deletions

diff --git a/world/map/npc/027-8/general_terogan.txt b/world/map/npc/027-8/general_terogan.txt
index 669a1597..1d2b2165 100644
--- a/world/map/npc/027-8/general_terogan.txt
+++ b/world/map/npc/027-8/general_terogan.txt
@@ -2,7 +2,7 @@
 // Based off Cindy Fight
 // General Terogan Fight
 
-027-8.gat,39,24,0|script|General Terogan#Main|400
+027-8,39,24,0|script|General Terogan#Main|400
 {
     if ($@CRYPT_FIGHT3 != 0)
         end;
@@ -75,9 +75,9 @@ L_RitualLeft:
     set $@CRYPT_FIGHT3, 1;
     set $@CRYPT_FIGHT3_WAVE, 0;
     set $@CRYPT_FIGHT3_SUMMONS_COUNT, 2;
-    set $@CRYPT_FIGHT3_PLAYER_COUNT, getmapusers("027-8.gat");
-    areamonster "027-8.gat", 43, 39, 58, 60, "", 1124, 1, "General Terogan#Main::OnPetDeath";
-    areamonster "027-8.gat", 20, 39, 35, 60, "", 1075, 1, "General Terogan#Main::OnPetDeath";
+    set $@CRYPT_FIGHT3_PLAYER_COUNT, getmapusers("027-8");
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, 1, "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1075, 1, "General Terogan#Main::OnPetDeath";
 
     initnpctimer;
     warp "027-8", 27, 43;
@@ -108,9 +108,9 @@ L_RitualRight:
     set $@CRYPT_FIGHT3, 1;
     set $@CRYPT_FIGHT3_WAVE, 0;
     set $@CRYPT_FIGHT3_SUMMONS_COUNT, 2;
-    set $@CRYPT_FIGHT3_PLAYER_COUNT, getmapusers("027-8.gat");
-    areamonster "027-8.gat", 43, 39, 58, 60, "", 1124, 1, "General Terogan#Main::OnPetDeath";
-    areamonster "027-8.gat", 20, 39, 35, 60, "", 1075, 1, "General Terogan#Main::OnPetDeath";
+    set $@CRYPT_FIGHT3_PLAYER_COUNT, getmapusers("027-8");
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, 1, "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1075, 1, "General Terogan#Main::OnPetDeath";
 
     initnpctimer;
     goto L_Announce;
@@ -141,7 +141,7 @@ OnTimer5000:
 
 L_Return_1:
     set $@CRYPT_FIGHT3_PLAYER_COUNT, 0;
-    areatimer "027-8.gat", 0, 0, 79, 84, 10, "General Terogan#Main::OnTick";
+    areatimer "027-8", 0, 0, 79, 84, 10, "General Terogan#Main::OnTick";
     end;
 
 L_CryptLogic:
@@ -149,10 +149,10 @@ L_CryptLogic:
     if ($@CRYPT_FIGHT3_ROUND_PEN > 60)
         set $@CRYPT_FIGHT3_ROUND_PEN, 60;
     if ($@CRYPT_FIGHT3_PLAYER_COUNT <= 0) goto L_CleanUpLosers;
-    if getareausers("027-8.gat", 20, 39, 35, 60, 1) < 1 goto L_Failure;
-    if getareausers("027-8.gat", 43, 39, 58, 60, 1) < 1 goto L_Failure;
+    if getareausers("027-8", 20, 39, 35, 60, 1) < 1 goto L_Failure;
+    if getareausers("027-8", 43, 39, 58, 60, 1) < 1 goto L_Failure;
     set $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds
-    if (mobcount("027-8.gat", "General Terogan#Main::OnPetDeath") < 0)
+    if (mobcount("027-8", "General Terogan#Main::OnPetDeath") < 0)
         goto L_NextWave;
     if ($@CRYPT_FIGHT3_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT3_ROUND_PEN >= 120)
         goto L_NextWave;
@@ -177,40 +177,40 @@ L_NextWave:
 
 L_SummonNuke:
     set $@CRYPT_FIGHT3_SUMMONS_COUNT, $@CRYPT_FIGHT3_SUMMONS_COUNT + $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4;
-    areamonster "027-8.gat", 0, 0, 79, 84, "", 1124, $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4, "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 0, 0, 79, 84, "", 1124, $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4, "General Terogan#Main::OnPetDeath";
     goto L_Announce;
 
 L_WeakSummons:
     set $@CRYPT_FIGHT3_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2;
     set $@CRYPT_FIGHT3_SUMMONS_COUNT, $@CRYPT_FIGHT3_SUMMONS_COUNT + ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2);
 
-    areamonster "027-8.gat", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
-    areamonster "027-8.gat", 20, 39, 35, 60, "", 1074, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1074, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
     goto L_Announce;
 
 L_StrongSummons:
     set $@CRYPT_FIGHT3_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2;
     set $@CRYPT_FIGHT3_SUMMONS_COUNT, $@CRYPT_FIGHT3_SUMMONS_COUNT + (2 * ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2));
 
-    areamonster "027-8.gat", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
-    areamonster "027-8.gat", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
     goto L_Announce;
 
 L_BossSummons:
     set $@CRYPT_FIGHT3_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2;
     set $@CRYPT_FIGHT3_SUMMONS_COUNT, $@CRYPT_FIGHT3_SUMMONS_COUNT + (2 * ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2)) + 2;
-    areamonster "027-8.gat", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
-    areamonster "027-8.gat", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
-    areamonster "027-8.gat", 43, 39, 58, 60, "", 1129, 1, "General Terogan#Main::OnPetDeath";
-    areamonster "027-8.gat", 20, 39, 35, 60, "", 1129, 1, "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 43, 39, 58, 60, "", 1129, 1, "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1129, 1, "General Terogan#Main::OnPetDeath";
     goto L_Announce;
 
 L_Announce:
     set $@msg$, $@CRYPT_FIGHT3_MESSAGES$[$@CRYPT_FIGHT3_WAVE];
     if ($@msg$ == "")
         goto L_Return_1;
-    mapannounce "027-8.gat", $@msg$, 0;
-    mapannounce "027-5.gat", $@msg$, 0;
+    mapannounce "027-8", $@msg$, 0;
+    mapannounce "027-5", $@msg$, 0;
     set $@msg$, "";
     goto L_Return_1;
 
@@ -228,12 +228,12 @@ OnPetDeath:
 L_Failure:
     if $@CRYPT_FAIL_ANNOUNCED goto L_NextWave;
     set $@CRYPT_FAIL_ANNOUNCED, 1;
-    mapannounce "027-8.gat", "Looks like your neighbour team to is finished off, this is your death sentence!", 0;
+    mapannounce "027-8", "Looks like your neighbour team to is finished off, this is your death sentence!", 0;
     set $@CRYPT_FIGHT3_WAVE, 23;
     goto L_NextWave;
 
 L_CleanUpLosers:
-    mapannounce "027-8.gat", "General Terogan:* You just proved you cannot even coordinate a simple task. Come back when you are prepared", 0;
+    mapannounce "027-8", "General Terogan:* You just proved you cannot even coordinate a simple task. Come back when you are prepared", 0;
     set $@CRYPT_FIGHT3, 0;
     set $@CRYPT_FIGHT3_PLAYER_COUNT, 0;
     set $@CRYPT_FIGHT3_WAVE, 0;
@@ -242,14 +242,14 @@ L_CleanUpLosers:
     set $@CRYPT_FIGHT3_ROUND_PEN, 0;
     set $@CRYPT_FIGHT3_SUMMONS_NUMBER, 0;
     set $@CRYPT_FAIL_ANNOUNCED, 0;
-    killmonster "027-8.gat", "General Terogan#Main::OnPetDeath";
+    killmonster "027-8", "General Terogan#Main::OnPetDeath";
     stopnpctimer;
     setnpctimer 0;
     end;
 
 L_CleanUp:
-    mapannounce "027-8.gat", "General Terogan: You might have won this battle, but you will never defeat me!", 0;
-    areatimer "027-8.gat", 0, 0, 79, 84, 10, "General Terogan#Main::OnReward";
+    mapannounce "027-8", "General Terogan: You might have won this battle, but you will never defeat me!", 0;
+    areatimer "027-8", 0, 0, 79, 84, 10, "General Terogan#Main::OnReward";
     set $@CRYPT_FIGHT3, 0;
     set $@CRYPT_FIGHT3_PLAYER_COUNT, 0;
     set $@CRYPT_FIGHT3_WAVE, 0;
@@ -258,7 +258,7 @@ L_CleanUp:
     set $@CRYPT_FIGHT3_ROUND_PEN, 0;
     set $@CRYPT_FIGHT3_SUMMONS_NUMBER, 0;
     set $@CRYPT_FAIL_ANNOUNCED, 0;
-    killmonster "027-8.gat", "General Terogan#Main::OnPetDeath";
+    killmonster "027-8", "General Terogan#Main::OnPetDeath";
     stopnpctimer;
     setnpctimer 0;
     end;
@@ -299,7 +299,7 @@ OnInit:
     end;
 }
 
-027-8.gat,27,41,0|script|General Terogan#Exit1|400
+027-8,27,41,0|script|General Terogan#Exit1|400
 {
     if ($@CRYPT_FIGHT3 != 0)
         message strcharinfo(0), "You are way too busy to check this book right now";
@@ -310,7 +310,7 @@ OnInit:
     warp "027-8", 38, 29;
     end;
 }
-027-8.gat,51,41,0|script|General Terogan#Exit2|400
+027-8,51,41,0|script|General Terogan#Exit2|400
 {
     if ($@CRYPT_FIGHT3 != 0)
         message strcharinfo(0), "You are way too busy to check this book right now";