nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-06 04:23:47 +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/EasternKingdoms/Karazhan/boss_curator.cpp
View File

@@ -79,9 +79,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_HATEFUL_BOLT, 10000);

4
src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
View File

@@ -43,9 +43,9 @@ struct boss_maiden_of_virtue : public BossAI
{
boss_maiden_of_virtue(Creature* creature) : BossAI(creature, DATA_MAIDEN) { }
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
DoCastAOE(SPELL_HOLY_GROUND, true);

4
src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
View File

@@ -366,9 +366,9 @@ public:
}
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
scheduler.Schedule(Seconds(15), Seconds(25), [this](TaskContext task)
{

4
src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
View File

@@ -124,9 +124,9 @@ struct boss_moroes : public BossAI
DoCastSelf(SPELL_DUAL_WIELD, true);
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
BossAI::EnterCombat(who);
BossAI::JustEngagedWith(who);
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SPELL_VANISH, 30s);

2
src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
View File

@@ -251,7 +251,7 @@ public:
Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
HandleDoors(false);
SwitchToPortalPhase();

2
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
View File

@@ -158,7 +158,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
if (instance)
instance->SetData(DATA_NIGHTBANE, IN_PROGRESS);

6
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
View File

@@ -105,7 +105,7 @@ public:
InfernalPoint* point;
void Reset() override { }
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
@@ -233,7 +233,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
DoZoneInCombat();
@@ -485,7 +485,7 @@ public:
{
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}

2
src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
View File

@@ -70,7 +70,7 @@ struct boss_servant_quarters : public BossAI
me->DespawnOrUnsummon(1);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->setActive(true);
if (me->GetEntry() == NPC_HYAKISS_THE_LURKER)

4
src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
View File

@@ -150,7 +150,7 @@ public:
instance->HandleGameObject(instance->GetGuidData(DATA_GO_LIBRARY_DOOR), true);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -584,7 +584,7 @@ public:
CastTimer = 2000 + (rand() % 3000);
}
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{

8
src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
View File

@@ -91,7 +91,7 @@ public:
AmplifyTimer = 2000;
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
}
@@ -148,7 +148,7 @@ public:
SacrificeGUID.Clear();
}
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -219,7 +219,7 @@ public:
FireboltTimer = 2000;
}
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void UpdateAI(uint32 diff) override
{
@@ -313,7 +313,7 @@ public:
DoCast(me, SPELL_SUMMON_IMP, true);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
DoZoneInCombat();

20
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
View File

@@ -158,7 +158,7 @@ public:
Initialize();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_DOROTHEE_AGGRO);
DoZoneInCombat();
@@ -263,7 +263,7 @@ public:
YipTimer = 10000;
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
@@ -358,7 +358,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_STRAWMAN_AGGRO);
DoZoneInCombat();
@@ -467,7 +467,7 @@ public:
RustCount = 0;
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_TINHEAD_AGGRO);
DoZoneInCombat();
@@ -599,7 +599,7 @@ public:
ScriptedAI::AttackStart(who);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_ROAR_AGGRO);
DoZoneInCombat();
@@ -707,7 +707,7 @@ public:
Talk(SAY_CRONE_SLAY);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_CRONE_AGGRO);
DoZoneInCombat();
@@ -775,7 +775,7 @@ public:
MoveTimer = 1000;
}
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override
@@ -886,7 +886,7 @@ public:
IsChasing = false;
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_WOLF_AGGRO);
DoZoneInCombat();
@@ -1118,7 +1118,7 @@ public:
RomuloDead = false;
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
}
@@ -1288,7 +1288,7 @@ public:
//LOG_ERROR("scripts", "boss_romuloAI: DamageTaken reach end of code, that should not happen.");
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
DoZoneInCombat();
Talk(SAY_ROMULO_AGGRO);

4
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
View File

@@ -168,7 +168,7 @@ public:
Start(false, false);
}
void EnterCombat(Unit* /*who*/) override { }
void JustEngagedWith(Unit* /*who*/) override { }
void WaypointReached(uint32 waypointId) override
{
@@ -480,7 +480,7 @@ public:
me->DespawnOrUnsummon();
}
void EnterCombat(Unit* /*who*/) override {}
void JustEngagedWith(Unit* /*who*/) override {}
uint32 NextStep(uint32 nextStep)
{