diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-29 13:38:36 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-29 14:23:50 +0100 |
| commit | 3f8334b021c123a371f0dfe8062c3a84eebba673 (patch) | |
| tree | 7053abb388e3464328b75792d267513bc3c9ab0b /crawl-ref/source/abl-show.cc | |
| parent | 8657d1a1b6f40b7da7e970ca6e0082d04f0d1802 (diff) | |
| download | crawl-ref-3f8334b021c123a371f0dfe8062c3a84eebba673.tar.gz crawl-ref-3f8334b021c123a371f0dfe8062c3a84eebba673.zip | |
Make clarity allow intentional berserk.
Unknown potions of rage override it as well. This is a debatable thing,
but since other sources of involuntary berserk are caused by "being angry",
it makes sense a drug is not affected by merely being calm.
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index a16fdf3ca6..3079b924d0 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -702,8 +702,6 @@ static talent _get_talent(ability_type ability, bool check_confused) case ABIL_TROG_BERSERK: // piety >= 30 invoc = true; failure = 30 - you.piety; // starts at 0% - if (player_mental_clarity(true)) - failure += 80; break; case ABIL_TROG_REGEN_MR: // piety >= 50 @@ -1101,8 +1099,7 @@ static bool _check_ability_possible(const ability_def& abil, mpr("You're too hungry to berserk."); return (false); } - return (you.can_go_berserk(true, abil.ability == ABIL_TROG_BERSERK) - && berserk_check_wielded_weapon()); + return (you.can_go_berserk(true) && berserk_check_wielded_weapon()); case ABIL_FLY_II: if (you.duration[DUR_EXHAUSTED]) @@ -1161,7 +1158,7 @@ static bool _activate_talent(const talent& tal) } if ((tal.which == ABIL_EVOKE_BERSERK || tal.which == ABIL_TROG_BERSERK) - && !you.can_go_berserk(true, tal.which == ABIL_TROG_BERSERK)) + && !you.can_go_berserk(true)) { crawl_state.zero_turns_taken(); return (false); @@ -1745,7 +1742,7 @@ static bool _do_ability(const ability_def& abil) case ABIL_TROG_BERSERK: // Trog abilities don't use or train invocations. - go_berserk(true, true); + go_berserk(true); break; case ABIL_TROG_REGEN_MR: |