Shopkeepers are immune to peaceful displacement as well

This commit is contained in:
copperwater
2018-03-12 15:57:25 -04:00
committed by Pasi Kallinen
parent 5a1bbb4d16
commit 92b9db7630

View File

@@ -1848,10 +1848,11 @@ domove_core()
&& (!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)) {
/* displacing peaceful into unsafe or trapped space, or trying to
* displace quest leader, Oracle, or priest */
* displace quest leader, Oracle, shopkeeper, or priest */
You("stop. %s doesn't want to swap places.",
upstart(y_monnam(mtmp)));
didnt_move = TRUE;