Core/Spells:

* handle PLAYER_FIELD_MOD_HEALING_DONE_PCT in SPELL_AURA_MOD_HEALING_DONE_PERCENT
* handle PLAYER_FIELD_MOD_HEALING_PCT in SPELL_AURA_MOD_HEALING_PCT
This commit is contained in:
Ovahlord committed 2021-02-27 19:07:39 +01:00
1 parent cd1de5078d
commit 2711267480
5 files changed
+64 -9

No files matched your search

+15 -7
View File
@@ -7343,7 +7343,10 @@ float Unit::SpellHealingPctDone(Unit* victim, SpellInfo const* spellProto) const
float DoneTotalMod = 1.0f;
// Healing done percent
DoneTotalMod *= GetTotalAuraMultiplier(SPELL_AURA_MOD_HEALING_DONE_PERCENT);
if (IsPlayer())
DoneTotalMod *= GetFloatValue(PLAYER_FIELD_MOD_HEALING_DONE_PCT);
else
DoneTotalMod *= GetTotalAuraMultiplier(SPELL_AURA_MOD_HEALING_DONE_PERCENT);
// done scripted mod (take it from owner)
Unit const* owner = GetOwner() ? GetOwner() : this;
@@ -7418,13 +7421,18 @@ uint32 Unit::SpellHealingBonusTaken(Unit* caster, SpellInfo const* spellProto, u
float TakenTotalMod = 1.0f;
// Healing taken percent
float minval = float(GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT));
if (minval)
AddPct(TakenTotalMod, minval);
if (IsPlayer())
TakenTotalMod *= GetFloatValue(PLAYER_FIELD_MOD_HEALING_PCT);
else
{
float minval = float(GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT));
if (minval)
AddPct(TakenTotalMod, minval);
float maxval = float(GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HEALING_PCT));
if (maxval)
AddPct(TakenTotalMod, maxval);
float maxval = float(GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HEALING_PCT));
if (maxval)
AddPct(TakenTotalMod, maxval);
}
// Tenacity increase healing % taken
if (AuraEffect const* Tenacity = GetAuraEffect(58549, 0))