More BWL code cleanup (vmangos#2988)

Author: schell244

src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_broodlord_lashlayer.cpp

@@ -14,17 +14,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* ScriptData
-SDName: Boss_Broodlord_Lashlayer
-SD%Complete: 100
-SDComment:
-SDCategory: Blackwing Lair
-EndScriptData */
-
 #include "scriptPCH.h"
 #include "blackwing_lair.h"
 
-enum
+enum Broodlord : uint32
 {
     SAY_AGGRO                   = 9967,
     SAY_LEASH                   = 9968,
@@ -64,7 +57,7 @@ struct boss_broodlordAI : public ScriptedAI
 
     void Reset() override
     {
-        m_uiCleaveTimer         = 8000;                     // These times are probably wrong
+        m_uiCleaveTimer         = 8000; // These times are probably wrong
         m_uiBlastWaveTimer      = 20000;
         m_uiMortalStrikeTimer   = 25000;
         m_uiKnockAwayTimer      = urand(20000, 25000);

src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_chromaggus.cpp

@@ -14,17 +14,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* ScriptData
-SDName: Boss_Chromaggus
-SD%Complete: 95
-SDComment: Chromatic Mutation disabled due to lack of core support
-SDCategory: Blackwing Lair
-EndScriptData */
-
 #include "scriptPCH.h"
 #include "blackwing_lair.h"
 
-enum
+enum Chromaggus : uint32
 {
     EMOTE_GENERIC_FRENZY_KILL   = 7797,
     EMOTE_SHIMMER               = 9793,

src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_ebonroc.cpp

@@ -14,22 +14,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* ScriptData
-SDName: Boss_Ebonroc
-SD%Complete: 90
-SDComment: Thrash is missing
-SDCategory: Blackwing Lair
-EndScriptData */
-
 #include "scriptPCH.h"
 #include "blackwing_lair.h"
 
-enum
+enum Ebonroc : uint32
 {
-    SPELL_SHADOW_FLAME          = 22539,
-    SPELL_WING_BUFFET           = 23339,
-    SPELL_SHADOW_OF_EBONROC     = 23340,
-    SPELL_THRASH                = 3391,                     // TODO missing
+    SPELL_SHADOW_FLAME      = 22539,
+    SPELL_WING_BUFFET       = 23339,
+    SPELL_SHADOW_OF_EBONROC = 23340,
+    SPELL_THRASH            = 3391,
 };
 
 struct boss_ebonrocAI : public ScriptedAI

src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_firemaw.cpp

@@ -14,22 +14,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* ScriptData
-SDName: Boss_Firemaw
-SD%Complete: 80
-SDComment: Thrash missing
-SDCategory: Blackwing Lair
-EndScriptData */
-
 #include "scriptPCH.h"
 #include "blackwing_lair.h"
 
-enum
+enum Firemaw : uint32
 {
-    SPELL_SHADOW_FLAME          = 22539,
-    SPELL_WING_BUFFET           = 23339,
-    SPELL_FLAME_BUFFET          = 23341,
-    SPELL_THRASH                = 3391,
+    SPELL_SHADOW_FLAME  = 22539,
+    SPELL_WING_BUFFET   = 23339,
+    SPELL_FLAME_BUFFET  = 23341,
+    SPELL_THRASH        = 3391,
 };
 
 struct boss_firemawAI : public ScriptedAI
@@ -49,7 +42,7 @@ struct boss_firemawAI : public ScriptedAI
     void Reset() override
     {
         m_uiShadowFlameTimer = 16000;
-        m_uiWingBuffetTimer = 30000;
+        m_uiWingBuffetTimer  = 30000;
         m_uiFlameBuffetTimer = 2000;
     }
 
@@ -116,8 +109,13 @@ struct boss_firemawAI : public ScriptedAI
         else
             m_uiFlameBuffetTimer -= uiDiff;
 
-        if (m_creature->IsAttackReady() && !urand(0, 2))
-            DoCastSpellIfCan(m_creature, SPELL_THRASH);
+        if (m_creature->IsAttackReady() && m_creature->IsNonMeleeSpellCasted(true))
+        {
+            if (!urand(0, 2))
+            {
+                DoCastSpellIfCan(m_creature, SPELL_THRASH);
+            }
+        }
 
         DoMeleeAttackIfReady();
     }

src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_flamegor.cpp

@@ -14,24 +14,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* ScriptData
-SDName: Boss_Flamegor
-SD%Complete: 90
-SDComment: Thrash is missing
-SDCategory: Blackwing Lair
-EndScriptData */
-
 #include "scriptPCH.h"
 #include "blackwing_lair.h"
 
-enum
+enum Flamegor : uint32
 {
-    EMOTE_GENERIC_FRENZY        = 1191,
+    EMOTE_GENERIC_FRENZY  = 1191,
 
-    SPELL_SHADOW_FLAME          = 22539,
-    SPELL_WING_BUFFET           = 23339,
-    SPELL_FRENZY                = 23342,                    // This spell periodically triggers fire nova
-    SPELL_THRASH                = 3391,                     // TODO missing
+    SPELL_SHADOW_FLAME    = 22539,
+    SPELL_WING_BUFFET     = 23339,
+    SPELL_FRENZY          = 23342, // This spell periodically triggers fire nova
+    SPELL_THRASH          = 3391,
 };
 
 struct boss_flamegorAI : public ScriptedAI
@@ -50,9 +43,9 @@ struct boss_flamegorAI : public ScriptedAI
 
     void Reset() override
     {
-        m_uiShadowFlameTimer = 16000;                        // These times are probably wrong
-        m_uiWingBuffetTimer = 30000;
-        m_uiFrenzyTimer = 10000;
+        m_uiShadowFlameTimer = 16000; // These times are probably wrong
+        m_uiWingBuffetTimer  = 30000;
+        m_uiFrenzyTimer      = 10000;
     }
 
     void Aggro(Unit* /*pWho*/) override