Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Implemented Menace warrior talent (#31015)

Browse Source
This commit is contained in:
Jeremy
2025-06-15 10:48:25 +02:00
committed by GitHub
parent 9e76a76494
commit d3967ebe0d
2 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/master/2025_06_15_06_world.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM `spell_script_names` WHERE `Scriptname` = 'spell_warr_intimidating_shout_menace_knock_back';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(316594, 'spell_warr_intimidating_shout_menace_knock_back');

48
src/server/scripts/Spells/spell_warrior.cpp
View File

@@ -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);