Improve targetting via monster list, add a new option to define the

toggle's initial setting, and update/correct the documentation a bit.


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

5 files changed, 79 insertions, 34 deletions

diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 69f547e24f..c0862fdda5 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -442,11 +442,13 @@ static void direction_again(dist& moves, targeting_type restricts,
 
 #ifndef USE_TILE
 // XXX: Hack - can't pass mlist entries into _find_mlist().
+bool mlist_full_info;
 std::vector<monster_pane_info> mlist;
-static void _fill_monster_list(void)
+static void _fill_monster_list(bool full_info)
 {
     std::vector<monster_pane_info> temp;
     get_monster_pane_info(temp);
+    mlist_full_info = full_info;
 
     // Get the unique entries.
     mlist.clear();
@@ -455,9 +457,13 @@ static void _fill_monster_list(void)
     {
         mlist.push_back(temp[start]);
         for (end = start + 1; end < (int) temp.size(); ++end)
-            if (monster_pane_info::less_than(temp[start], temp[end]))
+        {
+            if (monster_pane_info::less_than(temp[start], temp[end],
+                                             full_info))
+            {
                   break;
-
+            }
+        }
         start = end;
     }
 }
@@ -478,7 +484,8 @@ void direction(dist& moves, targeting_type restricts,
     if (!just_looking && Options.mlist_targetting == MLIST_TARGET_HIDDEN)
     {
         Options.mlist_targetting = MLIST_TARGET_ON;
-        _fill_monster_list();
+        bool full_info = update_monster_pane();
+        _fill_monster_list(full_info);
     }
 #endif
 
@@ -721,16 +728,18 @@ void direction(dist& moves, targeting_type restricts,
 
 #ifndef USE_TILE
         case CMD_TARGET_TOGGLE_MLIST:
+        {
             if (Options.mlist_targetting == MLIST_TARGET_ON)
                 Options.mlist_targetting = MLIST_TARGET_OFF;
             else
                 Options.mlist_targetting = MLIST_TARGET_ON;
 
-            update_monster_pane();
+            bool full_info = update_monster_pane();
 
             if (Options.mlist_targetting == MLIST_TARGET_ON)
-                _fill_monster_list();
+                _fill_monster_list(full_info);
             break;
+        }
 #endif
 
 #ifdef WIZARD
@@ -1243,6 +1252,30 @@ bool in_los(int x, int y)
     return (in_vlos(grid2view(coord_def(x, y))));
 }
 
+static bool _mons_is_valid_target(monsters *mon, int mode, int range)
+{
+    // Unknown mimics don't count as monsters, either.
+    if (mons_is_mimic(mon->type)
+        && !(mon->flags & MF_KNOWN_MIMIC))
+    {
+        return (false);
+    }
+
+    // Don't usually target unseen monsters...
+    if (!player_monster_visible(mon))
+    {
+        // ... unless it creates a "disturbance in the water".
+        // Since you can't see the monster, assume it's not a friend.
+        // Also don't target submerged monsters if there are other targets
+        // in sight. (This might be too restrictive.)
+        return (mode != TARG_FRIEND
+                && _mon_submerged_in_water(mon)
+                && i_feel_safe(false, false, true, range));
+    }
+
+    return (true);
+}
+
 #ifndef USE_TILE
 static bool _find_mlist( int x, int y, int idx, bool need_path, int range = -1)
 {
@@ -1266,20 +1299,40 @@ static bool _find_mlist( int x, int y, int idx, bool need_path, int range = -1)
         }
 
         // While the monsters are identical, don't increase real_idx.
-        if (mlist[i].m_mon->type == mlist[i+1].m_mon->type
-            && mlist[i].m_attitude == mlist[i+1].m_attitude)
-        {
+        if (!monster_pane_info::less_than(mlist[i], mlist[i+1], mlist_full_info))
             continue;
-        }
+
         real_idx++;
     }
 
     monsters *mon  = &menv[targ_mon];
+
+    if (!_mons_is_valid_target(mon, TARG_ANY, range))
+        return (false);
+
     const monsters *monl = mlist[real_idx].m_mon;
     extern mon_attitude_type mons_attitude(const monsters *m);
 
-    return (mons_attitude(mon) == mlist[idx].m_attitude
-            && mon->type == monl->type);
+    if (mons_attitude(mon) != mlist[idx].m_attitude)
+        return (false);
+
+    if (mon->type != monl->type)
+        return (mons_is_mimic(mon->type) && mons_is_mimic(monl->type));
+
+    if (mlist_full_info)
+    {
+        if (mons_is_zombified(mon)) // Both monsters are zombies.
+            return (mon->base_monster == monl->base_monster);
+
+        if (mon->has_hydra_multi_attack())
+            return (mon->number == monl->number);
+    }
+
+    if (mon->type == MONS_PLAYER_GHOST)
+        return (mon->name(DESC_PLAIN) == monl->name(DESC_PLAIN));
+
+    // Else the two monsters are identical.
+    return (true);
 }
 #endif
 
@@ -1309,24 +1362,8 @@ static bool _find_monster( int x, int y, int mode, bool need_path,
 
     monsters *mon = &menv[targ_mon];
 
-    // Unknown mimics don't count as monsters, either.
-    if (mons_is_mimic(mon->type)
-        && !(mon->flags & MF_KNOWN_MIMIC))
-    {
+    if (!_mons_is_valid_target(mon, mode, range))
         return (false);
-    }
-
-    // Don't usually target unseen monsters...
-    if (!player_monster_visible(mon))
-    {
-        // ... unless it creates a "disturbance in the water".
-        // Since you can't see the monster, assume it's not a friend.
-        // Also don't target submerged monsters if there are other targets
-        // in sight. (This might be too restrictive.)
-        return (mode != TARG_FRIEND
-                && _mon_submerged_in_water(mon)
-                && i_feel_safe(false, false, true, range));
-    }
 
     // Now compare target modes.
     if (mode == TARG_ANY)
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index b69e653cf9..c16b6427f3 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -2199,6 +2199,9 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     else INT_OPTION(mlist_min_height, 0, INT_MAX);
     else INT_OPTION(msg_max_height, 6, INT_MAX);
     else BOOL_OPTION(mlist_allow_alternate_layout);
+#ifndef USE_TILE
+    else BOOL_OPTION(mlist_targetting);
+#endif
     else BOOL_OPTION(classic_hud);
     else BOOL_OPTION(msg_condense_repeats);
     else BOOL_OPTION(view_lock_x);
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index b769206e7c..6074856306 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -1450,13 +1450,13 @@ void get_monster_pane_info(std::vector<monster_pane_info>& mons)
 }
 
 #define BOTTOM_JUSTIFY_MONSTER_LIST 0
-void update_monster_pane()
+bool update_monster_pane()
 {
     const int max_print = crawl_view.mlistsz.y;
     textbackground(BLACK);
 
     if (max_print <= 0)
-        return;
+        return (false);
 
     std::vector<monster_pane_info> mons;
     get_monster_pane_info(mons);
@@ -1514,10 +1514,15 @@ void update_monster_pane()
         cgotoxy(crawl_view.mlistsz.x - 4, crawl_view.mlistsz.y, GOTO_MLIST);
         cprintf(" ... ");
     }
+
+    return zombified;
 }
 #else
 // FIXME: Implement this for Tiles!
-void update_monster_pane() {}
+bool update_monster_pane()
+{
+    return (false);
+}
 #endif
 
 const char* itosym1(int stat)
diff --git a/crawl-ref/source/output.h b/crawl-ref/source/output.h
index 073879a2a7..7d017f0ae8 100644
--- a/crawl-ref/source/output.h
+++ b/crawl-ref/source/output.h
@@ -53,7 +53,7 @@ void print_stats_level(void);
 void draw_border(void);
 std::string mpr_monster_list(bool past = false);
 void redraw_skill(const std::string &your_name, const std::string &class_name);
-void update_monster_pane();
+bool update_monster_pane();
 
 const char *equip_slot_to_name(int equip);
 
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index 98607bb14c..3b0abac19b 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -140,7 +140,7 @@ int blink(int pow, bool high_level_controlled_blink, bool wizard_blink)
 
         // Allow wizard blink to send player into walls, in case the
         // user wants to alter that grid to something else.
-        if (grid_is_solid(grd[beam.tx][beam.ty]) && wizard_blink)
+        if (wizard_blink && grid_is_solid(grd[beam.tx][beam.ty]))
             grd[beam.tx][beam.ty] = DNGN_FLOOR;
 
         if (grid_is_solid(grd[beam.tx][beam.ty])