nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-06 20:37:45 +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/EasternKingdoms/ZulGurub/boss_arlokk.cpp
View File

@@ -115,9 +115,9 @@ public:
Talk(SAY_DEATH);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 7s, 9s, 0, PHASE_ONE);
events.ScheduleEvent(EVENT_GOUGE, 12s, 15s, 0, PHASE_ONE);
events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6s, 0, PHASE_ALL);
@@ -341,7 +341,7 @@ public:
_events.ScheduleEvent(EVENT_ATTACK, 6000);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->GetMotionMaster()->Clear(false);
me->RemoveAura(SPELL_SNEAK_RANK_1_1);

4
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
View File

@@ -72,9 +72,9 @@ public:
_JustDied();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
me->AddAura(SPELL_THRASH, me);
events.ScheduleEvent(EVENT_FROSTBREATH, 8s);
events.ScheduleEvent(EVENT_MASSIVEGEYSER, 25s);

4
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
View File

@@ -61,9 +61,9 @@ public:
BossAI::Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
events.ScheduleEvent(EVENT_AVATAR, 20s, 30s);
events.ScheduleEvent(EVENT_GROUND_TREMOR, 15s, 25s);
events.ScheduleEvent(EVENT_ENTANGLING_ROOTS, 5s, 15s);

4
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
View File

@@ -110,9 +110,9 @@ public:
_JustDied();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90s);
events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 25s);
events.ScheduleEvent(EVENT_CAUSE_INSANITY, 17s);

4
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
View File

@@ -69,9 +69,9 @@ struct boss_hazzarah : public BossAI
summon->DespawnOrUnsummon();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
events.ScheduleEvent(EVENT_SLEEP, 12s, 15s);
events.ScheduleEvent(EVENT_EARTH_SHOCK, 8s, 18s);
events.ScheduleEvent(EVENT_CHAIN_BURN, 12s, 28s);

6
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
View File

@@ -132,7 +132,7 @@ struct boss_jeklik : public BossAI
BossAI::EnterEvadeMode(why);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
me->RemoveAurasDueToSpell(SPELL_GREEN_CHANNELING);
@@ -147,7 +147,7 @@ struct boss_jeklik : public BossAI
{
me->SetHover(false);
me->SetDisableGravity(false);
_EnterCombat();
_JustEngagedWith();
SetCombatMovement(true);
me->SetReactState(REACT_AGGRESSIVE);
events.SetPhase(PHASE_ONE);
@@ -285,7 +285,7 @@ struct npc_batrider : public ScriptedAI
me->AddUnitState(UNIT_STATE_ROOT);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_scheduler.Schedule(2s, [this](TaskContext context)
{

8
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
View File

@@ -58,9 +58,9 @@ struct boss_jindo : public BossAI
{
boss_jindo(Creature* creature) : BossAI(creature, DATA_JINDO) { }
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, 20s);
events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, 16s);
events.ScheduleEvent(EVENT_HEX, 8s);
@@ -187,7 +187,7 @@ struct npc_healing_ward : public ScriptedAI
_scheduler.CancelAll();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_scheduler.
Schedule(2s, [this](TaskContext context)
@@ -237,7 +237,7 @@ struct npc_shade_of_jindo : public ScriptedAI
});
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_scheduler.
Schedule(1s, [this](TaskContext context)

10
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
View File

@@ -184,9 +184,9 @@ public:
instance->SaveToDB();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
events.ScheduleEvent(EVENT_OVERPOWER, 1s);
events.ScheduleEvent(EVENT_MORTAL_STRIKE, 14s, 28s);
events.ScheduleEvent(EVENT_WHIRLWIND, 24s, 30s);
@@ -537,9 +537,9 @@ public:
reviveGUID.Clear();
}
void EnterCombat(Unit* victim) override
void JustEngagedWith(Unit* who) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (who->GetTypeId() != TYPEID_PLAYER)
return;
_scheduler.Schedule(6s, 12s, [this](TaskContext context)
@@ -672,7 +672,7 @@ struct npc_vilebranch_speaker : public ScriptedAI
_scheduler.CancelAll();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_scheduler
.Schedule(2s, 4s, [this](TaskContext context)

6
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
View File

@@ -122,9 +122,9 @@ struct boss_marli : public BossAI
Talk(SAY_DEATH);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_SPAWN_START_SPIDERS, 1s, 0, PHASE_ONE);
Talk(SAY_AGGRO);
}
@@ -253,7 +253,7 @@ struct npc_spawn_of_marli : public ScriptedAI
_scheduler.CancelAll();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_scheduler.Schedule(4s, [this](TaskContext context)
{

4
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
View File

@@ -63,9 +63,9 @@ public:
_dynamicFlags = me->GetDynamicFlags();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
events.ScheduleEvent(EVENT_VANISH, 23s, 25s);
events.ScheduleEvent(EVENT_GOUGE, 5s, 10s);
events.ScheduleEvent(EVENT_THOUSAND_BLADES, 15s, 20s);

8
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
View File

@@ -121,9 +121,9 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
_scheduler.CancelAll();
_scheduler.Schedule(4s, [this](TaskContext context) {
@@ -306,7 +306,7 @@ public:
});
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_scheduler.Schedule(1s, [this](TaskContext context) {
DoCastSelf(SPELL_SHIELD);
@@ -391,7 +391,7 @@ public:
});
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_scheduler.Schedule(13s, [this](TaskContext context) {
DoCastSelf(SPELL_SWEEPINGSTRIKES);

6
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
View File

@@ -138,9 +138,9 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
me->SetReactState(REACT_AGGRESSIVE);
// Always running events
events.ScheduleEvent(EVENT_THRASH, 5s);
@@ -299,7 +299,7 @@ public:
events.Reset();
}
void EnterCombat(Unit*)
void JustEngagedWith(Unit*)
{
events.ScheduleEvent(EVENT_POISON, 8ms);

4
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
View File

@@ -49,9 +49,9 @@ public:
{
boss_wushoolayAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) { }
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 7s, 15s);
events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 12s, 16s);
events.ScheduleEvent(EVENT_FORKED_LIGHTNING, 8s, 12s);