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

Add m_next2u, analogous to m_next2m and next2u

Browse Source
This commit is contained in:
Pasi Kallinen
2024-01-19 21:53:25 +02:00
parent b6bc3ef698
commit 57747535af
15 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/muse.c
View File

@@ -443,7 +443,7 @@ find_defensive(struct monst *mtmp, boolean tryescape)
if (!tryescape && dist2(x, y, mtmp->mux, mtmp->muy) > 25)
return FALSE;
if (tryescape && Is_knox(&u.uz)
&& !next2u(mtmp->mx, mtmp->my) && m_next2m(mtmp))
&& !m_next2u(mtmp) && m_next2m(mtmp))
return FALSE;
if (u.uswallow && stuck)
return FALSE;
@@ -2084,7 +2084,7 @@ find_misc(struct monst *mtmp)
&& uwep && !rn2(5) && obj == MON_WEP(mtmp)
/* hero's location must be known and adjacent */
&& u_at(mtmp->mux, mtmp->muy)
&& next2u(mtmp->mx, mtmp->my)
&& m_next2u(mtmp)
/* don't bother if it can't work (this doesn't
prevent cursed weapons from being targeted) */
&& !u.uswallow