mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Sync] Some long overdue project sync pt2

Browse source
This commit is contained in:
Antz 2019-01-09 23:01:24 +00:00 • committed by Antz
parent 65ec4ea06e
commit f5bb0529c1
70 changed files with 1211 additions and 736 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/game/Object/StatSystem.cpp
View file

@ -40,7 +40,7 @@
bool Player::UpdateStats(Stats stat)
{
if (stat > STAT_SPIRIT)
return false;
{ return false; }
// value = ((base_value * base_pct) + total_value) * total_pct
float value = GetTotalStatValue(stat);
@ -135,7 +135,7 @@ bool Player::UpdateAllStats()
UpdateMaxHealth();
for (uint32 i = POWER_MANA; i < MAX_POWERS; ++i)
UpdateMaxPower(Powers(i));
{ UpdateMaxPower(Powers(i)); }
UpdateAllRatings();
UpdateAllCritPercentages();
@ -150,7 +150,7 @@ bool Player::UpdateAllStats()
UpdateExpertise(BASE_ATTACK);
UpdateExpertise(OFF_ATTACK);
for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
UpdateResistances(i);
{ UpdateResistances(i); }
return true;
}
@ -167,7 +167,7 @@ void Player::UpdateResistances(uint32 school)
pet->UpdateResistances(school);
}
else
UpdateArmor();
{ UpdateArmor(); }
}
void Player::UpdateArmor()
@ -346,7 +346,7 @@ void Player::UpdateAttackPowerAndDamage(bool ranged)
{
UpdateDamagePhysical(BASE_ATTACK);
if (CanDualWield() && haveOffhandWeapon()) // allow update offhand damage only if player knows DualWield Spec and has equipped offhand weapon
UpdateDamagePhysical(OFF_ATTACK);
{ UpdateDamagePhysical(OFF_ATTACK); }
}
}
@ -638,7 +638,7 @@ void Player::UpdateSpellHitChances()
void Player::UpdateAllSpellCritChances()
{
for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
UpdateSpellCritChance(i);
{ UpdateSpellCritChance(i); }
}
void Player::UpdateExpertise(WeaponAttackType attack)
@ -711,7 +711,7 @@ void Player::UpdateManaRegen()
// Set regen rate in cast state apply only on spirit based regen
int32 modManaRegenInterrupt = GetTotalAuraModifier(SPELL_AURA_MOD_MANA_REGEN_INTERRUPT);
if (modManaRegenInterrupt > 100)
modManaRegenInterrupt = 100;
{ modManaRegenInterrupt = 100; }
SetStatFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER, base_regen + power_regen_mp5 + spirit_regen * modManaRegenInterrupt / 100.0f);
SetStatFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER, base_regen + 0.001f + power_regen_mp5 + spirit_regen);
@ -803,10 +803,10 @@ bool Creature::UpdateAllStats()
UpdateAttackPowerAndDamage();
for (uint32 i = POWER_MANA; i < MAX_POWERS; ++i)
UpdateMaxPower(Powers(i));
{ UpdateMaxPower(Powers(i)); }
for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
UpdateResistances(i);
{ UpdateResistances(i); }
return true;
}
@ -819,7 +819,7 @@ void Creature::UpdateResistances(uint32 school)
SetResistance(SpellSchools(school), int32(value));
}
else
UpdateArmor();
{ UpdateArmor(); }
}
void Creature::UpdateArmor()
@ -868,7 +868,7 @@ void Creature::UpdateAttackPowerAndDamage(bool ranged)
SetFloatValue(index_mult, attPowerMultiplier); // UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER field
if (ranged)
return;
{ return; }
// automatically update weapon damage after attack power modification
UpdateDamagePhysical(BASE_ATTACK);
@ -878,7 +878,7 @@ void Creature::UpdateAttackPowerAndDamage(bool ranged)
void Creature::UpdateDamagePhysical(WeaponAttackType attType)
{
if (attType > OFF_ATTACK)
return;
{ return; }
UnitMods unitMod = (attType == BASE_ATTACK ? UNIT_MOD_DAMAGE_MAINHAND : UNIT_MOD_DAMAGE_OFFHAND);
@ -909,7 +909,7 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType)
bool Pet::UpdateStats(Stats stat)
{
if (stat > STAT_SPIRIT)
return false;
{ return false; }
// value = ((base_value * base_pct) + total_value) * total_pct
float value = GetTotalStatValue(stat);
@ -946,13 +946,13 @@ bool Pet::UpdateStats(Stats stat)
bool Pet::UpdateAllStats()
{
for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
UpdateStats(Stats(i));
{ UpdateStats(Stats(i)); }
for (uint32 i = POWER_MANA; i < MAX_POWERS; ++i)
UpdateMaxPower(Powers(i));
{ UpdateMaxPower(Powers(i)); }
for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
UpdateResistances(i);
{ UpdateResistances(i); }
return true;
}
@ -971,7 +971,7 @@ void Pet::UpdateResistances(uint32 school)
SetResistance(SpellSchools(school), int32(value));
}
else
UpdateArmor();
{ UpdateArmor(); }
}
void Pet::UpdateArmor()
@ -1026,16 +1026,16 @@ void Pet::UpdateMaxPower(Powers power)
void Pet::UpdateAttackPowerAndDamage(bool ranged)
{
if (ranged)
return;
{ return; }
float val = 0.0f;
float bonusAP = 0.0f;
UnitMods unitMod = UNIT_MOD_ATTACK_POWER;
if (GetEntry() == 416) // imp's attack power
val = GetStat(STAT_STRENGTH) - 10.0f;
{ val = GetStat(STAT_STRENGTH) - 10.0f; }
else
val = 2 * GetStat(STAT_STRENGTH) - 20.0f;
{ val = 2 * GetStat(STAT_STRENGTH) - 20.0f; }
Unit* owner = GetOwner();
if (owner && owner->GetTypeId() == TYPEID_PLAYER)
@ -1087,7 +1087,7 @@ void Pet::UpdateAttackPowerAndDamage(bool ranged)
void Pet::UpdateDamagePhysical(WeaponAttackType attType)
{
if (attType > BASE_ATTACK)
return;
{ return; }
UnitMods unitMod = UNIT_MOD_DAMAGE_MAINHAND;