sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests 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
src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+2 -2
View File
@@ -92,9 +92,9 @@ public:
BossAI::Reset();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
me->CastSpell(me, SPELL_ACIDIC_WOUND, true);
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+2 -2
View File
@@ -321,10 +321,10 @@ public:
events.ScheduleEvent(EVENT_SPELL_FRENZY, 40000);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
summons.DespawnAll();
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
ScheduleNormalEvents(1);
events.ScheduleEvent(EVENT_SPELL_BERSERK, 25 * MINUTE * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_SUMMON_MINIONS, 1000);
src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+2 -2
View File
@@ -87,9 +87,9 @@ public:
BossAI::Reset();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
me->CastSpell(me, SPELL_SABER_LASH_AURA, true);
src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+5 -5
View File
@@ -183,9 +183,9 @@ public:
}
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
}
void JustSummoned(Creature* summon) override
@@ -327,7 +327,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SUFF_SAY_FREED);
me->CastSpell(me, SPELL_AURA_OF_SUFFERING, true);
@@ -437,7 +437,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(DESI_SAY_FREED);
me->CastSpell(me, SPELL_AURA_OF_DESIRE, true);
@@ -529,7 +529,7 @@ public:
Unit::Kill(summoner, summoner);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(ANGER_SAY_FREED);
me->CastSpell(me, SPELL_AURA_OF_ANGER, true);
src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+3 -3
View File
@@ -158,9 +158,9 @@ public:
}
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
}
void DoAction(int32 param) override
@@ -332,7 +332,7 @@ public:
shade->AI()->DoAction(ACTION_AKAMA_DIED);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SPELL_CHAIN_LIGHTNING, 2000);
events.ScheduleEvent(EVENT_SPELL_DESTRUCTIVE_POISON, 5000);
src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+2 -2
View File
@@ -67,9 +67,9 @@ public:
BossAI::Reset();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
SchedulePhase(false);
events.ScheduleEvent(EVENT_SPELL_BERSERK, 900000);
src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+2 -2
View File
@@ -107,9 +107,9 @@ public:
}
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_SPELL_INCINERATE, 24000);
events.ScheduleEvent(EVENT_SPELL_DOOM_BLOSSOM, 10000);
events.ScheduleEvent(EVENT_SPELL_CRUSHING_SHADOWS, 17000);
src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+2 -2
View File
@@ -86,9 +86,9 @@ public:
Talk(SAY_DEATH);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SPELL_BERSERK, 480000);
events.ScheduleEvent(EVENT_YELL, urand(25000, 100000));
src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+9 -9
View File
@@ -271,7 +271,7 @@ struct boss_illidari_council_memberAI : public ScriptedAI
council->GetAI()->DoAction(ACTION_END_ENCOUNTER);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
if (Creature* council = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_ILLIDARI_COUNCIL)))
council->GetAI()->DoAction(ACTION_START_ENCOUNTER);
@@ -305,9 +305,9 @@ public:
return ObjectAccessor::GetCreature(*me, instance->GetGuidData(RAND(NPC_GATHIOS_THE_SHATTERER, NPC_HIGH_NETHERMANCER_ZEREVOR)));
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
boss_illidari_council_memberAI::EnterCombat(who);
boss_illidari_council_memberAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_SPELL_BLESSING, 10000);
events.ScheduleEvent(EVENT_SPELL_AURA, 0);
events.ScheduleEvent(EVENT_SPELL_SEAL, 2000);
@@ -386,9 +386,9 @@ public:
me->GetMotionMaster()->MoveChase(who, 20.0f);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
boss_illidari_council_memberAI::EnterCombat(who);
boss_illidari_council_memberAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_SPELL_FLAMESTRIKE, 25000);
events.ScheduleEvent(EVENT_SPELL_BLIZZARD, 5000);
events.ScheduleEvent(EVENT_SPELL_ARCANE_BOLT, 15000);
@@ -459,9 +459,9 @@ public:
me->GetMotionMaster()->MoveChase(who, 20.0f);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
boss_illidari_council_memberAI::EnterCombat(who);
boss_illidari_council_memberAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_SPELL_REFLECTIVE_SHIELD, 10000);
events.ScheduleEvent(EVENT_SPELL_CIRCLE_OF_HEALING, 20000);
events.ScheduleEvent(EVENT_SPELL_DIVINE_WRATH, 5000);
@@ -517,10 +517,10 @@ public:
{
boss_veras_darkshadowAI(Creature* creature) : boss_illidari_council_memberAI(creature) { }
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
me->SetCanDualWield(true);
boss_illidari_council_memberAI::EnterCombat(who);
boss_illidari_council_memberAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_SPELL_VANISH, 10000);
events.ScheduleEvent(EVENT_SPELL_ENRAGE, 900000);
}