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

Avoid generating monsters on boulders

Browse Source 
... unless the monster can go through walls.
This commit is contained in:
Pasi Kallinen
2022-01-22 15:41:18 +02:00
parent 9d64d135b8
commit f698d48ba0
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sp_lev.c
+7 -9
View File
@@ -1151,7 +1151,7 @@ get_location(xchar *x, xchar *y, int humidity, struct mkroom* croom)
static boolean static boolean
is_ok_location(xchar x, xchar y, int humidity) is_ok_location(xchar x, xchar y, int humidity)
{ {
register int typ; register int typ = levl[x][y].typ;
if (Is_waterlevel(&u.uz)) if (Is_waterlevel(&u.uz))
return TRUE; /* accept any spot */ return TRUE; /* accept any spot */
@@ -1160,17 +1160,15 @@ is_ok_location(xchar x, xchar y, int humidity)
if (humidity & ANY_LOC) if (humidity & ANY_LOC)
return TRUE; return TRUE;
if ((humidity & SOLID) && IS_ROCK(levl[x][y].typ)) if ((humidity & SOLID) && IS_ROCK(typ))
return TRUE; return TRUE;
if (humidity & DRY) { if ((humidity & (DRY|SPACELOC)) && SPACE_POS(typ)) {
typ = levl[x][y].typ; boolean bould = (sobj_at(BOULDER, x, y) != NULL);
if (typ == ROOM || typ == AIR || typ == CLOUD || typ == ICE
|| typ == CORR) if (!bould || (bould && (humidity & SOLID)))
return TRUE; return TRUE;
} }
if ((humidity & SPACELOC) && SPACE_POS(levl[x][y].typ))
return TRUE;
if ((humidity & WET) && is_pool(x, y)) if ((humidity & WET) && is_pool(x, y))
return TRUE; return TRUE;
if ((humidity & HOT) && is_lava(x, y)) if ((humidity & HOT) && is_lava(x, y))
@@ -1799,7 +1797,7 @@ pm_to_humidity(struct permonst* pm)
loc |= (HOT | WET); loc |= (HOT | WET);
if (passes_walls(pm) || noncorporeal(pm)) if (passes_walls(pm) || noncorporeal(pm))
loc |= SOLID; loc |= SOLID;
if (flaming(pm)) if (likes_fire(pm))
loc |= HOT; loc |= HOT;
return loc; return loc;
} }