diff options
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp | 47 |
1 files changed, 27 insertions, 20 deletions
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 64bba515ac0..c202169e720 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 @@ -19,8 +19,11 @@ #include "halls_of_stone.h" #include "InstanceScript.h" #include "ScriptedCreature.h" +#include "Spell.h" +#include "SpellInfo.h" +#include "SpellMgr.h" -enum Yells +enum Texts { SAY_AGGRO = 0, SAY_SLAY = 1, @@ -31,11 +34,12 @@ enum Yells enum Spells { SPELL_PARTING_SORROW = 59723, - SPELL_STORM_OF_GRIEF = 50752, - SPELL_SHOCK_OF_SORROW = 50760, - SPELL_PILLAR_OF_WOE = 50761 }; +#define SPELL_STORM_OF_GRIEF DUNGEON_MODE<uint32>(50752,59772) +#define SPELL_SHOCK_OF_SORROW DUNGEON_MODE<uint32>(50760,59726) +#define SPELL_PILLAR_OF_WOE DUNGEON_MODE<uint32>(50761,59727) + enum Events { EVENT_PARTING_SORROW = 1, @@ -57,12 +61,6 @@ struct boss_maiden_of_grief : public BossAI { _Reset(); - if (IsHeroic()) - events.ScheduleEvent(EVENT_PARTING_SORROW, 25s, 30s); - events.ScheduleEvent(EVENT_STORM_OF_GRIEF, 10s); - events.ScheduleEvent(EVENT_SHOCK_OF_SORROW, 20s, 25s); - events.ScheduleEvent(EVENT_PILLAR_OF_WOE, 5s, 15s); - instance->DoStopCriteriaTimer(CriteriaStartEvent::SendEvent, ACHIEV_GOOD_GRIEF_START_EVENT); } @@ -71,13 +69,24 @@ struct boss_maiden_of_grief : public BossAI BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); + if (IsHeroic()) + events.ScheduleEvent(EVENT_PARTING_SORROW, 25s, 30s); + events.ScheduleEvent(EVENT_STORM_OF_GRIEF, 5s, 10s); + events.ScheduleEvent(EVENT_SHOCK_OF_SORROW, 15s, 25s); + events.ScheduleEvent(EVENT_PILLAR_OF_WOE, 5s, 15s); + instance->DoStartCriteriaTimer(CriteriaStartEvent::SendEvent, ACHIEV_GOOD_GRIEF_START_EVENT); } - void KilledUnit(Unit* who) override + void KilledUnit(Unit* /*who*/) override + { + Talk(SAY_SLAY); + } + + void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override { - if (who->GetTypeId() == TYPEID_PLAYER) - Talk(SAY_SLAY); + if (reason == SPELL_FINISHED_SUCCESSFUL_CAST && spell->Id == SPELL_SHOCK_OF_SORROW) + Talk(SAY_STUN); } void JustDied(Unit* /*killer*/) override @@ -103,24 +112,22 @@ struct boss_maiden_of_grief : public BossAI case EVENT_PARTING_SORROW: if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_PARTING_SORROW); - events.ScheduleEvent(EVENT_PARTING_SORROW, 30s, 40s); + events.Repeat(30s, 40s); break; case EVENT_STORM_OF_GRIEF: - DoCastVictim(SPELL_STORM_OF_GRIEF, true); - events.ScheduleEvent(EVENT_STORM_OF_GRIEF, 15s, 20s); + DoCastVictim(SPELL_STORM_OF_GRIEF); + events.Repeat(15s, 20s); break; case EVENT_SHOCK_OF_SORROW: - ResetThreatList(); - Talk(SAY_STUN); DoCastAOE(SPELL_SHOCK_OF_SORROW); - events.ScheduleEvent(EVENT_SHOCK_OF_SORROW, 20s, 30s); + events.Repeat(20s, 35s); break; case EVENT_PILLAR_OF_WOE: if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, SPELL_PILLAR_OF_WOE); else DoCastVictim(SPELL_PILLAR_OF_WOE); - events.ScheduleEvent(EVENT_PILLAR_OF_WOE, 5s, 25s); + events.Repeat(5s, 25s); break; default: break; |