summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monstuff.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
-rw-r--r--crawl-ref/source/monstuff.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index a651eacd98..494de41b99 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1831,6 +1831,13 @@ bool swap_check(monsters *monster, coord_def &loc)
const int mgrid = grd[monster->x][monster->y];
+ // Don't move onto dangerous terrain.
+ if (is_grid_dangerous(mgrid))
+ {
+ canned_msg(MSG_UNTHINKING_ACT);
+ return (false);
+ }
+
if (mons_is_caught(monster))
{
simple_monster_message(monster, " is held in a net!");
@@ -2753,7 +2760,7 @@ static void _handle_behaviour(monsters *mon)
{
if (mon->foe == MHITYOU)
{
- if (random2(you.skills[SK_STEALTH]/3))
+ if (one_chance_in(you.skills[SK_STEALTH]/3))
{
mon->target_x = you.x_pos;
mon->target_y = you.y_pos;