Change Elyvilon's healing abilities back to Lesser and Greater Healing,

respectively, and rename the healing spells to Minor and Major Healing 
instead.


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

10 files changed, 51 insertions, 51 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 45aa883b82..22b491ac8a 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -263,11 +263,11 @@ static const ability_def Ability_List[] =
 
     // Elyvilon
     { ABIL_ELYVILON_DESTROY_WEAPONS, "Destroy Weapons", 0, 0, 0, 0, ABFLAG_NONE },
-    { ABIL_ELYVILON_LESSER_HEALING, "Minor Healing",
+    { ABIL_ELYVILON_LESSER_HEALING, "Lesser Healing",
       1, 0, 100, generic_cost::range(0, 1), ABFLAG_CONF_OK },
     { ABIL_ELYVILON_PURIFICATION, "Purification", 2, 0, 150, 1,
       ABFLAG_CONF_OK },
-    { ABIL_ELYVILON_GREATER_HEALING, "Major Healing",
+    { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing",
       2, 0, 250, 2, ABFLAG_CONF_OK },
     { ABIL_ELYVILON_RESTORATION, "Restoration", 3, 0, 400, 3, ABFLAG_CONF_OK },
     { ABIL_ELYVILON_DIVINE_VIGOUR, "Divine Vigour", 6, 0, 600, 5,
diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt
index d6eae640e3..67234937a0 100644
--- a/crawl-ref/source/dat/descript/spells.txt
+++ b/crawl-ref/source/dat/descript/spells.txt
@@ -278,7 +278,7 @@ Fulsome Distillation
 
 This spell extracts the vile and poisonous essences from a corpse. A rotten corpse may produce a stronger potion. You probably don't want to drink the results. 
 %%%%
-Greater Healing
+Major Healing
 
 This spell heals a large amount of damage to the caster's body. 
 %%%%
@@ -330,7 +330,7 @@ Lehudib's Crystal Spear
 
 This spell hurls a lethally sharp bolt of crystal. 
 %%%%
-Lesser Healing
+Minor Healing
 
 This spell heals a small amount of damage to the caster's body. 
 %%%%
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 9f24460b02..26154eac6a 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2663,8 +2663,8 @@ enum spell_type
     SPELL_VENOM_BOLT,
     SPELL_OLGREBS_TOXIC_RADIANCE,
     SPELL_TELEPORT_OTHER,              //   30
-    SPELL_LESSER_HEALING,
-    SPELL_GREATER_HEALING,
+    SPELL_MINOR_HEALING,
+    SPELL_MAJOR_HEALING,
     SPELL_DEATHS_DOOR,
     SPELL_SELECTIVE_AMNESIA,
     SPELL_MASS_CONFUSION,              //   35
diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index 03a5e55b3e..39c70417b6 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -59,10 +59,10 @@
       {
        SPELL_TELEPORT_OTHER,
        SPELL_TELEPORT_OTHER,
-       SPELL_LESSER_HEALING,
+       SPELL_MINOR_HEALING,
        SPELL_VENOM_BOLT,
        SPELL_SLOW,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -139,7 +139,7 @@
        SPELL_HASTE,
        SPELL_INVISIBILITY,
        SPELL_VAMPIRE_SUMMON,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -304,7 +304,7 @@
        SPELL_BLINK,
        SPELL_BOLT_OF_FIRE,
        SPELL_BOLT_OF_COLD,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -315,7 +315,7 @@
        SPELL_BLINK,
        SPELL_LIGHTNING_BOLT,
        SPELL_BANISHMENT,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -337,7 +337,7 @@
        SPELL_CANTRIP,
        SPELL_SMITING,
        SPELL_NO_SPELL,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -348,7 +348,7 @@
        SPELL_SUMMON_DEMON,
        SPELL_SMITING,
        SPELL_ANIMATE_DEAD,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -510,10 +510,10 @@
       {
        SPELL_LIGHTNING_BOLT,
        SPELL_NO_SPELL,
-       SPELL_LESSER_HEALING,
+       SPELL_MINOR_HEALING,
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -565,10 +565,10 @@
       {
        SPELL_PAIN,
        SPELL_CANTRIP,
-       SPELL_LESSER_HEALING,
+       SPELL_MINOR_HEALING,
        SPELL_SMITING,
        SPELL_ANIMATE_DEAD,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -576,10 +576,10 @@
       {
        SPELL_SUMMON_DEMON,
        SPELL_HELLFIRE_BURST,
-       SPELL_LESSER_HEALING,
+       SPELL_MINOR_HEALING,
        SPELL_SMITING,
        SPELL_ANIMATE_DEAD,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -620,7 +620,7 @@
       {
        SPELL_BOLT_OF_DRAINING,
        SPELL_BOLT_OF_DRAINING,
-       SPELL_LESSER_HEALING,
+       SPELL_MINOR_HEALING,
        SPELL_ANIMATE_DEAD,
        SPELL_ANIMATE_DEAD,
        SPELL_TELEPORT_SELF
@@ -697,10 +697,10 @@
       {
        SPELL_NO_SPELL,
        SPELL_NO_SPELL,
-       SPELL_LESSER_HEALING,
+       SPELL_MINOR_HEALING,
        SPELL_NO_SPELL,
-       SPELL_LESSER_HEALING,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING,
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -730,10 +730,10 @@
       {
        SPELL_CONFUSE,
        SPELL_PARALYSE,
-       SPELL_LESSER_HEALING,
+       SPELL_MINOR_HEALING,
        SPELL_SMITING,
        SPELL_SLOW,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -887,7 +887,7 @@
        SPELL_INVISIBILITY,
        SPELL_CONFUSE,
        SPELL_PARALYSE,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -1081,7 +1081,7 @@
        SPELL_SUMMON_GREATER_DEMON,
        SPELL_SYMBOL_OF_TORMENT,
        SPELL_PARALYSE,
-       SPELL_LESSER_HEALING
+       SPELL_MINOR_HEALING
       }
     },
 
@@ -1111,7 +1111,7 @@
       {
        SPELL_ICE_STORM,
        SPELL_CONJURE_BALL_LIGHTNING,
-       SPELL_GREATER_HEALING,
+       SPELL_MAJOR_HEALING,
        SPELL_BLINK,
        SPELL_BLINK,
        SPELL_TELEPORT_SELF
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index b9a64c6af2..135dd9b836 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -2810,8 +2810,8 @@ bool ms_useful_fleeing_out_of_sight( const monsters *mon, spell_type monspell )
     {
     case SPELL_HASTE:
     case SPELL_INVISIBILITY:
-    case SPELL_LESSER_HEALING:
-    case SPELL_GREATER_HEALING:
+    case SPELL_MINOR_HEALING:
+    case SPELL_MAJOR_HEALING:
     case SPELL_ANIMATE_DEAD:
         return (true);
 
@@ -2856,8 +2856,8 @@ bool ms_low_hitpoint_cast( const monsters *mon, spell_type monspell )
         if (mon->has_ench(ENCH_TP))
             return (false);
         // intentional fall-through
-    case SPELL_LESSER_HEALING:
-    case SPELL_GREATER_HEALING:
+    case SPELL_MINOR_HEALING:
+    case SPELL_MAJOR_HEALING:
         ret = true;
         break;
 
@@ -2990,8 +2990,8 @@ bool ms_waste_of_time( const monsters *mon, spell_type monspell )
         }
         break;
 
-    case SPELL_LESSER_HEALING:
-    case SPELL_GREATER_HEALING:
+    case SPELL_MINOR_HEALING:
+    case SPELL_MAJOR_HEALING:
         if (mon->hit_points > mon->max_hit_points / 2)
             ret = true;
         break;
@@ -3119,8 +3119,8 @@ static bool _ms_ranged_spell( spell_type monspell, bool attack_only )
     {
     case SPELL_NO_SPELL:
     case SPELL_HASTE:
-    case SPELL_LESSER_HEALING:
-    case SPELL_GREATER_HEALING:
+    case SPELL_MINOR_HEALING:
+    case SPELL_MAJOR_HEALING:
     case SPELL_TELEPORT_SELF:
     case SPELL_INVISIBILITY:
     case SPELL_BLINK:
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 74729ab5e7..b8b8646e06 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -6279,14 +6279,14 @@ static bool _handle_spell(monsters *monster, bolt &beem)
                 spell_cast = SPELL_DIG;
                 finalAnswer = true;
             }
-            else if ((monster->has_spell(SPELL_LESSER_HEALING)
-                         || monster->has_spell(SPELL_GREATER_HEALING))
+            else if ((monster->has_spell(SPELL_MINOR_HEALING)
+                         || monster->has_spell(SPELL_MAJOR_HEALING))
                      && monster->hit_points < monster->max_hit_points)
             {
                 // The player's out of sight!
                 // Quick, let's take a turn to heal ourselves. -- bwr
-                spell_cast = monster->has_spell(SPELL_GREATER_HEALING) ?
-                             SPELL_GREATER_HEALING : SPELL_LESSER_HEALING;
+                spell_cast = monster->has_spell(SPELL_MAJOR_HEALING) ?
+                             SPELL_MAJOR_HEALING : SPELL_MINOR_HEALING;
                 finalAnswer = true;
             }
             else if (mons_is_fleeing(monster) || mons_is_pacified(monster))
@@ -8778,7 +8778,7 @@ static spell_type _map_wand_to_mspell(int wand_type)
     case WAND_SLOWING:         return SPELL_SLOW;
     case WAND_HASTING:         return SPELL_HASTE;
     case WAND_MAGIC_DARTS:     return SPELL_MAGIC_DART;
-    case WAND_HEALING:         return SPELL_LESSER_HEALING;
+    case WAND_HEALING:         return SPELL_MINOR_HEALING;
     case WAND_PARALYSIS:       return SPELL_PARALYSE;
     case WAND_FIRE:            return SPELL_BOLT_OF_FIRE;
     case WAND_COLD:            return SPELL_BOLT_OF_COLD;
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index d40ccf72d0..6a00c6ad7a 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -195,7 +195,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast,
     default:
         break;
 
-    case SPELL_GREATER_HEALING:
+    case SPELL_MAJOR_HEALING:
         if (heal_monster(monster, 50 + random2avg(monster->hit_dice * 10, 2),
                          false))
         {
@@ -986,7 +986,7 @@ void setup_mons_cast(monsters *monster, bolt &pbolt,
     switch (spell_cast)
     {
     case SPELL_SUMMON_SMALL_MAMMALS:
-    case SPELL_GREATER_HEALING:
+    case SPELL_MAJOR_HEALING:
     case SPELL_VAMPIRE_SUMMON:
     case SPELL_SHADOW_CREATURES:       // summon anything appropriate for level
     case SPELL_FAKE_RAKSHASA_SUMMON:
@@ -1049,7 +1049,7 @@ void setup_mons_cast(monsters *monster, bolt &pbolt,
 
     if (spell_cast == SPELL_HASTE
         || spell_cast == SPELL_INVISIBILITY
-        || spell_cast == SPELL_LESSER_HEALING
+        || spell_cast == SPELL_MINOR_HEALING
         || spell_cast == SPELL_TELEPORT_SELF)
     {
         pbolt.target = monster->pos();
@@ -1846,7 +1846,7 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power )
                                                    : dice_def(3, 20);
         break;
 
-    case SPELL_LESSER_HEALING:
+    case SPELL_MINOR_HEALING:
         beam.flavour  = BEAM_HEALING;
         beam.hit      = 25 + (power / 5);
         break;
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 7d6b5d87ec..00a274a019 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -260,9 +260,9 @@ 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 minor healing",
+    { "call upon Elyvilon for lesser healing",
       "call upon Elyvilon for purification",
-      "call upon Elyvilon for major healing",
+      "call upon Elyvilon for greater healing",
       "call upon Elyvilon to restore your abilities",
       "call upon Elyvilon for divine vigour" },
     // Lugonu
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 31e06876bf..935abf777c 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1686,12 +1686,12 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_LESSER_HEALING:
+    case SPELL_MINOR_HEALING:
         if (cast_healing(5) < 0)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_GREATER_HEALING:
+    case SPELL_MAJOR_HEALING:
         if (cast_healing(25) < 0)
             return (SPRET_ABORT);
         break;
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 911ed55c38..ac3122a5ab 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -534,7 +534,7 @@
 },
 
 {
-    SPELL_LESSER_HEALING, "Lesser Healing",
+    SPELL_MINOR_HEALING, "Minor Healing",
      SPTYP_HOLY,
      SPFLAG_RECOVERY | SPFLAG_HELPFUL | SPFLAG_MONSTER,
      2,
@@ -547,7 +547,7 @@
 },
 
 {
-    SPELL_GREATER_HEALING, "Greater Healing",
+    SPELL_MAJOR_HEALING, "Major Healing",
      SPTYP_HOLY,
      SPFLAG_RECOVERY | SPFLAG_HELPFUL | SPFLAG_MONSTER,
      6,