nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-17 01:04:34 +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/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
View File

@@ -159,7 +159,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
// schedule Phase 1 abilities

2
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
View File

@@ -156,7 +156,7 @@ public:
pInstance->SetData(DATA_KELESETH, DONE);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
events.RescheduleEvent(EVENT_SPELL_SHADOWBOLT, 0);

4
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
View File

@@ -117,7 +117,7 @@ public:
}
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
events.Reset();
events.RescheduleEvent(EVENT_SHARVALD_CHARGE, 5000);
@@ -285,7 +285,7 @@ public:
}
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
events.Reset();
events.RescheduleEvent(EVENT_SHADOW_BOLT, 1000);

2
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
View File

@@ -73,7 +73,7 @@ public:
me->SaveRespawnTime();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
if (pInstance)
{

10
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
View File

@@ -210,7 +210,7 @@ public:
events.RescheduleEvent(EVENT_UNFREEZE_MONSTER, 3000);
}
}
void EnterCombat(Unit* /*pWho*/) override
void JustEngagedWith(Unit* /*pWho*/) override
{
if (m_pInstance)
m_pInstance->SetData(DATA_GORTOK_PALEHOOF, IN_PROGRESS);
@@ -367,7 +367,7 @@ public:
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit*) override {}
void JustEngagedWith(Unit*) override {}
void DoAction(int32 param) override
{
@@ -493,7 +493,7 @@ public:
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit*) override {}
void JustEngagedWith(Unit*) override {}
void DoAction(int32 param) override
{
@@ -603,7 +603,7 @@ public:
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit*) override {}
void JustEngagedWith(Unit*) override {}
void DoAction(int32 param) override
{
@@ -711,7 +711,7 @@ public:
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit*) override {}
void JustEngagedWith(Unit*) override {}
void DoAction(int32 param) override
{

4
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
View File

@@ -159,7 +159,7 @@ public:
Creature* GetGrauf() { return ObjectAccessor::GetCreature(*me, GraufGUID); }
void EnterCombat(Unit* /*pWho*/) override
void JustEngagedWith(Unit* /*pWho*/) override
{
if (!EventStarted)
{
@@ -386,7 +386,7 @@ public:
}
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
me->SetInCombatWithZone();
}

2
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
View File

@@ -175,7 +175,7 @@ public:
summon->CastSpell(summon, SPELL_TELEPORT_VISUAL, true);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
me->SetInCombatWithZone();
Talk(SAY_AGGRO);

2
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
View File

@@ -165,7 +165,7 @@ public:
ScriptedAI::EnterEvadeMode(why);
}
void EnterCombat(Unit* /*pWho*/) override
void JustEngagedWith(Unit* /*pWho*/) override
{
Talk(SAY_AGGRO);
if(pInstance)