[6946] Use blizzlike formula for armor reduction damage

Implement use CR_ARMOR_PENETRATION rating

Signed-off-by: DiSlord <dislord@nomail.com>
This commit is contained in:
DiSlord 2008-12-26 00:44:55 +03:00
parent ae4a0032c1
commit 9d431700c3
2 changed files with 12 additions and 9 deletions

View file

@ -1478,15 +1478,18 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage)
// Ignore enemy armor by SPELL_AURA_MOD_TARGET_RESISTANCE aura // Ignore enemy armor by SPELL_AURA_MOD_TARGET_RESISTANCE aura
armor += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_TARGET_RESISTANCE, SPELL_SCHOOL_MASK_NORMAL); armor += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_TARGET_RESISTANCE, SPELL_SCHOOL_MASK_NORMAL);
if (armor<0.0f) armor=0.0f; // Apply Player CR_ARMOR_PENETRATION rating
if (GetTypeId()==TYPEID_PLAYER)
armor *= 1.0f - ((Player*)this)->GetRatingBonusValue(CR_ARMOR_PENETRATION) / 100.0f;
float tmpvalue = 0.0f; if (armor < 0.0f) armor=0.0f;
if(getLevel() <= 59) //Level 1-59
tmpvalue = armor / (armor + 400.0f + 85.0f * getLevel()); float levelModifier = getLevel();
else if(getLevel() < 70) //Level 60-69 if ( levelModifier > 59 )
tmpvalue = armor / (armor - 22167.5f + 467.5f * getLevel()); levelModifier = levelModifier + (4.5f * (levelModifier-59));
else //Level 70+
tmpvalue = armor / (armor + 10557.5f); float tmpvalue = 0.1f * armor / (8.5f * levelModifier + 40);
tmpvalue = tmpvalue/(1.0f + tmpvalue);
if(tmpvalue < 0.0f) if(tmpvalue < 0.0f)
tmpvalue = 0.0f; tmpvalue = 0.0f;

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "6945" #define REVISION_NR "6946"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__