diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2017-12-31 03:23:42 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-04-16 20:22:13 +0200 |
| commit | bce43de7f3fba618c370f2aba327d23dd30d1cdd (patch) | |
| tree | 85b786bfa8f5103aaafa0ec01e93b337c29d4a15 | |
| parent | 8eb3c61f1aea5610cf68fb622f41850d2b934c51 (diff) | |
Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now.
(cherry picked from commit 6113b9dec2e0081c36c36c2974a28ed0693bc601)
426 files changed, 961 insertions, 954 deletions
diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index b96a97d8734..6033992071f 100644 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -75,7 +75,7 @@ void CombatAI::JustDied(Unit* killer) me->CastSpell(killer, *i, true); } -void CombatAI::EnterCombat(Unit* who) +void CombatAI::JustEngagedWith(Unit* who) { for (SpellVct::iterator i = spells.begin(); i != spells.end(); ++i) { @@ -132,7 +132,7 @@ void CasterAI::InitializeAI() m_attackDist = MELEE_RANGE; } -void CasterAI::EnterCombat(Unit* who) +void CasterAI::JustEngagedWith(Unit* who) { if (spells.empty()) return; diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h index 9082ad515e8..27d80e38280 100644 --- a/src/server/game/AI/CoreAI/CombatAI.h +++ b/src/server/game/AI/CoreAI/CombatAI.h @@ -40,7 +40,7 @@ class TC_GAME_API CombatAI : public CreatureAI void InitializeAI() override; void Reset() override; - void EnterCombat(Unit* who) override; + void JustEngagedWith(Unit* who) override; void JustDied(Unit* killer) override; void UpdateAI(uint32 diff) override; void SpellInterrupted(uint32 spellId, uint32 unTimeMs) override; @@ -59,7 +59,7 @@ class TC_GAME_API CasterAI : public CombatAI void InitializeAI() override; void AttackStart(Unit* victim) override { AttackStartCaster(victim, m_attackDist); } void UpdateAI(uint32 diff) override; - void EnterCombat(Unit* /*who*/) override; + void JustEngagedWith(Unit* /*who*/) override; private: float m_attackDist; }; diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index a290c8ec402..c00f53a6c36 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -278,6 +278,13 @@ class TC_GAME_API UnitAI targetList.resize(num); } + // Called when the unit enters combat + // (NOTE: Creature engage logic should NOT be here, but in JustEngagedWith, which happens once threat is established!) + virtual void JustEnteredCombat(Unit* /*who*/) { } + + // Called when the unit leaves combat + virtual void JustExitedCombat() { } + // Called at any Damage to any victim (before damage apply) virtual void DamageDealt(Unit* /*victim*/, uint32& /*damage*/, DamageEffectType /*damageType*/) { } diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 9f4db8bd193..4d946f569b8 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -85,8 +85,8 @@ class TC_GAME_API CreatureAI : public UnitAI // Called for reaction at stopping attack at no attackers or targets virtual void EnterEvadeMode(EvadeReason why = EVADE_REASON_OTHER); - // Called for reaction when initially engaged - virtual void EnterCombat(Unit* /*victim*/) { } + // Called for reaction when initially engaged - this will always happen _after_ JustEnteredCombat + virtual void JustEngagedWith(Unit* /*who*/) { } // Called when the creature is killed virtual void JustDied(Unit* /*killer*/) { } diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 965fd290a1d..fc5e30d0ff1 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -480,7 +480,7 @@ void BossAI::_JustReachedHome() me->setActive(false); } -void BossAI::_EnterCombat() +void BossAI::_JustEngagedWith() { if (instance) { @@ -593,7 +593,7 @@ void WorldBossAI::_JustDied() summons.DespawnAll(); } -void WorldBossAI::_EnterCombat() +void WorldBossAI::_JustEngagedWith() { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); if (target) diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 28d40b24856..5556f24872b 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -184,9 +184,9 @@ struct TC_GAME_API ScriptedAI : public CreatureAI void Reset() override { } //Called at creature aggro either by MoveInLOS or Attack Start - void EnterCombat(Unit* /*victim*/) override { } + void JustEngagedWith(Unit* /*victim*/) override { } - // Called before EnterCombat even before the creature is in combat. + // Called before JustEngagedWith even before the creature is in combat. void AttackStart(Unit* /*target*/) override; // ************* @@ -353,7 +353,7 @@ class TC_GAME_API BossAI : public ScriptedAI virtual void ScheduleTasks() { } void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) override { _EnterCombat(); } + void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override { _JustDied(); } void JustReachedHome() override { _JustReachedHome(); } @@ -361,7 +361,7 @@ class TC_GAME_API BossAI : public ScriptedAI protected: void _Reset(); - void _EnterCombat(); + void _JustEngagedWith(); void _JustDied(); void _JustReachedHome(); void _DespawnAtEvade(Seconds delayToRespawn, Creature* who = nullptr); @@ -395,12 +395,12 @@ class TC_GAME_API WorldBossAI : public ScriptedAI virtual void ExecuteEvent(uint32 /*eventId*/) { } void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) override { _EnterCombat(); } + void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override { _JustDied(); } protected: void _Reset(); - void _EnterCombat(); + void _JustEngagedWith(); void _JustDied(); EventMap events; diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 6ee8f6faefb..1651c794412 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -557,7 +557,7 @@ void SmartAI::JustReachedHome() me->GetMotionMaster()->MoveIdle(); // wait the order of leader } -void SmartAI::EnterCombat(Unit* enemy) +void SmartAI::JustEngagedWith(Unit* enemy) { if (IsAIControlled()) me->InterruptNonMeleeSpells(false); // must be before ProcessEvents diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 596625d7b4d..10aa34cc4a1 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -84,7 +84,7 @@ class TC_GAME_API SmartAI : public CreatureAI void JustReachedHome() override; // Called for reaction at enter to combat if not in combat yet (enemy can be nullptr) - void EnterCombat(Unit* enemy) override; + void JustEngagedWith(Unit* enemy) override; // Called for reaction at stopping attack at no attackers or targets void EnterEvadeMode(EvadeReason why = EVADE_REASON_OTHER) override; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 0121c59f71d..a1143318983 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8144,7 +8144,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy) if (enemy) { if (IsAIEnabled) - creature->AI()->EnterCombat(enemy); + creature->AI()->JustEngagedWith(enemy); if (creature->GetFormation()) creature->GetFormation()->MemberEngagingTarget(creature, enemy); diff --git a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp index 43047b45a87..cd0049eb169 100644 --- a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp +++ b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp @@ -219,10 +219,10 @@ struct boss_garothi_worldbreaker : public BossAI me->SummonCreatureGroup(SUMMON_GROUP_ID_SURGING_FEL); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetReactState(REACT_AGGRESSIVE); - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); DoCastSelf(SPELL_MELEE); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index 853b03245d0..b33ef19b431 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -77,7 +77,7 @@ public: summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS)); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index d59e12813c4..1a7e3d6191b 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -61,7 +61,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_WHIRLWIND, urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS)); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 2aa308330ec..41eabe990e1 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -62,7 +62,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, urand(1 * IN_MILLISECONDS, 9 * IN_MILLISECONDS)); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index 45d95b86980..69688fb9482 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -67,7 +67,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(YELL_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp index ffac75d2d14..23f32002eaf 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp @@ -92,9 +92,9 @@ class boss_alizabal : public CreatureScript _skewer = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_RANDOM_CAST, 10000); diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp index eecfbb08573..438230d622a 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp @@ -66,9 +66,9 @@ class boss_occuthar : public CreatureScript ASSERT(_vehicle); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_SEARING_SHADOWS, 8 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_FOCUSED_FIRE, 15 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp index 0ba50fed2b9..8b53a01935b 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp @@ -51,9 +51,9 @@ class boss_pit_lord_argaloth : public CreatureScript { boss_pit_lord_argalothAI(Creature* creature) : BossAI(creature, DATA_ARGALOTH) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_METEOR_SLASH, urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS)); events.ScheduleEvent(EVENT_CONSUMING_DARKNESS, urand(20 * IN_MILLISECONDS, 25 * IN_MILLISECONDS)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp index b62e56a033f..4baea306d59 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp @@ -152,7 +152,7 @@ public: npc_twilight_flame_caller() : CreatureScript("npc_twilight_flame_caller" _summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.Reset(); _combatPhase = true; @@ -261,7 +261,7 @@ class npc_twilight_torturer : public CreatureScript _events.ScheduleEvent(EVENT_INFLICT_PAIN_TT, urand(6000, 18000)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.Reset(); _combatPhase = true; @@ -361,7 +361,7 @@ class npc_twilight_sadist : public CreatureScript _events.ScheduleEvent(EVENT_INFLICT_PAIN_TS, urand(6000, 18000)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.Reset(); _combatPhase = true; @@ -455,7 +455,7 @@ class npc_mad_prisoner : public CreatureScript void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.Reset(); _events.ScheduleEvent(EVENT_HEAD_CRACK, 9000); @@ -525,7 +525,7 @@ class npc_crazed_mage : public CreatureScript void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.Reset(); _events.ScheduleEvent(EVENT_HEAD_CRACK2, 9000); @@ -604,7 +604,7 @@ class npc_raz_the_crazed : public CreatureScript void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.Reset(); _events.ScheduleEvent(SPELL_FURIOUS_SWIPE, 500); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp index df5de6bee6b..14121c54936 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp @@ -56,9 +56,9 @@ class boss_ascendant_lord_obsidius : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_MANA_TAP, 30000); Talk(YELL_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp index 9952ade7d7b..bd4771481e7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp @@ -57,9 +57,9 @@ class boss_beauty : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_MAGMA_SPIT, urand(7000, 10000)); events.ScheduleEvent(EVENT_BERSERKER_CHARGE, urand(16000, 19000)); events.ScheduleEvent(EVENT_FLAMEBREAK, urand(18000, 22000)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp index 5b480f337d8..a6c48f60110 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp @@ -61,9 +61,9 @@ class boss_corla : public CreatureScript events.ScheduleEvent(EVENT_DRAIN_ESSENSE, 2000); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(YELL_AGGRO); events.Reset(); combatPhase = true; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp index 172d1c3b9e1..d2efa182d7e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp @@ -56,9 +56,9 @@ class boss_karsh_steelbender : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(YELL_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, 10000); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp index 2299045d5ac..0fc3414379d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp @@ -75,9 +75,9 @@ class boss_romogg_bonecrusher : public CreatureScript Talk(YELL_KILL); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CHAINS_OF_WOE, urand(22000, 32000)); events.ScheduleEvent(EVENT_WOUNDING_STRIKE, urand(26000, 32000)); events.ScheduleEvent(EVENT_QUAKE, 45000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp index de92d16041a..48d4f69faa5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -44,7 +44,7 @@ class boss_ambassador_flamelash : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_FIREBLAST, 2000); _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 24000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp index d01fb7f55d5..17e6a3d7f90 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -301,7 +301,7 @@ struct npc_coren_direbrew_sisters : public ScriptedAI return ObjectGuid::Empty; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCastSelf(SPELL_PORT_TO_COREN); @@ -380,10 +380,10 @@ struct npc_direbrew_antagonist : public ScriptedAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_ANTAGONIST_COMBAT, who); - ScriptedAI::EnterCombat(who); + ScriptedAI::JustEngagedWith(who); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 5017f5e48bd..9685abdc679 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -56,7 +56,7 @@ class boss_emperor_dagran_thaurissan : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); me->CallForHelp(VISIBLE_RANGE); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp index f9a30d7210c..f2276c2988b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp @@ -55,7 +55,7 @@ class boss_general_angerforge : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.SetPhase(PHASE_ONE); _events.ScheduleEvent(EVENT_MIGHTYBLOW, 8000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index c14d56ba7bf..94639568b2d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -49,7 +49,7 @@ class boss_high_interrogator_gerstahn : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 4000); _events.ScheduleEvent(EVENT_MANABURN, 14000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp index 295f94e71fd..a2a5a5c6402 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp @@ -52,7 +52,7 @@ class boss_magmus : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.SetPhase(PHASE_ONE); _events.ScheduleEvent(EVENT_FIERY_BURST, 5000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp index 4b2bee3fc16..84bdbbfe133 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -51,7 +51,7 @@ class boss_moira_bronzebeard : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { //_events.ScheduleEvent(EVENT_HEAL, 12000); // not used atm // These times are probably wrong _events.ScheduleEvent(EVENT_MINDBLAST, 16000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp index d71529b1ccb..ead33670227 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp @@ -160,7 +160,7 @@ class boss_doomrel : public CreatureScript me->SetNpcFlags(UNIT_NPC_FLAG_GOSSIP); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 10000); _events.ScheduleEvent(EVENT_IMMOLATE, 18000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp index 8b5e4ad3d29..b93443ea5f6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp @@ -49,9 +49,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FIRE_NOVA, 6000); events.ScheduleEvent(EVENT_CLEAVE, 8000); events.ScheduleEvent(EVENT_CONFLIGURATION, 15000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp index b032426d2b7..2b0f27d921e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp @@ -59,9 +59,9 @@ public: me->GetMotionMaster()->MovePath(GIZRUL_PATH, false); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FATAL_BITE, urand(17000,20000)); events.ScheduleEvent(EVENT_INFECTED_BITE, urand(10000,12000)); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp index 19df946aaff..0976562d7d9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp @@ -78,9 +78,9 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(8000, 16000)); events.ScheduleEvent(EVENT_FREEZE, urand(8000, 16000)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp index 5bfeb67af53..c87b3483ebf 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp @@ -61,9 +61,9 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_REND, urand(17000,20000)); events.ScheduleEvent(EVENT_THRASH, urand(10000,12000)); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp index 4d35f845073..5abe284b26b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp @@ -50,9 +50,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FRENZY, 20000); events.ScheduleEvent(EVENT_KNOCK_AWAY, 18000); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp index b5f49c4f79d..14bda7f2b46 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp @@ -64,9 +64,9 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(6000,8000)); events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(9000,18000)); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp index 1b9ed52b451..63e2380ca89 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp @@ -51,9 +51,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CRYSTALIZE, 20 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_MOTHERS_MILK, 10 * IN_MILLISECONDS); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp index e53a6827190..deea8c52504 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -75,9 +75,9 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_SHOUT, 2 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_CLEAVE, 6 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp index 9b82c3292b0..bb011209dcb 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -123,7 +123,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { // ### TODO Check combat timing ### events.ScheduleEvent(EVENT_FIRENOVA, 6000); @@ -368,7 +368,7 @@ public: _events.ScheduleEvent(EVENT_ENCAGED_EMBERSEER, 1000); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { // Used to close doors if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true)) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp index 67ceaddcd99..41052b22630 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -47,9 +47,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SHOOT, 1000); events.ScheduleEvent(EVENT_STUN_BOMB, 16000); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp index 10a7c828e5b..10c1ad57f60 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -181,9 +181,9 @@ public: portcullisGUID.Clear(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_WHIRLWIND, urand(13000, 15000)); events.ScheduleEvent(EVENT_CLEAVE, urand(15000, 17000)); events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(17000, 19000)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index 0401375a166..ef1405c5c6f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -53,9 +53,9 @@ public: //DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_HEX, 8 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp index 902c640581a..56aad15784b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -52,9 +52,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FLAME_BREAK, 12 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_IMMOLATE, 3 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp index b5d56085fe8..9978cc82226 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp @@ -53,9 +53,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_REND, urand(17000,20000)); events.ScheduleEvent(SPELL_STRIKE, urand(10000,12000)); Talk(SAY_AGGRO); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp index 17431a1b6ee..bbd5cd2747f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp @@ -53,9 +53,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SNAP_KICK, 8 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_UPPERCUT, 20 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp index 9acbe8e6797..68d749fe67d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -51,9 +51,9 @@ public: { boss_broodlordAI(Creature* creature) : BossAI(creature, DATA_BROODLORD_LASHLAYER) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, 8000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp index 97a91c81fe3..716bce7fb2a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp @@ -191,9 +191,9 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SHIMMER, 0); events.ScheduleEvent(EVENT_BREATH_1, 30000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp index c147fd85548..ac11cfa43a8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp @@ -42,9 +42,9 @@ public: { boss_ebonrocAI(Creature* creature) : BossAI(creature, DATA_EBONROC) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000)); events.ScheduleEvent(EVENT_WINGBUFFET, 30000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp index e082f114c10..b99fd5a34e5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp @@ -42,9 +42,9 @@ public: { boss_firemawAI(Creature* creature) : BossAI(creature, DATA_FIREMAW) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000)); events.ScheduleEvent(EVENT_WINGBUFFET, 30000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp index ab465de3805..ad169213d58 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp @@ -47,9 +47,9 @@ public: { boss_flamegorAI(Creature* creature) : BossAI(creature, DATA_FLAMEGOR) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000)); events.ScheduleEvent(EVENT_WINGBUFFET, 30000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index c42d7cdd4b4..e1e4d26c00f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -203,7 +203,7 @@ public: void BeginEvent(Player* target) { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_GAMESBEGIN_2); @@ -423,7 +423,7 @@ public: canDespawn = true; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SHADOWFLAME, 12000); events.ScheduleEvent(EVENT_FEAR, urand(25000, 35000)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index e5b49dd8910..1ed7712b119 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -93,9 +93,9 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); DoCast(me, SPELL_ESSENCEOFTHERED); me->SetHealth(me->CountPctFromMaxHealth(30)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp index 108fdeb605b..a3ceef97f9e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -60,9 +60,9 @@ class boss_baron_geddon : public CreatureScript { } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* victim) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(victim); events.ScheduleEvent(EVENT_INFERNO, 45000); events.ScheduleEvent(EVENT_IGNITE_MANA, 30000); events.ScheduleEvent(EVENT_LIVING_BOMB, 35000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp index c54b27489bd..dc3a637b230 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp @@ -56,9 +56,9 @@ class boss_garr : public CreatureScript { } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* victim) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(victim); events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 25000); events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 15000); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp index 00aa6d38079..bf64ea54d84 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp @@ -52,9 +52,9 @@ class boss_gehennas : public CreatureScript { } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* victim) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(victim); events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 12000); events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 10000); events.ScheduleEvent(EVENT_SHADOW_BOLT, 6000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp index aeaa706c174..582a927901c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp @@ -69,9 +69,9 @@ class boss_golemagg : public CreatureScript DoCast(me, SPELL_MAGMASPLASH, true); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* victim) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(victim); events.ScheduleEvent(EVENT_PYROBLAST, 7000); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp index fe297f576e6..db31277bb5e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp @@ -52,9 +52,9 @@ class boss_lucifron : public CreatureScript { } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* victim) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(victim); events.ScheduleEvent(EVENT_IMPENDING_DOOM, 10000); events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 20000); events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp index 62108a9d1cf..3c975d3d005 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp @@ -63,9 +63,9 @@ class boss_magmadar : public CreatureScript DoCast(me, SPELL_MAGMA_SPIT, true); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* victim) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(victim); events.ScheduleEvent(EVENT_FRENZY, 30000); events.ScheduleEvent(EVENT_PANIC, 20000); events.ScheduleEvent(EVENT_LAVA_BOMB, 12000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp index 72eb8f43cb9..4adb6a92a9d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -87,9 +87,9 @@ class boss_majordomo : public CreatureScript Talk(SAY_SLAY); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30000); events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 15000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp index 9dd5625e973..d2bd0d01504 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp @@ -106,9 +106,9 @@ class boss_ragnaros : public CreatureScript me->SetEmoteState(EMOTE_ONESHOT_NONE); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* victim) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(victim); events.ScheduleEvent(EVENT_ERUPTION, 15000); events.ScheduleEvent(EVENT_WRATH_OF_RAGNAROS, 30000); events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 25000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index 7d7a4e3ce0c..fa51ae8c304 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -49,9 +49,9 @@ class boss_shazzrah : public CreatureScript { boss_shazzrahAI(Creature* creature) : BossAI(creature, BOSS_SHAZZRAH) { } - void EnterCombat(Unit* target) override + void JustEngagedWith(Unit* target) override { - BossAI::EnterCombat(target); + BossAI::JustEngagedWith(target); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6000); events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 10000); events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 24000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp index aacf257226c..3052c5dbe05 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp @@ -66,9 +66,9 @@ class boss_sulfuron : public CreatureScript { } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* victim) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(victim); events.ScheduleEvent(EVENT_DARK_STRIKE, 10000); events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 15000); events.ScheduleEvent(EVENT_INSPIRE, 13000); @@ -156,9 +156,9 @@ class npc_flamewaker_priest : public CreatureScript events.Reset(); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* victim) override { - ScriptedAI::EnterCombat(victim); + ScriptedAI::JustEngagedWith(victim); events.ScheduleEvent(EVENT_HEAL, urand(15000, 30000)); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2000); events.ScheduleEvent(EVENT_IMMOLATE, 8000); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 5c62115ffdd..0507c594dfc 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -90,7 +90,7 @@ public: SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 0edd267c695..4882d53abae 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -77,9 +77,9 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_HATEFUL_BOLT, Seconds(12)); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index ffb9576e9d9..822835f5883 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -65,9 +65,9 @@ public: _JustDied(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); DoCastSelf(SPELL_HOLYGROUND, true); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index c967a4804d6..cd8444f9159 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -337,9 +337,9 @@ public: BossAI::JustSummoned(summon); } - 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) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 539266ffa18..17352d9b261 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -155,7 +155,7 @@ public: DoZoneInCombat(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { StartEvent(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 7b8b3505c52..23458db8a55 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -263,7 +263,7 @@ public: Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { HandleDoors(false); SwitchToPortalPhase(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 2ba6ba50317..ea9bf01997a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -180,9 +180,9 @@ public: instance->HandleGameObject(instance->GetGuidData(DATA_MASTERS_TERRACE_DOOR_2), open); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(YELL_AGGRO); SetupGroundPhase(); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 5419d8c4c16..0aad78d8cbb 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -121,7 +121,7 @@ public: InfernalPoint *point; void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -271,7 +271,7 @@ public: instance->HandleGameObject(instance->GetGuidData(DATA_GO_NETHER_DOOR), true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index ce4bfdce6dd..cbdc82d355e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -193,7 +193,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: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index 3150111e30b..ba565183dc9 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -86,9 +86,9 @@ public: events.ScheduleEvent(EVENT_ENRAGE, Minutes(10)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 1f5d49a3c6d..04e7e60d7c5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -161,7 +161,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_DOROTHEE_AGGRO); } @@ -266,7 +266,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* /*killer*/) override { @@ -362,7 +362,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_STRAWMAN_AGGRO); } @@ -469,7 +469,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_TINHEAD_AGGRO); } @@ -599,7 +599,7 @@ public: ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_ROAR_AGGRO); } @@ -709,7 +709,7 @@ public: Talk(SAY_CRONE_SLAY); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_CRONE_AGGRO); } @@ -772,7 +772,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override @@ -888,7 +888,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_WOLF_AGGRO); } @@ -1112,7 +1112,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* who) override { @@ -1277,7 +1277,7 @@ public: TC_LOG_ERROR("scripts", "boss_romuloAI: DamageTaken reach end of code, that should not happen."); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_ROMULO_AGGRO); if (!JulianneGUID.IsEmpty()) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 3c7e07505db..66efdc34ede 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -181,7 +181,7 @@ public: Start(false, false); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override { @@ -476,7 +476,7 @@ public: me->DespawnOrUnsummon(); } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MovementInform(uint32 type, uint32 id) override { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 4f7e025c984..0338a3ad73f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -176,7 +176,7 @@ public: RemoveGravityLapse(); // Remove Gravity Lapse so that players fall to ground if they kill him when in air. } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SetBossState(DATA_KAELTHAS, IN_PROGRESS); } @@ -464,7 +464,7 @@ public: DoCast(me, SPELL_FLAMESTRIKE2, true); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override @@ -518,7 +518,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit* /*killer*/, uint32 &damage) override { @@ -624,7 +624,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -667,7 +667,7 @@ public: DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index e6cac2e0132..e50740d8dac 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -163,7 +163,7 @@ public: instance->SetBossState(DATA_DELRISSA, FAIL); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); @@ -385,7 +385,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!who) return; @@ -621,7 +621,7 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_SUMMON_IMP); } @@ -929,7 +929,7 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_BATTLE_SHOUT); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 2ec9cc5c7d5..bf1be4eee1f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -131,10 +131,10 @@ class boss_selin_fireheart : public CreatureScript crystal->KillSelf(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100, 0, PHASE_NORMAL); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index b9bdcced9e6..4e776b83208 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -88,10 +88,10 @@ class boss_vexallus : public CreatureScript _JustDied(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000); events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5000); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 2b3bb2e066b..8e8165c5e66 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -135,7 +135,7 @@ public: me->LoadEquipment(0, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST); events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST); @@ -852,7 +852,7 @@ public: { npc_ros_dark_riderAI(Creature* creature) : ScriptedAI(creature) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->ExitVehicle(); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 86fc1dc0c90..aa2cf832825 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -408,7 +408,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_TREE2); me->Dismount(); @@ -509,7 +509,7 @@ public: Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_VALROTH_AGGRO); DoCast(who, SPELL_VALROTH_SMITE); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 265b475a004..0acec8c59d0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -60,9 +60,9 @@ class boss_arcanist_doan : public CreatureScript _healthAbove50Pct = true; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SILENCE, 15 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index f1fca196ee7..c63e2634a5e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -51,9 +51,9 @@ class boss_azshir_the_sleepless : public CreatureScript _siphon = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30000); events.ScheduleEvent(EVENT_TERRIFY, 20000); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index 1b637aa028d..275eac7d76c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -60,10 +60,10 @@ class boss_bloodmage_thalnos : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FLAME_SHOCK, 10000); events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000); events.ScheduleEvent(EVENT_FLAME_SPIKE, 8000); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 6daedfb4a29..513d3b0f0fd 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -161,7 +161,7 @@ public: uint32 _spell; uint32 _spell2; void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SetType(uint32 _type) { switch (Creaturetype = _type) @@ -259,7 +259,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SaySound(uint8 textEntry, Unit* target = nullptr) { @@ -503,7 +503,7 @@ public: ++id; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SetBossState(DATA_HORSEMAN_EVENT, IN_PROGRESS); DoZoneInCombat(); @@ -814,7 +814,7 @@ public: me->AddUnitFlag(UNIT_FLAG_STUNNED); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 75c6ad43263..a040599c340 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -76,11 +76,11 @@ class boss_herod : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); DoCast(me, SPELL_RUSHINGCHARGE); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CLEAVE, 12000); events.ScheduleEvent(EVENT_WHIRLWIND, 60000); @@ -158,7 +158,7 @@ public: uint32 Start_Timer; void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 7c5855b4b10..0127314da4b 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -82,7 +82,7 @@ public: instance->SetBossState(DATA_HIGH_INQUISITOR_FAIRBANKS, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetStandState(UNIT_STAND_STATE_STAND); instance->SetBossState(DATA_HIGH_INQUISITOR_FAIRBANKS, IN_PROGRESS); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 224bc488b03..cff1995b7f0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -49,10 +49,10 @@ class boss_houndmaster_loksey : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_BLOODLUST, 20000); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index 4714bcb999e..1b378992720 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -63,10 +63,10 @@ class boss_interrogator_vishas : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5000); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index 6d976481eca..935b5b21515 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -115,7 +115,7 @@ public: instance->SetBossState(DATA_MOGRAINE_AND_WHITE_EVENT, FAIL); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_MO_AGGRO); DoCast(me, SPELL_RETRIBUTIONAURA); @@ -277,7 +277,7 @@ public: ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_WH_INTRO); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index 25c40f225c7..c81336334e2 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -49,9 +49,9 @@ class boss_scorn : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_LICH_SLAP, 45000); events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30000); events.ScheduleEvent(EVENT_MIND_FLAY, 30000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 77539afa7be..3ef5498e7a7 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -76,9 +76,9 @@ class boss_darkmaster_gandling : public CreatureScript gate->SetGoState(GO_STATE_ACTIVE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_ARCANEMISSILES, 4500); events.ScheduleEvent(EVENT_SHADOWSHIELD, 12000); events.ScheduleEvent(EVENT_CURSE, 2000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp index f20c8bdc227..0b373d807c9 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp @@ -50,7 +50,7 @@ public: DoCast(me, 23261, true); //Summon Darkreaver's Fallen Charger } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } }; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index 2f053417900..976e4310d8e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -53,9 +53,9 @@ class boss_doctor_theolen_krastinov : public CreatureScript { boss_theolenkrastinovAI(Creature* creature) : BossAI(creature, DATA_DOCTORTHEOLENKRASTINOV) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_REND, 8000); events.ScheduleEvent(EVENT_BACKHAND, 9000); events.ScheduleEvent(EVENT_FRENZY, 1000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 99c81366ef5..7eede7d160d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -51,9 +51,9 @@ class boss_illucia_barov : public CreatureScript { boss_illuciabarovAI(Creature* creature) : BossAI(creature, DATA_LADYILLUCIABAROV) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CURSEOFAGONY, 18000); events.ScheduleEvent(EVENT_SHADOWSHOCK, 9000); events.ScheduleEvent(EVENT_SILENCE, 5000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 55c5c442a71..174eefbf229 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -70,9 +70,9 @@ class boss_instructor_malicia : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CALLOFGRAVES, 4000); events.ScheduleEvent(EVENT_CORRUPTION, 8000); events.ScheduleEvent(EVENT_RENEW, 32000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index a50e2a19bb2..46db3be344b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -58,7 +58,7 @@ public: Summons.Summon(summoned); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 15000); events.ScheduleEvent(EVENT_ILLUSION, 30000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index f8678b1e6ae..0c4d5fa0ba2 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -87,7 +87,7 @@ class boss_kirtonos_the_herald : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SWOOP, urand(8000, 8000)); events.ScheduleEvent(EVENT_WING_FLAP, urand(15000, 15000)); @@ -97,7 +97,7 @@ class boss_kirtonos_the_herald : public CreatureScript events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, urand(53000, 53000)); events.ScheduleEvent(EVENT_DOMINATE_MIND, urand(34000, 48000)); events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, urand(20000, 20000)); - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index 1e6e803a6d0..ae5c0704b87 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -65,7 +65,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10000); events.ScheduleEvent(EVENT_BONE_SHIELD, 2000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index b54c8b40ad6..34962ef0c8e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -55,9 +55,9 @@ class boss_lord_alexei_barov : public CreatureScript DoCast(me, SPELL_UNHOLY_AURA); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_IMMOLATE, 7000); events.ScheduleEvent(EVENT_VEILOFSHADOW, 15000); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index 67df81f9928..109cc2d095f 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -50,9 +50,9 @@ class boss_lorekeeper_polkelt : public CreatureScript { boss_lorekeeperpolkeltAI(Creature* creature) : BossAI(creature, DATA_LOREKEEPERPOLKELT) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_VOLATILEINFECTION, 38000); events.ScheduleEvent(EVENT_DARKPLAGUE, 8000); events.ScheduleEvent(EVENT_CORROSIVEACID, 45000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index d4be3a1c44e..e23f705d0c0 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -54,7 +54,7 @@ public: DoCast(me, SPELL_ICE_ARMOR); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ICE_ARMOR, 2000); events.ScheduleEvent(EVENT_FROSTBOLT, 8000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 2ef20dfa915..da107feafc2 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -50,9 +50,9 @@ class boss_the_ravenian : public CreatureScript { boss_theravenianAI(Creature* creature) : BossAI(creature, DATA_THERAVENIAN) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_TRAMPLE, 24000); events.ScheduleEvent(EVENT_CLEAVE, 15000); events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 40000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index 9853500e5ee..70dc8888bbd 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -53,7 +53,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_FIRE_SHIELD, 2000); events.ScheduleEvent(EVENT_BLAST_WAVE, 14000); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index a69238119d4..dab93fff2a1 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -111,7 +111,7 @@ public: } void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { @@ -252,9 +252,9 @@ class boss_archmage_arugal : public CreatureScript Talk(SAY_TRANSFORM); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CURSE, Seconds(7)); events.ScheduleEvent(EVENT_TELEPORT, Seconds(15)); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index d5545ef82b3..797f64224d5 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -73,7 +73,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 45e28298a4e..329d1d9effa 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -126,7 +126,7 @@ public: me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 77ff89a0d66..540fd77a378 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -127,7 +127,7 @@ public: TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILLISECONDS); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index 237580e850d..f67c3691e25 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -95,7 +95,7 @@ public: me->SetDisplayId(MODEL_HUMAN); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index a4fcd1e0e97..d10eea337fe 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -60,7 +60,7 @@ public: _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_FROSTBOLT, 1 * IN_MILLISECONDS); _events.ScheduleEvent(EVENT_ICETOMB, 16 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index 36ffd22c2c6..7ee7b72229e 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -73,7 +73,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp index af92539c88c..8e7c71cc83c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp @@ -104,7 +104,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index cb2e8ad6305..6612432a076 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -63,7 +63,7 @@ class boss_postmaster_malown : public CreatureScript void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_WAILINGDEAD, 19000); // lasts 6 sec events.ScheduleEvent(EVENT_BACKHAND, 8000); // 2 sec stun diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 68b3c4701cc..a12d1bb7ee7 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -73,7 +73,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index 6dea3ad7941..79128416922 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -67,7 +67,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (!HasYelled) { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 357f66644cc..ac11c7eea34 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -143,7 +143,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* caster, SpellInfo const* spell) override { @@ -234,7 +234,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 9821ed2edae..d21be4f569f 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -115,7 +115,7 @@ public: instance->SetBossState(DATA_BRUTALLUS, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(YELL_AGGRO); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index e733c6810c2..21824b23ced 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -131,7 +131,7 @@ public: instance->SetBossState(DATA_EREDAR_TWINS, NOT_STARTED); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { DoZoneInCombat(); @@ -383,7 +383,7 @@ public: instance->SetBossState(DATA_EREDAR_TWINS, NOT_STARTED); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { DoZoneInCombat(); @@ -672,7 +672,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHitTarget(Unit* target, SpellInfo const* spell) override { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index fb11d19b833..2336a3d4177 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -156,7 +156,7 @@ public: instance->SetBossState(DATA_FELMYST, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_BERSERK, 600000); @@ -529,7 +529,7 @@ public: } void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); //DoCast(me, SPELL_VAPOR_FORCE, true); core bug @@ -565,7 +565,7 @@ public: } void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 837863205d2..da24c72d8dd 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -207,11 +207,11 @@ struct boss_kalecgos : public BossAI damage = 0; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_EVIL_AGGRO); - _EnterCombat(); + _JustEngagedWith(); if (Creature* kalecgosHuman = me->SummonCreature(NPC_KALECGOS_HUMAN, KalecgosSummonPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) if (Creature* sathrovar = instance->GetCreature(DATA_SATHROVARR)) @@ -460,9 +460,9 @@ struct boss_sathrovarr : public BossAI events.ScheduleEvent(EVENT_CHECK_TIMER, Seconds(1)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_SATH_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 684b094e06b..ff95eb0736c 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -649,7 +649,7 @@ public: ENSURE_AI(npc_kiljaeden_controller::npc_kiljaeden_controllerAI, pControl->AI())->Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -952,7 +952,7 @@ public: summoned->SetLevel(me->getLevel()); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { instance->SetBossState(DATA_KILJAEDEN, IN_PROGRESS); if (Creature* pControl = instance->GetCreature(DATA_KILJAEDEN_CONTROLLER)) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index f07684174c8..7a9fe642f73 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -276,9 +276,9 @@ public: }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); DoCast(me, SPELL_OPEN_PORTAL_PERIODIC, true); DoCast(me, SPELL_DARKNESS_PERIODIC, true); DoCast(me, SPELL_NEGATIVE_ENERGY_PERIODIC, true); @@ -472,7 +472,7 @@ public: muru->AI()->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_SHADOW_PULSE_PERIODIC, true); diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp index e739e50323b..4d822a1eb0d 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp @@ -67,9 +67,9 @@ struct boss_hogger : public BossAI _hasEnraged = false; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_PULL); diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp index 19bd7819bb7..f806c091d54 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp @@ -44,9 +44,9 @@ struct boss_lord_overheat : public BossAI { boss_lord_overheat(Creature* creature) : BossAI(creature, DATA_LORD_OVERHEAT) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_PULL); diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp index 4083febc219..901a1522223 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp @@ -68,9 +68,9 @@ struct boss_randolph_moloch : public BossAI _firstVanish = false; _secondVanish = false; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_PULL); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 8a2496b55da..8ab7cfd3a80 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -121,7 +121,7 @@ class boss_archaedas : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetFaction(FACTION_MONSTER); me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); @@ -270,7 +270,7 @@ class npc_archaedas_minions : public CreatureScript me->AddAura(SPELL_MINION_FREEZE_ANIM, me); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetFaction(FACTION_MONSTER); me->RemoveAllAuras(); @@ -359,7 +359,7 @@ class npc_stonekeepers : public CreatureScript me->AddAura(SPELL_MINION_FREEZE_ANIM, me); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetFaction(FACTION_FRIENDLY); me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp index 61344d2c2ef..13a23d59238 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp @@ -65,7 +65,7 @@ class boss_ironaya : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 uiDiff) override { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index b8539f686bf..900155c70e3 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -73,7 +73,7 @@ class npc_jadespine_basilisk : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 2bd86ba4393..be5e20b556a 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -44,10 +44,10 @@ class boss_akilzon : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp index cfe837fdc9a..3ce5945cacb 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp @@ -59,10 +59,10 @@ class boss_daakara : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 68480b836bc..4656ea355fc 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -52,10 +52,10 @@ class boss_halazzi : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 117043615bb..666afd87100 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -56,10 +56,10 @@ class boss_hexlord_malacrass : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 77c81ed5b2e..463ce4d472a 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -53,10 +53,10 @@ class boss_janalai : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 01e1e5cbf92..7efc791afee 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -58,10 +58,10 @@ class boss_nalorakk : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 0d5f23301ff..55e42b63cd5 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -47,7 +47,7 @@ class boss_grilek : public CreatureScript { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index 3d2aa5a098b..52580b16cf7 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -47,7 +47,7 @@ class boss_hazzarah : public CreatureScript { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp index e135634dc61..9f18cc61430 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp @@ -62,9 +62,9 @@ class boss_jindo_the_godbreaker : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp index 433055ce7d0..4a78dc99180 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp @@ -53,9 +53,9 @@ class boss_kilnara : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 67b1d379158..5c63f224ff7 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -130,9 +130,9 @@ class boss_mandokir : public CreatureScript _reviveGUID.Clear(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); DoCastAOE(SPELL_BLOODLORD_AURA); @@ -313,7 +313,7 @@ class npc_ohgan : public CreatureScript _instance = me->GetInstanceScript(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCastAOE(SPELL_OHGAN_ORDERS, true); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index 1ff9131f6b3..edc02e8d66f 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -47,7 +47,7 @@ class boss_renataki : public CreatureScript { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 45d90c680de..bbc30e74f75 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -55,9 +55,9 @@ class boss_venoxis : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index bf030d4a001..0e363f39efa 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -47,7 +47,7 @@ class boss_wushoolay : public CreatureScript { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp index aa30b0017e4..8bb3850beb2 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp @@ -55,9 +55,9 @@ class boss_zanzil : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp index 08967a5fd32..66b80f22b4d 100644 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp @@ -101,7 +101,7 @@ class npc_professor_phizzlethorpe : public CreatureScript summoned->AI()->AttackStart(me); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 818418e65d9..19addf594b6 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -71,7 +71,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(YELL_TWILIGHT_CORRUPTOR_AGGRO); _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, 15000); diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index 7c7c2c742c2..b04cd61752a 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -58,7 +58,7 @@ public: void Reset() override { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (who->GetEntry() == NPC_MARAUDING_OWL || who->GetEntry() == NPC_VILE_AMBUSHER) return; diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index 429e38b79d9..9cc5a1e0511 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -107,7 +107,7 @@ public: void Reset() override { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO, who); } diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 3d025a6935f..ba00500a290 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -121,7 +121,7 @@ public: _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoPlaySoundToSet(me, SOUND_AGGRO); _events.ScheduleEvent(EVENT_FADE, 30000); @@ -294,7 +294,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 0afb0db67c9..7ab80813107 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -53,7 +53,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DoDie() { diff --git a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp index e7b70226d6e..3720813dc3c 100644 --- a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp @@ -88,7 +88,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (HasEscortState(STATE_ESCORT_ESCORTING) && !IsFriendSummoned && GetPlayerForEscort()) { diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index 2b7331560f9..83ca2730a1d 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -54,9 +54,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000)); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index a42fb33dbfc..c262c6e5cc7 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -38,9 +38,9 @@ public: { boss_gelihastAI(Creature* creature) : BossAI(creature, DATA_GELIHAST) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_THROW_NET, urand(2000, 4000)); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index cad8278621d..c1ac2ec1016 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -47,9 +47,9 @@ public: { boss_kelrisAI(Creature* creature) : BossAI(creature, DATA_KELRIS) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MIND_BLAST, urand(2000, 5000)); events.ScheduleEvent(EVENT_SLEEP, urand(9000, 12000)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 3843e0f8bfd..da40c8b471d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -85,7 +85,7 @@ public: instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); @@ -212,7 +212,7 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 76ceb2ff034..6e5bccf0b22 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -130,7 +130,7 @@ public: me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { @@ -174,7 +174,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { @@ -224,7 +224,7 @@ public: TargetGUID = who->GetGUID(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { @@ -298,10 +298,10 @@ public: me->RemoveAllAuras(); // Reset Soul Charge auras. } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FEAR, 42000); events.ScheduleEvent(EVENT_AIR_BURST, 30000); events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, urand(5000, 25000)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 3e7aa8ca3bf..08a11b95449 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -89,7 +89,7 @@ public: instance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); @@ -217,7 +217,7 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 1e85927b478..a23f8707dba 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -85,7 +85,7 @@ public: instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 16acd943c7f..7965934e3d8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -80,7 +80,7 @@ public: instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 82937c6b6af..dcbe6a501f6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -431,7 +431,7 @@ void hyjalAI::EnterEvadeMode(EvadeReason /*why*/) me->SetLootRecipient(nullptr); } -void hyjalAI::EnterCombat(Unit* /*who*/) +void hyjalAI::JustEngagedWith(Unit* /*who*/) { if (IsDummy)return; for (uint8 i = 0; i < HYJAL_AI_MAX_SPELLS; ++i) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index af7643f0c97..331c04b6066 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -124,7 +124,7 @@ struct hyjalAI : public EscortAI void EnterEvadeMode(EvadeReason /*why*/ = EVADE_REASON_OTHER) override; // Send creature back to spawn location and evade. - void EnterCombat(Unit* /*who*/) override; // Used to reset cooldowns for our spells and to inform the raid that we're under attack + void JustEngagedWith(Unit* /*who*/) override; // Used to reset cooldowns for our spells and to inform the raid that we're under attack void UpdateAI(uint32 diff) override; // Called to summon waves, check for boss deaths and to cast our spells. diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 4139b6d64ac..2b2979b9976 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -441,7 +441,7 @@ public: imol = false; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override { @@ -584,7 +584,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -683,7 +683,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -803,7 +803,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -898,7 +898,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -994,7 +994,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -1080,7 +1080,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -1180,7 +1180,7 @@ public: me->UpdatePosition(x, y, z, 0); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -1436,7 +1436,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp index b67a31b6dcd..2032697dd57 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp @@ -61,10 +61,10 @@ class boss_epoch : public CreatureScript { boss_epochAI(Creature* creature) : BossAI(creature, DATA_EPOCH) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300); events.ScheduleEvent(EVENT_TIME_WARP, 25300); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp index 22d6e64df6c..b76d8ac469a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp @@ -60,10 +60,10 @@ class boss_infinite_corruptor : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 7000); events.ScheduleEvent(EVENT_VOID_STRIKE, 5000); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index ef7d158f2d7..f6a95960beb 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -112,7 +112,7 @@ public: instance->SetBossState(DATA_MAL_GANIS, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetBossState(DATA_MAL_GANIS, IN_PROGRESS); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 3983a4a2b7f..3da5f22cde9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -53,10 +53,10 @@ class boss_meathook : public CreatureScript Talk(SAY_SPAWN); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CHAIN, urand(12000, 17000)); events.ScheduleEvent(EVENT_DISEASE, urand(2000, 4000)); events.ScheduleEvent(EVENT_FRENZY, urand(21000, 26000)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index 8dd051557d7..117e5d92b0f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -60,10 +60,10 @@ class boss_salramm : public CreatureScript Talk(SAY_SPAWN); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CURSE_FLESH, 30000); events.ScheduleEvent(EVENT_SUMMON_GHOULS, urand(19000, 24000)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 8a1cbac5fae..9f103bdb5c2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -339,7 +339,7 @@ public: EscortAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_ARTHAS_AURA); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 63c98f67a6b..f52f408aa88 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -89,7 +89,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { //This is not correct. Should taunt Thrall before engage in combat Talk(SAY_TAUNT1); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 2c689f99167..105888eea31 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -83,7 +83,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index e35f6b85741..ebe00e929d8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -144,7 +144,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 421de855691..aa915223ee2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -410,7 +410,7 @@ public: me->Dismount(); me->SetSpeedRate(MOVE_RUN, SPEED_RUN); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_TH_RANDOM_AGGRO); if (me->IsMounted()) @@ -586,7 +586,7 @@ public: } void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index e28cbae2aca..c9fb3b273d9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -61,7 +61,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 30000)); events.ScheduleEvent(EVENT_TIMESTOP, urand(10000, 15000)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index 4cfd910f063..2e2a6f321b4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -62,7 +62,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(18000, 23000)); events.ScheduleEvent(EVENT_TIME_LAPSE, urand(10000, 15000)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index 18d41d52417..9463a72ef51 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -61,7 +61,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_HASTE, urand(15000, 23000)); events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 1ba5ce96763..6d24a967556 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -140,7 +140,7 @@ public: //ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { @@ -290,7 +290,7 @@ public: else mWaveId = 1; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DoSummonAtRift(uint32 creature_entry) { diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index 5d18fd3ead0..6c7f00f9b32 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -179,7 +179,7 @@ class npc_harbinger_of_flame : public CreatureScript { } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { for (ObjectGuid const& birdGuid : me->m_unitData->ChannelObjects) if (Creature* bird = ObjectAccessor::GetCreature(*me, birdGuid)) @@ -280,7 +280,7 @@ class npc_blazing_monstrosity : public CreatureScript AlysrazorTrashEvaded(me); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { DoZoneInCombat(); me->RemoveAurasDueToSpell(SPELL_SLEEP_ULTRA_HIGH_PRIORITY); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index 20b4e5160bc..7699375c69a 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -117,9 +117,9 @@ struct boss_baleroc : public firelands_bossAI EquipWeapon(EQUIP_DEFAULT); } - void EnterCombat(Unit* target) override + void JustEngagedWith(Unit* target) override { - firelands_bossAI::EnterCombat(target); + firelands_bossAI::JustEngagedWith(target); Talk(SAY_AGGRO); PreparePhase(PHASE_ONE); diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.cpp b/src/server/scripts/Kalimdor/Firelands/firelands.cpp index 1c91dd28dda..572e9a02f9f 100644 --- a/src/server/scripts/Kalimdor/Firelands/firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/firelands.cpp @@ -53,9 +53,9 @@ bool DelayedSpellCastEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/) return true; } -void firelands_bossAI::EnterCombat(Unit* target) +void firelands_bossAI::JustEngagedWith(Unit* target) { - BossAI::EnterCombat(target); + BossAI::JustEngagedWith(target); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); } @@ -111,7 +111,7 @@ struct npc_firelands_flame_archon : public ScriptedAI }); } - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { scheduler.Schedule(Seconds(10), Seconds(12), [this](TaskContext context) { @@ -178,7 +178,7 @@ struct npc_firelands_molten_flamefather : public ScriptedAI summon->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { scheduler.Schedule(Seconds(5), [this](TaskContext context) { diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.h b/src/server/scripts/Kalimdor/Firelands/firelands.h index 3920530ef32..321393ce8ef 100644 --- a/src/server/scripts/Kalimdor/Firelands/firelands.h +++ b/src/server/scripts/Kalimdor/Firelands/firelands.h @@ -119,7 +119,7 @@ struct firelands_bossAI : public BossAI { firelands_bossAI(Creature* creature, uint32 bossId) : BossAI(creature, bossId) { } - void EnterCombat(Unit* target) override; + void JustEngagedWith(Unit* target) override; void JustDied(Unit* killer) override; void EnterEvadeMode(EvadeReason why) override; }; diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index c4846fbc611..c4543f0db51 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -158,11 +158,11 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(ANRAPHET_SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index 09ef90beb2a..f3b4b29e328 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -177,11 +177,11 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index 4afebefd140..e125af5d46b 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -178,11 +178,11 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index 30f0c91ba4b..fddef2e003f 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -66,7 +66,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* /*killer*/) override { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp index b611a444d29..07eae93c6e3 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp @@ -66,7 +66,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 298a3535107..4a2e11d2e0b 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -69,7 +69,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SummonAdds(Unit* victim) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 3290dbc5715..54d4f174cb6 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -69,7 +69,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* /*killer*/) override { diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 7acd361d087..746e72d2cc9 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -160,9 +160,9 @@ public: instance->DoStopCriteriaTimer(CRITERIA_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000)); events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000)); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index ade7dbe5def..b2a742a8da4 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -68,9 +68,9 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_AMNENNARSWRATH, 8000); events.ScheduleEvent(EVENT_FROSTBOLT, 1000); events.ScheduleEvent(EVENT_FROST_NOVA, urand(10000, 15000)); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp index cca12c7d6f4..c2aa923875b 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp @@ -53,9 +53,9 @@ public: hp15 = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp index 0725d56dabb..b9c434c2b1d 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp @@ -58,9 +58,9 @@ public: events.ScheduleEvent(EVENT_OOC_1, 10000); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.Reset(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_FIREBALL, 100); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp index 7bc05390d49..b12a168fee3 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp @@ -51,9 +51,9 @@ public: DoCast(me, SPELL_VIRULENT_POISON); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_WEB_SPRAY, urand(3000, 5000)); events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, urand(9000, 14000)); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 11480b6619d..8f8debaec9f 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -109,7 +109,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (channeling) Talk(SAY_WATCH_OUT, who); @@ -330,7 +330,7 @@ public: instance->SetData(DATA_WAVE, me->GetEntry()); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_WEB, urand(5000, 8000)); } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index b1916d27125..106da2e5e8f 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -114,7 +114,7 @@ public: void Reset() override { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO1, who); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 1dba0df2ab3..c589ac7d980 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -136,9 +136,9 @@ class boss_ayamiss : public CreatureScript BossAI::EnterEvadeMode(why); } - void EnterCombat(Unit* attacker) override + void JustEngagedWith(Unit* attacker) override { - BossAI::EnterCombat(attacker); + BossAI::JustEngagedWith(attacker); events.ScheduleEvent(EVENT_STINGER_SPRAY, urand(20000, 30000)); events.ScheduleEvent(EVENT_POISON_STINGER, 5000); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index 882c6c3eb6e..9defa281c0d 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -84,9 +84,9 @@ class boss_buru : public CreatureScript Eggs.clear(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - _EnterCombat(); + _JustEngagedWith(); Talk(EMOTE_TARGET, who); DoCast(me, SPELL_THORNS); @@ -207,7 +207,7 @@ class npc_buru_egg : public CreatureScript SetCombatMovement(false); } - void EnterCombat(Unit* attacker) override + void JustEngagedWith(Unit* attacker) override { if (Creature* buru = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_BURU))) if (!buru->IsInCombat()) diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index 86638522d5d..00b47457c23 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -138,9 +138,9 @@ class boss_ossirian : public CreatureScript Trigger->CastSpell(Trigger, SpellWeakness[urand(0, 4)], false); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.Reset(); events.ScheduleEvent(EVENT_SILENCE, 30000); events.ScheduleEvent(EVENT_CYCLONE, 20000); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index df644afa51b..f2257b8cfe8 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -86,9 +86,9 @@ class boss_rajaxx : public CreatureScript _JustDied(); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*victim*/) override { - _EnterCombat(); + _JustEngagedWith(); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index cfe137f80a2..37e4acdd660 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -85,7 +85,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } @@ -190,7 +190,7 @@ public: instance->SetData(DATA_BUG_TRIO_DEATH, 1); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } @@ -291,7 +291,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 0062c33465c..afbb89c17a9 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -221,7 +221,7 @@ public: pPortal->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetData(DATA_CTHUN_PHASE, PHASE_EYE_GREEN_BEAM); @@ -532,7 +532,7 @@ public: instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -932,7 +932,7 @@ public: KillSelfTimer = 35000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -1011,7 +1011,7 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -1128,7 +1128,7 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -1243,7 +1243,7 @@ public: BeamTimer = 500; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 05df5362b39..9d6abb66649 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -102,7 +102,7 @@ public: Spawn->AI()->AttackStart(victim); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 0a308e28694..ea6b7533993 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -84,7 +84,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 1208d10dd90..5f63b7c3578 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -80,7 +80,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCastVictim(SPELL_BIRTH); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index ee38b0516d5..9d503546f07 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -90,7 +90,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } @@ -234,7 +234,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 947e6e771e4..a61c83919a4 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -130,9 +130,9 @@ class boss_skeram : public CreatureScript me->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.Reset(); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(6000, 12000)); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index f48e449e446..0605fe9581f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -149,7 +149,7 @@ struct boss_twinemperorsAI : public ScriptedAI DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_KILL : SOUND_VN_KILL); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { DoZoneInCombat(); Creature* pOtherBoss = GetOtherBoss(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index e7bb0ffd66f..49392be4ee4 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -180,9 +180,9 @@ class boss_viscidus : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.Reset(); InitSpells(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 05af73caed9..a7c085ee9ad 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -234,7 +234,7 @@ public: me->AddAura(id, me); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (gatherOthersWhenAggro) GetOtherSentinels(who); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 61574286512..d83e071d564 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -131,7 +131,7 @@ public: } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_ATTACKED, who); } diff --git a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp index 03443d77c6f..dbcffe2c029 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp @@ -73,7 +73,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_SANCT_INVADE); events.ScheduleEvent(EVENT_SHADOW_BOLT, 1000); diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index f4fe4b0d8a9..b9fd1716574 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -72,7 +72,7 @@ public: Cage->SetGoState(GO_STATE_READY); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustSummoned(Creature* summoned) override { @@ -198,7 +198,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (Player* player = GetPlayerForEscort()) if (HasEscortState(STATE_ESCORT_PAUSED)) diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index bc92bc22f8b..019a183f31c 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -93,7 +93,7 @@ public: me->SetStandState(UNIT_STAND_STATE_SLEEP); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* who) override { @@ -225,7 +225,7 @@ public: me->SetNpcFlags(NpcFlags); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(ATTACK_YELL, who); } @@ -307,7 +307,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -356,7 +356,7 @@ public: _events.Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO, who); } @@ -500,7 +500,7 @@ public: StartEvent(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void StartEvent() { diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 5e1c30167e6..9d45eb42a69 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -59,7 +59,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } @@ -250,7 +250,7 @@ public: me->SetDisplayFromModel(1); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_UPPERCUT, 15 * IN_MILLISECONDS); _events.ScheduleEvent(EVENT_IMMOLATE, 10 * IN_MILLISECONDS); diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 0a4bda0cffe..d6e390f0fd8 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -72,7 +72,7 @@ public: } } - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { events.Reset(); events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(3000, 5000)); diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index dce9b789281..7e20bb9410f 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -696,7 +696,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* /*slayer*/) override; void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 98849c85e03..74b047eef4e 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -159,7 +159,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void Reset() override { } void UpdateAI(uint32 diff) override @@ -227,7 +227,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_OOX_AGGRO); } diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 04549486b02..b7ece8f867d 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -131,7 +131,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { //not always use if (rand32() % 4) @@ -235,7 +235,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index abe25316e65..7202ae4d384 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -79,7 +79,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoPlaySoundToSet(me, SOUND_AGGRO); } diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp index d162024e595..6bf44a561b6 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp @@ -150,9 +150,9 @@ class boss_high_priestess_azil : public CreatureScript events.ScheduleEvent(EVENT_SUMMON_WAVE_WEST, 40000); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*victim*/) override { - _EnterCombat(); + _JustEngagedWith(); DoCast(me, SPELL_ENERGY_SHIELD); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp index 4d801eba6d7..b921caeb8d8 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp @@ -92,9 +92,9 @@ class boss_ozruk : public CreatureScript events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, 13000); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*victim*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index 594b4eea8a2..7ded04b5d98 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -139,9 +139,9 @@ class boss_slabhide : public CreatureScript _isFlying = false; } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*victim*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_HANDLE_ROCK_WALLS, 4000); events.ScheduleEvent(EVENT_LAVA_FISSURE, urand(6000, 8000)); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index 7fd6cc46799..6c6b417a8de 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -89,9 +89,9 @@ struct boss_amanitar : public BossAI { boss_amanitar(Creature* creature) : BossAI(creature, DATA_AMANITAR) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_ROOT, Seconds(5), Seconds(9)); events.ScheduleEvent(EVENT_BASH, Seconds(10), Seconds(14)); events.ScheduleEvent(EVENT_BOLT, Seconds(15), Seconds(20)); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index e7847bfe9a0..e1a41a10f76 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -78,9 +78,9 @@ class boss_elder_nadox : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_PLAGUE, 13 * IN_MILLISECONDS); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 04f11878208..fb516257481 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -186,7 +186,7 @@ public: me->SetControlled(false, UNIT_STATE_STUNNED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index 87a99e4df6f..abc583c6d0f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -159,13 +159,13 @@ struct boss_jedoga_shadowseeker : public BossAI events.ScheduleEvent(EVENT_INTRO_SAY, Minutes(2), 0, PHASE_INTRO); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->RemoveAurasDueToSpell(SPELL_SPHERE_VISUAL); me->RemoveAurasDueToSpell(SPELL_RANDOM_LIGHTNING_VISUAL); me->SummonCreatureGroup(SUMMON_GROUP_WORSHIPPERS); - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.SetPhase(PHASE_ONE); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 87c641f4391..86632ed7e99 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -110,9 +110,9 @@ class boss_prince_taldaram : public CreatureScript me->SummonCreatureGroup(SUMMON_GROUP_CONTROLLERS); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_BLOODTHIRST, 10000); events.ScheduleEvent(EVENT_VANISH, urand(25000, 35000)); @@ -325,7 +325,7 @@ class npc_prince_taldaram_flame_sphere : public CreatureScript _flameSphereTargetGUID = guid; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index f8a05dd4062..fb0e532668d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -130,9 +130,9 @@ public: bool CanAIAttack(Unit const* /*who*/) const override { return true; } // do not check boundary here - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); if (GameObject* door = instance->GetGameObject(DATA_ANUBARAK_WALL)) door->SetGoState(GO_STATE_ACTIVE); // open door for now diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 34c63c9b3e2..7b3946364bb 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -228,7 +228,7 @@ public: return BossAI::CanAIAttack(target); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_LEECH_POISON, randtime(Seconds(5), Seconds(7))); events.ScheduleEvent(EVENT_ACID_CLOUD, randtime(Seconds(7), Seconds(13))); @@ -442,7 +442,7 @@ struct npc_hadronox_crusherPackAI : public ScriptedAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (me->HasReactState(REACT_PASSIVE)) { @@ -455,11 +455,11 @@ struct npc_hadronox_crusherPackAI : public ScriptedAI other->AI()->AttackStart(who); } } - _EnterCombat(); - ScriptedAI::EnterCombat(who); + _JustEngagedWith(); + ScriptedAI::JustEngagedWith(who); } - virtual void _EnterCombat() = 0; + virtual void _JustEngagedWith() = 0; virtual void DoEvent(uint32 /*eventId*/) = 0; void MoveInLineOfSight(Unit* who) override @@ -471,7 +471,7 @@ struct npc_hadronox_crusherPackAI : public ScriptedAI } if (me->CanStartAttack(who, false) && me->IsWithinDistInMap(who, me->GetAttackDistance(who) + me->m_CombatDistance)) - EnterCombat(who); + JustEngagedWith(who); } void UpdateAI(uint32 diff) override @@ -517,7 +517,7 @@ class npc_anub_ar_crusher : public CreatureScript { npc_anub_ar_crusherAI(Creature* creature) : npc_hadronox_crusherPackAI(creature, crusherWaypoints), _hadFrenzy(false) { } - void _EnterCombat() override + void _JustEngagedWith() override { _events.ScheduleEvent(EVENT_SMASH, randtime(Seconds(8), Seconds(12))); @@ -601,7 +601,7 @@ class npc_anub_ar_crusher_champion : public CreatureScript } } - void _EnterCombat() override + void _JustEngagedWith() override { _events.ScheduleEvent(EVENT_REND, randtime(Seconds(4), Seconds(8))); _events.ScheduleEvent(EVENT_PUMMEL, randtime(Seconds(15), Seconds(19))); @@ -644,7 +644,7 @@ class npc_anub_ar_crusher_crypt_fiend : public CreatureScript } } - void _EnterCombat() override + void _JustEngagedWith() override { _events.ScheduleEvent(EVENT_CRUSHING_WEBS, randtime(Seconds(4), Seconds(8))); _events.ScheduleEvent(EVENT_INFECTED_WOUND, randtime(Seconds(15), Seconds(19))); @@ -687,7 +687,7 @@ class npc_anub_ar_crusher_necromancer : public CreatureScript } } - void _EnterCombat() override + void _JustEngagedWith() override { _events.ScheduleEvent(EVENT_SHADOW_BOLT, randtime(Seconds(2), Seconds(4))); _events.ScheduleEvent(EVENT_ANIMATE_BONES, randtime(Seconds(37), Seconds(45))); @@ -845,7 +845,7 @@ class npc_anub_ar_champion : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_REND, randtime(Seconds(4), Seconds(8))); _events.ScheduleEvent(EVENT_PUMMEL, randtime(Seconds(15), Seconds(19))); @@ -887,7 +887,7 @@ class npc_anub_ar_crypt_fiend : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_CRUSHING_WEBS, randtime(Seconds(4), Seconds(8))); _events.ScheduleEvent(EVENT_INFECTED_WOUND, randtime(Seconds(15), Seconds(19))); @@ -929,7 +929,7 @@ class npc_anub_ar_necromancer : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHADOW_BOLT, randtime(Seconds(2), Seconds(4))); _events.ScheduleEvent(EVENT_ANIMATE_BONES, randtime(Seconds(37), Seconds(45))); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 4cb56b57e0a..ae0427b45d1 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -176,7 +176,7 @@ class boss_krik_thir : public CreatureScript Talk(SAY_DEATH); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { _petsInCombat = false; me->SetReactState(REACT_AGGRESSIVE); @@ -186,7 +186,7 @@ class boss_krik_thir : public CreatureScript events.ScheduleEvent(EVENT_SWARM, Seconds(5)); events.ScheduleEvent(EVENT_MIND_FLAY, randtime(Seconds(1), Seconds(3))); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); } void MoveInLineOfSight(Unit* who) override @@ -198,7 +198,7 @@ class boss_krik_thir : public CreatureScript } if (me->CanStartAttack(who, false) && me->IsWithinDistInMap(who, me->GetAttackDistance(who) + me->m_CombatDistance)) - EnterCombat(who); + JustEngagedWith(who); } void EnterEvadeMode(EvadeReason /*why*/) override @@ -322,8 +322,8 @@ struct npc_gatewatcher_petAI : public ScriptedAI { npc_gatewatcher_petAI(Creature* creature, bool isWatcher) : ScriptedAI(creature), _instance(creature->GetInstanceScript()), _petGroup(0), _isWatcher(isWatcher) { } - virtual void _EnterCombat() = 0; - void EnterCombat(Unit* who) override + virtual void _JustEngagedWith() = 0; + void JustEngagedWith(Unit* who) override { if (_isWatcher) { @@ -348,8 +348,8 @@ struct npc_gatewatcher_petAI : public ScriptedAI if (Creature* summoner = meSummon->GetSummonerCreatureBase()) summoner->AI()->DoAction(ACTION_PET_ENGAGED); } - _EnterCombat(); - ScriptedAI::EnterCombat(who); + _JustEngagedWith(); + ScriptedAI::JustEngagedWith(who); } void SetData(uint32 data, uint32 value) override @@ -377,7 +377,7 @@ struct npc_gatewatcher_petAI : public ScriptedAI } if (me->CanStartAttack(who, false) && me->IsWithinDistInMap(who, me->GetAttackDistance(who) + me->m_CombatDistance)) - EnterCombat(who); + JustEngagedWith(who); } void SpellHit(Unit* /*whose*/, SpellInfo const* spell) override @@ -419,7 +419,7 @@ class npc_watcher_gashra : public CreatureScript _events.Reset(); } - void _EnterCombat() override + void _JustEngagedWith() override { _events.ScheduleEvent(EVENT_ENRAGE, randtime(Seconds(3), Seconds(5))); _events.ScheduleEvent(EVENT_WEB_WRAP, randtime(Seconds(16), Seconds(19))); @@ -497,7 +497,7 @@ class npc_watcher_narjil : public CreatureScript _events.Reset(); } - void _EnterCombat() override + void _JustEngagedWith() override { _events.ScheduleEvent(EVENT_BLINDING_WEBS, randtime(Seconds(13), Seconds(18))); _events.ScheduleEvent(EVENT_WEB_WRAP, randtime(Seconds(3), Seconds(5))); @@ -575,7 +575,7 @@ class npc_watcher_silthik : public CreatureScript _events.Reset(); } - void _EnterCombat() override + void _JustEngagedWith() override { _events.ScheduleEvent(EVENT_POISON_SPRAY, randtime(Seconds(16), Seconds(19))); _events.ScheduleEvent(EVENT_WEB_WRAP, randtime(Seconds(7), Seconds(11))); @@ -651,7 +651,7 @@ class npc_anub_ar_warrior : public CreatureScript _events.Reset(); } - void _EnterCombat() override + void _JustEngagedWith() override { _events.ScheduleEvent(EVENT_CLEAVE, randtime(Seconds(7), Seconds(9))); _events.ScheduleEvent(EVENT_STRIKE, randtime(Seconds(5), Seconds(10))); @@ -711,7 +711,7 @@ class npc_anub_ar_skirmisher : public CreatureScript _events.Reset(); } - void _EnterCombat() override + void _JustEngagedWith() override { _events.ScheduleEvent(EVENT_ANUBAR_CHARGE, randtime(Seconds(6), Seconds(8))); _events.ScheduleEvent(EVENT_BACKSTAB, randtime(Seconds(7), Seconds(9))); @@ -779,7 +779,7 @@ class npc_anub_ar_shadowcaster : public CreatureScript _events.Reset(); } - void _EnterCombat() override + void _JustEngagedWith() override { _events.ScheduleEvent(EVENT_SHADOW_BOLT, Seconds(4)); _events.ScheduleEvent(EVENT_SHADOW_NOVA, randtime(Seconds(10), Seconds(14))); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index dd3366cf598..9d39af1bfbe 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -163,10 +163,10 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_SARTHARION_AGGRO); - _EnterCombat(); + _JustEngagedWith(); DoZoneInCombat(); FetchDragons(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp index 0cfb1059a77..190034b6228 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp @@ -183,7 +183,7 @@ struct dummy_dragonAI : public ScriptedAI Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); DoZoneInCombat(); @@ -425,9 +425,9 @@ public: dummy_dragonAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - dummy_dragonAI::EnterCombat(who); + dummy_dragonAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_HATCH_EGGS, 30000); } @@ -493,9 +493,9 @@ public: instance->SetBossState(DATA_PORTAL_OPEN, NOT_STARTED); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - dummy_dragonAI::EnterCombat(who); + dummy_dragonAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ACOLYTE_SHADRON, 60000); } @@ -564,9 +564,9 @@ public: dummy_dragonAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - dummy_dragonAI::EnterCombat(who); + dummy_dragonAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ACOLYTE_VESPERON, 60000); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index aaadeba12ba..3934e636e1a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -106,10 +106,10 @@ class boss_baltharus_the_warborn : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->InterruptNonMeleeSpells(false); - _EnterCombat(); + _JustEngagedWith(); events.Reset(); events.SetPhase(PHASE_COMBAT); events.ScheduleEvent(EVENT_CLEAVE, Seconds(13), 0, PHASE_COMBAT); @@ -251,7 +251,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); events.Reset(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index 91968895d25..c6fa8aeb8b0 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -88,9 +88,9 @@ class boss_general_zarithrian : public CreatureScript return (instance->GetBossState(DATA_SAVIANA_RAGEFIRE) == DONE && instance->GetBossState(DATA_BALTHARUS_THE_WARBORN) == DONE && BossAI::CanAIAttack(target)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, Seconds(8)); events.ScheduleEvent(EVENT_INTIDMDATING_ROAR, Seconds(14)); @@ -194,7 +194,7 @@ class npc_onyx_flamecaller : public CreatureScript MoveToGeneral(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_BLAST_NOVA, Seconds(17)); _events.ScheduleEvent(EVENT_LAVA_GOUT, Seconds(3)); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index b691a6e0080..17d3af227d1 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -239,14 +239,14 @@ class boss_halion : public CreatureScript controller->AI()->EnterEvadeMode(why); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.Reset(); events.SetPhase(PHASE_ONE); - _EnterCombat(); + _JustEngagedWith(); me->AddAura(SPELL_TWILIGHT_PRECISION, me); events.ScheduleEvent(EVENT_ACTIVATE_FIREWALL, Seconds(5)); events.ScheduleEvent(EVENT_BREATH, randtime(Seconds(5), Seconds(15))); @@ -416,11 +416,11 @@ class boss_twilight_halion : public CreatureScript events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, Seconds(15)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.SetPhase(PHASE_TWO); - _EnterCombat(); + _JustEngagedWith(); me->AddAura(SPELL_TWILIGHT_PRECISION, me); events.ScheduleEvent(EVENT_CLEAVE, Seconds(3)); events.ScheduleEvent(EVENT_BREATH, Seconds(12)); @@ -461,9 +461,9 @@ class boss_twilight_halion : public CreatureScript void DamageTaken(Unit* attacker, uint32& damage) override { - //Needed because we already have UNIT_FLAG_IN_COMBAT, otherwise EnterCombat won't ever be called + //Needed because we already have UNIT_FLAG_IN_COMBAT, otherwise JustEngagedWith won't ever be called if (!events.IsInPhase(PHASE_TWO) && !events.IsInPhase(PHASE_THREE)) - EnterCombat(attacker); + JustEngagedWith(attacker); if (me->HealthBelowPctDamaged(50, damage) && events.IsInPhase(PHASE_TWO)) { @@ -598,7 +598,7 @@ class npc_halion_controller : public CreatureScript DoCastSelf(SPELL_CLEAR_DEBUFFS); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _twilightDamageTaken = 0; _materialDamageTaken = 0; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 7cb74810fee..a85e9133db2 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -86,9 +86,9 @@ class boss_saviana_ragefire : public CreatureScript me->SetDisableGravity(false); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.Reset(); events.ScheduleEvent(EVENT_ENRAGE, Seconds(20), EVENT_GROUP_LAND_PHASE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index a672a5ebba7..27522e26e0f 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -225,7 +225,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCastSpellShield(); } @@ -640,7 +640,7 @@ public: Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { DoCast(me, SPELL_EARTH_SHIELD); DoCast(who, SPELL_HEX_OF_MENDING); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 9827475a67a..dea9b160e08 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -269,9 +269,9 @@ class boss_anubarak_trial : public CreatureScript summons.Summon(summoned); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE)); @@ -716,7 +716,7 @@ class npc_anubarak_spike : public CreatureScript return victim->GetTypeId() == TYPEID_PLAYER; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index d79186c91a5..1adc7eb9abf 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -636,7 +636,7 @@ struct boss_faction_championsAI : public BossAI pChampionController->AI()->SetData(2, DONE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_ANTI_AOE, true); me->SetCombatPulseDelay(5); @@ -1245,9 +1245,9 @@ class npc_toc_warlock : public CreatureScript SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_faction_championsAI::EnterCombat(who); + boss_faction_championsAI::JustEngagedWith(who); DoCast(SPELL_SUMMON_FELHUNTER); } @@ -1431,9 +1431,9 @@ class npc_toc_hunter : public CreatureScript SetEquipmentSlots(false, 47156, EQUIP_NO_CHANGE, 48711); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_faction_championsAI::EnterCombat(who); + boss_faction_championsAI::JustEngagedWith(who); DoCast(SPELL_CALL_PET); } @@ -2064,9 +2064,9 @@ class npc_toc_retro_paladin : public CreatureScript SetEquipmentSlots(false, 47519, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_faction_championsAI::EnterCombat(who); + boss_faction_championsAI::JustEngagedWith(who); DoCast(SPELL_SEAL_OF_COMMAND); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index bd4cd93f6ce..62cd1612387 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -173,9 +173,9 @@ class boss_jaraxxus : public CreatureScript Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_FEL_FIREBALL, 5 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_FEL_LIGHTNING, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS)); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index c8d2b29987f..98c0ab31afc 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -245,7 +245,7 @@ struct boss_northrend_beastsAI : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetCombatPulseDelay(5); me->setActive(true); @@ -418,7 +418,7 @@ struct npc_snobold_vassal : public ScriptedAI ScriptedAI::AttackStart(victim); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_CHECK_MOUNT, 3s); _events.ScheduleEvent(EVENT_FIRE_BOMB, 12s, 25s); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index eddf870bb84..a7c7c8a8116 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -254,7 +254,7 @@ struct boss_twin_baseAI : public BossAI return instance->GetCreature(GetSisterData(SisterNpcId)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetInCombatWithZone(); if (Creature* pSister = GetSister()) @@ -430,12 +430,12 @@ class boss_fjola : public CreatureScript boss_twin_baseAI::ExecuteEvent(eventId); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { instance->DoStartCriteriaTimer(CRITERIA_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT); events.ScheduleEvent(EVENT_SPECIAL_ABILITY, 45 * IN_MILLISECONDS); me->SummonCreature(NPC_BULLET_CONTROLLER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 0.0f, TEMPSUMMON_MANUAL_DESPAWN); - boss_twin_baseAI::EnterCombat(who); + boss_twin_baseAI::JustEngagedWith(who); } void EnterEvadeMode(EvadeReason why) override diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp index ff4343f31fd..5ced4290e2d 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp @@ -76,9 +76,9 @@ class boss_king_dred : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_BELLOWING_ROAR, 33000); events.ScheduleEvent(EVENT_GRIEVOUS_BITE, 20000); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index d62a13d214e..fe4b640af4c 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -106,9 +106,9 @@ public: SetBubbled(false); } - void EnterCombat(Unit* /* victim */) override + void JustEngagedWith(Unit* /* victim */) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); SetCrystalsStatus(true); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index b0ce1e19736..db1942b3453 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -88,10 +88,10 @@ class boss_tharon_ja : public CreatureScript me->RestoreDisplayId(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_DECAY_FLESH, 20000); events.ScheduleEvent(EVENT_CURSE_OF_LIFE, 1000); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 8a6dc12233b..d05bff6386b 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -92,9 +92,9 @@ class boss_trollgore : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CONSUME, 15000); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 533a01b95bf..1367206bbb1 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -95,9 +95,9 @@ class boss_bronjahm : public CreatureScript DoCast(me, SPELL_SOULSTORM_CHANNEL, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_SOULSTORM_CHANNEL); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 55cd310239b..0be06b2a1ef 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -154,9 +154,9 @@ class boss_devourer_of_souls : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_FACE_AGGRO); if (!me->FindNearestCreature(NPC_CRUCIBLE_OF_SOULS, 60)) // Prevent double spawn diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index b4ad06a5716..bc4dd167a07 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -72,7 +72,7 @@ class boss_falric : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 676ab1727c7..929da4802fd 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -62,7 +62,7 @@ class boss_marwyn : public CreatureScript boss_horAI::Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 14d655a692a..29cb72ebb40 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -1484,7 +1484,7 @@ class npc_ghostly_priest : public CreatureScript { npc_ghostly_priestAI(Creature* creature) : npc_gauntlet_trash(creature) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(6000, 15000)); _events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000); @@ -1561,7 +1561,7 @@ class npc_phantom_mage : public CreatureScript npc_gauntlet_trash::EnterEvadeMode(why); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_FIREBALL, 3000); _events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000); @@ -1662,7 +1662,7 @@ class npc_shadowy_mercenary : public CreatureScript { npc_shadowy_mercenaryAI(Creature* creature) : npc_gauntlet_trash(creature) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHADOW_STEP, 23000); _events.ScheduleEvent(EVENT_DEADLY_POISON, 5000); @@ -1723,7 +1723,7 @@ class npc_spectral_footman : public CreatureScript { npc_spectral_footmanAI(Creature* creature) : npc_gauntlet_trash(creature) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 14000); _events.ScheduleEvent(EVENT_SHIELD_BASH, 10000); @@ -1777,7 +1777,7 @@ class npc_tortured_rifleman : public CreatureScript { npc_tortured_riflemanAI(Creature* creature) : npc_gauntlet_trash(creature) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHOOT, 1); _events.ScheduleEvent(EVENT_CURSED_ARROW, 7000); @@ -1877,7 +1877,7 @@ class npc_frostsworn_general : public CreatureScript _instance->SetData(DATA_FROSTSWORN_GENERAL, DONE); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*victim*/) override { Talk(SAY_AGGRO); DoZoneInCombat(); @@ -1963,7 +1963,7 @@ class npc_spiritual_reflection : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*victim*/) override { _events.ScheduleEvent(EVENT_BALEFUL_STRIKE, 3000); } @@ -2599,7 +2599,7 @@ class npc_quel_delar_sword : public CreatureScript me->SetImmuneToAll(false); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*victim*/) override { _events.ScheduleEvent(EVENT_QUEL_DELAR_HEROIC_STRIKE, 4000); _events.ScheduleEvent(EVENT_QUEL_DELAR_BLADESTORM, 6000); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index fb6b9c41435..cf68d62a1e4 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -104,9 +104,9 @@ class boss_garfrost : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); DoCast(me, SPELL_PERMAFROST); me->CallForHelp(70.0f); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index b038e9ceb00..9f9e3378aba 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -162,9 +162,9 @@ class boss_ick : public CreatureScript return ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_KRICK)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); if (Creature* krick = GetKrick()) krick->AI()->Talk(SAY_KRICK_AGGRO); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 5ccf9edf553..9cadcd57cb2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -161,7 +161,7 @@ class boss_tyrannus : public CreatureScript return ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_RIMEFANG)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index f057f2cc22b..e81d2d0e2c4 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -70,7 +70,7 @@ class npc_ymirjar_flamebearer : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_FIREBALL, 4000); _events.ScheduleEvent(EVENT_TACTICAL_BLINK, 15000); @@ -141,7 +141,7 @@ class npc_iceborn_protodrake : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (Vehicle* _vehicle = me->GetVehicleKit()) _vehicle->RemoveAllPassengers(); @@ -195,7 +195,7 @@ class npc_geist_ambusher : public CreatureScript Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (who->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 4d0c3ecc5af..938d3701368 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -117,9 +117,9 @@ class boss_drakkari_colossus : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); me->RemoveAura(SPELL_FREEZE_ANIM); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 65cb00886ed..a6c62a2324d 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -65,9 +65,9 @@ class boss_eck : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_BITE, 5 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_SPIT, 10 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_SPRING, 8 * IN_MILLISECONDS); diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 07c79bc724c..eb42d5ff822 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -113,9 +113,9 @@ class boss_gal_darah : public CreatureScript _DespawnAtEvade(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); me->InterruptNonMeleeSpells(false); SetPhase(PHASE_TROLL); diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index c5225d3e5eb..fd526afb7d4 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -86,9 +86,9 @@ class boss_moorabi : public CreatureScript events.ScheduleEvent(EVENT_PHANTOM, Seconds(21), 0, PHASE_INTRO); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); DoCastSelf(SPELL_MOJO_FRENZY, true); diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index cb63d60e40b..09469ca8df9 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -107,9 +107,9 @@ public: lWrappedPlayers.clear(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index fff0e33838e..c9790455396 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -260,7 +260,7 @@ class boss_blood_council_controller : public CreatureScript _DespawnAtEvade(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (instance->GetBossState(DATA_BLOOD_PRINCE_COUNCIL) == IN_PROGRESS) return; @@ -458,7 +458,7 @@ struct BloodPrincesBossAI : public BossAI instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(true)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetCombatPulseDelay(5); me->setActive(true); @@ -1122,7 +1122,7 @@ class npc_dark_nucleus : public CreatureScript DoCastSelf(SPELL_SHADOW_RESONANCE_AURA, true); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { _scheduler.Schedule(Seconds(1), [this](TaskContext targetAuraCheck) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 8c02a308440..28066e2dadd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -173,7 +173,7 @@ class boss_blood_queen_lana_thel : public CreatureScript Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_BLOOD_QUEEN_LANA_THEL, who->ToPlayer())) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 3e1a16b14e9..0f9ce61e6ca 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -276,7 +276,7 @@ class boss_deathbringer_saurfang : public CreatureScript me->RemoveAurasDueToSpell(SPELL_FRENZY); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (_dead) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 7f1c8dd8892..d239484148c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -113,7 +113,7 @@ class boss_festergut : public CreatureScript } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_FESTERGUT, who->ToPlayer())) { @@ -312,7 +312,7 @@ class npc_stinky_icc : public CreatureScript _events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(3000, 7000)); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { DoCast(me, SPELL_PLAGUE_STENCH); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 62129734089..1e32b9475c2 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -868,7 +868,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript _rocketeersYellCooldown = time_t(0); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { _events.SetPhase(PHASE_COMBAT); DoCast(me, _instance->GetData(DATA_TEAM_IN_INSTANCE) == HORDE ? SPELL_FRIENDLY_BOSS_DAMAGE_MOD : SPELL_MELEE_TARGETING_ON_ORGRIMS_HAMMER, true); @@ -1137,7 +1137,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript _mortarYellCooldown = time_t(0); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { _events.SetPhase(PHASE_COMBAT); DoCast(me, _instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE ? SPELL_FRIENDLY_BOSS_DAMAGE_MOD : SPELL_MELEE_TARGETING_ON_SKYBREAKER, true); @@ -1564,9 +1564,9 @@ class npc_gunship_boarding_leader : public CreatureScript { } - void EnterCombat(Unit* target) override + void JustEngagedWith(Unit* target) override { - npc_gunship_boarding_addAI::EnterCombat(target); + npc_gunship_boarding_addAI::JustEngagedWith(target); _events.ScheduleEvent(EVENT_BLADESTORM, urand(13000, 18000)); _events.ScheduleEvent(EVENT_WOUNDING_STRIKE, urand(8000, 10000)); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 6e47c2ff790..ffc5cb24ec6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -280,7 +280,7 @@ class boss_lady_deathwhisper : public CreatureScript me->GetMotionMaster()->MoveChase(victim); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_LADY_DEATHWHISPER, who->ToPlayer())) { @@ -911,7 +911,7 @@ class npc_darnavan : public CreatureScript me->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*victim*/) override { Talk(SAY_DARNAVAN_AGGRO); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index afba03fbd0a..8be4018532d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -157,7 +157,7 @@ class boss_lord_marrowgar : public CreatureScript _boneSpikeImmune.clear(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 62cda3d2b8d..21df2c282c0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -252,7 +252,7 @@ class boss_professor_putricide : public CreatureScript } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT)) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 1895f82db86..0b2f6a8f7bc 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -118,7 +118,7 @@ class boss_rotface : public CreatureScript infectionCooldown = 14000; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_ROTFACE, who->ToPlayer())) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 9bbb5767ca2..3ac7ac56463 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -269,7 +269,7 @@ class boss_sindragosa : public CreatureScript } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* victim) override { if (!instance->CheckRequiredBosses(DATA_SINDRAGOSA, victim->ToPlayer())) { @@ -880,7 +880,7 @@ class npc_rimefang : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*victim*/) override { DoCast(me, SPELL_FROST_AURA_RIMEFANG, true); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 1644848cf0e..78c6a79800d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -538,7 +538,7 @@ class boss_the_lich_king : public CreatureScript me->GetMap()->SetZoneWeather(AREA_ICECROWN_CITADEL, WEATHER_STATE_FOG, 0.0f); } - void EnterCombat(Unit* target) override + void JustEngagedWith(Unit* target) override { if (!instance->CheckRequiredBosses(DATA_THE_LICH_KING, target->ToPlayer())) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index c3a26f54b25..a80874a211e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -365,7 +365,7 @@ class boss_valithria_dreamwalker : public CreatureScript } else if (_instance->GetBossState(DATA_VALITHRIA_DREAMWALKER) == NOT_STARTED) if (Creature* archmage = me->FindNearestCreature(NPC_RISEN_ARCHMAGE, 30.0f)) - archmage->AI()->DoZoneInCombat(); // call EnterCombat on one of them, that will make it all start + archmage->AI()->DoZoneInCombat(); // call JustEngagedWith on one of them, that will make it all start } void DamageTaken(Unit* /*attacker*/, uint32& damage) override @@ -512,7 +512,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit* target) override + void JustEngagedWith(Unit* target) override { if (!instance->CheckRequiredBosses(DATA_VALITHRIA_DREAMWALKER, target->ToPlayer())) { @@ -620,7 +620,7 @@ class npc_the_lich_king_controller : public CreatureScript me->setActive(false); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { Talk(SAY_LICH_KING_INTRO); me->setActive(true); @@ -704,7 +704,7 @@ class npc_risen_archmage : public CreatureScript void Initialize() { - _canCallEnterCombat = true; + _canCallJustEngagedWith = true; } bool CanAIAttack(Unit const* target) const override @@ -721,10 +721,10 @@ class npc_risen_archmage : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { me->FinishSpell(CURRENT_CHANNELED_SPELL, false); - if (me->GetSpawnId() && _canCallEnterCombat) + if (me->GetSpawnId() && _canCallJustEngagedWith) { std::list<Creature*> archmages; RisenArchmageCheck check; @@ -746,9 +746,9 @@ class npc_risen_archmage : public CreatureScript if (action != ACTION_ENTER_COMBAT) return; - _canCallEnterCombat = false; + _canCallJustEngagedWith = false; DoZoneInCombat(); - _canCallEnterCombat = true; + _canCallJustEngagedWith = true; } void JustSummoned(Creature* summon) override @@ -803,7 +803,7 @@ class npc_risen_archmage : public CreatureScript private: EventMap _events; InstanceScript* _instance; - bool _canCallEnterCombat; + bool _canCallJustEngagedWith; }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 1fad25c79eb..0fae791b82e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -783,9 +783,9 @@ class boss_sister_svalna : public CreatureScript } } - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { - _EnterCombat(); + _JustEngagedWith(); if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_CROK_SCOURGEBANE))) crok->AI()->Talk(SAY_CROK_COMBAT_SVALNA); DoCastSelf(SPELL_DIVINE_SURGE, true); @@ -1290,7 +1290,7 @@ struct npc_argent_captainAI : public ScriptedAI } } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { me->SetHomePosition(*me); if (IsUndead) diff --git a/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp b/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp index 68e6ae3d40f..9434f49803e 100644 --- a/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp +++ b/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp @@ -60,7 +60,7 @@ public: (*itr)->Respawn(); }; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_BRUTAL_STRIKE, 5 * IN_MILLISECONDS); _events.ScheduleEvent(EVENT_DAGGER_THROW, 7 * IN_MILLISECONDS); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index d2f992da8ed..fa070d42c6c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -156,9 +156,9 @@ public: instance->DoStartCriteriaTimer(CRITERIA_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); summons.DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index bf287b7b417..00aecb3312c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -96,9 +96,9 @@ class boss_faerlina : public CreatureScript SummonAdds(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); summons.DoZoneInCombat(); events.ScheduleEvent(EVENT_POISON, randtime(Seconds(10), Seconds(15))); @@ -215,7 +215,7 @@ class npc_faerlina_add : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (Creature* faerlina = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_FAERLINA))) faerlina->AI()->DoZoneInCombat(nullptr, 250.0f); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index b07fb10ff39..3d1350040f6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -287,7 +287,7 @@ struct boss_four_horsemen_baseAI : public BossAI DoCastAOE(SPELL_ENCOUNTER_CREDIT, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (instance->GetBossState(BOSS_HORSEMEN) == IN_PROGRESS || instance->GetBossState(BOSS_HORSEMEN) == DONE) // another horseman already did it return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 42ff96345db..e1c049ea7d0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -113,9 +113,9 @@ public: me->SetSpeed(UnitMoveType::MOVE_RUN, 12.0f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_WOUND, Seconds(10)); events.ScheduleEvent(EVENT_ENRAGE, randtime(Seconds(16), Seconds(22))); events.ScheduleEvent(EVENT_DECIMATE, randtime(Minutes(1)+Seconds(50), Minutes(2))); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 9c747645350..673bc276a11 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -319,9 +319,9 @@ class boss_gothik : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.SetPhase(PHASE_ONE); events.ScheduleEvent(EVENT_SUMMON, Seconds(25), 0, PHASE_ONE); events.ScheduleEvent(EVENT_DOORS_UNLOCK, Minutes(3) + Seconds(25), 0, PHASE_ONE); @@ -895,7 +895,7 @@ public: void EnterEvadeMode(EvadeReason /*why*/) override { } void UpdateAI(uint32 /*diff*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit* /*who*/, uint32& damage) override { damage = 0; } Creature* SelectRandomSkullPile() diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index df225915ae0..78b68897d45 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -56,9 +56,9 @@ class boss_grobbulus : public CreatureScript { boss_grobbulusAI(Creature* creature) : BossAI(creature, BOSS_GROBBULUS) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CLOUD, Seconds(15)); events.ScheduleEvent(EVENT_INJECT, Seconds(20)); events.ScheduleEvent(EVENT_SPRAY, randtime(Seconds(15), Seconds(30))); // not sure diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 002a712d496..e51f9f592cf 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -113,9 +113,9 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); _safeSection = 0; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 33bff540e2d..f1b83835ee4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -601,7 +601,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI kelThuzad->AI()->EnterEvadeMode(EVADE_REASON_OTHER); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { _movementTimer = 0; // once it's zero, it'll never get checked again if (!me->HasReactState(REACT_PASSIVE)) @@ -623,7 +623,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI } me->SetReactState(REACT_AGGRESSIVE); AttackStart(who); - ScriptedAI::EnterCombat(who); + ScriptedAI::JustEngagedWith(who); } void AttackStart(Unit* who) override @@ -640,7 +640,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI } if (me->CanStartAttack(who, false) && me->GetDistance2d(who) <= MINION_AGGRO_DISTANCE) - EnterCombat(who); + JustEngagedWith(who); } void SetData(uint32 data, uint32 value) override diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 4b07cf6165c..b0ed5b4bb8b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -72,9 +72,9 @@ class boss_loatheb : public CreatureScript _sporeLoser = true; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_NECROTIC_AURA, Seconds(17)); events.ScheduleEvent(EVENT_DEATHBLOOM, Seconds(5)); events.ScheduleEvent(EVENT_SPORE, Seconds(18)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index a41c523d923..a39c4e984fb 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -104,9 +104,9 @@ public: { boss_maexxnaAI(Creature* creature) : BossAI(creature, BOSS_MAEXXNA) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_WRAP, Seconds(20)); events.ScheduleEvent(EVENT_SPRAY, Seconds(40)); events.ScheduleEvent(EVENT_SHOCK, randtime(Seconds(5), Seconds(10))); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index c3eb7d558e0..4df28e3dc7f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -116,9 +116,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); EnterPhaseGround(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 70d554420d9..993910fe263 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -93,9 +93,9 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Enraged = false; Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_HATEFUL, Seconds(1)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 28d8c0a181f..ee568e5a307 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -117,9 +117,9 @@ public: instance->SetBossState(BOSS_RAZUVIOUS, DONE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); me->StopMoving(); summons.DoZoneInCombat(); Talk(SAY_AGGRO); @@ -185,7 +185,7 @@ class npc_dk_understudy : public CreatureScript creature->LoadEquipment(1); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetEmoteState(EMOTE_ONESHOT_NONE); if (Creature* razuvious = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_RAZUVIOUS))) @@ -222,7 +222,7 @@ class npc_dk_understudy : public CreatureScript if (apply) { if (!me->IsInCombat()) - EnterCombat(nullptr); + JustEngagedWith(nullptr); me->StopMoving(); me->SetReactState(REACT_PASSIVE); _charmer = me->GetCharmerGUID(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index fdf89f72ea3..8e092ea0fa0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -175,9 +175,9 @@ class boss_sapphiron : public CreatureScript damage = me->GetHealth()-1; // don't die during air phase } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); me->CastSpell(me, SPELL_FROST_AURA, true); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 39461928c99..1ad622e5c32 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -563,7 +563,7 @@ public: Talk(SAY_STALAGG_SLAY); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_STALAGG_AGGRO); @@ -821,7 +821,7 @@ public: Talk(SAY_FEUGEN_SLAY); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_FEUGEN_AGGRO); @@ -981,7 +981,7 @@ public: void EnterEvadeMode(EvadeReason /*why*/) override { } // never stop casting due to evade void UpdateAI(uint32 /*diff*/) override { } // never do anything unless told - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit* /*who*/, uint32& damage) override { damage = 0; } // no, you can't kill it }; }; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 414a651e6ec..b781f2e3c1e 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -567,7 +567,7 @@ public: BossAI::AttackStart(target); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { // We can't call full function here since it includes DoZoneInCombat(), // if someone does it will be returned with a warning. @@ -1421,7 +1421,7 @@ class npc_scion_of_eternity : public CreatureScript _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(14, 29)*IN_MILLISECONDS); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index e79b41abd28..e89194732c2 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -105,7 +105,7 @@ class boss_anomalus : public CreatureScript instance->SetBossState(DATA_ANOMALUS, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 33e3b649c5f..16253a2a6ba 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -91,11 +91,11 @@ class boss_keristrasza : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); DoCastAOE(SPELL_INTENSE_COLD); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CRYSTAL_FIRE_BREATH, 14000); events.ScheduleEvent(EVENT_CRYSTAL_CHAINS_CRYSTALIZE, DUNGEON_MODE(30000, 11000)); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 3a250908c7f..cefaf394cbc 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -142,7 +142,7 @@ public: me->AddAura(SPELL_WEAR_CHRISTMAS_HAT, me); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp index 67f19532702..d5e4e84e778 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp @@ -51,9 +51,9 @@ class boss_nexus_commanders : public CreatureScript { boss_nexus_commandersAI(Creature* creature) : BossAI(creature, DATA_COMMANDER) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON); DoCast(me, SPELL_BATTLE_SHOUT); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 25027df77e7..913584ab1f9 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -84,9 +84,9 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CRYSTAL_SPIKES, 12000); events.ScheduleEvent(EVENT_TRAMPLE, 10000); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index a10a0b54b5a..ca92850c348 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -80,9 +80,9 @@ class boss_drakos : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 6b11e675361..66d6f60383d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -113,9 +113,9 @@ class boss_eregos : public CreatureScript Talk(SAY_KILL); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); /* Checks for present drakes vehicles from each type and deactivate achievement that corresponds to each found diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 0448c11e3e3..d529ef573e3 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -128,9 +128,9 @@ class boss_urom : public CreatureScript me->GetMotionMaster()->MoveIdle(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); StartAttack(); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 4ac561a865a..4633708fd64 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -92,9 +92,9 @@ class boss_varos : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 20c1153069a..aad76487dec 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -198,7 +198,7 @@ public: ScriptedAI::EnterEvadeMode(why); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -420,7 +420,7 @@ public: Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (Creature* pBjarngrim = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_BJARNGRIM))) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 337ccc79a0e..b1535ef9e99 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -124,7 +124,7 @@ public: instance->SetBossState(DATA_IONAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 9ac7fc0931b..d0462ac8897 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -100,9 +100,9 @@ public: instance->DoStopCriteriaTimer(CRITERIA_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_ARC_LIGHTNING, 15000); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 88a9bce7b78..318daa780f1 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -119,14 +119,14 @@ public: events.ScheduleEvent(EVENT_FORGE_CAST, 2 * IN_MILLISECONDS, 0, PHASE_INTRO); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_PAUSE, 3.5 * IN_MILLISECONDS, 0, PHASE_NORMAL); events.ScheduleEvent(EVENT_SHATTERING_STOMP, 0 * IN_MILLISECONDS, 0, PHASE_NORMAL); events.ScheduleEvent(EVENT_SHATTER, 5 * IN_MILLISECONDS, 0, PHASE_NORMAL); - _EnterCombat(); + _JustEngagedWith(); } void AttackStart(Unit* who) override diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 81dbabdf814..a8f0924c9e4 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -63,10 +63,10 @@ class boss_krystallus : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_BOULDER_TOSS, urand(3000, 9000)); events.ScheduleEvent(EVENT_GROUND_SLAM, urand(15000, 18000)); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 38c26bcbd05..b9c3ba99488 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -71,9 +71,9 @@ class boss_maiden_of_grief : public CreatureScript instance->DoStopCriteriaTimer(CRITERIA_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); instance->DoStartCriteriaTimer(CRITERIA_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 8d094801f47..8886b18a46b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -95,7 +95,7 @@ class boss_sjonnir : public CreatureScript Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_SJONNIR, who->ToPlayer())) { @@ -103,7 +103,7 @@ class boss_sjonnir : public CreatureScript return; } - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(3000, 8000)); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index eb2eb19fc2b..0b3bb2acfc8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -394,7 +394,7 @@ class boss_algalon_the_observer : public CreatureScript return type == DATA_HAS_FED_ON_TEARS ? _fedOnTears : 1; } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { uint32 introDelay = 0; me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); @@ -405,7 +405,7 @@ class boss_algalon_the_observer : public CreatureScript if (!_firstPull) { Talk(SAY_ALGALON_AGGRO); - _EnterCombat(); + _JustEngagedWith(); introDelay = 8000; } else diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 0df787fea3d..ee658a38263 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -161,9 +161,9 @@ class boss_steelbreaker : public CreatureScript me->RemoveAllAuras(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_STEELBREAKER_AGGRO); DoCast(me, SPELL_HIGH_VOLTAGE); events.SetPhase(++phase); @@ -309,9 +309,9 @@ class boss_runemaster_molgeim : public CreatureScript me->RemoveAllAuras(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_MOLGEIM_AGGRO); events.SetPhase(++phase); events.ScheduleEvent(EVENT_BERSERK, 900000); @@ -488,9 +488,9 @@ class boss_stormcaller_brundir : public CreatureScript return 0; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_BRUNDIR_AGGRO); events.SetPhase(++phase); events.ScheduleEvent(EVENT_MOVE_POSITION, 1000); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index bce4296d82b..b0469a7689d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -157,9 +157,9 @@ struct boss_auriaya : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_SONIC_SCREECH, Seconds(48)); @@ -288,7 +288,7 @@ struct npc_sanctum_sentry : public ScriptedAI me->SetWalk(true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_RIP, Seconds(6)); _events.ScheduleEvent(EVENT_SAVAGE_POUNCE, Milliseconds(1)); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 87be13e900c..82fde5eb24f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -274,9 +274,9 @@ class boss_flame_leviathan : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); me->SetReactState(REACT_PASSIVE); events.ScheduleEvent(EVENT_PURSUE, 1); events.ScheduleEvent(EVENT_MISSILE, urand(1500, 4*IN_MILLISECONDS)); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 5282b4598ac..c46140419b4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -337,9 +337,9 @@ class boss_freya : public CreatureScript } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - _EnterCombat(); + _JustEngagedWith(); DoZoneInCombat(); Creature* Elder[3]; for (uint8 n = 0; n < 3; ++n) @@ -726,9 +726,9 @@ class boss_elder_brightleaf : public CreatureScript Talk(SAY_ELDER_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } @@ -829,9 +829,9 @@ class boss_elder_stonebark : public CreatureScript Talk(SAY_ELDER_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } @@ -937,9 +937,9 @@ class boss_elder_ironbranch : public CreatureScript Talk(SAY_ELDER_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } @@ -1287,7 +1287,7 @@ class npc_ancient_conservator : public CreatureScript } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { DoCast(who, SPELL_CONSERVATOR_GRIP, true); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 8e352cff3d3..66020e81cd2 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -131,9 +131,9 @@ class boss_general_vezax : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); DoCast(me, SPELL_AURA_OF_DESPAIR); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 8262a82012a..8ddc4d1a7dc 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -358,9 +358,9 @@ class boss_hodir : public CreatureScript FrozenHelper->CastSpell(FrozenHelper, SPELL_SUMMON_FLASH_FREEZE_HELPER, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); DoCast(me, SPELL_BITING_COLD, true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 32ac9ff5833..4b327ea9f16 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -142,9 +142,9 @@ class boss_ignis : public CreatureScript instance->DoStopCriteriaTimer(CRITERIA_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_JET, 30000); events.ScheduleEvent(EVENT_SCORCH, 25000); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index c1e521a4899..06a005cd5e7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -117,7 +117,7 @@ class boss_kologarn : public CreatureScript bool left, right; ObjectGuid eyebeamTarget; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -133,7 +133,7 @@ class boss_kologarn : public CreatureScript if (Unit* arm = vehicle->GetPassenger(i)) arm->ToCreature()->SetInCombatWithZone(); - _EnterCombat(); + _JustEngagedWith(); } void Reset() override diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 331bd13be06..2076946b2ba 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -419,12 +419,12 @@ class boss_mimiron : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (!me->GetVehicleBase()) return; - _EnterCombat(); + _JustEngagedWith(); me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->RemoveAurasDueToSpell(SPELL_WELD); DoCast(me->GetVehicleBase(), SPELL_SEAT_6); @@ -1280,7 +1280,7 @@ class npc_mimiron_assault_bot : public CreatureScript { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_MAGNETIC_FIELD, 14000); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index eeb5b293aee..256a06c1836 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -352,9 +352,9 @@ struct boss_razorscale : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); ScheduleAirPhaseEvents(); summons.DoAction(ACTION_START_FIGHT, DummyEntryCheckPredicate()); @@ -1263,7 +1263,7 @@ struct npc_darkrune_watcher : public ScriptedAI razorscale->AI()->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(5)); _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, Seconds(34)); @@ -1324,7 +1324,7 @@ struct npc_darkrune_guardian : public ScriptedAI razorscale->AI()->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_STORMSTRIKE, Seconds(23)); } @@ -1392,7 +1392,7 @@ struct npc_darkrune_sentinel : public ScriptedAI razorscale->AI()->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_HEROIC_STRIKE, Seconds(9)); _events.ScheduleEvent(EVENT_BATTLE_SHOUT, Seconds(15)); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index a5464a4000a..187ae82ca45 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -592,9 +592,9 @@ class boss_thorim : public CreatureScript SetBoundary(&ArenaBoundaries); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO_1); events.SetPhase(PHASE_1); @@ -1241,7 +1241,7 @@ class npc_thorim_arena_phase : public CreatureScript _events.ScheduleEvent(EVENT_ABILITY_CHARGE, 8000); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (_info->Type == DARK_RUNE_WARBRINGER) DoCast(me, SPELL_AURA_OF_CELERITY); @@ -1412,7 +1412,7 @@ class npc_runic_colossus : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); _events.Reset(); @@ -1499,7 +1499,7 @@ class npc_ancient_rune_giant : public CreatureScript me->SummonCreature(s.entry, s.pos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); _events.Reset(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index b973e63159b..eac186c7e50 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -212,10 +212,10 @@ class boss_xt002 : public CreatureScript _DespawnAtEvade(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_ENRAGE, TIMER_ENRAGE); events.ScheduleEvent(EVENT_GRAVITY_BOMB, TIMER_GRAVITY_BOMB); @@ -749,7 +749,7 @@ class npc_life_spark : public CreatureScript _scheduler.CancelAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCastSelf(SPELL_STATIC_CHARGED); _scheduler.Schedule(Seconds(12), [this](TaskContext spellShock) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 7d7ededb054..8706991b370 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -507,7 +507,7 @@ class boss_voice_of_yogg_saron : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (Creature* sara = instance->GetCreature(DATA_SARA)) sara->SetInCombatWith(me); @@ -760,7 +760,7 @@ class boss_sara : public CreatureScript Talk(SAY_SARA_KILL); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_SARA_AGGRO); _events.ScheduleEvent(EVENT_SARAS_FERVOR, 5000, 0, PHASE_ONE); @@ -1605,7 +1605,7 @@ class npc_yogg_saron_keeper : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { switch (me->GetEntry()) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 329a793e76a..f3b6d1af83e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -154,11 +154,11 @@ class boss_ingvar_the_plunderer : public CreatureScript events.ScheduleEvent(EVENT_JUST_TRANSFORMED, IN_MILLISECONDS / 2, 0, PHASE_EVENT); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - if (events.IsInPhase(PHASE_EVENT) || events.IsInPhase(PHASE_UNDEAD)) // ingvar gets multiple EnterCombat calls + if (events.IsInPhase(PHASE_EVENT) || events.IsInPhase(PHASE_UNDEAD)) // ingvar gets multiple JustEngagedWith calls return; - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.SetPhase(PHASE_HUMAN); @@ -331,7 +331,7 @@ class npc_annhylde_the_caller : public CreatureScript void AttackStart(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 3580c82993a..a8e9c27b93a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -138,9 +138,9 @@ class boss_keleseth : public CreatureScript Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_START_COMBAT); if (!who) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 2e5c3bbfc1a..aa5a2470826 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -110,10 +110,10 @@ struct generic_boss_controllerAI : public BossAI _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (!IsInGhostForm) - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override @@ -187,9 +187,9 @@ class boss_skarvald_the_constructor : public CreatureScript generic_boss_controllerAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - generic_boss_controllerAI::EnterCombat(who); + generic_boss_controllerAI::JustEngagedWith(who); if (!IsInGhostForm) Talk(SAY_AGGRO); @@ -247,9 +247,9 @@ class boss_dalronn_the_controller : public CreatureScript OtherBossData = DATA_SKARVALD; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - generic_boss_controllerAI::EnterCombat(who); + generic_boss_controllerAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOW_BOLT, 1000); events.ScheduleEvent(EVENT_DEBILITATE, 5000); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 4dcba5d18ba..86cc3ee0533 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -65,7 +65,7 @@ class npc_dragonflayer_forge_master : public CreatureScript _instance->SetData(DATA_FORGE_1 + _forgeId - 1, DONE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (!_forgeId) _forgeId = GetForgeMasterType(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 1600591844d..70ba8b14dce 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -219,9 +219,9 @@ public: _orb = summon->GetGUID(); } - void EnterCombat (Unit* /*who*/) override + void JustEngagedWith (Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCING_SMASH, Seconds(7)); events.ScheduleEvent(EVENT_IMPALE, Seconds(11)); @@ -333,7 +333,7 @@ struct PalehoofMinionsBossAI : public BossAI DoCastSelf(SPELL_FREEZE, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetCombatPulseDelay(5); me->setActive(true); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 4d2315c4348..856be55fde0 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -476,9 +476,9 @@ struct npc_skadi_trashAI : public ScriptedAI }); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - CreatureAI::EnterCombat(who); + CreatureAI::JustEngagedWith(who); ScheduleTasks(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 4c9c95d688e..568d6e6c092 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -170,9 +170,9 @@ class boss_svala : public CreatureScript instance->SetGuidData(DATA_SACRIFICED_PLAYER, ObjectGuid::Empty); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 414602ce8b3..f0508e60b31 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -137,9 +137,9 @@ public: me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_BANE, urand(18000, 23000), EVENT_GROUP_BASE_SPELLS); events.ScheduleEvent(EVENT_FETID_ROT, urand(8000, 13000), EVENT_GROUP_BASE_SPELLS); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 6290be48287..e2c281a32ee 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -76,14 +76,14 @@ class boss_archavon : public CreatureScript { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000); events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000); events.ScheduleEvent(EVENT_STOMP, 45000); events.ScheduleEvent(EVENT_BERSERK, 300000); - _EnterCombat(); + _JustEngagedWith(); } // Below UpdateAI may need review/debug. @@ -166,7 +166,7 @@ class npc_archavon_warder : public CreatureScript events.ScheduleEvent(EVENT_WHIRL, 7500); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 6316d4ee2fc..2752b8eba20 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -99,7 +99,7 @@ class boss_emalon : public CreatureScript summoned->AI()->AttackStart(me->GetVictim()); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!summons.empty()) { @@ -116,7 +116,7 @@ class boss_emalon : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 360000); events.ScheduleEvent(EVENT_OVERCHARGE, 45000); - _EnterCombat(); + _JustEngagedWith(); } void UpdateAI(uint32 diff) override @@ -216,7 +216,7 @@ class npc_tempest_minion : public CreatureScript } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { DoZoneInCombat(); events.ScheduleEvent(EVENT_SHOCK, 20000); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 625ae8dffdf..4a962f50838 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -60,7 +60,7 @@ class boss_koralon : public CreatureScript { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_BURNING_FURY); @@ -69,7 +69,7 @@ class boss_koralon : public CreatureScript events.ScheduleEvent(EVENT_METEOR_FISTS, 75000); // 1st after 75sec, then every 45sec events.ScheduleEvent(EVENT_FLAME_CINDER, 30000); /// @todo check timer - _EnterCombat(); + _JustEngagedWith(); } void UpdateAI(uint32 diff) override @@ -139,7 +139,7 @@ class npc_flame_warder : public CreatureScript events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 2004e9b0574..748e04ba3d0 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -52,7 +52,7 @@ struct boss_toravon : public BossAI { boss_toravon(Creature* creature) : BossAI(creature, DATA_TORAVON) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCastSelf(SPELL_FROZEN_MALLET); @@ -60,7 +60,7 @@ struct boss_toravon : public BossAI events.ScheduleEvent(EVENT_WHITEOUT, Seconds(25)); events.ScheduleEvent(EVENT_FREEZING_GROUND, Seconds(7)); - _EnterCombat(); + _JustEngagedWith(); } void UpdateAI(uint32 diff) override @@ -113,7 +113,7 @@ struct npc_frost_warder : public ScriptedAI _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 9809381fc5a..8a0ba50a8dc 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -52,9 +52,9 @@ class boss_cyanigosa : public CreatureScript { boss_cyanigosaAI(Creature* creature) : BossAI(creature, DATA_CYANIGOSA) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 5b7eabe4f00..d664ef36fb1 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -68,9 +68,9 @@ class boss_erekem : public CreatureScript me->SetCanDualWield(false); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCast(me, SPELL_EARTH_SHIELD); } @@ -271,7 +271,7 @@ class npc_erekem_guard : public CreatureScript scheduler.CancelAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index eecd80e777d..0ce6a4f6e81 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -100,9 +100,9 @@ class boss_ichoron : public CreatureScript DoCast(me, SPELL_THREAT_PROC, true); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 0393c49fde3..fd6fbb48de5 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -91,9 +91,9 @@ class boss_xevozz : public CreatureScript BossAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index ecb24b8c153..b8a5c9fe814 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -71,9 +71,9 @@ class boss_zuramat : public CreatureScript Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 7cd5ef0845b..9a8640a3f3f 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -645,7 +645,7 @@ struct npc_violet_hold_teleportation_portal_commonAI : public ScriptedAI void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustSummoned(Creature* summon) override { @@ -905,9 +905,9 @@ struct violet_hold_trashAI : public EscortAI CreatureStartAttackDoor(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - EscortAI::EnterCombat(who); + EscortAI::JustEngagedWith(who); ScheduledTasks(); } diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 0bc88c6ab5e..ad80e29881c 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -104,7 +104,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -364,7 +364,7 @@ public: npc_nerubar_victimAI(Creature* creature) : ScriptedAI(creature) { } void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -458,7 +458,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -1450,7 +1450,7 @@ public: Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (me->IsValidAttackTarget(who)) AttackStart(who); @@ -1562,7 +1562,7 @@ public: DoMeleeAttackIfReady(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } @@ -2062,7 +2062,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 29085c372f2..f71f8900bc1 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -71,7 +71,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 9355001d075..ba94f8f6e91 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -631,7 +631,7 @@ class npc_torturer_lecraft : public CreatureScript _playerGUID.Clear(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { _events.ScheduleEvent(EVENT_HEMORRHAGE, urand(5000, 8000)); _events.ScheduleEvent(EVENT_KIDNEY_SHOT, urand(12000, 15000)); diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index d545b524fb8..9fd63359db2 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -172,7 +172,7 @@ public: } } - void EnterCombat(Unit* /*Who*/) override + void JustEngagedWith(Unit* /*Who*/) override { Talk(SAY_RANDOMAGGRO); } @@ -218,7 +218,7 @@ public: void Reset() override { } - void EnterCombat(Unit* Who) override + void JustEngagedWith(Unit* Who) override { if (Creature* Emily = GetClosestCreatureWithEntry(me, NPC_EMILY, 50.0f)) { @@ -559,7 +559,7 @@ public: { npc_venture_co_stragglerAI(Creature* creature) : ScriptedAI(creature) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_CHOP, Seconds(3), Seconds(6)); } diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index ccc2ffdc63c..401c112e03f 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -632,7 +632,7 @@ public: npc_riven_widow_cocoonAI(Creature* creature) : ScriptedAI(creature) { } void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } void JustDied(Unit* killer) override diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 55884eab019..00852bf9c26 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -438,7 +438,7 @@ public: events.ScheduleEvent(EVENT_SPAWN, 3000); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 3232b66fb76..4beecee5eed 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -69,7 +69,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void Reset() override { } @@ -352,7 +352,7 @@ public: npc_icefangAI(Creature* creature) : EscortAI(creature) { } void AttackStart(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void EnterEvadeMode(EvadeReason /*why*/) override { } void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index fa25ca58d37..d2323404161 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -279,7 +279,7 @@ class npc_wg_queue : public CreatureScript FrostArmor_Timer = 0; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index e02d3f206d5..7dd82f416f7 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -77,7 +77,7 @@ public: Class_Timer = 1000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } void SetMyClass(uint8 myclass) @@ -216,7 +216,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } @@ -342,7 +342,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 0340a4dd2f1..c8dd0f21c32 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -88,7 +88,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } void JustSummoned(Creature* summoned) override @@ -198,7 +198,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 20b6150fe81..4807a0fbcb5 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -105,10 +105,10 @@ class boss_nexusprince_shaffar : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_BEACON, 10000); events.ScheduleEvent(EVENT_FIREBALL, 8000); @@ -211,7 +211,7 @@ class npc_ethereal_beacon : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (Creature* shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100.0f)) if (!shaffar->IsInCombat()) @@ -286,7 +286,7 @@ class npc_ethereal_apprentice : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FIREBOLT, 3000); } @@ -346,7 +346,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_DOUBLE_BREATH, urand(6000,9000)); } diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index aa8bed66fc0..73a2ea00c5b 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -67,9 +67,9 @@ public: Talk(SAY_KILL); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_DARK_SHELL, 20000); events.ScheduleEvent(EVENT_VOID_BLAST, urand(8000, 23000)); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp index 610e751b618..31e04b0f0c1 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp @@ -85,9 +85,9 @@ class boss_anzu : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 14000); events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 5000); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 32547ea8a88..427e009c806 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -88,9 +88,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FLAME_SHOCK, 2000); events.ScheduleEvent(EVENT_ARCANE_SHOCK, 4000); events.ScheduleEvent(EVENT_FROST_SHOCK, 6000); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp index 29e68fa8751..22d7689ec0f 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp @@ -81,9 +81,9 @@ public: BossAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 5000); events.ScheduleEvent(EVENT_POLYMORPH, 8000); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 112f5ebed20..9343aa3119b 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -113,7 +113,7 @@ class boss_ambassador_hellmaw : public CreatureScript Start(true, false, ObjectGuid::Empty, nullptr, false, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _instance->SetBossState(DATA_AMBASSADOR_HELLMAW, IN_PROGRESS); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 00fd6ded1e6..21bf50ee269 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -80,9 +80,9 @@ struct boss_blackheart_the_inciter : public BossAI _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000); events.ScheduleEvent(EVENT_CHARGE_ATTACK, 5000); events.ScheduleEvent(EVENT_WAR_STOMP, 15000); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 529107380fb..ffb53372bd2 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -137,9 +137,9 @@ class boss_grandmaster_vorpil : public CreatureScript Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(7000, 14000)); if (IsHeroic()) events.ScheduleEvent(EVENT_BANISH, 17000); @@ -250,7 +250,7 @@ class npc_voidtraveler : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index d016437e22d..9e4cb192f03 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -84,9 +84,9 @@ class boss_murmur : public CreatureScript me->ResetPlayerDamageReq(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index e75a8448f2a..ccf94857772 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -80,7 +80,7 @@ struct npc_wrathbone_flayer : public ScriptedAI void JustDied(Unit* /*killer*/) override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_CLEAVE, 5000); _events.ScheduleEvent(EVENT_IGNORED, 7000); @@ -201,7 +201,7 @@ struct npc_angered_soul_fragment : public ScriptedAI }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->RemoveAurasDueToSpell(SPELL_GREATER_INVISIBILITY); diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index ed4b49da640..541bda4228c 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -126,10 +126,10 @@ struct boss_gurtogg_bloodboil : public BossAI BossAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_BERSERK, Minutes(10)); events.ScheduleEvent(EVENT_CHANGE_PHASE, Seconds(60)); ScheduleEvents(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 4c8c9d7e541..0eb318acc6e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -478,9 +478,9 @@ struct boss_illidan_stormrage : public BossAI akama->AI()->DoAction(ACTION_ACTIVE_AKAMA_INTRO); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); me->SetCanDualWield(true); if (GameObject* musicController = instance->GetGameObject(DATA_ILLIDAN_MUSIC_CONTROLLER)) musicController->PlayDirectMusic(EVENT_BT_SUMMIT_WALK_3_SOUND_ID); @@ -1626,7 +1626,7 @@ struct npc_maiev : public ScriptedAI _canDown = true; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.SetPhase(PHASE_1); _events.ScheduleEvent(EVENT_CAGE_TRAP, Seconds(30)); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index cf1068c8464..9594465ea83 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -143,12 +143,12 @@ struct boss_illidari_council : public BossAI DoCastSelf(SPELL_EMPYREAL_BALANCE, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (!_inCombat) { _inCombat = true; - _EnterCombat(); + _JustEngagedWith(); for (uint32 bossData : CouncilData) { if (Creature* council = instance->GetCreature(bossData)) @@ -251,7 +251,7 @@ struct IllidariCouncilBossAI : public BossAI events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetCombatPulseDelay(5); me->setActive(true); diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 655506ad2bf..f5b8418fd11 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -119,9 +119,9 @@ struct boss_mother_shahraz : public BossAI _enraged = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SILENCING_SHRIEK, Seconds(22)); events.ScheduleEvent(EVENT_PRISMATIC_SHIELD, Seconds(15)); diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 98f8e278990..a5455876b2d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -341,7 +341,7 @@ struct boss_essence_of_suffering : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetCombatPulseDelay(5); me->setActive(true); @@ -415,7 +415,7 @@ struct boss_essence_of_desire : public BossAI _dead = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SPIRIT_SHOCK, Seconds(11)); events.ScheduleEvent(EVENT_RUNE_SHIELD, Seconds(16)); @@ -527,7 +527,7 @@ struct boss_essence_of_anger : public BossAI DoCastSelf(SPELL_AURA_OF_ANGER); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(ANGER_SAY_FREED); diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index c54050c5c3f..524e4db50ed 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -708,7 +708,7 @@ struct npc_ashtongue_sorcerer : public ScriptedAI } void EnterEvadeMode(EvadeReason /*why*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* who) override { @@ -787,7 +787,7 @@ struct npc_ashtongue_defender : public ScriptedAI me->DespawnOrUnsummon(Seconds(5)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_HEROIC_STRIKE, Seconds(5)); _events.ScheduleEvent(EVENT_SHIELD_BASH, Seconds(10), Seconds(16)); @@ -854,7 +854,7 @@ struct npc_ashtongue_rogue : public ScriptedAI me->DespawnOrUnsummon(Seconds(5)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_DEBILITATING_POISON, Milliseconds(500), Seconds(2)); _events.ScheduleEvent(EVENT_EVISCERATE, Seconds(2), Seconds(5)); @@ -912,7 +912,7 @@ struct npc_ashtongue_elementalist : public ScriptedAI me->DespawnOrUnsummon(Seconds(5)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_RAIN_OF_FIRE, Seconds(18)); _events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(6)); @@ -979,7 +979,7 @@ struct npc_ashtongue_spiritbinder : public ScriptedAI me->DespawnOrUnsummon(Seconds(5)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SPIRIT_HEAL, Seconds(5), Seconds(6)); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index e6e7673163a..7b77e39744e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -81,9 +81,9 @@ struct boss_supremus : public BossAI _DespawnAtEvade(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); ChangePhase(); events.ScheduleEvent(EVENT_BERSERK, Minutes(15)); events.ScheduleEvent(EVENT_FLAME, Seconds(20)); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 3f48e84c54a..c156a1aa10c 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -122,9 +122,9 @@ struct boss_teron_gorefiend : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.SetPhase(PHASE_COMBAT); events.ScheduleEvent(EVENT_ENRAGE, Minutes(10)); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 52bb63caf68..35c19760c7e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -102,9 +102,9 @@ struct boss_najentus : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_NEEDLE, Seconds(2)); events.ScheduleEvent(EVENT_SHIELD, Seconds(60)); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index c4c594677d5..85fa9eb3f90 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -213,7 +213,7 @@ public: me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { StartEvent(who); } @@ -361,7 +361,7 @@ public: ENSURE_AI(boss_fathomlord_karathress::boss_fathomlord_karathressAI, Karathress->AI())->EventSharkkisDeath(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { instance->SetGuidData(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); @@ -493,7 +493,7 @@ public: ENSURE_AI(boss_fathomlord_karathress::boss_fathomlord_karathressAI, Karathress->AI())->EventTidalvessDeath(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { instance->SetGuidData(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); @@ -615,7 +615,7 @@ public: ENSURE_AI(boss_fathomlord_karathress::boss_fathomlord_karathressAI, Karathress->AI())->EventCaribdisDeath(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { instance->SetGuidData(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index b22c5ae38a4..01d05abb495 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -175,7 +175,7 @@ public: } } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 6aeb637d172..ccd10905332 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -253,14 +253,14 @@ public: instance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { // remove old tainted cores to prevent cheating in phase 2 Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) if (Player* player = itr->GetSource()) player->DestroyItemCount(31088, 1, true); - StartEvent(); // this is EnterCombat(), so were are 100% in combat, start the event + StartEvent(); // this is JustEngagedWith(), so were are 100% in combat, start the event if (Phase != 2) AttackStart(who); @@ -600,7 +600,7 @@ public: VashjGUID = instance->GetGuidData(DATA_LADYVASHJ); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -680,7 +680,7 @@ public: ENSURE_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->EventTaintedElementalDeath(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { AddThreat(who, 0.1f); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 2351119626d..97888f62955 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -135,7 +135,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (!victimGUID) return; @@ -411,7 +411,7 @@ public: instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (me->HasAura(AURA_BANISH)) return; @@ -650,7 +650,7 @@ public: DoCast(me, 8149, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { StartEvent(); } @@ -724,7 +724,7 @@ public: ENSURE_AI(boss_leotheras_the_blind::boss_leotheras_the_blindAI, leotheras->AI())->CheckChannelers(/*false*/); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { me->InterruptNonMeleeSpells(false); instance->SetGuidData(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID()); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 20d1b186949..1a84c014d0f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -167,7 +167,7 @@ public: Summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 8d2d134d80c..ea3780eb07e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -160,7 +160,7 @@ public: instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Playercount = me->GetMap()->GetPlayers().getSize(); StartEvent(); @@ -324,7 +324,7 @@ public: me->SetFaction(FACTION_MONSTER); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* who) override diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index b5c3e038a50..885837bf2bd 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -67,10 +67,10 @@ class boss_hydromancer_thespia : public CreatureScript Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 15000); events.ScheduleEvent(EVENT_LUNG_BURST, 7000); @@ -138,7 +138,7 @@ class npc_coilfang_waterelemental : public CreatureScript _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, urand(3000, 6000)); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 33eb0c5ff07..ff9df76e4a0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -109,7 +109,7 @@ public: Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -232,7 +232,7 @@ public: //react only if attacked } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index 78e92d7b4f1..7f1672fe609 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -76,7 +76,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void StartRageGen(Unit* /*caster*/) { @@ -137,7 +137,7 @@ public: instance->SetBossState(DATA_WARLORD_KALITHRESH, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index 10087f0b1bf..fe6268da9e8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -182,9 +182,9 @@ public: me->SetControlled(true, UNIT_STATE_ROOT); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_INITIAL_EMERGE, Milliseconds(4)); events.ScheduleEvent(EVENT_SYNCH_HEALTH, Seconds(3)); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp index 4b1b5c105a5..985188a19c0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp @@ -71,9 +71,9 @@ class boss_mennu_the_betrayer : public CreatureScript Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30000); events.ScheduleEvent(EVENT_TAINTED_EARTHGRAB_TOTEM, 20000); events.ScheduleEvent(EVENT_CORRUPTED_NOVA_TOTEM, 60000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp index 63a84af21b8..de39f52e5ec 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp @@ -61,9 +61,9 @@ class boss_quagmirran : public CreatureScript _JustDied(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_ACID_SPRAY, 25000); events.ScheduleEvent(EVENT_CLEAVE, 9000); events.ScheduleEvent(EVENT_UPPERCUT, 20000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp index 519317051df..6e0a796d023 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp @@ -69,9 +69,9 @@ class boss_rokmar_the_crackler : public CreatureScript _JustDied(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10000); events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20000); events.ScheduleEvent(EVENT_WATER_SPIT, 14000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp index 0db30a49dde..fdd5c88963f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp @@ -69,7 +69,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } @@ -151,7 +151,7 @@ public: void AttackStart(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp index 00b775fe9f9..ac48bceb1d1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp @@ -88,7 +88,7 @@ public: Striders.DespawnAll(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustSummoned(Creature* summon) override { diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 2ac442674ce..f050c1d9e39 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -104,9 +104,9 @@ class boss_gruul : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 02e2ee579c5..b217ef479eb 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -131,7 +131,7 @@ public: Talk(SAY_OGRE_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -254,7 +254,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -341,7 +341,7 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -433,7 +433,7 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -516,7 +516,7 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index a82ba283d18..d9baabc0ba2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -61,9 +61,9 @@ class boss_broggok : public CreatureScript DoAction(ACTION_RESET_BROGGOK); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 452ce7bd2f1..1c28c3795b4 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -100,9 +100,9 @@ class boss_kelidan_the_breaker : public CreatureScript me->SetImmuneToAll(true); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_WAKE); if (me->IsNonMeleeSpellCast(false)) me->InterruptNonMeleeSpells(true); @@ -301,7 +301,7 @@ class npc_shadowmoon_channeler : public CreatureScript me->InterruptNonMeleeSpells(true); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) ENSURE_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerEngaged(who); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index fff06ad43fa..34547cf1b48 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -51,9 +51,9 @@ class boss_the_maker : public CreatureScript { boss_the_makerAI(Creature* creature) : BossAI(creature, DATA_THE_MAKER) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ACID_SPRAY, 15000); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 34f3d9c18f9..0f93e4338d5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -86,9 +86,9 @@ class boss_omor_the_unscarred : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index ccec473f24d..81af9793526 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -91,7 +91,7 @@ class boss_nazan : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void IsSummonedBy(Unit* summoner) override { @@ -227,10 +227,10 @@ class boss_vazruden : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void KilledUnit(Unit* who) override @@ -356,7 +356,7 @@ class boss_vazruden_the_herald : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (phase == 0) { @@ -482,7 +482,7 @@ class npc_hellfire_sentry : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* killer) override { diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 77aef0eebc9..1f5dd5aa32b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -75,12 +75,12 @@ class boss_watchkeeper_gargolmar : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000); events.ScheduleEvent(EVENT_SURGE, 4000); - _EnterCombat(); + _JustEngagedWith(); } void MoveInLineOfSight(Unit* who) override diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 9daac72a439..ef83ec9af8d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -330,7 +330,7 @@ class npc_hellfire_channeler : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->InterruptNonMeleeSpells(false); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index e44dfd8c9c1..59f3ae424a8 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -200,7 +200,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } @@ -327,7 +327,7 @@ class npc_fel_orc_convert : public CreatureScript void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_HEMORRHAGE, 3000); @@ -388,7 +388,7 @@ class npc_lesser_shadow_fissure : public CreatureScript void Reset() override { } void MoveInLineOfSight(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 70aecff5f91..7ff3363c943 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -197,7 +197,7 @@ class boss_warbringer_omrogg : public CreatureScript ThreatYell = true; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); @@ -416,7 +416,7 @@ class npc_omrogg_heads : public CreatureScript void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SetData(uint32 data, uint32 value) override { diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 6ab28eb2288..cf1976e1a5b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -124,7 +124,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript removeAdds(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 185247c7225..07ce00a4a63 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -171,9 +171,9 @@ class boss_alar : public CreatureScript me->setActive(false); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); me->SetDisableGravity(true); // after enterevademode will be set walk movement me->setActive(true); } @@ -510,7 +510,7 @@ class npc_ember_of_alar : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -574,7 +574,7 @@ class npc_flame_patch_alar : public CreatureScript { npc_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) { } void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 1e1129b2f7f..f7874b392f7 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -169,10 +169,10 @@ class boss_high_astromancer_solarian : public CreatureScript _JustDied(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void SummonMinion(uint32 entry, float x, float y, float z) @@ -448,7 +448,7 @@ class npc_solarium_priest : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 4af6ba9dbce..d6e88a17fab 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -905,7 +905,7 @@ class boss_thaladred_the_darkener : public CreatureScript advisorbase_ai::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_THALADRED_AGGRO); AddThreat(who, 5000000.0f); @@ -1003,7 +1003,7 @@ class boss_lord_sanguinar : public CreatureScript advisorbase_ai::Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_SANGUINAR_AGGRO); } @@ -1099,7 +1099,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_CAPERNIAN_AGGRO); } @@ -1206,7 +1206,7 @@ class boss_master_engineer_telonicus : public CreatureScript advisorbase_ai::JustDied(killer); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_TELONICUS_AGGRO); } @@ -1283,7 +1283,7 @@ class npc_kael_flamestrike : public CreatureScript void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 2a1592b6a6c..b17aba9fcab 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -79,10 +79,10 @@ class boss_void_reaver : public CreatureScript _JustDied(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_POUNDING, 15000); events.ScheduleEvent(EVENT_ARCANE_ORB, 3000); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index 7d1a4c484fd..b9eedc85432 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -65,7 +65,7 @@ class npc_crystalcore_devastator : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp index 99dc00ef239..8b8c9e1302a 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -65,9 +65,9 @@ class boss_gatewatcher_gyrokill : public CreatureScript Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000); events.ScheduleEvent(EVENT_SAW_BLADE, 20000); events.ScheduleEvent(EVENT_SHADOW_POWER, 25000); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 996ee8568e5..a820969383b 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -61,9 +61,9 @@ class boss_gatewatcher_iron_hand : public CreatureScript { boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 55000); events.ScheduleEvent(EVENT_JACKHAMMER, 45000); events.ScheduleEvent(EVENT_SHADOW_POWER, 25000); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index 9820ba7d654..62f5dc423f7 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -75,9 +75,9 @@ class boss_mechano_lord_capacitus : public CreatureScript { boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(YELL_AGGRO); events.ScheduleEvent(EVENT_HEADCRACK, 10 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 15 * IN_MILLISECONDS); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index a3d1fa9ee55..18e8efcd220 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -68,9 +68,9 @@ class boss_nethermancer_sepethrea : public CreatureScript { boss_nethermancer_sepethreaAI(Creature* creature) : BossAI(creature, DATA_NETHERMANCER_SEPRETHREA) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000)); events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(12000, 18000)); events.ScheduleEvent(EVENT_DRAGONS_BREATH, urand(18000, 22000)); @@ -183,7 +183,7 @@ class npc_ragin_flames : public CreatureScript me->SetSpeedRate(MOVE_RUN, DUNGEON_MODE(0.5f, 0.7f)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 095e7c74067..0fae05c2766 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -75,9 +75,9 @@ class boss_pathaleon_the_calculator : public CreatureScript { boss_pathaleon_the_calculatorAI(Creature* creature) : BossAI(creature, DATA_PATHALEON_THE_CALCULATOR) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SUMMON, 30000); events.ScheduleEvent(EVENT_MANA_TAP, urand(12000, 20000)); events.ScheduleEvent(EVENT_ARCANE_TORRENT, urand(16000, 25000)); @@ -198,7 +198,7 @@ class npc_nether_wraith : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index eafd1f679f4..cc7397d6f26 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -325,11 +325,11 @@ class npc_warden_mellichar : public CreatureScript float attackRadius = me->GetAttackDistance(who)/10; if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) - EnterCombat(who); + JustEngagedWith(who); } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(YELL_INTRO1); DoCast(me, SPELL_BUBBLE_VISUAL); @@ -545,7 +545,7 @@ class npc_zerekethvoidzone : public CreatureScript DoCast(me, SPELL_VOID_ZONE_DAMAGE); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp index 382e7ddcd18..012fb80566d 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp @@ -84,9 +84,9 @@ class boss_dalliah_the_doomsayer : public CreatureScript soccothrates->AI()->SetData(1, 1); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, urand(1000, 4000)); events.ScheduleEvent(EVENT_WHIRLWIND, urand(7000, 9000)); if (IsHeroic()) diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 068e0b02211..9b840bf3c6c 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -112,7 +112,7 @@ class boss_harbinger_skyriss : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* /*killer*/) override { @@ -289,7 +289,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp index c9b191a659b..ae670817e9f 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp @@ -111,9 +111,9 @@ class boss_wrath_scryer_soccothrates : public CreatureScript dalliah->AI()->SetData(1, 1); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000)); events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000)); events.ScheduleEvent(EVENT_ME_FIRST, 6000); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index 766ee14d41f..f9b7b01f267 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -61,9 +61,9 @@ class boss_zereketh_the_unbound : public CreatureScript Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_VOID_ZONE, urand (6000, 10000)); events.ScheduleEvent(EVENT_SHADOW_NOVA, urand (6000, 10000)); events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, urand(12000, 20000)); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index 9a5f4ee09fa..3551cd1e7d4 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -67,9 +67,9 @@ class boss_commander_sarannis : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCANE_RESONANCE, 42700); events.ScheduleEvent(EVENT_ARCANE_DEVASTATION, 15200); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 6dc3ee02f5b..88c1cdbc2f5 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -92,7 +92,7 @@ class boss_high_botanist_freywinn : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index a836162b5b6..7d18b01133a 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -164,7 +164,7 @@ class boss_laj : public CreatureScript CanSummon = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index f210444fd9f..20647f08ae1 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -68,9 +68,9 @@ class boss_thorngrin_the_tender : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SACRIFICE, 5700); events.ScheduleEvent(EVENT_HELLFIRE, IsHeroic() ? urand(17400, 19300) : 18000); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index f09f2007262..455360570ca 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -92,7 +92,7 @@ class npc_warp_splinter_treant : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -171,7 +171,7 @@ class boss_warp_splinter : public CreatureScript me->SetSpeedRate(MOVE_RUN, 0.7f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index ee0d90b12f0..8548116f3f0 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -86,7 +86,7 @@ class boss_doomlord_kazzak : public CreatureScript Talk(SAY_INTRO); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index a73159c4a78..958a4b566c8 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -90,7 +90,7 @@ class boss_doomwalker : public CreatureScript Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index a3fc4d1bfc9..ccf6e6aa236 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -103,7 +103,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* who) override @@ -249,7 +249,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* who) override diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 90391331d33..4d2a2d4b834 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -263,7 +263,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) Talk(SAY_ELF_AGGRO); diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 22bf85cca64..84578db564f 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -87,7 +87,7 @@ public: FrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_EARTHBIND_TOTEM, false); } @@ -237,7 +237,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* who) override @@ -456,7 +456,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_KUR_EARTHBIND_TOTEM, false); } diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 2e8cfb2c3bd..0ac88250981 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -114,7 +114,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustSummoned(Creature* summoned) override { @@ -402,7 +402,7 @@ public: me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) PlayerGUID = who->GetGUID(); diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index a13a1fb02f8..6cced21f333 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -686,7 +686,7 @@ public: DoSummon(NPC_COILSKAR_ASSASSIN, me, 15.0f, 5000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { //don't always use if (rand32() % 5) @@ -878,7 +878,7 @@ public: me->SetTarget(ObjectGuid::Empty); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void HandleAnimation() { @@ -1047,7 +1047,7 @@ public: me->SetVisible(false); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } @@ -1182,7 +1182,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* /*killer*/) override { @@ -1452,7 +1452,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { switch (me->GetEntry()) { diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 8ecac60dcff..590342d4a8f 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -84,7 +84,7 @@ public: me->SetFaction(FACTION_OGRE); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DoNice() { @@ -198,7 +198,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* who) override diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 56a35e1ac0c..45efd2dcf96 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -285,7 +285,7 @@ class npc_pet_gen_mojo : public CreatureScript me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 /*diff*/) override { } void ReceiveEmote(Player* player, uint32 emote) override diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp index 263bcf2038f..2523dd63896 100644 --- a/src/server/scripts/Pet/pet_hunter.cpp +++ b/src/server/scripts/Pet/pet_hunter.cpp @@ -55,7 +55,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript _isViper = false; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void Reset() override { diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index 42716b22dfa..06d9ce4cb49 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -126,7 +126,7 @@ class npc_pet_mage_mirror_image : public CreatureScript owner->CastSpell(me, SPELL_MAGE_CLONE_ME, false); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (me->GetVictim() && !me->GetVictim()->HasBreakableByDamageCrowdControlAura(me)) { diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index c6839cdb836..39b16715a71 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -272,10 +272,10 @@ class boss_ysondre : public CreatureScript events.ScheduleEvent(EVENT_LIGHTNING_WAVE, 12000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_YSONDRE_AGGRO); - WorldBossAI::EnterCombat(who); + WorldBossAI::JustEngagedWith(who); } // Summon druid spirits on 75%, 50% and 25% health @@ -366,10 +366,10 @@ class boss_lethon : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, 10000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_LETHON_AGGRO); - WorldBossAI::EnterCombat(who); + WorldBossAI::JustEngagedWith(who); } void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override @@ -501,10 +501,10 @@ class boss_emeriss : public CreatureScript emerald_dragonAI::KilledUnit(who); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_EMERISS_AGGRO); - WorldBossAI::EnterCombat(who); + WorldBossAI::JustEngagedWith(who); } void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override @@ -599,10 +599,10 @@ class boss_taerar : public CreatureScript events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_TAERAR_AGGRO); - emerald_dragonAI::EnterCombat(who); + emerald_dragonAI::JustEngagedWith(who); } void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) override diff --git a/src/server/scripts/World/npc_guard.cpp b/src/server/scripts/World/npc_guard.cpp index 4a18782348d..d8b018575f4 100644 --- a/src/server/scripts/World/npc_guard.cpp +++ b/src/server/scripts/World/npc_guard.cpp @@ -111,7 +111,7 @@ struct npc_guard_generic : public GuardAI DoReplyToTextEmote(textEmote); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY) Talk(SAY_GUARD_SIL_AGGRO, who); @@ -199,7 +199,7 @@ struct npc_guard_shattrath_faction : public GuardAI _scheduler.CancelAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { ScheduleVanish(); } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 601f0d23421..3c8dac9d8de 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -287,7 +287,7 @@ public: me->RemoveNpcFlag(UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -408,7 +408,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void ReceiveEmote(Player* player, uint32 emote) override { @@ -793,7 +793,7 @@ public: void UpdateAI(uint32 diff) override; - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void QuestAccept(Player* player, Quest const* quest) override { @@ -865,7 +865,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* caster, SpellInfo const* spell) override { @@ -1071,7 +1071,7 @@ public: me->SetHealth(me->CountPctFromMaxHealth(70)); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* caster, SpellInfo const* spell) override { @@ -1173,7 +1173,7 @@ public: me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } @@ -1386,7 +1386,7 @@ public: npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) { } void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void OnPossess(bool apply) { @@ -1439,7 +1439,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -2347,7 +2347,7 @@ public: me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DoAction(int32 /*param*/) override { |