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

19
src/monmove.c
View File

@@ -18,23 +18,24 @@ static int vamp_shift(struct monst *, struct permonst *, boolean);
/* True if mtmp died */
boolean
mb_trapped(struct monst* mtmp)
mb_trapped(struct monst *mtmp, boolean canseeit)
{
if (flags.verbose) {
if (cansee(mtmp->mx, mtmp->my) && !Unaware)
if (canseeit && !Unaware)
pline("KABOOM!! You see a door explode.");
else if (!Deaf)
You_hear("a distant explosion.");
You_hear("a %s explosion.",
(distu(mtmp->mx, mtmp->my) > 7 * 7) ? "distant"
: "nearby");
}
wake_nearto(mtmp->mx, mtmp->my, 7 * 7);
mtmp->mstun = 1;
mtmp->mhp -= rnd(15);
if (DEADMONSTER(mtmp)) {
mondied(mtmp);
if (!DEADMONSTER(mtmp)) /* lifesaved */
return FALSE;
else
if (DEADMONSTER(mtmp))
return TRUE;
/* will get here if lifesaved */
}
return FALSE;
}
@@ -1401,7 +1402,7 @@ m_move(register struct monst* mtmp, register int after)
UnblockDoor(here, mtmp, !btrapped ? D_ISOPEN : D_NODOOR);
if (btrapped) {
if (mb_trapped(mtmp))
if (mb_trapped(mtmp, canseeit))
return 2;
} else {
if (flags.verbose) {
@@ -1417,7 +1418,7 @@ m_move(register struct monst* mtmp, register int after)
} else if (here->doormask == D_CLOSED && can_open) {
UnblockDoor(here, mtmp, !btrapped ? D_ISOPEN : D_NODOOR);
if (btrapped) {
if (mb_trapped(mtmp))
if (mb_trapped(mtmp, canseeit))
return 2;
} else {
if (flags.verbose) {
@@ -1438,7 +1439,7 @@ m_move(register struct monst* mtmp, register int after)
: D_BROKEN);
UnblockDoor(here, mtmp, mask);
if (btrapped) {
if (mb_trapped(mtmp))
if (mb_trapped(mtmp, canseeit))
return 2;
} else {
if (flags.verbose) {