Skip to content

Commit

Permalink
Icecrown: Implement missing full energy text and disable go wmo targe…
Browse files Browse the repository at this point in the history
…ting
  • Loading branch information
killerwife committed Jul 8, 2024
1 parent 547c0eb commit 526d2fb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
1 change: 1 addition & 0 deletions sql/scriptdev2/spell.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
15 changes: 13 additions & 2 deletions src/game/AI/ScriptDevAI/scripts/northrend/icecrown.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
};

Expand All @@ -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;
Expand Down Expand Up @@ -1136,4 +1146,5 @@ void AddSC_icecrown()
RegisterSpellScript<FrozenSiegebolt>("spell_frozen_siegebolt");
RegisterSpellScript<ArgentCannon>("spell_argent_cannon");
RegisterSpellScript<ReckoningBomb>("spell_reckoning_bomb");
RegisterSpellScript<TheReckoning>("spell_the_reckoning");
}

0 comments on commit 526d2fb

Please sign in to comment.