Add vault guards to undisplaceable monsters

2020-04-15 08:59:35 +03:00
parent ab4e82d1cf
commit 02f222bc0c
2 changed files with 9 additions and 4 deletions
--- a/src/hack.c
+++ b/src/hack.c
@@ -1843,10 +1843,7 @@ domove_core()
        } else if (mtmp->mpeaceful
                   && (!goodpos(u.ux0, u.uy0, mtmp, 0)
                       || t_at(u.ux0, u.uy0) != NULL
-                       || mtmp->ispriest
-                       || mtmp->isshk
-                       || mtmp->data == &mons[PM_ORACLE]
-                       || mtmp->m_id == g.quest_status.leader_m_id)) {
+                       || mundisplaceable(mtmp))) {
            /* displacing peaceful into unsafe or trapped space, or trying to
             * displace quest leader, Oracle, shopkeeper, or priest */
            You("stop.  %s doesn't want to swap places.",