nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-30 00:53:46 +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

2
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
View File

@@ -89,7 +89,7 @@ public:
pInstance->SetData(DATA_BRONJAHM, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
me->RemoveAurasDueToSpell(SPELL_SOULSTORM_CHANNEL_OOC);

2
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
View File

@@ -116,7 +116,7 @@ public:
return 0;
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_FACE_AGGRO);
DoZoneInCombat();

2
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
View File

@@ -73,7 +73,7 @@ public:
pInstance->SetData(DATA_FALRIC, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->SetImmuneToAll(false);

2
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
View File

@@ -69,7 +69,7 @@ public:
pInstance->SetData(DATA_MARWYN, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->SetImmuneToAll(false);

18
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
View File

@@ -695,7 +695,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5000);
events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 8000);
@@ -794,7 +794,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_FIREBALL, 3000);
events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000);
@@ -941,7 +941,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SHADOW_STEP, 4000);
events.ScheduleEvent(EVENT_DEADLY_POISON, 6000);
@@ -1039,7 +1039,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000);
events.ScheduleEvent(EVENT_SHIELD_BASH, 6000);
@@ -1125,7 +1125,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_CURSED_ARROW, 10000);
events.ScheduleEvent(EVENT_FROST_TRAP, 15000);
@@ -1201,7 +1201,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_FROSTSWORN_GENERAL_AGGRO);
events.ScheduleEvent(EVENT_ACTIVATE_REFLECTIONS, 8000);
@@ -1280,7 +1280,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_BALEFUL_STRIKE, urand(4000, 7000));
}
@@ -1886,7 +1886,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(1, 10000);
events.ScheduleEvent(2, 4500);
@@ -1955,7 +1955,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(1, 5000);
}

2
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
View File

@@ -109,7 +109,7 @@ public:
pInstance->SetData(DATA_ACHIEV_ELEVEN, 0);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->CastSpell(me, SPELL_PERMAFROST, true);

2
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
View File

@@ -98,7 +98,7 @@ public:
return pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) >= INSTANCE_PROGRESS_FINISHED_INTRO;
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
if (Creature* k = GetKrick())
k->AI()->Talk(SAY_AGGRO);

2
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
View File

@@ -432,7 +432,7 @@ public:
me->SetFacingTo(M_PI);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
/// @todo This spell check is invalid
// if (SPELL_NECROLYTE_CHANNELING)