nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-27 23:56:25 +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/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
View File

@@ -166,7 +166,7 @@ public:
m_pInstance->SetData(TYPE_BJARNGRIM, NOT_STARTED);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
me->SetInCombatWithZone();
Talk(SAY_AGGRO);
@@ -395,7 +395,7 @@ public:
BjarngrimGUID.Clear();
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.ScheduleEvent(EVENT_ARC_WELD, 2000);
events.ScheduleEvent(EVENT_RENEW_STEEL, 10000 + rand() % 1000);

2
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
View File

@@ -112,7 +112,7 @@ public:
events.RescheduleEvent(EVENT_STATIC_OVERLOAD, 5000, 0, 1);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
me->SetInCombatWithZone();
Talk(SAY_AGGRO);

2
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
View File

@@ -112,7 +112,7 @@ public:
}
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
me->SetInCombatWithZone();
Talk(SAY_AGGRO);

4
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
View File

@@ -119,7 +119,7 @@ public:
}
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
me->SetInCombatWithZone();
Talk(SAY_AGGRO);
@@ -487,7 +487,7 @@ public:
}
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.Reset();
if (me->GetEntry() == 28961) // NPC_TITANIUM_SIEGEBREAKER

2
src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
View File

@@ -81,7 +81,7 @@ public:
pInstance->SetData(BOSS_KRYSTALLUS, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
events.RescheduleEvent(EVENT_BOULDER, 8000);

2
src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
View File

@@ -78,7 +78,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_STORM, 5000);
events.ScheduleEvent(EVENT_SHOCK, 26000 + rand() % 6000);

6
src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
View File

@@ -161,7 +161,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
@@ -429,7 +429,7 @@ public:
events.Reset();
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.ScheduleEvent(EVENT_TOXIC_VOLLEY, 5000);
}
@@ -486,7 +486,7 @@ public:
events.RescheduleEvent(EVENT_MALFORMED_OOZE_CHECK, 1000);
}
void EnterCombat(Unit*) override { }
void JustEngagedWith(Unit*) override { }
void MoveInLineOfSight(Unit*) override { }
void UpdateAI(uint32 diff) override

6
src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
View File

@@ -715,7 +715,7 @@ public:
events.Reset();
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.ScheduleEvent(EVENT_DRP_CHARGE, 10000);
events.ScheduleEvent(EVENT_DRP_CLEAVE, 7000);
@@ -773,7 +773,7 @@ public:
events.Reset();
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.ScheduleEvent(EVENT_DRS_LIGHTNING_BOLD, 5000);
events.ScheduleEvent(EVENT_DRS_SHADOW_WORD_PAIN, 12000);
@@ -828,7 +828,7 @@ public:
events.Reset();
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.ScheduleEvent(EVENT_IGC_CRUSH, 6000);
events.ScheduleEvent(EVENT_IGC_GROUND_SMASH, 4000);

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
View File

@@ -463,7 +463,7 @@ public:
me->setActive(false);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
if (_fightWon)
return;

6
src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
View File

@@ -229,7 +229,7 @@ public:
me->RemoveAllAuras();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
if (pInstance)
pInstance->SetData(TYPE_ASSEMBLY, IN_PROGRESS);
@@ -425,7 +425,7 @@ public:
me->RemoveAllAuras();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
me->InterruptNonMeleeSpells(false);
me->setActive(true);
@@ -642,7 +642,7 @@ public:
me->RemoveAllAuras();
}
void EnterCombat(Unit* who) override
void JustEngagedWith(Unit* who) override
{
me->InterruptNonMeleeSpells(false);
me->setActive(true);

4
src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
View File

@@ -172,7 +172,7 @@ public:
void JustReachedHome() override { me->setActive(false); }
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
if (m_pInstance)
m_pInstance->SetData(TYPE_AURIAYA, IN_PROGRESS);
@@ -289,7 +289,7 @@ public:
uint32 _savagePounceTimer;
uint32 _ripFleshTimer;
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
if (me->GetInstanceScript())
if (Creature* cr = ObjectAccessor::GetCreature(*me, me->GetInstanceScript()->GetGuidData(TYPE_AURIAYA)))

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
View File

@@ -252,7 +252,7 @@ public:
ScriptedAI::AttackStart(who);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
ScheduleEvents();
Talk(FLAME_LEVIATHAN_SAY_AGGRO);

10
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
View File

@@ -474,7 +474,7 @@ public:
void JustReachedHome() override { me->setActive(false); }
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
me->setActive(true);
me->SetInCombatWithZone();
@@ -698,7 +698,7 @@ public:
freya->AI()->DoAction(ACTION_LUMBERJACKED);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.ScheduleEvent(EVENT_STONEBARK_FISTS_OF_STONE, 40000);
events.ScheduleEvent(EVENT_STONEBARK_GROUND_TREMOR, 5000);
@@ -794,7 +794,7 @@ public:
freya->AI()->DoAction(ACTION_LUMBERJACKED);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.ScheduleEvent(EVENT_BRIGHTLEAF_FLUX, 10000);
events.ScheduleEvent(EVENT_BRIGHTLEAF_SOLAR_FLARE, 5000);
@@ -905,7 +905,7 @@ public:
freya->AI()->DoAction(ACTION_LUMBERJACKED);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.ScheduleEvent(EVENT_IRONBRANCH_IMPALE, 10000);
events.ScheduleEvent(EVENT_IRONBRANCH_IRON_ROOT, 15000);
@@ -1114,7 +1114,7 @@ public:
}
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
if (me->GetEntry() == NPC_ANCIENT_CONSERVATOR)
{

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
View File

@@ -151,7 +151,7 @@ public:
me->setActive(false);
}
void EnterCombat(Unit* /*pWho*/) override
void JustEngagedWith(Unit* /*pWho*/) override
{
me->setActive(true);
me->SetInCombatWithZone();

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
View File

@@ -264,7 +264,7 @@ public:
SpawnHelpers();
}
void EnterCombat(Unit* /*pWho*/) override
void JustEngagedWith(Unit* /*pWho*/) override
{
me->CastSpell(me, SPELL_BITING_COLD_BOSS_AURA, true);
SmallIcicles(true);

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
View File

@@ -224,7 +224,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->setActive(true);

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
View File

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

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
View File

@@ -331,7 +331,7 @@ public:
ScriptedAI::JustReachedHome();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->setActive(true);
DoZoneInCombat();

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
View File

@@ -205,7 +205,7 @@ public:
me->GetMotionMaster()->MoveChase(who);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
me->SetInCombatWithZone();
events.Reset();

14
src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
View File

@@ -512,7 +512,7 @@ public:
void JustReachedHome() override { me->setActive(false); }
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
if (m_pInstance && !_encounterFinished)
m_pInstance->SetData(TYPE_THORIM, IN_PROGRESS);
@@ -1000,7 +1000,7 @@ public:
}
void MoveInLineOfSight(Unit* /*who*/) override {}
void EnterCombat(Unit* /*who*/) override {}
void JustEngagedWith(Unit* /*who*/) override {}
void AttackStart(Unit* /*who*/) override {}
void InitWaypoint()
@@ -1129,7 +1129,7 @@ public:
thorim->AI()->DoAction(ACTION_START_TRASH_DIED);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
if (me->GetEntry() == NPC_DARK_RUNE_ACOLYTE_I)
{
@@ -1248,7 +1248,7 @@ public:
_isCaster = (me->GetEntry() == NPC_DARK_RUNE_ACOLYTE_G);
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
if (me->GetEntry() == NPC_IRON_RING_GUARD)
{
@@ -1384,7 +1384,7 @@ public:
}
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
events.CancelEvent(EVENT_RC_RUNIC_SMASH);
events.ScheduleEvent(EVENT_RC_RUNIC_BARRIER, 10000);
@@ -1496,7 +1496,7 @@ public:
events.Reset();
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
_isInCombat = true;
events.CancelEvent(EVENT_ARG_SPAWN);
@@ -1583,7 +1583,7 @@ public:
me->CastSpell(me, SPELL_AURA_OF_CELERITY, true);
}
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
if (me->GetEntry() == NPC_DARK_RUNE_WARBRINGER)
{

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
View File

@@ -198,7 +198,7 @@ public:
void JustReachedHome() override { me->setActive(false); }
void EnterCombat(Unit*) override
void JustEngagedWith(Unit*) override
{
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
events.ScheduleEvent(EVENT_ENRAGE, 600000, 0, 0);

2
src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
View File

@@ -230,7 +230,7 @@ public:
events.Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
events.Reset();
events.ScheduleEvent(1, 2000); // checking Separation Anxiety, Charged Sphere