Merge branch 'dev'

.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 }}
 

.hackemrc

@@ -177,7 +177,7 @@ OPTIONS=ctrlkick
 OPTIONS=runmode:teleport
 
 # Safe-wait: We turn it off because it's annoying when something is next to you and you search.
-#OPTIONS=!safe_wait
+OPTIONS=!safe_wait
 
 # Display piles of items on the floor: 
 # 0=always, 1=never, other value is the size of the threshold. 
@@ -277,16 +277,15 @@ AUTOPICKUP_EXCEPTION="<.*papyrus spellbook"
 # Amulets of Strangulation, Oilskin Cloaks, etc)
 
 # This mostly covers items you cannot type-name. It's understood you name the rest.
-# In general,don't end item-type lines with *
+# In general, don't end item-type lines with *
 # we want to be able to override that for individual items.
 
-
-
 # #unidentified magical armor
 # # Usually, a "plumed helmet" is new, but a "helmet called plain" isn't.
 # AUTOPICKUP_EXCEPTION="<*faded pall"
 AUTOPICKUP_EXCEPTION="<.*apron"
 AUTOPICKUP_EXCEPTION="<.*polished silver shield"
+
 # # blind
 
 # Helms
@@ -360,16 +359,13 @@ AUTOPICKUP_EXCEPTION="<.*pyramid ring"
 AUTOPICKUP_EXCEPTION="<.*rhombus ring"
 AUTOPICKUP_EXCEPTION="<.*teardrop ring"
 AUTOPICKUP_EXCEPTION="<.*knotted ring"
-
 AUTOPICKUP_EXCEPTION="<.*glittery ring"
 AUTOPICKUP_EXCEPTION="<.*mobius ring"
 AUTOPICKUP_EXCEPTION="<.*infinity ring"
 AUTOPICKUP_EXCEPTION="<.*viney ring"
 AUTOPICKUP_EXCEPTION="<.*braided ring"
 AUTOPICKUP_EXCEPTION="<.*antique ring"
 AUTOPICKUP_EXCEPTION="<.*scaled"
-
-
 AUTOPICKUP_EXCEPTION="<.*crescent ring"
 AUTOPICKUP_EXCEPTION="<.*chunky ring"
 AUTOPICKUP_EXCEPTION="<.*tribal ring"
@@ -443,41 +439,6 @@ AUTOPICKUP_EXCEPTION=">.*ring of sleeping"
 AUTOPICKUP_EXCEPTION=">.*ring of displacement"
 AUTOPICKUP_EXCEPTION=">.*ring of protection from shape changers"
 
-
-# Informal naming
-AUTOPICKUP_EXCEPTION=">.*ring called adornment"
-AUTOPICKUP_EXCEPTION=">.*ring called gain con*"
-AUTOPICKUP_EXCEPTION=">.*ring called gain str*"
-AUTOPICKUP_EXCEPTION=">.*ring called (increase|) accuracy"
-AUTOPICKUP_EXCEPTION=">.*ring called (increase|) damage"
-AUTOPICKUP_EXCEPTION=">.*ring called protection"
-AUTOPICKUP_EXCEPTION=">.*ring called reg*"
-AUTOPICKUP_EXCEPTION=">.*ring called search*"
-AUTOPICKUP_EXCEPTION=">.*ring called stealth"
-AUTOPICKUP_EXCEPTION=">.*ring called sustain*"
-AUTOPICKUP_EXCEPTION=">.*ring called lev*"
-AUTOPICKUP_EXCEPTION=">.*ring called hunger"
-AUTOPICKUP_EXCEPTION=">.*ring called aggr[oa]*"
-AUTOPICKUP_EXCEPTION=">.*ring called con*"
-AUTOPICKUP_EXCEPTION=">.*ring called warn*"
-AUTOPICKUP_EXCEPTION=">.*ring called poison*"
-AUTOPICKUP_EXCEPTION=">.*ring called fire*"
-AUTOPICKUP_EXCEPTION=">.*ring called cold*"
-AUTOPICKUP_EXCEPTION=">.*ring called sonic*"
-AUTOPICKUP_EXCEPTION=">.*ring called shock*"
-AUTOPICKUP_EXCEPTION=">.*ring called free*"
-AUTOPICKUP_EXCEPTION=">.*ring called slow*"
-AUTOPICKUP_EXCEPTION=">.*ring called tele"
-AUTOPICKUP_EXCEPTION=">.*ring called tele(port|) control"
-AUTOPICKUP_EXCEPTION=">.*ring called poly"
-AUTOPICKUP_EXCEPTION=">.*ring called poly(morph|) control"
-AUTOPICKUP_EXCEPTION=">.*ring called inv*"
-AUTOPICKUP_EXCEPTION=">.*ring called see*"
-AUTOPICKUP_EXCEPTION=">.*ring called protection from*"
-AUTOPICKUP_EXCEPTION=">.*ring called mood"
-AUTOPICKUP_EXCEPTION=">.*ring called sleep*"
-
-
 # #unidentified amulets
 # #amulets show up properly when blind
 AUTOPICKUP_EXCEPTION="<.*circular amulet"
@@ -536,8 +497,8 @@ AUTOPICKUP_EXCEPTION="<whetstone"
 AUTOPICKUP_EXCEPTION="<.*can of grease"
 AUTOPICKUP_EXCEPTION="<.*magic whistle"
 
-# Autopickup of potions and scrolls - I assume that people like to either pickup
-# ALL of these or none of them.
+# Autopickup of potions and scrolls - assumes that people 
+# like to either pickup ALL of these or none of them.
 
 # Unidentified wands
 # I also assume that everyone will want to pickup EVERY un-identified wand.
@@ -579,9 +540,6 @@ AUTOPICKUP_EXCEPTION="<.*wand of corrosion"
 AUTOPICKUP_EXCEPTION="<.*wand of noise"
 AUTOPICKUP_EXCEPTION="<.*wand of deluge"
 
-
-
-
 # Gem autopickup
 # Unidentified gems
 #AUTOPICKUP_EXCEPTION="<.*black gem"
@@ -690,7 +648,8 @@ OPTIONS=quick_farsight
 
 #	- History settings
 # Maximize the history (full=messages printed least recent first)
-OPTIONS=msg_window:single
+OPTIONS=msg_window:reversed
+
 # For the TTY, X11 and Gem ports the minimum is 20 and maximum 60. 
 OPTIONS=msghistory:60
 
@@ -876,6 +835,7 @@ MENUCOLOR=" pill"=brown
 MENUCOLOR=" holy wafer"=brown
 MENUCOLOR=" brown pudding"=brown
 MENUCOLOR=" blood pudding"=brown
+
 # Note: Black/Blood Puddings are not vegetarian.
 MENUCOLOR="gray ooze"=brown
 
@@ -1141,6 +1101,7 @@ MENUCOLOR=" 100% "=red
 
 # Forgotten spells
 MENUCOLOR=" \(gone\)"=red
+
 # -----------------------------------------------------------------------------
 # I) MSGTYPE settings
 #	- Mundane messages/spam
@@ -1244,6 +1205,9 @@ MSGTYPE=hide "The Book of the Dead .*"
 ## Don't miss #enhance!
 MSGTYPE=alert "You feel more confident *"
 
+# Don't miss spells being forgotten!
+MSGTYPE=alert ".* spell is fading!"
+
 ## Warn when Zapping an empty wand (disable if wresting).
 MSGTYPE=stop "Nothing happens."
 
@@ -1372,7 +1336,7 @@ SYMBOLS=S_golem:8
 SYMBOLS=S_lava:~
 SYMBOLS=S_pool:~
 SYMBOLS=S_water:~
-# SYMBOLS=S_sink:#
+SYMBOLS=S_sink:#
 
 OPTIONS=boulder:0
 
@@ -1513,3 +1477,5 @@ OPTIONS=tombstone
 #	Updated wielding/wearing colors to include secondary quivered/tethered/ready weapons.
 #	Added underlining for crysknife
 
+# 3.0 (10/27/2023) - Some updates for new ring appearances.
+#   Many other changes have been applied since 2.0.

dat/Arch.des

@@ -11,6 +11,8 @@
 MAZE: "Arc-strt",' '
 FLAGS: noteleport,hardfloor
 GEOMETRY:center,center
+#0        1         2         3         4         5         6
+#1234567890123456789012345678901234567890123456789012345678901234567890
 MAP
 ............................................................................
 ............................................................................
@@ -34,7 +36,7 @@ MAP
 ............................................................................
 ENDMAP
 # Dungeon Description
-REGION:(00,00,75,19),lit,"ordinary"
+REGION: (00,00,75,19),lit,"ordinary"
 REGION: (22,06,23,06),unlit,"ordinary"
 REGION: (25,06,30,06),unlit,"ordinary"
 REGION: (32,06,48,06),unlit,"ordinary"
@@ -72,8 +74,9 @@ MONSTER:('@',"Lord Carnarvon"),(25,10) {
   OBJECT:('[',"fedora"),+5
   OBJECT:(')',"bullwhip"),+4
 }
-# The treasure of Lord Carnarvon
-OBJECT:('(',"chest"),(25,10)
+
+MAGIC_CHEST:(27,10)
+
 # student guards for the audience chamber
 MONSTER:('@',"student"),(26,09)
 MONSTER:('@',"student"),(27,09)

dat/Barb.des

@@ -81,8 +81,8 @@ MONSTER:('@',"Pelias"),(10,07) {
   OBJECT:(')',"runesword"),+5
   OBJECT:('[',"chain mail"),+5
 }
-# The treasure of Pelias
-OBJECT:('(',"chest"),(09,05)
+# Magic chest
+MAGIC_CHEST:(09,05)
 # chieftain guards for the audience chamber
 MONSTER:('@',"chieftain"),(10,05)
 MONSTER:('@',"chieftain"),(10,09)

dat/Caveman.des

@@ -56,8 +56,8 @@ MONSTER:('@',"Shaman Karnov"),(35,02) {
   OBJECT:('[',"light armor"),+5
   OBJECT:(')',"club"),+5
 }
-# The treasure of Shaman Karnov
-OBJECT:('(',"chest"),(34,02)
+# Magic chest
+MAGIC_CHEST:(40,03)
 # neanderthal guards for the audience chamber
 MONSTER:('@',"neanderthal"),(20,03)
 MONSTER:('@',"neanderthal"),(20,02)
@@ -225,7 +225,7 @@ STAIR:random,up
 # Non diggable walls
 NON_DIGGABLE:(00,00,75,19)
 # Objects
-OBJECT:(')',"rod"),(23,10),blessed,0,name:"The Sceptre of Might"
+OBJECT:(')',"executioner's mace"),(23,10),blessed,0,name:"The Sceptre of Might"
 OBJECT:('`',"boulder"),random
 OBJECT:('`',"boulder"),random
 OBJECT:('`',"boulder"),random

dat/Convict.des

@@ -38,6 +38,8 @@ STAIR:(64,08),down
 BRANCH:(71,03,71,03),(0,0,0,0)
 # Altar
 ALTAR:(70,16),chaos,shrine
+# Magic chest
+MAGIC_CHEST:(71,16)
 # Robert the Lifer
 MONSTER:('@',"Robert the Lifer"),(74,18)
 # fellow prisoners