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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-03-21 18:18:34 -04:00
parent 5a7d780db6 bd3a61597d
commit c3b89f775e
10 changed files with 336 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
doc/Guidebook.mn
View File

@@ -1,4 +1,4 @@
.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.299 $ $NHDT-Date: 1551488947 2019/03/02 01:09:07 $
.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.300 $ $NHDT-Date: 1553204011 2019/03/21 21:33:31 $
.\"
.\" This is an excerpt from the 'roff' man page from the 'groff' package.
.\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines.
@@ -24,7 +24,7 @@
.ds vr "NetHack 3.6
.ds f0 "\*(vr
.ds f1
.ds f2 "February 27, 2019
.ds f2 "March 19, 2019
.
.\" A note on some special characters:
.\" \(lq = left double quote
@@ -3010,10 +3010,6 @@ Gold is never blessed or cursed, but it is not described as \(lquncursed\(rq
even when the
.op implicit_uncursed
option is \(lqoff\(rq.
.lp guicolor
Use color text and/or highlighting attributes when displaying some
non-map data (such as menu selector letters).
Curses interface only; default is on.
.lp "help "
If more information is available for an object looked at
with the \(oq/\(cq command, ask if you want to see it (default on).
@@ -3281,6 +3277,7 @@ such as \(lqparanoid_confirmation:attack pray Remove\(rq.
.lp perm_invent
If true, always display your current inventory in a window. This only
makes sense for windowing system interfaces that implement this feature.
.\" petattr is a wincap option but we'll document it here...
.lp petattr
Specifies one or more text highlighting attributes to use when showing
pets on the map.
@@ -3308,7 +3305,7 @@ Currently multiple highlight-style letters can be combined by simply
stringing them together (for example, \(lqbk\(rq), but in the future
they might require being separated by plus signs (such as \(lqb+k\(rq,
which works already).
When using the \(oqN\(cq choice, it should be specified on its own,
When using the \(oqn\(cq choice, it should be specified on its own,
not in combination with any of the other letters.
.lp pettype
Specify the type of your initial pet, if you are playing a character class
@@ -3473,13 +3470,6 @@ and prior versions (for example \(lqsuppress_alert:3.3.1\(rq).
This option may be used to select one of the named symbol sets found within
\(lqsymbols\(rq to alter the symbols displayed on the screen.
Use \(lqsymset:default\(rq to explicitly select the default symbols.
.lp "term_cols\ \ \fIand\fP"
.lp term_rows
Curses interface only.
Number of columns and rows to use for the display.
Curses will attempt to resize to the values specified but will settle
for smaller sizes if they are too big.
Default is the current window size.
.lp "time "
Show the elapsed game time in turns on bottom line (default off).
Persistent.
@@ -3554,26 +3544,20 @@ When getting a location on the map, and using shifted movement keys or
meta-digit keys to fast-move, instead of moving 8 units at a time,
move by skipping the same glyphs.
(default off)
.lp windowborders
Whether to draw boxes around the map, status area, message area, and
persistent inventory window if enabled.
Curses interface only.
Acceptable values are
.sd
.si
.CC 1 "on, always show borders"
.CC 2 "off, never show borders"
.CC 3 "auto, on if terminal or window is at least (24+2)x(80+2)\ \ (default)"
.ei
.ed
.lp ""
(The 26x82 size threshold for \(oq3\(cq refers to number of rows and
columns of the display.)
.lp windowtype
When the program has been built to support multiple interfaces,
select which one to use, such as \(lqtty\(rq or \(lqX11\(rq
(default depends on build-time settings; use \(lq#version\(rq to check).
Cannot be set with the \(oqO\(cq command.
.lp ""
When used, it should be the first option set since its value might
enable or disable the availability of various other options.
For multiple lines in a configuration file, that would be the first
non-comment line.
For a comma-separated list in NETHACKOPTIONS or an OPTIONS line in a
configuration file,
that would
be the \fIrightmost\fP option in the list.
.lp wizweight
Augment object descriptions with their objects' weight (default off).
Debug mode only.
@@ -3634,6 +3618,10 @@ If NetHack can, it should use this size font for text windows.
.lp fullscreen
If NetHack can, it should try and display on the entire screen rather than
in a window.
.lp guicolor
Use color text and/or highlighting attributes when displaying some
non-map data (such as menu selector letters).
Curses interface only; default is on.
.lp large_font
If NetHack can, it should use a large font.
.lp map_mode
@@ -3665,6 +3653,17 @@ Handhelds are most likely to support this option.
.lp splash_screen
If NetHack can, it should display an opening splash screen when it starts
up (default yes).
.lp statuslines
Number of lines for traditional below-the-map status display.
Acceptable values are 2 and 3 (default is 2).
Curses interface only.
.lp "term_cols\ \ \fIand\fP"
.lp term_rows
Curses interface only.
Number of columns and rows to use for the display.
Curses will attempt to resize to the values specified but will settle
for smaller sizes if they are too big.
Default is the current window size.
.lp tiled_map
If NetHack can, it should display a tiled map if it can.
.lp tile_file
@@ -3680,6 +3679,24 @@ If NetHack can, it should display inverse when the game specifies it.
.lp vary_msgcount
If NetHack can, it should display this number of messages at a time in
the message window.
.lp windowborders
Whether to draw boxes around the map, status area, message area, and
persistent inventory window if enabled.
Curses interface only.
Acceptable values are
.sd
.si
.CC 0 "off, never show borders"
.CC 1 "on, always show borders"
.CC 2 "auto, on if display is at least (24+2)x(80+2)\ \ (default)"
.ei
.ed
.lp ""
(The 26x82 size threshold for \(oq2\(cq refers to number of rows and
columns of the display.
A width of at least 110 columns (80+2+26+2) is needed for
.op align_status
set to \f(CRleft\fP or \f(CRright\fP.)
.lp windowcolors
If NetHack can, it should display windows with the specified
foreground/background colors. Windows GUI only. The format is

97
doc/Guidebook.tex
View File

@@ -45,7 +45,7 @@
%.au
\author{Original version - Eric S. Raymond\\
(Edited and expanded for 3.6 by Mike Stephenson and others)}
\date{February 27, 2019}
\date{March 19, 2019}
\maketitle
@@ -3305,11 +3305,6 @@ or {\tt U} (known to be uncursed, when `off', the default).
Gold is never blessed or cursed, but it is not described as ``uncursed''
even when the {\it implicit\verb+_+uncursed\/} option is `off'.
%.lp
\item[\ib{guicolor}]
Use color text and/or highlighting attributes when displaying some
non-map data (such as menu selector letters).
Curses interface only; default is on.
%.lp
\item[\ib{help}]
If more information is available for an object looked at
with the `{\tt /}' command, ask if you want to see it (default on).
@@ -3614,6 +3609,7 @@ such as ``{\it par\-a\-noid\verb+_+con\-fir\-ma\-tion:attack~pray~Remove}''.
If true, always display your current inventory in a window. This only
makes sense for windowing system interfaces that implement this feature.
%.lp
%.\" petattr is a wincap option but we'll document it here...
\item[\ib{petattr}]
Specifies one or more text highlighting attributes to use when showing
pets on the map.
@@ -3642,7 +3638,7 @@ Currently multiple highlight-style letters can be combined by simply
stringing them together (for example, ``bk''), but in the future
they might require being separated by plus signs (such as ``b\verb&+&k'',
which works already).
When using the `N' choice, it should be specified on its own,
When using the `n' choice, it should be specified on its own,
not in combination with any of the other letters.
%.lp
@@ -3754,8 +3750,8 @@ depend upon the window port used or on the type of terminal. Persistent.
Prevent you from (knowingly) attacking your pets (default on). Persistent.
%+.lp
\item[\ib{sanity\verb+_+check}]
+Evaluate monsters, objects, and map prior to each turn (default off).
+Debug mode only.
Evaluate monsters, objects, and map prior to each turn (default off).
Debug mode only.
%.lp
\item[\ib{scores}]
Control what parts of the score list you are shown at the end (for example,
@@ -3823,15 +3819,6 @@ This option may be used to select one of the named symbol sets found within
{\tt symbols} to alter the symbols displayed on the screen.
Use ``{\tt symset:default}'' to explicitly select the default symbols.
%.lp
\item[\ib{term\verb+_+cols}\ \ {\it and}]"
%.lp
\item[\ib{term\verb+_+rows}]
Curses interface only.
Number of columns and rows to use for the display.
Curses will attempt to resize to the values specified but will settle
for smaller sizes if they are too big.
Default is the current window size.
%.lp
\item[\ib{time}]
Show the elapsed game time in turns on bottom line (default off). Persistent.
%.lp
@@ -3923,30 +3910,19 @@ meta-digit keys to fast-move, instead of moving 8 units at a time,
move by skipping the same glyphs.
(default off)
%.lp
\item[\ib{windowborders}]
Whether to draw boxes around the map, status area, message area, and
persistent inventory window if enabled.
Curses interface only.
Acceptable values are
%.sd
%.si
{\tt 1} --- on, always show borders\\
{\tt 2} --- off, never show borders\\
{\tt 3} --- auto, on if terminal or window is at least
(24\verb&+&2)x(80\verb&+&2)\ \ (default)\\
%.ei
%.ed
%.lp ""
(The 26x82 size threshold for `3' refers to number of rows and
columns of the display.)
%.lp
\item[\ib{windowtype}]
When the program has been built to support multiple interfaces,
select whichone to use, such as ``{\tt tty}'' or ``{\tt X11}''
(default depends on build-time settings; use ``{\tt \#version}'' to check).
Cannot be set with the `{\tt O}' command.
%.lp ""
When used, it should be the first option set since its value might
enable or disable the availability of various other options.
For multiple lines in a configuration file, that would be the first
non-comment line.
For a comma-separated list in NETHACKOPTIONS or an OPTIONS line in a
configuration file, that would be the {\it rightmost\/} option in the list.
%.lp
\item[\ib{wizweight}]
Augment object descriptions with their objects' weight (default off).
@@ -4031,6 +4007,11 @@ If {\it NetHack\/} can, it should use this size font for text windows.
\item[\ib{fullscreen}]
If {\it NetHack\/} can, it should try and display on the entire screen rather than in a window.
%.lp
\item[\ib{guicolor}]
Use color text and/or highlighting attributes when displaying some
non-map data (such as menu selector letters).
Curses interface only; default is on.
%.lp
\item[\ib{large\verb+_+font}]
If {\it NetHack\/} can, it should use a large font.
%.lp
@@ -4063,10 +4044,26 @@ If {\it NetHack\/} can, it should display a menu of existing saved games for the
choose from at game startup, if it can. Not all ports support this option.
%.lp
\item[\ib{softkeyboard}]
If {\it NetHack\/} can, it should display an onscreen keyboard. Handhelds are most likely to support this option.
If {\it NetHack\/} can, it should display an onscreen keyboard.
Handhelds are most likely to support this option.
%.lp
\item[\ib{splash\verb+_+screen}]
If {\it NetHack\/} can, it should display an opening splash screen when it starts up (default yes).
If {\it NetHack\/} can, it should display an opening splash screen when
it starts up (default yes).
%.lp
\item[\ib{statuslines}]
Number of lines for traditional below-the-map status display.
Acceptable values are 2 and 3 (default is 2).
Curses interface only.
%.lp
\item[\ib{term\verb+_+cols}\ \ {\it and}]"
%.lp
\item[\ib{term\verb+_+rows}]
Curses interface only.
Number of columns and rows to use for the display.
Curses will attempt to resize to the values specified but will settle
for smaller sizes if they are too big.
Default is the current window size.
%.lp
\item[\ib{tiled\verb+_+map}]
If {\it NetHack\/} can, it should display a tiled map if it can.
@@ -4090,6 +4087,28 @@ If {\it NetHack\/} can, it should display inverse when the game specifies it.
If {\it NetHack\/} can, it should display this number of messages at a time
in the message window.
%.lp
\item[\ib{windowborders}]
Whether to draw boxes around the map, status area, message area, and
persistent inventory window if enabled.
Curses interface only.
Acceptable values are
%.sd
%.si
{\tt 0} --- off, never show borders\\
{\tt 1} --- on, always show borders\\
{\tt 2} --- auto, on display is at least
(\verb&24+2&)x(\verb&80+2&)\ \ (default)\\
%.ei
%.ed
%.lp "
(The 26x82 size threshold for `2' refers to number of rows and
columns of the display.
A width of at least 110 columns (\verb&80+2+26+2&) is needed for
{\it align_status\/}
set to {tt left} or {\tt right}.)
%.lp
\item[\ib{windowcolors}]
If {\it NetHack\/} can, it should display windows with the specified
foreground/background colors. Windows GUI only. The format is

13
doc/fixes36.2
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.276 $ $NHDT-Date: 1552697495 2019/03/16 00:51:35 $
$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.277 $ $NHDT-Date: 1553204013 2019/03/21 21:33:33 $
This fixes36.2 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.1 in April 2018. Please note, however,
@@ -474,8 +474,8 @@ X11: rollback disabling of keystroke input for PICK_NONE menus (for scrolling)
curses: catch up with tty to not put dolook/whatis autodescribe feedback into
^P message recall (multi-digit count feedback was already handled)
curses: if the interface code ran out of memory, it would crash rather than
attempt a controlled panic (which is fairly likely crash anyway if
done when there's no memory available)
attempt a controlled panic (though that's fairly likely to crash anyway
if done when there's no more memory available)
curses: when getting multi-character responses from player, support <delete>
as well as <backspace> to remove last character entered; also, return
<escape> to core if ESC is typed when there is no input entered
@@ -483,7 +483,14 @@ curses: extend preceding <delete> support to typing of extended command names
curses: support hilite_pet and hilite_pile even when color is disabled
curses: support color hilite_status rules even if 'guicolor' is off
curses: update status if 'O' is used to add/change/remove hilite_status rules
curses: was doing a full status update for every changed field even when more
than one field was being changed at the same time
curses: 'hitpointbar' now works even when status highlighting is disabled
curses: add 'statuslines' option (value is 2 or 3)
curses: change 'windowborders' option's value (0=Off, 1=On, or 2=Auto instead
of 1=On, 2=Off, 3=Auto; can now be changed via 'O' during play)
vms: add compile of isaac64.c to Makefile.src and vmsbuild.com
vms+curses: add compile support but it is known to fail to build
Platform- and/or Interface-Specific Fixes or Features