nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Shopkeepers are immune to peaceful displacement as well

Browse Source
This commit is contained in:
copperwater
2020-04-15 08:46:47 +03:00
committed by Pasi Kallinen
parent 5a1bbb4d16
commit 92b9db7630
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hack.c
+2 -1
View File
@@ -1848,10 +1848,11 @@ domove_core()
&& (!goodpos(u.ux0, u.uy0, mtmp, 0) && (!goodpos(u.ux0, u.uy0, mtmp, 0)
|| t_at(u.ux0, u.uy0) != NULL || t_at(u.ux0, u.uy0) != NULL
|| mtmp->ispriest || mtmp->ispriest
|| mtmp->isshk
|| mtmp->data == &mons[PM_ORACLE] || mtmp->data == &mons[PM_ORACLE]
|| mtmp->m_id == g.quest_status.leader_m_id)) { || mtmp->m_id == g.quest_status.leader_m_id)) {
/* displacing peaceful into unsafe or trapped space, or trying to /* 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.", You("stop. %s doesn't want to swap places.",
upstart(y_monnam(mtmp))); upstart(y_monnam(mtmp)));
didnt_move = TRUE; didnt_move = TRUE;