diff --git a/zone/bot.cpp b/zone/bot.cpp index 8c3f668a4..00662389c 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -5175,7 +5175,7 @@ int Bot::GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target) ac_bonus = inst->GetItemArmorClass(true) / 25.0f; if (ac_bonus > skill_bonus) ac_bonus = skill_bonus; - return static_cast(ac_bonus + skill_bonus); + return base + static_cast(ac_bonus + skill_bonus); } case EQ::skills::SkillKick: { float skill_bonus = skill_level / 10.0f; @@ -5185,7 +5185,7 @@ int Bot::GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target) ac_bonus = inst->GetItemArmorClass(true) / 25.0f; if (ac_bonus > skill_bonus) ac_bonus = skill_bonus; - return static_cast(ac_bonus + skill_bonus); + return base + static_cast(ac_bonus + skill_bonus); } case EQ::skills::SkillBash: { float skill_bonus = skill_level / 10.0f; @@ -5199,7 +5199,7 @@ int Bot::GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target) ac_bonus = inst->GetItemArmorClass(true) / 25.0f; if (ac_bonus > skill_bonus) ac_bonus = skill_bonus; - return static_cast(ac_bonus + skill_bonus); + return base + static_cast(ac_bonus + skill_bonus); } case EQ::skills::SkillBackstab: { float skill_bonus = static_cast(skill_level) * 0.02f; diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 6c367101c..466ab7d58 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -102,10 +102,10 @@ int Mob::GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target) } if (RuleB(Character, ItemExtraSkillDamageCalcAsPercent) && GetSkillDmgAmt(skill) > 0) { - return static_cast(ac_bonus + skill_bonus) * std::abs(GetSkillDmgAmt(skill) / 100); + return (base + static_cast(ac_bonus + skill_bonus)) * std::abs(GetSkillDmgAmt(skill) / 100); } - return static_cast(ac_bonus + skill_bonus); + return base + static_cast(ac_bonus + skill_bonus); } case EQ::skills::SkillKick: case EQ::skills::SkillRoundKick: { @@ -128,10 +128,10 @@ int Mob::GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target) } if (RuleB(Character, ItemExtraSkillDamageCalcAsPercent) && GetSkillDmgAmt(skill) > 0) { - return static_cast(ac_bonus + skill_bonus) * std::abs(GetSkillDmgAmt(skill) / 100); + return (base + static_cast(ac_bonus + skill_bonus)) * std::abs(GetSkillDmgAmt(skill) / 100); } - return static_cast(ac_bonus + skill_bonus); + return base + static_cast(ac_bonus + skill_bonus); } case EQ::skills::SkillBash: { float skill_bonus = skill_level / 10.0f; @@ -160,10 +160,10 @@ int Mob::GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target) } if (RuleB(Character, ItemExtraSkillDamageCalcAsPercent) && GetSkillDmgAmt(skill) > 0) { - return static_cast(ac_bonus + skill_bonus) * std::abs(GetSkillDmgAmt(skill) / 100); + return (base + static_cast(ac_bonus + skill_bonus)) * std::abs(GetSkillDmgAmt(skill) / 100); } - return static_cast(ac_bonus + skill_bonus); + return base + static_cast(ac_bonus + skill_bonus); } case EQ::skills::SkillBackstab: { float skill_bonus = static_cast(skill_level) * 0.02f;