Spatial distortion heals blink frogs.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1062 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 12 insertions, 9 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 90c9dead7a..01c7cd9a49 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -133,7 +133,7 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] =
     { ABIL_ELYVILON_LESSER_HEALING, ABIL_ELYVILON_PURIFICATION,
       ABIL_ELYVILON_HEALING, ABIL_ELYVILON_RESTORATION,
       ABIL_ELYVILON_GREATER_HEALING },
-    // Lucy
+    // Lugonu
     { ABIL_LUGONU_ABYSS_EXIT, ABIL_LUGONU_BEND_SPACE,
       ABIL_LUGONU_SUMMON_DEMONS, ABIL_NON_ABILITY,
       ABIL_LUGONU_ABYSS_ENTER }
@@ -260,7 +260,7 @@ static const struct ability_def Ability_List[] =
     { ABIL_ELYVILON_RESTORATION, "Restoration", 3, 0, 400, 3, ABFLAG_NONE },
     { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing", 6, 0, 600, 4, ABFLAG_NONE },
 
-    // Lucy
+    // Lugonu
     { ABIL_LUGONU_ABYSS_EXIT, "Depart the Abyss", 0, 0, 100, 10, ABFLAG_PAIN },
     { ABIL_LUGONU_BEND_SPACE, "Bend Space", 1, 0, 50, 0, ABFLAG_PAIN },
     { ABIL_LUGONU_SUMMON_DEMONS, "Summon Abyssal Servants", 7, 0, 100, 5, ABFLAG_NONE },
@@ -2151,9 +2151,12 @@ static int lugonu_warp_monster(int x, int y, int pow, int)
         return (1);
     }
 
-    if (!check_mons_resist_magic(&mon, pow))
+    const int damage = 1 + random2(pow / 6);
+    if (mon.type == MONS_BLINK_FROG)
+        mon.heal(damage, false);
+    else if (!check_mons_resist_magic(&mon, pow))
     {
-        mon.hurt(&you, 1 + random2(pow / 6));
+        mon.hurt(&you, damage);
         if (!mon.alive())
             return (1);
     }
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index a1962ce3c6..e20875375c 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -179,11 +179,11 @@ static void generate_area(unsigned char gx1, unsigned char gy1,
                 {
                     grd[i][j] = DNGN_ALTAR_ZIN + random2(12);
                 }
-                while (grd[i][j] == DNGN_ALTAR_YREDELEMNUL
-                       || grd[i][j] == DNGN_ALTAR_VEHUMET
-                       || grd[i][j] == DNGN_ALTAR_NEMELEX_XOBEH);
+                while (grd[i][j] == DNGN_ALTAR_ZIN
+                       || grd[i][j] == DNGN_ALTAR_SHINING_ONE
+                       || grd[i][j] == DNGN_ALTAR_ELYVILON);
 
-                // Lucy has a flat 50% chance of corrupting the altar
+                // Lugonu has a flat 50% chance of corrupting the altar
                 if ( coinflip() )
                     grd[i][j] = DNGN_ALTAR_LUGONU;
             }
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 1efcb2b1d1..ca56d3888b 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -816,7 +816,7 @@ char *god_name( int which_god, bool long_name ) // mv - rewritten
         sprintf(godname_buff, "Elyvilon%s", long_name ? " the Healer" : "");
         break;
     case GOD_LUGONU:
-        sprintf(godname_buff, "Lugonu");
+        sprintf(godname_buff, "Lugonu%s", long_name? " the Unformed" : "");
         break;
     default:
         sprintf(godname_buff, "The Buggy One (%d)", which_god);