From b672eddd1d1a6eaf41039d8d7bf85f3a8c2a029c Mon Sep 17 00:00:00 2001 From: Ovalord <1Don7H4v3@m41L.com> Date: Wed, 29 Nov 2017 11:56:07 +0100 Subject: [PATCH] Core/Spells: fixed mage Mana Adept mastery --- src/server/game/Entities/Unit/Unit.cpp | 12 ++++++++++++ src/server/game/Spells/Auras/SpellAuraDefines.h | 2 +- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 0b46936e7e..4f27b2109c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6676,6 +6676,18 @@ float Unit::SpellDamagePctDone(Unit* victim, SpellInfo const* spellProto, Damage } } + // Add SPELL_AURA_MOD_DAMAGE_FROM_MANA percent bonus + AuraEffectList const& mDamageFromManaPct = owner->GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_FROM_MANA); + for (AuraEffectList::const_iterator i = mDamageFromManaPct.begin(); i != mDamageFromManaPct.end(); ++i) + { + if (GetPower(POWER_MANA)) + { + uint32 masteryBonus = (*i)->GetAmount(); + float manaPct = 100.f * GetPower(POWER_MANA) / GetMaxPower(POWER_MANA); + AddPct(DoneTotalMod, CalculatePct(masteryBonus, manaPct)); + } + } + // Custom scripted damage switch (spellProto->SpellFamilyName) { diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h index 527f9a43d7..c34b321651 100644 --- a/src/server/game/Spells/Auras/SpellAuraDefines.h +++ b/src/server/game/Spells/Auras/SpellAuraDefines.h @@ -415,7 +415,7 @@ enum AuraType SPELL_AURA_MOD_CAMOUFLAGE = 353, // NYI SPELL_AURA_MOD_HEALING_FROM_TARGET_HEALTH = 354, // Restoration Shaman mastery - mod healing based on target's health (less = more healing) SPELL_AURA_355 = 355, - SPELL_AURA_356 = 356, // Arcane Mage mastery - mod damage based on current mana + SPELL_AURA_MOD_DAMAGE_FROM_MANA = 356, // Arcane Mage mastery - mod damage based on current mana SPELL_AURA_ENABLE_BOSS1_UNIT_FRAME = 357, SPELL_AURA_WORGEN_ALTERED_FORM = 358, SPELL_AURA_359 = 359, diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 076ed25c55..f39d50a23f 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -414,7 +414,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNULL, //353 SPELL_AURA_MOD_CAMOUFLAGE &AuraEffect::HandleNoImmediateEffect, //354 SPELL_AURA_MOD_HEALING_FROM_TARGET_HEALTH implemented in Unit::SpellHealingPctDone &AuraEffect::HandleUnused, //355 unused (4.3.4) - &AuraEffect::HandleNULL, //356 SPELL_AURA_356 + &AuraEffect::HandleNoImmediateEffect, //356 SPELL_AURA_MOD_DAMAGE_FROM_MANA implemented in Unit::SpellDamagePctDone &AuraEffect::HandleNULL, //357 SPELL_AURA_ENABLE_BOSS1_UNIT_FRAME &AuraEffect::HandleNULL, //358 SPELL_AURA_358 &AuraEffect::HandleNULL, //359 SPELL_AURA_359