diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 744a0af2f02..8453fe9342d 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -24,6 +24,7 @@ #include "ScriptMgr.h" #include "Map.h" #include "MoveSpline.h" +#include "ObjectAccessor.h" #include "PathGenerator.h" #include "Player.h" #include "Spell.h" @@ -56,6 +57,7 @@ enum WarriorSpells SPELL_WARRIOR_HEROIC_LEAP_JUMP = 178368, SPELL_WARRIOR_IGNORE_PAIN = 190456, SPELL_WARRIOR_IMPROVED_RAGING_BLOW = 383854, + SPELL_WARRIOR_INTIMIDATING_SHOUT_MENACE_AOE = 316595, SPELL_WARRIOR_INVIGORATING_FURY = 385174, SPELL_WARRIOR_INVIGORATING_FURY_TALENT = 383468, SPELL_WARRIOR_IN_FOR_THE_KILL = 248621, @@ -692,15 +694,56 @@ class spell_warr_impending_victory : public SpellScript // 5246 - Intimidating Shout class spell_warr_intimidating_shout : public SpellScript { - void FilterTargets(std::list<WorldObject*>& unitList) + void FilterTargets(std::list<WorldObject*>& unitList) const { unitList.remove(GetExplTargetWorldObject()); } + static void ClearTargets(std::list<WorldObject*>& unitList) + { + // This is used in effect 3, which is an AOE Root effect. + // This doesn't seem to be a thing anymore, so we clear the targets list here. + unitList.clear(); + } + void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout::ClearTargets, EFFECT_3, TARGET_UNIT_SRC_AREA_ENEMY); + } +}; + +// 316594 - Intimidating Shout (Menace Talent, knock back -> root) +class spell_warr_intimidating_shout_menace_knock_back : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_WARRIOR_INTIMIDATING_SHOUT_MENACE_AOE }); + } + + void FilterTargets(std::list<WorldObject*>& unitList) const + { + unitList.remove(GetExplTargetWorldObject()); + } + + void HandleRoot(SpellEffIndex /*effIndex*/) const + { + CastSpellExtraArgs args = CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }; + + GetCaster()->m_Events.AddEventAtOffset([caster = GetCaster(), targetGUID = GetHitUnit()->GetGUID(), castArgs = std::move(args)]() + { + if (Unit* targetUnit = ObjectAccessor::GetUnit(*caster, targetGUID)) + caster->CastSpell(targetUnit, SPELL_WARRIOR_INTIMIDATING_SHOUT_MENACE_AOE, castArgs); + }, 500ms); + } + + void Register() override + { + OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout_menace_knock_back::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget += SpellEffectFn(spell_warr_intimidating_shout_menace_knock_back::HandleRoot, EFFECT_0, SPELL_EFFECT_KNOCK_BACK); } }; @@ -1234,6 +1277,7 @@ void AddSC_warrior_spell_scripts() RegisterSpellScript(spell_warr_heroic_leap_jump); RegisterSpellScript(spell_warr_impending_victory); RegisterSpellScript(spell_warr_intimidating_shout); + RegisterSpellScript(spell_warr_intimidating_shout_menace_knock_back); RegisterSpellScript(spell_warr_invigorating_fury); RegisterSpellScript(spell_warr_item_t10_prot_4p_bonus); RegisterSpellScript(spell_warr_mortal_strike); |