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

@@ -110,7 +110,7 @@ public:
SetWeather(WEATHER_STATE_FINE, 0.0f);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 20000)); // 10 to 20 seconds (bosskillers)
events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000)); // 20 to 30 seconds(bosskillers)
@@ -391,7 +391,7 @@ public:
me->SetDisableGravity(true);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}

View File

@@ -105,7 +105,7 @@ public:
EnterPhase(PHASE_LYNX);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
instance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS);
Talk(SAY_AGGRO);
@@ -350,7 +350,7 @@ public:
ScriptedAI::AttackStart(who);
}
void EnterCombat(Unit* /*who*/) override {/*DoZoneInCombat();*/ }
void JustEngagedWith(Unit* /*who*/) override {/*DoZoneInCombat();*/ }
void UpdateAI(uint32 diff) override
{

View File

@@ -228,7 +228,7 @@ struct boss_hexlord_addAI : public ScriptedAI
void Reset() override { }
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
@@ -294,7 +294,7 @@ public:
me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
instance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS);

View File

@@ -175,7 +175,7 @@ public:
Talk(SAY_SLAY);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
instance->SetData(DATA_JANALAIEVENT, IN_PROGRESS);
@@ -451,7 +451,7 @@ public:
DoCast(me, SPELL_FIRE_BOMB_DUMMY, true);
}
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
@@ -524,7 +524,7 @@ public:
return num == 0; // if num == 0, no more templist
}
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -618,7 +618,7 @@ public:
me->SetDisableGravity(true);
}
void EnterCombat(Unit* /*who*/) override {/*DoZoneInCombat();*/ }
void JustEngagedWith(Unit* /*who*/) override {/*DoZoneInCombat();*/ }
void UpdateAI(uint32 diff) override
{

View File

@@ -280,7 +280,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
if (instance)
instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS);

View File

@@ -201,7 +201,7 @@ public:
//me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
instance->SetData(DATA_ZULJINEVENT, IN_PROGRESS);
@@ -580,7 +580,7 @@ public:
void Reset() override { }
void EnterCombat(Unit* /*target*/) override { }
void JustEngagedWith(Unit* /*target*/) override { }
void SpellHit(Unit* caster, SpellInfo const* spell) override
{

View File

@@ -144,7 +144,7 @@ public:
void Reset() override { }
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void MovementInform(uint32 type, uint32 data) override
{
@@ -469,7 +469,7 @@ public:
void Reset() override { }
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void JustDied(Unit* /*killer*/) override
{
@@ -618,7 +618,7 @@ public:
uiTargetGUID.Clear();
}
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void sGossipSelect(Player* player, uint32 sender, uint32 action) override
{