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

more things considered when you're on the brink

Browse Source
This commit is contained in:
nhmall
2019-11-29 11:14:55 -05:00
parent 059e0277ff
commit fd7d0f5d52
9 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/do.c
View File

@@ -246,12 +246,13 @@ const char *verb;
}
return water_damage(obj, NULL, FALSE) == ER_DESTROYED;
} else if (u.ux == x && u.uy == y && (t = t_at(x, y)) != 0
&& uteetering_at_seen_pit(t)) {
&& (uteetering_at_seen_pit(t) || uescaped_shaft(t))) {
if (Blind && !Deaf)
You_hear("%s tumble downwards.", the(xname(obj)));
else
pline("%s %s into %s pit.", The(xname(obj)),
otense(obj, "tumble"), the_your[t->madeby_u]);
pline("%s %s into %s %s.", The(xname(obj)),
otense(obj, "tumble"), the_your[t->madeby_u],
is_pit(t->ttyp) ? "pit" : "hole");
} else if (obj->globby) {
/* Globby things like puddings might stick together */
while (obj && (otmp = obj_nexto_xy(obj, x, y, TRUE)) != 0) {
@@ -1001,7 +1002,7 @@ dodown()
}
if (!stairs_down && !ladder_down) {
trap = t_at(u.ux, u.uy);
if (trap && uteetering_at_seen_pit(trap)) {
if (trap && (uteetering_at_seen_pit(trap) || uescaped_shaft)) {
dotrap(trap, TOOKPLUNGE);
return 1;
} else if (!trap || !is_hole(trap->ttyp)