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

3.7: fix #9397 - pronouns when hallucinating

Browse Source 
Developed for 3.6 but deferred to 3.7.  Most of the testing was with
the earlier incarnation.

Report was that pronouns were accurate for the underlying monsters
when hallucination was describing something random, and also that the
gender prefix flag from bogusmon.txt wasn't being used.  The latter
is still the case, but pronouns are now chosen at random while under
the influence of hallucination.  One of the choices is plural and an
attempt is made to make the monster name and verb fit that usage.

|The homunculus picks up a wand of speed monster.
|The large cats zap themselves with a wand of speed monster!
|The blue dragon is suddenly moving faster.

There is no attempt to match gender for the singular cases; you might
get
|The succubus zaps himself [...]
or
|The incubus zaps herself [...]
This commit is contained in:
PatR
2019-11-24 18:29:14 -08:00
parent 8f5cca8e3d
commit 9adeff5e27
9 changed files with 132 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/apply.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 apply.c $NHDT-Date: 1573778560 2019/11/15 00:42:40 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.284 $ */
/* NetHack 3.6 apply.c $NHDT-Date: 1574648938 2019/11/25 02:28:58 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.301 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -212,7 +212,7 @@ int rx, ry, *resp;
if (mtmp) {
mptr = mtmp->data = &mons[mtmp->mnum];
/* TRUE: override visibility check--it's not on the map */
gndr = pronoun_gender(mtmp, TRUE);
gndr = pronoun_gender(mtmp, PRONOUN_NO_IT);
} else {
mptr = &mons[corpse->corpsenm];
if (is_female(mptr))
@@ -934,8 +934,9 @@ struct obj *obj;
/* infravision doesn't produce an image in the mirror */
} else if ((how_seen & SEENMON) == MONSEEN_INFRAVIS) {
if (vis) /* (redundant) */
pline("%s is too far away to see %sself in the dark.",
Monnam(mtmp), mhim(mtmp));
pline("%s in the dark.",
monverbself(mtmp, Monnam(mtmp), "are",
"too far away to see"));
/* some monsters do special things */
} else if (mlet == S_VAMPIRE || mlet == S_GHOST || is_vampshifter(mtmp)) {
if (vis)
@@ -965,7 +966,8 @@ struct obj *obj;
if (vis) {
char buf[BUFSZ]; /* "She" or "He" */
pline("%s admires %sself in your %s.", Monnam(mtmp), mhim(mtmp),
pline("%s in your %s.", /* "<mon> admires self in your mirror " */
monverbself(mtmp, Monnam(mtmp), "admire", (char *) 0),
mirror);
pline("%s takes it!", upstart(strcpy(buf, mhe(mtmp))));
} else