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

more monster/door interaction

Browse Source 
Apply visibility fixups for monsters triggering door trap
explosions or digging through doors similar to the monster-opens-
door-handling from a couple of days.  Again, the issue is that
hero/player can see a closed door in situations where they can't
see an open one, and messages about the door being opened or
destroyed need to take that into account when seeing a closed
door go away.

Not as thoroughly tested as monster just opening closed door.
This commit is contained in:
PatR
2021-03-23 08:52:36 -07:00
parent e37d3d9f2d
commit 6c70b46ea1
4 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/lock.c
View File

@@ -1092,30 +1092,44 @@ doorlock(struct obj *otmp, int x, int y)
case WAN_STRIKING:
case SPE_FORCE_BOLT:
if (door->doormask & (D_LOCKED | D_CLOSED)) {
/* sawit: closed door location is more visible than open */
boolean sawit, seeit;
if (door->doormask & D_TRAPPED) {
if (MON_AT(x, y))
(void) mb_trapped(m_at(x, y));
else if (flags.verbose) {
if (cansee(x, y))
pline("KABOOM!! You see a door explode.");
else
You_hear("a distant explosion.");
}
struct monst *mtmp = m_at(x, y);
sawit = mtmp ? canseemon(mtmp) : cansee(x, y);
door->doormask = D_NODOOR;
unblock_point(x, y);
newsym(x, y);
loudness = 40;
seeit = mtmp ? canseemon(mtmp) : cansee(x, y);
if (mtmp) {
(void) mb_trapped(mtmp, sawit || seeit);
} else {
/* for mtmp, mb_trapped() does is own wake_nearto() */
loudness = 40;
if (flags.verbose) {
if ((sawit || seeit) && !Unaware)
pline("KABOOM!! You see a door explode.");
else if (!Deaf)
You_hear("a %s explosion.",
(distu(x, y) > 7 * 7) ? "distant"
: "nearby");
}
}
break;
}
sawit = cansee(x, y);
door->doormask = D_BROKEN;
unblock_point(x, y);
seeit = cansee(x, y);
newsym(x, y);
if (flags.verbose) {
if (cansee(x, y))
if ((sawit || seeit) && !Unaware)
pline_The("door crashes open!");
else
else if (!Deaf)
You_hear("a crashing sound.");
}
unblock_point(x, y);
newsym(x, y);
/* force vision recalc before printing more messages */
if (g.vision_full_recalc)
vision_recalc(0);