diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-06 17:47:45 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-06 17:47:45 +0000 |
commit | aaaf25173613a29674b9e86c0cd871c888749639 (patch) | |
tree | ee6abd8754aed992a1b0f7e2b3894ab4673d984e /crawl-ref/source/acr.cc | |
parent | dc09560ed3f01a349766baf0a2cfc016041f9a6b (diff) | |
download | crawl-ref-aaaf25173613a29674b9e86c0cd871c888749639.tar.gz crawl-ref-aaaf25173613a29674b9e86c0cd871c888749639.zip |
Make Trog's Hand grant both regeneration and magic resistance.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9741 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r-- | crawl-ref/source/acr.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 48f977a3d0..8beab070af 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -2073,10 +2073,12 @@ static void _decrement_durations() coinflip(), "Your deflect missiles spell is about to expire..."); - _decrement_a_duration(DUR_REGENERATION, - "Your skin stops crawling.", - coinflip(), - "Your skin is crawling a little less now."); + if (_decrement_a_duration(DUR_REGENERATION, + NULL, coinflip(), + "Your skin is crawling a little less now.")) + { + remove_regen(you.attribute[ATTR_DIVINE_REGENERATION]); + } if (you.duration[DUR_PRAYER] > 1) you.duration[DUR_PRAYER]--; @@ -2199,7 +2201,7 @@ static void _decrement_durations() if (_decrement_a_duration(DUR_CONDENSATION_SHIELD)) remove_condensation_shield(); - if (you.duration[DUR_CONDENSATION_SHIELD] > 0 && player_res_cold() < 0) + if (you.duration[DUR_CONDENSATION_SHIELD] && player_res_cold() < 0) { mpr("You feel very cold."); ouch(2 + random2avg(13, 2), NON_MONSTER, KILLED_BY_FREEZING); @@ -2318,11 +2320,8 @@ static void _decrement_durations() } } - if (you.duration[DUR_PARALYSIS] == 0 - && you.duration[DUR_PETRIFIED] == 0) - { + if (!you.duration[DUR_PARALYSIS] && !you.duration[DUR_PETRIFIED]) mpr("You are exhausted.", MSGCH_WARN); - } // This resets from an actual penalty or from NO_BERSERK_PENALTY. you.berserk_penalty = 0; @@ -2351,7 +2350,7 @@ static void _decrement_durations() Options.tutorial_events[TUT_YOU_ENCHANTED] = tut_slow; } - if (you.duration[DUR_BACKLIGHT] > 0 && !--you.duration[DUR_BACKLIGHT] + if (you.duration[DUR_BACKLIGHT] && !--you.duration[DUR_BACKLIGHT] && !you.backlit()) { mpr("You are no longer glowing.", MSGCH_DURATION); |