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

thawing ice followup

Browse Source 
Modifying an() [actually just_an()] to treat "<thickness> ice" and
"frozen <hallucinatory liquid>" as special cases which shouldn't be
prefixed with "a" or "an" affected using something like "shaved ice"
or "frozen yogurt" as named fruit.
 |a) shaved ice
 |b) frozen yogurt (weapon in hand)
now have article "a" preceding them:
 |a) a shaved ice
 |b) a frozen yogurt (weapon in hand)
However, the existing cases
 |c) iron bars
 |d) an iron bars (weapon in hand)
still get item 'c' wrong.  'd' is slightly odd but that's because the
fruit name is ambiguous as to whether it's singular or plural.
This commit is contained in:
PatR
2023-10-26 01:28:56 -07:00
parent 04d6789c98
commit 4dc8429d9e
5 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pager.c
View File

@@ -1062,7 +1062,7 @@ add_cmap_descr(
const char **firstmatch, /* output: pointer to 1st matching description */
char *out_str) /* input/output: current description gets appended */
{
char *mbuf = NULL;
char *mbuf = NULL, *p;
int absidx = abs(idx);
if (glyph == NO_GLYPH) {
@@ -1111,11 +1111,17 @@ add_cmap_descr(
Strcpy(mbuf, "lava");
x_str = mbuf;
article = !(!strncmp(x_str, "water", 5)
|| !strncmp(x_str, "ice", 3)
|| !strncmp(x_str, "lava", 4)
|| !strncmp(x_str, "swamp", 5)
|| !strncmp(x_str, "molten", 6)
|| !strncmp(x_str, "shallow", 7)
|| !strncmp(x_str, "limitless", 9));
|| !strncmp(x_str, "limitless", 9)
/* ice while hallucinating */
|| !strncmp(x_str, "frozen", 6)
/* thawing ice ("solid ice", "thin ice", &c) */
|| ((p = strchr(x_str, ' ')) != 0 && !strcmpi(p, " ice"))
);
}
if (!found) {
@@ -1124,9 +1130,9 @@ add_cmap_descr(
Sprintf(out_str, "%sa trap", prefix);
*hit_trap = TRUE;
} else {
Sprintf(out_str, "%s%s", prefix,
article == 2 ? the(x_str)
: article == 1 ? an(x_str) : x_str);
Sprintf(out_str, "%s%s", prefix, (article == 2) ? the(x_str)
: (article == 1) ? an(x_str)
: x_str);
}
*firstmatch = x_str;
found = 1;
@@ -1226,6 +1232,7 @@ do_screen_description(
if (x_str == unreconnoitered)
goto didlook;
}
check_monsters:
/* Check for monsters */
if (!iflags.terrainmode || (iflags.terrainmode & TER_MON) != 0) {
@@ -1282,8 +1289,8 @@ do_screen_description(
if (sym == DEF_INVISIBLE) {
/* for active clairvoyance, use alternate "unseen creature" */
boolean usealt = (EDetect_monsters & I_SPECIAL) != 0L;
const char *unseen_explain = usealt ? altinvisexplain
: Blind ? altinvisexplain : invisexplain;
const char *unseen_explain = (usealt || Blind) ? altinvisexplain
: invisexplain;
if (!found) {
Sprintf(out_str, "%s%s", prefix, an(unseen_explain));