Merge branch 'NetHack-3.7' into fix322

2020-12-30 14:05:16 -05:00
parent 61cc0e3d51 ef4efdb125
commit 47884d63ac
712 changed files with 36133 additions and 17024 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,7 @@ Release/
 binary/
 build/
 ipch/
-lib/
+lib/*
 Nethack.sln
 Nethack.sdf
 Nethack.opensdf
@@ -81,3 +81,9 @@ win/share/monthin.txt
 win/share/objthin.txt
 win/share/oththin.txt
 # end of ms-dos
+
+#libnethack
+targets/*
+#test.js
+#sys/lib/npm-package/build/nethack.js
+#sys/lib/npm-package/build/nethack.wasm
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "submodules/lua"]
+	path = submodules/lua
+	url = https://github.com/lua/lua.git
+[submodule "submodules/pdcurses"]
+	path = submodules/pdcurses
+	url = https://github.com/wmcbrine/PDCurses.git
--- a/322
+++ b/322
@@ -1,4 +1,4 @@
-Cross-compiling NetHack 3.7 Last edit: May 31, 2020
+Cross-compiling NetHack 3.7 Last edit: December 7, 2020

 The NetHack 3.7 build process differs from the build process of previous
 versions in some important ways that make it possible to use a cross-compiler
@@ -17,6 +17,8 @@ Part B Contents:
    B2. What needs to be built and executed on the HOST?
    B3. What needs to be built for the TARGET?
    B4. Case sample: msdos
+    B5. Case sample: amiga (started but incomplete)
+    B6. Case sample: Web Assembly, libnh

 --------------------------------------------------------------------------------
 Part A - Cross-compiling NetHack
@@ -45,7 +47,7 @@ may include, but not necessarily be limited to, any of the following:

  o Compilers: Some of the native compilers on historical platforms may only
    support the particular dialect of C that was popular when the platform and
-    compiler were in their prime. 
+    compiler were in their prime.

 Another useful potential result of cross-compiling, is that it paves the way
 for carrying out test and production builds of NetHack for multiple target
@@ -65,27 +67,27 @@ steps to be carried out:
        (a) additional build steps to follow, including some header
            files: pm.h, onames.h, date.h.
        (b) creation of files, containing information required by,
-            or about the game during its execution, that are stored in a 
+            or about the game during its execution, that are stored in a
            portable, platform-independent way, that need to be inserted
            into the game package.
        (c) creation of files containing information required by, or about
            the game during its execution, that are stored in an architecture
            and/or platform and/or operating system dependent way, that need
-            to be inserted into the game package (the quest text format is 
+            to be inserted into the game package (the quest text format is
            one example).
-    3. Compile and link the level compiler. This step needs to execute 
+    3. Compile and link the level compiler. This step needs to execute
       work-alike tools to lex and yacc, or needs to build pre-built lex and
       yacc output (.c, .h files) that are provided in the sys/share part of
       the NetHack source code tree.
    4. Execute the level compiler to read dat/*.des files and create
-       a set of binary output files that are architecture and/or operating 
+       a set of binary output files that are architecture and/or operating
       system dependent on the build platform, for use by the game during
       its execution.
    5. Compile and link the dungeon compiler. Like the level compiler, this
-       step needs to execute work-alike tools to lex and yacc, or needs to 
+       step needs to execute work-alike tools to lex and yacc, or needs to
       build pre-built lex and yacc output (.c, .h files) that are provided
       in the sys/share part of the NetHack source code tree.
-    6. Execute the dungeon compiler to read dat/dungeon.def and create 
+    6. Execute the dungeon compiler to read dat/dungeon.def and create
       a set of binary output files that are architecture and/or operating
       system dependent on the build platform, for use by the game during
       its execution.
@@ -126,7 +128,7 @@ steps to be carried out:
        (a) additional build steps to follow, including some header
            files: pm.h, onames.h, date.h.
        (b) creation of files, containing information required by,
-            or about the game during its execution, that are stored in a 
+            or about the game during its execution, that are stored in a
            portable, platform-independent way, that need to be inserted
            into the game package.
    3. Compile and link several less critical utilities such as uudecode,
@@ -143,7 +145,7 @@ steps to be carried out:
       previous steps 2b, 3 and 4 above.

 Step 4 is now the only impediment to cross-compiling NetHack, and is resolved
-by executing step 4 using a cross-compiler that runs on the build (host) 
+by executing step 4 using a cross-compiler that runs on the build (host)
 platform to produce a resulting binary for the target platform, instead of
 executing the native compiler.

@@ -158,18 +160,15 @@ cross-compiling possible:
    o  There is no creation of platform-dependent files, such as the quest
       text files, by makedefs during the build process. Instead, the quest
       text files have been converted to Lua and are inserted into the game
-       package for processing by the embedded Lua <fixme: interpreter?> 
-       during execution of NetHack.
+       package for processing by the embedded Lua during execution of NetHack.

    o  There is no build-time level compiler involved. Instead, the level
       descriptions have been converted to Lua and are inserted into the game
-       package for processing by the embeded Lua <fixme: interpreter?> 
-       during execution of NetHack. 
+       package for processing by the embeded Lua during execution of NetHack.

    o  There is no build-time dungeon compiler involved. Instead, the dungeon
       description has been converted to Lua and is inserted into the game
-       package for processing by the embeded Lua <fixme: interpreter?> 
-       during execution of NetHack. 
+       package for processing by the embeded Lua during execution of NetHack.

    o  Some of the build and option information that was formerly produced
       during build time by makedefs, and contained information about the
@@ -182,7 +181,7 @@ cross-compiling possible:
  +------------------------------------------------------------+

    o  If you have a favourite target platform (let's call it XX-Platform for
-       example purposes) that you'd like to see NetHack be able to run on, do 
+       example purposes) that you'd like to see NetHack be able to run on, do
       some research to find out if a cross-compiler exists that:
           - produces output for XX-Platform.
           - executes on a platform that you use and love (Linux, Windows,
@@ -191,9 +190,9 @@ cross-compiling possible:

    o  Then, make the community, devteam, and others aware that you're starting
       a cross-compile of NetHack for XX-Platform. You might need to ask some
-       "starting out" questions initially, and as you get deeper into it, you 
+       "starting out" questions initially, and as you get deeper into it, you
       might need to ask some tougher questions.
-       
+
    o  Perhaps consider forking from NetHack on GitHub, and do the
       cross-compiler work there in your fork. Strive to get it to a point where
       it's ready to play-test on XX-Platform, or perhaps even use an emulator
@@ -205,9 +204,9 @@ cross-compiling possible:
           - It will make it possible and straightforward to merge upstream
             NetHack changes into your work for the XX-Platform cross-compile
             so that it stays current with the game as it evolves.
-           - You may get help from others in the form of suggestions, or 
+           - You may get help from others in the form of suggestions, or
             pull-requests, or offers to join the development. Chances are,
-             you aren't the only person out there that would like to 
+             you aren't the only person out there that would like to
             establish/resurrect/maintain NetHack on XX-Platform.

       Have fun!
@@ -258,7 +257,7 @@ On the HOST, here are the mandatory things that have to be built.
    a) Using the HOST native compiler, build  HOST native utility makedefs

       Compile and link the following with these compiler switches:
-         -DCROSSCOMPILE and -DCROSSCOMPILE_HOST
+         -DCROSSCOMPILE
       from sources: util/makedefs.c, src/mdlib.c, src/monst.c, src/objects.c

    b) Execute HOST native makedefs utility, util/makedefs, as follows:
@@ -307,7 +306,7 @@ On the HOST, here are the mandatory things that have to be built.
          util/uudecode

                   from sources: sys/share/uudecode.c
-                   purpose:      convert some binary files, that are 
+                   purpose:      convert some binary files, that are
                                 distributed in the NetHack sources in
                                 uuencoded format, back into their
                                 original binary state
@@ -452,67 +451,240 @@ Using the cross-compiler, build the following targets:
 Cross-compiler used:     Andrew Wu's djgpp cross-compiler
 Cross-compiler url:      https://github.com/andrewwutw/build-djgpp
 Cross-compiler pre-built binary downloads:
-    https://github.com/andrewwutw/build-djgpp/releases/download/v2.9/
-    Mac OS X pre-built binary: djgpp-osx-gcc550.tar.bz2              (tested)
-    Linux pre-built binary   : djgpp-linux64-gcc550.tar.bz2          (tested)
-    mingw pre-built binary   : djgpp-mingw-gcc550-standalone.zip     (untested)
+    https://github.com/andrewwutw/build-djgpp/releases/download/v3.0/
+    Cross-compiler bits tested:
+           https://github.com/andrewwutw/build-djgpp
+       and the pre-built binary for your platform from:
+           https://github.com/andrewwutw/build-djgpp/releases/download/v3.0/
+       and a DOS-extender (for including in msdos packaging) from
+           http://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip
+       and pdcurses from:
+           https://github.com/wmcbrine/PDCurses.git

-The msdos cross-compile for NetHack 3.7 uses two phases of compiles: 
-Phase1 is the host-side prerequisite stuff that needs to be done first. 
-Phase2 is the cross-compile pieces using the djgpp cross-compiler hosted on
-Linux, Mac OS X, or Windows mingw.
+    - A shell script to download that djgpp cross-compiler and associated
+      pieces for either linux or macOS is available:

-First, on the host platform, you need to set up for a native Unix NetHack
-build in the usual way. For example, on linux:
-    cd sys/unix
-    sh setup.sh hints/linux
-    cd ../..
-    make fetch-lua
+           sh sys/msdos/fetch-cross-compiler.sh

-Now, you could proceed to go ahead and issue
-    make all
-to build a native NetHack at that point if you wish, but it is not needed
-for the msdos cross-compile. 
+    That script won't install anything, it just does file fetches and stores
+    them in subfolders of lib. The linux.2020 and macOS.2020 hints files are
+    configured to find the cross-compiler there if you add
+        CROSS_TO_MSDOS=1
+    on your make command line.

-Instead, a test shell script has been put together that will next accomplish
-each of the following tasks when it is executed. The shell script can be
-invoked by:
-    sh sys/msdos/msdos-cross-compile.sh
-but before you do that, please read the paragraphs below.
+    Note: Both the fetch-cross-compiler.sh script and and the msdos
+    cross-compile and package procedures require unzip and zip to be available
+    on your host build system.

-The shell script is meant to accomplish the following things:
+    On your linux host:

-    Prep   : the script downloads the djgpp cross-compiler for the host
-             platform into lib/djgpp (it doesn't install anything on the
-             system, nor does it need to, it just downloads them into the
-             identified directories), it downloads a copy of the msdos
-             dos-extender into lib/djgpp/cwsdpmi for later packaging up with
-             the msdos game, and it downloads pdcurses into lib/pdcurses
-             for cross-compiling during the TARGET build.
+        cd sys/unix ; sh setup.sh hints/linux.2020 ; cd ../..
+        make fetch-lua

-             Be certain to ensure the right products are at the url's
-             identified above *before* you execute the Case sample msdos
-             cross-compile script. The correct products were at those url's
-             at the time this was written in Dec 2019, but we don't assume
-             any responsibility for what is at those url's now or in the
-             future. You need to check before executing the script.
+    On your macOS host:

-    Phase1 : the script uses the Makefile sys/msdos/Makefile1.cross 
-             to complete the host-side build steps using the native gcc
-             compiler for the host platform. During phase1 the host obj
-             files are put in subfolder src/host_o to keep them separated
-             and distinguishable from the target obj files that will be
-             built in phase2.
+        cd sys/unix ; sh setup.sh hints/macOS.2020 ; cd ../..
+        make fetch-lua

-    Phase2 : the script uses the Makefile sys/msdos/Makefile2.cross
-             to complete the target-side build steps using the
-             cross-compiler that was obtained during the prep step of the
-             script described above. During phase2 the target obj files
-             are put in src/msdos_o to keep them separated and
-             distinguishable from the host obj files
+    The MSDOS cross-compile can then be carried out by specifying
+    CROSS_TO_MSDOS=1 on the make command line:

-    Package: the script then packages up the results that reside in
-             msdos-binary into a zip file which it places in lib called
-             nh370dos.zip.
+        make CROSS_TO_MSDOS=1 all
+        make CROSS_TO_MSDOS=1 package

+    You can explicitly include tty and curses support if desired. The default
+    you'll end up with is a tty-only cross-compile build:
+
+        make WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 all
+        make WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package
+
+    Result: The "make package" target will bundle all of the necessary
+            components to run NetHack on msdos into a folder:
+                targets/msdos/pkg
+            and then it zips the contents of that folder into:
+                targets/msdos/nh370dos.zip
+
+    Also note that building the msdos targets using the make command
+    above, does not preclude you from building local linux or macOS
+    targets as well. Just drop the CROSS_TO_MSDOS=1 from the make
+    command line. That's because the cross-compiler hints additions are
+    enclosed inside ifdef sections and won't interfere with the
+    non-cross-compile build in that case.
+
+  +-------------------------+
+  | B5. Case sample: amiga  |
+  +-------------------------+
+
+Disclaimer: This is a minimal recipe, just to help someone else get
+            started if they have a desire to get a full cross-compile of
+            NetHack going for the Amiga.
+            See CAVEATS below.
+
+Cross-compiler used:     bebbo's amiga-gcc
+Cross-compiler url:      https://github.com/bebbo/amiga-gcc
+
+    To our knowledge, a pre-built copy of the cross-compiler isn't available,
+    so you will likely have to obtain the cross-compiler sources via git and
+    build it on your system.
+
+    The build prerequisite packages for building the compiler on Ubuntu can be
+    easily obtained:
+
+        sudo apt install make wget git gcc g++ lhasa libgmp-dev \
+            libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev \
+            autoconf rsync
+
+    The build prerequisite packages for macOS via homebrew are documented but
+    not tested by us any of us to date.
+
+        brew install bash wget make lhasa gmp mpfr libmpc flex gettext \
+        texinfo gcc make autoconf
+
+    After installing the prerequite packages and the cross-compiler
+    it was a straightforward build:
+
+            git clone https://github.com/bebbo/amiga-gcc.git
+            cd amiga-gcc
+            make update
+
+           [Note that you may have to take ownership of the files in the bebbo
+            repo via chown before succesfully carrying out the next steps]
+
+            make clean
+            make clean-prefix
+            date; make all -j3 >&b.log; date
+
+    The compiler pieces are installed in /opt/amiga by default. If you prefer,
+    you can alter the prefix before you build if you want. The instructions
+    for doing so were spelled out at the time of this writing at:
+
+        https://github.com/bebbo/amiga-gcc
+
+    On your linux host:
+
+        cd sys/unix ; sh setup.sh hints/linux.2020 ; cd ../..
+        make fetch-lua
+
+    On your macOS host:
+
+        cd sys/unix ; sh setup.sh hints/macOS.2020 ; cd ../..
+        make fetch-lua
+
+    The Amiga cross-compile can then be carried out by specifying
+    CROSS_TO_AMIGA=1 on the make command line:
+
+        make CROSS_TO_AMIGA=1 all
+        make CROSS_TO_AMIGA=1 package
+
+    You can explicitly include tty and curses support if desired, otherwise
+    you'll end up with a tty-only cross-compile build. The SDL1 pdcurses
+    support has not been tested.
+
+        make WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_AMIGA=1 all
+
+    Result: The "make package" target will bundle the (hopefully) necessary
+            components to run NetHack on msdos into a folder:
+                targets/amiga/pkg
+            and then it zips the contents of that folder into:
+                targets/amiga/nh370ami.zip
+
+    Also note that building the amiga targets using the make command
+    above, does not preclude you from building local linux or macOS
+    targets as well. Just drop the CROSS_TO_AMIGA=1 from the make
+    command line.
+
+    The cross-compiler hints additions are enclosed inside ifdef sections
+    and won't interfere with the non-cross-compile build in that case.
+
+    CAVEATS: The original NetHack Amiga build steps included the source for
+             some utilities that were built and executed on the amiga:
+                 txt2iff and xpm2iff
+             as part of the NetHack build procedure on amiga.
+             Those did not compile out-of-the-box on the linux host. They
+             will either have to be:
+             - ported to build and run on the linux or macOS cross-compile
+               host
+          or
+
+             - their functionality will have to be rolled into amiga NetHack
+               itself and executed on the target Amiga the first time the game
+               is run, perhaps.
+
+    If you make headway, or are successful getting a working copy of
+    NetHack going on the amiga, drop us a note at devteam@nethack.org.
+
+  +--------------------------------+
+  | B6. Case sample: Web Assembly  |
+  +--------------------------------+
+
+Credit: The initial Web Assembly cross compile was found in a pull request:
+            https://github.com/NetHack/NetHack/pull/385
+        by apowers313. The pull request was merged with some accompanying
+        NetHack source tree integration changes in early October 2020.
+
+Cross-compiler used: emscripten
+Cross-compiler url: https://emscripten.org/docs/getting_started/downloads.html
+
+    Here's a brief guide to obtaining the cross-compiler sources via git and
+    building it on your system.
+
+    For Ubuntu, the build prerequisite packages for building the compiler can
+    be easily obtained:
+
+        sudo apt-get install python3 cmake default-jre
+
+    For macOS, you will need to install Xcode, git, cmake, Python 3.5 or new
+    (at time of this writing).
+
+    After installing the prerequite packages above, obtain the cross-compiler
+    via git and build it from the directory of your choice using steps similar
+    to these:
+
+            git clone https://github.com/emscripten-core/emsdk.git
+            cd emsdk
+            git pull
+            ./emsdk install latest
+            ./emsdk activate latest
+            source ./emsdk_env.sh
+
+    The steps above reflect what was outlined at this url at the time
+    of writing:
+
+            https://emscripten.org/docs/getting_started/downloads.html
+
+    That is the definitive source and trumps anything documented here.
+
+    On your linux host, prepare to cross-compile NetHack as follows:
+
+        cd sys/unix ; sh setup.sh hints/linux.2020 ; cd ../..
+        make fetch-lua
+
+    On your macOS host, prepare to cross-compile NetHack as follows:
+
+        cd sys/unix ; sh setup.sh hints/macOS.2020 ; cd ../..
+        make fetch-lua
+
+    Then, cross-compile to targets/wasm as follows:
+
+        make CROSS_TO_WASM=1
+
+    You can build src/libnh.a from pull request 385 as follows:
+
+        make WANT_LIBNH=1
+
+    Do not add any additional windowport interfaces to your build
+    (such as WANT_WIN_TTY=1 WANT_WIN_CURSES=1 WANT_WIN_X11=1 or
+    WANT_WIN_QT=1) as those aren't applicable to the Web Assembly
+    or nethacklib builds. A "shim" pseudo-windowport is included
+    from pull request 385.
+
+    Result: As mentioned, the wasm cross-compile will end up in
+            targets/wasm and the nethacklib.a will end up in
+            src.
+
+    The cross-compiler hints additions are enclosed inside ifdef sections
+    and shouldn't interfere with the non-cross-compile builds using
+    hints/linux.2020 or hints/macOS.2020.
+
+---

--- a/DEVEL/Developer.txt
+++ b/DEVEL/Developer.txt
@@ -4,7 +4,7 @@
 |___/\___|\_/\___|_\___/ .__/\___|_|
                        |_|

-# NetHack 3.6  Developer.txt       $NHDT-Date: 1524689668 2018/04/25 20:54:28 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.13 $
+# NetHack 3.7  Developer.txt       $NHDT-Date: 1596498265 2020/08/03 23:44:25 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.19 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/code_features.txt
+++ b/DEVEL/code_features.txt
@@ -1,4 +1,4 @@
-# NetHack 3.6  code_features.txt $NHDT-Date: 1524689669 2018/04/25 20:54:29 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.3 $
+# NetHack 3.7  code_features.txt $NHDT-Date: 1596498264 2020/08/03 23:44:24 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.6 $
 # Copyright (c) 2015 by Michael Allison
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/code_style.txt
+++ b/DEVEL/code_style.txt
@@ -1,4 +1,4 @@
-# NetHack 3.6  code_style.txt       $NHDT-Date: 1524689669 2018/04/25 20:54:29 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.2 $
+# NetHack 3.7  code_style.txt       $NHDT-Date: 1596498264 2020/08/03 23:44:24 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.5 $
 # Copyright (c) 2015 by Derek S. Ray
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/git_recipes.txt
+++ b/DEVEL/git_recipes.txt
@@ -1,4 +1,4 @@
-# NetHack 3.6  git_recipes.txt       $NHDT-Date: 1524689669 2018/04/25 20:54:29 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.9 $
+# NetHack 3.7  git_recipes.txt       $NHDT-Date: 1596498266 2020/08/03 23:44:26 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.11 $
 # Copyright (c) 2015 by Derek S. Ray
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/gitinfo.pl
+++ b/DEVEL/gitinfo.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  getinfo.pl       $NHDT-Date: 1524689669 2018/04/25 20:54:29 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.2 $
+# NetHack 3.7  getinfo.pl       $NHDT-Date: 1596498266 2020/08/03 23:44:26 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.3 $
 # Copyright (c) 2018 by Michael Allison
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/NHadd
+++ b/DEVEL/hooksdir/NHadd
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  NHadd       $NHDT-Date: 1524689631 2018/04/25 20:53:51 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.1 $
+# NetHack 3.7  NHadd       $NHDT-Date: 1596498406 2020/08/03 23:46:46 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.2 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/NHgithook.pm
+++ b/DEVEL/hooksdir/NHgithook.pm
@@ -1,5 +1,5 @@
 #
-# NetHack 3.6  NHgithook.pm       $NHDT-Date: 1524689631 2018/04/25 20:53:51 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.6 $
+# NetHack 3.7  NHgithook.pm       $NHDT-Date: 1596498406 2020/08/03 23:46:46 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.7 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/NHsubst
+++ b/DEVEL/hooksdir/NHsubst
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  NHsubst       $NHDT-Date: 1524689631 2018/04/25 20:53:51 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.4 $
+# NetHack 3.7  NHsubst       $NHDT-Date: 1596498407 2020/08/03 23:46:47 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.5 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

@@ -392,7 +392,7 @@ $TEST-Branch: theirs $

 TEST 8:
 <<< d1
-/* NetHack 3.6        objnam.c        $TEST-Date$ $TEST-Branch$:$TEST-Revision$ */
+/* NetHack 3.7        objnam.c        $TEST-Date$ $TEST-Branch$:$TEST-Revision$ */
 ===
-/* NetHack 3.6        objnam.c        $TEST-Date: 1426977394 2015/03/21 22:36:34 $  $TEST-Branch: master $:$TEST-Revision: 1.108 $ */
+/* NetHack 3.7        objnam.c        $TEST-Date: 1426977394 2015/03/21 22:36:34 $  $TEST-Branch: master $:$TEST-Revision: 1.108 $ */
 >>> d3
--- a/DEVEL/hooksdir/NHtext
+++ b/DEVEL/hooksdir/NHtext
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  NHtext       $NHDT-Date: 1524689631 2018/04/25 20:53:51 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $
+# NetHack 3.7  NHtext       $NHDT-Date: 1596498408 2020/08/03 23:46:48 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.9 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/applypatch-msg
+++ b/DEVEL/hooksdir/applypatch-msg
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  applypatch-msg       $NHDT-Date: 1524689646 2018/04/25 20:54:06 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.1 $
+# NetHack 3.7  applypatch-msg       $NHDT-Date: 1596498405 2020/08/03 23:46:45 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.2 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/commit-msg
+++ b/DEVEL/hooksdir/commit-msg
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  commit-msg       $NHDT-Date: 1524689646 2018/04/25 20:54:06 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.1 $
+# NetHack 3.7  commit-msg       $NHDT-Date: 1596498405 2020/08/03 23:46:45 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.2 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/post-checkout
+++ b/DEVEL/hooksdir/post-checkout
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  post-checkout       $NHDT-Date: 1524689632 2018/04/25 20:53:52 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.2 $
+# NetHack 3.7  post-checkout       $NHDT-Date: 1596498409 2020/08/03 23:46:49 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.3 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/post-commit
+++ b/DEVEL/hooksdir/post-commit
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  post-commit       $NHDT-Date: 1524689632 2018/04/25 20:53:52 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.2 $
+# NetHack 3.7  post-commit       $NHDT-Date: 1596498409 2020/08/03 23:46:49 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.3 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/post-merge
+++ b/DEVEL/hooksdir/post-merge
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  post-merge       $NHDT-Date: 1524689632 2018/04/25 20:53:52 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.2 $
+# NetHack 3.7  post-merge       $NHDT-Date: 1596498410 2020/08/03 23:46:50 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.3 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/post-rewrite
+++ b/DEVEL/hooksdir/post-rewrite
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  post-rewrite       $NHDT-Date: 1524689632 2018/04/25 20:53:52 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.1 $
+# NetHack 3.7  post-rewrite       $NHDT-Date: 1596498411 2020/08/03 23:46:51 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.2 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/pre-applypatch
+++ b/DEVEL/hooksdir/pre-applypatch
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  pre-applypatch       $NHDT-Date: 1524689632 2018/04/25 20:53:52 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.1 $
+# NetHack 3.7  pre-applypatch       $NHDT-Date: 1596498411 2020/08/03 23:46:51 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.2 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/pre-auto-gc
+++ b/DEVEL/hooksdir/pre-auto-gc
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  pre-auto-gc       $NHDT-Date: 1524689632 2018/04/25 20:53:52 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.1 $
+# NetHack 3.7  pre-auto-gc       $NHDT-Date: 1596498412 2020/08/03 23:46:52 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.2 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/pre-commit
+++ b/DEVEL/hooksdir/pre-commit
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  pre-commit       $NHDT-Date: 1524689632 2018/04/25 20:53:52 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.1 $
+# NetHack 3.7  pre-commit       $NHDT-Date: 1596498413 2020/08/03 23:46:53 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.2 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/pre-push
+++ b/DEVEL/hooksdir/pre-push
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  pre-push       $NHDT-Date: 1524689632 2018/04/25 20:53:52 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.1 $
+# NetHack 3.7  pre-push       $NHDT-Date: 1596498413 2020/08/03 23:46:53 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.2 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/DEVEL/hooksdir/pre-rebase
+++ b/DEVEL/hooksdir/pre-rebase
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6  pre-rebase       $NHDT-Date: 1524689633 2018/04/25 20:53:53 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.1 $
+# NetHack 3.7  pre-rebase       $NHDT-Date: 1596498414 2020/08/03 23:46:54 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.2 $
 # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.

--- a/133
+++ b/133
@@ -1,4 +1,4 @@
-This is a listing of all files in a full NetHack 3.6 distribution, organized
+This is a listing of all files in a full NetHack 3.7 distribution, organized
 in their standard manner on a UNIX system.  It indicates which files are
 necessary for which versions, so that you can tell which files may be deleted
 from or not transferred to your system if you wish.
@@ -7,8 +7,8 @@ from or not transferred to your system if you wish.

 .:
 (files in top directory)
-.clang-format    .travis.yml      Cross-compiling  Files
-Porting          README
+.clang-format        Cross-compiling      Files
+Porting              README               azure-pipelines.yml

 DEVEL:
 (files for people developing changes to NetHack)
@@ -102,20 +102,22 @@ ntconf.h      obj.h         objclass.h    optlist.h     patchlevel.h
 pcconf.h      permonst.h    prop.h        quest.h       rect.h
 region.h      rm.h          skills.h      sp_lev.h      spell.h
 sys.h         system.h      tcap.h        tileset.h     timeout.h
-tradstdc.h    trampoli.h    trap.h        unixconf.h    vision.h
-vmsconf.h     winami.h      wincurs.h     winprocs.h    wintype.h
-you.h         youprop.h
+tradstdc.h    trap.h        unixconf.h    vision.h      vmsconf.h
+winami.h      wincurs.h     winprocs.h    wintype.h     you.h
+youprop.h

 (file for tty versions)
 wintty.h

-(files for various Macintosh versions)
-mac-carbon.h  mac-qt.h      mac-term.h    macpopup.h    mactty.h
-macwin.h      mttypriv.h
+outdated:
+(files that are no longer maintained for current game code)
+.travis.yml

 outdated/include:
 (files that are no longer maintained for current game code)
-amiconf.h  beconf.h   def_os2.h  macconf.h  os2conf.h  tosconf.h  wceconf.h
+amiconf.h     beconf.h      def_os2.h     mac-carbon.h  mac-qt.h
+mac-term.h    macconf.h     macpopup.h    mactty.h      macwin.h
+mttypriv.h    os2conf.h     tosconf.h     trampoli.h    wceconf.h

 outdated/sys/amiga:
 (files for Amiga versions - untested for 3.7)
@@ -123,9 +125,9 @@ Build.ami     Install.ami   Makefile.agc  Makefile.ami  NetHack.cnf
 amidos.c      amidos.p      amifont.uu    amifont8.uu   amigst.c
 amii.hlp      amimenu.c     amirip.c      amistack.c    amitty.c
 amiwind.c     amiwind.p     clipwin.c     colorwin.c    grave16.xpm
-ifchange      mkdmake       txt2iff.c     winami.c      winami.p
-winchar.c     windefs.h     winext.h      winfuncs.c    winkey.c
-winmenu.c     winproto.h    winreq.c      winstr.c      xpm2iff.c
+ifchange      mkdmake       txt2iff.c     winamenu.c    winami.c
+winami.p      winchar.c     windefs.h     winext.h      winfuncs.c
+winkey.c      winproto.h    winreq.c      winstr.c      xpm2iff.c

 outdated/sys/atari:
 (files for Atari version - untested for 3.7)
@@ -153,6 +155,10 @@ outdated/sys/os2:
 (files for OS/2 version - untested for 3.7)
 Install.os2   Makefile.os2  nhpmico.uu    os2.c

+outdated/sys/unix:
+(files that are no longer maintained for current game code)
+README.linux
+
 outdated/sys/wince:
 (files for Windows CE and PocketPC - untested for 3.7)
 Install.ce    bootstrp.mak  celib.c       cesetup.bat   cesound.c
@@ -220,15 +226,27 @@ uhitm.c     vault.c     version.c   vision.c    weapon.c    were.c
 wield.c     windows.c   wizard.c    worm.c      worn.c      write.c
 zap.c

+submodules:
+(files in top directory)
+lua       pdcurses
+
+sys/libnh:
+(files in top directory)
+README.md    libnhmain.c  sysconf
+
+sys/libnh/test:
+(files in top directory)
+README.md  libtest.c  run.sh
+
 sys/msdos:
 (files for MSDOS version)
-Install.dos             Makefile.GCC            Makefile1.cross
-Makefile2.cross         msdos-cross-compile.sh  msdos.c
-msdoshlp.txt            nhlua.h                 pckeys.c
-pctiles.c               pctiles.h               pcvideo.h
-portio.h                setup.bat               sysconf
-tile2bin.c              vesa.h                  video.c
-vidtxt.c                vidvesa.c               vidvga.c
+Install.dos              Makefile.GCC             fetch-cross-compiler.sh
+msdos.c                  msdoshlp.txt             nhlua.h
+pckeys.c                 pctiles.c                pctiles.h
+pcvideo.h                portio.h                 setup.bat
+sysconf                  tile2bin.c               vesa.h
+video.c                  vidtxt.c                 vidvesa.c
+vidvga.c

 (files for running MSDOS binary under Windows)
 nhico.uu  nhpif.uu
@@ -276,10 +294,10 @@ pmatchregex.c
 sys/unix:
 (files for UNIX versions)
 Install.unx     Makefile.dat    Makefile.doc    Makefile.src
-Makefile.top    Makefile.utl    NewInstall.unx  README.linux
-README.xcode    XCode.xcconfig  depend.awk      gitinfo.sh
-mkmkfile.sh     nethack.sh      setup.sh        sysconf
-unixmain.c      unixres.c       unixunix.c
+Makefile.top    Makefile.utl    NewInstall.unx  README.xcode
+XCode.xcconfig  depend.awk      gitinfo.sh      mkmkfile.sh
+nethack.sh      setup.sh        sysconf         unixmain.c
+unixres.c       unixunix.c

 (files for replacement cpp, only needed by some ancient UNIX systems)
 cpp1.shr  cpp2.shr  cpp3.shr
@@ -304,10 +322,15 @@ sys/unix/hints:
 (files for configuring UNIX NetHack versions)
 linux               linux-chroot        linux-minimal
 linux-qt4           linux-qt5           linux-x11
-macosx              macosx.sh           macosx10.5
-macosx10.7          macosx10.8          macosx10.10
-macosx10.10-qt      macosx10.14         solaris
-solaris-playground  unix
+linux.2020          macOS.2020          macosx
+macosx.sh           macosx10.5          macosx10.7
+macosx10.8          macosx10.10         macosx10.10-qt
+macosx10.14         solaris             solaris-playground
+unix
+
+sys/unix/hints/include:
+(files for configuring UNIX NetHack versions)
+cross-post.2020  cross-pre.2020   multiw-1.2020    multiw-2.2020

 sys/vms:
 (files for VMS version)
@@ -338,16 +361,17 @@ dlb_main.c  makedefs.c  mdgrep.h    mdgrep.pl   panic.c     recover.c

 win/Qt:
 (files for the Qt 4 or 5 widget library - X11, Windows, Mac OS X)
-qt_bind.cpp   qt_bind.h     qt_click.cpp  qt_click.h    qt_clust.cpp
-qt_clust.h    qt_delay.cpp  qt_delay.h    qt_glyph.cpp  qt_glyph.h
-qt_icon.cpp   qt_icon.h     qt_inv.cpp    qt_inv.h      qt_kde0.h
-qt_key.cpp    qt_key.h      qt_line.cpp   qt_line.h     qt_main.cpp
-qt_main.h     qt_map.cpp    qt_map.h      qt_menu.cpp   qt_menu.h
-qt_msg.cpp    qt_msg.h      qt_plsel.cpp  qt_plsel.h    qt_rip.cpp
-qt_rip.h      qt_set.cpp    qt_set.h      qt_stat.cpp   qt_stat.h
-qt_str.cpp    qt_str.h      qt_streq.cpp  qt_streq.h    qt_svsel.cpp
-qt_svsel.h    qt_win.cpp    qt_win.h      qt_xcmd.cpp   qt_xcmd.h
-qt_xpms.h     qt_yndlg.cpp  qt_yndlg.h
+Qt-issues.txt  qt_bind.cpp    qt_bind.h      qt_click.cpp   qt_click.h
+qt_clust.cpp   qt_clust.h     qt_delay.cpp   qt_delay.h     qt_glyph.cpp
+qt_glyph.h     qt_icon.cpp    qt_icon.h      qt_inv.cpp     qt_inv.h
+qt_kde0.h      qt_key.cpp     qt_key.h       qt_line.cpp    qt_line.h
+qt_main.cpp    qt_main.h      qt_map.cpp     qt_map.h       qt_menu.cpp
+qt_menu.h      qt_msg.cpp     qt_msg.h       qt_plsel.cpp   qt_plsel.h
+qt_post.h      qt_pre.h       qt_rip.cpp     qt_rip.h       qt_set.cpp
+qt_set.h       qt_stat.cpp    qt_stat.h      qt_str.cpp     qt_str.h
+qt_streq.cpp   qt_streq.h     qt_svsel.cpp   qt_svsel.h     qt_win.cpp
+qt_win.h       qt_xcmd.cpp    qt_xcmd.h      qt_xpms.h      qt_yndlg.cpp
+qt_yndlg.h

 win/X11:
 (files for X versions)
@@ -379,6 +403,10 @@ nhsplash.xpm   objects.txt    other.txt      ppmwrite.c     renumtiles.pl
 safeproc.c     thintile.c     tile.doc       tile.h         tile2bmp.c
 tilemap.c      tileset.c      tiletext.c

+win/shim:
+(file in top directory)
+winshim.c
+
 win/tty:
 (files for tty versions)
 getline.c  termcap.c  topl.c     wintty.c
@@ -401,8 +429,8 @@ record.uu              resource.h             rip.uu
 splash.uu              tiles-mingw32.mak      tiles.mak
 winMS.h

-win/win32/vs2017:
-(files for Visual Studio 2017 Community Edition builds)
+win/win32/vs:
+(files for Visual Studio 2017 or 2019 Community Edition builds)
 NetHack.sln                   NetHack.vcxproj
 NetHackPackage.appxmanifest   NetHackPackage.wapproj
 NetHackProperties.props       NetHackW.vcxproj
@@ -413,19 +441,20 @@ afterrecover.proj             aftertile2bmp.proj
 aftertilemap.proj             afteruudecode.proj
 build.bat                     common.props
 config.props                  console.props
-default.props                 default_dll.props
-default_lib.props             dirs.props
-dlb.vcxproj                   dll.props
-files.props                   makedefs.vcxproj
-nh340key.def                  nh340key.vcxproj
-nhdefkey.def                  nhdefkey.vcxproj
-nhraykey.def                  nhraykey.vcxproj
-recover.vcxproj               tile2bmp.vcxproj
-tilemap.vcxproj               tiles.vcxproj
-travisci.sh                   uudecode.vcxproj
+cpp.hint                      default.props
+default_dll.props             default_lib.props
+dirs.props                    dlb.vcxproj
+dll.props                     files.props
+makedefs.vcxproj              nh340key.def
+nh340key.vcxproj              nhdefkey.def
+nhdefkey.vcxproj              nhraykey.def
+nhraykey.vcxproj              recover.vcxproj
+tile2bmp.vcxproj              tilemap.vcxproj
+tiles.vcxproj                 travisci.sh
+uudecode.vcxproj

-win/win32/vs2017/Images:
-(files for Visual Studio 2017 Community Edition builds)
+win/win32/vs/Images:
+(files for Visual Studio 2017 or 2019 Community Edition builds)
 BadgeLogo.scale-100.png
 BadgeLogo.scale-125.png
 BadgeLogo.scale-150.png
--- a/13
+++ b/13
@@ -14,7 +14,7 @@ new machine.  The basic steps in porting the program are:
 	    have the files in the top directory since you're reading this
 	    one. :-)

-	    If you will be cross-compiling for your target platform on 
+	    If you will be cross-compiling for your target platform on
            a different platform, you may want to read Cross-compiling
            in the Top folder as well.

@@ -185,14 +185,13 @@ line options to produce several output files that are required for:
          (a) additional build steps to follow, including some header
              files: pm.h, onames.h, date.h.
          (b) creation of files, containing information required by,
-              or about the game during its execution, that are stored in a 
+              or about the game during its execution, that are stored in a
              portable, platform-independent way, that need to be inserted
              into the final game package.

          util/makedefs -v
          util/makedefs -o
          util/makedefs -p
-          util/makedefs -z
          util/makedefs -d
          util/makedefs -r
          util/makedefs -h
@@ -205,9 +204,9 @@ utilities, and so forth. Those produce output files for use during the game and
 need to be included in the packaging of the game.

     4.3. Lua
-  
+
 	Compile and link into a library, or obtain a prebuilt Lua library for
-your platform. Place the Lua source into lib/lua-5.4.0 (or other folder
+your platform. Place the Lua source into lib/lua-5.4.2 (or other folder
 representing an appropriate Lua version); place the compiled Lua library into
 lib.

@@ -244,7 +243,7 @@ text by makedefs during the build process, have been replaced by Lua versions
 and are inserted into the game package for processing by the embedded Lua
 interpreter during game execution.

-     5.2  Level Compiler  
+     5.2  Level Compiler

 	There is no longer a build-time level compiler. Instead, the level
 descriptions have been converted to Lua and are inserted into the game package
@@ -266,6 +265,6 @@ by code within the game itself. That was done to facilitate cross-compiling of
 NetHack on one platform for game execution on another.


-# NetHack 3.6  Porting       $NHDT-Date: 1594155866 2020/07/07 21:04:26 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.8 $
+# NetHack 3.7  Porting       $NHDT-Date: 1596498144 2020/08/03 23:42:24 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.9 $
 # Copyright (c) 2005 by Michael Allison
 # NetHack may be freely redistributed.  See license for details.
--- a/14
+++ b/14
@@ -11,7 +11,7 @@ The file doc/fixes37.0 in the source distribution will be updated with a list
 of fixes as they are committed.

 In short -- there are likely to be bugs. Don't treat NetHack-3.7 branch as
-released code, and if stability is paramount, then the most recent 
+released code, and if stability is paramount, then the most recent
 NetHack 3.6.6 release is safest for you.

 We're making the .0 work-in-progress available so that you can observe, test
@@ -22,11 +22,11 @@ The file doc/fixes37.0 in the source distribution has a full list of bug-fixes
 included so far, as well as brief mentions of some of the other code changes.
 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 
+that file. Some entries might be considered "spoilers", particularly in the
 "new features" section.

 Along with the game improvements and bug fixes, NetHack 3.7 strives to make
-some general architectural improvements to the game or to its building 
+some general architectural improvements to the game or to its building
 process. Among them:

 *  Remove barriers to building NetHack on one platform and operating system,
@@ -35,9 +35,9 @@ process. Among them:
    See the file "Cross-compiling" in the top-level folder for more information
    on that.

- *  Replace the build-time "yacc and lex"-based level compiler, the "yacc and 
+ *  Replace the build-time "yacc and lex"-based level compiler, the "yacc and
    lex"-based dungeon compiler, and the quest text file processing done
-    by NetHack's "makedefs" utility, with Lua text alternatives that are 
+    by NetHack's "makedefs" utility, with Lua text alternatives that are
    loaded and processed by the game during play.

 *  Write game savefiles and bonesfiles in a more portable and consistent way
@@ -60,7 +60,7 @@ considered spoilers:
        their individual fields and save those fields instead of the entire
        struct
 -  savefile: use little-endian format for fields where that makes a difference
- 
+
                        - - - - - - - - - - -

 Please read items (1), (2) and (3) BEFORE doing anything with your new code.
@@ -113,7 +113,7 @@ Please read items (1), (2) and (3) BEFORE doing anything with your new code.
        OpenVMS (aka VMS) V8.4 on Alpha and on Integrity/Itanium/IA64

    Instructions have been provided by way of community contribution on:
-        msdos protected mode using djgpp including a Linux-host djgpp 
+        msdos protected mode using djgpp including a Linux-host djgpp
        cross-compile

    Previous versions of NetHack were tested and known to run on the
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -0,0 +1,214 @@
+strategy:
+  matrix:
+    linux_focal_gcc8_minimal:
+      imageName: 'ubuntu-20.04'
+      toolchainName: gcc8
+      buildTargetName: minimal
+    linux_focal_clang_all:
+      imageName: 'ubuntu-20.04'
+      toolchainName: clang
+      buildTargetName: all
+    linux_focal_gcc8_all:
+      imageName: 'ubuntu-20.04'
+      toolchainName: gcc8
+      buildTargetName: all
+    linux_focal_gcc9_all:
+      imageName: 'ubuntu-20.04'
+      toolchainName: gcc9
+      buildTargetName: all
+    linux_bionic_gcc7_all:
+      imageName: 'ubuntu-18.04'
+      toolchainName: gcc7
+      buildTargetName: all
+# build is currently broken
+#    mac_catalina_gcc8_all:
+#      imageName: 'macOS-10.15'
+#      ccName: gcc-8
+#      cxxName: g++-8
+#      buildSetting: 'all'
+    mac_catalina_clang_all:
+      imageName: 'macOS-10.15'
+      toolchainName: clang
+      buildTargetName: all
+    windows-visualstudio:
+      imageName: 'windows-2019'
+      toolchainName: vs
+      buildTargetName: all
+    windows-mingw:
+      imageName: 'windows-2019'
+      toolchainName: mingw
+      buildTargetName: all
+    linux_focal_cross_msdos:
+      imageName: 'ubuntu-20.04'
+      toolchainName: cross
+      buildTargetName: msdos
+
+pool:
+  vmImage: $(imageName)
+
+# resources:
+#  repositories:
+#  - repository: pdcursesrepo
+#    type: github
+#    name: wmcbrine/PDCurses
+#    ref: refs/heads/master
+#    endpoint: github.com_barthouse
+
+variables:
+  toolchain: $(toolchainName)
+  buildTarget: $(buildTargetName)
+  netHackPath: s/NetHack
+
+steps:
+- bash: |
+    if [ "$(toolchain)" == "gcc7" ]
+    then
+      echo "##vso[task.setvariable variable=CC]gcc-7"
+      echo "##vso[task.setvariable variable=CXX]g++-7"
+    fi
+    if [ "$(toolchain)" == "gcc8" ]
+    then
+      echo "##vso[task.setvariable variable=CC]gcc-8"
+      echo "##vso[task.setvariable variable=CXX]g++-8"
+    fi
+    if [ "$(toolchain)" == "gcc9" ]
+    then
+      echo "##vso[task.setvariable variable=CC]gcc-9"
+      echo "##vso[task.setvariable variable=CXX]g++-9"
+    fi
+    if [ "$(toolchain)" == "gcc10" ]
+    then
+      echo "##vso[task.setvariable variable=CC]gcc-10"
+      echo "##vso[task.setvariable variable=CXX]g++-10"
+    fi
+    if [ "$(toolchain)" == "clang" ]
+    then
+      echo "##vso[task.setvariable variable=CC]clang"
+      echo "##vso[task.setvariable variable=CXX]clang++"
+    fi
+    if [ "$(toolchain)" == "cross" ]
+    then
+      echo "##vso[task.setvariable variable=CC]gcc-8"
+      echo "##vso[task.setvariable variable=CXX]g++-8"
+    fi
+  displayName: 'Setting variables'
+
+- bash: |
+    echo "toolchain: $(toolchain)"
+    echo "buildTarget: $(buildTarget)"
+    echo "netHackPath: $NETHACKPATH"
+    echo "CC: $CC"
+    echo "CXX: $CXX"
+  displayName: 'Echoing variables'
+
+- checkout: git://NetHack/NetHackTest@pipeline-test
+  submodules: true
+  path: $(netHackPath) # $(Agent.BuildDirectory)/$(netHackPath)
+
+- task: DownloadSecureFile@1
+  name: storeKey
+  inputs:
+    secureFile: 'NetHackPackage_StoreKey.pfx'
+  condition: eq( variables.toolchain, 'vs' )
+  displayName: 'Store Key Download'
+
+- task: CopyFiles@2
+  inputs:
+    contents: NetHackPackage_StoreKey.pfx
+    SourceFolder: $(Agent.TempDirectory)
+    TargetFolder: $(Agent.BuildDirectory)/$(netHackPath)/win/win32/vs
+  condition: eq( variables.toolchain, 'vs' )
+  displayName: 'Copying store key'
+
+- task: MSBuild@1
+  inputs:
+    solution: $(Agent.BuildDirectory)/$(netHackPath)/win/win32/vs/NetHack.sln
+    platform: Win32
+    configuration: Debug
+  condition: eq( variables.toolchain, 'vs' )
+  displayName: 'Visual Studio Build'
+
+- bash: |
+    export ADD_LUA=Y
+    export WANT_LUAC=N
+    export LUATOP=../submodules/lua
+    export LUASRC=../submodules/lua
+    export ADD_CURSES=Y
+    export PDCURSES_TOP=../submodules/pdcurses
+    export LUA_VERSION=5.4.2
+    export TRAVIS_COMPILER=1
+    cp ../sys/winnt/Makefile.gcc ./Makefile
+    mingw32-make LUA_VERSION=$LUA_VERSION install
+  condition: eq( variables.toolchain, 'mingw' )
+  workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)/src
+  displayName: 'MinGW Build'
+
+- bash: |
+    sudo apt-get -qq -y update
+    sudo apt-get -qq -y install libncurses5-dev
+    sudo apt-get -qq -y install libx11-dev libxaw7-dev xfonts-utils qtbase5-dev qtmultimedia5-dev qtbase5-dev-tools
+  condition: eq( variables['Agent.OS'], 'Linux' )
+  workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
+  displayName: 'Getting linux build dependencies'
+
+- bash: |
+    cd sys/unix
+    sh setup.sh hints/linux.2020
+    cd ../..
+    make fetch-lua
+    make WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc all
+  condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.buildTarget, 'all'))
+  workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
+  displayName: 'Building linux full build'
+
+- bash: |
+    cd sys/unix
+    sh setup.sh hints/linux-minimal
+    cd ../..
+    sed -i '/^#define CLIPPING/d'       include/config.h
+    sed -i '/^#define COMPRESS/d'       include/config.h
+    #sed -i '/^#define DOAGAIN/d'        include/config.h
+    sed -i '/^#define DUMPLOG/d'        include/config.h
+    #sed -i '/^#define GDBPATH/d'        include/config.h
+    #sed -i '/^#define GREPPATH/d'       include/config.h
+    sed -i '/^#define INSURANCE/d'      include/config.h
+    sed -i '/^#define LOGFILE/d'        include/config.h
+    sed -i '/^#define NEWS/d'           include/config.h
+    sed -i '/^#define PANICLOG/d'       include/config.h
+    #sed -i '/^#define STATUS_HILITES/d' include/config.h
+    sed -i '/^#define SYSCF/d'          include/config.h
+    sed -i '/^#define USER_SOUNDS/d'    include/config.h
+    sed -i '/^#define XLOGFILE/d'       include/config.h
+
+    sed -i '/^#define MAIL/d'           include/unixconf.h
+    sed -i '/^#define SHELL/d'          include/unixconf.h
+    sed -i '/^#define SUSPEND/d'        include/unixconf.h
+    sed -i 's/^#define TEXTCOLOR//'     include/unixconf.h
+    make fetch-lua
+    make WANT_WIN_ALL=1 all
+  condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.buildTarget, 'minimal'))
+  displayName: 'Building linux minimal build'
+  workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
+
+- bash: |
+    cd sys/unix
+    sh setup.sh hints/macos.2020
+    cd ../..
+    make fetch-lua
+    make all
+  condition: eq( variables['Agent.OS'], 'Darwin' )
+  workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
+  displayName: 'Building mac full build'
+
+- bash: |
+    export GCCVER=gcc1010
+    cd sys/unix
+    sh setup.sh hints/linux.2020
+    cd ../..
+    make fetch-lua
+    sh sys/msdos/fetch-cross-compiler.sh
+    make LUA_VERSION=5.4.2 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 all
+    make LUA_VERSION=5.4.2 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package
+  condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross'))
+  workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
+  displayName: 'Building MSDOS build'
--- a/dat/Arc-fila.lua
+++ b/dat/Arc-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Arch.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
+-- NetHack 3.7	Arch.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Arc-filb.lua
+++ b/dat/Arc-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Arch.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
+-- NetHack 3.7	Arch.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Arc-goal.lua
+++ b/dat/Arc-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Arch.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
+-- NetHack 3.7	Arch.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
@@ -52,7 +52,7 @@ des.region(selection.area(35,16,36,17), "unlit")
 des.region(selection.area(38,13,38,17), "unlit")
 des.region(selection.area(40,13,41,14), "unlit")
 des.region(selection.area(40,16,41,17), "unlit")
-des.region({ region={43,13, 50,15}, lit=0, type="temple", prefilled=0 })
+des.region({ region={43,13, 50,15}, lit=0, type="temple", filled=2 })
 des.region(selection.area(52,13,52,15), "unlit")
 -- Stairs
 des.stair("up", 38,10)
--- a/dat/Arc-loca.lua
+++ b/dat/Arc-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Arch.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
+-- NetHack 3.7	Arch.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
@@ -31,18 +31,18 @@ des.map([[
 ]]);
 -- Dungeon Description
 des.region(selection.area(00,00,75,19), "lit")
-des.region({ region={25,04, 28,07}, lit=1, type="temple", prefilled=0 })
-des.region({ region={25,09, 28,11}, lit=0, type="temple", prefilled=0 })
-des.region({ region={25,13, 28,16}, lit=1, type="temple", prefilled=0 })
+des.region({ region={25,04, 28,07}, lit=1, type="temple", filled=2 })
+des.region({ region={25,09, 28,11}, lit=0, type="temple", filled=2 })
+des.region({ region={25,13, 28,16}, lit=1, type="temple", filled=2 })
 des.region(selection.area(30,04,30,16), "lit")
 des.region(selection.area(32,04,32,16), "unlit")
-des.region({ region={33,04, 53,04}, lit=0, type="ordinary", prefilled=0, irregular=1 })
+des.region({ region={33,04, 53,04}, lit=0, type="ordinary", irregular=1 })
 des.region(selection.area(36,10,37,10), "unlit")
 des.region(selection.area(39,09,39,11), "unlit")
-des.region({ region={36,06, 42,08}, lit=0, type="ordinary", prefilled=0, irregular=1 })
-des.region({ region={36,12, 42,14}, lit=0, type="ordinary", prefilled=0, irregular=1 })
+des.region({ region={36,06, 42,08}, lit=0, type="ordinary", irregular=1 })
+des.region({ region={36,12, 42,14}, lit=0, type="ordinary", irregular=1 })
 des.region(selection.area(46,06,51,09), "unlit")
-des.region({ region={46,11, 49,11}, lit=0, type="ordinary", prefilled=0, irregular=1 })
+des.region({ region={46,11, 49,11}, lit=0, type="ordinary", irregular=1 })
 des.region(selection.area(48,13,51,14), "unlit")
 -- Doors
 des.door("closed",31,04)
--- a/dat/Arc-strt.lua
+++ b/dat/Arc-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Arch.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
+-- NetHack 3.7	Arch.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Bar-fila.lua
+++ b/dat/Bar-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Barb.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Barb.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Bar-filb.lua
+++ b/dat/Bar-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Barb.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Barb.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Bar-goal.lua
+++ b/dat/Bar-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Barb.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Barb.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Bar-loca.lua
+++ b/dat/Bar-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Barb.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Barb.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Bar-strt.lua
+++ b/dat/Bar-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Barb.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Barb.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Cav-fila.lua
+++ b/dat/Cav-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Caveman.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
+-- NetHack 3.7	Caveman.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Cav-filb.lua
+++ b/dat/Cav-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Caveman.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
+-- NetHack 3.7	Caveman.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Cav-goal.lua
+++ b/dat/Cav-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Caveman.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
+-- NetHack 3.7	Caveman.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Cav-loca.lua
+++ b/dat/Cav-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Caveman.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
+-- NetHack 3.7	Caveman.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
@@ -31,7 +31,7 @@ des.map([[
 ]]);
 -- Dungeon Description
 des.region(selection.area(00,00,75,19), "unlit")
-des.region({ region={52,06, 73,15}, lit=1, type="ordinary", prefilled=0, irregular=1 })
+des.region({ region={52,06, 73,15}, lit=1, type="ordinary", irregular=1 })
 -- Doors
 des.door("locked",28,11)
 -- Stairs
--- a/dat/Cav-strt.lua
+++ b/dat/Cav-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Caveman.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
+-- NetHack 3.7	Caveman.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
@@ -37,14 +37,14 @@ des.map([[
 ]]);
 -- Dungeon Description
 des.region(selection.area(00,00,75,19), "unlit")
-des.region({ region={13,01, 40,05}, lit=1, type="temple", prefilled=0, irregular=1 })
+des.region({ region={13,01, 40,05}, lit=1, type="temple", filled=1, irregular=1 })
 -- The occupied rooms.
-des.region({ region={02,01, 08,03}, lit=1, type="ordinary", prefilled=0, irregular=1 })
-des.region({ region={01,11, 06,14}, lit=1, type="ordinary", prefilled=0, irregular=1 })
-des.region({ region={13,08, 18,10}, lit=1, type="ordinary", prefilled=0, irregular=1 })
-des.region({ region={05,17, 14,18}, lit=1, type="ordinary", prefilled=0, irregular=1 })
-des.region({ region={17,16, 23,18}, lit=1, type="ordinary", prefilled=0, irregular=1 })
-des.region({ region={35,16, 44,18}, lit=1, type="ordinary", prefilled=0, irregular=1 })
+des.region({ region={02,01, 08,03}, lit=1, type="ordinary", irregular=1 })
+des.region({ region={01,11, 06,14}, lit=1, type="ordinary", irregular=1 })
+des.region({ region={13,08, 18,10}, lit=1, type="ordinary", irregular=1 })
+des.region({ region={05,17, 14,18}, lit=1, type="ordinary", irregular=1 })
+des.region({ region={17,16, 23,18}, lit=1, type="ordinary", irregular=1 })
+des.region({ region={35,16, 44,18}, lit=1, type="ordinary", irregular=1 })
 -- Stairs
 des.stair("down", 02,03)
 -- Portal arrival point
--- a/dat/GENFILES
+++ b/dat/GENFILES
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# NetHack 3.6   GENFILES      $NHDT-Date: 1550799147 2019/02/22 01:32:27 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.0 $
+# NetHack 3.7   GENFILES      $NHDT-Date: 1596498242 2020/08/03 23:44:02 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.2 $
 #       Copyright (c) 2018 by Kenneth Lorber
 # NetHack may be freely redistributed.  See license for details.

--- a/dat/Hea-fila.lua
+++ b/dat/Hea-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Healer.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
+-- NetHack 3.7	Healer.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991, 1993 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Hea-filb.lua
+++ b/dat/Hea-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Healer.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
+-- NetHack 3.7	Healer.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991, 1993 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Hea-goal.lua
+++ b/dat/Hea-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Healer.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
+-- NetHack 3.7	Healer.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991, 1993 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Hea-loca.lua
+++ b/dat/Hea-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Healer.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
+-- NetHack 3.7	Healer.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991, 1993 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
@@ -23,7 +23,7 @@ PPPPPPPPPPP........PPPPPPPPPPPP
 ]]);
 -- Dungeon Description
 des.region(selection.area(00,00,30,09), "lit")
-des.region({ region={12,03, 20,06}, lit=1, type="temple" })
+des.region({ region={12,03, 20,06}, lit=1, type="temple", filled=1 })
 -- Doors
 des.door("closed",09,04)
 des.door("closed",09,05)
--- a/dat/Hea-strt.lua
+++ b/dat/Hea-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Healer.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
+-- NetHack 3.7	Healer.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.10 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991, 1993 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Kni-fila.lua
+++ b/dat/Kni-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Knight.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Knight.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991,92 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Kni-filb.lua
+++ b/dat/Kni-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Knight.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Knight.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991,92 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Kni-goal.lua
+++ b/dat/Kni-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Knight.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Knight.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991,92 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Kni-loca.lua
+++ b/dat/Kni-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Knight.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Knight.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991,92 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
@@ -27,7 +27,7 @@ xxxxxxxxx.......xxxxxx.....xxxxxxxxxxxxx
 -- The Isle of Glass is a Tor rising out of the swamps surrounding it.
 des.region(selection.area(00,00,39,11), "lit")
 -- The top area of the Tor is a holy site.
-des.region({ region={09,02, 27,09}, lit=1, type="temple" })
+des.region({ region={09,02, 27,09}, lit=1, type="temple", filled=2 })
 -- Stairs
 des.stair("up", 38,0)
 des.stair("down", 18,05)
--- a/dat/Kni-strt.lua
+++ b/dat/Kni-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Knight.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Knight.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991,92 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
@@ -36,7 +36,7 @@ des.map([[
 -- Dungeon Description
 des.region(selection.area(00,00,49,15), "lit")
 des.region(selection.area(04,04,45,11), "unlit")
-des.region({ region={06,06,22,09}, lit=1, type="throne", prefilled=1 })
+des.region({ region={06,06,22,09}, lit=1, type="throne", filled=2 })
 des.region(selection.area(27,06,43,09), "lit")
 -- Portal arrival point
 des.levregion({ region = {20,14,20,14}, type="branch" })
--- a/dat/Mon-fila.lua
+++ b/dat/Mon-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Monk.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
+-- NetHack 3.7	Monk.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Mon-filb.lua
+++ b/dat/Mon-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Monk.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
+-- NetHack 3.7	Monk.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Mon-goal.lua
+++ b/dat/Mon-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Monk.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
+-- NetHack 3.7	Monk.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Mon-loca.lua
+++ b/dat/Mon-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Monk.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
+-- NetHack 3.7	Monk.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Mon-strt.lua
+++ b/dat/Mon-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Monk.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
+-- NetHack 3.7	Monk.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Pri-fila.lua
+++ b/dat/Pri-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Priest.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Priest.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Pri-filb.lua
+++ b/dat/Pri-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Priest.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Priest.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Pri-goal.lua
+++ b/dat/Pri-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Priest.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Priest.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Pri-loca.lua
+++ b/dat/Pri-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Priest.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Priest.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
@@ -26,11 +26,11 @@ des.map([[
 ........................................
 ]]);
 -- Dungeon Description
-des.region({ region={00,00, 09,13}, lit=0, type="morgue", prefilled=0 })
-des.region({ region={09,00, 30,01}, lit=0, type="morgue", prefilled=0 })
-des.region({ region={09,12, 30,13}, lit=0, type="morgue", prefilled=0 })
-des.region({ region={31,00, 39,13}, lit=0, type="morgue", prefilled=0 })
-des.region({ region={11,03, 29,10}, lit=1, type="temple", prefilled=0, irregular=1 })
+des.region({ region={00,00, 09,13}, lit=0, type="morgue", filled=1 })
+des.region({ region={09,00, 30,01}, lit=0, type="morgue", filled=1 })
+des.region({ region={09,12, 30,13}, lit=0, type="morgue", filled=1 })
+des.region({ region={31,00, 39,13}, lit=0, type="morgue", filled=1 })
+des.region({ region={11,03, 29,10}, lit=1, type="temple", filled=1, irregular=1 })
 -- The altar inside the temple
 des.altar({ x=20,y=07, align="noalign", type="shrine" })
 des.monster({ id = "aligned priest", x=20, y=07, align="noalign", peaceful = 0 })
--- a/dat/Pri-strt.lua
+++ b/dat/Pri-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Priest.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Priest.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
@@ -37,7 +37,7 @@ des.map([[
 ]]);
 -- Dungeon Description
 des.region(selection.area(00,00,75,19), "lit")
-des.region({ region={24,06, 33,13}, lit=1, type="temple" })
+des.region({ region={24,06, 33,13}, lit=1, type="temple", filled=2 })

 des.replace_terrain({ region={00,00, 10,19}, fromterrain=".", toterrain="T", chance=10 })
 des.replace_terrain({ region={65,00, 75,19}, fromterrain=".", toterrain="T", chance=10 })
--- a/dat/Ran-fila.lua
+++ b/dat/Ran-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Ranger.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Ranger.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Ran-filb.lua
+++ b/dat/Ran-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Ranger.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Ranger.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Ran-goal.lua
+++ b/dat/Ran-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Ranger.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Ranger.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Ran-loca.lua
+++ b/dat/Ran-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Ranger.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Ranger.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Ran-strt.lua
+++ b/dat/Ran-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Ranger.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
+-- NetHack 3.7	Ranger.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.9 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Rog-fila.lua
+++ b/dat/Rog-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Rogue.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Rogue.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1992 by Dean Luick
 -- NetHack may be freely redistributed.  See license for details.
 --
--- a/dat/Rog-filb.lua
+++ b/dat/Rog-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Rogue.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Rogue.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1992 by Dean Luick
 -- NetHack may be freely redistributed.  See license for details.
 --
--- a/dat/Rog-goal.lua
+++ b/dat/Rog-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Rogue.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Rogue.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1992 by Dean Luick
 -- NetHack may be freely redistributed.  See license for details.
 --
--- a/dat/Rog-loca.lua
+++ b/dat/Rog-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Rogue.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Rogue.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1992 by Dean Luick
 -- NetHack may be freely redistributed.  See license for details.
 --
--- a/dat/Rog-strt.lua
+++ b/dat/Rog-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Rogue.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Rogue.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1992 by Dean Luick
 -- NetHack may be freely redistributed.  See license for details.
 --
--- a/dat/Sam-fila.lua
+++ b/dat/Sam-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Samurai.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Samurai.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-92 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Sam-filb.lua
+++ b/dat/Sam-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Samurai.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Samurai.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-92 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Sam-goal.lua
+++ b/dat/Sam-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Samurai.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Samurai.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-92 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Sam-loca.lua
+++ b/dat/Sam-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Samurai.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Samurai.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-92 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Sam-strt.lua
+++ b/dat/Sam-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Samurai.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Samurai.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-92 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
@@ -37,7 +37,7 @@ des.map([[
 ]]);
 -- Dungeon Description
 des.region(selection.area(00,00,75,19), "lit")
-des.region({ region={18,03, 26,07}, lit=1, type="throne", prefilled=1 })
+des.region({ region={18,03, 26,07}, lit=1, type="throne", filled=2 })
 -- Portal arrival zone
 des.levregion({ region = {62,12,70,17}, type="branch" })
 -- Stairs
--- a/dat/Tou-fila.lua
+++ b/dat/Tou-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Tourist.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
+-- NetHack 3.7	Tourist.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991,92 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Tou-filb.lua
+++ b/dat/Tou-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Tourist.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
+-- NetHack 3.7	Tourist.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991,92 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Tou-goal.lua
+++ b/dat/Tou-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Tourist.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
+-- NetHack 3.7	Tourist.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991,92 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
@@ -33,7 +33,7 @@ des.map([[
 des.region(selection.area(00,00,75,19), "lit")
 -- The Inn
 des.region(selection.area(01,01,09,02), "lit")
-des.region({ region = {01,04,09,05}, lit=1, type = "barracks" })
+des.region({ region = {01,04,09,05}, lit=1, type = "barracks", filled = 1 })
 des.region(selection.area(01,07,02,10), "unlit")
 des.region(selection.area(07,07,09,10), "unlit")
 des.region(selection.area(01,14,02,15), "unlit")
@@ -41,9 +41,9 @@ des.region(selection.area(07,14,09,15), "unlit")
 des.region(selection.area(01,17,02,18), "unlit")
 des.region(selection.area(07,17,09,18), "unlit")
 --
-des.region({ region = {11,01,19,02}, lit = 0, type = "barracks" })
+des.region({ region = {11,01,19,02}, lit = 0, type = "barracks", filled = 1 })
 des.region(selection.area(21,01,30,02), "unlit")
-des.region({ region = {11,17,19,18}, lit = 0, type = "barracks" })
+des.region({ region = {11,17,19,18}, lit = 0, type = "barracks", filled = 1 })
 des.region(selection.area(21,17,30,18), "unlit")
 -- Police Station
 des.region(selection.area(18,07,25,11), "lit")
@@ -53,12 +53,12 @@ des.region(selection.area(24,13,25,13), "unlit")
 -- The town itself
 des.region(selection.area(42,03,47,06), "unlit")
 des.region(selection.area(42,08,50,11), "unlit")
-des.region({ region = {37,16,41,18}, lit = 0, type = "morgue" })
+des.region({ region = {37,16,41,18}, lit = 0, type = "morgue", filled = 1 })
 des.region(selection.area(47,16,55,18), "unlit")
 des.region(selection.area(55,01,62,03), "unlit")
 des.region(selection.area(64,01,71,03), "unlit")
-des.region({ region = {60,14,71,15}, lit = 1, type = "shop" })
-des.region({ region = {60,17,71,18}, lit = 1, type = "shop" })
+des.region({ region = {60,14,71,15}, lit = 1, type = "shop", filled = 1 })
+des.region({ region = {60,17,71,18}, lit = 1, type = "shop", filled = 1 })
 -- Non diggable walls
 des.non_diggable(selection.area(00,00,75,19))
 -- Stairs
--- a/dat/Tou-loca.lua
+++ b/dat/Tou-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Tourist.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
+-- NetHack 3.7	Tourist.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991,92 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
@@ -32,14 +32,14 @@ des.map([[
 des.region(selection.area(00,00,75,19), "lit")
 des.non_diggable(selection.area(00,00,75,19))
 --
-des.region({ region={01,01, 04,05}, lit=0, type="morgue", prefilled = 0 })
-des.region({ region={15,03, 20,05}, lit=1, type="shop", prefilled = 0  })
-des.region({ region={62,03, 71,04}, lit=1, type="shop", prefilled = 0  })
-des.region({ region={01,17, 11,18}, lit=1, type="barracks", prefilled = 0  })
-des.region({ region={12,09, 20,10}, lit=1, type="barracks", prefilled = 0  })
-des.region({ region={53,11, 59,14}, lit=1, type="zoo", prefilled = 0  })
-des.region({ region={63,14, 72,16}, lit=1, type="barracks", prefilled = 0  })
-des.region({ region={32,14, 40,16}, lit=1, type="temple", prefilled = 0  })
+des.region({ region={01,01, 04,05}, lit=0, type="morgue", filled=1 })
+des.region({ region={15,03, 20,05}, lit=1, type="shop", filled=1 })
+des.region({ region={62,03, 71,04}, lit=1, type="shop", filled=1 })
+des.region({ region={01,17, 11,18}, lit=1, type="barracks", filled=1 })
+des.region({ region={12,09, 20,10}, lit=1, type="barracks", filled=1 })
+des.region({ region={53,11, 59,14}, lit=1, type="zoo", filled=1 })
+des.region({ region={63,14, 72,16}, lit=1, type="barracks", filled=1 })
+des.region({ region={32,14, 40,16}, lit=1, type="temple", filled=1 })
 --
 des.region({ region = {06,01,11,02}, type = "ordinary" })
 des.region({ region = {24,01,29,02}, type = "ordinary" })
--- a/dat/Tou-strt.lua
+++ b/dat/Tou-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Tourist.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
+-- NetHack 3.7	Tourist.des	$NHDT-Date: 1432512784 2015/05/25 00:13:04 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991,92 by M. Stephenson, P. Winner
 -- NetHack may be freely redistributed.  See license for details.
@@ -36,7 +36,7 @@ des.map([[
 ]]);
 -- Dungeon Description
 des.region(selection.area(00,00,75,19), "lit")
-des.region({ region={14,01, 20,03}, lit=0, type="morgue", prefilled=0 })
+des.region({ region={14,01, 20,03}, lit=0, type="morgue", filled=1 })
 des.region(selection.area(07,10,11,12), "unlit")
 des.region(selection.area(04,16,08,18), "unlit")
 des.region(selection.area(17,16,21,18), "unlit")
--- a/dat/Val-fila.lua
+++ b/dat/Val-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Valkyrie.des	$NHDT-Date: 1553807172 2019/03/28 21:06:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.15 $
+-- NetHack 3.7	Valkyrie.des	$NHDT-Date: 1553807172 2019/03/28 21:06:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.15 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Val-filb.lua
+++ b/dat/Val-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Valkyrie.des	$NHDT-Date: 1553807172 2019/03/28 21:06:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.15 $
+-- NetHack 3.7	Valkyrie.des	$NHDT-Date: 1553807172 2019/03/28 21:06:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.15 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Val-goal.lua
+++ b/dat/Val-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Valkyrie.des	$NHDT-Date: 1553807172 2019/03/28 21:06:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.15 $
+-- NetHack 3.7	Valkyrie.des	$NHDT-Date: 1553807172 2019/03/28 21:06:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.15 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Val-loca.lua
+++ b/dat/Val-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Valkyrie.des	$NHDT-Date: 1553807172 2019/03/28 21:06:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.15 $
+-- NetHack 3.7	Valkyrie.des	$NHDT-Date: 1553807172 2019/03/28 21:06:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.15 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Val-strt.lua
+++ b/dat/Val-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Valkyrie.des	$NHDT-Date: 1553807172 2019/03/28 21:06:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.15 $
+-- NetHack 3.7	Valkyrie.des	$NHDT-Date: 1553807172 2019/03/28 21:06:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.15 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1991-2 by M. Stephenson
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/Wiz-fila.lua
+++ b/dat/Wiz-fila.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Wizard.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Wizard.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1992 by David Cohrs
 -- NetHack may be freely redistributed.  See license for details.
 --
--- a/dat/Wiz-filb.lua
+++ b/dat/Wiz-filb.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Wizard.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Wizard.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1992 by David Cohrs
 -- NetHack may be freely redistributed.  See license for details.
 --
--- a/dat/Wiz-goal.lua
+++ b/dat/Wiz-goal.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Wizard.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Wizard.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1992 by David Cohrs
 -- NetHack may be freely redistributed.  See license for details.
 --
@@ -29,7 +29,7 @@ des.map([[
                                                                            
 ]]);
 -- Dungeon Description
-des.region({ region={13,10,18,12}, lit=0, type="temple" })
+des.region({ region={13,10,18,12}, lit=0, type="temple", filled=2 })
 des.region(selection.area(13,06,18,08), "lit")
 des.region(selection.area(20,04,30,14), "unlit")
 des.region(selection.area(32,06,33,07), "unlit")
--- a/dat/Wiz-loca.lua
+++ b/dat/Wiz-loca.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Wizard.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Wizard.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1992 by David Cohrs
 -- NetHack may be freely redistributed.  See license for details.
 --
@@ -36,18 +36,18 @@ des.replace_terrain({ region = {34, 1,68,19}, fromterrain="}", toterrain=".", ch

 -- Dungeon Description
 des.region(selection.area(00,00,75,20), "lit")
-des.region({ region={37,04,65,16}, lit=0, type="ordinary", prefilled=1, irregular=1,
+des.region({ region={37,04,65,16}, lit=0, type="ordinary", irregular=1,
             contents = function()
                des.door({ state="secret", wall="random" })
                end
 })
-des.region({ region={39,06,63,14}, lit=0, type="ordinary", prefilled=1, irregular=1,
+des.region({ region={39,06,63,14}, lit=0, type="ordinary", irregular=1,
             contents = function()
                des.door({ state="secret", wall="random" })
             end
 })

-des.region({ region={41,08,46,12}, lit=1, type="ordinary", prefilled=1, irregular=1,
+des.region({ region={41,08,46,12}, lit=1, type="ordinary", irregular=1,
             contents = function()
                local walls = { "north", "south", "west" }
                local widx = math.random(1, #walls)
@@ -55,7 +55,7 @@ des.region({ region={41,08,46,12}, lit=1, type="ordinary", prefilled=1, irregula
             end
 })

-des.region({ region={56,08,61,12}, lit=1, type="ordinary", prefilled=1, irregular=1,
+des.region({ region={56,08,61,12}, lit=1, type="ordinary", irregular=1,
             contents = function()
                local walls = { "north", "south", "east" }
                local widx = math.random(1, #walls)
@@ -66,7 +66,7 @@ des.region({ region={56,08,61,12}, lit=1, type="ordinary", prefilled=1, irregula
 des.region(selection.area(48,08,54,08), "unlit")
 des.region(selection.area(48,12,54,12), "unlit")

-des.region({ region={48,10,54,10}, lit=0, type="ordinary", prefilled=1, irregular=1,
+des.region({ region={48,10,54,10}, lit=0, type="ordinary", irregular=1,
             contents = function()
                des.door({ state="secret", wall="random" })
             end
--- a/dat/Wiz-strt.lua
+++ b/dat/Wiz-strt.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	Wizard.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	Wizard.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1992 by David Cohrs
 -- NetHack may be freely redistributed.  See license for details.
 --
@@ -44,7 +44,7 @@ des.replace_terrain({ region={13,5, 33,15}, fromterrain="C", toterrain=".", chan
 des.region(selection.area(00,00,75,19), "lit")
 des.region(selection.area(35,00,49,03), "unlit")
 des.region(selection.area(43,12,49,16), "unlit")
-des.region({ region={19,11,33,15}, lit=0, type="ordinary", prefilled=0, irregular=1 })
+des.region({ region={19,11,33,15}, lit=0, type="ordinary", irregular=1 })
 des.region(selection.area(30,10,31,10), "unlit")
 -- Stairs
 des.stair("down", 30,10)
--- a/dat/air.lua
+++ b/dat/air.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	endgame.des	$NHDT-Date: 1546303680 2019/01/01 00:48:00 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.14 $
+-- NetHack 3.7	endgame.des	$NHDT-Date: 1546303680 2019/01/01 00:48:00 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.14 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1992,1993 by Izchak Miller, David Cohrs,
 --                      and Timo Hakulinen
--- a/dat/asmodeus.lua
+++ b/dat/asmodeus.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	gehennom.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.13 $
+-- NetHack 3.7	gehennom.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.13 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1992 by M. Stephenson and Izchak Miller
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/astral.lua
+++ b/dat/astral.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	endgame.des	$NHDT-Date: 1546303680 2019/01/01 00:48:00 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.14 $
+-- NetHack 3.7	endgame.des	$NHDT-Date: 1546303680 2019/01/01 00:48:00 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.14 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1992,1993 by Izchak Miller, David Cohrs,
 --                      and Timo Hakulinen
@@ -76,15 +76,15 @@ place:set(51,9);
 -- Where the player will land on arrival
 des.teleport_region({ region = {29,15,45,15}, exclude = {30,15,44,15} })
 -- Lit courts
-des.region({ region={01,05,16,14},lit=1,type="ordinary",prefilled=1,irregular=1 })
-des.region({ region={31,01,44,10},lit=1,type="ordinary",prefilled=1,irregular=1 })
-des.region({ region={61,05,74,14},lit=1,type="ordinary",prefilled=1,irregular=1 })
+des.region({ region={01,05,16,14},lit=1,type="ordinary",irregular=1 })
+des.region({ region={31,01,44,10},lit=1,type="ordinary",irregular=1 })
+des.region({ region={61,05,74,14},lit=1,type="ordinary",irregular=1 })
 -- A Sanctum for each alignment
 -- The shrines' alignments are shuffled for
 -- each game
-des.region({ region={04,07,10,11},lit=1,type="temple" })
-des.region({ region={34,03,40,07},lit=1,type="temple" })
-des.region({ region={64,07,70,11},lit=1,type="temple" })
+des.region({ region={04,07,10,11},lit=1,type="temple",filled=2 })
+des.region({ region={34,03,40,07},lit=1,type="temple",filled=2 })
+des.region({ region={64,07,70,11},lit=1,type="temple",filled=2 })

 des.altar({ x=07, y=09, align=align[1],type="sanctum" })
 des.altar({ x=37, y=05, align=align[2],type="sanctum" })
--- a/dat/baalz.lua
+++ b/dat/baalz.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	gehennom.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.13 $
+-- NetHack 3.7	gehennom.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.13 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 --	Copyright (c) 1992 by M. Stephenson and Izchak Miller
 -- NetHack may be freely redistributed.  See license for details.
--- a/dat/bogusmon.txt
+++ b/dat/bogusmon.txt
@@ -1,4 +1,4 @@
-# NetHack 3.6  bogusmon.txt       $NHDT-Date: 1574387024 2019/11/22 01:43:44 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.8 $
+# NetHack 3.7  bogusmon.txt       $NHDT-Date: 1596498237 2020/08/03 23:43:57 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.10 $
 # Copyright (c) 2016 by Pasi Kallinen
 # NetHack may be freely redistributed.  See license for details.
 #
--- a/dat/castle.lua
+++ b/dat/castle.lua
@@ -1,4 +1,4 @@
-- NetHack 3.6	castle.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
+-- NetHack 3.7	castle.des	$NHDT-Date: 1432512783 2015/05/25 00:13:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.11 $
 --	Copyright (c) 1989 by Jean-Christophe Collet
 -- NetHack may be freely redistributed.  See license for details.
 --
@@ -230,7 +230,7 @@ des.region(selection.area(00,00,62,16),"unlit")
 des.region(selection.area(00,05,05,11),"lit")
 des.region(selection.area(57,05,62,11),"lit")
 --   Throne room
-des.region({ region={27,05, 37,11},lit=1,type="throne", prefilled=1 })
+des.region({ region={27,05, 37,11},lit=1,type="throne", filled=2 })
 --   Antechamber
 des.region(selection.area(07,05,14,11),"lit")
 --   Storerooms
@@ -244,8 +244,8 @@ des.region(selection.area(56,02,60,03),"lit")
 des.region(selection.area(02,13,06,14),"lit")
 des.region(selection.area(56,13,60,14),"lit")
 --   Barracks
-des.region({ region={16,05, 25,06},lit=1,type="barracks", prefilled=0 })
-des.region({ region={16,10, 25,11},lit=1,type="barracks", prefilled=0 })
+des.region({ region={16,05, 25,06},lit=1,type="barracks", filled=1 })
+des.region({ region={16,10, 25,11},lit=1,type="barracks", filled=1 })
 --   Hallways
 des.region(selection.area(08,03,54,03),"unlit")
 des.region(selection.area(08,13,54,13),"unlit")
--- a/dat/cmdhelp
+++ b/dat/cmdhelp
@@ -1,4 +1,4 @@
-&# cmdhelp
+&# cmdhelp - became obsolete when 'BINDINGS=key:command' got added
 &	Tell what command a keystroke invokes
 ^	Show the type of an adjacent trap
 ^[	Cancel command (same as ESCape key)
@@ -145,6 +145,7 @@ _	Travel via a shortest-path algorithm to a point on the map
 *	Show all equipment in use (combination of the ),[,=,",( commands)
 $	Count your gold
 +	List known spells
+Del	Display map without monsters or objects obstructing the view.
 #	Perform an extended command (use '#?' to list choices)
 &# number_pad:
 &#  -1 = numpad off, swap y with z (including Y with Z, ^Y with ^Z, M-y &c)
@@ -222,3 +223,4 @@ M-T	Tip: empty a container
 M-u	Untrap something (trap, door, or chest)
 M-v	Print compile time options for this version of NetHack
 M-w	Wipe off your face
+M-X	Switch from normal play to explore mode
--- a/Show More
+++ b/Show More