From f1d3503f34e43f77bfd7ef052edbd1cd926d2fbe Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Mon, 19 Mar 2018 20:52:30 +0100 Subject: [PATCH] Core/Spells: Resurgence will now proc only if the caster has Water Shield active --- src/server/scripts/Spells/spell_shaman.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 90365933706..dfd1d6497a5 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -77,7 +77,8 @@ enum ShamanSpells SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL = 52042, SPELL_SHAMAN_TIDAL_WAVES = 53390, SPELL_SHAMAN_TOTEMIC_MASTERY = 38437, - SPELL_SHAMAN_UNLEASH_LIFE = 73685 + SPELL_SHAMAN_UNLEASH_LIFE = 73685, + SPELL_SHAMAN_WATER_SHIELD = 52127 }; enum ShamanSpellIcons @@ -1418,10 +1419,16 @@ class spell_sha_resurgence : public SpellScriptLoader SPELL_SHAMAN_HEALING_SURGE, SPELL_SHAMAN_RIPTIDE, SPELL_SHAMAN_UNLEASH_LIFE, - SPELL_SHAMAN_CHAIN_HEAL + SPELL_SHAMAN_CHAIN_HEAL, + SPELL_SHAMAN_WATER_SHIELD }); } + bool CheckProc(ProcEventInfo& /*eventInfo*/) + { + return GetUnitOwner()->HasAura(SPELL_SHAMAN_WATER_SHIELD); + } + void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1452,6 +1459,7 @@ class spell_sha_resurgence : public SpellScriptLoader void Register() override { + DoCheckProc += AuraCheckProcFn(spell_sha_resurgence_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_sha_resurgence_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1525,7 +1533,6 @@ class spell_sha_cleanse_spirit : public SpellScriptLoader SPELL_SHAMAN_CLEANSING_WATERS_DUMMY_R2, SPELL_SMAMAN_CLEANSING_WATERS_HEAL_R1, SPELL_SMAMAN_CLEANSING_WATERS_HEAL_R2 - }); }