diff options
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index c678965712..77e572b386 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -770,16 +770,17 @@ bool melee_attack::player_aux_unarmed() // minotaurs used to get +5 damage here, now they get // +6 because of the horns. - if (you.equip[EQ_HELMET] != -1 - && (get_helmet_type(you.inv[you.equip[EQ_HELMET]]) == THELM_HELMET - || get_helmet_type(you.inv[you.equip[EQ_HELMET]]) == THELM_HELM)) + if (you.equip[EQ_HELMET] != -1) { - aux_damage += 2; - - if (get_helmet_desc(you.inv[you.equip[EQ_HELMET]]) == THELM_DESC_SPIKED - || get_helmet_desc(you.inv[you.equip[EQ_HELMET]]) == THELM_DESC_HORNED) + const item_def& helmet = you.inv[you.equip[EQ_HELMET]]; + if ( is_hard_helmet(helmet) ) { - aux_damage += 3; + aux_damage += 2; + if (get_helmet_desc(helmet) == THELM_DESC_SPIKED + || get_helmet_desc(helmet) == THELM_DESC_HORNED) + { + aux_damage += 3; + } } } break; |