Merge branch 'NetHack-3.6.2' of https://github.com/NetHack/NetHack

README

@@ -31,12 +31,12 @@ NetHack 3.6 is an enhancement to the dungeon exploration game NetHack,
 which is a distant descendent of Rogue and Hack, and a direct descendent of
 NetHack 3.4 as there was no NetHack 3.5 release.
 
-NetHack 3.6.2 contains a collection of more than 220 bug fixes to NetHack 3.6.1.
-The file doc/fixes36.2 in the source distribution has a full list of them. The
-text in there was written for the development team's own use and is provided 
-"as is", so please do not ask us to further explain the entries in that file. 
-Some entries might be considered "spoilers", particularly in the "new features" 
-section.
+NetHack 3.6.2 contains a collection of about 320 bug fixes to NetHack 3.6.1
+and more than 20 enhancements. The file doc/fixes36.2 in the source
+distribution has a full list of them. The text in there was written for the
+development team's own use and is provided  "as is", so please do not ask us
+to further explain the entries in that file. Some entries might be considered
+"spoilers", particularly in the "new features" section.
 
 Below you will find some other general notes that were not considered
 spoilers:
@@ -45,6 +45,7 @@ spoilers:
 * sys/winnt/nttty performance improvements mainly through the introduction
   of a back buffer approach
 * a couple of windows crash bug fixes
+* adoption of the curses window port that was in use in the community
 
                         - - - - - - - - - - -
 
@@ -193,6 +194,6 @@ In our own patches, we will assume that your code is synchronized with ours.
 
                   -- Good luck, and happy Hacking --
 
-# $NHDT-Date: 1546383333 2019/01/01 22:55:33 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.48 $
+# $NHDT-Date: 1557077369 2019/05/05 17:29:29 $ $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.55 $
 # Copyright (c) 2012 by Michael Allison
 # NetHack may be freely redistributed.  See license for details.

dat/data.base

@@ -424,9 +424,6 @@ barbarian
 	things.  He excelled them even in lithe economy of motion.
 	They were wolves, but he was a tiger.
 		[ Conan - The Warrior, by Robert E. Howard ]
-barbed devil
-	Barbed devils lack any real special abilities, though they
-	are quite difficult to kill.
 # takes "bat or bird" when specifying 'B'
 ~*combat
 ~*wombat
@@ -894,19 +891,19 @@ tiamat
 citrine*
 	A pale yellow variety of crystalline quartz resembling topaz.
 clay golem
-        It was a warm spring night when a fist knocked at the door so
-        hard that the hinges bent.
-        A man opened it and peered out into the street. There was
-        mist coming off the river and it was a cloudy night. He might
-        as well have tried to see through white velvet.
-        But he thought afterwards that there had been shapes out
-        there, just beyond the light spilling out into the road. A
-        lot of shapes, watching him carefully. He thought maybe
-        there'd been very faint points of light...
-        There was no mistaking the shape right in front of him,
-        though. It was big and dark red and looked like a child's
-        clay model of a man. Its eyes were two embers.
-                [ Feet of Clay, by Terry Pratchett ]
+	It was a warm spring night when a fist knocked at the door so
+	hard that the hinges bent.
+	A man opened it and peered out into the street. There was
+	mist coming off the river and it was a cloudy night. He might
+	as well have tried to see through white velvet.
+	But he thought afterwards that there had been shapes out
+	there, just beyond the light spilling out into the road. A
+	lot of shapes, watching him carefully. He thought maybe
+	there'd been very faint points of light...
+	There was no mistaking the shape right in front of him,
+	though. It was big and dark red and looked like a child's
+	clay model of a man. Its eyes were two embers.
+		[ Feet of Clay, by Terry Pratchett ]
 cleaver
 	Hither came Conan, the Cimmerian, black-haired, sullen-eyed,
 	sword in hand, a thief, a reaver, a slayer, with gigantic

dat/history

@@ -188,32 +188,35 @@ Terry Pratchett, passed away.  NetHack 3.6.0 introduced a tribute to him.
 team since the release of 3.4.3 with some of the beloved community patches.
 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 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 NetHack Development Team, as well as Steve VanDevender and 
-Kevin Smolkowski ensured that NetHack 3.6.1 continued to operate on various
+Kevin Smolkowski ensured that NetHack 3.6 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.
 
 Michael Allison, David Cohrs, Barton House, Pasi Kallinen, Alex Kompel,
 Dion Nicolaas, Derek S. Ray and Yitzhak Sapir maintained the port of
-NetHack 3.6.1 for Microsoft Windows.
+NetHack 3.6 for Microsoft Windows.
 
-Pat Rankin attempted to keep the VMS port running for NetHack 3.6.1,
+Pat Rankin attempted to keep the VMS port running for NetHack 3.6,
 hindered by limited access.  Kevin Smolkowski has updated and tested it
 for the most recent version of OpenVMS (V8.4 as of this writing) on Alpha
 and Integrity (aka Itanium aka IA64) but not VAX.
 
-Ray Chason resurrected the msdos port for 3.6.1 and contributed the
+Ray Chason resurrected the msdos port for 3.6 and contributed the
 necessary updates to the community at large.
 
+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 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.
+
+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 official NetHack web site is maintained by Ken Lorber at
 http://www.nethack.org/.
 
@@ -227,9 +230,9 @@ and in days past, devnull.net (gone for now, but not forgotten).
                            - - - - - - - - - -
 
 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 Development Team sometimes makes note of the names of the worst
+of these miscreants in this, the list of Dungeoneers:
 
     Adam Aronow               Janet Walz                Nathan Eady
     Alex Kompel               Janne Salmijarvi          Norm Meluch

doc/Guidebook.mn

@@ -1,4 +1,4 @@
-.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.304 $ $NHDT-Date: 1554849951 2019/04/09 22:45:51 $
+.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.305 $ $NHDT-Date: 1557251604 2019/05/07 17:53:24 $
 .\"
 .\" This is an excerpt from the 'roff' man page from the 'groff' package.
 .\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines.
@@ -24,7 +24,7 @@
 .ds vr "NetHack 3.6
 .ds f0 "\*(vr
 .ds f1
-.ds f2 "April 9, 2019
+.ds f2 "May 7, 2019
 .
 .\" A note on some special characters:
 .\" \(lq = left double quote
@@ -4210,8 +4210,8 @@ Allowed attributes are none, bold, dim, underline, blink, and inverse.
 combination with any of the other attributes.
 .pg
 To specify both a color and an attribute, use \(oq&\(cq to combine them.
-To specify multiple attributes, use \(oq\+\(cq to combine those.
-For example: \(lqmagenta&inverse\+dim\(rq.
+To specify multiple attributes, use \(oq+\(cq to combine those.
+For example: \(lqmagenta&inverse+dim\(rq.
 .pg
 Note that the display may substitute or ignore particular attributes
 depending upon its capabilities, and in general may interpret the
@@ -5004,15 +5004,6 @@ passed away. NetHack 3.6.0 introduced a tribute to him.
 team since the release of 3.4.3 with some of the beloved community
 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 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 NetHack Development Team, as well as \fBSteve VanDevender\fP and
 \fBKevin Smolkowski\fP, ensured that NetHack 3.6 continued to operate on
 various
@@ -5027,14 +5018,26 @@ maintained the port of NetHack 3.6 for Mac OSX.
 \fBDerek S. Ray\fP and \fBYitzhak Sapir\fP maintained the port of
 NetHack 3.6 for Microsoft Windows.
 .pg
-\fBPat Rankin\fP attempted to keep the VMS port running for NetHack 3.6.1,
+\fBPat Rankin\fP attempted to keep the VMS port running for NetHack 3.6,
 hindered by limited access. \fBKevin Smolkowski\fP has updated and tested it
 for the most recent version of OpenVMS (V8.4 as of this writing) on Alpha
 and Integrity (aka Itanium aka IA64) but not VAX.
 .pg
-\fBRay Chason\fP resurrected the msdos port for 3.6.1 and contributed the
+\fBRay Chason\fP resurrected the msdos port for 3.6 and contributed the
 necessary updates to the community at large.
 .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 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
+In early May 2019, another 320 bug fixes along with some enhancements and 
+the adopted curses window port, were released as 3.6.2.
+.pg
 The official NetHack web site is maintained by \fBKen Lorber\fP
 at
 .UR http://www.nethack.org/ .

doc/Guidebook.tex

@@ -45,7 +45,7 @@
 %.au
 \author{Original version - Eric S. Raymond\\
 (Edited and expanded for 3.6 by Mike Stephenson and others)}
-\date{April 9, 2019}
+\date{May 7, 2019}
 
 \maketitle
 
@@ -5600,18 +5600,6 @@ \section{Credits}
 team since the release of 3.4.3 with some of the beloved community
 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 {\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},
-{\it Pasi Kallinen}, {\it Ken Lorber}, {\it Dean Luick},
-{\it Patric Mueller}, {\it Pat Rankin}, {\it Derek S. Ray},
-{\it Alex Smith}, {\it Mike Stephenson}, {\it Janet Walz}, and
-{\it Paul Winner}.
-
 %.pg
 \medskip
 The {\it NetHack Development Team}, as well as {\it Steve VanDevender} and
@@ -5632,16 +5620,33 @@ \section{Credits}
 
 %.pg
 \medskip
-{\it Pat Rankin} attempted to keep the VMS port running for NetHack 3.6.1,
+{\it Pat Rankin} attempted to keep the VMS port running for NetHack 3.6,
 hindered by limited access.  {\it Kevin Smolkowski} has updated and tested it
 for the most recent version of OpenVMS (V8.4 as of this writing) on Alpha
 and Integrity (aka Itanium aka IA64) but not VAX.
 
 %.pg
 \medskip
-{\it Ray Chason}  resurrected the msdos port for 3.6.1 and contributed the
+{\it Ray Chason}  resurrected the msdos port for 3.6 and contributed the
 necessary updates to the community at large.
 
+%.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 {\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},
+{\it Pasi Kallinen}, {\it Ken Lorber}, {\it Dean Luick},
+{\it Patric Mueller}, {\it Pat Rankin}, {\it Derek S. Ray},
+{\it Alex Smith}, {\it Mike Stephenson}, {\it Janet Walz}, and
+{\it Paul Winner}.
+
+%.pg
+\medskip
+In early May 2019, another 320 bug fixes along with some enhancements and 
+the adopted curses window port, were released as 3.6.2.
+
 %.pg
 \medskip
 \nd The official {\it NetHack\/} web site is maintained by {\it Ken Lorber} at