diff options
| -rw-r--r-- | crawl-ref/source/acr.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 5d825b3094..2b4355621a 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -2578,7 +2578,7 @@ static void _decrement_durations() you.duration[DUR_PRAYER]--; else if (you.duration[DUR_PRAYER] == 1) { - mpr( "Your prayer is over.", MSGCH_PRAY, you.religion ); + mpr("Your prayer is over.", MSGCH_PRAY, you.religion); you.duration[DUR_PRAYER] = 0; } diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 7fd860051f..d097267b68 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2012,6 +2012,9 @@ static bool _god_accepts_prayer(god_type type) { switch(type) { + case GOD_YREDELEMNUL: + return (yred_injury_mirror(false)); + case GOD_VEHUMET: case GOD_XOM: case GOD_SHINING_ONE: @@ -2115,11 +2118,8 @@ void pray() you.duration[DUR_PRAYER] *= 2; } - if (!_god_accepts_prayer(you.religion) || you.religion == GOD_ZIN - || you.religion == GOD_NEMELEX_XOBEH) - { + if (you.religion == GOD_ZIN || you.religion == GOD_NEMELEX_XOBEH) you.duration[DUR_PRAYER] = 1; - } else if (you.religion == GOD_YREDELEMNUL || you.religion == GOD_ELYVILON) you.duration[DUR_PRAYER] = 20; @@ -3480,6 +3480,12 @@ void lose_piety(int pgn) } } + if (!_god_accepts_prayer(you.religion)) + { + mpr("Your prayer is over.", MSGCH_PRAY, you.religion); + you.duration[DUR_PRAYER] = 0; + } + if (you.piety > 0 && you.piety <= 5) learned_something_new(TUT_GOD_DISPLEASED); |