Implement a hack to differentiate between Ely's self healing and healing

others. I've added a new targetting mode TARG_NOT_SELF that basically
just forces the autotargetting to skip the player in favour of the
previous target or, failing that, the nearest monster (no matter whether
friendly, hostile or neutral).
Both types of ability crop up at the same piety point, and the ability
letters are changed accordingly (which is likely to wreak havoc on those
relying on their finger memory, but makes more sense and is easier to
remember in the long run).

I haven't changed/added the ability descriptions. If someone could do
that, please?


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

6 files changed, 101 insertions, 42 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index ec8109285e..aeda24ca21 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -135,8 +135,8 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] =
     { ABIL_NEMELEX_DRAW_ONE, ABIL_NEMELEX_PEEK_TWO, ABIL_NEMELEX_TRIPLE_DRAW,
       ABIL_NEMELEX_MARK_FOUR, ABIL_NEMELEX_STACK_FIVE },
     // Elyvilon
-    { ABIL_ELYVILON_LESSER_HEALING, ABIL_ELYVILON_PURIFICATION,
-      ABIL_ELYVILON_GREATER_HEALING, ABIL_ELYVILON_RESTORATION,
+    { ABIL_ELYVILON_LESSER_HEALING_SELF, ABIL_ELYVILON_PURIFICATION,
+      ABIL_ELYVILON_GREATER_HEALING_SELF, ABIL_ELYVILON_RESTORATION,
       ABIL_ELYVILON_DIVINE_VIGOUR },
     // Lugonu
     { ABIL_LUGONU_ABYSS_EXIT, ABIL_LUGONU_BEND_SPACE, ABIL_LUGONU_BANISH,
@@ -262,11 +262,15 @@ static const ability_def Ability_List[] =
 
     // Elyvilon
     { ABIL_ELYVILON_DESTROY_WEAPONS, "Destroy Weapons", 0, 0, 0, 0, ABFLAG_NONE },
-    { ABIL_ELYVILON_LESSER_HEALING, "Lesser Healing",
+    { ABIL_ELYVILON_LESSER_HEALING_SELF, "Lesser Self-Healing",
+      1, 0, 100, generic_cost::range(0, 1), ABFLAG_CONF_OK },
+    { ABIL_ELYVILON_LESSER_HEALING_OTHERS, "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, "Greater Healing",
+    { ABIL_ELYVILON_GREATER_HEALING_SELF, "Greater Self-Healing",
+      2, 0, 250, 2, ABFLAG_CONF_OK },
+    { ABIL_ELYVILON_GREATER_HEALING_OTHERS, "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,
@@ -468,7 +472,7 @@ static talent _get_talent(ability_type ability, bool check_confused)
     // Look through the table to see if there's a preference, else
     // find a new empty slot for this ability. -- bwr
     const int index = _find_ability_slot( ability );
-    if ( index != -1 )
+    if (index != -1)
         result.hotkey = index_to_letter(index);
     else
         result.hotkey = 0;      // means 'find later on'
@@ -633,7 +637,8 @@ static talent _get_talent(ability_type ability, bool check_confused)
     case ABIL_KIKU_RECALL_UNDEAD_SLAVES:
     case ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS:
     case ABIL_OKAWARU_MIGHT:
-    case ABIL_ELYVILON_LESSER_HEALING:
+    case ABIL_ELYVILON_LESSER_HEALING_SELF:
+    case ABIL_ELYVILON_LESSER_HEALING_OTHERS:
     case ABIL_LUGONU_ABYSS_EXIT:
         invoc = true;
         failure = 30 - (you.piety / 20) - (6 * you.skills[SK_INVOCATIONS]);
@@ -679,7 +684,8 @@ static talent _get_talent(ability_type ability, bool check_confused)
     case ABIL_KIKU_ENSLAVE_UNDEAD:
     case ABIL_YRED_ANIMATE_DEAD:
     case ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB:
-    case ABIL_ELYVILON_GREATER_HEALING:
+    case ABIL_ELYVILON_GREATER_HEALING_SELF:
+    case ABIL_ELYVILON_GREATER_HEALING_OTHERS:
     case ABIL_LUGONU_BEND_SPACE:
         invoc = true;
         failure = 40 - (you.piety / 20) - (5 * you.skills[SK_INVOCATIONS]);
@@ -1678,25 +1684,39 @@ static bool _do_ability(const ability_def& abil)
             return (false);
         break;
 
-    case ABIL_ELYVILON_LESSER_HEALING:
-        if (cast_healing(3 + (you.skills[SK_INVOCATIONS] / 6), true) < 0)
+    case ABIL_ELYVILON_LESSER_HEALING_SELF:
+    case ABIL_ELYVILON_LESSER_HEALING_OTHERS:
+    {
+        const bool self = (abil.ability == ABIL_ELYVILON_LESSER_HEALING_SELF);
+        if (cast_healing(3 + (you.skills[SK_INVOCATIONS] / 6), true,
+                         self ? you.pos() : coord_def(0,0),
+                         self ? TARG_NUM_MODES : TARG_NOT_SELF) < 0)
+        {
             return (false);
+        }
 
         exercise(SK_INVOCATIONS, 1);
         break;
-
+    }
     case ABIL_ELYVILON_PURIFICATION:
         purification();
         exercise(SK_INVOCATIONS, 2 + random2(3));
         break;
 
-    case ABIL_ELYVILON_GREATER_HEALING:
-        if (cast_healing(10 + (you.skills[SK_INVOCATIONS] / 3), true) < 0)
+    case ABIL_ELYVILON_GREATER_HEALING_SELF:
+    case ABIL_ELYVILON_GREATER_HEALING_OTHERS:
+    {
+        const bool self = (abil.ability == ABIL_ELYVILON_GREATER_HEALING_SELF);
+        if (cast_healing(10 + (you.skills[SK_INVOCATIONS] / 3), true,
+                         self ? you.pos() : coord_def(0,0),
+                         self ? TARG_NUM_MODES : TARG_NOT_SELF) < 0)
+        {
             return (false);
+        }
 
         exercise(SK_INVOCATIONS, 3 + random2(5));
         break;
-
+    }
     case ABIL_ELYVILON_RESTORATION:
         restore_stat(STAT_ALL, 0, false);
         unrot_hp(100);
@@ -2147,7 +2167,21 @@ std::vector<talent> your_talents(bool check_confused)
             {
                 const ability_type abil = god_abilities[you.religion][i];
                 if (abil != ABIL_NON_ABILITY)
+                {
                     _add_talent(talents, abil, check_confused);
+                    if (abil == ABIL_ELYVILON_LESSER_HEALING_SELF)
+                    {
+                        _add_talent(talents,
+                                    ABIL_ELYVILON_LESSER_HEALING_OTHERS,
+                                    check_confused);
+                    }
+                    else if (abil == ABIL_ELYVILON_GREATER_HEALING_SELF)
+                    {
+                        _add_talent(talents,
+                                    ABIL_ELYVILON_GREATER_HEALING_OTHERS,
+                                    check_confused);
+                    }
+                }
             }
         }
     }
@@ -2219,19 +2253,19 @@ std::vector<talent> your_talents(bool check_confused)
     for (unsigned int i = 0; i < talents.size(); ++i)
     {
         // Skip preassigned hotkeys.
-        if ( talents[i].hotkey != 0 )
+        if (talents[i].hotkey != 0)
             continue;
 
         // Try to find a free hotkey for i, starting from Z.
-        for ( int k = 51; k >= 0; ++k )
+        for (int k = 51; k >= 0; ++k)
         {
             const int kkey = index_to_letter(k);
             bool good_key = true;
 
             // Check that it doesn't conflict with other hotkeys.
-            for ( unsigned int j = 0; j < talents.size(); ++j )
+            for (unsigned int j = 0; j < talents.size(); ++j)
             {
-                if ( talents[j].hotkey == kkey )
+                if (talents[j].hotkey == kkey)
                 {
                     good_key = false;
                     break;
@@ -2312,8 +2346,24 @@ void set_god_ability_slots()
     {
         if (god_abilities[you.religion][i] != ABIL_NON_ABILITY)
         {
-            _set_god_ability_helper(god_abilities[you.religion][i], 'a' + num);
-            ++num;
+            _set_god_ability_helper(god_abilities[you.religion][i],
+                                    'a' + num++);
+
+            if (you.religion == GOD_ELYVILON)
+            {
+                if (god_abilities[you.religion][i]
+                        == ABIL_ELYVILON_LESSER_HEALING_SELF)
+                {
+                    _set_god_ability_helper(ABIL_ELYVILON_LESSER_HEALING_OTHERS,
+                                            'a' + num++);
+                }
+                else if (god_abilities[you.religion][i]
+                            == ABIL_ELYVILON_GREATER_HEALING_SELF)
+                {
+                    _set_god_ability_helper(ABIL_ELYVILON_GREATER_HEALING_OTHERS,
+                                            'a' + num++);
+                }
+            }
         }
     }
 }
@@ -2329,7 +2379,8 @@ static int _find_ability_slot(ability_type which_ability)
     // No requested slot, find new one and make it preferred.
 
     // Skip over a-e (invocations).
-    for (int slot = 5; slot < 52; slot++)
+    const int first_slot = (you.religion == GOD_ELYVILON ? 7 : 5);
+    for (int slot = first_slot; slot < 52; slot++)
     {
         if (you.ability_letter_table[slot] == ABIL_NON_ABILITY)
         {
@@ -2339,7 +2390,7 @@ static int _find_ability_slot(ability_type which_ability)
     }
 
     // If we can't find anything else, try a-e.
-    for (int slot = 4; slot >= 0; slot--)
+    for (int slot = first_slot - 1; slot >= 0; slot--)
     {
         if (you.ability_letter_table[slot] == ABIL_NON_ABILITY)
         {
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 4926bffab3..e95e57787e 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -1048,14 +1048,15 @@ void direction(dist& moves, targeting_type restricts,
     bool target_unshifted = Options.target_unshifted_dirs;
 
     // Find a default target.
-    if (Options.default_target && mode == TARG_ENEMY)
+    if (Options.default_target && (mode == TARG_ENEMY || mode == TARG_NOT_SELF))
     {
         skip_iter = true;   // Skip first iteration...XXX mega-hack
         if (you.prev_targ != MHITNOT && you.prev_targ != MHITYOU)
         {
             const monsters *montarget = &menv[you.prev_targ];
             if (you.can_see(montarget)
-                && !mons_friendly(montarget) // not made friendly since then
+                    // not made friendly since then
+                && (mode == TARG_NOT_SELF || !mons_friendly(montarget))
                 && _is_target_in_range(montarget->pos(), range))
             {
                 found_autotarget = true;
@@ -2003,7 +2004,7 @@ static bool _find_monster( const coord_def& where, int mode, bool need_path,
         return (false);
 
     // Now compare target modes.
-    if (mode == TARG_ANY)
+    if (mode == TARG_ANY || mode == TARG_NOT_SELF)
         return (true);
 
     if (mode == TARG_FRIEND)
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index b20e911d3f..dc1e511346 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -83,27 +83,29 @@ enum ability_type
     ABIL_TROG_REGENERATION,
     ABIL_TROG_BROTHERS_IN_ARMS,
     ABIL_ELYVILON_DESTROY_WEAPONS = 219,
-    ABIL_ELYVILON_LESSER_HEALING = 220,     //  220
+    ABIL_ELYVILON_LESSER_HEALING_SELF = 220, //  220
+    ABIL_ELYVILON_LESSER_HEALING_OTHERS,
     ABIL_ELYVILON_PURIFICATION,
-    ABIL_ELYVILON_GREATER_HEALING,
-    ABIL_ELYVILON_RESTORATION,
+    ABIL_ELYVILON_GREATER_HEALING_SELF,
+    ABIL_ELYVILON_GREATER_HEALING_OTHERS,
+    ABIL_ELYVILON_RESTORATION,              //  225
     ABIL_ELYVILON_DIVINE_VIGOUR,
-    ABIL_LUGONU_ABYSS_EXIT,                 //  225
+    ABIL_LUGONU_ABYSS_EXIT,
     ABIL_LUGONU_BEND_SPACE,
     ABIL_LUGONU_BANISH,
-    ABIL_LUGONU_CORRUPT,
+    ABIL_LUGONU_CORRUPT,                    //  230
     ABIL_LUGONU_ABYSS_ENTER,
-    ABIL_NEMELEX_DRAW_ONE,                  //  230
+    ABIL_NEMELEX_DRAW_ONE,
     ABIL_NEMELEX_PEEK_TWO,
     ABIL_NEMELEX_TRIPLE_DRAW,
-    ABIL_NEMELEX_MARK_FOUR,
+    ABIL_NEMELEX_MARK_FOUR,                 //  235
     ABIL_NEMELEX_STACK_FIVE,
-    ABIL_BEOGH_SMITING,                     //  235
+    ABIL_BEOGH_SMITING,
     ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS,
 
-    ABIL_TRAN_BAT,
+    ABIL_TRAN_BAT = 240,
     ABIL_HARM_PROTECTION,
-    ABIL_HARM_PROTECTION_II,                //  239
+    ABIL_HARM_PROTECTION_II,                //  242
     ABIL_RENOUNCE_RELIGION = 250            //  250
 };
 
@@ -1584,6 +1586,7 @@ enum targ_mode_type
     TARG_ANY,
     TARG_ENEMY,
     TARG_FRIEND,
+    TARG_NOT_SELF,
     TARG_NUM_MODES
 };
 
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index f6da42121e..d0faee4b66 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 lesser healing",
+    { "call upon Elyvilon for lesser healing of yourself and others",
       "call upon Elyvilon for purification",
-      "call upon Elyvilon for greater healing",
+      "call upon Elyvilon for greater healing of yourself and others",
       "call upon Elyvilon to restore your abilities",
       "call upon Elyvilon for divine vigour" },
     // Lugonu
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index 0f7ece7715..ef998c9e48 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -689,7 +689,7 @@ static bool _can_pacify_monster(const monsters *mon, const int healed)
 
 // Returns: 1 -- success, 0 -- failure, -1 -- cancel
 static int _healing_spell(int healed, bool divine_ability,
-                          const coord_def& where)
+                          const coord_def& where, targ_mode_type mode)
 {
     ASSERT(healed >= 1);
 
@@ -699,14 +699,15 @@ static int _healing_spell(int healed, bool divine_ability,
     if (where.origin())
     {
         spd.isValid = spell_direction(spd, beam, DIR_TARGET,
+                                      mode != TARG_NUM_MODES ? mode :
                                       you.religion == GOD_ELYVILON ?
-                                          TARG_ANY : TARG_FRIEND,
+                                            TARG_ANY : TARG_FRIEND,
                                       LOS_RADIUS,
                                       false, true, true, "Heal whom?");
     }
     else
     {
-        spd.target = where;
+        spd.target  = where;
         spd.isValid = in_bounds(spd.target);
     }
 
@@ -786,10 +787,12 @@ static int _healing_spell(int healed, bool divine_ability,
 }
 
 // Returns: 1 -- success, 0 -- failure, -1 -- cancel
-int cast_healing(int pow, bool divine_ability, const coord_def& where)
+int cast_healing(int pow, bool divine_ability, const coord_def& where,
+                 targ_mode_type mode)
 {
     pow = std::min(50, pow);
-    return (_healing_spell(pow + roll_dice(2, pow) - 2, divine_ability, where));
+    return (_healing_spell(pow + roll_dice(2, pow) - 2, divine_ability, where,
+                           mode));
 }
 
 void remove_divine_vigour()
diff --git a/crawl-ref/source/spells1.h b/crawl-ref/source/spells1.h
index 32b6336463..c8302a8c5b 100644
--- a/crawl-ref/source/spells1.h
+++ b/crawl-ref/source/spells1.h
@@ -18,7 +18,8 @@ struct bolt;
 
 bool cast_sure_blade(int power);
 int cast_healing(int pow, bool divine_ability = false,
-                 const coord_def& where = coord_def(0,0));
+                 const coord_def& where = coord_def(0,0),
+                 targ_mode_type mode = TARG_NUM_MODES);
 
 void remove_divine_vigour();
 bool cast_divine_vigour();