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

Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6

Browse Source
This commit is contained in:
Bart House
2019-10-31 20:18:41 -07:00
parent 215815c0b5 e33dfed456
commit a57cff45ce
8 changed files with 156 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dat/history
+6 -3
View File
@@ -57,7 +57,7 @@ Spackman, Steve VanDevender, and Paul Winner, ported NetHack 3.1 to the PC.
Jon W{tte and Hao-yang Wang, with help from Ross Brown, Mike Engber, David Jon W{tte and Hao-yang Wang, with help from Ross Brown, Mike Engber, David
Hairston, Michael Hamel, Jonathan Handler, Johnny Lee, Tim Lennan, Rob Menke, Hairston, Michael Hamel, Jonathan Handler, Johnny Lee, Tim Lennan, Rob Menke,
and Andy Swanson developed NetHack 3.1 for the Macintosh, porting it for and Andy Swanson developed NetHack 3.1 for the Macintosh, porting it for
MPW. Building on their development, Barton House added a Think C port. MPW. Building on their development, Bart House added a Think C port.
Timo Hakulinen ported NetHack 3.1 to OS/2. Eric Smith ported NetHack 3.1 Timo Hakulinen ported NetHack 3.1 to OS/2. Eric Smith ported NetHack 3.1
to the Atari. Pat Rankin, with help from Joshua Delahunty, is responsible to the Atari. Pat Rankin, with help from Joshua Delahunty, is responsible
@@ -195,7 +195,7 @@ Unix flavors as well as maintaining the X11 interface.
Ken Lorber, Haoyang Wang, Pat Rankin, and Dean Luick maintained the port Ken Lorber, Haoyang Wang, Pat Rankin, and Dean Luick maintained the port
of NetHack 3.6.1 for Mac OSX. of NetHack 3.6.1 for Mac OSX.
Michael Allison, David Cohrs, Barton House, Pasi Kallinen, Alex Kompel, Michael Allison, David Cohrs, Bart House, Pasi Kallinen, Alex Kompel,
Dion Nicolaas, Derek S. Ray and Yitzhak Sapir maintained the port of Dion Nicolaas, Derek S. Ray and Yitzhak Sapir maintained the port of
NetHack 3.6 for Microsoft Windows. NetHack 3.6 for Microsoft Windows.
@@ -217,6 +217,9 @@ Derek S. Ray, Alex Smith, Mike Stephenson, Janet Walz and Paul Winner.
In early May 2019, another 320 bug fixes along with some enhancements and In early May 2019, another 320 bug fixes along with some enhancements and
the adopted curses window port, were released as 3.6.2. the adopted curses window port, were released as 3.6.2.
Bart House, who had contributed to the game as a porting team participant
for decades, joined the NetHack Development Team in late May 2019.
The official NetHack web site is maintained by Ken Lorber at The official NetHack web site is maintained by Ken Lorber at
http://www.nethack.org/. http://www.nethack.org/.
@@ -241,7 +244,7 @@ of these miscreants in this, the list of Dungeoneers:
Andy Church Jochen Erwied Pat Rankin Andy Church Jochen Erwied Pat Rankin
Andy Swanson John Kallen Patric Mueller Andy Swanson John Kallen Patric Mueller
Ari Huttunen John Rupley Paul Winner Ari Huttunen John Rupley Paul Winner
Barton House John S. Bien Pierre Martineau Bart House John S. Bien Pierre Martineau
Benson I. Margulies Johnny Lee Ralf Brown Benson I. Margulies Johnny Lee Ralf Brown
Bill Dyer Jon W{tte Ray Chason Bill Dyer Jon W{tte Ray Chason
Boudewijn Waijers Jonathan Handler Richard Addison Boudewijn Waijers Jonathan Handler Richard Addison
doc/Guidebook.mn
+10 -5
View File
@@ -1,4 +1,4 @@
.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.318 $ $NHDT-Date: 1572482202 2019/10/31 00:36:42 $ .\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.319 $ $NHDT-Date: 1572525093 2019/10/31 12:31:33 $
.\" .\"
.\" This is an excerpt from the 'roff' man page from the 'groff' package. .\" This is an excerpt from the 'roff' man page from the 'groff' package.
.\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines. .\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines.
@@ -24,7 +24,7 @@
.ds vr "NetHack 3.6 .ds vr "NetHack 3.6
.ds f0 "\*(vr .ds f0 "\*(vr
.ds f1 .ds f1
.ds f2 "October 27, 2019 .ds f2 "October 31, 2019
. .
.\" A note on some special characters: .\" A note on some special characters:
.\" \(lq = left double quote .\" \(lq = left double quote
@@ -2683,7 +2683,9 @@ HACKDIR, must be writable.
.lp TROUBLEDIR .lp TROUBLEDIR
The location that a record of game aborts and self-diagnosed game problems The location that a record of game aborts and self-diagnosed game problems
is kept. Defaults to HACKDIR, must be writable. is kept. Defaults to HACKDIR, must be writable.
.\"
.\" config file entries beyond this point are shown alphabetically .\" config file entries beyond this point are shown alphabetically
.\"
.lp AUTOCOMPLETE .lp AUTOCOMPLETE
Enable or disable an extended command autocompletion. Enable or disable an extended command autocompletion.
Autocompletion has no effect for the X11 windowport. Autocompletion has no effect for the X11 windowport.
@@ -4898,7 +4900,7 @@ and \fBPaul Winner\fP, ported NetHack 3.1 to the PC.
\fBMike Engber\fP, \fBDavid Hairston\fP, \fBMichael Hamel\fP, \fBMike Engber\fP, \fBDavid Hairston\fP, \fBMichael Hamel\fP,
\fBJonathan Handler\fP, \fBJohnny Lee\fP, \fBTim Lennan\fP, \fBRob Menke\fP, \fBJonathan Handler\fP, \fBJohnny Lee\fP, \fBTim Lennan\fP, \fBRob Menke\fP,
and \fBAndy Swanson\fP, developed NetHack 3.1 for the Macintosh, and \fBAndy Swanson\fP, developed NetHack 3.1 for the Macintosh,
porting it for MPW. Building on their development, \fBBarton House\fP porting it for MPW. Building on their development, \fBBart House\fP
added a Think C port. added a Think C port.
.pg .pg
\fBTimo Hakulinen\fP ported NetHack 3.1 to OS/2. \fBEric Smith\fP \fBTimo Hakulinen\fP ported NetHack 3.1 to OS/2. \fBEric Smith\fP
@@ -5057,7 +5059,7 @@ flavors and maintained the X11 interface.
\fBKen Lorber\fP, \fBHaoyang Wang\fP, \fBPat Rankin\fP, and \fBDean Luick\fP \fBKen Lorber\fP, \fBHaoyang Wang\fP, \fBPat Rankin\fP, and \fBDean Luick\fP
maintained the port of NetHack 3.6 for Mac OSX. maintained the port of NetHack 3.6 for Mac OSX.
.pg .pg
\fBMichael Allison\fP, \fBDavid Cohrs\fP, \fBBarton House\fP, \fBMichael Allison\fP, \fBDavid Cohrs\fP, \fBBart House\fP,
\fBPasi Kallinen\fP, \fBAlex Kompel\fP, \fBDion Nicolaas\fP, \fBPasi Kallinen\fP, \fBAlex Kompel\fP, \fBDion Nicolaas\fP,
\fBDerek S. Ray\fP and \fBYitzhak Sapir\fP maintained the port of \fBDerek S. Ray\fP and \fBYitzhak Sapir\fP maintained the port of
NetHack 3.6 for Microsoft Windows. NetHack 3.6 for Microsoft Windows.
@@ -5082,6 +5084,9 @@ The NetHack Development Team at the time of release of 3.6.1 consisted of
In early May 2019, another 320 bug fixes along with some enhancements and In early May 2019, another 320 bug fixes along with some enhancements and
the adopted curses window port, were released as 3.6.2. the adopted curses window port, were released as 3.6.2.
.pg .pg
\fBBart House\fP, who had contributed to the game as a porting team
participant for decades, joined the NetHack Development Team in late May 2019.
.pg
The official NetHack web site is maintained by \fBKen Lorber\fP The official NetHack web site is maintained by \fBKen Lorber\fP
at at
.UR http://www.nethack.org/ . .UR http://www.nethack.org/ .
@@ -5117,7 +5122,7 @@ Andreas Dorn Jeff Bailey Pasi Kallinen
Andy Church Jochen Erwied Pat Rankin Andy Church Jochen Erwied Pat Rankin
Andy Swanson John Kallen Patric Mueller Andy Swanson John Kallen Patric Mueller
Ari Huttunen John Rupley Paul Winner Ari Huttunen John Rupley Paul Winner
Barton House John S. Bien Pierre Martineau Bart House John S. Bien Pierre Martineau
Benson I. Margulies Johnny Lee Ralf Brown Benson I. Margulies Johnny Lee Ralf Brown
Bill Dyer Jon W{tte Ray Chason Bill Dyer Jon W{tte Ray Chason
Boudewijn Waijers Jonathan Handler Richard Addison Boudewijn Waijers Jonathan Handler Richard Addison
doc/Guidebook.tex
+117 -96
View File
@@ -45,7 +45,7 @@
%.au %.au
\author{Original version - Eric S. Raymond\\ \author{Original version - Eric S. Raymond\\
(Edited and expanded for 3.6 by Mike Stephenson and others)} (Edited and expanded for 3.6 by Mike Stephenson and others)}
\date{October 22, 2019} \date{October 31, 2019}
\maketitle \maketitle
@@ -1130,7 +1130,7 @@ slot to another so that it has a letter which is more meaningful for you
or that it will appear in a particular location when inventory listings or that it will appear in a particular location when inventory listings
are displayed. are displayed.
You can move to a currently empty slot, or if the destination is You can move to a currently empty slot, or if the destination is
occupied--and won't merge--the item there will swap slots with the one occupied---and won't merge---the item there will swap slots with the one
being moved. being moved.
``{\tt \#adjust}'' can also be used to split a stack of objects; when ``{\tt \#adjust}'' can also be used to split a stack of objects; when
choosing the item to adjust, enter a count prior to its letter.\\ choosing the item to adjust, enter a count prior to its letter.\\
@@ -2044,9 +2044,9 @@ will result in it disappearing from your map, similarly if it is the
one who moved rather than you. one who moved rather than you.
%.pg %.pg
However, if you encounter a monster which you can't see or sense-- However, if you encounter a monster which you can't see or
perhaps it is invisible and has just tapped you on the noggin-- sense---perhaps it is invisible and has just tapped you on the
a special ``remembered, unseen monster'' marker will be displayed at noggin---a special ``remembered, unseen monster'' marker will be displayed at
the location where you think it is. the location where you think it is.
That will persist until you have That will persist until you have
proven that there is no monster there, even if the unseen monster proven that there is no monster there, even if the unseen monster
@@ -2326,7 +2326,7 @@ But first you need to have a weapon in each hand.
(Note that your two weapons are not fully equal; the one in the (Note that your two weapons are not fully equal; the one in the
hand you normally wield with is considered primary and the other hand you normally wield with is considered primary and the other
one is considered secondary. The most noticeable difference is one is considered secondary. The most noticeable difference is
after you stop--or before you begin, for that matter--wielding after you stop---or before you begin, for that matter---wielding
two weapons at once. The primary is your wielded weapon and the two weapons at once. The primary is your wielded weapon and the
secondary is just an item in your inventory that's been designated secondary is just an item in your inventory that's been designated
as alternate weapon.) as alternate weapon.)
@@ -2558,7 +2558,7 @@ The commands to use rings are `{\tt P}' (put on) and `{\tt R}' (remove).
%.pg %.pg
Spellbooks are tomes of mighty magic. When studied with the `{\tt r}' (read) Spellbooks are tomes of mighty magic. When studied with the `{\tt r}' (read)
command, they transfer to the reader the knowledge of a spell (and command, they transfer to the reader the knowledge of a spell (and
therefore eventually become unreadable) --- unless the attempt backfires. therefore eventually become unreadable)---unless the attempt backfires.
Reading a cursed spellbook or one with mystic runes beyond Reading a cursed spellbook or one with mystic runes beyond
your ken can be harmful to your health! your ken can be harmful to your health!
@@ -2701,9 +2701,9 @@ you are carrying (shopkeepers aside).
Normally, if you have seen an object at a particular map location and Normally, if you have seen an object at a particular map location and
move to another location where you can't directly see that object any move to another location where you can't directly see that object any
more, if will continue to be displayed on your map. more, if will continue to be displayed on your map.
That remains the case even if it is not actually there any more-- That remains the case even if it is not actually there any
perhaps a monster has picked it up or it has rotted away-- more---perhaps a monster has picked it up or it has rotted
until you can see or feel that location again. away---until you can see or feel that location again.
One notable exception is that if the object gets covered by the One notable exception is that if the object gets covered by the
``remembered, unseen monster'' marker. ``remembered, unseen monster'' marker.
When that marker is later removed When that marker is later removed
@@ -2895,9 +2895,13 @@ Section names are case insensitive.
%.pg %.pg
You can use different configuration statements in the file, some You can use different configuration statements in the file, some
of which can be used multiple times. In general, the statements are of which can be used multiple times.
In general, the statements are
written in capital letters, followed by an equals sign, followed by written in capital letters, followed by an equals sign, followed by
settings particular to that statement. Here is a list of allowed statements: settings particular to that statement.
%.pg
Here is a list of allowed statements:
%.lp %.lp
\blist{} \blist{}
@@ -2912,7 +2916,7 @@ You can specify multiple OPTIONS statements, and multiple options
separated by commas in a single OPTIONS statement. separated by commas in a single OPTIONS statement.
(Comma separated options are processed from right to left.) (Comma separated options are processed from right to left.)
%.pg %.lp ""
Example: Example:
%.sd %.sd
\begin{verbatim} \begin{verbatim}
@@ -2946,6 +2950,9 @@ HACKDIR, must be writable.
\item[\bb{TROUBLEDIR}] \item[\bb{TROUBLEDIR}]
The location that a record of game aborts and self-diagnosed game problems The location that a record of game aborts and self-diagnosed game problems
is kept. Defaults to HACKDIR, must be writable. is kept. Defaults to HACKDIR, must be writable.
%
% config file entries beyond this point are shown alphabetically
%
%.lp %.lp
\item[\bb{AUTOCOMPLETE}] \item[\bb{AUTOCOMPLETE}]
Enable or disable an extended command autocompletion. Enable or disable an extended command autocompletion.
@@ -2955,11 +2962,11 @@ autocompletion, list the extended command. Prefix the
command with ``{{\tt !}}'' to disable the autocompletion command with ``{{\tt !}}'' to disable the autocompletion
for that command. for that command.
%.pg %.lp ""
Example: Example:
%.sd %.sd
\begin{verbatim} \begin{verbatim}
AUTOCOMPLETE=zap,!annotate AUTOCOMPLETE=zap,!annotate
\end{verbatim} \end{verbatim}
%.ed %.ed
@@ -2974,7 +2981,7 @@ extended commands. You can specify multiple bindings. Format is key
followed by the command, separated by a colon. followed by the command, separated by a colon.
See the ``Changing Key Bindings`` section for more information. See the ``Changing Key Bindings`` section for more information.
%.pg %.lp ""
Example: Example:
%.sd %.sd
\begin{verbatim} \begin{verbatim}
@@ -2987,7 +2994,7 @@ Example:
Chooses at random one of the comma-separated parameters as an active Chooses at random one of the comma-separated parameters as an active
section name. Lines in other sections are ignored. section name. Lines in other sections are ignored.
%.pg %.lp ""
Example: Example:
%.sd %.sd
\begin{verbatim} \begin{verbatim}
@@ -3000,23 +3007,39 @@ Example:
\end{verbatim} \end{verbatim}
%.ed %.ed
%.lp
\item[\bb{MSGTYPE}]
Change the way messages are shown in the top status line.
See the ``Configuring Message Types`` section.
%.lp %.lp
\item[\bb{MENUCOLOR}] \item[\bb{MENUCOLOR}]
Highlight menu lines with different colors. Highlight menu lines with different colors.
See the ``Configuring Menu Colors`` section. See the ``Configuring Menu Colors`` section.
%.lp %.lp
\item[\bb{SYMBOLS},\bb{ROGUESYMBOLS}] \item[\bb{MSGTYPE}]
Override one or more symbols in the symbols files. Change the way messages are shown in the top status line.
See the ``Configuring Message Types`` section.
%.lp
\item[\bb{ROGUESYMBOLS}]
Custom symbols for for the rogue level's symbol set.
See {\it SYMBOLS} below.
%.lp
\item[\bb{SOUND}]
Define a sound mapping.
See the ``Configuring User Sounds'' section.
%.lp
\item[\bb{SOUNDDIR}]
Define the directory that contains the sound files.
See the ``Configuring User Sounds'' section.
%.lp
\item[\bb{SYMBOLS}]
Override one or more symbols in the symbol set used for all dungeon
levels except for the special rogue level.
See the ``Modifying {\it NetHack\/} Symbols'' section. See the ``Modifying {\it NetHack\/} Symbols'' section.
%.pg %.pg
%.lp ""
Example: Example:
%.sd %.sd
\begin{verbatim} \begin{verbatim}
SYMBOLS=S_boulder:0 # replace small punctuation (tick marks) with digits
SYMBOLS=S_boulder:0,S_golem:7
\end{verbatim} \end{verbatim}
%.ed %.ed
@@ -3026,22 +3049,17 @@ Debug mode only: extra items to add to initial inventory.
Value is the name of a text file containing a list of item names, Value is the name of a text file containing a list of item names,
one per line, up to a maximum of 128 lines. one per line, up to a maximum of 128 lines.
Each line is processed by the function that handles wishing. Each line is processed by the function that handles wishing.
%.pg
%.lp ""
Example: Example:
%.sd %.sd
\begin{verbatim} \begin{verbatim}
WIZKIT=~/wizkit.txt WIZKIT=~/wizkit.txt
\end{verbatim} \end{verbatim}
%.ed %.ed
%.lp
\item[\bb{SOUNDDIR}]
Define the directory that contains the sound files.
See the ``Configuring User Sounds'' section.
%.lp
\item[\bb{SOUND}]
Define a sound mapping. See the ``Configuring User Sounds'' section.
\elist \elist
%.lp ""
%.pg %.pg
Here is a short example of config file contents: Here is a short example of config file contents:
%.sd %.sd
@@ -4366,158 +4384,158 @@ Below are the special commands you can rebind. Some of them can be bound to
same keys with no problems, others are in the same ``context'', and if bound same keys with no problems, others are in the same ``context'', and if bound
to same keys, only one of those commands will be available. Special command to same keys, only one of those commands will be available. Special command
can only be bound to a single key. can only be bound to a single key.
\elist
%.pg %.pg
\blist{} \blist{\itemindent 10mm \labelwidth 15mm \rightmargin 20mm}
%.lp %.lp
\item{\bb{count}} \item[{\bb{count}}]
Prefix key to start a count, to repeat a command this many times. Prefix key to start a count, to repeat a command this many times.
With {\it number\verb+_+pad\/} only. Default is `{\tt n}'. With {\it number\verb+_+pad\/} only. Default is `{\tt n}'.
%.lp %.lp
\item{\bb{doinv}} \item[{\bb{doinv}}]
Show inventory. With {\it number\verb+_+pad\/} only. Default is `{\tt 0}'. Show inventory. With {\it number\verb+_+pad\/} only. Default is `{\tt 0}'.
%.lp %.lp
\item{\bb{fight}} \item[{\bb{fight}}]
Prefix key to force fight a direction. Default is `{\tt F}'. Prefix key to force fight a direction. Default is `{\tt F}'.
%.lp %.lp
\item{\bb{fight.numpad}} \item[{\bb{fight.numpad}}]
Prefix key to force fight a direction. With {\it number\verb+_+pad\/} only. Prefix key to force fight a direction. With {\it number\verb+_+pad\/} only.
Default is `{\tt -}'. Default is `{\tt -}'.
%.lp %.lp
\item{\bb{getdir.help}} \item[{\bb{getdir.help}}]
When asked for a direction, the key to show the help. Default is `{\tt ?}'. When asked for a direction, the key to show the help. Default is `{\tt ?}'.
%.lp %.lp
\item{\bb{getdir.self}} \item[{\bb{getdir.self}}]
When asked for a direction, the key to target yourself. Default is `{\tt .}'. When asked for a direction, the key to target yourself. Default is `{\tt .}'.
%.lp %.lp
\item{\bb{getdir.self2}} \item[{\bb{getdir.self2}}]
When asked for a direction, the key to target yourself. Default is `{\tt s}'. When asked for a direction, the key to target yourself. Default is `{\tt s}'.
%.lp %.lp
\item{\bb{getpos.autodescribe}} \item[{\bb{getpos.autodescribe}}]
When asked for a location, the key to toggle {\it autodescribe\/}. When asked for a location, the key to toggle {\it autodescribe\/}.
Default is `{\tt \#}'. Default is `{\tt \#}'.
%.lp %.lp
\item{\bb{getpos.all.next}} \item[{\bb{getpos.all.next}}]
When asked for a location, the key to go to next closest interesting thing. When asked for a location, the key to go to next closest interesting thing.
Default is `{\tt a}'. Default is `{\tt a}'.
%.lp %.lp
\item{\bb{getpos.all.prev}} \item[{\bb{getpos.all.prev}}]
When asked for a location, the key to go to previous closest interesting thing. When asked for a location, the key to go to previous closest interesting thing.
Default is `{\tt A}'. Default is `{\tt A}'.
%.lp %.lp
\item{\bb{getpos.door.next}} \item[{\bb{getpos.door.next}}]
When asked for a location, the key to go to next closest door or doorway. When asked for a location, the key to go to next closest door or doorway.
Default is `{\tt d}'. Default is `{\tt d}'.
%.lp %.lp
\item{\bb{getpos.door.prev}} \item[{\bb{getpos.door.prev}}]
When asked for a location, the key to go to previous closest door or doorway. When asked for a location, the key to go to previous closest door or doorway.
Default is `{\tt D}'. Default is `{\tt D}'.
%.lp %.lp
\item{\bb{getpos.help}} \item[{\bb{getpos.help}}]
When asked for a location, the key to show help. Default is `{\tt ?}'. When asked for a location, the key to show help. Default is `{\tt ?}'.
%.lp %.lp
\item{\bb{getpos.mon.next}} \item[{\bb{getpos.mon.next}}]
When asked for a location, the key to go to next closest monster. When asked for a location, the key to go to next closest monster.
Default is `{\tt m}'. Default is `{\tt m}'.
%.lp %.lp
\item{\bb{getpos.mon.prev}} \item[{\bb{getpos.mon.prev}}]
When asked for a location, the key to go to previous closest monster. When asked for a location, the key to go to previous closest monster.
Default is `{\tt M}'. Default is `{\tt M}'.
%.lp %.lp
\item{\bb{getpos.obj.next}} \item[{\bb{getpos.obj.next}}]
When asked for a location, the key to go to next closest object. When asked for a location, the key to go to next closest object.
Default is `{\tt o}'. Default is `{\tt o}'.
%.lp %.lp
\item{\bb{getpos.obj.prev}} \item[{\bb{getpos.obj.prev}}]
When asked for a location, the key to go to previous closest object. When asked for a location, the key to go to previous closest object.
Default is `{\tt O}'. Default is `{\tt O}'.
%.lp %.lp
\item{\bb{getpos.menu}} \item[{\bb{getpos.menu}}]
When asked for a location, and using one of the next or previous keys to When asked for a location, and using one of the next or previous keys to
cycle through targets, toggle showing a menu instead. Default is `{\tt !}'. cycle through targets, toggle showing a menu instead. Default is `{\tt !}'.
%.lp %.lp
\item{\bb{getpos.moveskip}} \item[{\bb{getpos.moveskip}}]
When asked for a location, and using the shifted movement keys or When asked for a location, and using the shifted movement keys or
meta-digit keys to fast-move around, move by skipping the same glyphs meta-digit keys to fast-move around, move by skipping the same glyphs
instead of by 8 units. instead of by 8 units.
Default is `{\tt *}'. Default is `{\tt *}'.
%.lp %.lp
\item{\bb{getpos.filter}} \item[{\bb{getpos.filter}}]
When asked for a location, change the filtering mode when using one of When asked for a location, change the filtering mode when using one of
the next or previous keys to cycle through targets. Toggles between no the next or previous keys to cycle through targets. Toggles between no
filtering, in view only, and in the same area only. Default is `{\tt "}'. filtering, in view only, and in the same area only. Default is `{\tt "}'.
%.lp %.lp
\item{\bb{getpos.pick}} \item[{\bb{getpos.pick}}]
When asked for a location, the key to choose the location, and possibly When asked for a location, the key to choose the location, and possibly
ask for more info. Default is `{\tt .}'. ask for more info. Default is `{\tt .}'.
%.lp %.lp
\item{\bb{getpos.pick.once}} \item[{\bb{getpos.pick.once}}]
When asked for a location, the key to choose the location, and skip When asked for a location, the key to choose the location, and skip
asking for more info. Default is `{\tt ,}'. asking for more info. Default is `{\tt ,}'.
%.lp %.lp
\item{\bb{getpos.pick.quick}} \item[{\bb{getpos.pick.quick}}]
When asked for a location, the key to choose the location, skip asking When asked for a location, the key to choose the location, skip asking
for more info, and exit the location asking loop. Default is `{\tt ;}'. for more info, and exit the location asking loop. Default is `{\tt ;}'.
%.lp %.lp
\item{\bb{getpos.pick.verbose}} \item[{\bb{getpos.pick.verbose}}]
When asked for a location, the key to choose the location, and show more When asked for a location, the key to choose the location, and show more
info without asking. Default is `{\tt :}'. info without asking. Default is `{\tt :}'.
%.lp %.lp
\item{\bb{getpos.self}} \item[{\bb{getpos.self}}]
When asked for a location, the key to go to your location. When asked for a location, the key to go to your location.
Default is `{\tt @}'. Default is `{\tt @}'.
%.lp %.lp
\item{\bb{getpos.unexplored.next}} \item[{\bb{getpos.unexplored.next}}]
When asked for a location, the key to go to next closest unexplored location. When asked for a location, the key to go to next closest unexplored location.
Default is `{\tt x}'. Default is `{\tt x}'.
%.lp %.lp
\item{\bb{getpos.unexplored.prev}} \item[{\bb{getpos.unexplored.prev}}]
When asked for a location, the key to go to previous closest unexplored When asked for a location, the key to go to previous closest unexplored
location. Default is `{\tt X}'. location. Default is `{\tt X}'.
%.lp %.lp
\item{\bb{getpos.valid}} \item[{\bb{getpos.valid}}]
When asked for a location, the key to go to show valid target locations. When asked for a location, the key to go to show valid target locations.
Default is `{\tt \$}'. Default is `{\tt \$}'.
%.lp %.lp
\item{\bb{getpos.valid.next}} \item[{\bb{getpos.valid.next}}]
When asked for a location, the key to go to next closest valid location. When asked for a location, the key to go to next closest valid location.
Default is `{\tt z}'. Default is `{\tt z}'.
%.lp %.lp
\item{\bb{getpos.valid.prev}} \item[{\bb{getpos.valid.prev}}]
When asked for a location, the key to go to previous closest valid location. When asked for a location, the key to go to previous closest valid location.
Default is `{\tt Z}'. Default is `{\tt Z}'.
%.lp %.lp
\item{\bb{nopickup}} \item[{\bb{nopickup}}]
Prefix key to move without picking up items. Default is `{\tt m}'. Prefix key to move without picking up items. Default is `{\tt m}'.
%.lp %.lp
\item{\bb{redraw}} \item[{\bb{redraw}}]
Key to redraw the screen. Default is `{\tt \^{}R}'. Key to redraw the screen. Default is `{\tt \^{}R}'.
%.lp %.lp
\item{\bb{redraw.numpad}} \item[{\bb{redraw.numpad}}]
Key to redraw the screen. With {\it number\verb+_+pad\/} only. Key to redraw the screen. With {\it number\verb+_+pad\/} only.
Default is `{\tt \^{}L}'. Default is `{\tt \^{}L}'.
%.lp %.lp
\item{\bb{repeat}} \item[{\bb{repeat}}]
Key to repeat previous command. Default is `{\tt \^{}A}'. Key to repeat previous command. Default is `{\tt \^{}A}'.
%.lp %.lp
\item{\bb{reqmenu}} \item[{\bb{reqmenu}}]
Prefix key to request menu from some commands. Default is `{\tt m}'. Prefix key to request menu from some commands. Default is `{\tt m}'.
%.lp %.lp
\item{\bb{run}} \item[{\bb{run}}]
Prefix key to run towards a direction. Default is `{\tt G}'. Prefix key to run towards a direction. Default is `{\tt G}'.
%.lp %.lp
\item{\bb{run.nopickup}} \item[{\bb{run.nopickup}}]
Prefix key to run towards a direction without picking up items on the way. Prefix key to run towards a direction without picking up items on the way.
Default is `{\tt M}'. Default is `{\tt M}'.
%.lp %.lp
\item{\bb{run.numpad}} \item[{\bb{run.numpad}}]
Prefix key to run towards a direction. With {\it number\verb+_+pad\/} only. Prefix key to run towards a direction. With {\it number\verb+_+pad\/} only.
Default is `{\tt 5}'. Default is `{\tt 5}'.
%.lp %.lp
\item{\bb{rush}} \item[{\bb{rush}}]
Prefix key to rush towards a direction. Default is `{\tt g}'. Prefix key to rush towards a direction. Default is `{\tt g}'.
\elist \elist
\elist
%.hn 2 %.hn 2
@@ -4721,6 +4739,8 @@ combination with any of the other attributes.
To specify both a color and an attribute, use `\&' to combine them. To specify both a color and an attribute, use `\&' to combine them.
To specify multiple attributes, use `+' to combine those. To specify multiple attributes, use `+' to combine those.
%.lp ""
For example: {\tt magenta\&inverse+dim}. For example: {\tt magenta\&inverse+dim}.
Note that the display may substitute or ignore particular attributes Note that the display may substitute or ignore particular attributes
@@ -4773,23 +4793,19 @@ percentage or absolute number threshold, or text to match against.
\blist{} \blist{}
%.lp "*" %.lp "*"
\item{\bb{}} \item[{\tt always}] will set the default attributes for that field.
``{\tt always}'' will set the default attributes for that field.
%.lp "*" %.lp "*"
\item{\bb{}} \item[{\tt up} and ``{\tt down}''] set the field attributes for when the field
``{\tt up}'' and ``{\tt down}'' set the field attributes for when the field
value changes upwards or downwards. This attribute times out after value changes upwards or downwards. This attribute times out after
{\tt statushilites} turns. {\tt statushilites} turns.
%.lp "*" %.lp "*"
\item{\bb{}} \item[{\tt changed}] sets the field attribute for when the field value
``{\tt changed}'' sets the field attribute for when the field value
changes. This attribute times out after {\tt statushilites} turns. changes. This attribute times out after {\tt statushilites} turns.
(If a field has both a ``changed'' rule and an ``up'' or ``down'' (If a field has both a ``changed'' rule and an ``up'' or ``down''
rule which matches a change in the field's value, rule which matches a change in the field's value,
the ``up'' or ``down'' one takes precedence.) the ``up'' or ``down'' one takes precedence.)
%.lp "*" %.lp "*"
\item{\bb{}} \item[{\tt percentage}] sets the field attribute when the field value
percentage sets the field attribute when the field value
matches the percentage. matches the percentage.
It is specified as a number between 0 and 100, followed by `{\tt \%}' It is specified as a number between 0 and 100, followed by `{\tt \%}'
(percent sign). (percent sign).
@@ -4817,8 +4833,7 @@ exactly 1 experience point short of the next level.
% percentage will remain at 0\% no matter have many additional experience % percentage will remain at 0\% no matter have many additional experience
% points you earn.) % points you earn.)
%.lp "*" %.lp "*"
\item{\bb{}} \item[{\tt absolute}] value sets the attribute when the field value
absolute value sets the attribute when the field value
matches that number. matches that number.
The number must be 0 or higher, except for ``{\it armor-class\/} which The number must be 0 or higher, except for ``{\it armor-class\/} which
allows negative values, and may optionally be preceded by `{\tt =}'. allows negative values, and may optionally be preceded by `{\tt =}'.
@@ -4827,8 +4842,7 @@ it also matches when value is below or above.
If the prefix is `{\tt <}' or `{\tt >}', only match when strictly If the prefix is `{\tt <}' or `{\tt >}', only match when strictly
above or below. above or below.
%.lp "*" %.lp "*"
\item{\bb{}} \item[{\tt text}] match sets the attribute when the field value matches the text.
text match sets the attribute when the field value matches the text.
Text matches can only be used for ``{\it alignment\/}'', Text matches can only be used for ``{\it alignment\/}'',
``{\it carrying-capacity\/}'', ``{\it hunger\/}'', ``{\it dungeon-level\/}'', ``{\it carrying-capacity\/}'', ``{\it hunger\/}'', ``{\it dungeon-level\/}'',
and ``{\it title\/}''. and ``{\it title\/}''.
@@ -4880,11 +4894,13 @@ on the rogue level.
\elist \elist
You can also override one or more symbols using the {\it SYMBOLS\/} and You can also override one or more symbols using the {\it SYMBOLS\/} and
{\it ROGUESYMBOLS\/} config file options. Symbols are specified as {\it ROGUESYMBOLS\/} config file options.
{\it name:value\/} pairs. Note that {\it NetHack\/} escape-processes Symbols are specified as {\it name:value\/} pairs.
the {\it value\/} string in conventional C fashion. This means that `\verb+\+' Note that {\it NetHack\/} escape-processes
is a prefix to take the following character literally. Thus `\verb+\+' needs the {\it value\/} string in conventional C fashion.
to be represented as `\verb+\\+'. This means that `\verb+\+' is a prefix to take the following character
literally.
Thus `\verb+\+' needs to be represented as `\verb+\\+'.
The special prefix The special prefix
`\verb+\m+' switches on the meta bit in the symbol value, and the `\verb+\m+' switches on the meta bit in the symbol value, and the
`{\tt \^{}}' prefix causes the following character to be treated as a control `{\tt \^{}}' prefix causes the following character to be treated as a control
@@ -5071,8 +5087,8 @@ Default & Symbol Name & Description\\
\verb@Y@ & S\verb+_+yeti & (apelike creature)\\ \verb@Y@ & S\verb+_+yeti & (apelike creature)\\
\verb@Z@ & S\verb+_+zombie & (zombie)\\ \verb@Z@ & S\verb+_+zombie & (zombie)\\
\verb@z@ & S\verb+_+zruty & (zruty)\\ \verb@z@ & S\verb+_+zruty & (zruty)\\
\verb@ @ & S\verb+_+pet\verb+_+override & (pet override if sysconf accessibility is set)\\ \verb@ @ & S\verb+_+pet\verb+_+override & (any pet if sysconf accessibility is set)\\
\verb@ @ & S\verb+_+player\verb+_+override & (player override if sysconf accessibility is set) \verb@ @ & S\verb+_+player\verb+_+override & (hero if sysconf accessibility is set)
\end{longtable}% \end{longtable}%
} }
@@ -5439,7 +5455,7 @@ with help from {\it Ross Brown}, {\it Mike Engber}, {\it David Hairston},
{\it Michael Hamel}, {\it Jonathan Handler}, {\it Johnny Lee}, {\it Michael Hamel}, {\it Jonathan Handler}, {\it Johnny Lee},
{\it Tim Lennan}, {\it Rob Menke}, and {\it Andy Swanson}, {\it Tim Lennan}, {\it Rob Menke}, and {\it Andy Swanson},
developed {\it NetHack\/} 3.1 for the Macintosh, porting it for MPW. developed {\it NetHack\/} 3.1 for the Macintosh, porting it for MPW.
Building on their development, {\it Barton House} added a Think C port. Building on their development, {\it Bart House} added a Think C port.
%.pg %.pg
\medskip \medskip
@@ -5652,7 +5668,7 @@ maintained the port of {\it NetHack\/} 3.6 for Mac OSX.
%.pg %.pg
\medskip \medskip
{\it Michael Allison}, {\it David Cohrs}, {\it Barton House}, {\it Michael Allison}, {\it David Cohrs}, {\it Bart House},
{\it Pasi Kallinen}, {\it Alex Kompel}, {\it Dion Nicolaas}, {\it Pasi Kallinen}, {\it Alex Kompel}, {\it Dion Nicolaas},
{\it Derek S. Ray} and {\it Yitzhak Sapir} {\it Derek S. Ray} and {\it Yitzhak Sapir}
maintained the port of {\it NetHack\/} 3.6 for Microsoft Windows. maintained the port of {\it NetHack\/} 3.6 for Microsoft Windows.
@@ -5686,6 +5702,11 @@ time of release of 3.6.1 consisted of
In early May 2019, another 320 bug fixes along with some enhancements and In early May 2019, another 320 bug fixes along with some enhancements and
the adopted curses window port, were released as 3.6.2. the adopted curses window port, were released as 3.6.2.
%.pg
\medskip
{\it Bart House}, who had contributed to the game as a porting team participant
for decades, joined the {\it NetHack Development Team} in late May 2019.
%.pg %.pg
\medskip \medskip
\nd The official {\it NetHack\/} web site is maintained by {\it Ken Lorber} at \nd The official {\it NetHack\/} web site is maintained by {\it Ken Lorber} at
@@ -5727,7 +5748,7 @@ Andreas Dorn & Jeff Bailey & Pasi Kallinen\\
Andy Church & Jochen Erwied & Pat Rankin\\ Andy Church & Jochen Erwied & Pat Rankin\\
Andy Swanson & John Kallen & Patric Mueller\\ Andy Swanson & John Kallen & Patric Mueller\\
Ari Huttunen & John Rupley & Paul Winner\\ Ari Huttunen & John Rupley & Paul Winner\\
Barton House & John S. Bien & Pierre Martineau\\ Bart House & John S. Bien & Pierre Martineau\\
Benson I. Margulies & Johnny Lee & Ralf Brown\\ Benson I. Margulies & Johnny Lee & Ralf Brown\\
Bill Dyer & Jon W\{tte & Ray Chason\\ Bill Dyer & Jon W\{tte & Ray Chason\\
Boudewijn Waijers & Jonathan Handler & Richard Addison\\ Boudewijn Waijers & Jonathan Handler & Richard Addison\\
doc/fixes36.3
+3 -1
View File
@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.149 $ $NHDT-Date: 1572141706 2019/10/27 02:01:46 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.151 $ $NHDT-Date: 1572530225 2019/10/31 13:57:05 $
This fixes36.3 file is here to capture information about updates in the 3.6.x This fixes36.3 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.2 in May 2019. Please note, however, lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -208,6 +208,8 @@ parsing for the argument to 'scores' option was sloppy; "3a/o" (slash) and
"3a 1o" (space and digit one, not lowercase L) both worked but "3a o" "3a 1o" (space and digit one, not lowercase L) both worked but "3a o"
(just space) was supposed to but didn't (just space) was supposed to but didn't
wizmakemap could leave genocided monsters on map wizmakemap could leave genocided monsters on map
when entering Astral level, initial rendering of guardian angel didn't show
it as tame; noticeable if the level was entered with 'hilite_pet' On
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository
include/pcconf.h
+5
View File
@@ -21,6 +21,11 @@
* Note: 3.6.x was not verified with Symantec C. * Note: 3.6.x was not verified with Symantec C.
*/ */
#if defined(MSDOS)
#define CONFIG_FILE "defaults.nh"
#define GUIDEBOOK_FILE "Guidebook.txt"
#endif
/* /*
* The following options are somewhat configurable depending on * The following options are somewhat configurable depending on
* your compiler. * your compiler.
src/minion.c
+9 -6
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 minion.c $NHDT-Date: 1561061319 2019/06/20 20:08:39 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.42 $ */ /* NetHack 3.6 minion.c $NHDT-Date: 1572530226 2019/10/31 13:57:06 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.43 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2008. */ /*-Copyright (c) Robert Patrick Rankin, 2008. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -481,15 +481,18 @@ gain_guardian_angel()
&& (mtmp = mk_roamer(&mons[PM_ANGEL], u.ualign.type, mm.x, mm.y, && (mtmp = mk_roamer(&mons[PM_ANGEL], u.ualign.type, mm.x, mm.y,
TRUE)) != 0) { TRUE)) != 0) {
mtmp->mstrategy &= ~STRAT_APPEARMSG; mtmp->mstrategy &= ~STRAT_APPEARMSG;
/* guardian angel -- the one case mtame doesn't imply an
* edog structure, so we don't want to call tamedog().
* [Note: this predates mon->mextra which allows a monster
* to have both emin and edog at the same time.]
*/
mtmp->mtame = 10;
/* for 'hilite_pet'; after making tame, before next message */
newsym(mtmp->mx, mtmp->my);
if (!Blind) if (!Blind)
pline("An angel appears near you."); pline("An angel appears near you.");
else else
You_feel("the presence of a friendly angel near you."); You_feel("the presence of a friendly angel near you.");
/* guardian angel -- the one case mtame doesn't
* imply an edog structure, so we don't want to
* call tamedog().
*/
mtmp->mtame = 10;
/* make him strong enough vs. endgame foes */ /* make him strong enough vs. endgame foes */
mtmp->m_lev = rn1(8, 15); mtmp->m_lev = rn1(8, 15);
mtmp->mhp = mtmp->mhpmax = mtmp->mhp = mtmp->mhpmax =
sys/winnt/Makefile.msc
+2 -1
View File
@@ -526,7 +526,8 @@ guilflags = $(lflags) -subsystem:windows,$(EXEVER)
dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
# basic subsystem specific libraries, less the C Run-Time # basic subsystem specific libraries, less the C Run-Time
baselibs = kernel32.lib $(optlibs) $(winsocklibs) advapi32.lib gdi32.lib baselibs = kernel32.lib $(optlibs) $(winsocklibs) advapi32.lib gdi32.lib \
ole32.lib Shell32.lib
winlibs = $(baselibs) user32.lib comdlg32.lib winspool.lib winlibs = $(baselibs) user32.lib comdlg32.lib winspool.lib
# for Windows applications that use the C Run-Time libraries # for Windows applications that use the C Run-Time libraries
sys/winnt/windmain.c
+4 -2
View File
@@ -21,15 +21,17 @@ extern LONG GetCurrentPackageFullName(UINT32 *packageFullNameLength,
PWSTR packageFullName); PWSTR packageFullName);
extern HRESULT SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, extern HRESULT SHGetKnownFolderPath(REFKNOWNFOLDERID rfid,
DWORD dwFlags, HANDLE hToken, PWSTR *ppszPath); DWORD dwFlags, HANDLE hToken, PWSTR *ppszPath);
#ifndef DEFINE_KNOWN_FOLDER
#ifdef INITGUID #ifdef INITGUID
#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) const GUID DECLSPEC_SELECTANY name = { l, w1, w2,{ b1, b2, b3, b4, b5, b6, b7, b8 } } #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) const GUID DECLSPEC_SELECTANY name = { l, w1, w2,{ b1, b2, b3, b4, b5, b6, b7, b8 } }
#else #else
#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) const GUID name #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) const GUID name
#endif #endif /* INITGUID */
#endif /* DEFINE_KNOWN_FOLDER */
DEFINE_KNOWN_FOLDER (FOLDERID_ProgramData, 0x62ab5d82, 0xfdc1, 0x4dc3, 0xa9, 0xdd, 0x07, 0x0d, 0x1d, 0x49, 0x5d, 0x97); DEFINE_KNOWN_FOLDER (FOLDERID_ProgramData, 0x62ab5d82, 0xfdc1, 0x4dc3, 0xa9, 0xdd, 0x07, 0x0d, 0x1d, 0x49, 0x5d, 0x97);
DEFINE_KNOWN_FOLDER (FOLDERID_LocalAppData, 0xf1b32785, 0x6fba, 0x4fcf, 0x9d, 0x55, 0x7b, 0x8e, 0x7f, 0x15, 0x70, 0x91); DEFINE_KNOWN_FOLDER (FOLDERID_LocalAppData, 0xf1b32785, 0x6fba, 0x4fcf, 0x9d, 0x55, 0x7b, 0x8e, 0x7f, 0x15, 0x70, 0x91);
DEFINE_KNOWN_FOLDER (FOLDERID_Profile, 0x5e6c858f, 0x0e22, 0x4760, 0x9a, 0xfe, 0xea, 0x33, 0x17, 0xb6, 0x71, 0x73); DEFINE_KNOWN_FOLDER (FOLDERID_Profile, 0x5e6c858f, 0x0e22, 0x4760, 0x9a, 0xfe, 0xea, 0x33, 0x17, 0xb6, 0x71, 0x73);
#endif #endif /* __MINGW32__ */
#if 0 #if 0
#include "wintty.h" #include "wintty.h"