summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/actor.cc
diff options
context:
space:
mode:
authorBrendan Hickey <brendan@bhickey.net>2013-12-01 19:03:54 -0800
committerBrendan Hickey <brendan@bhickey.net>2013-12-01 19:05:51 -0800
commit2b49d2d24af5cf060a8476369b60fc6d3bbd6fe7 (patch)
tree96c5eea0e783bf618954379bc9183faccb678b34 /crawl-ref/source/actor.cc
parentd552c381c44a00806781b6fc389fadf53f3a6092 (diff)
downloadcrawl-ref-2b49d2d24af5cf060a8476369b60fc6d3bbd6fe7.tar.gz
crawl-ref-2b49d2d24af5cf060a8476369b60fc6d3bbd6fe7.zip
The Slimy Ring of Jiyva
An unrand ring: {rMut contam MR} rMut ceases to function if you murder Jiyva.
Diffstat (limited to 'crawl-ref/source/actor.cc')
-rw-r--r--crawl-ref/source/actor.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc
index 5803afeb22..0f51185028 100644
--- a/crawl-ref/source/actor.cc
+++ b/crawl-ref/source/actor.cc
@@ -330,7 +330,8 @@ bool actor::no_cast(bool calc_unid, bool items) const
bool actor::rmut_from_item(bool calc_unid) const
{
- return wearing(EQ_AMULET, AMU_RESIST_MUTATION, calc_unid);
+ return wearing(EQ_AMULET, AMU_RESIST_MUTATION, calc_unid)
+ || (!jiyva_is_dead() && wearing(EQ_RINGS, RING_JIYVA));
}
bool actor::evokable_berserk(bool calc_unid) const