From b2c6bb4df553e2f7198a5b79539a3e991331ff00 Mon Sep 17 00:00:00 2001 From: E Spause Date: Wed, 15 Mar 2017 06:39:57 -0400 Subject: [PATCH] Set default, no-skill value for bash to 1. This is consistent with what demonstar was seeing on live with no skill and slam. GetBaseDamage is now used for Bash/Slam additionally. --- common/skills.cpp | 2 +- zone/special_attacks.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/skills.cpp b/common/skills.cpp index 6cb063e2e..8fe5cf3f2 100644 --- a/common/skills.cpp +++ b/common/skills.cpp @@ -128,7 +128,7 @@ int32 EQEmu::skills::GetBaseDamage(SkillType skill) { switch (skill) { case SkillBash: - return 2; + return 1; case SkillDragonPunch: return 12; case SkillEagleStrike: diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 923888e4f..e38ffb04d 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -96,7 +96,7 @@ int Mob::GetBaseSkillDamage(EQEmu::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 static_cast(base + ac_bonus + skill_bonus); } case EQEmu::skills::SkillBackstab: { float skill_bonus = static_cast(skill_level) * 0.02f;