Core/Unit: rename & cleanup GetCreatePowers

it hurted my eyes too much
This commit is contained in:
ccrs
2019-01-14 07:07:06 +01:00
parent 8f9654d817
commit 954fd2639a
6 changed files with 27 additions and 20 deletions
+4 -4
View File
@@ -319,9 +319,9 @@ void Player::UpdateMaxPower(Powers power)
{
UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + power);
float bonusPower = (power == POWER_MANA && GetCreatePowers(power) > 0) ? GetManaBonusFromIntellect() : 0;
float bonusPower = (power == POWER_MANA && GetCreatePowerValue(power) > 0) ? GetManaBonusFromIntellect() : 0;
float value = GetFlatModifierValue(unitMod, BASE_VALUE) + GetCreatePowers(power);
float value = GetFlatModifierValue(unitMod, BASE_VALUE) + GetCreatePowerValue(power);
value *= GetPctModifierValue(unitMod, BASE_PCT);
value += GetFlatModifierValue(unitMod, TOTAL_VALUE) + bonusPower;
value *= GetPctModifierValue(unitMod, TOTAL_PCT);
@@ -1032,7 +1032,7 @@ void Creature::UpdateMaxPower(Powers power)
{
UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + power);
float value = GetFlatModifierValue(unitMod, BASE_VALUE) + GetCreatePowers(power);
float value = GetFlatModifierValue(unitMod, BASE_VALUE) + GetCreatePowerValue(power);
value *= GetPctModifierValue(unitMod, BASE_PCT);
value += GetFlatModifierValue(unitMod, TOTAL_VALUE);
value *= GetPctModifierValue(unitMod, TOTAL_PCT);
@@ -1334,7 +1334,7 @@ void Guardian::UpdateMaxPower(Powers power)
default: multiplicator = 15.0f; break;
}
float value = GetFlatModifierValue(unitMod, BASE_VALUE) + GetCreatePowers(power);
float value = GetFlatModifierValue(unitMod, BASE_VALUE) + GetCreatePowerValue(power);
value *= GetPctModifierValue(unitMod, BASE_PCT);
value += GetFlatModifierValue(unitMod, TOTAL_VALUE) + addValue * multiplicator;
value *= GetPctModifierValue(unitMod, TOTAL_PCT);