pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-11 23:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix up slam some more

Browse Source
This commit is contained in:
E Spause 2017-03-15 06:15:01 -04:00
parent 3ce99d9f00
commit 21e53a3cd0
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zone/special_attacks.cpp
View File

@ -91,15 +91,6 @@ int Mob::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target)
inst = CastToClient()->GetInv().GetItem(EQEmu::inventory::slotSecondary); inst = CastToClient()->GetInv().GetItem(EQEmu::inventory::slotSecondary);
else if (HasTwoHanderEquipped()) else if (HasTwoHanderEquipped())
inst = CastToClient()->GetInv().GetItem(EQEmu::inventory::slotPrimary); inst = CastToClient()->GetInv().GetItem(EQEmu::inventory::slotPrimary);
else
{
//Slam
if (GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN)
{
if(skill_bonus <= 1.0f / 10.0f)
skill_bonus = 1.0f / 10.0f;
}
}
} }
if (inst) if (inst)
ac_bonus = inst->GetItemArmorClass(true) / 25.0f; ac_bonus = inst->GetItemArmorClass(true) / 25.0f;
@ -312,11 +303,7 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk)
DoAnim(animTailRake); DoAnim(animTailRake);
int32 ht = 0; int32 ht = 0;
if (GetWeaponDamage(GetTarget(), GetInv().GetItem(EQEmu::inventory::slotSecondary)) <= 0 && ht = dmg = GetBaseSkillDamage(EQEmu::skills::SkillBash, GetTarget());
GetWeaponDamage(GetTarget(), GetInv().GetItem(EQEmu::inventory::slotShoulders)) <= 0)
dmg = -5;
else
ht = dmg = GetBaseSkillDamage(EQEmu::skills::SkillBash, GetTarget());
ReuseTime = BashReuseTime - 1 - skill_reduction; ReuseTime = BashReuseTime - 1 - skill_reduction;
ReuseTime = (ReuseTime * HasteMod) / 100; ReuseTime = (ReuseTime * HasteMod) / 100;