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

grappling hook ignores spot effects

Browse Source 
Using a grappling hook can land you in water, lava, et al, but you were
unaffected.
This commit is contained in:
cohrs
2002-02-01 03:30:40 +00:00
parent 1c562198f5
commit 8eb206765d
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes33.2
View File

@@ -411,6 +411,7 @@ secret corridor detected out of vision range is still displayed (prevents bug
getobj can now see user-specified count when using inventory to make selection
scalpel is stainless steel (i.e. METAL) not regular steel (IRON)
eggs, potions & other breakables may break when they fall down stairs
hurtling via grappling hook does not apply effects of destination location
Platform- and/or Interface-Specific Fixes

13
src/apply.c
View File

@@ -2332,8 +2332,7 @@ use_grapple (obj)
}
/* What did you hit? */
switch (rn2(5))
{
switch (rn2(5)) {
case 0: /* Trap */
/* FIXME -- untrap needs to deal with non-adjacent traps */
break;
@@ -2361,9 +2360,13 @@ use_grapple (obj)
}
/* FALL THROUGH */
case 3: /* Surface */
You("are yanked toward the %s!",
surface(cc.x, cc.y));
hurtle(sgn(cc.x-u.ux), sgn(cc.y-u.uy), 1, FALSE);
if (IS_AIR(levl[cc.x][cc.y].typ) || is_pool(cc.x, cc.y))
pline_The("hook slices through the %s.", surface(cc.x, cc.y));
else {
You("are yanked toward the %s!", surface(cc.x, cc.y));
hurtle(sgn(cc.x-u.ux), sgn(cc.y-u.uy), 1, FALSE);
spoteffects();
}
return (1);
default: /* Yourself (oops!) */
if (P_SKILL(typ) <= P_BASIC) {