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

pets and portals

Browse Source 
Extend pull request #737,
commit d6ab241b8c, to magic portals.
If hero is on or next to a magic portal, have pets behave as if food
they want is being carried, like PR #737 did for hero standing on
stairs.  (To be on one, hero must have come through from the other
side and not moved off the receiving portal yet, or else is in the
endgame but no longer carrying the Amulet.)
This commit is contained in:
PatR
2022-05-01 15:09:17 -07:00
parent 308dce273d
commit a9559c01f4
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dogmove.c
View File

@@ -594,7 +594,8 @@ dog_goal(register struct monst *mtmp, struct edog *edog,
appr = 1;
}
/* if you have dog food it'll follow you more closely; if you are
on stairs (or ladder), it will behave as if you have dog food */
on stairs (or ladder) or on or next to a magic portal, it will
behave as if you have dog food */
if (appr == 0) {
if (On_stairs(u.ux, u.uy)) {
appr = 1;
@@ -604,6 +605,18 @@ dog_goal(register struct monst *mtmp, struct edog *edog,
appr = 1;
break;
}
if (appr == 0) {
struct trap *t;
/* assume at most one magic portal per level;
[should this be limited to known portals?] */
for (t = g.ftrap; t; t = t->ntrap)
if (t->ttyp == MAGIC_PORTAL) {
if (/*t->tseen &&*/ distu(t->tx, t->ty) <= 2)
appr = 1;
break;
}
}
}
}
} else