diff options
author | Jeremy <Golrag@users.noreply.github.com> | 2025-09-01 23:58:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-09-01 23:58:59 +0200 |
commit | ddfccf0c96982c9273f9a2db3266d38c663fa633 (patch) | |
tree | 5d3ab8c51793cb6d99317f337c243fef8eb474e6 | |
parent | f3645bee7bf766a3a8421145118048a7619122ca (diff) |
Scripts/Spells: Implement warrior talent Tenderize (#31071)
-rw-r--r-- | sql/updates/world/master/2025_09_01_02_world.sql | 7 | ||||
-rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 39 |
2 files changed, 46 insertions, 0 deletions
diff --git a/sql/updates/world/master/2025_09_01_02_world.sql b/sql/updates/world/master/2025_09_01_02_world.sql new file mode 100644 index 00000000000..7a5f8128455 --- /dev/null +++ b/sql/updates/world/master/2025_09_01_02_world.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_proc` WHERE `SpellId` IN (388933); +INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES +(388933,0x00,4,0x00100000,0x00000000,0x00000000,0x00000000,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0,0,0,0); -- Tenderize + +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_warr_tenderize'); +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(388933, 'spell_warr_tenderize'); diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index e072fdab3f1..125d0cdc2b1 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -86,6 +86,8 @@ enum WarriorSpells SPELL_WARRIOR_SHIELD_WALL = 871, SPELL_WARRIOR_SHOCKWAVE = 46968, SPELL_WARRIOR_SHOCKWAVE_STUN = 132168, + SPELL_WARRIOR_SLAUGHTERING_STRIKES = 388004, + SPELL_WARRIOR_SLAUGHTERING_STRIKES_BUFF = 393931, SPELL_WARRIOR_STOICISM = 70845, SPELL_WARRIOR_STORM_BOLT_STUN = 132169, SPELL_WARRIOR_STORM_BOLTS = 436162, @@ -1398,6 +1400,42 @@ class spell_warr_sweeping_strikes : public AuraScript Unit* _procTarget = nullptr; }; +// 388933 - Tenderize +class spell_warr_tenderize : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_WARRIOR_ENRAGE, SPELL_WARRIOR_SLAUGHTERING_STRIKES_BUFF, SPELL_WARRIOR_SLAUGHTERING_STRIKES }); + } + + void HandleProc(ProcEventInfo const& eventInfo) const + { + GetTarget()->CastSpell(nullptr, SPELL_WARRIOR_ENRAGE, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = eventInfo.GetProcSpell() + }); + } + + void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo) const + { + Unit* target = GetTarget(); + if (!target->HasAura(SPELL_WARRIOR_SLAUGHTERING_STRIKES)) + return; + + target->CastSpell(nullptr, SPELL_WARRIOR_SLAUGHTERING_STRIKES_BUFF, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = eventInfo.GetProcSpell(), + .SpellValueOverrides = { { SPELLVALUE_AURA_STACK, aurEff->GetAmount() } } + }); + } + + void Register() override + { + OnProc += AuraProcFn(spell_warr_tenderize::HandleProc); + OnEffectProc += AuraEffectProcFn(spell_warr_tenderize::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + } +}; + // 394329 - Titanic Rage class spell_warr_titanic_rage : public AuraScript { @@ -1624,6 +1662,7 @@ void AddSC_warrior_spell_scripts() RegisterSpellScript(spell_warr_sudden_death); RegisterSpellScript(spell_warr_sudden_death_proc); RegisterSpellScript(spell_warr_sweeping_strikes); + RegisterSpellScript(spell_warr_tenderize); RegisterSpellScript(spell_warr_titanic_rage); RegisterSpellScript(spell_warr_trauma); RegisterSpellScript(spell_warr_t3_prot_8p_bonus); |