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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-09-28 20:23:05 -04:00
parent 5a6d70a952 da6c393e43
commit c26914bb55
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

@@ -827,7 +827,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[g.trapx][g.trapy].typ == SCORR) {
levl[g.trapx][g.trapy].typ = CORR;
@@ -924,7 +924,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(g.trapx, g.trapy));
}
/* don't use rloc_to() because worm tails must "move" */
@@ -1873,7 +1873,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(g.trapx, g.trapy));
@@ -2451,7 +2451,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");
}