diff --git a/sql/updates/world/master/2026_02_13_00_world.sql b/sql/updates/world/master/2026_02_13_00_world.sql new file mode 100644 index 0000000000..0f2f71b954 --- /dev/null +++ b/sql/updates/world/master/2026_02_13_00_world.sql @@ -0,0 +1,8 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_dru_elunes_favored', 'spell_dru_elunes_favored_proc'); +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(5487, 'spell_dru_elunes_favored'), +(370588, 'spell_dru_elunes_favored_proc'); + +DELETE FROM `spell_proc` WHERE `SpellId` IN (370588); +INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES +(370588,0x40,7,0x00000000,0x00000000,0x00000000,0x00000000,0x0,0x0,0x1,0x2,0x0,0x0,0x0,0,0,0,0); -- Elune's Favored diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index ef8b90b214..7520116f5d 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -78,6 +78,9 @@ enum DruidSpells SPELL_DRUID_ECLIPSE_VISUAL_SOLAR = 93430, SPELL_DRUID_EFFLORESCENCE_AURA = 81262, SPELL_DRUID_EFFLORESCENCE_HEAL = 81269, + SPELL_DRUID_ELUNES_FAVORED = 370586, + SPELL_DRUID_ELUNES_FAVORED_PROC = 370588, + SPELL_DRUID_ELUNES_FAVORED_HEAL = 370602, SPELL_DRUID_EMBRACE_OF_THE_DREAM_EFFECT = 392146, SPELL_DRUID_EMBRACE_OF_THE_DREAM_HEAL = 392147, SPELL_DRUID_ENTANGLING_ROOTS = 339, @@ -779,6 +782,79 @@ class spell_dru_efflorescence_heal : public SpellScript } }; +// 370586 - Elune's Favored (attached to 5487 - Bear Form) +class spell_dru_elunes_favored : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_DRUID_ELUNES_FAVORED_PROC }); + } + + void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) const + { + Unit* caster = GetTarget(); + caster->CastSpell(caster, SPELL_DRUID_ELUNES_FAVORED_PROC, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .OriginalCastId = GetAura()->GetCastId() + }); + } + + void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) const + { + GetTarget()->RemoveAurasDueToSpell(SPELL_DRUID_ELUNES_FAVORED_PROC); + } + + void Register() override + { + AfterEffectApply += AuraEffectApplyFn(spell_dru_elunes_favored::HandleApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove += AuraEffectRemoveFn(spell_dru_elunes_favored::HandleRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL); + } +}; + +// 370588 - Elune's Favored (Proc) +class spell_dru_elunes_favored_proc : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_DRUID_ELUNES_FAVORED_HEAL }) + && ValidateSpellEffect({ { SPELL_DRUID_ELUNES_FAVORED, EFFECT_0 } }); + } + + void HandleProc(ProcEventInfo const& eventInfo) + { + _arcaneDamage += eventInfo.GetDamageInfo()->GetDamage(); + } + + void HandlePeriodic(AuraEffect const* aurEff) + { + Unit* caster = GetTarget(); + if (!_arcaneDamage) + return; + + AuraEffect const* elunesFavored = caster->GetAuraEffect(SPELL_DRUID_ELUNES_FAVORED, EFFECT_0); + if (!elunesFavored) + return; + + int32 heal = CalculatePct(_arcaneDamage, elunesFavored->GetAmount()); + + caster->CastSpell(caster, SPELL_DRUID_ELUNES_FAVORED_HEAL, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringAura = aurEff, + .SpellValueOverrides = { { SPELLVALUE_BASE_POINT0, heal } } + }); + + _arcaneDamage = 0; + } + + void Register() override + { + OnProc += AuraProcFn(spell_dru_elunes_favored_proc::HandleProc); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_dru_elunes_favored_proc::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } + + uint32 _arcaneDamage{}; +}; + // 392124 - Embrace of the Dream class spell_dru_embrace_of_the_dream : public AuraScript { @@ -3008,6 +3084,8 @@ void AddSC_druid_spell_scripts() RegisterSpellScript(spell_dru_efflorescence); RegisterSpellScript(spell_dru_efflorescence_dummy); RegisterSpellScript(spell_dru_efflorescence_heal); + RegisterSpellScript(spell_dru_elunes_favored); + RegisterSpellScript(spell_dru_elunes_favored_proc); RegisterSpellScript(spell_dru_embrace_of_the_dream); RegisterSpellScript(spell_dru_embrace_of_the_dream_effect); RegisterSpellAndAuraScriptPair(spell_dru_entangling_roots, spell_dru_entangling_roots_aura);