diff options
| -rw-r--r-- | sql/updates/world/master/2025_11_15_01_world.sql | 7 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_dh.cpp | 27 |
2 files changed, 31 insertions, 3 deletions
diff --git a/sql/updates/world/master/2025_11_15_01_world.sql b/sql/updates/world/master/2025_11_15_01_world.sql new file mode 100644 index 00000000000..1ec785c47fa --- /dev/null +++ b/sql/updates/world/master/2025_11_15_01_world.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dh_demon_muzzle'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(388111, 'spell_dh_demon_muzzle'); + +DELETE FROM `spell_proc` WHERE `SpellId` IN (388111); +INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES +(388111,0x00,107,0x00000000,0x00000002,0x00000000,0x00000000,0x11010,0x0,0x0,0x2,0x0,0x2,0x0,0,100,0,0); -- Demon Muzzle diff --git a/src/server/scripts/Spells/spell_dh.cpp b/src/server/scripts/Spells/spell_dh.cpp index fcaf05b4963..b95d1c367ef 100644 --- a/src/server/scripts/Spells/spell_dh.cpp +++ b/src/server/scripts/Spells/spell_dh.cpp @@ -79,6 +79,7 @@ enum DemonHunterSpells SPELL_DH_DARKNESS_ABSORB = 209426, SPELL_DH_DEFLECTING_SPIKES = 321028, SPELL_DH_DEMON_BLADES_DMG = 203796, + SPELL_DH_DEMON_MUZZLE_PROC = 394933, SPELL_DH_DEMON_SPIKES = 203819, SPELL_DH_DEMON_SPIKES_TRIGGER = 203720, SPELL_DH_DEMONIC = 213410, @@ -186,7 +187,6 @@ enum DemonHunterSpells SPELL_DH_SHATTERED_SOULS_MARKER = 221461, SPELL_DH_SHEAR = 203782, SPELL_DH_SHEAR_PASSIVE = 203783, - SPELL_DH_SIGIL_OF_CHAINS_AREA_SELECTOR = 204834, SPELL_DH_SIGIL_OF_CHAINS_GRIP = 208674, SPELL_DH_SIGIL_OF_CHAINS_JUMP = 208674, SPELL_DH_SIGIL_OF_CHAINS_SLOW = 204843, @@ -197,9 +197,7 @@ enum DemonHunterSpells SPELL_DH_SIGIL_OF_FLAME_AOE = 204598, SPELL_DH_SIGIL_OF_FLAME_FLAME_CRASH = 228973, SPELL_DH_SIGIL_OF_FLAME_VISUAL = 208710, - SPELL_DH_SIGIL_OF_MISERY = 207685, SPELL_DH_SIGIL_OF_MISERY_AOE = 207685, - SPELL_DH_SIGIL_OF_SILENCE = 204490, SPELL_DH_SIGIL_OF_SILENCE_AOE = 204490, SPELL_DH_SIGIL_OF_SPITE = 390163, SPELL_DH_SIGIL_OF_SPITE_AOE = 389860, @@ -805,6 +803,28 @@ class spell_dh_deflecting_spikes : public SpellScript } }; +// 388111 - Demon Muzzle +class spell_dh_demon_muzzle : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_DH_DEMON_MUZZLE_PROC }); + } + + static void HandleProc(AuraScript const&, AuraEffect const*, ProcEventInfo const& procEvent) + { + procEvent.GetActor()->CastSpell(procEvent.GetActionTarget(), SPELL_DH_DEMON_MUZZLE_PROC, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = procEvent.GetProcSpell() + }); + } + + void Register() override + { + OnEffectProc += AuraEffectProcFn(spell_dh_demon_muzzle::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + } +}; + // 213410 - Demonic (attached to 212084 - Fel Devastation and 198013 - Eye Beam) class spell_dh_demonic : public SpellScript { @@ -2068,6 +2088,7 @@ void AddSC_demon_hunter_spell_scripts() RegisterSpellScript(spell_dh_darkglare_boon); RegisterSpellScript(spell_dh_darkness); RegisterSpellScript(spell_dh_deflecting_spikes); + RegisterSpellScript(spell_dh_demon_muzzle); RegisterSpellScriptWithArgs(spell_dh_demonic, "spell_dh_demonic_havoc", SPELL_DH_METAMORPHOSIS_TRANSFORM); RegisterSpellScriptWithArgs(spell_dh_demonic, "spell_dh_demonic_vengeance", SPELL_DH_METAMORPHOSIS_VENGEANCE_TRANSFORM); RegisterSpellScript(spell_dh_demonic_appetite); |