Merge branch 'NetHack-3.6.2'

This commit is contained in:
nhmall
2018-09-28 20:01:41 -04:00
13 changed files with 168 additions and 89 deletions

View File

@@ -21,7 +21,7 @@
.ds vr "NetHack 3.6
.ds f0 "\*(vr
.ds f1
.ds f2 "August 30, 2018
.ds f2 "September 26, 2018
.
.\" labeled paragraph start (should be part of tmac.n, but I don't want to
.\" make changes to that file)
@@ -1121,10 +1121,6 @@ and go directly to removing a saddle.
Default key is 'M-l', and 'l' if
.op number_pad
is on.
.lp #monpolycontrol
Control monster polymorphs.
Autocompletes.
Debug mode only.
.lp #monster
Use a monster's special ability (when polymorphed into monster form).
Autocompletes. Default key is 'M-m'.
@@ -1316,14 +1312,10 @@ Show what type of thing a symbol corresponds to. Default key is '/'.
Wield a weapon. Default key is 'w'.
.lp #wipe
Wipe off your face. Autocompletes. Default key is 'M-w'.
.lp #wizdebug_bury
.lp #wizbury
Bury objects under and around you.
Autocompletes.
Debug mode only.
.lp #wizdebug_traveldisplay
Toggle travel display.
Autocompletes.
Debug mode only.
.lp #wizdetect
Search for hidden things (secret doors or traps or unseen monsters)
within a modest radius.
@@ -2895,6 +2887,13 @@ Default '.'.
Menu character accelerator to select all items on this page of a menu.
Implemented by the Amiga, Gem and tty ports.
Default ','.
." .lp menu_tab_sep
." Format menu entries using TAB to separate columns (default off).
." Only applicable to some menus, and only useful to some interfaces.
." Debug mode only.
.lp monpolycontrol
Prompt for new form whenever any monster changes shape (default off).
Debug mode only.
.lp msghistory
The number of top line messages to save (and recall with ^P) (default 20).
Cannot be set with the `O' command.
@@ -3100,6 +3099,9 @@ used `teleport' only. Whether or not the effect is noticeable will
depend upon the window port used or on the type of terminal. Persistent.
.lp safe_pet
Prevent you from (knowingly) attacking your pets (default on). Persistent.
.lp sanity_check
Evaluate monsters, objects, and map prior to each turn (default off).
Debug mode only.
.lp scores
Control what parts of the score list you are shown at the end (ex.
``scores:5 top scores/4 around my score/own scores''). Only the first
@@ -3172,6 +3174,9 @@ the score list around after game end on a terminal or emulating window.
Allow the travel command (default on). Turning this option off will
prevent the game from attempting unintended moves if you make inadvertent
mouse clicks on the map window. Persistent.
." .lp travel_debug
." Display intended path during each step of travel (default off).
." Debug mode only.
.lp verbose
Provide more commentary during the game (default on). Persistent.
.lp whatis_coord
@@ -3227,6 +3232,9 @@ move by skipping the same glyphs.
Select which windowing system to use, such as ``tty'' or ``X11''
(default depends on version).
Cannot be set with the `O' command.
.lp wizweight
Augment object descriptions with their objects' weight (default off).
Debug mode only.
.lp zerocomp
When writing out a save file, perform zero-comp compression of the
contents. Not all ports support zero-comp compression. It has no effect
@@ -4597,7 +4605,7 @@ again to \fBM. Drew Streib\fP and \fBPasi Kallinen\fP for providing a
public NetHack server at nethack.alt.org. Thanks to \fBKeith Simpson\fP
and \fBAndy Thomson\fP for hardfought.org. Thanks to all those
unnamed dungeoneers who invest their time and effort into annual
NetHack tournaments such as Junehack and in days past,
NetHack tournaments such as Junethack and in days past,
devnull.net (gone for now, but not forgotten).
.pg
.ce

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{August 30, 2018}
\date{September 26, 2018}
\maketitle
@@ -1244,11 +1244,6 @@ Default key is '{\tt M-l}', and '{\tt l}' if {\it number\verb+_+pad\/} is on.
Precede with the `{\tt m}' prefix to skip containers at your location
and go directly to removing a saddle.
%.lp
\item[\tb{\#monpolycontrol}]
Control monster polymorphs.
Autocompletes.
Debug mode only.
%.lp
\item[\tb{\#monster}]
Use a monster's special ability (when polymorphed into monster form).
Autocompletes. Default key is '{\tt M-m}'.
@@ -1494,16 +1489,11 @@ Wield a weapon. Default key is '{\tt w}'.
\item[\tb{\#wipe}]
Wipe off your face. Autocompletes. Default key is '{\tt M-w}'.
%.lp
\item[\tb{\#wizdebug\verb+_+bury}]
\item[\tb{\#wizbury}]
Bury objects under and around you.
Autocompletes.
Debug mode only.
%.lp
\item[\tb{\#wizdebug\verb+_+traveldisplay}]
Toggle travel display.
Autocompletes.
Debug mode only.
%.lp
\item[\tb{\#wizdetect}]
Search for hidden things (secret doors or traps or unseen monsters)
within a modest radius.
@@ -3370,6 +3360,15 @@ Default `.'.
Menu character accelerator to select all items on this page of a menu.
Implemented by the Amiga, Gem and tty ports.
Default `,'.
% %.lp
% \item[\ib{menu\verb+_+tab\verb+_+sep}]
% Format menu entries using TAB to separate columns (default off).
% Only applicable to some menus, and only useful to some interfaces.
% Debug mode only.
%.lp
\item[\ib{monpolycontrol}]
Prompt for new form whenever any monster changes shape (default off).
Debug mode only.
%.lp
\item[\ib{msghistory}]
The number of top line messages to save (and recall with `{\tt \^{}P}')
@@ -3608,6 +3607,10 @@ depend upon the window port used or on the type of terminal. Persistent.
%.lp
\item[\ib{safe\verb+_+pet}]
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.
%.lp
\item[\ib{scores}]
Control what parts of the score list you are shown at the end (ex.\
@@ -3698,6 +3701,10 @@ the score list around after game end on a terminal or emulating window.
Allow the travel command (default on). Turning this option off will
prevent the game from attempting unintended moves if you make inadvertent
mouse clicks on the map window. Persistent.
% %.lp
% \item[ib{travel\verb+_+debug}]
% Display intended path during each step of travel (default off).
% Debug mode only.
%.lp
\item[\ib{verbose}]
Provide more commentary during the game (default on). Persistent.
@@ -3766,6 +3773,10 @@ Select which windowing system to use, such as ``{\tt tty}'' or ``{\tt X11}''
(default depends on version).
Cannot be set with the `{\tt O}' command.
%.lp
\item[\ib{wizweight}]
Augment object descriptions with their objects' weight (default off).
Debug mode only.
%.lp
\item[\ib{zerocomp}]
When writing out a save file, perform zero-comp compression of the
contents. Not all ports support zero-comp compression. It has no effect

View File

@@ -5731,7 +5731,7 @@
NetHack server at nethack.alt.org. Thanks to Keith Simpson and
Andy Thomson for hardfought.org. Thanks to all those unnamed dun-
geoneers who invest their time and effort into annual NetHack
tournaments such as Junehack and in days past, devnull.net (gone
tournaments such as Junethack and in days past, devnull.net (gone
for now, but not forgotten).

View File

@@ -168,6 +168,8 @@ tty: turn off an optimization that is the suspected cause of Windows reported
tty: ensure that current status fields are always copied to prior status
values so that comparisons are correct
tty: fix an out of bounds error in tty_status_update() for BL_HUNGER case
tty: fix leftover display artifact when last field on the row got smaller
and optimize so only the right-most field requires the cleanup code
X11: its use of genl_status_update exposed a negative index use that could
lead to a segfault
@@ -229,6 +231,9 @@ wizard mode #wizidentify can now select individual items for permanent
identify everything if everything is already fully identified
spiders will occasionally spin webs when moving around
make mine town "orctown" variation a multiple level feature of the mines
replace #monpolycontrol command with monpolycontrol boolean option
replace #wizdebug_traveldisplay command with travel_debug boolean option
rename #wizdebug_bury command to #wizbury
Code Cleanup and Reorganization