Initial preparation for new version (0.9.1).

k21971 · Mar 10, 2025 · 461e8c9 · 461e8c9
1 parent 3480ba8
commit 461e8c9
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 28 deletions.
diff --git a/.github/workflows/evilhack-cpp.yml b/.github/workflows/evilhack-cpp.yml
@@ -46,7 +46,7 @@ jobs:
         ADD_CURSES: Y
         PDCURSES_TOP: ../../pdcurses
         TRAVIS_COMPILER: 1
-        ZIP_NAME: evilhack-0.9.0.zip
+        ZIP_NAME: evilhack-0.9.1.zip
     steps:
     - uses: actions/checkout@v4
       with:
@@ -67,13 +67,13 @@ jobs:
       with:
         type: 'zip'
         path: binary/
-        filename: evilhack-0.9.0.zip
+        filename: evilhack-0.9.1.zip
     - name: release
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')
       with:
         files: |
-          evilhack-0.9.0.zip
+          evilhack-0.9.1.zip
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/doc/evilhack-changelog.md b/doc/evilhack-changelog.md
@@ -4370,3 +4370,10 @@ The following changes to date are:
 - Fix: addition of teleport regions to some of the Mines' End levels
 - Switch status from beta to released
 
+
+### Version 0.9.1
+
+- Latest merges from 'vanilla' NetHack 3.6.7 official release (as of
+  November 6th, 2024)
+- Initial preparation for new version (0.9.1)
+
diff --git a/include/global.h b/include/global.h
@@ -19,7 +19,7 @@
 /*
  * Development status of this NetHack version.
  */
-#define NH_DEVEL_STATUS NH_STATUS_RELEASED
+#define NH_DEVEL_STATUS NH_STATUS_WIP
 
 #ifndef DEBUG  /* allow tool chains to define without causing warnings */
 #define DEBUG

diff --git a/include/patchlevel.h b/include/patchlevel.h
@@ -9,7 +9,7 @@
 /*
  * PATCHLEVEL is updated for each release.
  */
-#define PATCHLEVEL 0
+#define PATCHLEVEL 1
 /*
  * Incrementing EDITLEVEL can be used to force invalidation of old bones
  * and save files.
@@ -39,7 +39,7 @@
  * to individual level files matter; changes to general game state don't)
  * but the extra complexity to support that is not worth the effort.]
  */
-/*#define VERSION_COMPATIBILITY 0x00090000L*/
+/*#define VERSION_COMPATIBILITY 0x00090100L*/
 
 /****************************************************************************/
 /* Version 3.6.x */

diff --git a/install-to-chroot.sh b/install-to-chroot.sh
@@ -18,9 +18,9 @@ COMPRESSBIN="/bin/gzip"
 NH_GIT="/home/build/EvilHack"
 NH_BRANCH="master"
 # HACKDIR from include/config.h; aka nethack subdir inside chroot
-NHSUBDIR="evilhack-0.9.0"
+NHSUBDIR="evilhack-0.9.1"
 # VAR_PLAYGROUND from include/unixconf.h
-NH_VAR_PLAYGROUND="/evilhack-0.9.0/var/"
+NH_VAR_PLAYGROUND="/evilhack-0.9.1/var/"
 # END OF CONFIG
 ##############################################################################
 
@@ -45,8 +45,8 @@ set -e
 umask 022
 
 echo "Creating inprogress and extrainfo directories"
-mkdir -p "$NAO_CHROOT/dgldir/inprogress-evil090"
-chown "$USRGRP" "$NAO_CHROOT/dgldir/inprogress-evil090"
+mkdir -p "$NAO_CHROOT/dgldir/inprogress-evil091"
+chown "$USRGRP" "$NAO_CHROOT/dgldir/inprogress-evil091"
 mkdir -p "$NAO_CHROOT/dgldir/extrainfo-evil"
 chown "$USRGRP" "$NAO_CHROOT/dgldir/extrainfo-evil"
 

diff --git a/sys/unix/hints/hardfought b/sys/unix/hints/hardfought
@@ -15,7 +15,7 @@ COMPILEREVISION?=1
 PREFIX=/opt/nethack/chroot
 
 # this is the dir where NetHack is inside the chroot
-HACKDIR=/evilhack-0.9.0
+HACKDIR=/evilhack-0.9.1
 INSTDIR=$(PREFIX)$(HACKDIR)
 # DGL does not use the shell script launcher
 SHELLDIR=/tmp

diff --git a/sys/unix/sysconf b/sys/unix/sysconf
@@ -126,7 +126,7 @@ LLC_TURNS=3000
 # Only available if NetHack was compiled with DUMPLOG
 # Allows following placeholders:
 #   %% literal '%'
-#   %v version (eg. "0.9.0-0")
+#   %v version (eg. "0.9.1-0")
 #   %u game UID
 #   %t game start time, UNIX timestamp format
 #   %T current time, UNIX timestamp format

diff --git a/sys/winnt/.evilhackrc.template b/sys/winnt/.evilhackrc.template
@@ -88,7 +88,7 @@ OPTIONS=force_invmenu
 
 #
 # If you want to get rid of "use #quit to quit..." use:
-OPTIONS=suppress_alert:0.9.0
+OPTIONS=suppress_alert:0.9.1
 #
 # Note: the rest_on_space in the next line may not be
 #       appropriate for a beginning NetHack player, since

diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
@@ -139,7 +139,7 @@ TARGET_CPU=x86
 #==============================================================================
 
 #  The version of the game this Makefile was designed for
-NETHACK_VERSION="0.9.0"
+NETHACK_VERSION="0.9.1"
 
 # A brief version for use in macros
 NHV1=$(subst .,,$(NETHACK_VERSION))

diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
@@ -94,7 +94,7 @@ DEBUGINFO = Y
 #
 #  The version of the game this Makefile was designed for
 #NETHACK_VERSION="3.6.7"
-NETHACK_VERSION="0.9.0"
+NETHACK_VERSION="0.9.1"
 
 # A brief version for use in macros
 NHV=$(NETHACK_VERSION:.=)

diff --git a/sys/winnt/console.rc b/sys/winnt/console.rc
@@ -12,8 +12,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,0,0
- PRODUCTVERSION 0,9,0,0
+ FILEVERSION 0,9,1,0
+ PRODUCTVERSION 0,9,1,0
  FILEFLAGSMASK 0x1fL
 #ifdef _DEBUG
  FILEFLAGS 0x9L
@@ -29,13 +29,13 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "EvilHack for Windows - TTY Interface\0"
-            VALUE "FileVersion", "0.9.0\0"
+            VALUE "FileVersion", "0.9.1\0"
             VALUE "InternalName", "EvilHack\0"
             VALUE "LegalCopyright", "Copyright (C) 2018 - 2025 by Keith Simpson - a NetHack 3.6.x variant, copyright (C) 1985 - 2025.  By Stichting Mathematisch Centrum and M. Stephenson.  See license for details.\0"
             VALUE "OriginalFilename", "EvilHack.exe\0"
             VALUE "PrivateBuild", "050102\0"
             VALUE "ProductName", "EvilHack\0"
-            VALUE "ProductVersion", "0.9.0\0"
+            VALUE "ProductVersion", "0.9.1\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/sys/winnt/sysconf.template b/sys/winnt/sysconf.template
@@ -24,7 +24,7 @@ WIZARDS=*
 # Only available if NetHack was compiled with DUMPLOG
 # Allows following placeholders:
 #   %% literal '%'
-#   %v version (eg. "0.9.0-0")
+#   %v version (eg. "0.9.1-0")
 #   %u game UID
 #   %t game start time, UNIX timestamp format
 #   %T current time, UNIX timestamp format

diff --git a/win/win32/EvilHackW.rc b/win/win32/EvilHackW.rc
@@ -320,8 +320,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,0,0
- PRODUCTVERSION 0,9,0,0
+ FILEVERSION 0,9,1,0
+ PRODUCTVERSION 0,9,1,0
  FILEFLAGSMASK 0x1fL
 #ifdef _DEBUG
  FILEFLAGS 0x9L
@@ -337,13 +337,13 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "EvilHack for Windows - Graphical Interface"
-            VALUE "FileVersion", "0.9.0"
+            VALUE "FileVersion", "0.9.1"
             VALUE "InternalName", "EvilHackW"
             VALUE "LegalCopyright", "Copyright (C) 2018 - 2025 by Keith Simpson - a NetHack 3.6.x variant, copyright (C) 1985 - 2025.  By Stichting Mathematisch Centrum and M. Stephenson.  See license for details."
             VALUE "OriginalFilename", "EvilHackW.exe"
             VALUE "PrivateBuild", "140606"
             VALUE "ProductName", "EvilHack"
-            VALUE "ProductVersion", "0.9.0"
+            VALUE "ProductVersion", "0.9.1"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/win/win32/evilhack.rc b/win/win32/evilhack.rc
@@ -60,8 +60,8 @@ IDI_ICON1               ICON                    "nethack.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,0,0
- PRODUCTVERSION 0,9,0,0
+ FILEVERSION 0,9,1,0
+ PRODUCTVERSION 0,9,1,0
  FILEFLAGSMASK 0x1fL
 #ifdef _DEBUG
  FILEFLAGS 0x9L
@@ -77,12 +77,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "EvilHack for Windows - TTY Interface"
-            VALUE "FileVersion", "0.9.0"
+            VALUE "FileVersion", "0.9.1"
             VALUE "InternalName", "EvilHack"
             VALUE "LegalCopyright", "Copyright (C) 2018 - 2025 by Keith Simpson - a NetHack 3.6.x variant, copyright (C) 1985 - 2025.  By Stichting Mathematisch Centrum and M. Stephenson.  See license for details."
             VALUE "OriginalFilename", "EvilHack.exe"
             VALUE "ProductName", "EvilHack"
-            VALUE "ProductVersion", "0.9.0"
+            VALUE "ProductVersion", "0.9.1"
         END
     END
     BLOCK "VarFileInfo"