diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-01-14 23:53:08 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-01-14 23:53:08 +0100 |
| commit | e660c8bc19198d9e2e912c5243498469f75b0ee6 (patch) | |
| tree | 15a84d32a7de5a4d20faec9fcea8096123bc0a63 | |
| parent | 2b024e8fbff24b071217cd88f052fdeaa48b47ba (diff) | |
Scripts: Fix rbac permission for skipping default boss sequencing check
202 files changed, 403 insertions, 444 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index e6cff2f35d0..9c9dfd8930b 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -525,12 +525,12 @@ void BossAI::_JustReachedHome() me->setActive(false); } -void BossAI::_JustEngagedWith() +void BossAI::_JustEngagedWith(Unit* who) { if (instance) { // bosses do not respawn, check only on enter combat - if (!instance->CheckRequiredBosses(_bossId)) + if (!instance->CheckRequiredBosses(_bossId, who->ToPlayer())) { EnterEvadeMode(EVADE_REASON_SEQUENCE_BREAK); return; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 483c9b45cf4..150f3323833 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -326,7 +326,7 @@ class TC_GAME_API BossAI : public ScriptedAI virtual void ScheduleTasks() { } void Reset() override { _Reset(); } - void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); } + void JustEngagedWith(Unit* who) override { _JustEngagedWith(who); } void JustDied(Unit* /*killer*/) override { _JustDied(); } void JustReachedHome() override { _JustReachedHome(); } @@ -334,7 +334,7 @@ class TC_GAME_API BossAI : public ScriptedAI protected: void _Reset(); - void _JustEngagedWith(); + void _JustEngagedWith(Unit* who); void _JustDied(); void _JustReachedHome(); void _DespawnAtEvade(Seconds delayToRespawn, Creature* who = nullptr); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp index 9019ddba069..25a39939072 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FIRE_NOVA, 6s); events.ScheduleEvent(EVENT_CLEAVE, 8000); events.ScheduleEvent(EVENT_CONFLIGURATION, 15s); 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 7904c6cfb28..4b5775c6c7a 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FATAL_BITE, 17s, 20s); events.ScheduleEvent(EVENT_INFECTED_BITE, 10s, 12s); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp index f4da4f5324f..79c52bb8f3e 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CORROSIVE_ACID, 8s, 16s); events.ScheduleEvent(EVENT_FREEZE, 8s, 16s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp index 79da9eee2e9..32fd1457963 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_REND, 17s, 20s); events.ScheduleEvent(EVENT_THRASH, 10s, 12s); } 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 b9f2e3bf241..03a2fd99842 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 4dca64f382d..536c952e6de 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, 6s, 8s); events.ScheduleEvent(EVENT_SHADOW_WRATH, 9s, 18s); } 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 26b782241b6..f2f1f968adb 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CRYSTALIZE, 20 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_MOTHERS_MILK, 10s); } 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 2895fd15bb6..66d89c4276f 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BLAST_WAVE, 20s); events.ScheduleEvent(EVENT_SHOUT, 2s); events.ScheduleEvent(EVENT_CLEAVE, 6s); 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 d2e57edc6f7..dd2640c0ed1 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHOOT, 1s); events.ScheduleEvent(EVENT_STUN_BOMB, 16s); } 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 27c601d1fd8..71ba849f116 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_WHIRLWIND, 13s, 15s); events.ScheduleEvent(EVENT_CLEAVE, 15s, 17s); events.ScheduleEvent(EVENT_MORTAL_STRIKE, 17s, 19s); 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 a2cc904e031..b0cf8902f65 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2s); events.ScheduleEvent(EVENT_HEX, 8 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_CLEAVE, 14s); 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 ca0d824cc93..d2e59177be3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -145,9 +145,9 @@ struct boss_the_beast : public BossAI } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FLAME_BREAK, 12s); events.ScheduleEvent(EVENT_IMMOLATE, 3s); events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23s); 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 13b7909b3c1..27846ea47c4 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(SPELL_REND, 17s, 20s); events.ScheduleEvent(SPELL_STRIKE, 10s, 12s); 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 651707e03e0..46b3794fb6e 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SNAP_KICK, 8s); events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_UPPERCUT, 20s); 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 df895fd9f4d..9a06976bc48 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, 8s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp index 73265637979..be980775316 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 e13e716a3d6..78ad471a3c1 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s); events.ScheduleEvent(EVENT_WINGBUFFET, 30s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp index 7c452b1d1e0..449aea15e99 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s); events.ScheduleEvent(EVENT_WINGBUFFET, 30s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp index d5701a7fbfd..dacc867df4c 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s); events.ScheduleEvent(EVENT_WINGBUFFET, 30s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 3cb281c8475..a1a53ce17ef 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -204,7 +204,7 @@ public: void BeginEvent(Player* target) { - _JustEngagedWith(); + _JustEngagedWith(target); Talk(SAY_GAMESBEGIN_2); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index ecbb4a57b2b..c276bb7b743 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoCast(me, SPELL_ESSENCEOFTHERED); me->SetHealth(me->CountPctFromMaxHealth(30)); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 4526d1b8d3e..596cf9b6f73 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_HATEFUL_BOLT, 12s); 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 2c946d4025e..7500931ef63 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCastSelf(SPELL_HOLYGROUND, true); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 655189a5534..9368239ba6a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -181,9 +181,9 @@ public: instance->HandleGameObject(instance->GetGuidData(DATA_MASTERS_TERRACE_DOOR_2), open); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(YELL_AGGRO); SetupGroundPhase(); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index f03df2a61c4..5761c180729 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, 10min); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index d1147bbcf49..41717966e0a 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -141,9 +141,9 @@ struct boss_felblood_kaelthas : public BossAI _firstGravityLapse = true; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.SetPhase(PHASE_ONE); events.ScheduleEvent(EVENT_FIREBALL, 1ms, 0, PHASE_ONE); events.ScheduleEvent(EVENT_FLAME_STRIKE, 44s, 0, PHASE_ONE); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 0abd9c754e5..ea181382b56 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100ms, 0, PHASE_NORMAL); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index a8d4070e9f1..1985e03ea6a 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -83,10 +83,10 @@ class boss_vexallus : public CreatureScript Talk(SAY_KILL); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8s); events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5s); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 4e3b97506f5..73d40e14f3b 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -55,9 +55,9 @@ struct boss_arcanist_doan : public BossAI _healthAbove50Pct = true; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SILENCE, 15s); 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 1ecbd57b92d..80179501e2f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -46,9 +46,9 @@ struct boss_azshir_the_sleepless : public BossAI _siphon = false; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30s); events.ScheduleEvent(EVENT_TERRIFY, 20s); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index 4682bf289b8..e399baa0c59 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -55,10 +55,10 @@ struct boss_bloodmage_thalnos : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s); events.ScheduleEvent(EVENT_SHADOW_BOLT, 2s); events.ScheduleEvent(EVENT_FLAME_SPIKE, 8s); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 435e00e78ea..b75f857d8c6 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -64,11 +64,11 @@ struct boss_herod : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); DoCast(me, SPELL_RUSHINGCHARGE); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CLEAVE, 12s); events.ScheduleEvent(EVENT_WHIRLWIND, 1min); 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 65c726cc3c5..f5d91e404fd 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -73,9 +73,9 @@ struct boss_high_inquisitor_fairbanks : public BossAI me->SetStandState(UNIT_STAND_STATE_DEAD); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CURSE_BLOOD, 10s); events.ScheduleEvent(EVENT_DIPEL_MAGIC, 30s); events.ScheduleEvent(EVENT_FEAR, 40s); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 592f1772154..0a6571e5795 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -39,9 +39,9 @@ struct boss_houndmaster_loksey : public BossAI { boss_houndmaster_loksey(Creature* creature) : BossAI(creature, DATA_HOUNDMASTER_LOKSEY) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCast(SPELL_SUMMON_SCARLET_HOUND); events.ScheduleEvent(EVENT_BLOODLUST, 20s); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index ea9bed63ca0..a2a0280b331 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -57,10 +57,10 @@ struct boss_interrogator_vishas : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5s); } 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 422be5cb01b..9f7ac20331d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -103,9 +103,9 @@ public: instance->HandleGameObject(ObjectGuid::Empty, false, instance->GetGameObject(DATA_HIGH_INQUISITORS_DOOR)); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_MO_AGGRO); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index 4a4c12ba91f..c9d10609255 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -39,9 +39,9 @@ struct boss_scorn : public BossAI { boss_scorn(Creature* creature) : BossAI(creature, DATA_SCORN) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_LICH_SLAP, 45s); events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30s); events.ScheduleEvent(EVENT_MIND_FLAY, 30s); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index a7f923ebdb5..42e48427603 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ARCANEMISSILES, 4500ms); events.ScheduleEvent(EVENT_SHADOWSHIELD, 12s); events.ScheduleEvent(EVENT_CURSE, 2s); 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 d274b021352..a9d9b422951 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_REND, 8s); events.ScheduleEvent(EVENT_BACKHAND, 9s); events.ScheduleEvent(EVENT_FRENZY, 1s); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index a7912707acf..fb82675d70a 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CURSEOFAGONY, 18s); events.ScheduleEvent(EVENT_SHADOWSHOCK, 9s); events.ScheduleEvent(EVENT_SILENCE, 5s); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 63a923c41b5..dae8dea2f9e 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CALLOFGRAVES, 4s); events.ScheduleEvent(EVENT_CORRUPTION, 8s); events.ScheduleEvent(EVENT_RENEW, 32s); 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 70245a7f8a0..21d81588499 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { events.ScheduleEvent(EVENT_SWOOP, 8s, 8s); events.ScheduleEvent(EVENT_WING_FLAP, 15s, 15s); @@ -97,7 +97,7 @@ class boss_kirtonos_the_herald : public CreatureScript events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 53s, 53s); events.ScheduleEvent(EVENT_DOMINATE_MIND, 34s, 48s); events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, 20s, 20s); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void JustDied(Unit* /*killer*/) override 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 6edad834378..962f9b5dec7 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_IMMOLATE, 7s); events.ScheduleEvent(EVENT_VEILOFSHADOW, 15s); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index 6f69a40529e..8ae50697d9b 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_VOLATILEINFECTION, 38s); events.ScheduleEvent(EVENT_DARKPLAGUE, 8s); events.ScheduleEvent(EVENT_CORROSIVEACID, 45s); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 88190aa8e39..63050b56ab5 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_TRAMPLE, 24s); events.ScheduleEvent(EVENT_CLEAVE, 15s); events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 40s); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 4918d11356c..66fc71f1edf 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -255,9 +255,9 @@ class boss_archmage_arugal : public CreatureScript Talk(SAY_TRANSFORM); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CURSE, 7s); events.ScheduleEvent(EVENT_TELEPORT, 15s); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index bf7fb74f4dd..1e3670cffd5 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -208,11 +208,11 @@ struct boss_kalecgos : public BossAI damage = 0; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_EVIL_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (Creature* kalecgosHuman = me->SummonCreature(NPC_KALECGOS_HUMAN, KalecgosSummonPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) if (Creature* sathrovar = instance->GetCreature(DATA_SATHROVARR)) @@ -462,9 +462,9 @@ struct boss_sathrovarr : public BossAI events.ScheduleEvent(EVENT_CHECK_TIMER, 1s); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_SATH_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index e08e2b2c401..c0034cebb38 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoCast(me, SPELL_OPEN_PORTAL_PERIODIC, true); DoCast(me, SPELL_DARKNESS_PERIODIC, true); DoCast(me, SPELL_NEGATIVE_ENERGY_PERIODIC, true); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 94171105fa2..18efaf22e28 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -113,9 +113,9 @@ class boss_akilzon : public CreatureScript SetWeather(WEATHER_STATE_FINE, 0.0f); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_STATIC_DISRUPTION, 10s, 20s); // 10 to 20 seconds (bosskillers) events.ScheduleEvent(EVENT_GUST_OF_WIND, 20s, 30s); // 20 to 30 seconds(bosskillers) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index f9a5d675950..f0c8327de53 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -114,9 +114,9 @@ class boss_halazzi : public CreatureScript EnterPhase(PHASE_LYNX); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); EnterPhase(PHASE_LYNX); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index f1c1a50d009..6c6408c9714 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -290,9 +290,9 @@ class boss_hexlord_malacrass : public CreatureScript me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(YELL_AGGRO); for (uint8 i = 0; i < 4; ++i) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 99697a547f9..8f0eee9e7d1 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -178,9 +178,9 @@ class boss_janalai : public CreatureScript Talk(SAY_SLAY); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 1bdb2cd3b91..b7072f7b650 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -237,9 +237,9 @@ class boss_nalorakk : public CreatureScript } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(YELL_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 28175cdd9f7..62a8238881c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -202,9 +202,9 @@ class boss_zuljin : public CreatureScript //me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(YELL_INTRO); SpawnAdds(); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 8c785fd3ccf..c16c9a51fce 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -124,9 +124,9 @@ class boss_arlokk : public CreatureScript Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(7000, 9000), 0, PHASE_ONE); events.ScheduleEvent(EVENT_GOUGE, urand(12000, 15000), 0, PHASE_ONE); events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6s, 0, PHASE_ALL); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp index 9626e18a4c7..30c94bc3417 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp @@ -52,9 +52,9 @@ class boss_gahzranka : public CreatureScript // gahzranka _JustDied(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FROSTBREATH, 8s); events.ScheduleEvent(EVENT_MASSIVEGEYSER, 25s); events.ScheduleEvent(EVENT_SLAM, 15s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index a8cdfc19daf..fe7f35a45b9 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -50,9 +50,9 @@ class boss_grilek : public CreatureScript // grilek _JustDied(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_AVATAR, 15s, 25s); events.ScheduleEvent(EVENT_GROUND_TREMOR, 15s, 25s); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index ff598238ddb..5293177f6cc 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -82,9 +82,9 @@ class boss_hakkar : public CreatureScript _JustDied(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90s); events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 25s); events.ScheduleEvent(EVENT_CAUSE_INSANITY, 15s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index c4a0ff7238e..8e07f1eac40 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -52,9 +52,9 @@ class boss_hazzarah : public CreatureScript _JustDied(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_MANABURN, 4s, 10s); events.ScheduleEvent(EVENT_SLEEP, 10s, 18s); events.ScheduleEvent(EVENT_ILLUSIONS, 10s, 18s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 83222e60047..865c0ca93bd 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -96,9 +96,9 @@ class boss_jeklik : public CreatureScript Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.SetPhase(PHASE_ONE); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index 4a13bea84ad..6a643276187 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -86,9 +86,9 @@ class boss_jindo : public CreatureScript _JustDied(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, 20s); events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, 15s); events.ScheduleEvent(EVENT_HEX, 8s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 78f36a9e869..acde201a8d3 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -144,9 +144,9 @@ class boss_mandokir : public CreatureScript me->SetImmuneToAll(false); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_OVERPOWER, 7s, 9s); events.ScheduleEvent(EVENT_MORTAL_STRIKE, 12s, 18s); events.ScheduleEvent(EVENT_WHIRLWIND, 24s, 30s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index bd4bba2d82f..21cbc8f939a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -109,9 +109,9 @@ class boss_marli : public CreatureScript Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPAWN_START_SPIDERS, 1s, 0, PHASE_ONE); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index 126557382f2..fb89448d998 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -59,16 +59,6 @@ class boss_renataki : public CreatureScript Initialize(); } - void JustDied(Unit* /*killer*/) override - { - _JustDied(); - } - - void JustEngagedWith(Unit* /*who*/) override - { - _JustEngagedWith(); - } - void UpdateAI(uint32 diff) override { if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 8ac25df81ff..2ad920d44b9 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -151,9 +151,9 @@ class boss_thekal : public CreatureScript instance->SetBossState(DATA_ZATH, DONE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.SetPhase(PHASE_ONE); events.ScheduleEvent(EVENT_MORTALCLEAVE, 4s, 0, PHASE_ONE); events.ScheduleEvent(EVENT_SILENCE, 9s, 0, PHASE_ONE); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 43f2a682490..dd366b476b3 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -122,9 +122,9 @@ class boss_venoxis : public CreatureScript me->RemoveAllAuras(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetReactState(REACT_AGGRESSIVE); // Always running events events.ScheduleEvent(EVENT_THRASH, 5s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 8d388a6b442..977716e1081 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -40,19 +40,9 @@ class boss_wushoolay : public CreatureScript { boss_wushoolayAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) { } - void Reset() override + void JustEngagedWith(Unit* who) override { - _Reset(); - } - - void JustDied(Unit* /*killer*/) override - { - _JustDied(); - } - - void JustEngagedWith(Unit* /*who*/) override - { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, 5s, 10s); events.ScheduleEvent(EVENT_LIGHTNINGWAVE, 8s, 16s); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index 55d4e450e5d..ff1ff5289ad 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_POISON_CLOUD, 5s, 9s); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index 9e9f2f1ad11..fc223d35cb7 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_THROW_NET, 2s, 4s); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index c69e02f963e..272817a24bf 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MIND_BLAST, 2s, 5s); events.ScheduleEvent(EVENT_SLEEP, 9s, 12s); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index a19ee1fc602..89e46b7b128 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -299,10 +299,10 @@ public: me->RemoveAllAuras(); // Reset Soul Charge auras. } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FEAR, 42s); events.ScheduleEvent(EVENT_AIR_BURST, 30s); events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, 5s, 25s); 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 4d4993c50b6..c5c5b272603 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 @@ -63,9 +63,9 @@ class boss_epoch : public CreatureScript me->RemoveLootMode(LOOT_MODE_DEFAULT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); _stepTargetIndex = 0; _stepTargets.clear(); 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 b797b3e9967..3286e02d707 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp @@ -75,10 +75,10 @@ class boss_infinite_corruptor : public CreatureScript target->CastSpell(target, SPELL_CORRUPTION_OF_TIME_TARGET, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 7s); events.ScheduleEvent(EVENT_VOID_STRIKE, 5s); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 2c0c10a4c7b..9bec3ac49d7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -58,10 +58,10 @@ class boss_meathook : public CreatureScript me->RemoveLootMode(LOOT_MODE_DEFAULT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CHAIN, Seconds(7), Seconds(11)); events.ScheduleEvent(EVENT_DISEASE, Seconds(2)); events.ScheduleEvent(EVENT_FRENZY, Seconds(13), Seconds(17)); 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 68fcf2cfea5..c7b7bcde2f4 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 @@ -70,10 +70,10 @@ class boss_salramm : public CreatureScript me->RemoveLootMode(LOOT_MODE_DEFAULT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SUMMON_GHOULS, randtime(Seconds(19),Seconds(24))); events.ScheduleEvent(EVENT_SHADOW_BOLT, Seconds(2)); diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index bd77d7e5343..8c6551c14d5 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->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 20s); events.ScheduleEvent(EVENT_TAIL_SWEEP, 15s, 20s); 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 f0d7b71b71d..0de301752bd 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_AMNENNARSWRATH, 8s); events.ScheduleEvent(EVENT_FROSTBOLT, 1s); events.ScheduleEvent(EVENT_FROST_NOVA, 10s, 15s); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp index d9c566d17f5..fa29f1984db 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 b49ce16283f..3f6b142577a 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.Reset(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_FIREBALL, 100ms); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp index 2c768ed4917..239feee5a7e 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_WEB_SPRAY, 3s, 5s); events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, 9s, 14s); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index d8a811cc288..ce7975cf808 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -86,7 +86,7 @@ class boss_buru : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(EMOTE_TARGET, who); DoCast(me, SPELL_THORNS); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index aa5fd89eebc..7d1f866561f 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -140,9 +140,9 @@ class boss_ossirian : public CreatureScript Trigger->CastSpell(Trigger, SpellWeakness[urand(0, 4)], false); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.Reset(); events.ScheduleEvent(EVENT_SILENCE, 30s); events.ScheduleEvent(EVENT_CYCLONE, 20s); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index 3d9a4aa2af3..42668abb46d 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -82,17 +82,6 @@ class boss_rajaxx : public CreatureScript events.ScheduleEvent(EVENT_THUNDERCRASH, 12s); } - void JustDied(Unit* /*killer*/) override - { - //SAY_DEATH - _JustDied(); - } - - void JustEngagedWith(Unit* /*victim*/) override - { - _JustEngagedWith(); - } - void UpdateAI(uint32 diff) override { if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index d4af2b06787..289dcc70a2e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -81,10 +81,10 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { DoCastVictim(SPELL_BIRTH); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 98248c95ce8..0362f85f572 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -93,10 +93,10 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 4afdfee1dfb..95cd0d4aaf9 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -135,9 +135,9 @@ class boss_skeram : public CreatureScript me->DespawnOrUnsummon(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.Reset(); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6s, 12s); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index d52d3edc0a3..d13e37c06c2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -151,7 +151,7 @@ struct boss_twinemperorsAI : public BossAI void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Creature* pOtherBoss = GetOtherBoss(); if (pOtherBoss) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index e580ee33a39..37cf18f92d0 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.Reset(); InitSpells(); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index b366d182f9c..5778b6df464 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ROOT, 5s, 9s); events.ScheduleEvent(EVENT_BASH, 10s, 14s); events.ScheduleEvent(EVENT_BOLT, 15s, 20s); 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 acfe049a377..05c94714663 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_PLAGUE, 13s); 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 5526436f671..20d83f3cc20 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { me->RemoveAurasDueToSpell(SPELL_SPHERE_VISUAL); me->RemoveAurasDueToSpell(SPELL_RANDOM_LIGHTNING_VISUAL); me->SummonCreatureGroup(SUMMON_GROUP_WORSHIPPERS); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 a6a21a7419d..0c1b5db8d8c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -111,9 +111,9 @@ class boss_prince_taldaram : public CreatureScript me->SummonCreatureGroup(SUMMON_GROUP_CONTROLLERS); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_BLOODTHIRST, 10s); events.ScheduleEvent(EVENT_VANISH, 25s, 35s); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 1878e09227b..103456736cd 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_SARTHARION_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoZoneInCombat(); FetchDragons(); 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 e08d2eac7ee..7305de488d4 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 @@ -107,10 +107,10 @@ class boss_baltharus_the_warborn : public CreatureScript } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { me->InterruptNonMeleeSpells(false); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.Reset(); events.SetPhase(PHASE_COMBAT); events.ScheduleEvent(EVENT_CLEAVE, Seconds(13), 0, PHASE_COMBAT); 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 f88360fb8f6..34cf55020c0 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, 8s); events.ScheduleEvent(EVENT_INTIDMDATING_ROAR, 14s); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 696e8f30f74..dd8e4958c83 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -238,14 +238,14 @@ class boss_halion : public CreatureScript controller->AI()->EnterEvadeMode(why); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); events.Reset(); events.SetPhase(PHASE_ONE); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->AddAura(SPELL_TWILIGHT_PRECISION, me); events.ScheduleEvent(EVENT_ACTIVATE_FIREWALL, 5s); events.ScheduleEvent(EVENT_BREATH, randtime(Seconds(5), Seconds(15))); @@ -421,11 +421,11 @@ class boss_twilight_halion : public CreatureScript events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, 15s); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { events.SetPhase(PHASE_TWO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->AddAura(SPELL_TWILIGHT_PRECISION, me); events.ScheduleEvent(EVENT_CLEAVE, 3s); events.ScheduleEvent(EVENT_BREATH, 12s); 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 44633fcb3a5..131b77fea34 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.Reset(); events.ScheduleEvent(EVENT_ENRAGE, Seconds(20), EVENT_GROUP_LAND_PHASE); 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 1f2128fcf53..7b90aefd3c9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -270,9 +270,9 @@ class boss_anubarak_trial : public CreatureScript summons.Summon(summoned); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); 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 06e534b99aa..fa71fcb9356 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -130,9 +130,9 @@ struct boss_jaraxxus : public BossAI } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_FEL_FIREBALL, 6s); events.ScheduleEvent(EVENT_FEL_LIGHTNING, 17s); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp index 445dae7314e..41aaa06eb0f 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BELLOWING_ROAR, 33s); events.ScheduleEvent(EVENT_GRIEVOUS_BITE, 20s); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index c7b036c3165..89136073ffc 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 JustEngagedWith(Unit* /* victim */) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 a3ec494817f..b71ead02d08 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -90,10 +90,10 @@ class boss_tharon_ja : public CreatureScript me->RestoreDisplayId(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_DECAY_FLESH, 20s); events.ScheduleEvent(EVENT_CURSE_OF_LIFE, 1s); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index c79a221ce99..2fa286e6a41 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CONSUME, 15s); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index a46b3412ae9..9d68adaf0bf 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 651ce72856f..ba9aba5d3d1 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 @@ -155,9 +155,9 @@ class boss_devourer_of_souls : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_FACE_AGGRO); if (!me->FindNearestCreature(NPC_CRUCIBLE_OF_SOULS, 60)) // Prevent double spawn 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 0a85e9fc36b..18a211e0553 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 d092c47d7bf..c36fa05339d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -160,9 +160,9 @@ struct boss_ick : public BossAI BossAI::JustSummoned(summon); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (Creature* krick = GetKrick()) krick->AI()->Talk(SAY_KRICK_AGGRO); diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 22c31ca3825..73dab15acbf 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 4f689e733ce..5c91761faa9 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BITE, 5s); events.ScheduleEvent(EVENT_SPIT, 10s); events.ScheduleEvent(EVENT_SPRING, 8s); diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index cfdd1bc48d5..d7c3b7a95f4 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -117,9 +117,9 @@ class boss_gal_darah : public CreatureScript _DespawnAtEvade(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 0f2eb720b14..f4f6837b454 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -85,9 +85,9 @@ class boss_moorabi : public CreatureScript events.ScheduleEvent(EVENT_PHANTOM, Seconds(21), 0, PHASE_INTRO); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 cf9164c46f1..e7bca0869fe 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp index 3bdef27667f..8aa17aad1cd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp @@ -350,9 +350,9 @@ struct boss_sister_svalna : public BossAI } } - void JustEngagedWith(Unit* /*attacker*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_CROK_SCOURGEBANE))) crok->AI()->Talk(SAY_CROK_COMBAT_SVALNA); DoCastSelf(SPELL_DIVINE_SURGE, true); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 3ad619646dc..2c1179fed8a 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->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 38a8b0e76ea..8fb3897c717 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); summons.DoZoneInCombat(); events.ScheduleEvent(EVENT_POISON, randtime(Seconds(10), Seconds(15))); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 96157d0ab3e..f0b8d37f0c0 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_WOUND, 10s); 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 feab62aba51..0d7ca73ccde 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -324,9 +324,9 @@ class boss_gothik : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index fe7533e6f1c..89cb80b5386 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -54,9 +54,9 @@ class boss_grobbulus : public CreatureScript { boss_grobbulusAI(Creature* creature) : BossAI(creature, BOSS_GROBBULUS) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CLOUD, 15s); events.ScheduleEvent(EVENT_INJECT, 20s); 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 ef6089e91f9..0b570a7d5b5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -114,9 +114,9 @@ public: Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); _safeSection = 0; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index da62f44780e..2db0ad726e7 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_NECROTIC_AURA, 17s); events.ScheduleEvent(EVENT_DEATHBLOOM, 5s); events.ScheduleEvent(EVENT_SPORE, 18s); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 666f9582324..ade0c491990 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_WRAP, 20s); events.ScheduleEvent(EVENT_SPRAY, 40s); 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 5343a7a0316..263e0ef7e20 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 05847d2c134..edfcd4910d5 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Enraged = false; Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_HATEFUL, 1s); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index dd4e67d883c..c02db311140 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->StopMoving(); summons.DoZoneInCombat(); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 9bd30b2d4be..4eca760017d 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->CastSpell(me, SPELL_FROST_AURA, true); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index bff6abcadec..f12778ed321 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -92,11 +92,11 @@ class boss_keristrasza : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); DoCastAOE(SPELL_INTENSE_COLD); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CRYSTAL_FIRE_BREATH, 14s); events.ScheduleEvent(EVENT_CRYSTAL_CHAINS_CRYSTALIZE, DUNGEON_MODE(30000, 11000)); 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 2fd53226714..9492c9dd357 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 9033a569699..98399f0ab44 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CRYSTAL_SPIKES, 12s); events.ScheduleEvent(EVENT_TRAMPLE, 10s); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index d963cfa3cc8..c832a216e35 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 c76e85eb560..e96c05d63b3 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 7818b15a2cb..c04c3728a06 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -144,9 +144,9 @@ class boss_urom : public CreatureScript DoCastSelf(SPELL_EVOCATE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); StartAttack(); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 7f20bbb3ff9..faa6f0166e7 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 09d3c7f5e34..16fa0dcc136 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -101,9 +101,9 @@ public: instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 6e672819a2e..298d6e2f3da 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -120,14 +120,14 @@ public: events.ScheduleEvent(EVENT_FORGE_CAST, 2 * IN_MILLISECONDS, 0, PHASE_INTRO); } - void JustEngagedWith(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); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } 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 390c853640a..c4f41767109 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BOULDER_TOSS, 3s, 9s); events.ScheduleEvent(EVENT_GROUND_SLAM, 15s, 18s); 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 0f30408c12e..6c1f04bc80b 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->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->DoStartTimedAchievement(ACHIEVEMENT_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 6c1ea42794f..85463eecb58 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -103,7 +103,7 @@ class boss_sjonnir : public CreatureScript return; } - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 3s, 8s); 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 ef12cdb3d55..ad946bbe34e 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 @@ -359,7 +359,7 @@ struct boss_algalon_the_observer : public BossAI return type == DATA_HAS_FED_ON_TEARS ? _fedOnTears : 1; } - void JustEngagedWith(Unit* /*target*/) override + void JustEngagedWith(Unit* who) override { uint32 introDelay = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -371,7 +371,7 @@ struct boss_algalon_the_observer : public BossAI { Talk(SAY_ALGALON_AGGRO); me->PlayDirectMusic(ENGAGE_MUSIC_ID); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 0ff9a460389..224dd1b77da 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 @@ -159,9 +159,9 @@ class boss_steelbreaker : public CreatureScript me->RemoveAllAuras(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_STEELBREAKER_AGGRO); DoCast(me, SPELL_HIGH_VOLTAGE); events.SetPhase(++phase); @@ -307,9 +307,9 @@ class boss_runemaster_molgeim : public CreatureScript me->RemoveAllAuras(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_MOLGEIM_AGGRO); events.SetPhase(++phase); events.ScheduleEvent(EVENT_BERSERK, 15min); @@ -486,9 +486,9 @@ class boss_stormcaller_brundir : public CreatureScript return 0; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_BRUNDIR_AGGRO); events.SetPhase(++phase); events.ScheduleEvent(EVENT_MOVE_POSITION, 1s); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index ddf5e649515..80f7b1aa27b 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_SONIC_SCREECH, 48s); 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 5ffb743866a..b9346ddc6d9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -272,9 +272,9 @@ class boss_flame_leviathan : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 da5107c998b..5478f7c8d73 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -340,7 +340,7 @@ class boss_freya : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoZoneInCombat(); Creature* Elder[3]; for (uint8 n = 0; n < 3; ++n) @@ -727,9 +727,9 @@ class boss_elder_brightleaf : public CreatureScript Talk(SAY_ELDER_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } @@ -830,9 +830,9 @@ class boss_elder_stonebark : public CreatureScript Talk(SAY_ELDER_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } @@ -939,9 +939,9 @@ class boss_elder_ironbranch : public CreatureScript Talk(SAY_ELDER_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } 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 124e3ec0f55..0458f811f92 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 21ce224d1f2..1f7a1a64410 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -364,9 +364,9 @@ class boss_hodir : public CreatureScript FrozenHelper->CastSpell(FrozenHelper, SPELL_SUMMON_FLASH_FREEZE_HELPER, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 62d9236f25d..967435ab294 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -141,9 +141,9 @@ class boss_ignis : public CreatureScript instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_JET, 30s); 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 3936737929d..3b5ff2b2227 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -118,7 +118,7 @@ class boss_kologarn : public CreatureScript bool left, right; ObjectGuid eyebeamTarget; - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); @@ -134,7 +134,7 @@ class boss_kologarn : public CreatureScript if (Unit* arm = vehicle->GetPassenger(i)) DoZoneInCombat(arm->ToCreature()); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } 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 f60de8705c1..73a6e4c800f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -421,12 +421,12 @@ class boss_mimiron : public CreatureScript } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { if (!me->GetVehicleBase()) return; - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveAurasDueToSpell(SPELL_WELD); DoCast(me->GetVehicleBase(), SPELL_SEAT_6); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 8f276d3de40..49cbf43e337 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -354,9 +354,9 @@ struct boss_razorscale : public BossAI } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); ScheduleAirPhaseEvents(); summons.DoAction(ACTION_START_FIGHT, DummyEntryCheckPredicate()); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 1a73187e34a..4bdcd3514c4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -611,9 +611,9 @@ class boss_thorim : public CreatureScript SetBoundary(&ArenaBoundaries); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO_1); events.SetPhase(PHASE_1); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index a3f2642e7ee..426bb3dd956 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -183,10 +183,10 @@ struct boss_xt002 : public BossAI _DespawnAtEvade(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SEARING_LIGHT, Is25ManRaid() ? 9s : 11s, GROUP_SEARING_GRAVITY, PHASE_1); events.ScheduleEvent(EVENT_GRAVITY_BOMB, Is25ManRaid() ? 18s : 21s, GROUP_SEARING_GRAVITY, PHASE_1); events.ScheduleEvent(EVENT_ENRAGE, 10min); 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 1826cdc7213..c500282145b 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, 500ms, 0, PHASE_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { if (events.IsInPhase(PHASE_EVENT) || events.IsInPhase(PHASE_UNDEAD)) // ingvar gets multiple JustEngagedWith calls return; - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.SetPhase(PHASE_HUMAN); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index d902e063034..0d69f9d27dc 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -143,7 +143,7 @@ class boss_keleseth : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 babd815c9cf..3fd1fb461f4 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { if (!IsInGhostForm) - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 2e9c6ce346e..6879e76a238 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 JustEngagedWith (Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCING_SMASH, 7s); events.ScheduleEvent(EVENT_IMPALE, 11s); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index a38b6ed0ac9..0018069e18b 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 ef8d0f4ce39..0860a8989bc 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -138,9 +138,9 @@ public: me->SetReactState(REACT_AGGRESSIVE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_BANE, 18s, 23s, EVENT_GROUP_BASE_SPELLS); events.ScheduleEvent(EVENT_FETID_ROT, 8s, 13s, 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 2612da8c57f..7593753c28c 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { events.ScheduleEvent(EVENT_ROCK_SHARDS, 15s); events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30s); events.ScheduleEvent(EVENT_STOMP, 45s); events.ScheduleEvent(EVENT_BERSERK, 5min); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } // Below UpdateAI may need review/debug. diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index ef7119cf543..03b4d3fd3c1 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -116,7 +116,7 @@ class boss_emalon : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 6min); events.ScheduleEvent(EVENT_OVERCHARGE, 45s); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 8dcd6878d46..591f54d4b1a 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 JustEngagedWith(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, 75s); // 1st after 75sec, then every 45sec events.ScheduleEvent(EVENT_FLAME_CINDER, 30s); /// @todo check timer - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index bbece15bc73..c108cdcc70e 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -55,7 +55,7 @@ struct boss_toravon : public BossAI { boss_toravon(Creature* creature) : BossAI(creature, DATA_TORAVON) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { DoCastSelf(SPELL_FROZEN_MALLET); @@ -63,7 +63,7 @@ struct boss_toravon : public BossAI events.ScheduleEvent(EVENT_WHITEOUT, 25s); events.ScheduleEvent(EVENT_FREEZING_GROUND, 7s); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } 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 5179e0266c4..5faecfba8b3 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BEACON, 10s); events.ScheduleEvent(EVENT_FIREBALL, 8s); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 259fc2225a8..797261e2c4a 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_DARK_SHELL, 20s); events.ScheduleEvent(EVENT_VOID_BLAST, 8s, 23s); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp index 9bb64a76794..a7f885e42cc 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 14s); events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 5s); } 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 8cbd1a991c0..f76d03915de 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -94,9 +94,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FLAME_SHOCK, 2s); events.ScheduleEvent(EVENT_ARCANE_SHOCK, 4s); events.ScheduleEvent(EVENT_FROST_SHOCK, 6s); 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 dc831f4014b..8a6858d66b4 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 5s); events.ScheduleEvent(EVENT_POLYMORPH, 8s); 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 937adb34666..9a2a4d14a85 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 @@ -79,9 +79,9 @@ struct boss_blackheart_the_inciter : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_INCITE_CHAOS, 20s); events.ScheduleEvent(EVENT_CHARGE_ATTACK, 5s); 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 9bd392b9f6f..d73e7ad57f0 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 7s, 14s); if (IsHeroic()) events.ScheduleEvent(EVENT_BANISH, 15s); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index ea7631dda6b..a440b7335f2 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -84,16 +84,6 @@ class boss_murmur : public CreatureScript me->ResetPlayerDamageReq(); } - void JustEngagedWith(Unit* /*who*/) override - { - _JustEngagedWith(); - } - - void JustDied(Unit* /*killer*/) override - { - _JustDied(); - } - void UpdateAI(uint32 diff) override { if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index 9c892159ef0..b1bc46a7f9c 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BERSERK, 10min); events.ScheduleEvent(EVENT_CHANGE_PHASE, 1min); ScheduleEvents(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 26fdb144bab..2135744b276 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -487,9 +487,9 @@ struct boss_illidan_stormrage : public BossAI akama->AI()->DoAction(ACTION_ACTIVE_AKAMA_INTRO); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetCanDualWield(true); if (GameObject* musicController = instance->GetGameObject(DATA_ILLIDAN_MUSIC_CONTROLLER)) musicController->PlayDirectMusic(EVENT_BT_SUMMIT_WALK_3_SOUND_ID); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index a1a27cea411..47687f644bf 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 me->SummonCreatureGroup(SUMMON_COUNCIL_GROUP); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { if (!_inCombat) { _inCombat = true; - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoCastSelf(SPELL_EMPYREAL_BALANCE, true); for (uint32 bossData : CouncilData) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 0797b3955b1..d76c34c243d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -106,9 +106,9 @@ struct boss_mother_shahraz : public BossAI _enraged = false; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SILENCING_SHRIEK, 22s); events.ScheduleEvent(EVENT_PRISMATIC_SHIELD, 15s); diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index c24a748363f..630b08f7409 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); ChangePhase(); events.ScheduleEvent(EVENT_BERSERK, 15min); events.ScheduleEvent(EVENT_FLAME, 20s); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 64217393e83..b2413cf51c6 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -121,9 +121,9 @@ struct boss_teron_gorefiend : public BossAI } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.SetPhase(PHASE_COMBAT); events.ScheduleEvent(EVENT_ENRAGE, 10min); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 977592fa070..16e357a9026 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -101,9 +101,9 @@ struct boss_najentus : public BossAI } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_NEEDLE, 2s); events.ScheduleEvent(EVENT_SHIELD, 1min); 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 d7ab3090bbf..b89982cf689 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 15000); events.ScheduleEvent(EVENT_LUNG_BURST, 7s); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index 5ef914821c4..bcf6d6fd42b 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -175,9 +175,9 @@ struct boss_ahune : public BossAI me->SetControlled(true, UNIT_STATE_ROOT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_INITIAL_EMERGE, 4ms); events.ScheduleEvent(EVENT_SYNCH_HEALTH, 3s); } 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 02970ec2413..d7acc1b12a4 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30s); events.ScheduleEvent(EVENT_TAINTED_EARTHGRAB_TOTEM, 20s); events.ScheduleEvent(EVENT_CORRUPTED_NOVA_TOTEM, 1min); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp index 188c3791117..5d4469079db 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ACID_SPRAY, 25000); events.ScheduleEvent(EVENT_CLEAVE, 9s); events.ScheduleEvent(EVENT_UPPERCUT, 20s); 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 81ca0f43388..2603d809482 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10s); events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20s); events.ScheduleEvent(EVENT_WATER_SPIT, 14s); diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 0309859533a..1c6d5afead0 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index cedffabb9c8..a9f3447f630 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -67,9 +67,9 @@ class boss_broggok : public CreatureScript DoAction(ACTION_RESET_BROGGOK); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 507049cdf0c..388a0cc386e 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 @@ -101,7 +101,7 @@ class boss_kelidan_the_breaker : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_WAKE); if (me->IsNonMeleeSpellCast(false)) me->InterruptNonMeleeSpells(true); 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 d22def5cb36..94b3b7dce0b 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 958c92f7283..1afbe60ecc8 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 d6c6256dd59..8fbb9725ee2 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 @@ -227,10 +227,10 @@ class boss_vazruden : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void KilledUnit(Unit* who) 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 5368495c9e6..3303416c686 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MORTAL_WOUND, 5s); events.ScheduleEvent(EVENT_SURGE, 4s); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void MoveInLineOfSight(Unit* who) override diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 73054e4cf3f..88319294454 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetDisableGravity(true); // after enterevademode will be set walk movement me->setActive(true); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 017e6429f45..80e77e5bdc7 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void SummonMinion(uint32 entry, float x, float y, float z) 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 a8fd8fc0c14..9898a6e9116 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_POUNDING, 15000); events.ScheduleEvent(EVENT_ARCANE_ORB, 3s); 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 2d706cd0ab7..8f30594f8ef 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10s); events.ScheduleEvent(EVENT_SAW_BLADE, 20s); 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 34ac3dd0adc..40fa105d1b8 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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 b8d1428279d..7bce2eeb508 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 @@ -81,9 +81,9 @@ class boss_mechano_lord_capacitus : public CreatureScript { boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(YELL_AGGRO); events.ScheduleEvent(EVENT_HEADCRACK, 10s); events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 15s); 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 27b1bd6ab2a..f023f4bd5dd 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -70,7 +70,7 @@ class boss_nethermancer_sepethrea : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FROST_ATTACK, 7s, 10s); events.ScheduleEvent(EVENT_ARCANE_BLAST, 12s, 18s); events.ScheduleEvent(EVENT_DRAGONS_BREATH, 18s, 22s); 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 7f55596aed0..545122c0193 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SUMMON, 30s); events.ScheduleEvent(EVENT_MANA_TAP, 12s, 20s); events.ScheduleEvent(EVENT_ARCANE_TORRENT, 16s, 25s); 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 441c6c52692..1dda6152612 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, 1s, 4s); events.ScheduleEvent(EVENT_WHIRLWIND, 7s, 9s); if (IsHeroic()) 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 d30ab1aa05e..19e74d1c639 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FELFIRE_SHOCK, 12s, 14s); events.ScheduleEvent(EVENT_KNOCK_AWAY, 11s, 12s); events.ScheduleEvent(EVENT_ME_FIRST, 6s); 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 5c16338ffff..ee6c4d971c4 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_VOID_ZONE, urand (6000, 10000)); events.ScheduleEvent(EVENT_SHADOW_NOVA, urand (6000, 10000)); events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, 12s, 20s); 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 3551cd1e7d4..0474aedc3bc 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); 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_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index fbe19e73236..4ecbae7ae46 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 JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SACRIFICE, 5700ms); events.ScheduleEvent(EVENT_HELLFIRE, IsHeroic() ? urand(17400, 19300) : 18000); |