From cc262ec12e8e51e5b295a160b1c02e4568bd5810 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 29 Apr 2016 20:05:41 +0200 Subject: Core/Spells: Updated Eviscerate and Envenom formulas Closes #16886 Closes #16887 --- src/server/game/Spells/SpellEffects.cpp | 51 --------------------------------- 1 file changed, 51 deletions(-) (limited to 'src/server/game') diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 4d1c5ab06a9..667249d897e 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -503,57 +503,6 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) } break; } - case SPELLFAMILY_ROGUE: - { - // Envenom - if (m_spellInfo->SpellFamilyFlags[1] & 0x00000008) - { - if (Player* player = m_caster->ToPlayer()) - { - // consume from stack dozes not more that have combo-points - if (uint32 combo = player->GetComboPoints()) - { - // Lookup for Deadly poison (only attacker applied) - if (AuraEffect const* aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_ROGUE, flag128(0x00010000, 0, 0), m_caster->GetGUID())) - { - // count consumed deadly poison doses at target - uint32 spellId = aurEff->GetId(); - - uint32 doses = aurEff->GetBase()->GetStackAmount(); - if (doses > combo) - doses = combo; - - for (uint32 i = 0; i < doses; ++i) - unitTarget->RemoveAuraFromStack(spellId, m_caster->GetGUID()); - - damage *= doses; - damage += int32(player->GetTotalAttackPowerValue(BASE_ATTACK) * 0.09f * combo); - } - - // Eviscerate and Envenom Bonus Damage (item set effect) - if (m_caster->HasAura(37169)) - damage += combo * 40; - } - } - } - // Eviscerate - else if (m_spellInfo->SpellFamilyFlags[0] & 0x00020000) - { - if (Player* player = m_caster->ToPlayer()) - { - if (uint32 combo = player->GetComboPoints()) - { - float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK); - damage += irand(int32(ap * combo * 0.03f), int32(ap * combo * 0.07f)); - - // Eviscerate and Envenom Bonus Damage (item set effect) - if (m_caster->HasAura(37169)) - damage += combo*40; - } - } - } - break; - } case SPELLFAMILY_DEATHKNIGHT: { // Blood Boil - bonus for diseased targets -- cgit v1.2.3