diff options
author | MoltenCrystal <moltencrystal_dev@outlook.com> | 2025-04-08 21:19:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-04-08 21:19:44 +0200 |
commit | db60034515ee69111ebd3d880641b57bc26c0b15 (patch) | |
tree | 83252b1cfd9edb86e5e47001f49471749574e2cf | |
parent | e8b2be3527c7683e8bfca70ed7706fc20da566fd (diff) |
Scripts/Spells: Fix Arms and Protection Execute damage (#30829)
-rw-r--r-- | sql/updates/world/master/2025_04_08_01_world.sql | 3 | ||||
-rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/sql/updates/world/master/2025_04_08_01_world.sql b/sql/updates/world/master/2025_04_08_01_world.sql new file mode 100644 index 00000000000..b7bbe3e2ba1 --- /dev/null +++ b/sql/updates/world/master/2025_04_08_01_world.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_execute_damage'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(260798,'spell_warr_execute_damage'); diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 34e2f2b0bc3..942cf9e169e 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -312,6 +312,21 @@ class spell_warr_devastator : public AuraScript } }; +// 260798 - Execute (Arms, Protection) +class spell_warr_execute_damage : public SpellScript +{ + static void CalculateExecuteDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit const* /*victim*/, int32 const& /*damageOrHealing*/, int32 const& /*flatMod*/, float& pctMod) + { + // tooltip has 2 multiplier hardcoded in it $damage=${2.0*$260798s1} + pctMod *= 2.0f; + } + + void Register() override + { + CalcDamage += SpellCalcDamageFn(spell_warr_execute_damage::CalculateExecuteDamage); + } +}; + // 383103 - Fueled by Violence class spell_warr_fueled_by_violence : public AuraScript { @@ -828,6 +843,7 @@ void AddSC_warrior_spell_scripts() RegisterSpellScript(spell_warr_colossus_smash); RegisterSpellScript(spell_warr_critical_thinking); RegisterSpellScript(spell_warr_devastator); + RegisterSpellScript(spell_warr_execute_damage); RegisterSpellScript(spell_warr_fueled_by_violence); RegisterSpellScript(spell_warr_heroic_leap); RegisterSpellScript(spell_warr_heroic_leap_jump); |