diff options
| author | megamage <none@none> | 2009-06-17 13:34:49 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-06-17 13:34:49 -0500 |
| commit | d805e89091027bd81c9d0cb99323afd8f5ab8540 (patch) | |
| tree | 639d12c9e40ebb686dfbc539d359c07d68bd6db7 /src | |
| parent | d4a6a3d09d20e11cbb38d010de9018554dd965a0 (diff) | |
*Update creature melee damage calculation.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Creature.cpp | 12 | ||||
| -rw-r--r-- | src/game/StatSystem.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index be0747f0a89..65dc188063c 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1393,12 +1393,12 @@ void Creature::SelectLevel(const CreatureInfo *cinfo) // damage float damagemod = _GetDamageMod(rank); - SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, cinfo->mindmg * damagemod); - SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, cinfo->maxdmg * damagemod); - SetBaseWeaponDamage(OFF_ATTACK, MINDAMAGE, cinfo->mindmg * damagemod); - SetBaseWeaponDamage(OFF_ATTACK, MAXDAMAGE, cinfo->maxdmg * damagemod); - SetBaseWeaponDamage(RANGED_ATTACK, MINDAMAGE, cinfo->minrangedmg * damagemod); - SetBaseWeaponDamage(RANGED_ATTACK, MAXDAMAGE, cinfo->maxrangedmg * damagemod); + SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, (cinfo->mindmg + cinfo->attackpower) * damagemod); + SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, (cinfo->maxdmg + cinfo->attackpower) * damagemod); + SetBaseWeaponDamage(OFF_ATTACK, MINDAMAGE, (cinfo->mindmg + cinfo->attackpower) * damagemod); + SetBaseWeaponDamage(OFF_ATTACK, MAXDAMAGE, (cinfo->maxdmg + cinfo->attackpower) * damagemod); + SetBaseWeaponDamage(RANGED_ATTACK, MINDAMAGE, (cinfo->minrangedmg + cinfo->rangedattackpower) * damagemod); + SetBaseWeaponDamage(RANGED_ATTACK, MAXDAMAGE, (cinfo->maxrangedmg + cinfo->rangedattackpower) * damagemod); // this value is not accurate, but should be close to the real value SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, level * 5); diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index 8287ed2b2bf..2049964c779 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -880,8 +880,8 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType) float weapon_maxdamage = GetWeaponDamageRange(attType, MAXDAMAGE); float base_value = GetModifierValue(unitMod, BASE_VALUE) - + (weapon_mindamage + weapon_maxdamage) / 6 - * GetTotalAttackPowerValue(attType) / (getLevel() * 5); + + (weapon_mindamage + weapon_maxdamage) + * GetTotalAttackPowerValue(attType) / (getLevel() * 30); //float base_value = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType); float base_pct = GetModifierValue(unitMod, BASE_PCT); float total_value = GetModifierValue(unitMod, TOTAL_VALUE); |