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

fix errant verb tense in some messages if pet or mon name ends in 's'

Browse Source 
Report stated:
"Poes deliberately slither onto a polymorph trap!" ... it's only one cat, er,
black naga. Why does the parser treat the name as plural? There are lots of
singular words and names that end in -s or -es!

H9249 1780
This commit is contained in:
nhmall
2019-09-26 11:49:15 -04:00
parent 9361e872b2
commit da6c393e43
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/muse.c
View File

@@ -846,7 +846,7 @@ struct monst *mtmp;
Mnam = Monnam(mtmp);
pline("%s %s into a %s!", Mnam,
vtense(Mnam, locomotion(mtmp->data, "jump")),
vtense(fakename[0], locomotion(mtmp->data, "jump")),
(t->ttyp == TRAPDOOR) ? "trap door" : "hole");
if (levl[trapx][trapy].typ == SCORR) {
levl[trapx][trapy].typ = CORR;
@@ -943,7 +943,7 @@ struct monst *mtmp;
if (vis) {
Mnam = Monnam(mtmp);
pline("%s %s onto a teleport trap!", Mnam,
vtense(Mnam, locomotion(mtmp->data, "jump")));
vtense(fakename[0], locomotion(mtmp->data, "jump")));
seetrap(t_at(trapx, trapy));
}
/* don't use rloc_to() because worm tails must "move" */
@@ -1892,7 +1892,7 @@ struct monst *mtmp;
const char *Mnam = Monnam(mtmp);
pline("%s deliberately %s onto a polymorph trap!", Mnam,
vtense(Mnam, locomotion(mtmp->data, "jump")));
vtense(fakename[0], locomotion(mtmp->data, "jump")));
}
if (vis)
seetrap(t_at(trapx, trapy));
@@ -2470,7 +2470,7 @@ boolean by_you; /* true: if mon kills itself, hero gets credit/blame */
newsym(mon->mx, mon->my);
if (vis)
pline("%s %s %s %s fire trap!", Mnam,
vtense(Mnam, locomotion(mon->data, "move")),
vtense(fakename[0], locomotion(mon->data, "move")),
is_floater(mon->data) ? "over" : "onto",
trap->tseen ? "the" : "a");
}