Extend monster pathfinding to monsters circumventing pools of deep water

or lava. I've added some more checks to avoid hampering performance too
much, but of course there's still space for improvement.

Once per turn check whether the player can see water and/or lava, and
only if this is the case run the additional checks (monster habitat,
grid_see_grid) when a monster tries to move.
Smart monsters that have a ranged attack won't use pathfinding either
since they can directly fire at the player. (This is identical to their
pre-pathfinding behaviour.)

Also fix butterflies really not interrupting resting. (Setting it to 0
doesn't work for some reason.)


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

1 files changed, 3 insertions, 6 deletions

diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index 260cc4b573..e5f46985b6 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -135,7 +135,7 @@ bool monster_habitable_grid(int monster_class,
     }
 
     // Amphibious critters are happy in water or on land.
-    if (mons_amphibious(monster_class)
+    if (mons_class_amphibious(monster_class)
         && (preferred_habitat == DNGN_FLOOR
                 && grid_compatible(DNGN_DEEP_WATER, actual_grid)
             || preferred_habitat == DNGN_DEEP_WATER
@@ -2523,11 +2523,8 @@ std::vector<coord_def> monster_pathfind::calc_waypoints()
         return path;
 
     dungeon_feature_type can_move;
-    if (mons_amphibious(mons_is_zombified(mons) ? mons->base_monster
-                                                : mons->type))
-    {
+    if (mons_amphibious(mons))
         can_move = DNGN_DEEP_WATER;
-    }
     else
         can_move = DNGN_SHALLOW_WATER;
 
@@ -2621,7 +2618,7 @@ int monster_pathfind::travel_cost(coord_def npos)
     // Travelling through water, entering or leaving water is more expensive
     // for non-amphibious monsters, so they'll avoid it where possible.
     // Only tested for shallow water since they can't enter deep water anywa.
-    if (!airborne && !mons_amphibious(montype)
+    if (!airborne && !mons_class_amphibious(montype)
         && (grd(pos) == DNGN_SHALLOW_WATER || grd(npos) == DNGN_SHALLOW_WATER))
     {
         return 2;