From 920d5d89d92e005de3802938bbaca7e673dd3425 Mon Sep 17 00:00:00 2001 From: Aqua Deus <95978183+aquadeus@users.noreply.github.com> Date: Sun, 31 Aug 2025 16:30:12 +0200 Subject: Scripts/Spells: Implement hunter talent Shrapnel Shot (#31073) Co-authored-by: ModoX --- sql/updates/world/master/2025_08_31_06_world.sql | 7 ++++++ src/server/scripts/Spells/spell_hunter.cpp | 28 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 sql/updates/world/master/2025_08_31_06_world.sql diff --git a/sql/updates/world/master/2025_08_31_06_world.sql b/sql/updates/world/master/2025_08_31_06_world.sql new file mode 100644 index 00000000000..1aac4c1a1f6 --- /dev/null +++ b/sql/updates/world/master/2025_08_31_06_world.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_proc` WHERE `SpellId` IN (473520); +INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES +(473520,0x00,9,0x00000000,0x80000000,0x00000000,0x00000000,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0,0,0,0); -- Shrapnel Shot + +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_hun_shrapnel_shot'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(473520, 'spell_hun_shrapnel_shot'); diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 72126d29702..b753ff11b26 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -62,6 +62,7 @@ enum HunterSpells SPELL_HUNTER_LATENT_POISON_DAMAGE = 378016, SPELL_HUNTER_LATENT_POISON_INJECTORS_STACK = 336903, SPELL_HUNTER_LATENT_POISON_INJECTORS_DAMAGE = 336904, + SPELL_HUNTER_LOCK_AND_LOAD = 194594, SPELL_HUNTER_LONE_WOLF = 155228, SPELL_HUNTER_MARKSMANSHIP_HUNTER_AURA = 137016, SPELL_HUNTER_MASTER_MARKSMAN = 269576, @@ -80,6 +81,8 @@ enum HunterSpells SPELL_HUNTER_RAPID_FIRE_ENERGIZE = 263585, SPELL_HUNTER_REJUVENATING_WIND_HEAL = 385540, SPELL_HUNTER_SCOUTS_INSTINCTS = 459455, + SPELL_HUNTER_SHRAPNEL_SHOT_TALENT = 473520, + SPELL_HUNTER_SHRAPNEL_SHOT_DEBUFF = 474310, SPELL_HUNTER_STEADY_SHOT = 56641, SPELL_HUNTER_STEADY_SHOT_FOCUS = 77443, SPELL_HUNTER_STREAMLINE_TALENT = 260367, @@ -1006,6 +1009,30 @@ class spell_hun_scrappy : public AuraScript } }; +// 473520 - Shrapnel Shot +class spell_hun_shrapnel_shot : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_HUNTER_LOCK_AND_LOAD }); + } + + void HandleProc(ProcEventInfo const& /*eventInfo*/) const + { + if (!roll_chance_i(GetEffect(EFFECT_0)->GetAmount())) + return; + + GetCaster()->CastSpell(GetCaster(), SPELL_HUNTER_LOCK_AND_LOAD, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + } + + void Register() override + { + OnProc += AuraProcFn(spell_hun_shrapnel_shot::HandleProc); + } +}; + // 56641 - Steady Shot class spell_hun_steady_shot : public SpellScript { @@ -1349,6 +1376,7 @@ void AddSC_hunter_spell_scripts() RegisterSpellScript(spell_hun_scatter_shot); RegisterSpellScript(spell_hun_scouts_instincts); RegisterSpellScript(spell_hun_scrappy); + RegisterSpellScript(spell_hun_shrapnel_shot); RegisterSpellScript(spell_hun_steady_shot); RegisterSpellScript(spell_hun_streamline); RegisterSpellScript(spell_hun_surging_shots); -- cgit v1.2.3