diff options
| author | Machiavelli <none@none> | 2009-06-22 22:44:07 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-22 22:44:07 +0200 |
| commit | 2c7799bfef898273d3ed624934a32306b085432d (patch) | |
| tree | 2bb76a733b396504c3de863f5a04604b2c162a67 /src | |
| parent | 9aa33f7a7b9c044a81f47d37cde325faba3ff0a1 (diff) | |
Backed out changeset 8569b2063da0
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/StatSystem.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index 1e23fed401c..bb7b1273ac0 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -1166,23 +1166,18 @@ void Guardian::UpdateDamagePhysical(WeaponAttackType attType) UnitMods unitMod = UNIT_MOD_DAMAGE_MAINHAND; - //float att_speed = float(GetAttackTime(BASE_ATTACK))/1000.0f; + float att_speed = float(GetAttackTime(BASE_ATTACK))/1000.0f; - //float base_value = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType)/ 14.0f * att_speed + bonusDamage; - float base_value = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType); + float base_value = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType)/ 14.0f * att_speed + bonusDamage; float base_pct = GetModifierValue(unitMod, BASE_PCT); float total_value = GetModifierValue(unitMod, TOTAL_VALUE); float total_pct = GetModifierValue(unitMod, TOTAL_PCT); - float dmg_multiplier = GetCreatureInfo()->dmg_multiplier; float weapon_mindamage = GetWeaponDamageRange(BASE_ATTACK, MINDAMAGE); float weapon_maxdamage = GetWeaponDamageRange(BASE_ATTACK, MAXDAMAGE); -/* + float mindamage = ((base_value + weapon_mindamage) * base_pct + total_value) * total_pct; - float maxdamage = ((base_value + weapon_maxdamage) * base_pct + total_value) * total_pct;*/ - float mindamage = ((base_value + weapon_mindamage) * base_pct + total_value) * total_pct * dmg_multiplier; - float maxdamage = ((base_value + weapon_maxdamage) * base_pct + total_value) * total_pct * dmg_multiplier; - + float maxdamage = ((base_value + weapon_maxdamage) * base_pct + total_value) * total_pct; // Pet's base damage changes depending on happiness if (isHunterPet() && attType == BASE_ATTACK) |