Merge branch 'NetHack-3.6.2'

Files

@@ -443,36 +443,6 @@ ttyoptions
 (tile files optionally generated for X ports at playground creation time)
 pet_mark.xbm  rip.xpm       x11tiles
 
-Arc-fila.lev  Arc-filb.lev  Arc-goal.lev  Arc-loca.lev  Arc-strt.lev
-Bar-fila.lev  Bar-filb.lev  Bar-goal.lev  Bar-loca.lev  Bar-strt.lev
-Cav-fila.lev  Cav-filb.lev  Cav-goal.lev  Cav-loca.lev  Cav-strt.lev
-Hea-fila.lev  Hea-filb.lev  Hea-goal.lev  Hea-loca.lev  Hea-strt.lev
-Kni-fila.lev  Kni-filb.lev  Kni-goal.lev  Kni-loca.lev  Kni-strt.lev
-Mon-fila.lev  Mon-filb.lev  Mon-goal.lev  Mon-loca.lev  Mon-strt.lev
-Pri-fila.lev  Pri-filb.lev  Pri-goal.lev  Pri-loca.lev  Pri-strt.lev
-Ran-fila.lev  Ran-filb.lev  Ran-goal.lev  Ran-loca.lev  Ran-strt.lev
-Rog-fila.lev  Rog-filb.lev  Rog-goal.lev  Rog-loca.lev  Rog-strt.lev
-Sam-fila.lev  Sam-filb.lev  Sam-goal.lev  Sam-loca.lev  Sam-strt.lev
-Tou-fila.lev  Tou-filb.lev  Tou-goal.lev  Tou-loca.lev  Tou-strt.lev
-Val-fila.lev  Val-filb.lev  Val-goal.lev  Val-loca.lev  Val-strt.lev
-Wiz-fila.lev  Wiz-filb.lev  Wiz-goal.lev  Wiz-loca.lev  Wiz-strt.lev
-air.lev       asmodeus.lev  astral.lev    baalz.lev     bigrm-1.lev
-bigrm-2.lev   bigrm-3.lev   bigrm-4.lev   bigrm-5.lev   bigrm-6.lev
-bigrm-7.lev   bigrm-8.lev   bigrm-9.lev   bigrm-10.lev  castle.lev
-earth.lev     fakewiz1.lev  fakewiz2.lev  fire.lev      juiblex.lev
-knox.lev      medusa-1.lev  medusa-2.lev  medusa-3.lev  medusa-4.lev
-minefill.lev  minend-1.lev  minend-2.lev  minend-3.lev  minetn-1.lev
-minetn-2.lev  minetn-3.lev  minetn-4.lev  minetn-5.lev  minetn-6.lev
-minetn-7.lev  oracle.lev    orcus.lev     sanctum.lev   soko1-1.lev
-soko1-2.lev   soko2-1.lev   soko2-2.lev   soko3-1.lev   soko3-2.lev
-soko4-1.lev   soko4-2.lev   tower1.lev    tower2.lev    tower3.lev
-valley.lev    water.lev     wizard1.lev   wizard2.lev   wizard3.lev
-data         dungeon.pdf  options      oracles      quest.dat    rumors
-Info.plist    nethack.icns
-dlb.lst   porthelp
-guioptions
-ttyoptions
-pet_mark.xbm  rip.xpm       x11tiles
 include:
 (file for tiles support copied from win/share at compile time)
 tile.h

dat/history

@@ -188,15 +188,8 @@ 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
@@ -204,16 +197,26 @@ 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/.
 

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
@@ -4211,8 +4211,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.
+To specify multiple attributes, use \(oq+\(cq to combine those.
-For example: \(lqmagenta&inverse\+dim\(rq.
+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
@@ -5005,15 +5005,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
@@ -5028,14 +5019,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 @@ 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
-\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 @@ maintained the port of  {\it NetHack\/} 3.6 for Microsoft Windows.
 
 %.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