From 482864797bfafce8a555c7fc754d7f0582da4bdb Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sat, 18 Jul 2009 23:23:27 +0000
Subject: Also fix the check for the player's being undead in Jiyva's
 retribution, and add yet more cleanups.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10293 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/beam.cc     | 11 ++---------
 crawl-ref/source/monstuff.cc |  8 ++++----
 crawl-ref/source/religion.cc |  4 ++--
 3 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'crawl-ref')

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index c4eaf856eb..0b11a7c131 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4895,10 +4895,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon)
         obvious_effect = true;
 
         if (mons_holiness(mon) == MH_UNDEAD)
-        {
             monster_polymorph(mon, MONS_DEATH_OOZE);
-            mon->attitude = ATT_STRICT_NEUTRAL;
-        }
         else
         {
             const int x = mon->hit_dice + (coinflip() ? 1 : -1) * random2(5);
@@ -4909,13 +4906,9 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon)
                 mon->add_ench(ENCH_EATS_ITEMS);
             }
             else if (x >= 3 && x < 5)
-            {
                 monster_polymorph(mon, MONS_JELLY);
-            }
             else if (x >= 5 && x < 7)
-            {
                 monster_polymorph(mon, MONS_BROWN_OOZE);
-            }
             else if (x >= 7 && x <= 11)
             {
                 if (coinflip())
@@ -4936,9 +4929,9 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon)
                 else
                     monster_polymorph(mon, MONS_AZURE_JELLY);
             }
-            mon->attitude = ATT_STRICT_NEUTRAL;
         }
-        return(MON_AFFECTED);
+        mon->attitude = ATT_STRICT_NEUTRAL;
+        return (MON_AFFECTED);
 
     case BEAM_PAIN:             // pain/agony
         if (simple_monster_message(mon, " convulses in agony!"))
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 935b0bd4ff..d4d2bc673a 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -2070,13 +2070,13 @@ bool monster_polymorph(monsters *monster, monster_type targetc,
         else if (targetc == MONS_PULSATING_LUMP)
             str_polymon = " degenerates into ";
         else if (you.religion == GOD_JIYVA
-                 && (targetc == MONS_OOZE
+                 && (targetc == MONS_DEATH_OOZE
+                     || targetc == MONS_OOZE
                      || targetc == MONS_JELLY
                      || targetc == MONS_BROWN_OOZE
-                     || targetc == MONS_ACID_BLOB
-                     || targetc == MONS_GIANT_AMOEBA
                      || targetc == MONS_SLIME_CREATURE
-                     || targetc == MONS_DEATH_OOZE
+                     || targetc == MONS_GIANT_AMOEBA
+                     || targetc == MONS_ACID_BLOB
                      || targetc == MONS_AZURE_JELLY))
         {
             // Message used for the Slimify ability.
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index ba22cbb666..e46ea99752 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -5138,7 +5138,7 @@ static bool _jiyva_retribution()
 {
     const god_type god = GOD_JIYVA;
 
-    if (you.is_undead || one_chance_in(4))
+    if (!you.can_safely_mutate() || one_chance_in(4))
     {
         const monster_type slimes[] = {
                 MONS_GIANT_EYEBALL, MONS_EYE_OF_DRAINING,
@@ -5178,7 +5178,7 @@ static bool _jiyva_retribution()
     return (true);
 }
 
-bool divine_retribution( god_type god )
+bool divine_retribution(god_type god)
 {
     ASSERT(god != GOD_NO_GOD);
 
-- 
cgit v1.2.3-54-g00ecf