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

\#wizkill feedback

Browse Source 
If is mon not sensed or seen and you use #wizkill to kill it, report
"You kill an unseen mon." rather than just "You kill the mon."  Also,
override hallucination when identifying the victim.
This commit is contained in:
PatR
2022-06-19 13:50:15 -07:00
parent efcd07f814
commit d80752ad4b
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd.c
+12 -10
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 cmd.c $NHDT-Date: 1655513914 2022/06/18 00:58:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.577 $ */ /* NetHack 3.7 cmd.c $NHDT-Date: 1655671810 2022/06/19 20:50:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.579 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1210,15 +1210,17 @@ wiz_kill(void)
we issue our own message in order to name it in case it we issue our own message in order to name it in case it
isn't; note that if it triggers other kills, those might isn't; note that if it triggers other kills, those might
be referred to as "it" */ be referred to as "it" */
if (!iflags.menu_requested) { int tame = !!mtmp->mtame, seen = canspotmon(mtmp),
boolean namedpet = has_mgivenname(mtmp) && !Hallucination; flgs = SUPPRESS_IT | SUPPRESS_HALLUCINATION
| ((tame && has_mgivenname(mtmp)) ? SUPPRESS_SADDLE : 0),
articl = tame ? ARTICLE_YOUR : seen ? ARTICLE_THE : ARTICLE_A;
const char *adjs = tame ? (!seen ? "poor, unseen" : "poor")
: (!seen ? "unseen" : (const char *) 0);
char *Mn = x_monnam(mtmp, articl, adjs, flgs, FALSE);
if (!iflags.menu_requested) {
/* normal case: hero is credited/blamed */ /* normal case: hero is credited/blamed */
You("%s %s!", nonliving(mtmp->data) ? "destroy" : "kill", You("%s %s!", nonliving(mtmp->data) ? "destroy" : "kill", Mn);
!mtmp->mtame ? noit_mon_nam(mtmp)
: x_monnam(mtmp, ARTICLE_YOUR, "poor",
SUPPRESS_IT | (namedpet ? SUPPRESS_SADDLE : 0),
FALSE));
xkilled(mtmp, XKILL_NOMSG); xkilled(mtmp, XKILL_NOMSG);
} else { /* 'm'-prefix */ } else { /* 'm'-prefix */
/* we know that monsters aren't moving because player has /* we know that monsters aren't moving because player has
@@ -1227,9 +1229,9 @@ wiz_kill(void)
need to have the mon_moving flag be True in order to need to have the mon_moving flag be True in order to
avoid blaming or crediting hero for their deaths */ avoid blaming or crediting hero for their deaths */
g.context.mon_moving = TRUE; g.context.mon_moving = TRUE;
pline("%s is %s.", noit_Monnam(mtmp), pline("%s is %s.", upstart(Mn),
nonliving(mtmp->data) ? "destroyed" : "killed"); nonliving(mtmp->data) ? "destroyed" : "killed");
/* Null second arg suppresses message */ /* Null second arg suppresses the usual message */
monkilled(mtmp, (char *) 0, AD_PHYS); monkilled(mtmp, (char *) 0, AD_PHYS);
g.context.mon_moving = FALSE; g.context.mon_moving = FALSE;
} }