From b8306d42f5411d91440d88654c254a08b6f5c070 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 11 Nov 2014 12:13:44 +0100 Subject: [PATCH] remove unarmed damage bonus rule --- src/battle.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/battle.c b/src/battle.c index 018763093..2569bf0da 100644 --- a/src/battle.c +++ b/src/battle.c @@ -132,7 +132,6 @@ static int skill_formula = 0; #define DAMAGE_CRITICAL (1<<0) #define DAMAGE_MELEE_BONUS (1<<1) #define DAMAGE_MISSILE_BONUS (1<<2) -#define DAMAGE_UNARMED_BONUS (1<<3) #define DAMAGE_SKILL_BONUS (1<<4) /** initialize rules from configuration. */ @@ -158,9 +157,6 @@ static void static_rules(void) if (get_param_int(global.parameters, "rules.combat.missile_bonus", 1)) { damage_rules |= DAMAGE_MISSILE_BONUS; } - if (get_param_int(global.parameters, "rules.combat.unarmed_bonus", 1)) { - damage_rules |= DAMAGE_UNARMED_BONUS; - } if (get_param_int(global.parameters, "rules.combat.skill_bonus", 1)) { damage_rules |= DAMAGE_SKILL_BONUS; } @@ -1206,12 +1202,6 @@ terminate(troop dt, troop at, int type, const char *damage, bool missile) da += af->person[at.index].damage_rear; } } - else if (awtype == NULL) { - /* skill bonus for unarmed combat */ - if (damage_rules & DAMAGE_UNARMED_BONUS) { - da += effskill(au, SK_WEAPONLESS); - } - } else { /* melee bonus */ if (damage_rules & DAMAGE_MELEE_BONUS) {