Implement creature class level stats.

This commit is contained in:
ratkosrb
2022-06-12 17:09:23 +03:00
parent 50f16555da
commit 358ab70d88
22 changed files with 39446 additions and 426 deletions
+272 -255
View File
@@ -96,7 +96,6 @@ bool Player::UpdateAllStats()
UpdateAttackPowerAndDamage();
UpdateAttackPowerAndDamage(true);
UpdateArmor();
UpdateMaxHealth();
for (int i = POWER_MANA; i < MAX_POWERS; ++i)
@@ -107,6 +106,7 @@ bool Player::UpdateAllStats()
UpdateDefenseBonusesMod();
UpdateSpellDamageAndHealingBonus();
UpdateManaRegen();
for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
UpdateResistances(i);
@@ -214,37 +214,22 @@ void Player::UpdateMaxPower(Powers power)
SetMaxPower(power, uint32(value));
}
void Player::UpdateAttackPowerAndDamage(bool ranged)
float Unit::GetAttackPowerFromStrengthAndAgility(bool ranged, float strength, float agility) const
{
float val2 = 0.0f;
float level = float(GetLevel());
UnitMods unitMod = ranged ? UNIT_MOD_ATTACK_POWER_RANGED : UNIT_MOD_ATTACK_POWER;
uint16 index = UNIT_FIELD_ATTACK_POWER;
uint16 index_mod = UNIT_FIELD_ATTACK_POWER_MODS;
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4
uint16 index_mult = UNIT_FIELD_ATTACK_POWER_MULTIPLIER;
#endif
if (ranged)
{
index = UNIT_FIELD_RANGED_ATTACK_POWER;
index_mod = UNIT_FIELD_RANGED_ATTACK_POWER_MODS;
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4
index_mult = UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER;
#endif
switch (GetClass())
{
case CLASS_HUNTER:
val2 = level * 2.0f + GetStat(STAT_AGILITY) * 2.0f - 10.0f;
val2 = level * 2.0f + agility * 2.0f - 10.0f;
break;
case CLASS_ROGUE:
val2 = level + GetStat(STAT_AGILITY) - 10.0f;
val2 = level + agility - 10.0f;
break;
case CLASS_WARRIOR:
val2 = level + GetStat(STAT_AGILITY) - 10.0f;
val2 = level + agility - 10.0f;
break;
case CLASS_DRUID:
switch (GetShapeshiftForm())
@@ -255,12 +240,12 @@ void Player::UpdateAttackPowerAndDamage(bool ranged)
val2 = 0.0f;
break;
default:
val2 = GetStat(STAT_AGILITY) - 10.0f;
val2 = agility - 10.0f;
break;
}
break;
default:
val2 = GetStat(STAT_AGILITY) - 10.0f;
val2 = agility - 10.0f;
break;
}
}
@@ -269,19 +254,19 @@ void Player::UpdateAttackPowerAndDamage(bool ranged)
switch (GetClass())
{
case CLASS_WARRIOR:
val2 = level * 3.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f;
val2 = level * 3.0f + strength * 2.0f - 20.0f;
break;
case CLASS_PALADIN:
val2 = level * 3.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f;
val2 = level * 3.0f + strength * 2.0f - 20.0f;
break;
case CLASS_ROGUE:
val2 = level * 2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f;
val2 = level * 2.0f + strength + agility - 20.0f;
break;
case CLASS_HUNTER:
val2 = level * 2.0f + GetStat(STAT_STRENGTH) + GetStat(STAT_AGILITY) - 20.0f;
val2 = level * 2.0f + strength + agility - 20.0f;
break;
case CLASS_SHAMAN:
val2 = level * 2.0f + GetStat(STAT_STRENGTH) * 2.0f - 20.0f;
val2 = level * 2.0f + strength * 2.0f - 20.0f;
break;
case CLASS_DRUID:
{
@@ -314,33 +299,55 @@ void Player::UpdateAttackPowerAndDamage(bool ranged)
switch (form)
{
case FORM_CAT:
val2 = GetLevel() * mLevelMult + GetStat(STAT_STRENGTH) * 2.0f + GetStat(STAT_AGILITY) - 20.0f;
val2 = GetLevel() * mLevelMult + strength * 2.0f + agility - 20.0f;
break;
case FORM_BEAR:
case FORM_DIREBEAR:
val2 = GetLevel() * mLevelMult + GetStat(STAT_STRENGTH) * 2.0f - 20.0f;
val2 = GetLevel() * mLevelMult + strength * 2.0f - 20.0f;
break;
case FORM_MOONKIN:
val2 = GetLevel() * mLevelMult + GetStat(STAT_STRENGTH) * 2.0f - 20.0f;
val2 = GetLevel() * mLevelMult + strength * 2.0f - 20.0f;
break;
default:
val2 = GetStat(STAT_STRENGTH) * 2.0f - 20.0f;
val2 = strength * 2.0f - 20.0f;
break;
}
break;
}
case CLASS_MAGE:
val2 = GetStat(STAT_STRENGTH) - 10.0f;
val2 = strength - 10.0f;
break;
case CLASS_PRIEST:
val2 = GetStat(STAT_STRENGTH) - 10.0f;
val2 = strength - 10.0f;
break;
case CLASS_WARLOCK:
val2 = GetStat(STAT_STRENGTH) - 10.0f;
val2 = strength - 10.0f;
break;
}
}
return val2;
}
void Player::UpdateAttackPowerAndDamage(bool ranged)
{
UnitMods unitMod = ranged ? UNIT_MOD_ATTACK_POWER_RANGED : UNIT_MOD_ATTACK_POWER;
uint16 index = UNIT_FIELD_ATTACK_POWER;
uint16 index_mod = UNIT_FIELD_ATTACK_POWER_MODS;
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4
uint16 index_mult = UNIT_FIELD_ATTACK_POWER_MULTIPLIER;
#endif
if (ranged)
{
index = UNIT_FIELD_RANGED_ATTACK_POWER;
index_mod = UNIT_FIELD_RANGED_ATTACK_POWER_MODS;
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4
index_mult = UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER;
#endif
}
float val2 = GetAttackPowerFromStrengthAndAgility(ranged, GetStat(STAT_STRENGTH), GetStat(STAT_AGILITY));
SetModifierValue(unitMod, BASE_VALUE, val2);
float base_attPower = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
@@ -680,196 +687,7 @@ void Player::_RemoveAllStatBonuses()
######## ########
#######################################*/
bool Creature::UpdateStats(Stats /*stat*/)
{
return true;
}
bool Creature::UpdateAllStats()
{
UpdateMaxHealth();
UpdateAttackPowerAndDamage();
UpdateAttackPowerAndDamage(true);
for (int i = POWER_MANA; i < MAX_POWERS; ++i)
UpdateMaxPower(Powers(i));
for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
UpdateResistances(i);
if (GetMaxPower(POWER_MANA))
UpdateManaRegen();
return true;
}
void Creature::UpdateResistances(uint32 school)
{
if (school > SPELL_SCHOOL_NORMAL)
{
int32 value = school == SPELL_SCHOOL_HOLY ? 0 : GetTotalResistanceValue(SpellSchools(school));
SetResistance(SpellSchools(school), value);
}
else
UpdateArmor();
}
void Creature::UpdateArmor()
{
int32 value = GetTotalResistanceValue(SPELL_SCHOOL_NORMAL);
SetArmor(value);
}
void Creature::UpdateMaxHealth()
{
float value = GetTotalAuraModValue(UNIT_MOD_HEALTH);
SetMaxHealth(std::max(1, int(value)));
}
void Creature::UpdateMaxPower(Powers power)
{
UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + power);
float value = GetTotalAuraModValue(unitMod);
SetMaxPower(power, uint32(value));
}
void Creature::UpdateManaRegen()
{
float ManaIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_MANA);
float intellect = std::max(1.0f, GetStat(STAT_INTELLECT));
// Apply PCT bonus from SPELL_AURA_MOD_POWER_REGEN_PERCENT aura on spirit base regen
float power_regen = GetTotalAuraMultiplierByMiscValue(SPELL_AURA_MOD_POWER_REGEN_PERCENT, POWER_MANA);
// Mana regen from SPELL_AURA_MOD_POWER_REGEN aura
float power_regen_mp5 = GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, POWER_MANA) / 5.0f;
m_manaRegen = uint32((sqrt(intellect) * GetRegenMPPerSpirit() * power_regen + power_regen_mp5) * ManaIncreaseRate);
}
void Creature::UpdateAttackPowerAndDamage(bool ranged)
{
UnitMods unitMod = ranged ? UNIT_MOD_ATTACK_POWER_RANGED : UNIT_MOD_ATTACK_POWER;
uint16 index = UNIT_FIELD_ATTACK_POWER;
uint16 index_mod = UNIT_FIELD_ATTACK_POWER_MODS;
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4
uint16 index_mult = UNIT_FIELD_ATTACK_POWER_MULTIPLIER;
#endif
if (ranged)
{
index = UNIT_FIELD_RANGED_ATTACK_POWER;
index_mod = UNIT_FIELD_RANGED_ATTACK_POWER_MODS;
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4
index_mult = UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER;
#endif
}
float base_attPower = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
float attPowerMod = GetModifierValue(unitMod, TOTAL_VALUE);
float attPowerMultiplier = GetModifierValue(unitMod, TOTAL_PCT) - 1.0f;
SetInt32Value(index, (uint32)base_attPower); //UNIT_FIELD_(RANGED)_ATTACK_POWER field
SetInt32Value(index_mod, (uint32)attPowerMod); //UNIT_FIELD_(RANGED)_ATTACK_POWER_MODS field
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4
SetFloatValue(index_mult, attPowerMultiplier); //UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER field
#endif
if (ranged)
{
UpdateDamagePhysical(RANGED_ATTACK);
return;
}
//automatically update weapon damage after attack power modification
UpdateDamagePhysical(BASE_ATTACK);
UpdateDamagePhysical(OFF_ATTACK);
}
void Creature::UpdateDamagePhysical(WeaponAttackType attType)
{
UnitMods unitMod;
float databaseAttackPower;
switch (attType)
{
case BASE_ATTACK:
default:
unitMod = UNIT_MOD_DAMAGE_MAINHAND;
databaseAttackPower = GetCreatureInfo()->attack_power;
break;
case OFF_ATTACK:
unitMod = UNIT_MOD_DAMAGE_OFFHAND;
databaseAttackPower = GetCreatureInfo()->attack_power;
break;
case RANGED_ATTACK:
unitMod = UNIT_MOD_DAMAGE_RANGED;
databaseAttackPower = GetCreatureInfo()->ranged_attack_power;
break;
}
float base_value = GetModifierValue(unitMod, BASE_VALUE);
float base_pct = GetModifierValue(unitMod, BASE_PCT);
float total_value = GetModifierValue(unitMod, TOTAL_VALUE);
float total_pct = GetModifierValue(unitMod, TOTAL_PCT);
float total_phys = GetTotalAuraModValue(UNIT_MOD_DAMAGE_PHYSICAL);
float dmg_multiplier = GetCreatureInfo()->dmg_multiplier;
float weapon_mindamage = GetWeaponDamageRange(attType, MINDAMAGE);
float weapon_maxdamage = GetWeaponDamageRange(attType, MAXDAMAGE);
// Disarm effects. Only applies to mobs with a weapon equipped. Sources suggest a
// ~60% damage reduction on mobs which can be disarmed and have a weapon
// http://wowwiki.wikia.com/wiki/Attumen_the_Huntsman?oldid=1377353
// http://wowwiki.wikia.com/wiki/Disarm?direction=prev&oldid=200198
if (HasWeapon() && !CanUseEquippedWeapon(attType))
total_pct *= 0.4f;
/* AP for units is 30% of base damage.
* ie if AP is reduced to 0, attack will be reduced of 30%
* We have to ignore creatures that don't have AP set in database (we would divide by 0)
*/
if (databaseAttackPower)
{
float attackPowerNow = GetTotalAttackPowerValue(attType);
weapon_mindamage = weapon_mindamage * (0.7f + 0.3f * attackPowerNow / databaseAttackPower);
weapon_maxdamage = weapon_maxdamage * (0.7f + 0.3f * attackPowerNow / databaseAttackPower);
}
float mindamage = ((base_value + weapon_mindamage) * dmg_multiplier * base_pct + total_value + total_phys) * total_pct;
float maxdamage = ((base_value + weapon_maxdamage) * dmg_multiplier * base_pct + total_value + total_phys) * total_pct;
uint16 fieldmin, fieldmax;
switch (attType)
{
case RANGED_ATTACK:
fieldmin = UNIT_FIELD_MINRANGEDDAMAGE;
fieldmax = UNIT_FIELD_MAXRANGEDDAMAGE;
break;
case BASE_ATTACK:
fieldmin = UNIT_FIELD_MINDAMAGE;
fieldmax = UNIT_FIELD_MAXDAMAGE;
break;
case OFF_ATTACK:
fieldmin = UNIT_FIELD_MINOFFHANDDAMAGE;
fieldmax = UNIT_FIELD_MAXOFFHANDDAMAGE;
break;
default:
return;
}
SetStatFloatValue(fieldmin, mindamage);
SetStatFloatValue(fieldmax, maxdamage);
}
/*#######################################
######## ########
######## PETS STAT SYSTEM ########
######## ########
#######################################*/
bool Pet::UpdateStats(Stats stat)
bool Creature::UpdateStats(Stats stat)
{
if (stat > STAT_SPIRIT)
return false;
@@ -904,6 +722,231 @@ bool Pet::UpdateStats(Stats stat)
return true;
}
bool Creature::UpdateAllStats()
{
for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
{
float value = GetTotalStatValue(Stats(i));
SetStat(Stats(i), (int32)value);
}
UpdateMaxHealth();
UpdateAttackPowerAndDamage();
UpdateAttackPowerAndDamage(true);
for (int i = POWER_MANA; i < MAX_POWERS; ++i)
UpdateMaxPower(Powers(i));
for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
UpdateResistances(i);
if (GetMaxPower(POWER_MANA))
UpdateManaRegen();
return true;
}
void Creature::UpdateResistances(uint32 school)
{
if (school > SPELL_SCHOOL_NORMAL)
{
int32 value = school == SPELL_SCHOOL_HOLY ? 0 : GetTotalResistanceValue(SpellSchools(school));
SetResistance(SpellSchools(school), value);
}
else
UpdateArmor();
}
void Creature::UpdateArmor()
{
float dynamic = GetStat(STAT_AGILITY); // 1 agility = 1 armor for creatures
m_auraModifiersGroup[UNIT_MOD_ARMOR][TOTAL_VALUE] += dynamic;
int32 value = GetTotalResistanceValue(SPELL_SCHOOL_NORMAL);
SetArmor(value);
m_auraModifiersGroup[UNIT_MOD_ARMOR][TOTAL_VALUE] -= dynamic;
}
void Creature::UpdateMaxHealth()
{
UnitMods unitMod = UNIT_MOD_HEALTH;
float stamina = GetStat(STAT_STAMINA) - GetCreateStat(STAT_STAMINA);
float value = GetModifierValue(unitMod, BASE_VALUE);
if (IsPet())
value += GetCreateHealth();
value *= GetModifierValue(unitMod, BASE_PCT);
value += GetModifierValue(unitMod, TOTAL_VALUE) + stamina * 10.0f;
value *= GetModifierValue(unitMod, TOTAL_PCT);
SetMaxHealth(std::max(1, int(value)));
}
void Creature::UpdateMaxPower(Powers power)
{
UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + power);
float intellect = (power == POWER_MANA) ? GetStat(STAT_INTELLECT) - GetCreateStat(STAT_INTELLECT) : 0.0f;
float value = GetModifierValue(unitMod, BASE_VALUE);
if (IsPet())
value += GetCreatePowers(power);
value *= GetModifierValue(unitMod, BASE_PCT);
value += GetModifierValue(unitMod, TOTAL_VALUE) + intellect * 15.0f;
value *= GetModifierValue(unitMod, TOTAL_PCT);
if (value < 0.0f)
value = 0.0f;
SetMaxPower(power, uint32(value));
}
void Creature::UpdateManaRegen()
{
float ManaIncreaseRate = sWorld.getConfig(CONFIG_FLOAT_RATE_POWER_MANA);
float intellect = std::max(1.0f, GetStat(STAT_INTELLECT));
// Apply PCT bonus from SPELL_AURA_MOD_POWER_REGEN_PERCENT aura on spirit base regen
float power_regen = GetTotalAuraMultiplierByMiscValue(SPELL_AURA_MOD_POWER_REGEN_PERCENT, POWER_MANA);
// Mana regen from SPELL_AURA_MOD_POWER_REGEN aura
float power_regen_mp5 = GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, POWER_MANA) / 5.0f;
m_manaRegen = uint32((sqrt(intellect) * GetRegenMPPerSpirit() * power_regen + power_regen_mp5) * ManaIncreaseRate);
}
void Creature::UpdateAttackPowerAndDamage(bool ranged)
{
UnitMods unitMod = ranged ? UNIT_MOD_ATTACK_POWER_RANGED : UNIT_MOD_ATTACK_POWER;
uint16 index = UNIT_FIELD_ATTACK_POWER;
uint16 index_mod = UNIT_FIELD_ATTACK_POWER_MODS;
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4
uint16 index_mult = UNIT_FIELD_ATTACK_POWER_MULTIPLIER;
#endif
if (ranged)
{
index = UNIT_FIELD_RANGED_ATTACK_POWER;
index_mod = UNIT_FIELD_RANGED_ATTACK_POWER_MODS;
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4
index_mult = UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER;
#endif
}
float baseAttackPower = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
float attackPowerMod = GetModifierValue(unitMod, TOTAL_VALUE);
float attackPowerMultiplier = GetModifierValue(unitMod, TOTAL_PCT) - 1.0f;
// Only apply AP bonus from stats when different than default value,
// as the stats are already taken into account in the base AP values.
if (GetCreateStat(STAT_STRENGTH) != GetStat(STAT_STRENGTH) ||
GetCreateStat(STAT_AGILITY) != GetStat(STAT_AGILITY))
{
float defaultAPBonus = GetAttackPowerFromStrengthAndAgility(ranged, GetCreateStat(STAT_STRENGTH), GetCreateStat(STAT_AGILITY));
float currentAPBonus = GetAttackPowerFromStrengthAndAgility(ranged, GetStat(STAT_STRENGTH), GetStat(STAT_AGILITY));
attackPowerMod += (currentAPBonus - defaultAPBonus);
}
SetInt32Value(index, (int32)baseAttackPower); //UNIT_FIELD_(RANGED)_ATTACK_POWER field
SetInt32Value(index_mod, (int32)attackPowerMod); //UNIT_FIELD_(RANGED)_ATTACK_POWER_MODS field
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4
SetFloatValue(index_mult, attackPowerMultiplier); //UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER field
#endif
//automatically update weapon damage after attack power modification
if (ranged)
{
UpdateDamagePhysical(RANGED_ATTACK);
}
else
{
UpdateDamagePhysical(BASE_ATTACK);
UpdateDamagePhysical(OFF_ATTACK);
}
}
void Creature::UpdateDamagePhysical(WeaponAttackType attType)
{
UnitMods unitMod;
float databaseAttackPower;
CreatureClassLevelStats const* pCLS = GetClassLevelStats();
switch (attType)
{
case BASE_ATTACK:
default:
unitMod = UNIT_MOD_DAMAGE_MAINHAND;
databaseAttackPower = pCLS->attack_power;
break;
case OFF_ATTACK:
unitMod = UNIT_MOD_DAMAGE_OFFHAND;
databaseAttackPower = pCLS->attack_power;
break;
case RANGED_ATTACK:
unitMod = UNIT_MOD_DAMAGE_RANGED;
databaseAttackPower = pCLS->ranged_attack_power;
break;
}
float base_value = GetModifierValue(unitMod, BASE_VALUE);
float base_pct = GetModifierValue(unitMod, BASE_PCT);
float total_value = GetModifierValue(unitMod, TOTAL_VALUE);
float total_pct = GetModifierValue(unitMod, TOTAL_PCT);
float total_phys = GetTotalAuraModValue(UNIT_MOD_DAMAGE_PHYSICAL);
float weapon_mindamage = GetWeaponDamageRange(attType, MINDAMAGE);
float weapon_maxdamage = GetWeaponDamageRange(attType, MAXDAMAGE);
// Disarm effects. Only applies to mobs with a weapon equipped. Sources suggest a
// ~60% damage reduction on mobs which can be disarmed and have a weapon
// http://wowwiki.wikia.com/wiki/Attumen_the_Huntsman?oldid=1377353
// http://wowwiki.wikia.com/wiki/Disarm?direction=prev&oldid=200198
if (HasWeapon() && !CanUseEquippedWeapon(attType))
total_pct *= 0.4f;
/* AP for units is 30% of base damage.
* ie if AP is reduced to 0, attack will be reduced of 30%
* We have to ignore creatures that don't have AP set in database (we would divide by 0)
*/
if (databaseAttackPower)
{
float attackPowerNow = GetTotalAttackPowerValue(attType);
weapon_mindamage = weapon_mindamage * (0.7f + 0.3f * attackPowerNow / databaseAttackPower);
weapon_maxdamage = weapon_maxdamage * (0.7f + 0.3f * attackPowerNow / databaseAttackPower);
}
float mindamage = ((base_value + weapon_mindamage) * base_pct + total_value + total_phys) * total_pct;
float maxdamage = ((base_value + weapon_maxdamage) * base_pct + total_value + total_phys) * total_pct;
uint16 fieldmin, fieldmax;
switch (attType)
{
case RANGED_ATTACK:
fieldmin = UNIT_FIELD_MINRANGEDDAMAGE;
fieldmax = UNIT_FIELD_MAXRANGEDDAMAGE;
break;
case BASE_ATTACK:
fieldmin = UNIT_FIELD_MINDAMAGE;
fieldmax = UNIT_FIELD_MAXDAMAGE;
break;
case OFF_ATTACK:
fieldmin = UNIT_FIELD_MINOFFHANDDAMAGE;
fieldmax = UNIT_FIELD_MAXOFFHANDDAMAGE;
break;
default:
return;
}
SetStatFloatValue(fieldmin, mindamage);
SetStatFloatValue(fieldmax, maxdamage);
}
/*#######################################
######## ########
######## PETS STAT SYSTEM ########
######## ########
#######################################*/
bool Pet::UpdateAllStats()
{
for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
@@ -934,37 +977,12 @@ void Pet::UpdateArmor()
float amount = (GetStat(STAT_AGILITY) * 2.0f);
m_auraModifiersGroup[UNIT_MOD_ARMOR][TOTAL_VALUE] += amount;
Creature::UpdateArmor();
int32 value = GetTotalResistanceValue(SPELL_SCHOOL_NORMAL);
SetArmor(value);
m_auraModifiersGroup[UNIT_MOD_ARMOR][TOTAL_VALUE] -= amount;
}
void Pet::UpdateMaxHealth()
{
UnitMods unitMod = UNIT_MOD_HEALTH;
float stamina = GetStat(STAT_STAMINA) - GetCreateStat(STAT_STAMINA);
float value = GetModifierValue(unitMod, BASE_VALUE) + GetCreateHealth();
value *= GetModifierValue(unitMod, BASE_PCT);
value += GetModifierValue(unitMod, TOTAL_VALUE) + stamina * 10.0f;
value *= GetModifierValue(unitMod, TOTAL_PCT);
SetMaxHealth(std::max(1, int(value)));
}
void Pet::UpdateMaxPower(Powers power)
{
UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + power);
float addValue = (power == POWER_MANA) ? GetStat(STAT_INTELLECT) - GetCreateStat(STAT_INTELLECT) : 0.0f;
float value = GetModifierValue(unitMod, BASE_VALUE) + GetCreatePowers(power);
value *= GetModifierValue(unitMod, BASE_PCT);
value += GetModifierValue(unitMod, TOTAL_VALUE) + addValue * 15.0f;
value *= GetModifierValue(unitMod, TOTAL_PCT);
SetMaxPower(power, uint32(value));
}
void Pet::UpdateAttackPowerAndDamage(bool ranged)
{
if (ranged)
@@ -1010,7 +1028,6 @@ void Pet::UpdateDamagePhysical(WeaponAttackType attType)
float total_value = GetModifierValue(unitMod, TOTAL_VALUE);
float total_pct = GetModifierValue(unitMod, TOTAL_PCT);
float total_phys = GetTotalAuraModValue(UNIT_MOD_DAMAGE_PHYSICAL);
float dmg_multiplier = getPetType() == HUNTER_PET ? 1.0f : GetCreatureInfo()->dmg_multiplier;
float weapon_mindamage = GetWeaponDamageRange(attType, MINDAMAGE);
float weapon_maxdamage = GetWeaponDamageRange(attType, MAXDAMAGE);
@@ -1030,8 +1047,8 @@ void Pet::UpdateDamagePhysical(WeaponAttackType attType)
weapon_maxdamage = weapon_maxdamage * (0.7f + 0.3f * attackPowerNow / createAttackPower);
}
float mindamage = ((base_value + weapon_mindamage) * dmg_multiplier * base_pct + total_value + total_phys) * total_pct;
float maxdamage = ((base_value + weapon_maxdamage) * dmg_multiplier * base_pct + total_value + total_phys) * total_pct;
float mindamage = ((base_value + weapon_mindamage) * base_pct + total_value + total_phys) * total_pct;
float maxdamage = ((base_value + weapon_maxdamage) * base_pct + total_value + total_phys) * total_pct;
// Pet's base damage changes depending on happiness
if (getPetType() == HUNTER_PET)