From c7c5895ad3b1072ac9a8e4b569279a624d16cd14 Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 1 Jun 2015 21:41:00 -0400 Subject: [PATCH] ready for testing Changes to be committed: modified: doc/Guidebook.mn modified: doc/Guidebook.tex modified: include/config.h modified: win/tty/wintty.c --- doc/Guidebook.mn | 54 +++++++++++++++++++++- doc/Guidebook.tex | 111 +++++++++++++++++++++++++++------------------- include/config.h | 8 ++-- win/tty/wintty.c | 2 +- 4 files changed, 123 insertions(+), 52 deletions(-) diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 06097ca17..a16e2b1ba 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -5,7 +5,7 @@ .ds vr "NetHack 3.6 .ds f0 "\*(vr .ds f1 -.ds f2 "May 31, 2015 +.ds f2 "June 1, 2015 .\" labeled paragraph start (should be part of tmac.n, but I don't want to .\" make changes to that file) .\" .PS word @@ -2368,6 +2368,9 @@ Display a sparkly effect when a monster (including yourself) is hit by an attack to which it is resistant (default on). .lp standout Boldface monsters and ``\fB--More--\fP'' (default off). +.lp statuscolors +Enable coloring of status fields (default off). +See ``Configuring Status Hilites'' for futher information. .lp suppress_alert This option may be set to a NetHack version level to suppress alert notification messages about feature changes for that @@ -2736,7 +2739,6 @@ on the same line will be shown in red color and underlined. You can have multiple MENUCOLOR entries in your config file, and the last MENUCOLOR-line in your config file that matches a menu line will be used for the line. -.pg .hn 2 Configuring User Sounds .pg @@ -2766,6 +2768,54 @@ the volume to be set while playing the sound file. The pattern should be a POSIX extended regular expression. .pg .hn 2 +Configuring Status Hilites +.pg +Your copy of NetHack may have been compiled with support for {\tStatus Hilites}. +If so, you can customize your game display by setting thresholds to +change the color or appearance of fields in the status display. +.pg +For example, the following line in your config file will cause +the hitpoints field to display in the color red if your hitpoints +drop to or below a threshold of 30%: +.si +.lp OPTION=hilite_status: hitpoints/30%/red/normal +.ei +.pg +For another example, the following line in your config file will cause +wisdom to be displayed red if it drops and green if it rises. +.si +.lp OPTION=hilite_status: wisdom/updown/red/green +.ei +You can adjust the display of the following status fields: +.TS S +center; +c c c. +.\"TABLE_START +title strength dexterity +constitution intelligence wisdom +charisma alignment score +carrying-capacity gold power +power-max experience-level armor-class +HD time hunger +hitpoints hitpoints-max dungeon-level +experience condition +.\"TABLE_END Do not delete this line. +.TE +.lp "" +Allowed colors are black, red, green, brown, blue, magenta, cyan, gray, +orange, lightgreen, yellow, lightblue, lightmagenta, lightcyan, and white. +.lp "" +Allowed attributes are bold, inverse, normal. +Note that the platform used may interpret the attributes any way it +wants. +.lp "" +Behaviours can occur based on percentage thresholds, updown, or absolute values. +The in-game options menu can help you determine the correct syntax for a +config file. +.lp "" +The whole feature can be disable by setting option {\itstatuscolors} off. +.pg +.hn 2 Modifying NetHack Symbols .pg NetHack can load entire symbol sets from the symbol file. diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 80cbac507..ff45a5400 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -46,7 +46,7 @@ %.au \author{Original version - Eric S. Raymond\\ (Edited and expanded for 3.6 by Michael Allison, Mike Stephenson)} -\date{May 31, 2015} +\date{June 1, 2015} \maketitle @@ -2839,13 +2839,17 @@ The possible values are: \item[\ib{sortpack}] Sort the pack contents by type when displaying inventory (default on). %.lp -\item[\ib{standout}] -Boldface monsters and ``{\tt --More--}'' (default off). -%.lp \item[\ib{sparkle}] Display a sparkly effect when a monster (including yourself) is hit by an attack to which it is resistant (default on). %.lp +\item[\ib{standout}] +Boldface monsters and ``{\tt --More--}'' (default off). +%.lp +\item[\ib{statuscolors}] +Enable coloring of status fields (default off). +See ``{\it Configuring Status Hilites\/}'' for further information. +%.lp \item[\ib{suppress\_alert}] This option may be set to a NetHack version level to suppress alert notification messages about feature changes for that @@ -3313,7 +3317,6 @@ on the same line will be shown in red color and underlined. You can have multiple MENUCOLOR entries in your config file, and the last MENUCOLOR-line in your config file that matches a menu line will be used for the line. -%.pg %.lp %.hn 2 @@ -3352,6 +3355,64 @@ Each SOUND entry is broken down into the following parts: The pattern should be a regular expression. %.lp +%.hn 2 +\subsection*{Configuring Status Hilites} + +%.pg +Your copy of NetHack may have been compiled with support for {\it Status Hilites}. +If so, you can customize your game display by setting thresholds to +change the color or appearance of fields in the status display. + +For example, the following line in your config file will cause +the hitpoints field to display in the color red if your hitpoints +drop to or below a threshold of 30%: +\begin{verbatim} + OPTION=hilite_status: hitpoints/30%/red/normal +\end{verbatim} +%.pg +For another example, the following line in your config file will cause +wisdom to be displayed red if it drops and green if it rises. +\begin{verbatim} + OPTION=hilite_status: wisdom/updown/red/green +\end{verbatim} +You can adjust the display of the following status fields: +%.sd +\begin{center} +\begin{tabular}{lll} +%TABLE_START +title & strength & dexterity\\ +constitution & intelligence & wisdom\\ +charisma & alignment & score\\ +carrying-capacity & gold & power\\ +power-max & experience-level & armor-class\\ +HD & time & hunger\\ +hitpoints & hitpoints-max & dungeon-level\\ +experience & condition\\ +%TABLE_END Do not delete this line. +\end{tabular} +\end{center} +%.ed + +%.lp "" +Allowed behaviors are {\it updown}, {\it percentage}, {\it absolute}, {\it brown}, +{\it blue}, {\it magenta}, {\it cyan}, {\it gray}, {\it orange}, +{\it lightgreen}, {\it yellow}, {\it lightblue}, {\it lightmagenta}, +{\it lightcyan}, and {\it white}. + +%.lp "" +Allowed colors are {\it black}, {\it red}, {\it green}, {\it brown}, +{\it blue}, {\it magenta}, {\it cyan}, {\it gray}, {\it orange}, +{\it lightgreen}, {\it yellow}, {\it lightblue}, {\it lightmagenta}, +{\it lightcyan}, and {\it white}. + +%.lp "" +Behaviours can occur based on percentage thresholds, updown, or absolute values. +The in-game options menu can help you determine the correct syntax for a +config file. + +%.lp "" +The whole feature can be disable by setting option {\it statuscolors} off.%.lp + %.hn 2 \subsection*{Modifying NetHack Symbols} @@ -4134,46 +4195,6 @@ Hao-yang Wang & Michael Sokolov & Tom West\\ Helge Hafting & Mike Engber & Warren Cheung\\ Irina Rempt-Drijfhout & Mike Gallop & Warwick Allison\\ Izchak Miller & Mike Passaretti & Yitzhak Sapir ---Guidebook.mn-- -Adam Aronow J. Ali Harlow Mike Stephenson -Alex Kompel Janet Walz Mikko Juola -Andreas Dorn Janne Salmijarvi Norm Meluch -Andy Church Jean-Christophe Collet Olaf Seibert -Andy Swanson Jeff Bailey Pasi Kallinen -Ari Huttunen Jochen Erwied Pat Rankin -Barton House John Kallen Paul Winner -Benson I. Margulies John Rupley Pierre Martineau -Bill Dyer John S. Bien Ralf Brown -Boudewijn Waijers Johnny Lee Ray Chason -Bruce Cox Jon W{tte Richard Addison -Bruce Holloway Jonathan Handler Richard Beigel -Bruce Mewborne Joshua Delahunty Richard P. Hughey -Carl Schelin Keizo Yamamoto Rob Menke -Chris Russo Ken Arnold Robin Bandy -David Cohrs Ken Arromdee Robin Johnson -David Damerell Ken Lorber Roderick Schertler -David Gentzel Ken Washikita Roland McGrath -David Hairston Kevin Darcy Ron Van Iwaarden -Dean Luick Kevin Hugo Ronnen Miller -Del Lamb Kevin Sitze Ross Brown -Derek S. Ray Kevin Smolkowski Sascha Wostmann -Deron Meranda Kevin Sweet Scott Bigham -Dion Nicolaas Lars Huttar Scott R. Turner -Dylan O'Donnell Leon Arnott Sean Hunt -Eric Backus M. Drew Streib Stephen Spackman -Eric Hendrickson Malcolm Ryan Stefan Thielscher -Eric R. Smith Mark Gooderum Stephen White -Eric S. Raymond Mark Modrall Steve Creps -Erik Andersen Marvin Bressler Steve Linhart -Frederick Roeber Matthew Day Steve VanDevender -Gil Neiger Merlyn LeRoy Teemu Suikki -Greg Laskin Michael Allison Tim Lennan -Greg Olson Michael Feir Timo Hakulinen -Gregg Wonderly Michael Hamel Tom Almy -Hao-yang Wang Michael Sokolov Tom West -Helge Hafting Mike Engber Warren Cheung -Irina Rempt-Drijfhout Mike Gallop Warwick Allison -Izchak Miller Mike Passaretti Yitzhak Sapir %TABLE_END Do not delete this line. \end{tabular} \end{center} diff --git a/include/config.h b/include/config.h index 9e1fdd72a..b266baf00 100644 --- a/include/config.h +++ b/include/config.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 config.h $NHDT-Date: 1432512777 2015/05/25 00:12:57 $ $NHDT-Branch: master $:$NHDT-Revision: 1.87 $ */ +/* NetHack 3.6 config.h $NHDT-Date: 1433209251 2015/06/02 01:40:51 $ $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.88 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -431,10 +431,10 @@ typedef unsigned char uchar; * bugs left here. */ -/* #define STATUS_VIA_WINDOWPORT */ /* re-work of the status line updating - process */ -/* #define STATUS_HILITES */ /* support hilites of status fields */ +#define STATUS_VIA_WINDOWPORT /* re-work of the status line updating process */ +#define STATUS_HILITES /* support hilites of status fields */ /* #define WINCHAIN*/ /* stacked window systems */ + /* End of Section 5 */ #include "global.h" /* Define everything else according to choices above */ diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 1ea92f516..46094259e 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 wintty.c $NHDT-Date: 1433201840 2015/06/01 23:37:20 $ $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.100 $ */ +/* NetHack 3.6 wintty.c $NHDT-Date: 1433209190 2015/06/02 01:39:50 $ $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.101 $ */ /* Copyright (c) David Cohrs, 1991 */ /* NetHack may be freely redistributed. See license for details. */ -- 2.40.0