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
@@ -78,7 +78,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
Talk(SAY_AGGRO);
@@ -78,7 +78,7 @@ public:
me->SetControlled(false, UNIT_STATE_ROOT);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.ScheduleEvent(EVENT_SPELL_INHIBIT_MAGIC, 0);
events.ScheduleEvent(EVENT_SPELL_ATTRACT_MAGIC, 28000);
@@ -88,7 +88,7 @@ public:
}
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
Talk(SAY_AGGRO);
@@ -190,7 +190,7 @@ public:
void Reset() override { }
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_DOUBLE_BREATH, urand(6000, 9000));
}
@@ -62,7 +62,7 @@ public:
VoidBlastCounter = 0;
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
me->SetInCombatWithZone();
@@ -83,7 +83,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -229,7 +229,7 @@ public:
me->RemoveAurasDueToSpell(SPELL_BANISH_SELF);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
events.ScheduleEvent(EVENT_SPELL_SCREECH, 14000);
@@ -87,7 +87,7 @@ public:
}
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
if (isBanished)
return;
@@ -82,7 +82,7 @@ public:
instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SPELL_INCITE, 20000);
@@ -136,7 +136,7 @@ public:
instance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
summonPortals();
@@ -76,7 +76,7 @@ public:
instance->SetData(DATA_MURMUREVENT, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SPELL_SONIC_BOOM, 30000);
events.ScheduleEvent(EVENT_SPELL_MURMURS_TOUCH, urand(8000, 20000));