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

hilite_status title when polymorphed

Browse Source 
Make a 'textmatch' rule for title that matches a specific monster type
while polymorphed take precedence over a "none of the above" one.
This commit is contained in:
PatR
2018-05-22 19:23:03 -07:00
parent cb02e77589
commit 645e1ac5b3
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/botl.c
+12 -6
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 botl.c $NHDT-Date: 1527010852 2018/05/22 17:40:52 $ $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.100 $ */ /* NetHack 3.6 botl.c $NHDT-Date: 1527042178 2018/05/23 02:22:58 $ $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.101 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */ /*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1316,7 +1316,7 @@ noneoftheabove(hl_text)
const char *hl_text; const char *hl_text;
{ {
if (fuzzymatch(hl_text, "none of the above", "\" -_", TRUE) if (fuzzymatch(hl_text, "none of the above", "\" -_", TRUE)
|| fuzzymatch(hl_text, "(polymorphed)", "()", TRUE) || fuzzymatch(hl_text, "(polymorphed)", "\"()", TRUE)
|| fuzzymatch(hl_text, "none of the above (polymorphed)", || fuzzymatch(hl_text, "none of the above (polymorphed)",
"\" -_()", TRUE)) "\" -_()", TRUE))
return TRUE; return TRUE;
@@ -1492,10 +1492,16 @@ int *colorptr;
txtstr = blstats[idx][fldidx].val; txtstr = blstats[idx][fldidx].val;
if (fldidx == BL_TITLE) if (fldidx == BL_TITLE)
txtstr += (strlen(plname) + sizeof " the " - sizeof ""); txtstr += (strlen(plname) + sizeof " the " - sizeof "");
if (hl->rel == TXT_VALUE && hl->textmatch[0] if (hl->rel == TXT_VALUE && hl->textmatch[0]) {
&& (fuzzymatch(hl->textmatch, txtstr, "\" -_", TRUE) if (fuzzymatch(hl->textmatch, txtstr, "\" -_", TRUE)) {
|| (Upolyd && noneoftheabove(hl->textmatch)))) { merge_bestcolor(&bestcolor, hl->coloridx);
merge_bestcolor(&bestcolor, hl->coloridx); exactmatch = TRUE;
} else if (exactmatch) {
; /* already found best fit, skip "noneoftheabove" */
} else if (fldidx == BL_TITLE
&& Upolyd && noneoftheabove(hl->textmatch)) {
merge_bestcolor(&bestcolor, hl->coloridx);
}
} }
break; break;
case BL_TH_ALWAYS_HILITE: case BL_TH_ALWAYS_HILITE: