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

venom bit

Browse Source 
I looked for places where changing "{blinding,acid} venom" into
"splash of {blinding,acid} venom" might make messages become too
verbose.  Turns out to have been unnecessary work because the full
name won't be used unless you get a venom object in inventory and
formally identify it.  Wizard mode, or bones from wizard mode, is
necessary for that to happen so the possibility can be ignored.
[The name change is still useful for wizard mode wishing though.]

Many messages use hard-coded "venom" instead of xname() so won't
be affected even if such identification takes place.  However,
thitmon() was producing
 |The <mon> is hit by the splash of venom.
 |The splash of venom blinds the <mon>.
which seems rather redundant even without the longer full object
name.  So change the second message to be generated as
 |The venom blinds the <mon>.
It also shortens "cream pie" in first line to "pie" in second one.
This commit is contained in:
PatR
2020-07-27 09:20:12 -07:00
parent fae75f5930
commit 3cc82cbbe7
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mthrowu.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 mthrowu.c $NHDT-Date: 1586567393 2020/04/11 01:09:53 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.99 $ */
/* NetHack 3.6 mthrowu.c $NHDT-Date: 1595866809 2020/07/27 16:20:09 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.101 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2016. */
/* NetHack may be freely redistributed. See license for details. */
@@ -425,7 +425,14 @@ boolean verbose; /* give message(s) even when you can't see what happened */
: AT_WEAP),
otmp)) {
if (vis && mtmp->mcansee)
pline("%s is blinded by %s.", Monnam(mtmp), the(xname(otmp)));
/* shorten object name to reduce redundancy in the
two message [first via hit() above] sequence:
"The {splash of venom,cream pie} hits <mon>."
"<Mon> is blinded by the {venom,pie}." */
pline("%s is blinded by %s.", Monnam(mtmp),
the((otmp->oclass == VENOM_CLASS) ? "venom"
: (otmp->otyp == CREAM_PIE) ? "pie"
: xname(otmp))); /* catchall; not used */
mtmp->mcansee = 0;
tmp = (int) mtmp->mblinded + rnd(25) + 20;
if (tmp > 127)