summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-08 21:33:35 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-08 21:33:35 +0000
commitc61e0f454a342b46ef5c893e27aa41c0ca103751 (patch)
tree40bb10614fdb3b8bec14e0954e886e6ebd4c5ea3 /crawl-ref/source/religion.cc
parentca54ca53590788e28c47f0ea7f6c072d65a640d9 (diff)
downloadcrawl-ref-c61e0f454a342b46ef5c893e27aa41c0ca103751.tar.gz
crawl-ref-c61e0f454a342b46ef5c893e27aa41c0ca103751.zip
Break chaining of Zin's Revitalisation if you go under penance or get
excommunicated. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4934 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc15
1 files changed, 15 insertions, 0 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 6b8d33e8e3..fc1cdbd94f 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -475,6 +475,15 @@ static void _inc_penance(god_type god, int val)
// orcish bonuses don't apply under penance
if (god == GOD_BEOGH)
you.redraw_armour_class = true;
+ // neither does Zin's revitalisation chaining
+ else if (god == GOD_ZIN)
+ {
+ if (you.duration[DUR_REVITALISATION_CHAIN])
+ {
+ mpr("Your power of revitalisation disappears!");
+ you.duration[DUR_REVITALISATION_CHAIN] = 0;
+ }
+ }
// neither does TSO's halo or divine shield
else if (god == GOD_SHINING_ONE)
{
@@ -4296,6 +4305,12 @@ void excommunication(god_type new_god)
break;
case GOD_ZIN:
+ if (you.duration[DUR_REVITALISATION_CHAIN])
+ {
+ mpr("Your power of revitalisation disappears!");
+ you.duration[DUR_REVITALISATION_CHAIN] = 0;
+ }
+
if (env.sanctuary_time)
remove_sanctuary();