From 89310380a81814b47b8082267fd7f221d682d348 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Tue, 25 Jun 2019 18:11:35 -0700 Subject: [PATCH] Remove magical damage boosts for unarmed combat --- src/melee.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/melee.cpp b/src/melee.cpp index 8bd6aae9b04a9..d5b40be45a2d5 100644 --- a/src/melee.cpp +++ b/src/melee.cpp @@ -758,11 +758,6 @@ void player::roll_bash_damage( bool crit, damage_instance &di, bool average, skill = BIO_CQB_LEVEL; } - if( unarmed && weap.is_null() ) { - // Pure unarmed doubles the bonuses from unarmed skill - skill *= 2; - } - const int stat = get_str(); /** @EFFECT_STR increases bashing damage */ float stat_bonus = bonus_damage( !average ); @@ -793,11 +788,6 @@ void player::roll_bash_damage( bool crit, damage_instance &di, bool average, float bash_cap = 2 * stat + 2 * skill; float bash_mul = 1.0f; - if( unarmed ) { - /** @EFFECT_UNARMED increases bashing damage with unarmed weapons */ - weap_dam += skill; - } - // 80%, 88%, 96%, 104%, 112%, 116%, 120%, 124%, 128%, 132% if( skill < 5 ) { bash_mul = 0.8 + 0.08 * skill;