From a3f21cc9ea7f5ad30c8e93928cc39f7d577b321c Mon Sep 17 00:00:00 2001 From: E Spause Date: Thu, 16 Mar 2017 13:27:58 -0400 Subject: [PATCH] Additional fixups. --- common/skills.cpp | 2 +- zone/special_attacks.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/skills.cpp b/common/skills.cpp index 4720cb470..947861163 100644 --- a/common/skills.cpp +++ b/common/skills.cpp @@ -128,7 +128,7 @@ int32 EQEmu::skills::GetBaseDamage(SkillType skill) { switch (skill) { case SkillBash: - return 1; + return 2; case SkillDragonPunch: return 12; case SkillEagleStrike: diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index adcf09aaf..a7a599991 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -96,9 +96,10 @@ int Mob::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target) ac_bonus = inst->GetItemArmorClass(true) / 25.0f; else return 0; // return 0 in cases where we don't have an item + if (ac_bonus > skill_bonus) ac_bonus = skill_bonus; - return static_cast(base + ac_bonus + skill_bonus); + return static_cast(ac_bonus + skill_bonus); } case EQEmu::skills::SkillBackstab: { float skill_bonus = static_cast(skill_level) * 0.02f;