nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-03 02:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
View File

@@ -234,7 +234,7 @@ public:
me->SetReactState(REACT_AGGRESSIVE);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
bool valid = true;
if (Creature* keleseth = instance->instance->GetCreature(instance->GetGuidData(DATA_PRINCE_KELESETH_GUID)))
@@ -494,7 +494,7 @@ public:
me->SetReactState(REACT_AGGRESSIVE);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
bool valid = true;
if (Creature* keleseth = instance->instance->GetCreature(instance->GetGuidData(DATA_PRINCE_KELESETH_GUID)))
@@ -779,7 +779,7 @@ public:
instance->SetBossState(DATA_BLOOD_PRINCE_COUNCIL, NOT_STARTED);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
bool valid = true;
if (Creature* keleseth = instance->instance->GetCreature(instance->GetGuidData(DATA_PRINCE_KELESETH_GUID)))

2
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
View File

@@ -168,7 +168,7 @@ public:
instance->SetBossState(DATA_BLOOD_QUEEN_LANA_THEL, NOT_STARTED);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
if (!instance->CheckRequiredBosses(DATA_BLOOD_QUEEN_LANA_THEL, who->ToPlayer()) || !me->IsVisible())
{

2
src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
View File

@@ -269,7 +269,7 @@ public:
instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MARK_OF_THE_FALLEN_CHAMPION);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
if (!_introDone)
{

4
src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
View File

@@ -108,7 +108,7 @@ public:
}
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
if (!instance->CheckRequiredBosses(DATA_FESTERGUT, who->ToPlayer()))
{
@@ -435,7 +435,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*target*/) override
void JustEngagedWith(Unit* /*target*/) override
{
me->setActive(true);
me->CastSpell(me, SPELL_PLAGUE_STENCH, true);

6
src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
View File

@@ -770,7 +770,7 @@ public:
_events.ScheduleEvent(EVENT_INTRO_H_4, 39200);
}
void EnterCombat(Unit* /*target*/) override
void JustEngagedWith(Unit* /*target*/) override
{
if (_instance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE && !me->HasAura(SPELL_FRIENDLY_BOSS_DAMAGE_MOD))
me->CastSpell(me, SPELL_FRIENDLY_BOSS_DAMAGE_MOD, true);
@@ -1106,7 +1106,7 @@ public:
_events.ScheduleEvent(EVENT_INTRO_A_5, 45000);
}
void EnterCombat(Unit* /*target*/) override
void JustEngagedWith(Unit* /*target*/) override
{
if (_instance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_ALLIANCE && !me->HasAura(SPELL_FRIENDLY_BOSS_DAMAGE_MOD))
me->CastSpell(me, SPELL_FRIENDLY_BOSS_DAMAGE_MOD, true);
@@ -1658,7 +1658,7 @@ public:
{
}
void EnterCombat(Unit* /*target*/) override
void JustEngagedWith(Unit* /*target*/) override
{
_events.Reset();
_events.ScheduleEvent(EVENT_BLADESTORM, urand(13000, 18000));

8
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
View File

@@ -265,7 +265,7 @@ public:
me->GetMotionMaster()->MoveChase(victim);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
if (!instance->CheckRequiredBosses(DATA_LADY_DEATHWHISPER, who->ToPlayer()))
{
@@ -716,7 +716,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); }
void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); }
void UpdateAI(uint32 diff) override
{
@@ -829,7 +829,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); }
void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); }
void UpdateAI(uint32 diff) override
{
@@ -1041,7 +1041,7 @@ public:
me->DespawnOrUnsummon();
}
void EnterCombat(Unit* /*victim*/) override
void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
Talk(SAY_DARNAVAN_AGGRO);

2
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
View File

@@ -127,7 +127,7 @@ public:
instance->SetData(DATA_BONED_ACHIEVEMENT, uint32(true));
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
me->setActive(true);

2
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
View File

@@ -294,7 +294,7 @@ public:
BossAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
Position homePos = me->GetHomePosition();
if (!instance->CheckRequiredBosses(DATA_PROFESSOR_PUTRICIDE, who->ToPlayer()) || me->GetExactDist2d(&homePos) > 10.0f || !me->IsVisible()) // check home position because during festergut/rotface fight, trigger missile after their death can trigger putricide combat

4
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
View File

@@ -147,7 +147,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
if (!instance->CheckRequiredBosses(DATA_ROTFACE, who->ToPlayer()))
{
@@ -891,7 +891,7 @@ public:
summons.DespawnAll();
}
void EnterCombat(Unit* /*target*/) override
void JustEngagedWith(Unit* /*target*/) override
{
me->setActive(true);
events.ScheduleEvent(EVENT_DECIMATE, urand(20000, 25000));

8
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View File

@@ -320,9 +320,9 @@ public:
instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_ASPHYXIATION);
}
void EnterCombat(Unit* victim) override
void JustEngagedWith(Unit* who) override
{
if (!instance->CheckRequiredBosses(DATA_SINDRAGOSA, victim->ToPlayer()) || !me->IsVisible())
if (!instance->CheckRequiredBosses(DATA_SINDRAGOSA, who->ToPlayer()) || !me->IsVisible())
{
EnterEvadeMode(EVADE_REASON_OTHER);
instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT);
@@ -1594,7 +1594,7 @@ public:
}
}
void EnterCombat(Unit* /*victim*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->CastSpell(me, SPELL_FROST_AURA_RIMEFANG, true);
}
@@ -1785,7 +1785,7 @@ public:
_events.ScheduleEvent(EVENT_WHELP_FROST_BLAST, urand(3000, 6000));
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
if (me->GetEntry() == NPC_FROSTWARDEN_HANDLER)
{

2
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
View File

@@ -669,7 +669,7 @@ public:
me->PlayDirectSound(17374);
}
void EnterCombat(Unit* target) override
void JustEngagedWith(Unit* target) override
{
if (!instance->CheckRequiredBosses(DATA_THE_LICH_KING, target->ToPlayer()) || !me->IsVisible())
{

4
src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
View File

@@ -520,7 +520,7 @@ public:
checkTimer = 5000;
}
void EnterCombat(Unit* target) override
void JustEngagedWith(Unit* target) override
{
if (!instance->CheckRequiredBosses(DATA_VALITHRIA_DREAMWALKER, target->ToPlayer()))
{
@@ -728,7 +728,7 @@ public:
_events.ScheduleEvent(EVENT_COLUMN_OF_FROST, urand(10000, 20000));
}
void EnterCombat(Unit* /*target*/) override
void JustEngagedWith(Unit* /*target*/) override
{
me->FinishSpell(CURRENT_CHANNELED_SPELL, false);
me->SetInCombatWithZone();

20
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
View File

@@ -1037,7 +1037,7 @@ public:
}
}
void EnterCombat(Unit* /*attacker*/) override
void JustEngagedWith(Unit* /*attacker*/) override
{
if (me->HasReactState(REACT_PASSIVE) || me->IsImmuneToAll())
{
@@ -1046,7 +1046,7 @@ public:
me->SetReactState(REACT_PASSIVE);
return;
}
_EnterCombat();
_JustEngagedWith();
me->LowerPlayerDamageReq(me->GetMaxHealth());
if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_CROK_SCOURGEBANE)))
{
@@ -1241,7 +1241,7 @@ public:
}
}
void EnterCombat(Unit* /*target*/) override
void JustEngagedWith(Unit* /*target*/) override
{
if (IsUndead)
DoZoneInCombat();
@@ -1627,7 +1627,7 @@ public:
ScriptedAI::AttackStart(victim);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->InterruptNonMeleeSpells(false);
me->CallForHelp(8.5f);
@@ -2576,7 +2576,7 @@ public:
void Reset() override { events.Reset(); }
void AttackStart(Unit* who) override { AttackStartCaster(who, 20.0f); }
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
events.ScheduleEvent(1, urand(5000, 15000));
@@ -2643,7 +2643,7 @@ public:
void Reset() override { events.Reset(); }
void AttackStart(Unit* who) override { AttackStartCaster(who, 20.0f); }
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
events.ScheduleEvent(1, urand(5000, 10000));
@@ -2697,7 +2697,7 @@ public:
void Reset() override { events.Reset(); }
void AttackStart(Unit* who) override { AttackStartCaster(who, 20.0f); }
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
events.ScheduleEvent(1, urand(5000, 15000));
@@ -2758,7 +2758,7 @@ public:
void Reset() override { events.Reset(); }
void AttackStart(Unit* who) override { AttackStartCaster(who, 20.0f); }
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
events.ScheduleEvent(1, urand(5000, 15000));
@@ -2825,7 +2825,7 @@ public:
void Reset() override { events.Reset(); summons.DespawnAll(); }
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
summons.DespawnAll();
@@ -3361,7 +3361,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->CallForHelp(15.0f);
}