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

Monster or hero placement should avoid wall of water

Browse Source
This commit is contained in:
Pasi Kallinen
2022-02-13 18:06:56 +02:00
parent c1a6dd40bc
commit f2ea207936
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/teleport.c
+2
View File
@@ -83,12 +83,14 @@ goodpos(int x, int y, struct monst* mtmp, long gpflags)
if (mtmp == &g.youmonst) if (mtmp == &g.youmonst)
return (Swimming || Amphibious return (Swimming || Amphibious
|| (!Is_waterlevel(&u.uz) || (!Is_waterlevel(&u.uz)
&& !(levl[x][y].typ == WATER)
/* water on the Plane of Water has no surface /* water on the Plane of Water has no surface
so there's no way to be on or above that */ so there's no way to be on or above that */
&& (Levitation || Flying || Wwalking))); && (Levitation || Flying || Wwalking)));
else else
return (is_swimmer(mdat) return (is_swimmer(mdat)
|| (!Is_waterlevel(&u.uz) || (!Is_waterlevel(&u.uz)
&& !(levl[x][y].typ == WATER)
&& (is_floater(mdat) || is_flyer(mdat) && (is_floater(mdat) || is_flyer(mdat)
|| is_clinger(mdat)))); || is_clinger(mdat))));
} else if (mdat->mlet == S_EEL && rn2(13) && !ignorewater) { } else if (mdat->mlet == S_EEL && rn2(13) && !ignorewater) {