diff --git a/sql/updates/world/4.3.4/2025_06_20_04_world.sql b/sql/updates/world/4.3.4/2025_06_20_04_world.sql new file mode 100644 index 0000000000..f0ab511332 --- /dev/null +++ b/sql/updates/world/4.3.4/2025_06_20_04_world.sql @@ -0,0 +1,8 @@ +UPDATE `spell_dbc` SET `DurationIndex`= 105 WHERE `Id`= 32733; +DELETE FROM `spelleffect_dbc` WHERE `SpellId`= 32733; +INSERT INTO `spelleffect_dbc` (`Id`, `SpellId`, `EffectIndex`, `Effect`, `EffectAura`, `EffectImplicitTargetA`, `Comment`) VALUES +(160116, 32733, 0, 6, 4, 1, ''); + +DELETE FROM `spell_script_names` WHERE `ScriptName`= 'spell_pal_blessed_life'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(-31828, 'spell_pal_blessed_life'); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 486a3a016e..759ef98756 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -72,6 +72,7 @@ enum PaladinSpells SPELL_PALADIN_HAND_OF_LIGHT = 96172, SPELL_PALADIN_HAND_OF_SACRIFICE = 6940, SPELL_PALADIN_HOLY_LIGHT = 635, + SPELL_PALADON_HOLY_POWER_TALENT_MARKER_DND = 32733, // serverside spell SPELL_PALADIN_HOLY_RADIANCE_TRIGGERED = 86452, SPELL_PALADIN_HOLY_SHOCK_DAMAGE = 25912, SPELL_PALADIN_HOLY_SHOCK_HEALING = 25914, @@ -1860,6 +1861,25 @@ class spell_pal_guarded_by_the_light : public AuraScript OnEffectProc.Register(&spell_pal_guarded_by_the_light::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; + +// -31828 - Blessed Life +class spell_pal_blessed_life : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_PALADON_HOLY_POWER_TALENT_MARKER_DND }); + } + + bool CheckProcCooldown(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + { + return !GetTarget()->HasAura(SPELL_PALADON_HOLY_POWER_TALENT_MARKER_DND, GetCasterGUID()); + } + + void Register() override + { + DoCheckEffectProc.Register(&spell_pal_blessed_life::CheckProcCooldown, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + } +}; } void AddSC_paladin_spell_scripts() @@ -1872,6 +1892,7 @@ void AddSC_paladin_spell_scripts() RegisterSpellScript(spell_pal_aura_mastery); RegisterSpellScript(spell_pal_aura_mastery_immune); RegisterSpellScript(spell_pal_avenging_wrath); + RegisterSpellScript(spell_pal_blessed_life); RegisterSpellScript(spell_pal_blessing_of_faith); RegisterSpellScript(spell_pal_communion); RegisterSpellScript(spell_pal_consecration);