refactor(Core/AI): Some more refactoring prep for Comat Threat system… (#15026)

Co-authored-by: Treeston <14020072+Treeston@users.noreply.github.com>
2026-01-30 17:13:47 +00:00 · 2023-02-13 21:39:40 +01:00
parent fdfa88093e
commit bd6034e1a9
391 changed files with 873 additions and 846 deletions
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -117,9 +117,9 @@ public:
            me->SetReactState(REACT_AGGRESSIVE);
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
            events.ScheduleEvent(EVENT_SWITCH_PLATFORM, 0);
        }

--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -102,10 +102,10 @@ public:
            BossAI::JustDied(killer);
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            Talk(SAY_AGGRO);
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
            me->CallForHelp(105.0f);

            events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000);
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -263,9 +263,9 @@ public:
            }
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
        }

        void KilledUnit(Unit* victim) override
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -70,10 +70,10 @@ public:
            BossAI::JustDied(killer);
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            Talk(SAY_AGGRO);
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);

            events.ScheduleEvent(EVENT_SPELL_POUNDING, 15000);
            events.ScheduleEvent(EVENT_SPELL_ARCANEORB, 3000);
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -56,9 +56,9 @@ public:
            Talk(SAY_DEATH);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000);
            events.ScheduleEvent(EVENT_SAW_BLADE, 20000);
            events.ScheduleEvent(EVENT_SHADOW_POWER, 30000);
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -51,9 +51,9 @@ public:
    {
        boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) { }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 15000);
            events.ScheduleEvent(EVENT_JACKHAMMER, 35000);
            events.ScheduleEvent(EVENT_SHADOW_POWER, 25000);
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -63,9 +63,9 @@ public:
    {
        boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            Talk(YELL_AGGRO);
            events.ScheduleEvent(EVENT_HEADCRACK, 6000);
            events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10000);
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -52,9 +52,9 @@ public:
    {
        boss_nethermancer_sepethreaAI(Creature* creature) : BossAI(creature, DATA_NETHERMANCER_SEPRETHREA) { }

-        void EnterCombat(Unit*  /*who*/) override
+        void JustEngagedWith(Unit*  /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_FROST_ATTACK, 6000);
            events.ScheduleEvent(EVENT_ARCANE_BLAST, 14000);
            events.ScheduleEvent(EVENT_DRAGONS_BREATH, 18000);
@@ -158,7 +158,7 @@ public:
            me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, true);
        }

-        void EnterCombat(Unit*) override
+        void JustEngagedWith(Unit*) override
        {
            events.ScheduleEvent(EVENT_SPELL_FIRE_TAIL, 500);
            events.ScheduleEvent(EVENT_SPELL_INFERNO, urand(10000, 20000));
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -78,9 +78,9 @@ public:
            Talk(SAY_APPEAR);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_SUMMON, 30000);
            events.ScheduleEvent(EVENT_MANA_TAP, 12000);
            events.ScheduleEvent(EVENT_ARCANE_TORRENT, 16000);
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -119,7 +119,7 @@ public:
            Talk(SAY_DEATH);
        }

-        void EnterCombat(Unit*) override
+        void JustEngagedWith(Unit*) override
        {
            events.ScheduleEvent(EVENT_MILL_CHECK_HEALTH, 1000);
            events.ScheduleEvent(EVENT_MILL_PYROBLAST, 30000);
@@ -354,7 +354,7 @@ public:

        void MoveInLineOfSight(Unit*) override { }
        void AttackStart(Unit*) override { }
-        void EnterCombat(Unit*) override { }
+        void JustEngagedWith(Unit*) override { }

        void JustDied(Unit*) override
        {
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
@@ -77,9 +77,9 @@ struct boss_dalliah_the_doomsayer : public BossAI
        }
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        Talk(SAY_AGGRO);

        if (Creature* soccothrates = instance->GetCreature(DATA_SOCCOTHRATES))
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -78,7 +78,7 @@ public:
            me->SetImmuneToAll(false);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_AGGRO);
            me->SetInCombatWithZone();
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -110,9 +110,9 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events2.Reset();
            events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000));
            events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000));
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
@@ -51,9 +51,9 @@ struct boss_zereketh_the_unbound : public BossAI
        Talk(SAY_DEATH);
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        Talk(SAY_AGGRO);

        scheduler.Schedule(6s, [this](TaskContext context)
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
@@ -59,9 +59,9 @@ public:
            _Reset();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            Talk(SAY_AGGRO);
            events.ScheduleEvent(EVENT_ARCANE_RESONANCE, 20000);
            events.ScheduleEvent(EVENT_ARCANE_DEVASTATION, 10000);
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -49,9 +49,9 @@ struct boss_high_botanist_freywinn : public BossAI
 {
    boss_high_botanist_freywinn(Creature* creature) : BossAI(creature, DATA_HIGH_BOTANIST_FREYWINN) { }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        Talk(SAY_AGGRO);

        scheduler.Schedule(6s, [this](TaskContext context)
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -98,9 +98,9 @@ public:
            me->CastSpell(me, _lastTransform, true);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();

            events.ScheduleEvent(EVENT_ALERGIC_REACTION, 5000);
            events.ScheduleEvent(EVENT_TRANSFORM, 30000);
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
@@ -76,9 +76,9 @@ public:
            BossAI::MoveInLineOfSight(who);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            Talk(SAY_AGGRO);
            events.ScheduleEvent(EVENT_SACRIFICE, 6000);
            events.ScheduleEvent(EVENT_HELLFIRE, 18000);
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -41,9 +41,9 @@ struct boss_warp_splinter : public BossAI
 {
    boss_warp_splinter(Creature* creature) : BossAI(creature, DATA_WARP_SPLINTER) { }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        Talk(SAY_AGGRO);

        scheduler.Schedule(8s, [this](TaskContext context)