From 1cf6a336fed7685bfedfce38ea0d84db85c22984 Mon Sep 17 00:00:00 2001 From: Erik Lunna Date: Thu, 26 Oct 2023 22:10:30 +0200 Subject: [PATCH 1/2] Prep for 1.2.2 release. --- .github/workflows/hackem-cpp.yml | 6 +++--- include/patchlevel.h | 6 +++--- sys/winnt/.hackemrc.template | 2 +- sys/winnt/Makefile.gcc | 2 +- sys/winnt/Makefile.msc | 2 +- sys/winnt/console.rc | 8 ++++---- sys/winnt/nethack.def | 2 +- sys/winnt/sysconf.template | 2 +- win/win32/hackem.rc | 8 ++++---- win/win32/hackemW.rc | 10 +++++----- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/hackem-cpp.yml b/.github/workflows/hackem-cpp.yml index 327dfb8d3..83245c008 100644 --- a/.github/workflows/hackem-cpp.yml +++ b/.github/workflows/hackem-cpp.yml @@ -46,7 +46,7 @@ jobs: ADD_CURSES: Y PDCURSES_TOP: ../../pdcurses TRAVIS_COMPILER: 1 - ZIP_NAME: HackEM-1.2.1.zip + ZIP_NAME: HackEM-1.2.2.zip steps: - uses: actions/checkout@v3 with: @@ -67,13 +67,13 @@ jobs: with: type: 'zip' path: binary/ - filename: HackEM-1.2.1.zip + filename: HackEM-1.2.2.zip - name: release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: files: | - HackEM-1.2.1.zip + HackEM-1.2.2.zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/include/patchlevel.h b/include/patchlevel.h index d00ce1204..14c90d802 100644 --- a/include/patchlevel.h +++ b/include/patchlevel.h @@ -9,7 +9,7 @@ /* * PATCHLEVEL is updated for each release. */ -#define PATCHLEVEL 1 +#define PATCHLEVEL 2 /* * Incrementing EDITLEVEL can be used to force invalidation of old bones * and save files. @@ -17,7 +17,7 @@ #define EDITLEVEL 0 #define COPYRIGHT_BANNER_A \ -"HackEM, copyright 2022-2023 by Erik Lunna - a NetHack 3.6.x variant," +"Hack'EM, copyright 2022-2023 by Erik Lunna - a NetHack 3.6.x variant," #define COPYRIGHT_BANNER_B \ "copyright 1985-2023 by Stichting Mathematisch Centrum and M. Stephenson." /* COPYRIGHT_BANNER_C is generated by makedefs into date.h */ @@ -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 0x01020100L +#define VERSION_COMPATIBILITY 0x01020200L /****************************************************************************/ /* Version 3.6.x */ diff --git a/sys/winnt/.hackemrc.template b/sys/winnt/.hackemrc.template index a9963aadd..54a002132 100644 --- a/sys/winnt/.hackemrc.template +++ b/sys/winnt/.hackemrc.template @@ -92,7 +92,7 @@ OPTIONS=force_invmenu # # If you want to get rid of "use #quit to quit..." use: -OPTIONS=suppress_alert:1.2.1 +OPTIONS=suppress_alert:1.2.2 # # 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 index 9d6361bb5..4179a0a00 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/winnt/Makefile.gcc @@ -139,7 +139,7 @@ SKIP_NETHACKW=Y #============================================================================== # The version of the game this Makefile was designed for -NETHACK_VERSION="1.2.1" +NETHACK_VERSION="1.2.2" # A brief version for use in macros NHV1=$(subst .,,$(NETHACK_VERSION)) diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index b42bb4053..072c44ae8 100644 --- 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.6" -NETHACK_VERSION="1.2.1" +NETHACK_VERSION="1.2.2" # A brief version for use in macros NHV=$(NETHACK_VERSION:.=) diff --git a/sys/winnt/console.rc b/sys/winnt/console.rc index e56f2644c..0341f71e0 100644 --- a/sys/winnt/console.rc +++ b/sys/winnt/console.rc @@ -12,8 +12,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,1,0 - PRODUCTVERSION 1,2,1,0 + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,0 FILEFLAGSMASK 0x1fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -29,13 +29,13 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "HackEM for Windows - TTY Interface\0" - VALUE "FileVersion", "1.2.1\0" + VALUE "FileVersion", "1.2.2\0" VALUE "InternalName", "HackEM\0" VALUE "LegalCopyright", "Copyright (C) 2022 - 2023 by Erik Lunna - a NetHack 3.6.x variant, copyright (C) 1985 - 2022. By Stichting Mathematisch Centrum and M. Stephenson. See license for details.\0" VALUE "OriginalFilename", "HackEM.exe\0" VALUE "PrivateBuild", "050102\0" VALUE "ProductName", "HackEM\0" - VALUE "ProductVersion", "1.2.1\0" + VALUE "ProductVersion", "1.2.2\0" END END BLOCK "VarFileInfo" diff --git a/sys/winnt/nethack.def b/sys/winnt/nethack.def index f6a0ccf52..68a887c06 100644 --- a/sys/winnt/nethack.def +++ b/sys/winnt/nethack.def @@ -1,5 +1,5 @@ NAME HACKEM -DESCRIPTION 'HackEM 1.2.1 for Windows' +DESCRIPTION 'Hack'EM 1.2.2 for Windows' EXETYPE WINDOWS STUB 'WINSTUB.EXE' CODE PRELOAD MOVEABLE DISCARDABLE diff --git a/sys/winnt/sysconf.template b/sys/winnt/sysconf.template index 443e67275..ba787a265 100644 --- 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. "1.2.1-0") +# %v version (eg. "1.2.2-0") # %u game UID # %t game start time, UNIX timestamp format # %T current time, UNIX timestamp format diff --git a/win/win32/hackem.rc b/win/win32/hackem.rc index aa08cb2e9..1aa860954 100644 --- a/win/win32/hackem.rc +++ b/win/win32/hackem.rc @@ -60,8 +60,8 @@ IDI_ICON1 ICON "nethack.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,1,0 - PRODUCTVERSION 1,2,1,0 + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,0 FILEFLAGSMASK 0x1fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -77,12 +77,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "HackEM for Windows - TTY Interface" - VALUE "FileVersion", "1.2.1" + VALUE "FileVersion", "1.2.2" VALUE "InternalName", "HackEM" VALUE "LegalCopyright", "Copyright (C) 2022 - 2023 by Erik Lunna - a NetHack 3.6.x variant, copyright (C) 1985 - 2022. By Stichting Mathematisch Centrum and M. Stephenson. See license for details." VALUE "OriginalFilename", "HackEM.exe" VALUE "ProductName", "HackEM" - VALUE "ProductVersion", "1.2.1" + VALUE "ProductVersion", "1.2.2" END END BLOCK "VarFileInfo" diff --git a/win/win32/hackemW.rc b/win/win32/hackemW.rc index 830c1518a..1594b834c 100644 --- a/win/win32/hackemW.rc +++ b/win/win32/hackemW.rc @@ -320,8 +320,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,1,0 - PRODUCTVERSION 1,2,1,0 + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,0 FILEFLAGSMASK 0x1fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -336,14 +336,14 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "FileDescription", "HackEM for Windows - Graphical Interface" - VALUE "FileVersion", "1.2.1" + VALUE "FileDescription", "Hack'EM for Windows - Graphical Interface" + VALUE "FileVersion", "1.2.2" VALUE "InternalName", "HackEMW" VALUE "LegalCopyright", "Copyright (C) 2022 - 2023 by Erik Lunna - a NetHack 3.6.x variant, copyright (C) 1985 - 2022. By Stichting Mathematisch Centrum and M. Stephenson. See license for details." VALUE "OriginalFilename", "HackEMW.exe" VALUE "PrivateBuild", "140606" VALUE "ProductName", "HackEM" - VALUE "ProductVersion", "1.2.1" + VALUE "ProductVersion", "1.2.2" END END BLOCK "VarFileInfo" From 8abfa4a40910a48ad1c79a3ee96e67de0944bbcc Mon Sep 17 00:00:00 2001 From: Erik Lunna Date: Thu, 26 Oct 2023 22:20:16 +0200 Subject: [PATCH 2/2] sysconf tweaks (from EvilHack) --- sys/unix/sysconf | 97 +++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 38 deletions(-) diff --git a/sys/unix/sysconf b/sys/unix/sysconf index f98c2a80e..3fc321fc1 100644 --- a/sys/unix/sysconf +++ b/sys/unix/sysconf @@ -20,7 +20,7 @@ WIZARDS=* # Which users can use explore mode (aka discover mode; accessed via '-X' # command line flag or OPTIONS=playmode:explore in runtime options file or # via '#exploremode' command during normal play). Same syntax as WIZARDS. -EXPLORERS=nobody +EXPLORERS=* # Users allowed to use the '!' (shell escape) and '^Z' (suspend process) # commands to temporarily leave the game and enter a shell process. @@ -41,7 +41,7 @@ EXPLORERS=nobody # Use the player name for matching WIZARDS, EXPLORERS and SHELLERS, # instead of the user's login name. -#CHECK_PLNAME=1 +CHECK_PLNAME=1 # Limit the number of simultaneous games (see also nethack.sh). # Valid values are 0-25. @@ -86,13 +86,13 @@ PERSMAX=50 # Maximum entries in the record file. ENTRYMAX=2000 # Minimum points to get an entry. -#POINTSMIN=1 +POINTSMIN=1 # Determine identity of "person" in the score file with name (0) or # numeric (1) user id. #PERS_IS_UID=1 # Maximum number of score file entries to use for random statue names -#MAX_STATUENAME_RANK=10 +MAX_STATUENAME_RANK=50 # Use "Live logging" for in-game progress (achievements, wishes, etc) # Bitmask for kinds of things you want to log - combine the following values @@ -170,40 +170,61 @@ PANICTRACE_LIBC=2 # default values. Unlike the SYSCF values above, individual users can # still choose their own option settings via NETHACKOPTIONS in their # environment or via ~/.hackemrc run-time configuration file. -#OPTIONS=!autopickup,fruit:tomato,symset:DECgraphics -# The following are the NAO defaults for 3.6.0 according to paxed -OPTIONS=bones -OPTIONS=color -OPTIONS=lit_corridor -OPTIONS=dark_room -OPTIONS=autodig -OPTIONS=autoopen + +# Basic options OPTIONS=disclose:yi ya yv yg yc yo -OPTIONS=boulder:0 -OPTIONS=autopickup -OPTIONS=pickup_types:$!?"=/~ -OPTIONS=pickup_burden:unencumbered -OPTIONS=hilite_pet -OPTIONS=hilite_pile -OPTIONS=msg_window:reversed -OPTIONS=number_pad:0 -OPTIONS=sortloot:full -OPTIONS=time -OPTIONS=paranoid_confirmation:attack pray quit Remove swim wand-break - -#OPTIONS=showdmg -#OPTIONS=invweight - -# For fuzzing -BIND=v:wizmakemap - -# For bug-finding -#OPTIONS=sanity_check - -# Make testing curses easier -#OPTIONS=windowtype:curses -#OPTIONS=align_message:top -#OPTIONS=align_status:bottom -#OPTIONS=perm_invent +OPTIONS=bones,color,lit_corridor,dark_room,autodig,autoopen +OPTIONS=boulder:0,pickup_burden:unencumbered,sparkle:5 +OPTIONS=!autopickup,hilite_pet,hilite_pile,time,use_darkgray +OPTIONS=msg_window:reversed,number_pad:0,sortloot:full +OPTIONS=menu_objsyms,perm_invent,hitpointbar,quick_farsight +# realtime options (wallclock time / play time / disabled) +OPTIONS=realtime:wallclock time + +# hilite_status - allowed colors are black, red, green, brown, blue, +# magenta, cyan, gray, orange, lightgreen, yellow, lightblue, lightmagenta, +# lightcyan, and white. +OPTIONS=statushilites +OPTIONS=hilite_status: hitpoints-max/green&normal +OPTIONS=hilite_status: hitpoints/100%/green&normal +OPTIONS=hilite_status: hitpoints/<100%/lightgreen&normal +OPTIONS=hilite_status: hitpoints/<76%/yellow&normal +OPTIONS=hilite_status: hitpoints/<51%/orange&normal +OPTIONS=hilite_status: hitpoints/<26%/red&normal +OPTIONS=hilite_status: hitpoints/<11%/black&normal +OPTIONS=hilite_status: power-max/green&normal +OPTIONS=hilite_status: power/100%/green&normal +OPTIONS=hilite_status: power/<100%/lightgreen&normal +OPTIONS=hilite_status: power/<76%/yellow&normal +OPTIONS=hilite_status: power/<51%/orange&normal +OPTIONS=hilite_status: power/<26%/red&normal +OPTIONS=hilite_status: power/<11%/black&normal +OPTIONS=hilite_status: gold/always/yellow&normal +OPTIONS=hilite_status: hunger/satiated/brown&normal +OPTIONS=hilite_status: hunger/hungry/orange&normal +OPTIONS=hilite_status: hunger/weak/red&normal +OPTIONS=hilite_status: hunger/fainting/black&normal +OPTIONS=hilite_status: hunger/fainted/black&normal +OPTIONS=hilite_status: condition/conf/orange&normal +OPTIONS=hilite_status: condition/stun/red&normal +OPTIONS=hilite_status: condition/blind/black&normal +OPTIONS=hilite_status: condition/deaf/cyan&normal +OPTIONS=hilite_status: condition/foodpois/lightgreen&normal +OPTIONS=hilite_status: condition/termill/lightgreen&normal +OPTIONS=hilite_status: condition/slime/lightgreen&normal +OPTIONS=hilite_status: condition/wither/green&normal +OPTIONS=hilite_status: condition/hallu/magenta&normal +OPTIONS=hilite_status: condition/strngl/red&normal +OPTIONS=hilite_status: condition/stone/brown&bold&normal +OPTIONS=hilite_status: condition/movement/lightblue&normal +OPTIONS=hilite_status: carrying-capacity/burdened/yellow&normal +OPTIONS=hilite_status: carrying-capacity/stressed/orange&normal +OPTIONS=hilite_status: carrying-capacity/strained/red&normal +OPTIONS=hilite_status: carrying-capacity/overtaxed/red&normal +OPTIONS=hilite_status: carrying-capacity/overloaded/black&normal + +# Various MSGTYPE examples +MSGTYPE=hide "Unknown command *" +MSGTYPE=alert "The (couatl|.*eel|kraken) swings itself around you!" #eof