diff options
| -rw-r--r-- | sql/updates/world/master/2025_11_14_02_world.sql | 12 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_dh.cpp | 50 |
2 files changed, 62 insertions, 0 deletions
diff --git a/sql/updates/world/master/2025_11_14_02_world.sql b/sql/updates/world/master/2025_11_14_02_world.sql new file mode 100644 index 00000000000..952204a9636 --- /dev/null +++ b/sql/updates/world/master/2025_11_14_02_world.sql @@ -0,0 +1,12 @@ +DELETE FROM `spell_proc` WHERE `SpellId` IN (206478); +INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES +(206478,0x00,107,0x00000040,0x00000000,0x00000000,0x80000000,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0,0,0,0); -- Demonic Appetite + +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_dh_demonic_appetite_energize','spell_dh_demonic_appetite_energize'); +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(206478,'spell_dh_demonic_appetite'), +(178963,'spell_dh_demonic_appetite_energize'), +(202644,'spell_dh_demonic_appetite_energize'), +(228532,'spell_dh_demonic_appetite_energize'), +(328953,'spell_dh_demonic_appetite_energize'), +(1238743,'spell_dh_demonic_appetite_energize'); diff --git a/src/server/scripts/Spells/spell_dh.cpp b/src/server/scripts/Spells/spell_dh.cpp index 9772d0637cc..ea4d9af7150 100644 --- a/src/server/scripts/Spells/spell_dh.cpp +++ b/src/server/scripts/Spells/spell_dh.cpp @@ -90,6 +90,8 @@ enum DemonHunterSpells SPELL_DH_DEMON_SPIKES = 203819, SPELL_DH_DEMON_SPIKES_TRIGGER = 203720, SPELL_DH_DEMONIC = 213410, + SPELL_DH_DEMONIC_APPETITE = 206478, + SPELL_DH_DEMONIC_APPETITE_ENERGIZE = 210041, SPELL_DH_DEMONIC_ORIGINS = 235893, SPELL_DH_DEMONIC_ORIGINS_BUFF = 235894, SPELL_DH_DEMONIC_TRAMPLE_DMG = 208645, @@ -832,6 +834,52 @@ public: explicit spell_dh_demonic(uint32 transformSpellId) : _transformSpellId(transformSpellId) { } }; +// 206478 - Demonic Appetite +class spell_dh_demonic_appetite : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_DH_SHATTERED_SOUL_LESSER_RIGHT, SPELL_DH_SHATTERED_SOUL_LESSER_LEFT }); + } + + static void ShatterLesserSoulFragment(AuraScript const&, ProcEventInfo const& procEvent) + { + procEvent.GetActionTarget()->CastSpell(procEvent.GetActor(), + Trinity::Containers::SelectRandomContainerElement(std::array{ SPELL_DH_SHATTERED_SOUL_LESSER_RIGHT, SPELL_DH_SHATTERED_SOUL_LESSER_LEFT }), + TRIGGERED_DONT_REPORT_CAST_ERROR); + } + + void Register() override + { + OnProc += AuraProcFn(spell_dh_demonic_appetite::ShatterLesserSoulFragment); + } +}; + +// 178963 - Consume Soul +// 202644 - Consume Soul +// 228532 - Consume Soul +// 328953 - Consume Soul +// 1238743 - Consume Soul +class spell_dh_demonic_appetite_energize : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_DH_DEMONIC_APPETITE_ENERGIZE }); + } + + bool Load() override + { + return !GetCaster()->HasAura(SPELL_DH_DEMONIC_APPETITE); + } + + void Register() override + { + for (SpellEffectInfo const& spellEffectInfo : sSpellMgr->AssertSpellInfo(m_scriptSpellId, DIFFICULTY_NONE)->GetEffects()) + if (spellEffectInfo.IsEffect(SPELL_EFFECT_TRIGGER_SPELL) && spellEffectInfo.TriggerSpell == SPELL_DH_DEMONIC_APPETITE_ENERGIZE) + OnEffectLaunchTarget += SpellEffectFn(spell_dh_demonic_appetite_energize::PreventHitDefaultEffect, spellEffectInfo.EffectIndex, SPELL_EFFECT_TRIGGER_SPELL); + } +}; + // 203720 - Demon Spikes class spell_dh_demon_spikes : public SpellScript { @@ -1896,6 +1944,8 @@ void AddSC_demon_hunter_spell_scripts() RegisterSpellScript(spell_dh_deflecting_spikes); 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); + RegisterSpellScript(spell_dh_demonic_appetite_energize); RegisterSpellScript(spell_dh_demon_spikes); RegisterSpellScriptWithArgs(spell_dh_elysian_decree, "spell_dh_elysian_decree", SPELL_DH_ELYSIAN_DECREE); RegisterAreaTriggerAI(at_dh_elysian_decree); |