diff options
Diffstat (limited to 'src')
6 files changed, 25 insertions, 24 deletions
diff --git a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp b/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp index f139b10b4bd..c0ef4f03a56 100644 --- a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp +++ b/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp @@ -14,15 +14,15 @@ update creature_template set scriptname = '' where entry = ''; enum Spells { - SPELL_ARCANE_VACUUM = 58694, - SPELL_BLIZZARD = 58693, - H_SPELL_BLIZZARD = 59369, - SPELL_MANA_DESTRUCTION = 59374, - SPELL_TAIL_SWEEP = 58690, - H_SPELL_TAIL_SWEEP = 59283, - SPELL_UNCONTROLLABLE_ENERGY = 58688, - H_SPELL_UNCONTROLLABLE_ENERGY = 59281, - SPELL_TRANSFORM = 58668 + SPELL_ARCANE_VACUUM = SPELL_ARCANE_VACUUM_58694, + SPELL_BLIZZARD = SPELL_BLIZZARD_58693, + H_SPELL_BLIZZARD = SPELL_BLIZZARD_59369, + SPELL_MANA_DESTRUCTION = SPELL_MANA_DESTRUCTION_59374, + SPELL_TAIL_SWEEP = SPELL_TAIL_SWEEP_58690, + H_SPELL_TAIL_SWEEP = SPELL_TAIL_SWEEP_59283, + SPELL_UNCONTROLLABLE_ENERGY = SPELL_UNCONTROLLABLE_ENERGY_58688, + H_SPELL_UNCONTROLLABLE_ENERGY = SPELL_UNCONTROLLABLE_ENERGY_59281, + SPELL_TRANSFORM = SPELL_CYANIGOSA_TRANSFORM_58668 }; enum Yells diff --git a/src/scripts/northrend/violet_hold/boss_erekem.cpp b/src/scripts/northrend/violet_hold/boss_erekem.cpp index 576e6195729..d094e7a8fa7 100644 --- a/src/scripts/northrend/violet_hold/boss_erekem.cpp +++ b/src/scripts/northrend/violet_hold/boss_erekem.cpp @@ -25,7 +25,6 @@ enum Spells SPELL_STORMSTRIKE = SPELL_STORMSTRIKE_51876 }; -//not in db enum Yells { SAY_AGGRO = -1608010, diff --git a/src/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/scripts/northrend/violet_hold/boss_ichoron.cpp index aa856c5723a..38d7f3572ce 100644 --- a/src/scripts/northrend/violet_hold/boss_ichoron.cpp +++ b/src/scripts/northrend/violet_hold/boss_ichoron.cpp @@ -43,7 +43,6 @@ enum IchoronCreatures NPC_ICHOR_GLOBULE = 29321, }; -//not in db enum Yells { SAY_AGGRO = -1608018, @@ -181,7 +180,10 @@ struct boss_ichoronAI : public ScriptedAI bIsExploded = false; if (!HealthBelowPct(25)) + { + DoScriptText(SAY_BUBBLE, m_creature); DoCast(m_creature, SPELL_PROTECTIVE_BUBBLE, true); + } m_creature->SetVisibility(VISIBILITY_ON); m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim()); @@ -197,6 +199,7 @@ struct boss_ichoronAI : public ScriptedAI if (!bIsFrenzy && HealthBelowPct(25) && !bIsExploded) { + DoScriptText(SAY_ENRAGE, m_creature); DoCast(m_creature, DUNGEON_MODE(SPELL_FRENZY, SPELL_FRENZY_H), true); bIsFrenzy = true; } @@ -209,6 +212,7 @@ struct boss_ichoronAI : public ScriptedAI { if (!m_creature->HasAura(SPELL_PROTECTIVE_BUBBLE, 0)) { + DoScriptText(SAY_SHATTER, m_creature); DoCast(m_creature, DUNGEON_MODE(SPELL_WATER_BLAST, SPELL_WATER_BLAST_H)); DoCast(m_creature, SPELL_DRAINED); bIsExploded = true; diff --git a/src/scripts/northrend/violet_hold/boss_xevozz.cpp b/src/scripts/northrend/violet_hold/boss_xevozz.cpp index b933932f2f2..49f5cc3eb6b 100644 --- a/src/scripts/northrend/violet_hold/boss_xevozz.cpp +++ b/src/scripts/northrend/violet_hold/boss_xevozz.cpp @@ -49,7 +49,6 @@ enum CreatureSpells SPELL_POWER_BALL_VISUAL = 54141, }; -//not in db enum Yells { SAY_AGGRO = -1608027, diff --git a/src/scripts/northrend/violet_hold/boss_zuramat.cpp b/src/scripts/northrend/violet_hold/boss_zuramat.cpp index 26e718672a9..bda09b3c590 100644 --- a/src/scripts/northrend/violet_hold/boss_zuramat.cpp +++ b/src/scripts/northrend/violet_hold/boss_zuramat.cpp @@ -10,22 +10,21 @@ Script Data End */ enum Spells { - SPELL_SHROUD_OF_DARKNESS = 54524, - H_SPELL_SHROUD_OF_DARKNESS = 59745, - SPELL_SUMMON_VOID_SENTRY = 54369, - SPELL_VOID_SHIFT = 54361, - H_SPELL_VOID_SHIFT = 59743, - - SPELL_ZUMARAT_ADD_2 = 59747, - H_SPELL_ZUMARAT_ADD_2 = 59747 + SPELL_SHROUD_OF_DARKNESS = SPELL_SHROUD_OF_DARKNESS_54524, + H_SPELL_SHROUD_OF_DARKNESS = SPELL_SHROUD_OF_DARKNESS_59745, + SPELL_SUMMON_VOID_SENTRY = SPELL_SUMMON_VOID_SENTRY_54369, + SPELL_VOID_SHIFT = SPELL_VOID_SHIFT_54361, + H_SPELL_VOID_SHIFT = SPELL_VOID_SHIFT_59743, + + SPELL_ZURAMAT_ADD_2 = SPELL_ZURAMAT_ADD_2_54342, + H_SPELL_ZURAMAT_ADD_2 = SPELL_ZURAMAT_ADD_2_59747 }; enum ZuramatCreatures { - CREATURE_VOID_SENTRY = 29364 + CREATURE_VOID_SENTRY = 29364 }; -//not in db enum Yells { SAY_AGGRO = -1608037, @@ -152,7 +151,7 @@ struct boss_zuramatAI : public ScriptedAI void JustSummoned(Creature* summon) { summon->AI()->AttackStart(m_creature->getVictim()); - summon->AI()->DoCastAOE(DUNGEON_MODE(SPELL_ZUMARAT_ADD_2, H_SPELL_ZUMARAT_ADD_2)); + summon->AI()->DoCastAOE(DUNGEON_MODE(SPELL_ZURAMAT_ADD_2, H_SPELL_ZURAMAT_ADD_2)); summon->SetPhaseMask(17,true); } }; diff --git a/src/scripts/northrend/violet_hold/violet_hold.cpp b/src/scripts/northrend/violet_hold/violet_hold.cpp index 642d65a13f1..f55d8c76c11 100644 --- a/src/scripts/northrend/violet_hold/violet_hold.cpp +++ b/src/scripts/northrend/violet_hold/violet_hold.cpp @@ -26,7 +26,7 @@ enum eSinclari { NPC_VIOLET_HOLD_GUARD = 30659, - SAY_SINCLARI_1 = -1608000, + SAY_SINCLARI_1 = -1608045, }; const Position DoorPosition = { 1828.300049, 797.309021, 46.135502, 1.48353}; |