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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-11-07 23:10:47 -05:00
parent cc3b101a02 6afb780d98
commit 50d04bbd61
7 changed files with 119 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README
+1 -1
View File
@@ -30,7 +30,7 @@ spoilers:
* Added several grammar corrections * Added several grammar corrections
* Improved recognition of deafness for several situations including the * Improved recognition of deafness for several situations including the
* playing of musical instruments and bribing negotiations with demon lords * playing of musical instruments and bribing negotiations with demon lords
* Fixed ignoring of god's wrath when hero injured himself during alter kick * Fixed ignoring of god's wrath when hero injured himself during altar kick
* Fixed several cases where persistent inventory window was not updated * Fixed several cases where persistent inventory window was not updated
* Fixed temple priests or shopkeepers moving over other monsters * Fixed temple priests or shopkeepers moving over other monsters
* Ensured that thrown or kicked objects will end up in bones * Ensured that thrown or kicked objects will end up in bones
doc/Guidebook.mn
+51 -34
View File
@@ -1,4 +1,4 @@
.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.325 $ $NHDT-Date: 1572735924 2019/11/02 23:05:24 $ .\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.329 $ $NHDT-Date: 1573171723 2019/11/08 00:08:43 $
.\" .\"
.\" 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.7 .ds vr "NetHack 3.7
.ds f0 "\*(vr .ds f0 "\*(vr
.ds f1 .ds f1
.ds f2 "November 2, 2019 .ds f2 "November 7, 2019
. .
.\" A note on some special characters: .\" A note on some special characters:
.\" \(lq = left double quote .\" \(lq = left double quote
@@ -2625,7 +2625,7 @@ and Mac OS X it is \(lq.nethackrc\(rq in the user's home directory.
The file may not exist, but it is a normal ASCII text file and The file may not exist, but it is a normal ASCII text file and
can be created with any text editor. can be created with any text editor.
.pg .pg
On Windows, it is \(lq.nethackrc\(rq in On Windows, it is \(lq.nethackrc\(rq in the folder
\(lq\\%USERPROFILE%\\NetHack\\3.6\(rq. The file may not exist, \(lq\\%USERPROFILE%\\NetHack\\3.6\(rq. The file may not exist,
but it is a normal ASCII text file can can be created with any but it is a normal ASCII text file can can be created with any
text editor. text editor.
@@ -2775,26 +2775,38 @@ Example:
.sd .sd
\f(CRWIZKIT=\(ti/wizkit.txt\fP \" \(ti == '~' \f(CRWIZKIT=\(ti/wizkit.txt\fP \" \(ti == '~'
.ed .ed
.lp "" .
.pg \" this would look better outdented .pg
Here is a short example of config file contents: \ \" dummy paragraph to force some separation [.BR isn't working as intended]
.sd .pg
.SD n \" suppress indentation
Here is an example of configuration file contents:
.ED
.\" [conditional indentation; see description of NETHACKOPTIONS below]
.ds sD i \" assume proportional, indentation acceptable and preferred
.\" Check for fixed-width font; 'f' will be same width as 'F'.
.if (\w'f'p)=(\w'F'p) .ds sD n \" if same width, suppress indentation
.SD \*(sD \" string variable sD will expand to either 'i' or 'n'
.ft CR \" set font to constant-width Roman .ft CR \" set font to constant-width Roman
# Set your character's role, race, gender, and alignment. # Set your character's role, race, gender, and alignment.
OPTIONS=role:Valkyrie, race:Human, gender:female, align:lawful OPTIONS=role:Valkyrie, race:Human, gender:female, align:lawful
# #
# Turn on autopickup, set automatically picked up object types # Turn on autopickup, set automatically picked up object types
OPTIONS=autopickup,pickup_types:$"=/!?+ OPTIONS=autopickup,pickup_types:$"=/!?+
# Show colored text if possible #
OPTIONS=color # Map customization
# Show lit corridors differently OPTIONS=color # Display things in color if possible
OPTIONS=lit_corridor OPTIONS=lit_corridor # Show lit corridors differently
OPTIONS=hilite_pet,hilite_pile
# Replace small punctuation (tick marks) with digits
SYMBOLS=S_boulder:0,S_golem:7
# #
# No startup splash screen. Windows GUI only. # No startup splash screen. Windows GUI only.
OPTIONS=!splash_screen OPTIONS=!splash_screen
.ft \" revert to previous font .ft \" revert to previous font
.ed .ED
.BR 2 .pg
\ \" another dummy paragraph [.BR 2]
.hn 2 .hn 2
Using the NETHACKOPTIONS environment variable Using the NETHACKOPTIONS environment variable
.pg .pg
@@ -3195,7 +3207,7 @@ Valid settings are:
.sd .sd
.si .si
.CC 0 "disabled" .CC 0 "disabled"
.CC 1 "enabled and make OS adjustments to support mouse use in the game" .CC 1 "enabled and make OS adjustments to support mouse use"
.CC 2 "like 1 but does not make any OS adjustments" .CC 2 "like 1 but does not make any OS adjustments"
.ei .ei
.ed .ed
@@ -3612,7 +3624,7 @@ used to customize and change the characteristics of the
windowtype that you have chosen. windowtype that you have chosen.
Character strings that are too long may be truncated. Character strings that are too long may be truncated.
Not all window ports will adjust for all settings listed Not all window ports will adjust for all settings listed
here. You can safely add any of these options to your config here. You can safely add any of these options to your configuration
file, and if the window port is capable of adjusting to file, and if the window port is capable of adjusting to
suit your preferences, it will attempt to do so. If it suit your preferences, it will attempt to do so. If it
can't it will silently ignore it. You can find out if an can't it will silently ignore it. You can find out if an
@@ -3808,7 +3820,8 @@ May be used to alter the value of keystrokes that the operating system
returns to NetHack to help compensate for international keyboard issues. returns to NetHack to help compensate for international keyboard issues.
OPTIONS=subkeyvalue:171/92 OPTIONS=subkeyvalue:171/92
will return 92 to NetHack, if 171 was originally going to be returned. will return 92 to NetHack, if 171 was originally going to be returned.
You can use multiple subkeyvalue statements in the config file if needed. You can use multiple subkeyvalue statements in the configuration file
if needed.
Cannot be set with the \(oqO\(cq command. Cannot be set with the \(oqO\(cq command.
.lp video .lp video
Set the video mode used (PC NetHack only). Set the video mode used (PC NetHack only).
@@ -3872,12 +3885,12 @@ character in the pattern, specifically:
.ed .ed
The The
.op autopickup_exception .op autopickup_exception
rules are processed in the order in which they appear in your config file, rules are processed in the order in which they appear in your configuration
thus allowing a later rule to override an earlier rule. file, thus allowing a later rule to override an earlier rule.
.lp "" .lp ""
Exceptions can be set with the \(oqO\(cq command, but because they are not Exceptions can be set with the \(oqO\(cq command, but because they are not
included in your config file, they won't be in effect if you save and then included in your configuration file, they won't be in effect if you save
restore your game. and then restore your game.
.op autopickup_exception .op autopickup_exception
rules and not saved with the game. rules and not saved with the game.
.\" end of ``.lp autopickup_exception'' entry; continue enclosing page... .\" end of ``.lp autopickup_exception'' entry; continue enclosing page...
@@ -3920,8 +3933,8 @@ You can bind multiple keys to the same extended command.
Unbind a key by using \(lqnothing\(rq as the extended command to bind to. Unbind a key by using \(lqnothing\(rq as the extended command to bind to.
You can also bind the \(lq<esc>\(rq, \(lq<enter>\(rq, and \(lq<space>\(rq keys. You can also bind the \(lq<esc>\(rq, \(lq<enter>\(rq, and \(lq<space>\(rq keys.
.lp "Menu accelerator keys" .lp "Menu accelerator keys"
The menu control or accelerator keys can also be rebound via OPTIONS-lines The menu control or accelerator keys can also be rebound via OPTIONS lines
in the config file. in the configuration file.
You cannot bind object symbols into menu accelerators. You cannot bind object symbols into menu accelerators.
.lp "Special command keys" .lp "Special command keys"
Below are the special commands you can rebind. Below are the special commands you can rebind.
@@ -4080,7 +4093,7 @@ Configuring Message Types
You can change the way the messages are shown in the message area, when You can change the way the messages are shown in the message area, when
the message matches a user-defined pattern. the message matches a user-defined pattern.
.pg .pg
In general, the config file entries to configure the message types In general, the configuration file entries to describe the message types
look like this: look like this:
.si .si
MSGTYPE=type "pattern" MSGTYPE=type "pattern"
@@ -4120,16 +4133,17 @@ the user is prompted with more-prompt, and a message matching
.\" historical trivia: "You displaced Fido." was the sort of message you .\" historical trivia: "You displaced Fido." was the sort of message you
.\" got when swapping places with your pet, but that was changed long ago... .\" got when swapping places with your pet, but that was changed long ago...
.lp "" .lp ""
The order of the defined MSGTYPE-lines is important; the last matching The order of the defined MSGTYPE lines is important; the last matching
rule is used. Put the general case first, exceptions below them. rule is used. Put the general case first, exceptions below them.
.hn 2 .hn 2
Configuring Menu Colors Configuring Menu Colors
.pg .pg
Some platforms allow you to define colors used in menu lines when the 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 line matches a user-defined pattern.
win32gui support this. At this time the tty, curses, win32tty and
win32gui interfaces support this.
.pg .pg
In general, the config file entries to configure the menu color mappings In general, the configuration file entries to describe the menu color mappings
look like this: look like this:
.si .si
.lp MENUCOLOR="pattern"=color&attribute .lp MENUCOLOR="pattern"=color&attribute
@@ -4172,8 +4186,8 @@ in it will be shown in green color, lines with \(lq\ cursed\ \(rq will be
shown in red, and lines with \(lq\ cursed\ \(rq followed shown in red, and lines with \(lq\ cursed\ \(rq followed
by \(lq(being worn)\(rq by \(lq(being worn)\(rq
on the same line will be shown in red color and underlined. on the same line will be shown in red color and underlined.
You can have multiple MENUCOLOR entries in your config file, You can have multiple MENUCOLOR entries in your configuration file,
and the last MENUCOLOR-line in your config file that matches and the last MENUCOLOR line that matches
a menu line will be used for the line. a menu line will be used for the line.
.pg .pg
Note that if you intend to have one or more color specifications match Note that if you intend to have one or more color specifications match
@@ -4189,7 +4203,7 @@ that matches a user-defined pattern is delivered to the message window.
At this time the Qt port and the win32tty and win32gui ports support the At this time the Qt port and the win32tty and win32gui ports support the
use of user sounds. use of user sounds.
.pg .pg
The following config file entries are relevant to mapping user sounds The following configuration file entries are relevant to mapping user sounds
to messages: to messages:
.lp SOUNDDIR .lp SOUNDDIR
The directory that houses the sound files to be played. The directory that houses the sound files to be played.
@@ -4358,7 +4372,7 @@ is tested; the character's name is ignored.
.ei .ei
.pg .pg
The in-game options menu can help you determine the correct syntax for a The in-game options menu can help you determine the correct syntax for a
config file. configuration file.
.pg .pg
The whole feature can be disabled by setting option The whole feature can be disabled by setting option
.op statushilites .op statushilites
@@ -4394,7 +4408,7 @@ Set the name of the symbol set that you want to load for display
on the rogue level. on the rogue level.
.pg .pg
You can also override one or more symbols using the SYMBOLS and You can also override one or more symbols using the SYMBOLS and
ROGUESYMBOLS config file options. ROGUESYMBOLS configuration file options.
Symbols are specified as name:value pairs. Symbols are specified as name:value pairs.
Note that Note that
NetHack escape-processes the value string in conventional C fashion. NetHack escape-processes the value string in conventional C fashion.
@@ -4604,11 +4618,13 @@ z S_zruty (zruty)
.\" don't hyphenate file name across lines .\" don't hyphenate file name across lines
.hw sysconf .hw sysconf
.pg .pg
Notes: several symbols in this table appear to be blank. .lp "Notes:"
.lp "*"
Several symbols in this table appear to be blank.
They are the space character, except for S_pet_override They are the space character, except for S_pet_override
and S_player_override which don't have any default value and S_player_override which don't have any default value
and can only be used if enabled in the \(lqsysconf\(rq file. and can only be used if enabled in the \(lqsysconf\(rq file.
.pg .lp "*"
S_rock is misleadingly named; rocks and stones use S_gem. S_rock is misleadingly named; rocks and stones use S_gem.
Statues and boulders are the rock being referred to, but since Statues and boulders are the rock being referred to, but since
version 3.6.0, statues are displayed as the monster they depict. version 3.6.0, statues are displayed as the monster they depict.
@@ -5210,3 +5226,4 @@ Izchak Miller Mike Stephenson
.\"Amiga is a trademark of Commodore-Amiga, Inc .\"Amiga is a trademark of Commodore-Amiga, Inc
.sm "Brand and product names are trademarks or registered trademarks \ .sm "Brand and product names are trademarks or registered trademarks \
of their respective holders." of their respective holders."
.\"EOF
doc/Guidebook.tex
+39 -33
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{November 2, 2019} \date{November 7, 2019}
\maketitle \maketitle
@@ -2875,7 +2875,7 @@ directory. The file may not exist, but it is a normal ASCII text file and
can be created with any text editor.\\ can be created with any text editor.\\
%.lp "" %.lp ""
On Windows, it is \mbox{``.nethackrc''} in the foler On Windows, it is \mbox{``.nethackrc''} in the folder
\mbox{{``\%USERPROFILE\%\textbackslash NetHack\textbackslash 3.6''}}. The \mbox{{``\%USERPROFILE\%\textbackslash NetHack\textbackslash 3.6''}}. The
file may not exist, but it is a normal ASCII text file and can be created file may not exist, but it is a normal ASCII text file and can be created
with any text editor. with any text editor.
@@ -3065,7 +3065,7 @@ Example:
%.lp "" %.lp ""
%.pg %.pg
Here is a short example of config file contents: Here is an example of configuration file contents:
%.sd %.sd
\begin{verbatim} \begin{verbatim}
# Set your character's role, race, gender, and alignment. # Set your character's role, race, gender, and alignment.
@@ -3073,10 +3073,13 @@ Here is a short example of config file contents:
# Turn on autopickup, set automatically picked up object types # Turn on autopickup, set automatically picked up object types
OPTIONS=autopickup,pickup_types:$"=/!?+ OPTIONS=autopickup,pickup_types:$"=/!?+
# Show colored text if possible
OPTIONS=color # Map customization
# Show lit corridors differently OPTIONS=color # Display things in color if possible
OPTIONS=lit_corridor OPTIONS=lit_corridor # Show lit corridors differently
OPTIONS=hilite_pet,hilite_pile
# Replace small punctuation (tick marks) with digits
SYMBOLS=S_boulder:0,S_golem:7
# No startup splash screen. Windows GUI only. # No startup splash screen. Windows GUI only.
OPTIONS=!splash_screen OPTIONS=!splash_screen
@@ -3518,7 +3521,7 @@ Valid settings are:
%.sd %.sd
%.si %.si
{\tt 0} --- disabled\\ {\tt 0} --- disabled\\
{\tt 1} --- enabled and make OS adjustment to support mouse use in the game\\ {\tt 1} --- enabled and make OS adjustment to support mouse use\\
{\tt 2} --- enabled like {\tt 1}, but does not make any OS adjustments\\ {\tt 2} --- enabled like {\tt 1}, but does not make any OS adjustments\\
%.ei %.ei
%.ed %.ed
@@ -3997,7 +4000,7 @@ windowtype that you have chosen.
Character strings that are too long may be truncated. Character strings that are too long may be truncated.
Not all window ports will adjust for all settings listed Not all window ports will adjust for all settings listed
here. You can safely add any of these options to your here. You can safely add any of these options to your
config file, and if the window port is capable of adjusting configuration file, and if the window port is capable of adjusting
to suit your preferences, it will attempt to do so. If it to suit your preferences, it will attempt to do so. If it
can't it will silently ignore it. You can find out if an can't it will silently ignore it. You can find out if an
option is supported by the window port that you are currently option is supported by the window port that you are currently
@@ -4250,7 +4253,8 @@ returns to {\it NetHack\/} to help compensate for international keyboard
issues. issues.
OPTIONS=subkeyvalue:171/92 OPTIONS=subkeyvalue:171/92
will return 92 to {\it NetHack\/}, if 171 was originally going to be returned. will return 92 to {\it NetHack\/}, if 171 was originally going to be returned.
You can use multiple subkeyvalue statements in the config file if needed. You can use multiple subkeyvalue statements in the configuration file
if needed.
Cannot be set with the `{\tt O}' command. Cannot be set with the `{\tt O}' command.
%.lp %.lp
\item[\ib{video}] \item[\ib{video}]
@@ -4321,12 +4325,13 @@ character in the pattern, specifically:
%.ed %.ed
The {\it autopickup\verb+_+exception\/} rules are processed in the order The {\it autopickup\verb+_+exception\/} rules are processed in the order
in which they appear in your config file, thus allowing a later rule to override in which they appear in your configuration file, thus allowing a
an earlier rule. later rule to override an earlier rule.
%.lp "" %.lp ""
Exceptions can be set with the `{\tt O}' command, but because they are not included Exceptions can be set with the `{\tt O}' command, but because they are not
in your config file, they won't be in effect if you save and then restore your game. included in your configuration file, they won't be in effect if you save
and then restore your game.
{\it autopickup\verb+_+exception\/} rules are not saved with the game. {\it autopickup\verb+_+exception\/} rules are not saved with the game.
\elist \elist
@@ -4375,8 +4380,9 @@ the ``{\tt <esc>}'', ``{\tt <enter>}'', and ``{\tt <space>}'' keys.
%.lp "Menu accelerator keys" %.lp "Menu accelerator keys"
\item[\tb{Menu accelerator keys}] \item[\tb{Menu accelerator keys}]
The menu control or accelerator keys can also be rebound via OPTIONS-lines The menu control or accelerator keys can also be rebound via OPTIONS lines
in the config file. You cannot bind object symbols into menu accelerators. in the configuration file.
You cannot bind object symbols into menu accelerators.
%.lp "Special command keys" %.lp "Special command keys"
\item[\tb{Special command keys}] \item[\tb{Special command keys}]
@@ -4546,7 +4552,7 @@ You can change the way the messages are shown in the message area, when
the message matches a user-defined pattern. the message matches a user-defined pattern.
%.pg %.pg
In general, the config file entries to configure the message types In general, the configuration file entries to describe the message types
look like this: look like this:
\begin{verbatim} \begin{verbatim}
MSGTYPE=type "pattern" MSGTYPE=type "pattern"
@@ -4584,7 +4590,7 @@ the user is prompted with more-prompt, and a message matching
``You displaced \verb+<+something\verb+>+'' is not shown at all. ``You displaced \verb+<+something\verb+>+'' is not shown at all.
%.lp %.lp
The order of the defined MSGTYPE-lines is important; the last matching The order of the defined MSGTYPE lines is important; the last matching
rule is used. Put the general case first, exceptions below them. rule is used. Put the general case first, exceptions below them.
%.pg %.pg
@@ -4595,11 +4601,12 @@ rule is used. Put the general case first, exceptions below them.
%.pg %.pg
Some platforms allow you to define colors used in menu lines when the 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 line matches a user-defined pattern.
win32gui support this. At this time the tty, curses, win32tty and
win32gui interfaces support this.
%.pg %.pg
In general, the config file entries to configure the menu color mappings In general, the configuration file entries to describe the menu color mappings
look like this: look like this:
\begin{verbatim} \begin{verbatim}
MENUCOLOR="pattern"=color&attribute MENUCOLOR="pattern"=color&attribute
@@ -4651,8 +4658,8 @@ specifies that any menu line with ``~blessed~'' contained
in it will be shown in green color, lines with ``~cursed~'' will be in it will be shown in green color, lines with ``~cursed~'' will be
shown in red, and lines with ``~cursed~'' followed by ``(being worn)'' shown in red, and lines with ``~cursed~'' followed by ``(being worn)''
on the same line will be shown in red color and underlined. on the same line will be shown in red color and underlined.
You can have multiple MENUCOLOR entries in your config file, You can have multiple MENUCOLOR entries in your configuration file,
and the last MENUCOLOR-line in your config file that matches and the last MENUCOLOR line that matches
a menu line will be used for the line. a menu line will be used for the line.
%.pg %.pg
@@ -4673,7 +4680,7 @@ At this time the Qt port and the win32tty and win32gui ports support the
use of user sounds. use of user sounds.
%.pg %.pg
The following config file entries are relevant to mapping user sounds The following configuration file entries are relevant to mapping user sounds
to messages: to messages:
\blist{} \blist{}
@@ -4852,7 +4859,7 @@ is tested; the character's name is ignored.
\elist \elist
The in-game options menu can help you determine the correct syntax for a The in-game options menu can help you determine the correct syntax for a
config file. configuration file.
The whole feature can be disable by setting option {\it statushilites} to 0. The whole feature can be disable by setting option {\it statushilites} to 0.
@@ -4894,7 +4901,7 @@ 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. {\it ROGUESYMBOLS\/} configuration file options.
Symbols are specified as {\it name:value\/} pairs. Symbols are specified as {\it name:value\/} pairs.
Note that {\it NetHack\/} escape-processes Note that {\it NetHack\/} escape-processes
the {\it value\/} string in conventional C fashion. the {\it value\/} string in conventional C fashion.
@@ -5094,13 +5101,16 @@ Default & Symbol Name & Description\\
} }
\hyphenation{sysconf} %no syllable breaks => don't hyphenate file name \hyphenation{sysconf} %no syllable breaks => don't hyphenate file name
%.pg %.lp
Notes: several symbols in this table appear to be blank. Notes:
%.lp "*"
Several symbols in this table appear to be blank.
They are the space character, except for S\verb+_+pet\verb+_+override They are the space character, except for S\verb+_+pet\verb+_+override
and S\verb+_+player\verb+_+override which don't have any default value and S\verb+_+player\verb+_+override which don't have any default value
and can only be used if enabled in the ``sysconf'' file. and can only be used if enabled in the ``sysconf'' file.
%.pg %.lp "*"
S\verb+_+rock is misleadingly named; rocks and stones use S\verb+_+gem. S\verb+_+rock is misleadingly named; rocks and stones use S\verb+_+gem.
Statues and boulders are the rock being referred to, but since Statues and boulders are the rock being referred to, but since
version 3.6.0, statues are displayed as the monster they depict. version 3.6.0, statues are displayed as the monster they depict.
@@ -5836,7 +5846,3 @@ Izchak Miller & Mike Stephenson
%\end{flushleft} %\end{flushleft}
\end{document} \end{document}
doc/fixes36.3
+4 -1
View File
@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.165 $ $NHDT-Date: 1573119743 2019/11/07 09:42:23 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.167 $ $NHDT-Date: 1573178084 2019/11/08 01:54:44 $
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,
@@ -243,6 +243,8 @@ a recent intended sanity check fix inadvertently bypassed placing a thrown
chained ball back onto the floor chained ball back onto the floor
in symset:curses, symbol S_tree was accidentally set to horizontal line where in symset:curses, symbol S_tree was accidentally set to horizontal line where
plus-or-minus sign was meant; also, change S_bars to not-equals sign plus-or-minus sign was meant; also, change S_bars to not-equals sign
percentage highlighting for Xp broke up/down/changed highlighting for it;
it was flagged as having gone up every time the percentage changed
curses: sometimes the message window would show a blank line after a prompt curses: sometimes the message window would show a blank line after a prompt
curses: the change to show map in columns 1..79 instead of 2..80 made the curses: the change to show map in columns 1..79 instead of 2..80 made the
highlight for '@' show up in the wrong place if clipped map had been highlight for '@' show up in the wrong place if clipped map had been
@@ -358,6 +360,7 @@ unix: sysconf CHECK_PLNAME=1 wouldn't work if attempt to obtain unix username
failed even though it didn't need that to check player character name failed even though it didn't need that to check player character name
unix+curses: startup error only reset terminal for tty; one noticeable unix+curses: startup error only reset terminal for tty; one noticeable
example was answering 'n' to "Destroy old game?" example was answering 'n' to "Destroy old game?"
vms: update install.com to include overlooked file bigrm-10.lev in nh-data.dlb
Windows: some startup error messages were not being delivered successfully Windows: some startup error messages were not being delivered successfully
WindowsGUI: player selection dialog box layout was not being adjusted for DPI WindowsGUI: player selection dialog box layout was not being adjusted for DPI
Windows: significant changes to default directory choices; see documentation Windows: significant changes to default directory choices; see documentation
include/patchlevel.h
+1 -1
View File
@@ -52,7 +52,7 @@
* Added several grammar corrections * Added several grammar corrections
* Improved recognition of deafness for several situations including the * Improved recognition of deafness for several situations including the
* playing of musical instruments and bribing negotiations with demon lords * playing of musical instruments and bribing negotiations with demon lords
* Fixed ignoring of god's wrath when hero injured himself during alter kick * Fixed ignoring of god's wrath when hero injured himself during altar kick
* Fixed several cases where persistent inventory window was not updated * Fixed several cases where persistent inventory window was not updated
* Fixed temple priests or shopkeepers moving over other monsters * Fixed temple priests or shopkeepers moving over other monsters
* Ensured that thrown or kicked objects will end up in bones * Ensured that thrown or kicked objects will end up in bones
src/botl.c
+9 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 botl.c $NHDT-Date: 1562114350 2019/07/03 00:39:10 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.146 $ */ /* NetHack 3.6 botl.c $NHDT-Date: 1573178085 2019/11/08 01:54:45 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.148 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */ /*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -141,9 +141,9 @@ do_statusline2()
if (Upolyd) if (Upolyd)
Sprintf(expr, "HD:%d", mons[u.umonnum].mlevel); Sprintf(expr, "HD:%d", mons[u.umonnum].mlevel);
else if (flags.showexp) else if (flags.showexp)
Sprintf(expr, "Xp:%u/%-1ld", u.ulevel, u.uexp); Sprintf(expr, "Xp:%d/%-1ld", u.ulevel, u.uexp);
else else
Sprintf(expr, "Exp:%u", u.ulevel); Sprintf(expr, "Exp:%d", u.ulevel);
xln = strlen(expr); xln = strlen(expr);
/* time/move counter */ /* time/move counter */
@@ -809,6 +809,12 @@ boolean *valsetlist;
if (anytype != ANY_MASK32) { if (anytype != ANY_MASK32) {
#ifdef STATUS_HILITES #ifdef STATUS_HILITES
if (chg || *curr->val) { if (chg || *curr->val) {
/* if Xp percentage changed, we set 'chg' to 1 above;
reset that if the Xp value hasn't actually changed
or possibly went down rather than up (level loss) */
if (chg == 1 && fld == BL_XP)
chg = compare_blstats(prev, curr);
curr->hilite_rule = get_hilite(idx, fld, curr->hilite_rule = get_hilite(idx, fld,
(genericptr_t) &curr->a, (genericptr_t) &curr->a,
chg, pc, &color); chg, pc, &color);
sys/vms/install.com
+3 -3
View File
@@ -1,9 +1,9 @@
$ ! vms/install.com -- set up nethack 'playground' $ ! vms/install.com -- set up nethack 'playground'
$! $NHDT-Date: 1542388600 2018/11/16 17:16:40 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.11 $ $! $NHDT-Date: 1573172443 2019/11/08 00:20:43 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.12 $
$! Copyright (c) 2016 by Robert Patrick Rankin $! Copyright (c) 2016 by Robert Patrick Rankin
$! NetHack may be freely redistributed. See license for details. $! NetHack may be freely redistributed. See license for details.
$ ! $ !
$ ! $NHDT-Date: 1542388600 2018/11/16 17:16:40 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.11 $ $ ! $NHDT-Date: 1573172452 2019/11/08 00:20:52 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.12 $
$ ! $ !
$ ! Use vmsbuild.com to create nethack.exe, makedefs, and lev_comp *first*. $ ! Use vmsbuild.com to create nethack.exe, makedefs, and lev_comp *first*.
$ ! $ !
@@ -35,7 +35,7 @@ $ sysconf_file = "[.sys.vms]sysconf"
$ guidebook = "[.doc]Guidebook.txt" $ guidebook = "[.doc]Guidebook.txt"
$ invoc_proc = "[.sys.vms]nethack.com" $ invoc_proc = "[.sys.vms]nethack.com"
$ trmcp_file = "[.sys.share]termcap" $ trmcp_file = "[.sys.share]termcap"
$ spec_files = "AIR.LEV,ASMODEUS.LEV,ASTRAL.LEV,BAALZ.LEV,BIGRM-%.LEV," - $ spec_files = "AIR.LEV,ASMODEUS.LEV,ASTRAL.LEV,BAALZ.LEV,BIGRM-*.LEV," -
+ "CASTLE.LEV,EARTH.LEV,FAKEWIZ%.LEV,FIRE.LEV," - + "CASTLE.LEV,EARTH.LEV,FAKEWIZ%.LEV,FIRE.LEV," -
+ "JUIBLEX.LEV,KNOX.LEV,MEDUSA-%.LEV,MINEFILL.LEV," - + "JUIBLEX.LEV,KNOX.LEV,MEDUSA-%.LEV,MINEFILL.LEV," -
+ "MINETN-%.LEV,MINEND-%.LEV,ORACLE.LEV,ORCUS.LEV," - + "MINETN-%.LEV,MINEND-%.LEV,ORACLE.LEV,ORCUS.LEV," -