From 25d6335de959237d22835c1bf0988d1c47c3a716 Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Sat, 3 May 2003 02:08:34 +0000 Subject: [PATCH] two land mine bits Noticed when investigating one of the killer reason bugs recently reported: a land mine explosion shouldn't create a concealed pit trap; make a revealed pit instead. And while testing that, I noticed that the "Kaboom" message given when pushing a boulder onto a land mine was given while the map still showed the boulder at its original location even though it had actually been moved already. It's a little odd that you get hit by shrapnel at your original position--as if you're shoving the boulder ahead of you and then pausing a moment before stepping into its former location--but that's trickier to fix; sometimes you won't advance due to there being multiple boulders present (in that case you evidently do shove the boulder instead of performing a steady push, so maybe the current behavior is fine as it is). --- doc/fixes34.2 | 2 ++ src/hack.c | 10 ++++++---- src/trap.c | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/fixes34.2 b/doc/fixes34.2 index 2fb3e4e6e..996900f07 100644 --- a/doc/fixes34.2 +++ b/doc/fixes34.2 @@ -48,6 +48,8 @@ immediate encumbrance feedback when removing gauntlets of power make deliberately flying down the Castle's trap doors consistent with falling give more explicit feedback for exploding bag of holding help display for "list of game options" misformats runmode and scroll_amount +pit created by land mine explosion doesn't start out concealed +update map display sooner when pushed boulder triggers land mine explosion Platform- and/or Interface-Specific Fixes diff --git a/src/hack.c b/src/hack.c index bd6df7430..1e8b721bd 100644 --- a/src/hack.c +++ b/src/hack.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)hack.c 3.4 2003/01/08 */ +/* SCCS Id: @(#)hack.c 3.4 2003/04/30 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -134,11 +134,13 @@ moverock() switch(ttmp->ttyp) { case LANDMINE: if (rn2(10)) { - pline("KAABLAMM!!! %s %s land mine.", - Tobjnam(otmp, "trigger"), - ttmp->madeby_u ? "your" : "a"); obj_extract_self(otmp); place_object(otmp, rx, ry); + unblock_point(sx, sy); + newsym(sx, sy); + pline("KAABLAMM!!! %s %s land mine.", + Tobjnam(otmp, "trigger"), + ttmp->madeby_u ? "your" : "a"); blow_up_landmine(ttmp); /* if the boulder remains, it should fill the pit */ fill_pit(u.ux, u.uy); diff --git a/src/trap.c b/src/trap.c index d367c1b60..903d87b4f 100644 --- a/src/trap.c +++ b/src/trap.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)trap.c 3.4 2003/02/10 */ +/* SCCS Id: @(#)trap.c 3.4 2003/04/30 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1208,6 +1208,7 @@ struct trap *trap; /* caller may subsequently fill pit, e.g. with a boulder */ trap->ttyp = PIT; /* explosion creates a pit */ trap->madeby_u = FALSE; /* resulting pit isn't yours */ + seetrap(trap); /* and it isn't concealed */ } #endif /* OVLB */ -- 2.40.0