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

Add vault guards to undisplaceable monsters

Browse Source
This commit is contained in:
Pasi Kallinen
2020-04-15 08:59:35 +03:00
parent ab4e82d1cf
commit 02f222bc0c
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/monst.h
+8
View File
@@ -187,6 +187,14 @@ struct monst {
|| (mon)->cham == PM_VLAD_THE_IMPALER) || (mon)->cham == PM_VLAD_THE_IMPALER)
#define vampshifted(mon) (is_vampshifter((mon)) && !is_vampire((mon)->data)) #define vampshifted(mon) (is_vampshifter((mon)) && !is_vampire((mon)->data))
/* monsters which cannot be displaced: priests, shopkeepers, vault guards,
Oracle, quest leader */
#define mundisplaceable(mon) ((mon)->ispriest \
|| (mon)->isshk \
|| (mon)->isgd \
|| (mon)->data == &mons[PM_ORACLE] \
|| (mon)->m_id == g.quest_status.leader_m_id)
/* mimic appearances that block vision/light */ /* mimic appearances that block vision/light */
#define is_lightblocker_mappear(mon) \ #define is_lightblocker_mappear(mon) \
(is_obj_mappear(mon, BOULDER) \ (is_obj_mappear(mon, BOULDER) \
src/hack.c
+1 -4
View File
@@ -1843,10 +1843,7 @@ domove_core()
} else if (mtmp->mpeaceful } else if (mtmp->mpeaceful
&& (!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 || mundisplaceable(mtmp))) {
|| 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 /* displacing peaceful into unsafe or trapped space, or trying to
* displace quest leader, Oracle, shopkeeper, 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.",