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

Merge branch 'win-wip3.7' into win-wip3.7-bart

Browse Source 
Conflicts:
	src/o_init.c
This commit is contained in:
Bart House
2018-12-22 13:22:58 -08:00
parent 605667b470 85f8e84fc3
commit c8ae68b06a
17 changed files with 353 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/trap.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 trap.c $NHDT-Date: 1543515862 2018/11/29 18:24:22 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.312 $ */
/* NetHack 3.6 trap.c $NHDT-Date: 1545259936 2018/12/19 22:52:16 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.313 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */
@@ -2678,13 +2678,29 @@ register struct monst *mtmp;
break;
case VIBRATING_SQUARE:
if (see_it && !Blind) {
if (in_sight)
pline("You see a strange vibration beneath %s %s.",
s_suffix(mon_nam(mtmp)),
makeplural(mbodypart(mtmp, FOOT)));
else
pline("You see the ground vibrate in the distance.");
seetrap(trap);
seetrap(trap); /* before messages */
if (in_sight) {
char buf[BUFSZ], *p, *monnm = mon_nam(mtmp);
if (nolimbs(mtmp->data)
|| is_floater(mtmp->data) || is_flyer(mtmp->data)) {
/* just "beneath <mon>" */
Strcpy(buf, monnm);
} else {
Strcpy(buf, s_suffix(monnm));
p = eos(strcat(buf, " "));
Strcpy(p, makeplural(mbodypart(mtmp, FOOT)));
/* avoid "beneath 'rear paws'" or 'rear hooves' */
(void) strsubst(p, "rear ", "");
}
You_see("a strange vibration beneath %s.", buf);
} else {
/* notice something (hearing uses a larger threshold
for 'nearby') */
You_see("the ground vibrate %s.",
(distu(mtmp->mx, mtmp->my) <= 2 * 2)
? "nearby" : "in the distance");
}
}
break;
default: