From b91eac6a1c377c14ebe2b66104ac02e2f9a01ad4 Mon Sep 17 00:00:00 2001 From: ariel- Date: Tue, 21 Feb 2017 21:07:45 -0300 Subject: Core/Spells: fix Hand of Justice proc chance and reduce it past level 60. Ref #7789 (cherrypicked from f4ae639961542112dddcf627fc2e1f11967048a9) --- src/server/game/Spells/Auras/SpellAuras.cpp | 5 +++++ src/server/game/Spells/SpellMgr.h | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 2d44d1f8259..8a1d43d9c6a 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1811,6 +1811,11 @@ float Aura::CalcProcChance(SpellProcEntry const& procEntry, ProcEventInfo& event if (Player* modOwner = caster->GetSpellModOwner()) modOwner->ApplySpellMod(GetId(), SPELLMOD_CHANCE_OF_SUCCESS, chance); } + + // proc chance is reduced by an additional 3.333% per level past 60 + if ((procEntry.AttributesMask & PROC_ATTR_REDUCE_PROC_60) && eventInfo.GetActor()->getLevel() > 60) + chance = std::max(0.f, (1.f - ((eventInfo.GetActor()->getLevel() - 60) * 1.f / 30.f)) * chance); + return chance; } diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 3d669486432..3b393033ec2 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -257,7 +257,10 @@ enum ProcAttributes PROC_ATTR_REQ_EXP_OR_HONOR = 0x0000001, // requires proc target to give exp or honor for aura proc PROC_ATTR_TRIGGERED_CAN_PROC = 0x0000002, // aura can proc even with triggered spells PROC_ATTR_REQ_POWER_COST = 0x0000004, // requires triggering spell to have a power cost for aura proc - PROC_ATTR_REQ_SPELLMOD = 0x0000008 // requires triggering spell to be affected by proccing aura to drop charges + PROC_ATTR_REQ_SPELLMOD = 0x0000008, // requires triggering spell to be affected by proccing aura to drop charges + + + PROC_ATTR_REDUCE_PROC_60 = 0x0000080 // aura should have a reduced chance to proc if level of proc Actor > 60 }; struct SpellProcEntry -- cgit v1.2.3