Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]

Author: Rochet2

src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp

@@ -29,8 +29,7 @@ enum ShirrakTexts
 
 enum ShirrakSpells
 {
-    SPELL_INHIBIT_MAGIC_PERIODIC   = 33460,
-    SPELL_INHIBIT_MAGIC            = 32264,
+    SPELL_INHIBIT_MAGIC            = 33460,
 
     SPELL_ATTRACT_MAGIC            = 32265,
     SPELL_CARNIVOROUS_BITE         = 36383,
@@ -58,13 +57,14 @@ struct boss_shirrak_the_dead_watcher : public BossAI
 
     void Reset() override
     {
-        DoCastSelf(SPELL_INHIBIT_MAGIC_PERIODIC);
+        DoCastSelf(SPELL_INHIBIT_MAGIC);
         _Reset();
     }
 
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
+
         events.ScheduleEvent(EVENT_ATTRACT_MAGIC, 30s);
         events.ScheduleEvent(EVENT_CARNIVOROUS_BITE, 5s, 10s);
         events.ScheduleEvent(EVENT_FOCUS_FIRE, 20s, 30s);
@@ -124,14 +124,23 @@ struct npc_focus_fire : public ScriptedAI
 
     void JustAppeared() override
     {
-        // Should be in this sniffed order but makes it ignore other spell casts, so disabled
-        // DoCastSelf(SPELL_BIRTH);
-        DoCastSelf(SPELL_FOCUS_TARGET_VISUAL);
-
-        _scheduler.Schedule(5s, [this](TaskContext /*task*/)
-        {
-            DoCastSelf(SPELL_PING_SHIRRAK);
-        });
+        _scheduler
+            .SetValidator([this]
+            {
+                return !me->HasUnitState(UNIT_STATE_CASTING);
+            })
+            .Schedule(0s, [this](TaskContext /*task*/)
+            {
+                DoCastSelf(SPELL_BIRTH);
+            })
+            .Schedule(0s, [this](TaskContext /*task*/)
+            {
+                DoCastSelf(SPELL_FOCUS_TARGET_VISUAL);
+            })
+            .Schedule(5s, [this](TaskContext /*task*/)
+            {
+                DoCastSelf(SPELL_PING_SHIRRAK);
+            });
     }
 
     void SpellHit(WorldObject* /*caster*/, SpellInfo const* spellInfo) override

src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp

@@ -15,10 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "the_eye.h"
-#include "ObjectAccessor.h"
-#include "ScriptedCreature.h"
 #include "ScriptMgr.h"
+#include "Containers.h"
+#include "ScriptedCreature.h"
+#include "SpellInfo.h"
+#include "the_eye.h"
 
 enum ReaverTexts
 {
@@ -33,7 +34,7 @@ enum ReaverSpells
     SPELL_POUNDING              = 34162,
     SPELL_ARCANE_ORB            = 34172,
     SPELL_KNOCK_AWAY            = 25778,
-    SPELL_BERSERK               = 27680
+    SPELL_BERSERK               = 26662
 };
 
 enum ReaverEvents
@@ -44,28 +45,31 @@ enum ReaverEvents
     EVENT_BERSERK
 };
 
+// 19516 - Void Reaver
 struct boss_void_reaver : public BossAI
 {
-    boss_void_reaver(Creature* creature) : BossAI(creature, DATA_VOID_REAVER), _enraged(false) { }
-
-    void Reset() override
-    {
-        _Reset();
-        _enraged = false;
-    }
+    boss_void_reaver(Creature* creature) : BossAI(creature, DATA_VOID_REAVER) { }
 
     void JustEngagedWith(Unit* who) override
     {
-        Talk(SAY_AGGRO);
         BossAI::JustEngagedWith(who);
+
+        Talk(SAY_AGGRO);
+
         me->CallForHelp(120.0f);
 
-        events.ScheduleEvent(EVENT_POUNDING, 15s);
+        events.ScheduleEvent(EVENT_POUNDING, 8s, 15s);
         events.ScheduleEvent(EVENT_ARCANE_ORB, 3s);
-        events.ScheduleEvent(EVENT_KNOCK_AWAY, 30s);
+        events.ScheduleEvent(EVENT_KNOCK_AWAY, 12s, 16s);
         events.ScheduleEvent(EVENT_BERSERK, 10min);
     }
 
+    void OnSpellCast(SpellInfo const* spell) override
+    {
+        if (spell->Id == SPELL_POUNDING)
+            Talk(SAY_POUNDING);
+    }
+
     void KilledUnit(Unit* /*victim*/) override
     {
         Talk(SAY_SLAY);
@@ -92,14 +96,13 @@ struct boss_void_reaver : public BossAI
             switch (eventId)
             {
                 case EVENT_POUNDING:
-                    DoCastVictim(SPELL_POUNDING);
-                    Talk(SAY_POUNDING);
-                    events.ScheduleEvent(EVENT_POUNDING, 15s);
+                    DoCastSelf(SPELL_POUNDING);
+                    events.Repeat(12s, 14s);
                     break;
                 case EVENT_ARCANE_ORB:
                 {
                     std::vector<Unit*> target_list;
-                    for (auto* ref : me->GetThreatManager().GetUnsortedThreatList())
+                    for (ThreatReference const* ref : me->GetThreatManager().GetUnsortedThreatList())
                     {
                         Unit* target = ref->GetVictim();
                         if (target->GetTypeId() == TYPEID_PLAYER && target->IsAlive() && !target->IsWithinDist(me, 18, false))
@@ -108,30 +111,22 @@ struct boss_void_reaver : public BossAI
 
                     Unit* target;
                     if (!target_list.empty())
-                        target = *(target_list.begin() + rand32() % target_list.size());
+                        target = Trinity::Containers::SelectRandomContainerElement(target_list);
                     else
                         target = me->GetVictim();
 
                     if (target)
-                        me->CastSpell(target, SPELL_ARCANE_ORB);
+                        DoCast(target, SPELL_ARCANE_ORB);
 
-                    events.ScheduleEvent(EVENT_ARCANE_ORB, 3s);
+                    events.Repeat(3s);
                     break;
                 }
                 case EVENT_KNOCK_AWAY:
                     DoCastVictim(SPELL_KNOCK_AWAY);
-                    // Drop 25% aggro
-                    if (GetThreat(me->GetVictim()))
-                        ModifyThreatByPercent(me->GetVictim(), -25);
-
-                    events.ScheduleEvent(EVENT_KNOCK_AWAY, 30s);
+                    events.Repeat(20s, 22s);
                     break;
                 case EVENT_BERSERK:
-                    if (!_enraged)
-                    {
-                        DoCastSelf(SPELL_BERSERK);
-                        _enraged = true;
-                    }
+                    DoCastSelf(SPELL_BERSERK);
                     break;
                 default:
                     break;
@@ -143,9 +138,6 @@ struct boss_void_reaver : public BossAI
 
         DoMeleeAttackIfReady();
     }
-
-private:
-    bool _enraged;
 };
 
 void AddSC_boss_void_reaver()

src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp

@@ -16,11 +16,9 @@
  */
 
 #include "ScriptMgr.h"
+#include "arcatraz.h"
 #include "SpellInfo.h"
 #include "SpellScript.h"
-#include "arcatraz.h"
-#include "InstanceScript.h"
-#include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 
 enum SkyrissTexts
@@ -126,11 +124,6 @@ struct boss_harbinger_skyriss : public BossAI
         }
     }
 
-    void KilledUnit(Unit* /*victim*/) override
-    {
-        Talk(SAY_SLAY);
-    }
-
     void DamageTaken(Unit* /*killer*/, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override
     {
         if (_phase < PHASE_HEALTH_66 && me->HealthBelowPctDamaged(66, damage))
@@ -145,6 +138,11 @@ struct boss_harbinger_skyriss : public BossAI
         }
     }
 
+    void KilledUnit(Unit* /*victim*/) override
+    {
+        Talk(SAY_SLAY);
+    }
+
     void JustDied(Unit* /*killer*/) override
     {
         Talk(SAY_DEATH);
@@ -250,28 +248,40 @@ struct boss_harbinger_skyriss_illusion : public ScriptedAI
     void JustAppeared() override
     {
         DoZoneInCombat();
-        // Should be in this sniffed order but makes it ignore other spell casts, so disabled
-        // DoCastSelf(SPELL_BIRTH);
-        DoCastSelf(SPELL_BLINK_VISUAL);
 
-        switch (me->GetEntry())
-        {
-            case NPC_ILLUSION_66:
-                DoCastSelf(SPELL_66_HEALTH);
-                break;
-            case NPC_ILLUSION_33:
-                DoCastSelf(SPELL_33_HEALTH);
-                break;
-            default:
-                break;
-        }
-
-        _scheduler.Schedule(2s, 10s, [this](TaskContext task)
-        {
-            if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
-                DoCast(target, IsHeroic() ? SPELL_MIND_REND_IMAGE_H : SPELL_MIND_REND_IMAGE);
-            task.Repeat(8s, 12s);
-        });
+        _scheduler
+            .SetValidator([this]
+            {
+                return !me->HasUnitState(UNIT_STATE_CASTING);
+            })
+            .Schedule(0s, [this](TaskContext /*task*/)
+            {
+                DoCastSelf(SPELL_BIRTH);
+            })
+            .Schedule(0s, [this](TaskContext /*task*/)
+            {
+                DoCastSelf(SPELL_BLINK_VISUAL);
+            })
+            .Schedule(0s, [this](TaskContext /*task*/)
+            {
+                switch (me->GetEntry())
+                {
+                    case NPC_ILLUSION_66:
+                        DoCastSelf(SPELL_66_HEALTH);
+                        break;
+                    case NPC_ILLUSION_33:
+                        DoCastSelf(SPELL_33_HEALTH);
+                        break;
+                    default:
+                       break;
+                }
+            })
+            .Schedule(2s, 10s, [this](TaskContext task)
+            {
+                if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
+                    DoCast(target, IsHeroic() ? SPELL_MIND_REND_IMAGE_H : SPELL_MIND_REND_IMAGE);
+                task.Repeat(8s, 12s);
+            });
     }
 
     void UpdateAI(uint32 diff) override