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

Co-authored-by: Treeston <14020072+Treeston@users.noreply.github.com>
This commit is contained in:
Kitzunu
2023-02-13 21:39:40 +01:00
committed by GitHub
parent fdfa88093e
commit bd6034e1a9
391 changed files with 873 additions and 846 deletions

View File

@@ -278,7 +278,7 @@ public:
}
}
void EnterCombat(Unit* pWho) override
void JustEngagedWith(Unit* pWho) override
{
if (pWho && !IsTargetInBounds(pWho))
{
@@ -286,7 +286,7 @@ public:
return;
}
_EnterCombat();
_JustEngagedWith();
DoCastSelf(SPELL_SARTHARION_PYROBUFFET, true);
Talk(SAY_SARTHARION_AGGRO);
@@ -808,7 +808,7 @@ struct boss_sartharion_dragonAI : public BossAI
BossAI::JustSummoned(summon);
}
void EnterCombat(Unit* /*who*/) final
void JustEngagedWith(Unit* /*who*/) final
{
me->setActive(true);
DoZoneInCombat();

View File

@@ -158,10 +158,10 @@ public:
}
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
me->InterruptNonMeleeSpells(false);
events.ScheduleEvent(EVENT_CLEAVE, 11000);
@@ -282,7 +282,7 @@ public:
{
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_events.Reset();
_events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000));

View File

@@ -111,9 +111,9 @@ public:
}
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_CLEAVE, 9000);
@@ -213,7 +213,7 @@ public:
Start(true, true);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_events.Reset();
_events.ScheduleEvent(EVENT_BLAST_NOVA, urand(20000, 30000));

View File

@@ -294,9 +294,9 @@ public:
BossAI::JustReachedHome();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1);
@@ -459,7 +459,7 @@ public:
me->SetReactState(REACT_DEFENSIVE);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_events.Reset();
_events.ScheduleEvent(EVENT_CLEAVE, urand(8000, 10000));

View File

@@ -74,9 +74,9 @@ public:
me->SetReactState(REACT_AGGRESSIVE);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_ENRAGE, 15000);