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

water vs lava

Browse Source 
When underwater, map adjacent lava as lava rather than as "not water".
The Valkyrie quest has lava adjacent to water and the hero ought to
be able recognize it while immersed so she doesn't try to climb out
of water directly into lava.

When the color option is disabled and lava uses the same symbol as
pool or as water (which is the case for default ascii, DECgraphics,
and IBMgraphics), apply the detected-monster display effect to lava.
For tty, this will draw it in inverse video if the use_inverse
option is enabled.  (Assumes non-tty will nearly always be using
color so not care.)  Creating a separate mapglyph special attribute
for B&W lava instead of overloading MG_DETECT ought to be done but
I didn't want to modify any interface code.
This commit is contained in:
PatR
2016-05-13 07:22:08 -07:00
parent 166cbd4434
commit 888695c328
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/display.c
View File

@@ -540,7 +540,7 @@ xchar x, y;
return;
/* The hero can't feel non pool locations while under water. */
if (Underwater && !Is_waterlevel(&u.uz) && !is_pool(x, y))
if (Underwater && !Is_waterlevel(&u.uz) && !is_pool_or_lava(x, y))
return;
/* Set the seen vector as if the hero had seen it.
@@ -701,18 +701,9 @@ register int x, y;
return;
}
if (Underwater && !Is_waterlevel(&u.uz)) {
/* don't do anything unless (x,y) is an adjacent underwater position
*/
int dx, dy;
if (!is_pool(x, y))
return;
dx = x - u.ux;
if (dx < 0)
dx = -dx;
dy = y - u.uy;
if (dy < 0)
dy = -dy;
if (dx > 1 || dy > 1)
/* when underwater, don't do anything unless <x,y> is an
adjacent underwater or lava position */
if (!is_pool_or_lava(x, y) || distu(x, y) > 2)
return;
}
@@ -1103,9 +1094,13 @@ int mode;
show_glyph(x, y, cmap_to_glyph(S_stone));
}
/*
* TODO? Should this honor Xray radius rather than force radius 1?
*/
for (x = u.ux - 1; x <= u.ux + 1; x++)
for (y = u.uy - 1; y <= u.uy + 1; y++)
if (isok(x, y) && is_pool(x, y)) {
if (isok(x, y) && is_pool_or_lava(x, y)) {
if (Blind && !(x == u.ux && y == u.uy))
show_glyph(x, y, cmap_to_glyph(S_stone));
else

10
src/mapglyph.c
View File

@@ -124,11 +124,19 @@ unsigned *ospecial;
color = NO_COLOR;
#ifdef TEXTCOLOR
/* provide a visible difference if normal and lit corridor
* use the same symbol */
use the same symbol */
} else if (iflags.use_color && offset == S_litcorr
&& showsyms[idx] == showsyms[S_corr + SYM_OFF_P]) {
color = CLR_WHITE;
#endif
/* try to provide a visible difference between water and lava
if they use the same symbol and color is disabled */
} else if (!iflags.use_color && offset == S_lava
&& (showsyms[idx] == showsyms[S_pool + SYM_OFF_P]
|| showsyms[idx] == showsyms[S_water + SYM_OFF_P])) {
/* temporary? hack; makes tty use inverse video if the
corresponding boolean option is enabled */
special |= MG_DETECT;
} else {
cmap_color(offset);
}