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

fix U1079 - loss of water walking over lava

Browse Source 
Fix the reported problem of being able to safely stand on lava after
taking off fireproofed water walking boots.  The situation was more wide-
spread than that; the same thing happened when non-fireproofed boots were
burned off while walking over the lava in the first place.  Now you'll
fall in and end up getting stuck (you have to have fire resistance for any
of this to happen and that resistance makes falling in be survivable).
This commit is contained in:
nethack.rankin
2004-07-01 01:28:18 +00:00
parent 74c5d3f004
commit c91ac3274c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/do_wear.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)do_wear.c 3.4 2003/11/14 */
/* SCCS Id: @(#)do_wear.c 3.4 2004/06/30 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -94,6 +94,8 @@ Boots_on()
break;
case WATER_WALKING_BOOTS:
if (u.uinwater) spoteffects(TRUE);
/* (we don't need a lava check here since boots can't be
put on while feet are stuck) */
break;
case SPEED_BOOTS:
/* Speed boots are still better than intrinsic speed, */
@@ -146,10 +148,12 @@ Boots_off()
}
break;
case WATER_WALKING_BOOTS:
if (is_pool(u.ux,u.uy) && !Levitation && !Flying &&
!is_clinger(youmonst.data) && !context.takeoff.cancelled_don) {
makeknown(otyp);
/* check for lava since fireproofed boots make it viable */
if ((is_pool(u.ux, u.uy) || is_lava(u.ux, u.uy)) &&
!Levitation && !Flying && !is_clinger(youmonst.data) &&
!context.takeoff.cancelled_don) {
/* make boots known in case you survive the drowning */
makeknown(otyp);
spoteffects(TRUE);
}
break;
@@ -1320,10 +1324,11 @@ boolean noisy;
err++;
} else if (u.utrap && (u.utraptype == TT_BEARTRAP ||
u.utraptype == TT_INFLOOR ||
u.utraptype == TT_LAVA ||
u.utraptype == TT_BURIEDBALL)) {
if (u.utraptype == TT_BEARTRAP) {
if (noisy) Your("%s is trapped!", body_part(FOOT));
} else if (u.utraptype == TT_INFLOOR) {
} else if (u.utraptype == TT_INFLOOR || u.utraptype == TT_LAVA) {
if (noisy) Your("%s are stuck in the %s!",
makeplural(body_part(FOOT)),
surface(u.ux, u.uy));