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

hearing an unseen monster read a scroll

Browse Source 
Heroes recognized unseen same-race monsters by voice, but it yielded
an unexpected result if the monster was unique.  Change it so that
hero will recognize any type of monster by its voice if that monster
has been seen and limit unseen same-race ones to non-unique monsters.
Treats shopkeepers as unique since they have distinct names.

This adds a new flag to struct monst in order to track whether each
specific monster has ever been seen or sensed.
This commit is contained in:
PatR
2023-04-22 02:00:04 -07:00
parent 861fcdf9c4
commit 85a002c157
5 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/muse.c
+13 -8
View File
@@ -240,15 +240,20 @@ mreadmsg(struct monst *mtmp, struct obj *otmp)
if (vismon) {
/* directly see the monster reading the scroll */
pline("%s reads %s!", Monnam(mtmp), onambuf);
} else {
} else { /* !Deaf, otherwise we wouldn't reach here */
char blindbuf[BUFSZ];
boolean m_is_like_u = (!Hallucination
&& same_race(gy.youmonst.data, mtmp->data));
/* describe the unseen monster accurately if it is similar to the
hero's current form (unless hallucinating), else use "someone" */
boolean similar = same_race(gy.youmonst.data, mtmp->data),
uniqmon = ((mtmp->data->geno & G_UNIQ) != 0
/* shopkeepers aren't unique monsters but since
they have distinct names, treat them as such */
|| mtmp->isshk),
recognize = (!Hallucination
&& (mtmp->meverseen || (similar && !uniqmon)));
/* describe unseen monster accurately when not hallucinating if it
has ever been seen or is the same race as the hero (not yet seen
unique monsters excepted) */
int mflags = (SUPPRESS_INVISIBLE | SUPPRESS_SADDLE
| (m_is_like_u ? SUPPRESS_IT : AUGMENT_IT));
| (recognize ? SUPPRESS_IT : AUGMENT_IT));
/* monster can't be seen; hero might be blind or monster might
be at a spot that isn't in view or might be invisible; remember
@@ -263,7 +268,7 @@ mreadmsg(struct monst *mtmp, struct obj *otmp)
x_monnam(mtmp, ARTICLE_A, (char *) 0, mflags, FALSE),
blindbuf);
}
if (mtmp->mconf)
if (mtmp->mconf) /* (note: won't get if not seen and hero can't hear) */
pline("Being confused, %s mispronounces the magic words...",
vismon ? mon_nam(mtmp) : mhe(mtmp));
}