diff options
author | Brendan Hickey <brendan@bhickey.net> | 2014-01-10 21:47:22 -0800 |
---|---|---|
committer | Brendan Hickey <brendan@bhickey.net> | 2014-01-10 21:47:22 -0800 |
commit | ce14469f1ba4967b2fe6d9d5a6405415d6e92230 (patch) | |
tree | 7ffdd5a50b49860cf6d2514570e414ad39e18520 /crawl-ref/source/ability.cc | |
parent | 8283a6738187e540cb07d805f0c2a5cafe198c26 (diff) | |
download | crawl-ref-ce14469f1ba4967b2fe6d9d5a6405415d6e92230.tar.gz crawl-ref-ce14469f1ba4967b2fe6d9d5a6405415d6e92230.zip |
Don't show berserk for species that can't use it.
Diffstat (limited to 'crawl-ref/source/ability.cc')
-rw-r--r-- | crawl-ref/source/ability.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/crawl-ref/source/ability.cc b/crawl-ref/source/ability.cc index f9950416dd..ac1c4175a2 100644 --- a/crawl-ref/source/ability.cc +++ b/crawl-ref/source/ability.cc @@ -825,14 +825,23 @@ static ability_type _fixup_ability(ability_type ability) case ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS: if (!you.recall_list.empty()) return ABIL_STOP_RECALL; - + case ABIL_EVOKE_BERSERK: + case ABIL_TROG_BERSERK: + switch (you.species) + { + case SP_DJINNI: + case SP_GHOUL: + case SP_MUMMY: + case SP_FORMICID: + return ABIL_NON_ABILITY; + default: + return ability; + } case ABIL_OKAWARU_FINESSE: case ABIL_BLINK: case ABIL_WISP_BLINK: case ABIL_EVOKE_BLINK: - case ABIL_EVOKE_BERSERK: - case ABIL_TROG_BERSERK: - if (you.species == SP_FORMICID) + if (you.species == SP_FORMICID) return ABIL_NON_ABILITY; default: |