Don't treat electric eels as safe just because they're aquatic.

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

3 files changed, 23 insertions, 12 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 26d5a59a00..d2c5762a4e 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2704,20 +2704,22 @@ bool mons_is_safe(const monsters *mon, bool want_move,
                     || you.skills[SK_STEALTH] > 27 && dist > 2
 #endif
                        // Only seen through glass walls or within water?
+                       // Assuming that there are no water-only/lava-only
+                       // monsters capable of throwing or zapping wands.
                     || (!see_grid_no_trans(mon->pos())
                             || mons_class_habitat(mon->type) == HT_WATER
                             || mons_class_habitat(mon->type) == HT_LAVA)
                         && !_mons_has_path_to_player(mon)
                         && !mons_has_los_attack(mon)
                         && (!see_grid_no_trans(mon->pos())
-                            || !mons_has_ranged_attack(mon)));
+                            || !mons_has_ranged_ability(mon)));
 
 #ifdef CLUA_BINDINGS
     if (consider_user_options)
     {
         bool moving = (!you.delay_queue.empty()
-                       && is_run_delay(you.delay_queue.front().type)
-                       && you.delay_queue.front().type != DELAY_REST
+                          && is_run_delay(you.delay_queue.front().type)
+                          && you.delay_queue.front().type != DELAY_REST
                        || you.running < RMODE_NOT_RUNNING
                        || want_move);
 
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 14721142ff..9da8ae5473 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -3324,6 +3324,14 @@ bool mons_has_ranged_spell( const monsters *mon, bool attack_only,
     return (false);
 }
 
+bool mons_has_ranged_ability( const monsters *mon)
+{
+    if (mon->type == MONS_ELECTRIC_EEL || mon->type == MONS_LAVA_SNAKE)
+        return (true);
+
+    return (false);
+}
+
 bool mons_has_ranged_attack( const monsters *mon )
 {
     // Ugh.
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index 62146ac041..61de3b7117 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -730,17 +730,18 @@ bool ms_direct_nasty(spell_type monspell);
  * called from: monstuff
  * *********************************************************************** */
 
-bool ms_useful_fleeing_out_of_sight( const monsters *mon, spell_type monspell );
-bool ms_quick_get_away( const monsters *mon, spell_type monspell );
-bool ms_waste_of_time( const monsters *mon, spell_type monspell );
-bool ms_low_hitpoint_cast( const monsters *mon, spell_type monspell );
+bool ms_useful_fleeing_out_of_sight(const monsters *mon, spell_type monspell);
+bool ms_quick_get_away(const monsters *mon, spell_type monspell);
+bool ms_waste_of_time(const monsters *mon, spell_type monspell);
+bool ms_low_hitpoint_cast(const monsters *mon, spell_type monspell);
 
-bool mons_is_magic_user( const monsters *mon );
-bool mons_has_los_ability( int mclass );
+bool mons_is_magic_user(const monsters *mon);
+bool mons_has_los_ability(int mclass);
 bool mons_has_los_attack(const monsters *mon);
-bool mons_has_ranged_spell( const monsters *mon, bool attack_only = false,
-                            bool ench_too = true );
-bool mons_has_ranged_attack( const monsters *mon );
+bool mons_has_ranged_spell(const monsters *mon, bool attack_only = false,
+                           bool ench_too = true);
+bool mons_has_ranged_attack(const monsters *mon);
+bool mons_has_ranged_ability(const monsters *mon);
 
 // last updated 06mar2001 (gdl)
 /* ***********************************************************************