Merge pull request #31858 from CleverRaven/kevingranade-nerf-unarmed

Remove magical damage boosts for unarmed combat

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;