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

Pickaxing or whipping a liquid wall

Browse Source
This commit is contained in:
Pasi Kallinen
2023-02-07 07:36:51 +02:00
parent ce02aebfa6
commit 7aeba46690
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/apply.c
View File

@@ -2910,6 +2910,12 @@ use_whip(struct obj *obj)
} else if (u.dz < 0) {
You("flick a bug off of the %s.", ceiling(u.ux, u.uy));
} else if (!u.dz && (IS_WATERWALL(levl[rx][ry].typ)
|| levl[rx][ry].typ == LAVAWALL)) {
You("cause a small splash.");
if (levl[rx][ry].typ == LAVAWALL)
(void) fire_damage(uwep, FALSE, rx, ry);
return ECMD_TIME;
} else if ((!u.dx && !u.dy) || (u.dz > 0)) {
int dam;
@@ -2919,7 +2925,9 @@ use_whip(struct obj *obj)
kick_steed();
return ECMD_TIME;
}
if (is_pool_or_lava(u.ux, u.uy)) {
if (is_pool_or_lava(u.ux, u.uy)
|| IS_WATERWALL(levl[rx][ry].typ)
|| levl[rx][ry].typ == LAVAWALL) {
You("cause a small splash.");
if (is_lava(u.ux, u.uy))
(void) fire_damage(uwep, FALSE, u.ux, u.uy);

5
src/dig.c
View File

@@ -1101,6 +1101,11 @@ use_pick_axe2(struct obj *obj)
} else if (lev->typ == IRONBARS) {
pline("Clang!");
wake_nearby();
} else if (IS_WATERWALL(lev->typ)) {
pline("Splash!");
} else if (lev->typ == LAVAWALL) {
pline("Splash!");
(void) fire_damage(uwep, FALSE, rx, ry);
} else if (IS_TREE(lev->typ)) {
You("need an axe to cut down a tree.");
} else if (IS_ROCK(lev->typ)) {