nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-22 05:06:24 +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

4
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
View File

@@ -323,7 +323,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
DoZoneInCombat();
@@ -1087,7 +1087,7 @@ public:
EventMap events;
uint16 timer;
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
events.Reset();

4
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
View File

@@ -120,10 +120,10 @@ public:
activeRifts++;
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
activeRifts = 0;
events.SetTimer(45000);

4
src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
View File

@@ -64,9 +64,9 @@ public:
BossAI::Reset();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_BATTLE_SHOUT, 0);

4
src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
View File

@@ -77,10 +77,10 @@ public:
aGuids.clear();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
me->CastSpell(me, SPELL_INTENSE_COLD, true);
events.ScheduleEvent(EVENT_CRYSTALFIRE_BREATH, 14000);

4
src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
View File

@@ -109,9 +109,9 @@ public:
return 0;
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_MAGUS_ICE_NOVA, 10000);

4
src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
View File

@@ -83,10 +83,10 @@ public:
BossAI::Reset();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_ORMOROK_CRYSTAL_SPIKES, 12000);
events.ScheduleEvent(EVENT_ORMOROK_TRAMPLE, 10000);

2
src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
View File

@@ -194,7 +194,7 @@ public:
me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
_allowDeath = me->GetInstanceScript()->GetBossState(DATA_ORMOROK_EVENT) == DONE;
}

2
src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
View File

@@ -83,7 +83,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);

2
src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
View File

@@ -101,7 +101,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);

2
src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
View File

@@ -141,7 +141,7 @@ public:
me->ApplySpellImmune(0, IMMUNITY_ID, 49838, true);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
if( lock )
return;

2
src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
View File

@@ -120,7 +120,7 @@ public:
me->DisableRotate(false);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);

2
src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
View File

@@ -502,7 +502,7 @@ public:
void Reset() override {}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
DoCast(IsHeroic() ? H_SPELL_EMPOWERING_BLOWS : SPELL_EMPOWERING_BLOWS);
}