more hiding monsters vs traps (trunk only)
Previous patch only handled hides-under monsters and the hero; this takes care of other hiding monsters.
This commit is contained in:
@@ -2344,8 +2344,13 @@ STATIC_OVL boolean
|
|||||||
restrap(mtmp)
|
restrap(mtmp)
|
||||||
register struct monst *mtmp;
|
register struct monst *mtmp;
|
||||||
{
|
{
|
||||||
|
struct trap *t;
|
||||||
|
|
||||||
if((mtmp->cham >= LOW_PM) || mtmp->mcan || mtmp->m_ap_type ||
|
if((mtmp->cham >= LOW_PM) || mtmp->mcan || mtmp->m_ap_type ||
|
||||||
cansee(mtmp->mx, mtmp->my) || rn2(3) || (mtmp == u.ustuck) ||
|
cansee(mtmp->mx, mtmp->my) || rn2(3) || (mtmp == u.ustuck) ||
|
||||||
|
/* can't hide while trapped except in pits */
|
||||||
|
(mtmp->mtrapped && (t = t_at(mtmp->mx, mtmp->my)) != 0 &&
|
||||||
|
!(t->ttyp == PIT || t->ttyp == SPIKED_PIT)) ||
|
||||||
(sensemon(mtmp) && distu(mtmp->mx, mtmp->my) <= 2))
|
(sensemon(mtmp) && distu(mtmp->mx, mtmp->my) <= 2))
|
||||||
return(FALSE);
|
return(FALSE);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user