diff options
Diffstat (limited to 'src/server')
-rw-r--r-- | src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp | 13 | ||||
-rw-r--r-- | src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp | 15 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 8a9463b514..18a30b7dbc 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -27,6 +27,7 @@ enum Spells SPELL_MOJO_WAVE = 55626, SPELL_FREEZE_ANIM = 52656, SPELL_MIGHTY_BLOW = 54719, + SPELL_MORTAL_STRIKE = 54715, SPELL_ELEMENTAL_SPAWN_EFFECT = 54888, SPELL_EMERGE = 54850, @@ -54,9 +55,10 @@ enum Misc EMOTE_ALTAR = 1, EVENT_COLOSSUS_MIGHTY_BLOW = 1, - EVENT_COLOSSUS_HEALTH_1 = 2, - EVENT_COLOSSUS_HEALTH_2 = 3, - EVENT_COLOSSUS_START_FIGHT = 4, + EVENT_COLOSSUS_MORTAL_STRIKE = 2, + EVENT_COLOSSUS_HEALTH_1 = 3, + EVENT_COLOSSUS_HEALTH_2 = 4, + EVENT_COLOSSUS_START_FIGHT = 5, EVENT_ELEMENTAL_HEALTH = 10, EVENT_ELEMENTAL_SURGE = 11, @@ -146,6 +148,7 @@ public: { BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_COLOSSUS_MIGHTY_BLOW, 10s); + events.ScheduleEvent(EVENT_COLOSSUS_MORTAL_STRIKE, 7s); events.ScheduleEvent(EVENT_COLOSSUS_HEALTH_1, 1s); events.ScheduleEvent(EVENT_COLOSSUS_HEALTH_2, 1s); } @@ -212,6 +215,10 @@ public: me->CastSpell(me->GetVictim(), SPELL_MIGHTY_BLOW, false); events.ScheduleEvent(EVENT_COLOSSUS_MIGHTY_BLOW, 10s); break; + case EVENT_COLOSSUS_MORTAL_STRIKE: + DoCastVictim(SPELL_MORTAL_STRIKE); + events.ScheduleEvent(EVENT_COLOSSUS_MORTAL_STRIKE, 7s); + break; case EVENT_COLOSSUS_HEALTH_1: if (me->HealthBelowPct(51)) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 68a22e9640..5bf51b7c91 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -51,14 +51,7 @@ enum Misc MAX_CONSTRICTOR = 3, MAX_SUMMONS = 5, - EVENT_POISON_NOVA = 1, - EVENT_POWERFULL_BITE = 2, - EVENT_VENOM_BOLT = 3, - EVENT_CHECK_HEALTH1 = 4, - EVENT_CHECK_HEALTH2 = 5, - EVENT_SUMMON1 = 6, - EVENT_SUMMON2 = 7, - EVENT_KILL_TALK = 8 + EVENT_KILL_TALK = 1 }; const Position SpawnLoc[] = @@ -121,17 +114,17 @@ public: Talk(SAY_AGGRO); BossAI::JustEngagedWith(who); - ScheduleTimedEvent(10s, [&]{ + ScheduleTimedEvent(16s, 53s, [&]{ Talk(EMOTE_NOVA); DoCastAOE(SPELL_POISON_NOVA); - }, 15s); + }, 16s, 53s); ScheduleTimedEvent(3s, [&] { DoCastVictim(SPELL_POWERFULL_BITE); }, 10s); ScheduleTimedEvent(15s, [&] { - DoCastVictim(SPELL_VENOM_BOLT); + DoCastRandomTarget(SPELL_VENOM_BOLT, 0, 45.0f, false); }, 10s); } |