pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-02 07:00:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Combat] Monks no longer double kick (#5090)
Build / Linux (push) Has been cancelled
Details
Build / Windows (push) Has been cancelled
Details

Browse Source
This commit is contained in:
nytmyr
2026-05-31 13:19:13 -05:00
committed by GitHub
parent e089899e11
commit 584320202f
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/special_attacks.cpp
+24 -23
View File
@@ -512,29 +512,6 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk)
bool found_skill = false; bool found_skill = false;
if (
ca_atk->m_atk == 100 &&
ca_atk->m_skill == EQ::skills::SkillKick &&
can_use_kick
) {
if (GetTarget() != this) {
CheckIncreaseSkill(EQ::skills::SkillKick, GetTarget(), 10);
DoAnim(animKick, 0, false);
int hate_override = 0;
if (GetWeaponDamage(GetTarget(), GetInv().GetItem(EQ::invslot::slotFeet)) <= 0) {
damage = -5;
} else {
hate_override = damage = GetBaseSkillDamage(EQ::skills::SkillKick, GetTarget());
}
reuse_time = KickReuseTime - 1 - skill_reduction;
DoSpecialAttackDamage(GetTarget(), EQ::skills::SkillKick, damage, 0, hate_override, reuse_time);
found_skill = true;
}
}
if (class_id == Class::Monk) { if (class_id == Class::Monk) {
reuse_time = MonkSpecialAttack(GetTarget(), ca_atk->m_skill) - 1 - skill_reduction; reuse_time = MonkSpecialAttack(GetTarget(), ca_atk->m_skill) - 1 - skill_reduction;
@@ -596,6 +573,30 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk)
found_skill = true; found_skill = true;
} }
else {
if (
ca_atk->m_atk == 100 &&
ca_atk->m_skill == EQ::skills::SkillKick &&
can_use_kick
) {
if (GetTarget() != this) {
CheckIncreaseSkill(EQ::skills::SkillKick, GetTarget(), 10);
DoAnim(animKick, 0, false);
int hate_override = 0;
if (GetWeaponDamage(GetTarget(), GetInv().GetItem(EQ::invslot::slotFeet)) <= 0) {
damage = -5;
} else {
hate_override = damage = GetBaseSkillDamage(EQ::skills::SkillKick, GetTarget());
}
reuse_time = KickReuseTime - 1 - skill_reduction;
DoSpecialAttackDamage(GetTarget(), EQ::skills::SkillKick, damage, 0, hate_override, reuse_time);
found_skill = true;
}
}
}
if ( if (
ca_atk->m_atk == 100 && ca_atk->m_atk == 100 &&