diff --git a/sql/scriptdev2/spell.sql b/sql/scriptdev2/spell.sql index 4e632e8de20..0657209b826 100644 --- a/sql/scriptdev2/spell.sql +++ b/sql/scriptdev2/spell.sql @@ -895,6 +895,7 @@ INSERT INTO spell_scripts(Id, ScriptName) VALUES (57283,'spell_remove_mushroom_power'), (57385,'spell_argent_cannon'), (57412,'spell_reckoning_bomb'), +(57415,'spell_the_reckoning'), (57418,'spell_to_icecrown_air_ship_h_summon_vehicle'), (57473,'spell_arcane_storm'), (57491,'spell_flame_tsunami_damage'), diff --git a/src/game/AI/ScriptDevAI/scripts/northrend/icecrown.cpp b/src/game/AI/ScriptDevAI/scripts/northrend/icecrown.cpp index d06a8de4726..8c7eb79f43d 100644 --- a/src/game/AI/ScriptDevAI/scripts/northrend/icecrown.cpp +++ b/src/game/AI/ScriptDevAI/scripts/northrend/icecrown.cpp @@ -1075,9 +1075,12 @@ struct ArgentCannon : public SpellScript Position pos = spell->m_targets.getDestination(); SpellCastArgs args; args.SetDestination(pos); - spell->GetCaster()->CastSpell(args, damage, TRIGGERED_OLD_TRIGGERED); + Unit* caster = spell->GetCaster(); + caster->CastSpell(args, damage, TRIGGERED_OLD_TRIGGERED); - spell->GetCaster()->CastSpell(nullptr, 57608, TRIGGERED_OLD_TRIGGERED); // Powering Up The Core + caster->CastSpell(nullptr, 57608, TRIGGERED_OLD_TRIGGERED); // Powering Up The Core + if (caster->GetPower(caster->GetPowerType()) == caster->GetMaxPower(caster->GetPowerType())) + DoBroadcastText(31367, caster, nullptr, CHAT_TYPE_BOSS_EMOTE); // reckoning bomb ready text } }; @@ -1097,6 +1100,13 @@ struct ReckoningBomb : public SpellScript } }; +// 57415 - The Reckoning +struct TheReckoning : public SpellScript +{ + // should hit nothing at this time + bool OnCheckTarget(const Spell* /*spell*/, GameObject* /*target*/, SpellEffectIndex /*eff*/) const { return false; } +}; + void AddSC_icecrown() { Script* pNewScript = new Script; @@ -1136,4 +1146,5 @@ void AddSC_icecrown() RegisterSpellScript("spell_frozen_siegebolt"); RegisterSpellScript("spell_argent_cannon"); RegisterSpellScript("spell_reckoning_bomb"); + RegisterSpellScript("spell_the_reckoning"); }