[SD] Moam and Ouro use Double Attack manually

cmangos · Nov 10, 2024 · 4d7dee5 · 4d7dee5
1 parent 5964022
commit 4d7dee5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/game/AI/ScriptDevAI/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp b/src/game/AI/ScriptDevAI/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
@@ -34,6 +34,7 @@ enum
     EMOTE_ENERGIZING         = -1509028,
 
     SPELL_TRAMPLE            = 15550,
+    SPELL_DOUBLE_ATTACK      = 18941,
     SPELL_DRAIN_MANA         = 25676,
     SPELL_ARCANE_ERUPTION    = 25672,
     SPELL_SUMMON_MANAFIENDS  = 25684,
@@ -52,6 +53,7 @@ enum MoamActions
     MOAM_MANA_FIENDS,
     MOAM_ENERGIZE,
     MOAM_TRAMPLE,
+    MOAM_DOUBLE_ATTACK,
     MOAM_MANA_DRAIN,
     MOAM_ACTION_MAX,
     MOAM_CANCEL_ENERGIZE,
@@ -65,6 +67,7 @@ struct boss_moamAI : public CombatAI
     {
         AddCombatAction(MOAM_ARCANE_ERUPTION, 0u);
         AddCombatAction(MOAM_TRAMPLE, 9000u);
+        AddCombatAction(MOAM_DOUBLE_ATTACK, 8000, 12000);
         AddCombatAction(MOAM_MANA_DRAIN, 6000u);
         AddCombatAction(MOAM_MANA_FIENDS, 90000u);
         AddCombatAction(MOAM_ENERGIZE, 90000u);
@@ -138,6 +141,12 @@ struct boss_moamAI : public CombatAI
                     ResetCombatAction(action, 15000);
                 break;
             }
+            case MOAM_DOUBLE_ATTACK:
+            {
+                if (DoCastSpellIfCan(nullptr, SPELL_DOUBLE_ATTACK) == CAST_OK)
+                    ResetCombatAction(action, urand(8000, 12000));
+                break;
+            }
             case MOAM_MANA_DRAIN:
             {
                 if (DoCastSpellIfCan(nullptr, SPELL_DRAIN_MANA) == CAST_OK)

diff --git a/src/game/AI/ScriptDevAI/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp b/src/game/AI/ScriptDevAI/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
@@ -31,6 +31,7 @@ EndScriptData
 enum
 {
     // ground spells
+    SPELL_DOUBLE_ATTACK     = 18941,
     SPELL_SWEEP             = 26103,
     SPELL_SANDBLAST         = 26102,
     SPELL_BOULDER           = 26616,
@@ -75,6 +76,7 @@ enum OuroActions
     OURO_BOULDER,
     OURO_SAND_BLAST,
     OURO_SWEEP,
+    OURO_DOUBLE_ATTACK,
     OURO_NO_MELEE_BURROW,
     OURO_ACTION_MAX,
     OURO_SPAWN_DELAY_ATTACK,
@@ -112,6 +114,7 @@ struct boss_ouroAI : public CombatAI
         AddCombatAction(OURO_BOULDER, true);
         AddCombatAction(OURO_SAND_BLAST, 25000u);
         AddCombatAction(OURO_SWEEP, 20000u);
+        AddCombatAction(OURO_DOUBLE_ATTACK, urand(1000, 10000));
         AddCombatAction(OURO_NO_MELEE_BURROW, 2000u);
         AddCustomAction(OURO_SPAWN_DELAY_ATTACK, true, [&]() {HandleSpawnDelay(); });
         m_creature->SetImmobilizedState(true);
@@ -272,6 +275,12 @@ struct boss_ouroAI : public CombatAI
                     ResetCombatAction(action, 20000);
                 break;
             }
+            case OURO_DOUBLE_ATTACK:
+            {
+                if (DoCastSpellIfCan(nullptr, SPELL_DOUBLE_ATTACK) == CAST_OK)
+                    ResetCombatAction(action, urand(7000, 13000));
+                break;
+            }
             case OURO_BOULDER:
             {
                 uint32 timer = 500;