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

1
include/extern.h
View File

@@ -1730,6 +1730,7 @@ extern boolean can_fog(struct monst *);
extern boolean should_displace(struct monst *, coord *, long *, int, coordxy, extern boolean should_displace(struct monst *, coord *, long *, int, coordxy,
coordxy); coordxy);
extern boolean undesirable_disp(struct monst *, coordxy, coordxy); extern boolean undesirable_disp(struct monst *, coordxy, coordxy);
extern boolean can_hide_under_obj(struct obj *);
/* ### monst.c ### */ /* ### monst.c ### */

10
src/mon.c
View File

@@ -4196,7 +4196,9 @@ maybe_unhide_at(coordxy x, coordxy y)
} }
if (undetected if (undetected
&& ((hides_under(mtmp->data) && (!OBJ_AT(x, y) || trapped)) && ((hides_under(mtmp->data)
&& (!OBJ_AT(x, y) || trapped
|| !can_hide_under_obj(gl.level.objects[x][y])))
|| (mtmp->data->mlet == S_EEL && !is_pool(x, y)))) || (mtmp->data->mlet == S_EEL && !is_pool(x, y))))
(void) hideunder(mtmp); (void) hideunder(mtmp);
} }
@@ -4210,6 +4212,7 @@ hideunder(struct monst *mtmp)
int seeit = canseemon(mtmp); int seeit = canseemon(mtmp);
boolean oldundetctd, undetected = FALSE, is_u = (mtmp == &gy.youmonst); boolean oldundetctd, undetected = FALSE, is_u = (mtmp == &gy.youmonst);
coordxy x = is_u ? u.ux : mtmp->mx, y = is_u ? u.uy : mtmp->my; coordxy x = is_u ? u.ux : mtmp->mx, y = is_u ? u.uy : mtmp->my;
struct obj *otmp;
if (mtmp == u.ustuck) { if (mtmp == u.ustuck) {
; /* undetected==FALSE; can't hide if holding you or held by you */ ; /* undetected==FALSE; can't hide if holding you or held by you */
@@ -4221,9 +4224,8 @@ hideunder(struct monst *mtmp)
undetected = (is_pool(x, y) && !Is_waterlevel(&u.uz)); undetected = (is_pool(x, y) && !Is_waterlevel(&u.uz));
if (seeit) if (seeit)
seenobj = "the water"; seenobj = "the water";
} else if (hides_under(mtmp->data) && OBJ_AT(x, y)) { } else if (hides_under(mtmp->data) && OBJ_AT(x, y)
struct obj *otmp = gl.level.objects[x][y]; && (otmp = gl.level.objects[x][y]) != 0 && can_hide_under_obj(otmp)) {
if (seeit) if (seeit)
seenobj = ansimpleoname(otmp); seenobj = ansimpleoname(otmp);
/* most monsters won't hide under cockatrice corpse but they /* most monsters won't hide under cockatrice corpse but they

18
src/monmove.c
View File

@@ -1312,7 +1312,8 @@ m_move(register struct monst *mtmp, int after)
finish_meating(mtmp); finish_meating(mtmp);
return MMOVE_DONE; /* still eating */ 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 */ return MMOVE_NOTHING; /* do not leave hiding place */
/* Where does 'mtmp' think you are? Not necessary if m_move() called /* 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; 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 void
dissolve_bars(coordxy x, coordxy y) dissolve_bars(coordxy x, coordxy y)
{ {