From c764e3e1c0ca68bda689fe91d5cacaca6703ffbc Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Fri, 26 Jul 2013 02:43:55 +0200 Subject: Core/Spells: Fix warrior "Rend" damage --- src/server/scripts/Spells/spell_warrior.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/server/scripts/Spells') diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index d0008d1e674..5af45bfc32d 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -538,7 +538,7 @@ class spell_warr_rallying_cry : public SpellScriptLoader } }; -// 772 - Rend +// 94009 - Rend class spell_warr_rend : public SpellScriptLoader { public: @@ -554,21 +554,13 @@ class spell_warr_rend : public SpellScriptLoader { canBeRecalculated = false; - // $0.2 * (($MWB + $mwb) / 2 + $AP / 14 * $MWS) bonus per tick + // $0.25 * (($MWB + $mwb) / 2 + $AP / 14 * $MWS) bonus per tick float ap = caster->GetTotalAttackPowerValue(BASE_ATTACK); int32 mws = caster->GetAttackTime(BASE_ATTACK); float mwbMin = caster->GetWeaponDamageRange(BASE_ATTACK, MINDAMAGE); float mwbMax = caster->GetWeaponDamageRange(BASE_ATTACK, MAXDAMAGE); - float mwb = ((mwbMin + mwbMax) / 2 + ap * mws / 14000) * 0.2f; + float mwb = ((mwbMin + mwbMax) / 2 + ap * mws / 14000) * 0.25f; amount += int32(caster->ApplyEffectModifiers(GetSpellInfo(), aurEff->GetEffIndex(), mwb)); - - // "If used while your target is above 75% health, Rend does 35% more damage." - // as for 3.1.3 only ranks above 9 (wrong tooltip?) - if (GetSpellInfo()->GetRank() >= 9) - { - if (GetUnitOwner()->HasAuraState(AURA_STATE_HEALTH_ABOVE_75_PERCENT, GetSpellInfo(), caster)) - AddPct(amount, GetSpellInfo()->Effects[EFFECT_2].CalcValue(caster)); - } } } -- cgit v1.2.3