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

report ice's thaw state

Browse Source 
Classify nearby ice as "solid" (no melt timer), "sturdy" (more than
1000 turns left), "steady" (101 to 1000 turns left), "unsteady" (51
to 100 turns left), "thin" (15 to 50 turns left), or "slushy" (1 to
14 turns left, matching walking on ice with the Warning attribute).
[I'm not thrilled with "steady" and particularly "unsteady".]

I was originally going to do this just for probing downward, but ended
up also doing it for look-here and getpos's autodescribe.  It nearly
got out of hand and touched more files than anticipated.

'mention_decor' ought to treat moving from ice firmer than thin to
thin or slushy, from thin to slushy, from slushy to any other, and
from thin to firmer as if moving onto different terrain but I haven't
attempted to tackle that.

The melt timer could work more like a candle's burn timer, triggering
at intermediate stages and resetting itself, so that ice which changes
to a weaker state under the hero could be reported to the player.  But
this doesn't implement that.
This commit is contained in:
PatR
2023-10-25 13:26:03 -07:00
parent 7bf3888118
commit 04d6789c98
10 changed files with 156 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/invent.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 invent.c $NHDT-Date: 1698090922 2023/10/23 19:55:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.456 $ */
/* NetHack 3.7 invent.c $NHDT-Date: 1698264784 2023/10/25 20:13:04 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.457 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -4224,7 +4224,7 @@ dfeature_at(coordxy x, coordxy y, char *buf)
else if (is_lava(x, y))
cmap = S_lava; /* "molten lava" */
else if (is_ice(x, y))
cmap = S_ice; /* "ice" */
dfeature = ice_descr(x, y, altbuf), cmap = -1; /* "ice" */
else if (is_pool(x, y))
dfeature = "pool of water";
else if (IS_SINK(ltyp))
@@ -4330,19 +4330,28 @@ look_here(
if (dfeature && !strncmp(dfeature, "altar ", 6)) {
/* don't say "altar" twice, dfeature has more info */
You("try to feel what is here.");
} else if (SURFACE_AT(u.ux, u.uy) == ICE) {
/* using describe_decor() to handle ice is simpler than
replicating it in the conditional message construction */
if (!flags.mention_decor || iflags.prev_decor == ICE)
force_decor(FALSE);
/* plain "ice" if blind and levitating, otherwise "solid ice" &c;
"There is [thin ]ice here. You try to feel what is on it." */
You("try to feel what is on it.");
skip_dfeature = TRUE; /* ice already described */
} else {
const char *where = (Blind && !can_reach_floor(TRUE))
? "lying beneath you"
: "lying here on the ",
*onwhat = (Blind && !can_reach_floor(TRUE))
? ""
: surface(u.ux, u.uy);
boolean cant_reach = !can_reach_floor(TRUE);
const char *surf = surface(u.ux, u.uy),
*where = cant_reach ? "lying beneath you"
: "lying here on the ",
*onwhat = cant_reach ? "" : surf;
You("try to feel what is %s%s.", drift ? "floating here" : where,
drift ? "" : onwhat);
if (dfeature && !drift && !strcmp(dfeature, surf))
skip_dfeature = TRUE; /* terrain feature already identified */
}
if (dfeature && !drift && !strcmp(dfeature, surface(u.ux, u.uy)))
dfeature = 0; /* ice already identified */
trap = t_at(u.ux, u.uy);
if (!can_reach_floor(trap && is_pit(trap->ttyp))) {
pline("But you can't reach it!");