ratkosrb
2019-03-21 20:33:31 +02:00
parent 0a2c451d07
commit df1ffbc8ee
7 changed files with 170 additions and 123 deletions
+26 -38
View File
@@ -119,8 +119,8 @@ void Player::UpdateResistances(uint32 school)
{
if (school > SPELL_SCHOOL_NORMAL)
{
float value = school == SPELL_SCHOOL_HOLY ? 0.0f : GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school));
SetResistance(SpellSchools(school), int32(value));
int32 value = school == SPELL_SCHOOL_HOLY ? 0 : GetTotalResistanceValue(SpellSchools(school));
SetResistance(SpellSchools(school), value);
}
else
UpdateArmor();
@@ -128,24 +128,22 @@ void Player::UpdateResistances(uint32 school)
void Player::UpdateArmor()
{
float value = 0.0f;
UnitMods unitMod = UNIT_MOD_ARMOR;
float dynamic = (GetStat(STAT_AGILITY) * 2.0f);
value = GetModifierValue(unitMod, BASE_VALUE); // base armor (from items)
value *= GetModifierValue(unitMod, BASE_PCT); // armor percent from items
value += GetStat(STAT_AGILITY) * 2.0f; // armor bonus from stats
value += GetModifierValue(unitMod, TOTAL_VALUE);
//add dynamic flat mods
AuraList const& mResbyIntellect = GetAurasByType(SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT);
for (AuraList::const_iterator i = mResbyIntellect.begin(); i != mResbyIntellect.end(); ++i)
// Add dynamic flat mods
for (auto& i : GetAurasByType(SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT))
{
Modifier* mod = (*i)->GetModifier();
if (mod->m_miscvalue & SPELL_SCHOOL_MASK_NORMAL)
value += int32(GetStat(STAT_INTELLECT) * mod->m_amount / 100.0f);
if (Modifier* mod = i->GetModifier())
{
if (mod->m_miscvalue & SPELL_SCHOOL_MASK_NORMAL)
dynamic += (GetStat(STAT_INTELLECT) * (mod->m_amount * 0.01f));
}
}
// add dummy effects from spells (check class and other conditions first for optimization)
m_auraModifiersGroup[UNIT_MOD_ARMOR][TOTAL_VALUE] += dynamic;
int32 value = GetTotalResistanceValue(SPELL_SCHOOL_NORMAL);
// Add dummy effects from spells (check class and other conditions first for optimization)
if (getClass() == CLASS_DRUID)
{
ShapeshiftForm form = GetShapeshiftForm();
@@ -158,7 +156,7 @@ void Player::UpdateArmor()
if ((*itr)->GetId() == 5229)
{
float enrageModifier = 0.0f;
enrageModifier = GetModifierValue(unitMod, BASE_VALUE);
enrageModifier = GetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE);
enrageModifier *= (*itr)->GetModifier()->m_amount / 100.0f;
value += enrageModifier;
break;
@@ -167,9 +165,8 @@ void Player::UpdateArmor()
}
}
value *= GetModifierValue(unitMod, TOTAL_PCT);
SetArmor(int32(value));
SetArmor(value);
m_auraModifiersGroup[UNIT_MOD_ARMOR][TOTAL_VALUE] -= dynamic;
}
float Player::GetHealthBonusFromStamina(float stamina)
@@ -709,8 +706,8 @@ void Creature::UpdateResistances(uint32 school)
{
if (school > SPELL_SCHOOL_NORMAL)
{
float value = school == SPELL_SCHOOL_HOLY ? 0.0f : GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school));
SetResistance(SpellSchools(school), int32(value));
int32 value = school == SPELL_SCHOOL_HOLY ? 0 : GetTotalResistanceValue(SpellSchools(school));
SetResistance(SpellSchools(school), value);
}
else
UpdateArmor();
@@ -718,8 +715,8 @@ void Creature::UpdateResistances(uint32 school)
void Creature::UpdateArmor()
{
float value = GetTotalAuraModValue(UNIT_MOD_ARMOR);
SetArmor(int32(value));
int32 value = GetTotalResistanceValue(SPELL_SCHOOL_NORMAL);
SetArmor(value);
}
void Creature::UpdateMaxHealth()
@@ -888,27 +885,18 @@ bool Pet::UpdateAllStats()
void Pet::UpdateResistances(uint32 school)
{
if (school > SPELL_SCHOOL_NORMAL)
{
float value = school == SPELL_SCHOOL_HOLY ? 0.0f : GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school));
SetResistance(SpellSchools(school), int32(value));
}
return Creature::UpdateResistances(school);
else
UpdateArmor();
}
void Pet::UpdateArmor()
{
float value = 0.0f;
float bonus_armor = 0.0f;
UnitMods unitMod = UNIT_MOD_ARMOR;
float amount = (GetStat(STAT_AGILITY) * 2.0f);
value = GetModifierValue(unitMod, BASE_VALUE);
value *= GetModifierValue(unitMod, BASE_PCT);
value += GetStat(STAT_AGILITY) * 2.0f;
value += GetModifierValue(unitMod, TOTAL_VALUE) + bonus_armor;
value *= GetModifierValue(unitMod, TOTAL_PCT);
SetArmor(int32(value));
m_auraModifiersGroup[UNIT_MOD_ARMOR][TOTAL_VALUE] += amount;
Creature::UpdateArmor();
m_auraModifiersGroup[UNIT_MOD_ARMOR][TOTAL_VALUE] -= amount;
}
void Pet::UpdateMaxHealth()