Merge pull request #267 from mekolat/gat

remove .gat

1 files changed, 23 insertions, 23 deletions

diff --git a/world/map/npc/027-7/general_razha.txt b/world/map/npc/027-7/general_razha.txt
index 755aa610..9a99e8b8 100644
--- a/world/map/npc/027-7/general_razha.txt
+++ b/world/map/npc/027-7/general_razha.txt
@@ -2,7 +2,7 @@
 // Based off Cindy Fight
 // General Razha Fight
 
-027-7.gat,39,25,0|script|General Razha|400
+027-7,39,25,0|script|General Razha|400
 {
     if ($@CRYPT_FIGHT2 != 0)
         end;
@@ -57,9 +57,9 @@ L_Ritual:
     set $@CRYPT_FIGHT2, 1;
     set $@CRYPT_FIGHT2_WAVE, 0;
     set $@CRYPT_FIGHT2_SUMMONS_COUNT, 2;
-    set $@CRYPT_FIGHT2_PLAYER_COUNT, getmapusers("027-7.gat");
-    areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, 1, "General Razha::OnPetDeath";
-    areamonster "027-7.gat", 0, 0, 79, 84, "", 1124, 1, "General Razha::OnPetDeath";
+    set $@CRYPT_FIGHT2_PLAYER_COUNT, getmapusers("027-7");
+    areamonster "027-7", 0, 0, 79, 84, "", 1036, 1, "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1124, 1, "General Razha::OnPetDeath";
 
     initnpctimer;
     goto L_Announce;
@@ -86,7 +86,7 @@ OnTimer5000:
 
 L_Return_1:
     set $@CRYPT_FIGHT2_PLAYER_COUNT, 0;
-    areatimer "027-7.gat", 0, 0, 79, 84, 10, "General Razha::OnTick";
+    areatimer "027-7", 0, 0, 79, 84, 10, "General Razha::OnTick";
     end;
 
 L_CryptLogic:
@@ -96,7 +96,7 @@ L_CryptLogic:
     if ($@CRYPT_FIGHT2_PLAYER_COUNT <= 0)
         goto L_CleanUpLosers;
     set $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds
-    if (mobcount("027-7.gat", "General Razha::OnPetDeath") < 0)
+    if (mobcount("027-7", "General Razha::OnPetDeath") < 0)
         goto L_NextWave;
     if ($@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT2_ROUND_PEN >= 120)
         goto L_NextWave;
@@ -121,31 +121,31 @@ L_NextWave:
 
 L_SummonNuke:
     set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4;
-    areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4, "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1036, $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4, "General Razha::OnPetDeath";
     goto L_Announce;
 
 L_WeakSummons:
     set $@CRYPT_FIGHT2_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2;
     set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2);
 
-    areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
-    areamonster "027-7.gat", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
     goto L_Announce;
 
 L_StrongSummons:
     set $@CRYPT_FIGHT2_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2;
     set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2);
 
-    areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
-    areamonster "027-7.gat", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
     goto L_Announce;
 
 L_BossSummons:
     set $@CRYPT_FIGHT2_SUMMONS_NUMBER, (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2;
     set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2);
-    areamonster "027-7.gat", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
-    areamonster "027-7.gat", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
-    areamonster "027-7.gat", 0, 0, 79, 84, "", 1128, 1, "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2), "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1128, 1, "General Razha::OnPetDeath";
     set $@CRYPT_FIGHT2_SUMMONS_COUNT, $@CRYPT_FIGHT2_SUMMONS_COUNT + 1;
     goto L_Announce;
 
@@ -153,8 +153,8 @@ L_Announce:
     set $@msg$, $@CRYPT_FIGHT2_MESSAGES$[$@CRYPT_FIGHT2_WAVE];
     if ($@msg$ == "")
         goto L_Return_1;
-    mapannounce "027-7.gat", $@msg$, 0;
-    mapannounce "027-4.gat", $@msg$, 0;
+    mapannounce "027-7", $@msg$, 0;
+    mapannounce "027-4", $@msg$, 0;
     set $@msg$, "";
     goto L_Return_1;
 
@@ -169,8 +169,8 @@ OnPetDeath:
     end;
 
 L_CleanUpLosers:
-    mapannounce "027-7.gat", "General Razha:* Oh where did you all go, I was beginning to have fun here.", 0;
-    mapannounce "027-4.gat", "The battle is lost.", 0;
+    mapannounce "027-7", "General Razha:* Oh where did you all go, I was beginning to have fun here.", 0;
+    mapannounce "027-4", "The battle is lost.", 0;
     set $@CRYPT_FIGHT2, 0;
     set $@CRYPT_FIGHT2_PLAYER_COUNT, 0;
     set $@CRYPT_FIGHT2_WAVE, 0;
@@ -178,15 +178,15 @@ L_CleanUpLosers:
     set $@CRYPT_FIGHT2_SUMMONS_COUNT, 0;
     set $@CRYPT_FIGHT2_ROUND_PEN, 0;
     set $@CRYPT_FIGHT2_SUMMONS_NUMBER, 0;
-    killmonster "027-7.gat", "General Razha::OnPetDeath";
+    killmonster "027-7", "General Razha::OnPetDeath";
     stopnpctimer;
     setnpctimer 0;
     end;
 
 L_CleanUp:
-    mapannounce "027-7.gat", "General Razha:* How in all hells could that happen? I am lost forever.", 0;
-    mapannounce "027-4.gat", "General Razha is defeated.", 0;
-    areatimer "027-7.gat", 0, 0, 79, 84, 10, "General Razha::OnReward";
+    mapannounce "027-7", "General Razha:* How in all hells could that happen? I am lost forever.", 0;
+    mapannounce "027-4", "General Razha is defeated.", 0;
+    areatimer "027-7", 0, 0, 79, 84, 10, "General Razha::OnReward";
     set $@CRYPT_FIGHT2, 0;
     set $@CRYPT_FIGHT2_PLAYER_COUNT, 0;
     set $@CRYPT_FIGHT2_WAVE, 0;
@@ -194,7 +194,7 @@ L_CleanUp:
     set $@CRYPT_FIGHT2_SUMMONS_COUNT, 0;
     set $@CRYPT_FIGHT2_ROUND_PEN, 0;
     set $@CRYPT_FIGHT2_SUMMONS_NUMBER, 0;
-    killmonster "027-7.gat", "General Razha::OnPetDeath";
+    killmonster "027-7", "General Razha::OnPetDeath";
     stopnpctimer;
     setnpctimer 0;
     end;