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

don't hide under statues, statue trap or not

Browse Source 
Unlike ground clutter, statues are typically in pretty tight contact
with the ground; statue traps are sometimes proclaimed as "monsters
posing as statues".
This commit is contained in:
nhmall
2023-06-15 09:29:41 -04:00
parent 1bd966f826
commit fee66f2905
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/monmove.c
View File

@@ -1312,7 +1312,8 @@ m_move(register struct monst *mtmp, int after)
finish_meating(mtmp);
return MMOVE_DONE; /* still eating */
}
if (hides_under(ptr) && OBJ_AT(mtmp->mx, mtmp->my) && rn2(10))
if (hides_under(ptr) && OBJ_AT(mtmp->mx, mtmp->my)
&& can_hide_under_obj(gl.level.objects[mtmp->mx][mtmp->my]) && rn2(10))
return MMOVE_NOTHING; /* do not leave hiding place */
/* Where does 'mtmp' think you are? Not necessary if m_move() called
@@ -1893,6 +1894,21 @@ m_move_aggress(struct monst *mtmp, coordxy x, coordxy y)
return MMOVE_DONE;
}
/* returns TRUE if a mon can hide under the obj */
boolean
can_hide_under_obj(struct obj *obj)
{
struct trap *t;
if (!obj || (obj->otyp == STATUE
/* uncomment this next line for just statue traps */
/* && (t = t_at(obj->ox, obj->oy)) != 0 && t->ttyp == STATUE_TRAP */
))
return FALSE;
return TRUE;
nhUse(t);
}
void
dissolve_bars(coordxy x, coordxy y)
{