diff options
Diffstat (limited to 'src/server/scripts/Kalimdor')
67 files changed, 127 insertions, 127 deletions
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); } |