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

peacefuls witnessing attack against peaceful mon

Browse Source 
The short exclamations ("Gasp!", "Why?", &c) led to ambiguity
about which monster was vocalizing them.  Use full sentences
which refer to the speaker.  It can become quite a bit more
verbose but is less likely to lead to confusion.  Perhaps it
should cut those off after a modest number of them have been
issued?
This commit is contained in:
PatR
2020-09-24 00:44:07 -07:00
parent 9faaa1b25d
commit 5df5079700
5 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sounds.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 sounds.c $NHDT-Date: 1600652306 2020/09/21 01:38:26 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.102 $ */
/* NetHack 3.7 sounds.c $NHDT-Date: 1600933442 2020/09/24 07:44:02 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.103 $ */
/* Copyright (c) 1989 Janet Walz, Mike Threepoint */
/* NetHack may be freely redistributed. See license for details. */
@@ -369,6 +369,7 @@ register struct monst *mtmp;
growl_verb = growl_sound(mtmp);
if (growl_verb) {
pline("%s %s!", Monnam(mtmp), vtense((char *) 0, growl_verb));
iflags.last_msg = PLNMSG_GROWL;
if (g.context.run)
nomul(0);
wake_nearto(mtmp->mx, mtmp->my, mtmp->data->mlevel * 18);
@@ -480,7 +481,7 @@ register struct monst *mtmp;
}
/* hero has attacked a peaceful monster within 'mon's view */
boolean
const char *
maybe_gasp(mon)
struct monst *mon;
{
@@ -542,10 +543,9 @@ struct monst *mon;
break;
}
if (dogasp) {
verbalize("%s", Exclam[mon->m_id % SIZE(Exclam)]);
return TRUE;
return Exclam[rn2(SIZE(Exclam))]; /* [mon->m_id % SIZE(Exclam)]; */
}
return FALSE;
return (const char *) 0;
}
/* return True if mon is a gecko or seems to look like one (hallucination) */