Core/Auras: Rename many old aura types to their new meaning
Port From (https://github.com/TrinityCore/TrinityCore/commit/bd7c714c97beb04eb815b0aa175badfb6933ccf1)
This commit is contained in:
@@ -2474,17 +2474,6 @@ namespace Game.Entities
|
||||
// Ignore Absorption Auras
|
||||
float auraAbsorbMod = GetMaxPositiveAuraModifierByMiscMask(AuraType.ModTargetAbsorbSchool, (uint)damageInfo.GetSchoolMask());
|
||||
|
||||
auraAbsorbMod = Math.Max(auraAbsorbMod, (float)GetMaxPositiveAuraModifier(AuraType.ModTargetAbilityAbsorbSchool, aurEff =>
|
||||
{
|
||||
if (!Convert.ToBoolean(aurEff.GetMiscValue() & (int)damageInfo.GetSchoolMask()))
|
||||
return false;
|
||||
|
||||
if (!aurEff.IsAffectingSpell(damageInfo.GetSpellInfo()))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}));
|
||||
|
||||
MathFunctions.RoundToInterval(ref auraAbsorbMod, 0.0f, 100.0f);
|
||||
|
||||
int absorbIgnoringDamage = (int)MathFunctions.CalculatePct(damageInfo.GetDamage(), auraAbsorbMod);
|
||||
|
||||
@@ -78,9 +78,6 @@ namespace Game.Entities
|
||||
DoneAdvertisedBenefit += (int)MathFunctions.CalculatePct(GetStat(usedStat), eff.GetAmount());
|
||||
}
|
||||
}
|
||||
// ... and attack power
|
||||
DoneAdvertisedBenefit += (int)MathFunctions.CalculatePct(GetTotalAttackPowerValue(WeaponAttackType.BaseAttack), GetTotalAuraModifierByMiscMask(AuraType.ModSpellDamageOfAttackPower, (int)schoolMask));
|
||||
|
||||
}
|
||||
return DoneAdvertisedBenefit;
|
||||
}
|
||||
@@ -383,12 +380,6 @@ namespace Game.Entities
|
||||
Stats usedStat = (Stats)(i.GetSpellEffectInfo().MiscValue);
|
||||
advertisedBenefit += (uint)MathFunctions.CalculatePct(GetStat(usedStat), i.GetAmount());
|
||||
}
|
||||
|
||||
// ... and attack power
|
||||
var mHealingDonebyAP = GetAuraEffectsByType(AuraType.ModSpellHealingOfAttackPower);
|
||||
foreach (var i in mHealingDonebyAP)
|
||||
if (Convert.ToBoolean(i.GetMiscValue() & (int)schoolMask))
|
||||
advertisedBenefit += (uint)MathFunctions.CalculatePct(GetTotalAttackPowerValue(WeaponAttackType.BaseAttack), i.GetAmount());
|
||||
}
|
||||
return advertisedBenefit;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user