Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(balance): unarmed skill affects empty-handed damage again #4160

Merged
merged 1 commit into from
Jan 28, 2024
Merged

feat(balance): unarmed skill affects empty-handed damage again #4160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/melee.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,6 +976,11 @@ void Character::roll_bash_damage( bool crit, damage_instance &di, bool average,
float weap_dam = weap.damage_melee( DT_BASH ) + stat_bonus;
/** @EFFECT_UNARMED caps bash damage with unarmed weapons */

if( unarmed && weap.is_null() ) {
/** @EFFECT_UNARMED defines weapon damage of empty-handed unarmed attacks */
weap_dam += skill * 2;
}

/** @EFFECT_BASHING caps bash damage with bashing weapons */
float bash_cap = 2 * stat + 2 * skill;
float bash_mul = 1.0f;
Expand Down
Loading