Elyvilon ability descriptions split into healing and self-healing.

Removed two more stray uses of minor/major healing.
Shortened too long ability lines on ^ display.


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

3 files changed, 22 insertions, 20 deletions

diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt
index 190f4b481f..927369c694 100644
--- a/crawl-ref/source/dat/descript/ability.txt
+++ b/crawl-ref/source/dat/descript/ability.txt
@@ -270,28 +270,32 @@ Destroy all weapons on the ground. In order to prevent a weapon from being accid
 %%%%
 Lesser Healing
 
-Depending on your Invocations skill, heal a small amount of hit points.
-
-Can be used on hostile monsters, trying to make them neutral. This works best on animals, worse on humanoids of your species, still worse on other humanoids, and worst of all on demons and undead. The chance for successful pacification depends on the healing power.
+Using this ability on hostile monsters will try to make them neutral. This works best on animals, worse on humanoids of your species, still worse on other humanoids, and worst of all on demons and undead. The chance for successful pacification depends on the healing power.
 
 Whether the pacification succeeds or not, the invested food, piety and magic point are lost. If it does succeed, the monster is healed and you gain some piety and half the monster's experience value. Otherwise, the monster is unaffected and you gain nothing. In total, this is a net piety gain if you need just one try.
 
 You can also heal allies and neutral monsters.
 %%%%
+Lesser Self-Healing
+
+Depending on your Invocations skill, heal a small amount of your health.
+%%%%
 Purification
 
 Purge your body of bad effects such as sickness, poisoning, slowness, confusion and rotting.
 %%%%
 Greater Healing
 
-Depending on your Invocations skill, heal a moderate amount of hit points. Roughly, Greater Healing will allow you to heal three times the amount of Lesser Healing at a slightly higher piety cost.
-
-Can be used on hostile monsters, trying to make them neutral. This works best on animals, worse on humanoids of your species, still worse on other humanoids, and worst of all on demons and undead. The chance for successful pacification depends on the healing power.
+Using this ability on hostile monsters will try to make them neutral. This works best on animals, worse on humanoids of your species, still worse on other humanoids, and worst of all on demons and undead. The chance for successful pacification depends on the healing power, so is significantly better than using Lesser Healing. 
 
 Whether the pacification succeeds or not, the invested food, piety and magic points are lost. If it does succeed, the monster is healed and you gain some piety and half the monster's experience value. Otherwise, the monster is unaffected and you gain nothing. In total, this is a net piety loss even if you need just one try.
 
 You can also heal allies and neutral monsters.
 %%%%
+Greater Self-Healing
+
+Depending on your Invocations skill, heal a moderate amount of your health. Roughly, Greater Healing will allow you to heal three times the amount of Lesser Healing at a slightly higher total piety cost.
+%%%%
 Restoration
 
 Fully restore your Strength, Dexterity and Intelligence, and heal a large amount of rotted hitpoints.
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index bc612b78fc..e8ff3bd57d 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3479,10 +3479,8 @@ void describe_god( god_type which_god, bool give_title )
         textcolor(colour);
 
         // mv: Some gods can protect you from harm.
-        // I'm not sure how to explain such divine protection because
-        // god isn't really protecting player - he only sometimes saves
-        // his life (probably it shouldn't be displayed at all).
-        // What about this?
+        // The god isn't really protecting player - only sometimes saving
+        // his life.
         bool have_any = false;
 
         if (harm_protection_type hpt =
@@ -3565,9 +3563,9 @@ void describe_god( god_type which_god, bool give_title )
         else if (which_god == GOD_ELYVILON)
         {
             have_any = true;
-            std::string buf = "You can call upon ";
+            std::string buf = "You can destroy weapons on the ground in ";
             buf += god_name(which_god);
-            buf += " to destroy weapons lying on the ground.";
+            buf += "'s name.";
             _print_final_god_abil_desc(which_god, buf,
                                        ABIL_ELYVILON_DESTROY_WEAPONS);
         }
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index d0faee4b66..d055dde4cf 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -260,10 +260,10 @@ const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =
       "mark four cards in a deck",
       "order the top five cards of a deck, losing the rest" },
     // Elyvilon
-    { "call upon Elyvilon for lesser healing of yourself and others",
-      "call upon Elyvilon for purification",
-      "call upon Elyvilon for greater healing of yourself and others",
-      "call upon Elyvilon to restore your abilities",
+    { "provide lesser healing for yourself and others",
+      "purify yourself",
+      "provide greater healing for yourself and others",
+      "restore your abilities",
       "call upon Elyvilon for divine vigour" },
     // Lugonu
     { "depart the Abyss",
@@ -346,10 +346,10 @@ const char* god_lose_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =
       "mark decks",
       "stack decks" },
     // Elyvilon
-    { "call upon Elyvilon for minor healing",
-      "call upon Elyvilon for purification",
-      "call upon Elyvilon for major healing",
-      "call upon Elyvilon to restore your abilities",
+    { "provide lesser healing",
+      "purify yourself",
+      "provide greater healing",
+      "restore your abilities",
       "call upon Elyvilon for divine vigour" },
     // Lugonu
     { "depart the Abyss at will",