diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2014-07-09 19:52:40 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-07-09 19:52:40 +0100 |
| commit | 4e5aae5fdf2f8f4ccd531511ff9b10e8cb79a92c (patch) | |
| tree | b39b4e74e8f28b7aba6226d066a41ca8bc62dea7 /crawl-ref/source/attack.cc | |
| parent | f9d185bb4727298cf6d45927aae460804fd29626 (diff) | |
| download | crawl-ref-4e5aae5fdf2f8f4ccd531511ff9b10e8cb79a92c.tar.gz crawl-ref-4e5aae5fdf2f8f4ccd531511ff9b10e8cb79a92c.zip | |
Don't apply unarmed melee bonuses from forms to throwing weapons
Diffstat (limited to 'crawl-ref/source/attack.cc')
| -rw-r--r-- | crawl-ref/source/attack.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc index dcbee6318e..6e8faa0a99 100644 --- a/crawl-ref/source/attack.cc +++ b/crawl-ref/source/attack.cc @@ -1360,8 +1360,7 @@ int attack::calc_base_unarmed_damage() // Should only get here if we're not wielding something that's a weapon. // If there's a non-weapon in hand, it has no base damage. - // Throwing things with a weapon in hand is okay, however. - if (weapon && wpn_skill != SK_THROWING) + if (weapon) return 0; if (attacker->is_player()) @@ -1404,7 +1403,7 @@ int attack::calc_base_unarmed_damage() break; } - if (you.has_usable_claws() && wpn_skill == SK_UNARMED_COMBAT) + if (you.has_usable_claws()) { // Claw damage only applies for bare hands. damage += you.has_claws(false) * 2; |