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

Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

Browse Source
This commit is contained in:
nhmall
2019-02-11 12:03:49 -05:00
parent d711f1a167 f3e7f49714
commit 4e14516e2d
6 changed files with 101 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
dat/history
View File

@@ -30,8 +30,8 @@ level revisions and updates of 3.0.
NetHack 3.0 was ported to the Atari by Eric R. Smith, to OS/2 by Timo
Hakulinen, and to VMS by David Gentzel. The three of them and Kevin Darcy
later joined the main development team to produce subsequent revisions of
3.0.
later joined the main NetHack Development Team to produce subsequent
revisions of 3.0.
Olaf Seibert ported NetHack 2.3 and 3.0 to the Amiga. Norm Meluch, Stephen
Spackman and Pierre Martineau designed overlay code for PC NetHack 3.0.
@@ -40,7 +40,7 @@ Dungeoneers, they continued to enhance the PC, Macintosh, and Amiga ports
through the later revisions of 3.0.
Headed by Mike Stephenson and coordinated by Izchak Miller and Janet Walz,
the development team which now included Ken Arromdee, David Cohrs,
the NetHack Development Team which now included Ken Arromdee, David Cohrs,
Jean-Christophe Collet, Kevin Darcy, Matt Day, Timo Hakulinen, Steve Linhart,
Dean Luick, Pat Rankin, Eric Raymond, and Eric Smith undertook a radical
revision of 3.0. They re-structured the game's design, and re-wrote major
@@ -66,21 +66,21 @@ Windows NT.
Dean Luick, with help from David Cohrs, developed NetHack 3.1 for X11.
Warwick Allison wrote a tiled version of NetHack for the Atari;
he later contributed the tiles to the DevTeam and tile support was
then added to other platforms.
he later contributed the tiles to the NetHack Development Team and tile
support was then added to other platforms.
The 3.2 development team, comprised of Michael Allison, Ken Arromdee, David
Cohrs, Jessie Collet, Steve Creps, Kevin Darcy, Timo Hakulinen, Steve
The 3.2 NetHack Development Team, comprised of Michael Allison, Ken Arromdee,
David Cohrs, Jessie Collet, Steve Creps, Kevin Darcy, Timo Hakulinen, Steve
Linhart, Dean Luick, Pat Rankin, Eric Smith, Mike Stephenson, Janet Walz,
and Paul Winner, released version 3.2 in April of 1996.
Version 3.2 marked the tenth anniversary of the formation of the development
team. In a testament to their dedication to the game, all thirteen members
of the original development team remained on the team at the start of work
on that release. During the interval between the release of 3.1.3 and 3.2,
one of the founding members of the development team, Dr. Izchak Miller,
passed away. That release of the game was dedicated to him by the
development and porting teams.
of the original NetHack Development Team remained on the team at the start of
work on that release. During the interval between the release of 3.1.3 and
3.2, one of the founding members of the NetHack Development Team,
Dr. Izchak Miller, passed away. That release of the game was dedicated to
him by the development and porting teams.
Version 3.2 proved to be more stable than previous versions. Many bugs
were fixed, abuses eliminated, and game features tuned for better game
@@ -99,12 +99,13 @@ the Qt interface.
Warren Cheung combined SLASH with the Wizard Patch to produce Slash'em, and
with the help of Kevin Hugo, added more features. Kevin later joined the
DevTeam and incorporated the best of these ideas in NetHack 3.3.
NetHack Development Team and incorporated the best of these ideas in
NetHack 3.3.
The final update to 3.2 was the bug fix release 3.2.3, which was released
simultaneously with 3.3.0 in December 1999 just in time for the Year 2000.
The 3.3 development team, consisting of Michael Allison, Ken Arromdee,
The 3.3 NetHack Development Team, consisting of Michael Allison, Ken Arromdee,
David Cohrs, Jessie Collet, Steve Creps, Kevin Darcy, Timo Hakulinen,
Kevin Hugo, Steve Linhart, Ken Lorber, Dean Luick, Pat Rankin, Eric Smith,
Mike Stephenson, Janet Walz, and Paul Winner, released 3.3.0 in
@@ -121,10 +122,10 @@ publicly available web-site listing all the bugs that had been discovered.
Despite that constantly growing bug list, 3.3 proved stable enough to last
for more than a year and a half.
The 3.4 development team initially consisted of Michael Allison, Ken Arromdee,
David Cohrs, Jessie Collet, Kevin Hugo, Ken Lorber, Dean Luick, Pat Rankin,
Mike Stephenson, Janet Walz, and Paul Winner, with Warwick Allison joining
just before the release of NetHack 3.4.0 in March 2002.
The 3.4 NetHack Development Team initially consisted of Michael Allison,
Ken Arromdee, David Cohrs, Jessie Collet, Kevin Hugo, Ken Lorber, Dean Luick,
Pat Rankin, Mike Stephenson, Janet Walz, and Paul Winner, with Warwick Allison
joining just before the release of NetHack 3.4.0 in March 2002.
As with version 3.3, various people contributed to the game as a whole as
well as supporting ports on the different platforms that NetHack runs on:
@@ -153,7 +154,7 @@ resurrected it for 3.3.1.
The release of NetHack 3.4.3 in December 2003 marked the beginning of a
long release hiatus. 3.4.3 proved to be a remarkably stable version that
provided continued enjoyment by the community for more than a decade. The
devteam slowly and quietly continued to work on the game behind the scenes
NetHack Development Team slowly and quietly continued to work on the game behind the scenes
during the tenure of 3.4.3. It was during that same period that several
new variants emerged within the NetHack community. Notably sporkhack by
Derek S. Ray, unnethack by Patric Mueller, nitrohack and its successors
@@ -166,17 +167,18 @@ released publicly by other parties. Since that code was a work-in-progress
and had not gone through a period of debugging, it was decided that the
version numbers present on that code snapshot would be retired and never
used in an official NetHack release. An announcement was posted on the
devteam's official nethack.org website to that effect, stating that there
would never be a 3.4.4, 3.5, or 3.5.0 official release version.
NetHack Development Team's official nethack.org website to that effect,
stating that there would never be a 3.4.4, 3.5, or 3.5.0 official release
version.
In January 2015, preparation began for the release of NetHack 3.6.
At the beginning of development for what would eventually get released
as 3.6.0, the development team consisted of Warwick Allison,
as 3.6.0, the NetHack Development Team consisted of Warwick Allison,
Michael Allison, Ken Arromdee, David Cohrs, Jessie Collet, Ken Lorber,
Dean Luick, Pat Rankin, Mike Stephenson, Janet Walz, and Paul Winner.
Leading up to the release of 3.6.0 in early 2015, new members Sean Hunt,
Pasi Kallinen, and Derek S. Ray joined the NetHack development team.
Pasi Kallinen, and Derek S. Ray joined the NetHack Development Team.
Near the end of the development of 3.6.0, one of the significant inspirations
for many of the humorous and fun features found in the game, author
@@ -188,14 +190,14 @@ Many bugs were fixed and some code was restructured.
In late April 2018, several hundred bug fixes for 3.6.0 and some new
features were assembled and released as NetHack 3.6.1.
The development team at the time of release of 3.6.1 consisted of
The NetHack Development Team at the time of release of 3.6.1 consisted of
Warwick Allison, Michael Allison, Ken Arromdee, David Cohrs, Jessie Collet,
Pasi Kallinen, Ken Lorber, Dean Luick, Patric Mueller, Pat Rankin,
Derek S. Ray, Alex Smith, Mike Stephenson, Janet Walz and Paul Winner.
The development team, as well as Steve VanDevender and Kevin Smolkowski
ensured that NetHack 3.6.1 continued to operate on various Unix flavors
as well as maintaining the X11 interface.
The NetHack Development Team, as well as Steve VanDevender and
Kevin Smolkowski ensured that NetHack 3.6.1 continued to operate on various
Unix flavors as well as maintaining the X11 interface.
Ken Lorber, Haoyang Wang, Pat Rankin, and Dean Luick maintained the port
of NetHack 3.6.1 for Mac OSX.

38
doc/Guidebook.mn
View File

@@ -24,7 +24,7 @@
.ds vr "NetHack 3.6
.ds f0 "\*(vr
.ds f1
.ds f2 "December 15, 2018
.ds f2 "February 10, 2019
.
.\" A note on some special characters:
.\" \(lq = left double quote
@@ -4714,7 +4714,7 @@ Creps\fP, \fBEric Hendrickson\fP, \fBIzchak Miller\fP, \fBJohn Rupley\fP,
.pg
NetHack 3.0 was ported to the Atari by \fBEric R. Smith\fP, to OS/2 by
\fBTimo Hakulinen\fP, and to VMS by \fBDavid Gentzel\fP. The three of them
and \fBKevin Darcy\fP later joined the main development team to produce
and \fBKevin Darcy\fP later joined the main NetHack Development Team to produce
subsequent revisions of 3.0.
.pg
\fBOlaf Seibert\fP ported NetHack 2.3 and 3.0 to the Amiga.
@@ -4725,7 +4725,7 @@ continued to enhance the PC, Macintosh, and Amiga ports through the later
revisions of 3.0.
.pg
Headed by \fBMike Stephenson\fP and coordinated by \fBIzchak Miller\fP and
\fBJanet Walz\fP, the development team which now included \fBKen Arromdee\fP,
\fBJanet Walz\fP, the NetHack Development Team which now included \fBKen Arromdee\fP,
\fBDavid Cohrs\fP, \fBJean-Christophe Collet\fP, \fBKevin Darcy\fP,
\fBMatt Day\fP, \fBTimo Hakulinen\fP, \fBSteve Linhart\fP, \fBDean Luick\fP,
\fBPat Rankin\fP, \fBEric Raymond\fP, and \fBEric Smith\fP undertook a radical
@@ -4757,10 +4757,10 @@ ported NetHack 3.1 to the Atari. \fBPat Rankin\fP, with help from
\fBDean Luick\fP, with help from \fBDavid Cohrs\fP, developed NetHack
3.1 for X11.
\fBWarwick Allison\fP wrote a tiled version of NetHack for the Atari;
he later contributed the tiles to the DevTeam and tile support was
he later contributed the tiles to the NetHack Development Team and tile support was
then added to other platforms.
.pg
The 3.2 development team, comprised of \fBMichael Allison\fP, \fBKen
The 3.2 NetHack Development Team, comprised of \fBMichael Allison\fP, \fBKen
Arromdee\fP, \fBDavid Cohrs\fP, \fBJessie Collet\fP, \fBSteve Creps\fP,
\fBKevin Darcy\fP, \fBTimo Hakulinen\fP, \fBSteve Linhart\fP, \fBDean
Luick\fP, \fBPat Rankin\fP, \fBEric Smith\fP, \fBMike Stephenson\fP,
@@ -4769,9 +4769,9 @@ Luick\fP, \fBPat Rankin\fP, \fBEric Smith\fP, \fBMike Stephenson\fP,
.pg
Version 3.2 marked the tenth anniversary of the formation of the development
team. In a testament to their dedication to the game, all thirteen members
of the original development team remained on the team at the start of work
of the original NetHack Development Team remained on the team at the start of work
on that release. During the interval between the release of 3.1.3
and 3.2, one of the founding members of the development team, \fBDr. Izchak
and 3.2, one of the founding members of the NetHack Development Team, \fBDr. Izchak
Miller\fP, was diagnosed with cancer and passed away. That release of the
game was dedicated to him by the development and porting teams.
.pg
@@ -4792,12 +4792,12 @@ casting system with the Wizard Patch.
\fBWarren Cheung\fP combined SLASH with the Wizard Patch to produce Slash'EM,
and with the help of \fBKevin Hugo\fP, added more features.
Kevin later joined the
DevTeam and incorporated the best of these ideas in NetHack 3.3.
NetHack Development Team and incorporated the best of these ideas in NetHack 3.3.
.pg
The final update to 3.2 was the bug fix release 3.2.3, which was released
simultaneously with 3.3.0 in December 1999 just in time for the Year 2000.
.pg
The 3.3 development team, consisting of
The 3.3 NetHack Development Team, consisting of
\fBMichael Allison\fP, \fBKen Arromdee\fP,
\fBDavid Cohrs\fP, \fBJessie Collet\fP, \fBSteve Creps\fP, \fBKevin Darcy\fP,
\fBTimo Hakulinen\fP, \fBKevin Hugo\fP, \fBSteve Linhart\fP, \fBKen Lorber\fP,
@@ -4817,7 +4817,7 @@ available web-site listing all the bugs that had been discovered. Despite
that constantly growing bug list, 3.3 proved stable enough to last for
more than a year and a half.
.pg
The 3.4 development team initially consisted of
The 3.4 NetHack Development Team initially consisted of
\fBMichael Allison\fP, \fBKen Arromdee\fP,
\fBDavid Cohrs\fP, \fBJessie Collet\fP, \fBKevin Hugo\fP, \fBKen Lorber\fP,
\fBDean Luick\fP, \fBPat Rankin\fP, \fBMike Stephenson\fP,
@@ -4857,7 +4857,7 @@ resurrected it for 3.3.1.
The release of NetHack 3.4.3 in December 2003 marked the beginning of a
long release hiatus. 3.4.3 proved to be a remarkably stable version that
provided continued enjoyment by the community for more than a decade. The
devteam slowly and quietly continued to work on the game behind the scenes
NetHack Development Team slowly and quietly continued to work on the game behind the scenes
during the tenure of 3.4.3. It was during that same period that several new
variants emerged within the NetHack community. Notably sporkhack by
\fBDerek S. Ray\fP, unnethack by \fBPatric Mueller\fP, nitrohack and its
@@ -4870,21 +4870,21 @@ released publicly by other parties. Since that code was a work-in-progress
and had not gone through the process of debugging it as a suitable release,
it was decided that the version numbers present on that code snapshot would
be retired and never used in an official NetHack release. An announcement
was posted on the devteam's official nethack.org website to that effect,
was posted on the NetHack Development Team's official nethack.org website to that effect,
stating that there would never be a 3.4.4, 3.5, or 3.5.0 official release
version.
.pg
In January 2015, preparation began for the release of NetHack 3.6.
.pg
At the beginning of development for what would eventually get released
as 3.6.0, the development team consisted of \fBWarwick Allison\fP,
as 3.6.0, the NetHack Development Team consisted of \fBWarwick Allison\fP,
\fBMichael Allison\fP, \fBKen Arromdee\fP,
\fBDavid Cohrs\fP, \fBJessie Collet\fP,
\fBKen Lorber\fP, \fBDean Luick\fP, \fBPat Rankin\fP,
\fBMike Stephenson\fP, \fBJanet Walz\fP, and \fBPaul Winner\fP.
In early 2015, ahead of the release of 3.6.0, new members
\fBSean Hunt\fP, \fBPasi Kallinen\fP, and \fBDerek S. Ray\fP
joined the NetHack development team.
joined the NetHack Development Team.
.pg
Near the end of the development of 3.6.0, one of the significant inspirations for many of
the humorous and fun features found in the game, author Terry Pratchett,
@@ -4896,14 +4896,14 @@ patches. Many bugs were fixed and some code was restructured.
.pg
In late April 2018, several hundred bug fixes for 3.6.0 and
some new features were assembled and released as NetHack 3.6.1.
The development team at the time of release of 3.6.1 consisted of
The NetHack Development Team at the time of release of 3.6.1 consisted of
\fBWarwick Allison\fP, \fBMichael Allison\fP, \fBKen Arromdee\fP,
\fBDavid Cohrs\fP, \fBJessie Collet\fP, \fBPasi Kallinen\fP,
\fBKen Lorber\fP, \fBDean Luick\fP, \fBPatric Mueller\fP,
\fBPat Rankin\fP, \fBDerek S. Ray\fP, \fBAlex Smith\fP,
\fBMike Stephenson\fP, \fBJanet Walz\fP, and \fBPaul Winner\fP.
.pg
The development team, as well as \fBSteve VanDevender\fP and
The NetHack Development Team, as well as \fBSteve VanDevender\fP and
\fBKevin Smolkowski\fP, ensured that NetHack 3.6 continued to operate on
various
.UX
@@ -4944,9 +4944,9 @@ and in days past, devnull.net (gone for now, but not forgotten).
. \" to the right, so pad them with a few spaces
.pg
From time to time, some depraved individual out there in netland sends a
particularly intriguing modification to help out with the game. The Gods of
the Dungeon sometimes make note of the names of the worst of these miscreants
in this, the list of Dungeoneers:
particularly intriguing modification to help out with the game. The NetHack
Develpment Team sometimes makes note of the names of the worst of these
miscreants in this, the list of Dungeoneers:
.
.TS S
center;

36
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{December 15, 2018}
\date{February 10, 2019}
\maketitle
@@ -5207,7 +5207,7 @@ NetHack\/} 3.0c.
\medskip
\nd {\it NetHack\/} 3.0 was ported to the Atari by {\it Eric R. Smith}, to OS/2 by
{\it Timo Hakulinen}, and to VMS by {\it David Gentzel}. The three of them
and {\it Kevin Darcy\/} later joined the main development team to produce
and {\it Kevin Darcy\/} later joined the main {\it NetHack Development Team} to produce
subsequent revisions of 3.0.
%.pg
@@ -5222,7 +5222,7 @@ revisions of 3.0.
%.pg
\medskip
\nd Headed by {\it Mike Stephenson\/} and coordinated by {\it Izchak Miller\/} and
{\it Janet Walz}, the development team which now included {\it Ken Arromdee},
{\it Janet Walz}, the {\it NetHack Development Team} which now included {\it Ken Arromdee},
{\it David Cohrs}, {\it Jean-Christophe Collet}, {\it Kevin Darcy},
{\it Matt Day}, {\it Timo Hakulinen}, {\it Steve Linhart}, {\it Dean Luick},
{\it Pat Rankin}, {\it Eric Raymond}, and {\it Eric Smith\/} undertook a radical
@@ -5265,12 +5265,12 @@ was responsible for the VMS version of {\it NetHack\/} 3.1.
\nd {\it Dean Luick}, with help from {\it David Cohrs}, developed {\it NetHack\/}
3.1 for X11.
{\it Warwick Allison} wrote a tiled version of {\it NetHack\/} for the Atari;
he later contributed the tiles to the DevTeam and tile support was
he later contributed the tiles to the {\it NetHack Development Team} and tile support was
then added to other platforms.
%.pg
\medskip
\nd The 3.2 development team, comprised of {\it Michael Allison}, {\it Ken
\nd The 3.2 {\it NetHack Development Team}, comprised of {\it Michael Allison}, {\it Ken
Arromdee}, {\it David Cohrs}, {\it Jessie Collet}, {\it Steve Creps}, {\it
Kevin Darcy}, {\it Timo Hakulinen}, {\it Steve Linhart}, {\it Dean Luick},
{\it Pat Rankin}, {\it Eric Smith}, {\it Mike Stephenson}, {\it Janet Walz},
@@ -5280,9 +5280,9 @@ and {\it Paul Winner}, released version 3.2 in April of 1996.
\medskip
\nd Version 3.2 marked the tenth anniversary of the formation of the development
team. In a testament to their dedication to the game, all thirteen members
of the original development team remained on the team at the start of work on
of the original {\it NetHack Development Team} remained on the team at the start of work on
that release. During the interval between the release of 3.1.3 and 3.2,
one of the founding members of the development team, {\it Dr. Izchak Miller},
one of the founding members of the {\it NetHack Development Team}, {\it Dr. Izchak Miller},
was diagnosed with cancer and passed away. That release of the game was
dedicated to him by the development and porting teams.
@@ -5310,7 +5310,7 @@ casting system with the Wizard Patch.
to produce {\it Slash'EM\/}, and
with the help of {\it Kevin Hugo}, added more features.
Kevin later joined the
DevTeam and incorporated the best of these ideas into {\it NetHack\/} 3.3.
{\it NetHack Development Team} and incorporated the best of these ideas into {\it NetHack\/} 3.3.
%.pg
\medskip
@@ -5319,7 +5319,7 @@ simultaneously with 3.3.0 in December 1999 just in time for the Year 2000.
%.pg
\medskip
The 3.3 development team, consisting of {\it Michael Allison}, {\it Ken Arromdee},
The 3.3 {\it NetHack Development Team}, consisting of {\it Michael Allison}, {\it Ken Arromdee},
{\it David Cohrs}, {\it Jessie Collet}, {\it Steve Creps}, {\it Kevin Darcy},
{\it Timo Hakulinen}, {\it Kevin Hugo}, {\it Steve Linhart}, {\it Ken Lorber},
{\it Dean Luick}, {\it Pat Rankin}, {\it Eric Smith}, {\it Mike Stephenson},
@@ -5341,7 +5341,7 @@ more than a year and a half.
%.pg
\medskip
The 3.4 development team initially consisted of
The 3.4 {\it NetHack Development Team} initially consisted of
{\it Michael Allison}, {\it Ken Arromdee},
{\it David Cohrs}, {\it Jessie Collet}, {\it Kevin Hugo}, {\it Ken Lorber},
{\it Dean Luick}, {\it Pat Rankin}, {\it Mike Stephenson},
@@ -5402,7 +5402,7 @@ resurrected it for 3.3.1.
The release of {\it NetHack\/} 3.4.3 in December 2003 marked the beginning of
a long release hiatus. 3.4.3 proved to be a remarkably stable version that
provided continued enjoyment by the community for more than a decade. The
devteam slowly and quietly continued to work on the game behind the scenes
{\it NetHack Development Team} slowly and quietly continued to work on the game behind the scenes
during the tenure of 3.4.3. It was during that same period that several new
variants emerged within the {\it NetHack\/} community. Notably sporkhack by
Derek S. Ray, {\it unnethack\/} by Patric Mueller, {\it nitrohack\/} and its
@@ -5417,7 +5417,7 @@ released publicly by other parties. Since that code was a work-in-progress
and had not gone through the process of debugging it as a suitable release,
it was decided that the version numbers present on that code snapshot would
be retired and never used in an official {\it NetHack\/} release. An
announcement was posted on the devteam's official {\it nethack.org\/} website
announcement was posted on the {\it NetHack Development Team}'s official {\it nethack.org\/} website
to that effect, stating that there would never be a 3.4.4, 3.5, or 3.5.0
official release version.
@@ -5428,7 +5428,7 @@ In January 2015, preparation began for the release of NetHack 3.6.
%.pg
\medskip
At the beginning of development for what would eventually get released
as 3.6.0, the development team consisted of {\it Warwick Allison},
as 3.6.0, the {\it NetHack Development Team} consisted of {\it Warwick Allison},
{\it Michael Allison}, {\it Ken Arromdee},
{\it David Cohrs}, {\it Jessie Collet},
{\it Ken Lorber}, {\it Dean Luick}, {\it Pat Rankin},
@@ -5453,7 +5453,7 @@ patches. Many bugs were fixed and some code was restructured.
%.pg
\medskip
In late April 2018, several hundred bug fixes for 3.6.0 and some new features
were assembled and released as NetHack 3.6.1. The development team at the
were assembled and released as NetHack 3.6.1. The {\it NetHack Development Team} at the
time of release of 3.6.1 consisted of
{\it Warwick Allison}, {\it Michael Allison}, {\it Ken Arromdee},
{\it David Cohrs}, {\it Jessie Collet},
@@ -5464,7 +5464,7 @@ time of release of 3.6.1 consisted of
%.pg
\medskip
The development team, as well as {\it Steve VanDevender} and
The {\it NetHack Development Team}, as well as {\it Steve VanDevender} and
{\it Kevin Smolkowski}, ensured that {\it NetHack\/} 3.6 continued to
operate on various Unix flavors and maintained the X11 interface.
@@ -5519,9 +5519,9 @@ unnamed dungeoneers who invest their time and effort into annual
\section*{Dungeoneers}
%.pg
\nd From time to time, some depraved individual out there in netland sends a
particularly intriguing modification to help out with the game. The Gods of
the Dungeon sometimes make note of the names of the worst of these miscreants
in this, the list of Dungeoneers:
particularly intriguing modification to help out with the game. The
{\it NetHack Development Team} sometimes makes note of the names of the worst
of these miscreants in this, the list of Dungeoneers:
%.sd
\begin{center}
\begin{tabular}{llll}

4
doc/fixes36.2
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.254 $ $NHDT-Date: 1549835645 2019/02/10 21:54:05 $
$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.255 $ $NHDT-Date: 1549849509 2019/02/11 01:45:09 $
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,
@@ -464,6 +464,8 @@ windows-gui: recognize new BL_RESET in status_update; no change in behavior yet
windows-gui: align hpbar behavior at zero hit points with tty behavior
windows-gui: add support for status_hilites for the player condition field
such as stone, slime, strngl, blind, deaf, stun, conf, etc.
windows-gui: a shop or vault message could appear in a popup after the
close-window button was used when game was ending
windows-tty: Specify both width and height when creating font for width testing
windows-tty: To counter lag problems that were occuring with the Win32 console
port, implement a console back buffer to reduce the number of calls

32
src/shk.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 shk.c $NHDT-Date: 1548978606 2019/01/31 23:50:06 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.154 $ */
/* NetHack 3.6 shk.c $NHDT-Date: 1549849510 2019/02/11 01:45:10 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.155 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1781,16 +1781,23 @@ int croaked;
long loss = 0L;
long umoney;
struct eshk *eshkp = ESHK(shkp);
boolean take = FALSE, taken = FALSE;
boolean take = FALSE, taken = FALSE, verbose;
unsigned save_minvis = shkp->minvis;
int roomno = *u.ushops;
char takes[BUFSZ];
verbose = !program_state.stopprint;
#ifdef HANGUPHANDLING
verbose &= !program_state.done_hup;
#endif
/* not strictly consistent; affects messages and prevents next player
(if bones are saved) from blundering into or being ambused by an
invisible shopkeeper */
shkp->minvis = 0;
/* The simplifying principle is that first-come
already took everything you had. */
if (numsk > 1) {
if (cansee(shkp->mx, shkp->my) && croaked) {
if (verbose && cansee(shkp->mx, shkp->my) && croaked) {
takes[0] = '\0';
if (has_head(shkp->data) && !rn2(2))
Sprintf(takes, ", shakes %s %s,", noit_mhis(shkp),
@@ -1810,7 +1817,7 @@ int croaked;
&& !eshkp->robbed && !eshkp->debit && NOTANGRY(shkp)
&& !eshkp->following && u.ugrave_arise < LOW_PM) {
taken = (invent != 0);
if (taken)
if (taken && verbose)
pline("%s gratefully inherits all your possessions.",
Shknam(shkp));
set_repo_loc(shkp);
@@ -1844,17 +1851,19 @@ int croaked;
money2mon(shkp, umoney);
context.botl = 1;
}
pline("%s %s all your possessions.", Shknam(shkp), takes);
if (verbose)
pline("%s %s all your possessions.", Shknam(shkp), takes);
taken = TRUE;
/* where to put player's invent (after disclosure) */
set_repo_loc(shkp);
} else {
money2mon(shkp, loss);
context.botl = 1;
pline("%s %s the %ld %s %sowed %s.", Shknam(shkp),
takes, loss, currency(loss),
strncmp(eshkp->customer, plname, PL_NSIZ) ? "" : "you ",
noit_mhim(shkp));
if (verbose)
pline("%s %s the %ld %s %sowed %s.", Shknam(shkp),
takes, loss, currency(loss),
strncmp(eshkp->customer, plname, PL_NSIZ) ? "" : "you ",
noit_mhim(shkp));
/* shopkeeper has now been paid in full */
pacify_shk(shkp);
eshkp->following = 0;
@@ -1866,7 +1875,7 @@ int croaked;
if (!inhishop(shkp))
home_shk(shkp, FALSE);
}
clear:
clear:
shkp->minvis = save_minvis;
setpaid(shkp);
return taken;
@@ -1900,7 +1909,8 @@ struct monst *shkp;
repo.shopkeeper = shkp;
}
/* called at game exit, after inventory disclosure but before making bones */
/* called at game exit, after inventory disclosure but before making bones;
shouldn't issue any messages */
void
finish_paybill()
{

15
src/vault.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 vault.c $NHDT-Date: 1549157816 2019/02/03 01:36:56 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.60 $ */
/* NetHack 3.6 vault.c $NHDT-Date: 1549849513 2019/02/11 01:45:13 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.61 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1068,13 +1068,19 @@ paygd()
struct obj *coins, *nextcoins;
int gx, gy;
char buf[BUFSZ];
boolean verbose;
if (!umoney || !grd)
return;
verbose = !program_state.stopprint;
#ifdef HANGUPHANDLING
verbose &= !program_state.done_hup;
#endif
if (u.uinvault) {
Your("%ld %s goes into the Magic Memory Vault.", umoney,
currency(umoney));
if (verbose)
Your("%ld %s goes into the Magic Memory Vault.",
umoney, currency(umoney));
gx = u.ux;
gy = u.uy;
} else {
@@ -1083,7 +1089,8 @@ paygd()
return;
}
mnexto(grd);
pline("%s remits your gold to the vault.", Monnam(grd));
if (verbose)
pline("%s remits your gold to the vault.", Monnam(grd));
gx = rooms[EGD(grd)->vroom].lx + rn2(2);
gy = rooms[EGD(grd)->vroom].ly + rn2(2);
Sprintf(buf, "To Croesus: here's the gold recovered from %s the %s.",