From c11b6e06db7b1591023b063f7cf81ddb4b4323e7 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 21 Nov 2019 10:21:29 +0100 Subject: [PATCH] Core/Spells: simplified application of SPELL_AURA_MOD_SPELL_POWER_PCT and removed a duplicate applying of SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN --- src/server/game/Entities/Unit/Unit.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index f1a2a72e14..1137049df3 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6952,10 +6952,6 @@ uint32 Unit::SpellDamageBonusTaken(Unit* caster, SpellInfo const* spellProto, ui }); } - // from positive and negative SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN - // multiplicative bonus, for example Dispersion + Shadowform (0.10*0.85=0.085) - TakenTotalMod *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, spellProto->GetSchoolMask()); - //.. taken pct: dummy auras AuraEffectList const& mDummyAuras = GetAuraEffectsByType(SPELL_AURA_DUMMY); for (AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i) @@ -7040,19 +7036,7 @@ int32 Unit::SpellBaseDamageBonusDone(SpellSchoolMask schoolMask) const } // Spell power from SPELL_AURA_MOD_SPELL_POWER_PCT - AuraEffectList const& mSpellPowerPct = GetAuraEffectsByType(SPELL_AURA_MOD_SPELL_POWER_PCT); - for (AuraEffect const* aurEff : mSpellPowerPct) - { - int32 spellGroupVal = GetHighestExclusiveSameEffectSpellGroupValue(aurEff, SPELL_AURA_MOD_SPELL_POWER_PCT); - if (abs(spellGroupVal) >= abs(aurEff->GetAmount())) - { - AddPct(DoneAdvertisedBenefit, spellGroupVal); - break; - } - else if (!spellGroupVal) - AddPct(DoneAdvertisedBenefit, aurEff->GetAmount()); - } - + AddPct(DoneAdvertisedBenefit, GetTotalAuraModifier(SPELL_AURA_MOD_SPELL_POWER_PCT)); // ... and attack power DoneAdvertisedBenefit += static_cast(CalculatePct(GetTotalAttackPowerValue(BASE_ATTACK), GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_SPELL_DAMAGE_OF_ATTACK_POWER, schoolMask))); }