From 30c0986c2795663356a148bd3a0f0e2c981ee9e8 Mon Sep 17 00:00:00 2001
From: Matthew Cline <zelgadis@sourceforge.net>
Date: Fri, 13 Nov 2009 03:24:45 -0800
Subject: Jiyva won't slimify god-gift monsters.

---
 crawl-ref/source/mon-stuff.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'crawl-ref/source/mon-stuff.cc')

diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc
index bdd286c9c3..e51a64cb62 100644
--- a/crawl-ref/source/mon-stuff.cc
+++ b/crawl-ref/source/mon-stuff.cc
@@ -2646,13 +2646,15 @@ bool mon_can_be_slimified(monsters *monster)
 {
     const mon_holy_type holi = monster->holiness();
 
-    return (holi == MH_UNDEAD
-            || holi == MH_NATURAL
-                && !mons_is_slime(monster));
+    return (!(monster->flags & MF_GOD_GIFT)
+            && (holi == MH_UNDEAD
+                 || holi == MH_NATURAL && !mons_is_slime(monster))
+            );
 }
 
 void slimify_monster(monsters *mon, bool hostile)
 {
+
     if (mon->holiness() == MH_UNDEAD)
         monster_polymorph(mon, MONS_DEATH_OOZE);
     else
@@ -2689,6 +2691,7 @@ void slimify_monster(monsters *mon, bool hostile)
     else
         mon->attitude = ATT_HOSTILE;
 
+    //mon->god = GOD_NO_GOD; // Prevent assertion.
     mons_make_god_gift(mon, GOD_JIYVA);
 }
 
-- 
cgit v1.2.3-54-g00ecf