Merge branch 'master' into derek-farming
Reverse merge before final reintegration. * master: (40 commits) Fix magic mapped dark room symbols Disclose extinct species alongside genocided ones ... Conflicts: doc/fixes35.0 src/do.c src/files.c src/invent.c src/objnam.c sys/share/pcmain.c
This commit is contained in:
Derek S. Ray
@@ -1952,6 +1952,8 @@ new players if it detects some anticipated mistakes (default on).
|
||||
.lp "confirm "
|
||||
Have user confirm attacks on pets, shopkeepers, and other
|
||||
peaceable creatures (default on).
|
||||
.lp dark_room
|
||||
Show out-of-sight areas of lit rooms (default off).
|
||||
.lp disclose
|
||||
Controls what information the program reveals when the game ends.
|
||||
Value is a space separated list of prompting/category pairs
|
||||
@@ -2051,6 +2053,9 @@ An obsolete synonym for ``gender:male''.
|
||||
Cannot be set with the `O' command.
|
||||
.lp mention_walls
|
||||
Give feedback when walking against a wall (default off).
|
||||
.lp menucolors
|
||||
Enable coloring menu lines (default off).
|
||||
See ``Configuring Menu Colors'' on how to configure the colors.
|
||||
.lp menustyle
|
||||
Controls the interface used when you need to choose various objects (in
|
||||
response to the Drop command, for instance). The value specified should
|
||||
@@ -2321,6 +2326,19 @@ the appearance of the display, not the way the game treats you.
|
||||
Show your approximate accumulated score on bottom line (default off).
|
||||
.lp "silent "
|
||||
Suppress terminal beeps (default on).
|
||||
.lp sortloot
|
||||
Controls the sorting behavior of the pickup lists for inventory
|
||||
and #loot commands and some others.
|
||||
The possible values are:
|
||||
.PS full
|
||||
.PL full
|
||||
always sort the lists;
|
||||
.PL loot
|
||||
only sort the lists that don't use inventory letters, like with
|
||||
the #loot and pickup commands;
|
||||
.PL none
|
||||
show lists the traditional way without sorting.
|
||||
.PE
|
||||
.lp sortpack
|
||||
Sort the pack contents by type when displaying inventory (default on).
|
||||
.lp sparkle
|
||||
@@ -2604,6 +2622,56 @@ The second example results in the exclusion of any corpse from autopickup.
|
||||
The last example results in the exclusion of items known to be cursed from
|
||||
autopickup.
|
||||
.hn 2
|
||||
Configuring Menu Colors
|
||||
.pg
|
||||
Some platforms allow you to define colors used in menu lines when the
|
||||
line matches a user-defined pattern. At this time the tty, win32tty and
|
||||
win32gui support this.
|
||||
.pg
|
||||
In general, the config file entries to configure the menu color mappings
|
||||
look like this:
|
||||
.si
|
||||
.lp MENUCOLOR="pattern"=color&attribute
|
||||
.ei
|
||||
.PS "menu color"
|
||||
.PL pattern
|
||||
the pattern to match;
|
||||
.PL color
|
||||
the color to use for lines matching the pattern;
|
||||
.PL attribute
|
||||
the attribute to use for lines matching the pattern. The attribute is
|
||||
optional, and if left out, you must also leave out the preceding ampersand.
|
||||
If no attribute is defined, no attribute is used.
|
||||
.PE
|
||||
.lp ""
|
||||
For explanation on pattern format and the matching routines, see
|
||||
the pattern in the ``Configuring User Sounds'' -section.
|
||||
.lp ""
|
||||
Allowed colors are black, red, green, brown, blue, magenta, cyan, gray,
|
||||
orange, lightgreen, yellow, lightblue, lightmagenta, lightcyan, and white.
|
||||
.lp ""
|
||||
Allowed attributes are none, bold, dim, underline, blink, and inverse.
|
||||
Note that the platform used may interpret the attributes any way it
|
||||
wants.
|
||||
.lp ""
|
||||
Here's an example of menu colors using NetHack's internal
|
||||
pattern matching facility:
|
||||
.sd
|
||||
.si
|
||||
MENUCOLOR="* blessed *"=green
|
||||
MENUCOLOR="* cursed *"=red
|
||||
MENUCOLOR="* cursed *(being worn)"=red&underline
|
||||
.ei
|
||||
.ed
|
||||
specifies that any menu line with " blessed " contained
|
||||
in it will be shown in green color, lines with " cursed " will be
|
||||
shown in red, and lines with " cursed " followed by "(being worn)"
|
||||
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
|
||||
Some platforms allow you to define sound files to be played when a message
|
||||
@@ -2784,6 +2852,7 @@ O S_ogre (ogre)
|
||||
o S_orc (orc)
|
||||
p S_piercer (piercer)
|
||||
^ S_pit (pit)
|
||||
# S_poisoncloud (poison cloud)
|
||||
^ S_polymorph_trap (polymorph trap)
|
||||
} S_pool (water)
|
||||
! S_potion (potion)
|
||||
|
||||
@@ -2363,6 +2363,9 @@ players if it detects some anticipated mistakes (default on).
|
||||
Have user confirm attacks on pets, shopkeepers, and other
|
||||
peaceable creatures (default on).
|
||||
%.lp
|
||||
%.lp
|
||||
\item[\ib{dark\_room}]
|
||||
Show out-of-sight areas of lit rooms (default off).
|
||||
\item[\ib{disclose}]
|
||||
Controls what information the program reveals when the game ends.
|
||||
Value is a space separated list of prompting/category pairs
|
||||
@@ -2479,6 +2482,10 @@ An obsolete synonym for ``{\tt gender:male}''. Cannot be set with the
|
||||
\item[\ib{mention\_walls}]
|
||||
Give feedback when walking against a wall (default off).
|
||||
%.lp
|
||||
\item[\ib{menucolors}]
|
||||
Enable coloring menu lines (default off).
|
||||
See ``{\it Configuring Menu Colors\/}'' on how to configure the colors.
|
||||
%.lp
|
||||
\item[\ib{menustyle}]
|
||||
Controls the interface used when you need to choose various objects (in
|
||||
response to the Drop command, for instance). The value specified should
|
||||
@@ -2785,6 +2792,20 @@ Show your approximate accumulated score on bottom line (default off).
|
||||
\item[\ib{silent}]
|
||||
Suppress terminal beeps (default on).
|
||||
%.lp
|
||||
\item[\ib{sortloot}]
|
||||
Controls the sorting behavior of pickup lists for inventory
|
||||
and \#loot commands and some others.
|
||||
|
||||
The possible values are:
|
||||
%.sd
|
||||
%.si
|
||||
{\tt full} --- always sort the lists;\\
|
||||
{\tt loot} --- only sort the lists that don't use inventory
|
||||
letters, like with the \#loot and pickup commands;\\
|
||||
{\tt none} --- show lists the traditional way without sorting.
|
||||
%.ei
|
||||
%.ed
|
||||
%.lp
|
||||
\item[\ib{sortpack}]
|
||||
Sort the pack contents by type when displaying inventory (default on).
|
||||
%.lp
|
||||
@@ -3141,6 +3162,71 @@ The second example results in the exclusion of any corpse from autopickup.
|
||||
The last example results in the exclusion of items known to be cursed from
|
||||
autopickup.
|
||||
|
||||
%.lp
|
||||
%.hn 2
|
||||
\subsection*{Configuring Menu Colors}
|
||||
|
||||
%.pg
|
||||
Some platforms allow you to define colors used in menu lines when the
|
||||
line matches a user-defined pattern. At this time the tty, win32tty and
|
||||
win32gui support this.
|
||||
|
||||
%.pg
|
||||
In general, the config file entries to configure the menu color mappings
|
||||
look like this:
|
||||
\begin{verbatim}
|
||||
MENUCOLOR="pattern"=color&attribute
|
||||
\end{verbatim}
|
||||
|
||||
\blist{}
|
||||
%.lp
|
||||
\item[\ib{pattern}]
|
||||
the pattern to match;
|
||||
%.lp
|
||||
\item[\ib{color}]
|
||||
the color to use for lines matching the pattern;
|
||||
%.lp
|
||||
\item[\ib{attribute}]
|
||||
the attribute to use for lines matching the pattern. The attribute is
|
||||
optional, and if left out, you must also leave out the preceding ampersand.
|
||||
If no attribute is defined, no attribute is used.
|
||||
\elist
|
||||
|
||||
%.lp ""
|
||||
For explanation on pattern format and the matching routines, see
|
||||
the pattern in the {\it Configuring User Sounds} -section.
|
||||
|
||||
%.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 ""
|
||||
Allowed attributes are {\it none}, {\it bold}, {\it dim}, {\it underline},
|
||||
{\it blink}, and {\it inverse}.
|
||||
Note that the platform used may interpret the attributes any way it
|
||||
wants.
|
||||
|
||||
%.lp ""
|
||||
Here's an example of menu colors using NetHack's internal
|
||||
pattern matching facility:
|
||||
|
||||
\begin{verbatim}
|
||||
MENUCOLOR="* blessed *"=green
|
||||
MENUCOLOR="* cursed *"=red
|
||||
MENUCOLOR="* cursed *(being worn)"=red&underline
|
||||
\end{verbatim}
|
||||
|
||||
specifies that any menu line with " blessed " contained
|
||||
in it will be shown in green color, lines with " cursed " will be
|
||||
shown in red, and lines with " cursed " followed by "(being worn)"
|
||||
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
|
||||
\subsection*{Configuring User Sounds}
|
||||
@@ -3343,6 +3429,7 @@ Default & Symbol Name & Description\\
|
||||
\verb@o@ & S\_orc & (orc)\\
|
||||
\verb@p@ & S\_piercer & (piercer)\\
|
||||
\verb@^@ & S\_pit & (pit)\\
|
||||
\verb@#@ & S\_poisoncloud & (poison cloud)\\
|
||||
\verb@^@ & S\_polymorph\_trap & (polymorph trap)\\
|
||||
\verb@}@ & S\_pool & (water)\\
|
||||
\verb@!@ & S\_potion & (potion)\\
|
||||
|
||||
@@ -887,13 +887,13 @@ show object symbols in menu headings in menus where those object symbols
|
||||
act as menu accelerators, toggleable via "menu_objsyms" option
|
||||
show t-shirt text at end of game inventory disclose
|
||||
hitting with a polearm remembers the position of the last monster you hit
|
||||
allow showing legal polearm positions when asked for location to hit
|
||||
add messages for trying to pick up some terrain features
|
||||
boomerang makes noise when hitting a sink
|
||||
non-pet rust monsters would eat rust-proofed non-digestibles but ignore
|
||||
those non-digestibles otherwise
|
||||
kicking a grave may topple the gravestone
|
||||
allow showing legal jumping positions when asked for location to jump to
|
||||
allow showing legal positions for stinking cloud, jumping and polearms
|
||||
when asked for a location
|
||||
cloned creatures (of any type) don't deathdrop items
|
||||
pudding corpses behave somewhat differently than before
|
||||
|
||||
@@ -1114,6 +1114,7 @@ show more explicit reason why player was helpless at death
|
||||
added new hallucinatory-only gods
|
||||
options to create the character blind or nudist
|
||||
moving clouds on the plane of air
|
||||
disclose extinct species alongside genocided ones
|
||||
|
||||
|
||||
Platform- and/or Interface-Specific New Features
|
||||
@@ -1134,6 +1135,7 @@ smartphone: added "Type Cmd" command that allows to type arbitrary commands
|
||||
smartphone: added Q(quiver) command to "Attack" layout
|
||||
smartphone: fixed F command to prompt for direction
|
||||
unix,vms: altmeta option to handle terminals which send "ESC c" for Alt+c
|
||||
tty,win32gui,win32tty: add menucolors
|
||||
|
||||
|
||||
NetHack Community Patches (or Variation) Included
|
||||
@@ -1152,6 +1154,8 @@ adopt/adapt/improve the Paranoid_Quit patch; default is paranoid_confirm:pray
|
||||
adopt/adapt/improve Dungeon Overview
|
||||
Aardvark Joe's Extended Logfile
|
||||
Michael Deutschmann's use_darkgray
|
||||
Clive Crous' dark_room
|
||||
sortloot by Jeroen Demeyer and Jukka Lahtinen
|
||||
|
||||
|
||||
Code Cleanup and Reorganization
|
||||
|
||||
Reference in New Issue
Block a user