From 091c3333e96c60d0baba250269436ba81c8ad1a3 Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 19 Aug 2022 07:35:58 -0700 Subject: [PATCH] \#wizkill fixes Remove 'I' for remembered, unseen monster if it is successfully killed as well as when a kill attempt reveals that there is nothing there. When killing engulfer, don't report it to be "unseen" since hero is able to recognized it by touch. --- src/cmd.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cmd.c b/src/cmd.c index 719e3ead9..fae7f9d37 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1299,12 +1299,18 @@ wiz_kill(void) mtmp = m_at(cc.x, cc.y); } + /* whether there's an unseen monster here or not, player will know + that there's no monster here after the kill or failed attempt; + let hero know too */ + (void) unmap_invisible(cc.x, cc.y); + if (mtmp) { /* we don't require that the monster be seen or sensed so we issue our own message in order to name it in case it isn't; note that if it triggers other kills, those might be referred to as "it" */ - int tame = !!mtmp->mtame, seen = canspotmon(mtmp), + int tame = !!mtmp->mtame, + seen = (canspotmon(mtmp) || (u.uswallow && mtmp == u.ustuck)), flgs = (SUPPRESS_IT | SUPPRESS_HALLUCINATION | ((tame && has_mgivenname(mtmp)) ? SUPPRESS_SADDLE : 0)), @@ -1332,7 +1338,6 @@ wiz_kill(void) } } else { There("is no monster there."); - (void) unmap_invisible(cc.x, cc.y); break; } }