Trim variable name length on the Crypt generals

3 files changed, 98 insertions, 98 deletions

diff --git a/npc/027-6/general_krukan.txt b/npc/027-6/general_krukan.txt
index 1116ea67..1491e80f 100644
--- a/npc/027-6/general_krukan.txt
+++ b/npc/027-6/general_krukan.txt
@@ -52,8 +52,8 @@ L_Ritual:
     // initialize fight
     $@CRYPT_FIGHT1 = 1;
     $@CRYPT_FIGHT1_WAVE = 0;
-    $@CRYPT_FIGHT1_SUMMONS_COUNT = 2;
-    $@CRYPT_FIGHT1_PLAYER_COUNT = getmapusers("027-6");
+    $@CRYPT_FIGHT1_MOBS_COUNT = 2;
+    $@CRYPT_FIGHT1_PC = getmapusers("027-6");
     areamonster "027-6", 0, 0, 79, 84, "", 1043, 1, "General Krukan::OnPetDeath";
     areamonster "027-6", 0, 0, 79, 84, "", 1044, 1, "General Krukan::OnPetDeath";
 
@@ -80,27 +80,27 @@ OnTimer5000:
     goto L_Return_1;
 
 L_Return_1:
-    $@CRYPT_FIGHT1_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT1_PC = 0;
     areatimer 0, "027-6", 0, 0, 79, 84, 10, "General Krukan::OnTick";
     end;
 
 L_CryptLogic:
-    $@CRYPT_FIGHT1_ROUND_PEN = $@CRYPT_FIGHT1_PLAYER_COUNT;
+    $@CRYPT_FIGHT1_ROUND_PEN = $@CRYPT_FIGHT1_PC;
     if ($@CRYPT_FIGHT1_ROUND_PEN > 60)
         $@CRYPT_FIGHT1_ROUND_PEN = 60;
-    if ($@CRYPT_FIGHT1_PLAYER_COUNT <= 0)
+    if ($@CRYPT_FIGHT1_PC <= 0)
         goto L_CleanUpLosers;
-    set $@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds
+    set $@CRYPT_FIGHT1_ROUND_TIMER, $@CRYPT_FIGHT1_ROUND_TIMER + 5; // Advance 5 seconds
     if (mobcount("027-6", "General Krukan::OnPetDeath") <= 0)
         goto L_NextWave;
-    if ($@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT1_ROUND_PEN >= 120)
+    if ($@CRYPT_FIGHT1_ROUND_TIMER + $@CRYPT_FIGHT1_ROUND_PEN >= 120)
         goto L_NextWave;
     goto L_Return_1;
 
 L_NextWave:
-    $@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER = 0;
+    $@CRYPT_FIGHT1_ROUND_TIMER = 0;
     $@CRYPT_FIGHT1_WAVE = $@CRYPT_FIGHT1_WAVE + 1;
-    if ( ($@CRYPT_FIGHT1_WAVE > 10) && ($@CRYPT_FIGHT1_SUMMONS_COUNT == 0) )
+    if ( ($@CRYPT_FIGHT1_WAVE > 10) && ($@CRYPT_FIGHT1_MOBS_COUNT == 0) )
         goto L_CleanUp;
     if ( ($@CRYPT_FIGHT1_WAVE > 10) && ($@CRYPT_FIGHT1_WAVE < 22) )
         goto L_Return_1;
@@ -115,33 +115,33 @@ L_NextWave:
     goto L_SummonNuke;
 
 L_SummonNuke:
-    $@CRYPT_FIGHT1_SUMMONS_COUNT = $@CRYPT_FIGHT1_SUMMONS_COUNT + $@CRYPT_FIGHT1_WAVE*2 + $@CRYPT_FIGHT1_PLAYER_COUNT*4;
-    areamonster "027-6", 0, 0, 79, 84, "", 1043, $@CRYPT_FIGHT1_WAVE*2 + $@CRYPT_FIGHT1_PLAYER_COUNT*4, "General Krukan::OnPetDeath";
+    $@CRYPT_FIGHT1_MOBS_COUNT = $@CRYPT_FIGHT1_MOBS_COUNT + $@CRYPT_FIGHT1_WAVE*2 + $@CRYPT_FIGHT1_PC*4;
+    areamonster "027-6", 0, 0, 79, 84, "", 1043, $@CRYPT_FIGHT1_WAVE*2 + $@CRYPT_FIGHT1_PC*4, "General Krukan::OnPetDeath";
     goto L_Announce;
 
 L_WeakSummons:
-    $@CRYPT_FIGHT1_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT1_WAVE) + (2 * $@CRYPT_FIGHT1_PLAYER_COUNT))/2;
-    $@CRYPT_FIGHT1_SUMMONS_COUNT = $@CRYPT_FIGHT1_SUMMONS_COUNT + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2);
+    $@CRYPT_FIGHT1_MOBS_NUMBER = (5 + (1 * $@CRYPT_FIGHT1_WAVE) + (2 * $@CRYPT_FIGHT1_PC))/2;
+    $@CRYPT_FIGHT1_MOBS_COUNT = $@CRYPT_FIGHT1_MOBS_COUNT + ($@CRYPT_FIGHT1_MOBS_NUMBER/2) + ($@CRYPT_FIGHT1_MOBS_NUMBER/2);
 
-    areamonster "027-6", 0, 0, 79, 84, "", 1043, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath";
-    areamonster "027-6", 0, 0, 79, 84, "", 1044, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath";
+    areamonster "027-6", 0, 0, 79, 84, "", 1043, ($@CRYPT_FIGHT1_MOBS_NUMBER/2), "General Krukan::OnPetDeath";
+    areamonster "027-6", 0, 0, 79, 84, "", 1044, ($@CRYPT_FIGHT1_MOBS_NUMBER/2), "General Krukan::OnPetDeath";
     goto L_Announce;
 
 L_StrongSummons:
-    $@CRYPT_FIGHT1_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT1_WAVE) + (2 * $@CRYPT_FIGHT1_PLAYER_COUNT))/2;
-    $@CRYPT_FIGHT1_SUMMONS_COUNT = $@CRYPT_FIGHT1_SUMMONS_COUNT + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2);
+    $@CRYPT_FIGHT1_MOBS_NUMBER = (5 + (1 * $@CRYPT_FIGHT1_WAVE) + (2 * $@CRYPT_FIGHT1_PC))/2;
+    $@CRYPT_FIGHT1_MOBS_COUNT = $@CRYPT_FIGHT1_MOBS_COUNT + ($@CRYPT_FIGHT1_MOBS_NUMBER/2) + ($@CRYPT_FIGHT1_MOBS_NUMBER/2);
 
-    areamonster "027-6", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath";
-    areamonster "027-6", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath";
+    areamonster "027-6", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT1_MOBS_NUMBER/2), "General Krukan::OnPetDeath";
+    areamonster "027-6", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT1_MOBS_NUMBER/2), "General Krukan::OnPetDeath";
     goto L_Announce;
 
 L_BossSummons:
-    $@CRYPT_FIGHT1_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT1_WAVE) + (2 * $@CRYPT_FIGHT1_PLAYER_COUNT))/2;
-    $@CRYPT_FIGHT1_SUMMONS_COUNT = $@CRYPT_FIGHT1_SUMMONS_COUNT + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2);
-    areamonster "027-6", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath";
-    areamonster "027-6", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT1_SUMMONS_NUMBER/2), "General Krukan::OnPetDeath";
+    $@CRYPT_FIGHT1_MOBS_NUMBER = (5 + (1 * $@CRYPT_FIGHT1_WAVE) + (2 * $@CRYPT_FIGHT1_PC))/2;
+    $@CRYPT_FIGHT1_MOBS_COUNT = $@CRYPT_FIGHT1_MOBS_COUNT + ($@CRYPT_FIGHT1_MOBS_NUMBER/2) + ($@CRYPT_FIGHT1_MOBS_NUMBER/2);
+    areamonster "027-6", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT1_MOBS_NUMBER/2), "General Krukan::OnPetDeath";
+    areamonster "027-6", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT1_MOBS_NUMBER/2), "General Krukan::OnPetDeath";
     areamonster "027-6", 0, 0, 79, 84, "", 1127, 1, "General Krukan::OnPetDeath";
-    $@CRYPT_FIGHT1_SUMMONS_COUNT = $@CRYPT_FIGHT1_SUMMONS_COUNT + 1;
+    $@CRYPT_FIGHT1_MOBS_COUNT = $@CRYPT_FIGHT1_MOBS_COUNT + 1;
     goto L_Announce;
 
 L_Announce:
@@ -155,21 +155,21 @@ L_Announce:
 
 OnTick:
     if (ispcdead()) end;
-    $@CRYPT_FIGHT1_PLAYER_COUNT = $@CRYPT_FIGHT1_PLAYER_COUNT + 1;
+    $@CRYPT_FIGHT1_PC = $@CRYPT_FIGHT1_PC + 1;
     end;
 
 OnPetDeath:
-    $@CRYPT_FIGHT1_SUMMONS_COUNT = $@CRYPT_FIGHT1_SUMMONS_COUNT - 1;
+    $@CRYPT_FIGHT1_MOBS_COUNT = $@CRYPT_FIGHT1_MOBS_COUNT - 1;
     end;
 
 L_CleanUpLosers:
     $@CRYPT_FIGHT1 = 0;
-    $@CRYPT_FIGHT1_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT1_PC = 0;
     $@CRYPT_FIGHT1_WAVE = 0;
-    $@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER = 0;
-    $@CRYPT_FIGHT1_SUMMONS_COUNT = 0;
+    $@CRYPT_FIGHT1_ROUND_TIMER = 0;
+    $@CRYPT_FIGHT1_MOBS_COUNT = 0;
     $@CRYPT_FIGHT1_ROUND_PEN = 0;
-    $@CRYPT_FIGHT1_SUMMONS_NUMBER = 0;
+    $@CRYPT_FIGHT1_MOBS_NUMBER = 0;
     killmonster "027-6", "General Krukan::OnPetDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -178,12 +178,12 @@ L_CleanUpLosers:
 L_CleanUp:
     areatimer 0, "027-6", 0, 0, 79, 84, 10, "General Krukan::OnReward";
     $@CRYPT_FIGHT1 = 0;
-    $@CRYPT_FIGHT1_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT1_PC = 0;
     $@CRYPT_FIGHT1_WAVE = 0;
-    $@CRYPT_FIGHT1_SUMMONS_ROUND_TIMER = 0;
-    $@CRYPT_FIGHT1_SUMMONS_COUNT = 0;
+    $@CRYPT_FIGHT1_ROUND_TIMER = 0;
+    $@CRYPT_FIGHT1_MOBS_COUNT = 0;
     $@CRYPT_FIGHT1_ROUND_PEN = 0;
-    $@CRYPT_FIGHT1_SUMMONS_NUMBER = 0;
+    $@CRYPT_FIGHT1_MOBS_NUMBER = 0;
     killmonster "027-6", "General Krukan::OnPetDeath";
     stopnpctimer;
     setnpctimer 0;
diff --git a/npc/027-7/general_razha.txt b/npc/027-7/general_razha.txt
index 5eb32bc2..ceb024b0 100644
--- a/npc/027-7/general_razha.txt
+++ b/npc/027-7/general_razha.txt
@@ -52,8 +52,8 @@ L_Ritual:
     // initialize fight
     $@CRYPT_FIGHT2 = 1;
     $@CRYPT_FIGHT2_WAVE = 0;
-    $@CRYPT_FIGHT2_SUMMONS_COUNT = 2;
-    $@CRYPT_FIGHT2_PLAYER_COUNT = getmapusers("027-7");
+    $@CRYPT_FIGHT2_MOBS_COUNT = 2;
+    $@CRYPT_FIGHT2_PC = 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";
 
@@ -80,27 +80,27 @@ OnTimer5000:
     goto L_Return_1;
 
 L_Return_1:
-    $@CRYPT_FIGHT2_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT2_PC = 0;
     areatimer 0, "027-7", 0, 0, 79, 84, 10, "General Razha::OnTick";
     end;
 
 L_CryptLogic:
-    $@CRYPT_FIGHT2_ROUND_PEN = $@CRYPT_FIGHT2_PLAYER_COUNT;
+    $@CRYPT_FIGHT2_ROUND_PEN = $@CRYPT_FIGHT2_PC;
     if ($@CRYPT_FIGHT2_ROUND_PEN > 60)
         $@CRYPT_FIGHT2_ROUND_PEN = 60;
-    if ($@CRYPT_FIGHT2_PLAYER_COUNT <= 0)
+    if ($@CRYPT_FIGHT2_PC <= 0)
         goto L_CleanUpLosers;
-    set $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER, $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER + 5; // Advance 5 seconds
+    set $@CRYPT_FIGHT2_ROUND_TIMER, $@CRYPT_FIGHT2_ROUND_TIMER + 5; // Advance 5 seconds
     if (mobcount("027-7", "General Razha::OnPetDeath") <= 0)
         goto L_NextWave;
-    if ($@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER + $@CRYPT_FIGHT2_ROUND_PEN >= 120)
+    if ($@CRYPT_FIGHT2_ROUND_TIMER + $@CRYPT_FIGHT2_ROUND_PEN >= 120)
         goto L_NextWave;
     goto L_Return_1;
 
 L_NextWave:
-    $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER = 0;
+    $@CRYPT_FIGHT2_ROUND_TIMER = 0;
     $@CRYPT_FIGHT2_WAVE = $@CRYPT_FIGHT2_WAVE + 1;
-    if ( ($@CRYPT_FIGHT2_WAVE > 10) && ($@CRYPT_FIGHT2_SUMMONS_COUNT == 0) )
+    if ( ($@CRYPT_FIGHT2_WAVE > 10) && ($@CRYPT_FIGHT2_MOBS_COUNT == 0) )
         goto L_CleanUp;
     if ( ($@CRYPT_FIGHT2_WAVE > 10) && ($@CRYPT_FIGHT2_WAVE < 22) )
         goto L_Return_1;
@@ -115,33 +115,33 @@ L_NextWave:
     goto L_SummonNuke;
 
 L_SummonNuke:
-    $@CRYPT_FIGHT2_SUMMONS_COUNT = $@CRYPT_FIGHT2_SUMMONS_COUNT + $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4;
-    areamonster "027-7", 0, 0, 79, 84, "", 1036, $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PLAYER_COUNT*4, "General Razha::OnPetDeath";
+    $@CRYPT_FIGHT2_MOBS_COUNT = $@CRYPT_FIGHT2_MOBS_COUNT + $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PC*4;
+    areamonster "027-7", 0, 0, 79, 84, "", 1036, $@CRYPT_FIGHT2_WAVE*2 + $@CRYPT_FIGHT2_PC*4, "General Razha::OnPetDeath";
     goto L_Announce;
 
 L_WeakSummons:
-    $@CRYPT_FIGHT2_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2;
-    $@CRYPT_FIGHT2_SUMMONS_COUNT = $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2);
+    $@CRYPT_FIGHT2_MOBS_NUMBER = (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PC))/2;
+    $@CRYPT_FIGHT2_MOBS_COUNT = $@CRYPT_FIGHT2_MOBS_COUNT + ($@CRYPT_FIGHT2_MOBS_NUMBER/2) + ($@CRYPT_FIGHT2_MOBS_NUMBER/2);
 
-    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";
+    areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_MOBS_NUMBER/2), "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1045, ($@CRYPT_FIGHT2_MOBS_NUMBER/2), "General Razha::OnPetDeath";
     goto L_Announce;
 
 L_StrongSummons:
-    $@CRYPT_FIGHT2_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2;
-    $@CRYPT_FIGHT2_SUMMONS_COUNT = $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2);
+    $@CRYPT_FIGHT2_MOBS_NUMBER = (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PC))/2;
+    $@CRYPT_FIGHT2_MOBS_COUNT = $@CRYPT_FIGHT2_MOBS_COUNT + ($@CRYPT_FIGHT2_MOBS_NUMBER/2) + ($@CRYPT_FIGHT2_MOBS_NUMBER/2);
 
-    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, "", 1036, ($@CRYPT_FIGHT2_MOBS_NUMBER/2), "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_MOBS_NUMBER/2), "General Razha::OnPetDeath";
     goto L_Announce;
 
 L_BossSummons:
-    $@CRYPT_FIGHT2_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PLAYER_COUNT))/2;
-    $@CRYPT_FIGHT2_SUMMONS_COUNT = $@CRYPT_FIGHT2_SUMMONS_COUNT + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT2_SUMMONS_NUMBER/2);
-    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";
+    $@CRYPT_FIGHT2_MOBS_NUMBER = (5 + (1 * $@CRYPT_FIGHT2_WAVE) + (2 * $@CRYPT_FIGHT2_PC))/2;
+    $@CRYPT_FIGHT2_MOBS_COUNT = $@CRYPT_FIGHT2_MOBS_COUNT + ($@CRYPT_FIGHT2_MOBS_NUMBER/2) + ($@CRYPT_FIGHT2_MOBS_NUMBER/2);
+    areamonster "027-7", 0, 0, 79, 84, "", 1036, ($@CRYPT_FIGHT2_MOBS_NUMBER/2), "General Razha::OnPetDeath";
+    areamonster "027-7", 0, 0, 79, 84, "", 1124, ($@CRYPT_FIGHT2_MOBS_NUMBER/2), "General Razha::OnPetDeath";
     areamonster "027-7", 0, 0, 79, 84, "", 1128, 1, "General Razha::OnPetDeath";
-    $@CRYPT_FIGHT2_SUMMONS_COUNT = $@CRYPT_FIGHT2_SUMMONS_COUNT + 1;
+    $@CRYPT_FIGHT2_MOBS_COUNT = $@CRYPT_FIGHT2_MOBS_COUNT + 1;
     goto L_Announce;
 
 L_Announce:
@@ -155,23 +155,23 @@ L_Announce:
 
 OnTick:
     if (ispcdead()) end;
-    $@CRYPT_FIGHT2_PLAYER_COUNT = $@CRYPT_FIGHT2_PLAYER_COUNT + 1;
+    $@CRYPT_FIGHT2_PC = $@CRYPT_FIGHT2_PC + 1;
     end;
 
 OnPetDeath:
-    $@CRYPT_FIGHT2_SUMMONS_COUNT = $@CRYPT_FIGHT2_SUMMONS_COUNT - 1;
+    $@CRYPT_FIGHT2_MOBS_COUNT = $@CRYPT_FIGHT2_MOBS_COUNT - 1;
     end;
 
 L_CleanUpLosers:
     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;
     $@CRYPT_FIGHT2 = 0;
-    $@CRYPT_FIGHT2_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT2_PC = 0;
     $@CRYPT_FIGHT2_WAVE = 0;
-    $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER = 0;
-    $@CRYPT_FIGHT2_SUMMONS_COUNT = 0;
+    $@CRYPT_FIGHT2_ROUND_TIMER = 0;
+    $@CRYPT_FIGHT2_MOBS_COUNT = 0;
     $@CRYPT_FIGHT2_ROUND_PEN = 0;
-    $@CRYPT_FIGHT2_SUMMONS_NUMBER = 0;
+    $@CRYPT_FIGHT2_MOBS_NUMBER = 0;
     killmonster "027-7", "General Razha::OnPetDeath";
     stopnpctimer;
     setnpctimer 0;
@@ -182,12 +182,12 @@ L_CleanUp:
     mapannounce "027-4", "General Razha is defeated.", 0;
     areatimer 0, "027-7", 0, 0, 79, 84, 10, "General Razha::OnReward";
     $@CRYPT_FIGHT2 = 0;
-    $@CRYPT_FIGHT2_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT2_PC = 0;
     $@CRYPT_FIGHT2_WAVE = 0;
-    $@CRYPT_FIGHT2_SUMMONS_ROUND_TIMER = 0;
-    $@CRYPT_FIGHT2_SUMMONS_COUNT = 0;
+    $@CRYPT_FIGHT2_ROUND_TIMER = 0;
+    $@CRYPT_FIGHT2_MOBS_COUNT = 0;
     $@CRYPT_FIGHT2_ROUND_PEN = 0;
-    $@CRYPT_FIGHT2_SUMMONS_NUMBER = 0;
+    $@CRYPT_FIGHT2_MOBS_NUMBER = 0;
     killmonster "027-7", "General Razha::OnPetDeath";
     stopnpctimer;
     setnpctimer 0;
diff --git a/npc/027-8/general_terogan.txt b/npc/027-8/general_terogan.txt
index 6886ee46..e9619b0a 100644
--- a/npc/027-8/general_terogan.txt
+++ b/npc/027-8/general_terogan.txt
@@ -70,8 +70,8 @@ L_RitualLeft:
     // initialize fight
     $@CRYPT_FIGHT3 = 1;
     $@CRYPT_FIGHT3_WAVE = 0;
-    $@CRYPT_FIGHT3_SUMMONS_COUNT = 2;
-    $@CRYPT_FIGHT3_PLAYER_COUNT = getmapusers("027-8");
+    $@CRYPT_FIGHT3_MOBS_COUNT = 2;
+    $@CRYPT_FIGHT3_PC = 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";
 
@@ -103,8 +103,8 @@ L_RitualRight:
     // initialize fight
     $@CRYPT_FIGHT3 = 1;
     $@CRYPT_FIGHT3_WAVE = 0;
-    $@CRYPT_FIGHT3_SUMMONS_COUNT = 2;
-    $@CRYPT_FIGHT3_PLAYER_COUNT = getmapusers("027-8");
+    $@CRYPT_FIGHT3_MOBS_COUNT = 2;
+    $@CRYPT_FIGHT3_PC = 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";
 
@@ -135,15 +135,15 @@ OnTimer5000:
     goto L_Return_1;
 
 L_Return_1:
-    $@CRYPT_FIGHT3_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT3_PC = 0;
     areatimer 0, "027-8", 0, 0, 79, 84, 10, "General Terogan#Main::OnTick";
     end;
 
 L_CryptLogic:
-    $@CRYPT_FIGHT3_ROUND_PEN = $@CRYPT_FIGHT3_PLAYER_COUNT;
+    $@CRYPT_FIGHT3_ROUND_PEN = $@CRYPT_FIGHT3_PC;
     if ($@CRYPT_FIGHT3_ROUND_PEN > 60)
         $@CRYPT_FIGHT3_ROUND_PEN = 60;
-    if ($@CRYPT_FIGHT3_PLAYER_COUNT <= 0) goto L_CleanUpLosers;
+    if ($@CRYPT_FIGHT3_PC <= 0) goto L_CleanUpLosers;
     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_ROUND_TIMER, $@CRYPT_FIGHT3_ROUND_TIMER + 5; // Advance 5 seconds
@@ -156,7 +156,7 @@ L_CryptLogic:
 L_NextWave:
     $@CRYPT_FIGHT3_ROUND_TIMER = 0;
     $@CRYPT_FIGHT3_WAVE = $@CRYPT_FIGHT3_WAVE + 1;
-    if ( ($@CRYPT_FIGHT3_WAVE > 10) && ($@CRYPT_FIGHT3_SUMMONS_COUNT == 0) )
+    if ( ($@CRYPT_FIGHT3_WAVE > 10) && ($@CRYPT_FIGHT3_MOBS_COUNT == 0) )
         goto L_CleanUp;
     if ( ($@CRYPT_FIGHT3_WAVE > 10) && ($@CRYPT_FIGHT3_WAVE < 22) )
         goto L_Return_1;
@@ -171,31 +171,31 @@ L_NextWave:
     goto L_SummonNuke;
 
 L_SummonNuke:
-    $@CRYPT_FIGHT3_SUMMONS_COUNT = $@CRYPT_FIGHT3_SUMMONS_COUNT + $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4;
-    areamonster "027-8", 0, 0, 79, 84, "", 1124, $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PLAYER_COUNT*4, "General Terogan#Main::OnPetDeath";
+    $@CRYPT_FIGHT3_MOBS_COUNT = $@CRYPT_FIGHT3_MOBS_COUNT + $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PC*4;
+    areamonster "027-8", 0, 0, 79, 84, "", 1124, $@CRYPT_FIGHT3_WAVE*2 + $@CRYPT_FIGHT3_PC*4, "General Terogan#Main::OnPetDeath";
     goto L_Announce;
 
 L_WeakSummons:
-    $@CRYPT_FIGHT3_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2;
-    $@CRYPT_FIGHT3_SUMMONS_COUNT = $@CRYPT_FIGHT3_SUMMONS_COUNT + ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2) + ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2);
+    $@CRYPT_FIGHT3_MOBS_NUMBER = (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PC))/2;
+    $@CRYPT_FIGHT3_MOBS_COUNT = $@CRYPT_FIGHT3_MOBS_COUNT + ($@CRYPT_FIGHT3_MOBS_NUMBER/2) + ($@CRYPT_FIGHT3_MOBS_NUMBER/2);
 
-    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";
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_MOBS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1074, ($@CRYPT_FIGHT3_MOBS_NUMBER/2), "General Terogan#Main::OnPetDeath";
     goto L_Announce;
 
 L_StrongSummons:
-    $@CRYPT_FIGHT3_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2;
-    $@CRYPT_FIGHT3_SUMMONS_COUNT = $@CRYPT_FIGHT3_SUMMONS_COUNT + (2 * ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2));
+    $@CRYPT_FIGHT3_MOBS_NUMBER = (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PC))/2;
+    $@CRYPT_FIGHT3_MOBS_COUNT = $@CRYPT_FIGHT3_MOBS_COUNT + (2 * ($@CRYPT_FIGHT3_MOBS_NUMBER/2));
 
-    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, "", 1124, ($@CRYPT_FIGHT3_MOBS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_MOBS_NUMBER/2), "General Terogan#Main::OnPetDeath";
     goto L_Announce;
 
 L_BossSummons:
-    $@CRYPT_FIGHT3_SUMMONS_NUMBER = (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PLAYER_COUNT))/2;
-    $@CRYPT_FIGHT3_SUMMONS_COUNT = $@CRYPT_FIGHT3_SUMMONS_COUNT + (2 * ($@CRYPT_FIGHT3_SUMMONS_NUMBER/2)) + 2;
-    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";
+    $@CRYPT_FIGHT3_MOBS_NUMBER = (5 + (1 * $@CRYPT_FIGHT3_WAVE) + (2 * $@CRYPT_FIGHT3_PC))/2;
+    $@CRYPT_FIGHT3_MOBS_COUNT = $@CRYPT_FIGHT3_MOBS_COUNT + (2 * ($@CRYPT_FIGHT3_MOBS_NUMBER/2)) + 2;
+    areamonster "027-8", 43, 39, 58, 60, "", 1124, ($@CRYPT_FIGHT3_MOBS_NUMBER/2), "General Terogan#Main::OnPetDeath";
+    areamonster "027-8", 20, 39, 35, 60, "", 1075, ($@CRYPT_FIGHT3_MOBS_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;
@@ -212,11 +212,11 @@ L_Announce:
 OnTick:
     if (ispcdead())
         end;
-    $@CRYPT_FIGHT3_PLAYER_COUNT = $@CRYPT_FIGHT3_PLAYER_COUNT + 1;
+    $@CRYPT_FIGHT3_PC = $@CRYPT_FIGHT3_PC + 1;
     end;
 
 OnPetDeath:
-    $@CRYPT_FIGHT3_SUMMONS_COUNT = $@CRYPT_FIGHT3_SUMMONS_COUNT - 1;
+    $@CRYPT_FIGHT3_MOBS_COUNT = $@CRYPT_FIGHT3_MOBS_COUNT - 1;
     end;
 
 L_Failure:
@@ -229,12 +229,12 @@ L_Failure:
 L_CleanUpLosers:
     mapannounce "027-8", "General Terogan : You just proved you cannot even coordinate a simple task. Come back when you are prepared", 0;
     $@CRYPT_FIGHT3 = 0;
-    $@CRYPT_FIGHT3_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT3_PC = 0;
     $@CRYPT_FIGHT3_WAVE = 0;
     $@CRYPT_FIGHT3_ROUND_TIMER = 0;
-    $@CRYPT_FIGHT3_SUMMONS_COUNT = 0;
+    $@CRYPT_FIGHT3_MOBS_COUNT = 0;
     $@CRYPT_FIGHT3_ROUND_PEN = 0;
-    $@CRYPT_FIGHT3_SUMMONS_NUMBER = 0;
+    $@CRYPT_FIGHT3_MOBS_NUMBER = 0;
     $@CRYPT_FAIL_ANNOUNCED = 0;
     killmonster "027-8", "General Terogan#Main::OnPetDeath";
     stopnpctimer;
@@ -245,12 +245,12 @@ L_CleanUp:
     mapannounce "027-8", "General Terogan : You might have won this battle, but you will never defeat me!", 0;
     areatimer 0, "027-8", 0, 0, 79, 84, 10, "General Terogan#Main::OnReward";
     $@CRYPT_FIGHT3 = 0;
-    $@CRYPT_FIGHT3_PLAYER_COUNT = 0;
+    $@CRYPT_FIGHT3_PC = 0;
     $@CRYPT_FIGHT3_WAVE = 0;
     $@CRYPT_FIGHT3_ROUND_TIMER = 0;
-    $@CRYPT_FIGHT3_SUMMONS_COUNT = 0;
+    $@CRYPT_FIGHT3_MOBS_COUNT = 0;
     $@CRYPT_FIGHT3_ROUND_PEN = 0;
-    $@CRYPT_FIGHT3_SUMMONS_NUMBER = 0;
+    $@CRYPT_FIGHT3_MOBS_NUMBER = 0;
     $@CRYPT_FAIL_ANNOUNCED = 0;
     killmonster "027-8", "General Terogan#Main::OnPetDeath";
     stopnpctimer;