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/.hackemrc b/.hackemrc
index e7a4b8ef0..8d39e1d69 100644
--- a/.hackemrc
+++ b/.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,7 +359,6 @@ 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"
@@ -368,8 +366,6 @@ 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.
diff --git a/dat/Arch.des b/dat/Arch.des
index a58bb0b76..095ff21b3 100644
--- a/dat/Arch.des
+++ b/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)
diff --git a/dat/Barb.des b/dat/Barb.des
index 34b61aa07..be5c398fc 100644
--- a/dat/Barb.des
+++ b/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)
diff --git a/dat/Caveman.des b/dat/Caveman.des
index 276d36480..6754b6a95 100644
--- a/dat/Caveman.des
+++ b/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
diff --git a/dat/Convict.des b/dat/Convict.des
index 4c4861280..4a5baccb2 100644
--- a/dat/Convict.des
+++ b/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
diff --git a/dat/Flame.des b/dat/Flame.des
index a3d34c2f9..49c9ddeb9 100644
--- a/dat/Flame.des
+++ b/dat/Flame.des
@@ -39,9 +39,6 @@ ENDMAP
 REGION: (00,00,75,19), lit, "ordinary"
 NON_DIGGABLE: (00,00,75,19)
 
-# Random Monsters
-#RANDOM_MONSTERS: 'R', 'E'
-
 # Portal arrival point
 BRANCH: (69,17,69,17), (0,0,0,0)
 
@@ -51,8 +48,7 @@ STAIR: (05,12), down
 # High Flame Mage
 MONSTER: ('@', "High Flame Mage"), (36,11)
 
-# The treasure of the High Flame Mage
-OBJECT: ('(', "chest"), (37,11)
+MAGIC_CHEST:(40,11)
 
 # guards for the audience chamber
 MONSTER: ('@', "igniter"), (34,09)
@@ -67,30 +63,17 @@ MONSTER: ('D', "red dragon"), random, peaceful
 MONSTER: ('D', "red dragon"), random, peaceful
 
 # Random traps
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
+LOOP [8] { TRAP: "cold", random }
 
 # Monsters on siege duty.
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
+LOOP [6] { MONSTER: ('E', "ice elemental"), random, hostile }
+MONSTER: ('T', "ice troll"), random, hostile
 MONSTER: ('T', "ice troll"), random, hostile
 MONSTER: ('T', "ice troll"), random, hostile
-MONSTER: ('T', "water troll"), random, hostile
-MONSTER: ('T', "water troll"), random, hostile
 MONSTER: ('&', "water demon"), random, hostile
-MONSTER: ('n', "water nymph"), random, hostile
-MONSTER: ('n', "water nymph"), random, hostile
-MONSTER: ('R', "rust monster"), random, hostile
+MONSTER: ('&', "ice devil"), random, hostile
+MONSTER: ('n', "ice nymph"), random, hostile
+MONSTER: ('n', "ice nymph"), random, hostile
 MONSTER: ('R', "rust monster"), random, hostile
  
 #
@@ -132,49 +115,30 @@ STAIR: (48,14), up
 STAIR: (20,06), down
 
 # Objects
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
+LOOP [9] { OBJECT: random, random }
 
 # Random traps
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
+LOOP [7] { TRAP: "cold", random }
 TRAP: random, random
 TRAP: random, random
 
 # Random monsters.
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
+LOOP [6] { MONSTER: ('E', "ice elemental"), random, hostile }
 MONSTER: ('&', "ice devil"), random, hostile
 MONSTER: ('&', "water demon"), random, hostile
 MONSTER: ('H', "frost giant"), random, hostile
 MONSTER: ('H', "frost giant"), random, hostile
 MONSTER: ('T', "ice troll"), random, hostile
 MONSTER: ('T', "ice troll"), random, hostile
-MONSTER: ('T', "water troll"), random, hostile
-MONSTER: ('T', "water troll"), random, hostile
-MONSTER: ('R', "rust monster"), random, hostile
-MONSTER: ('R', "rust monster"), random, hostile
-MONSTER: ('R', "rust monster"), random, hostile
+MONSTER: ('T', "ice troll"), random, hostile
+LOOP [3] { MONSTER: ('v', "ice vortex"), random, hostile }
 MONSTER: ('R', "disenchanter"), random, hostile
 
 #
 #       The "goal" level for the quest.
 #
-#       Here you meet Lord Surtur your nemesis monster.  You have to
-#       defeat Lord Surtur in combat to gain the artifact you have
+#       Here you meet the High Ice Mage your nemesis monster.  You 
+#       have to defeat him in combat to gain the artifact you have
 #       been assigned to retrieve.
 #
 
@@ -223,19 +187,10 @@ DRAWBRIDGE: (17,14), north, closed
 OBJECT: ('(', "magic candle"), (17,08), blessed, 0, name:"The Candle of Eternal Flame"
 
 # Objects
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
+LOOP [7] { OBJECT: random, random }
 
 # Random traps
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
+LOOP [10] { TRAP: "cold", random }
 TRAP: random, random
 TRAP: random, random
 
@@ -243,29 +198,19 @@ TRAP: random, random
 ALTAR: (17,08), noalign, altar
 
 # Random monsters.
-MONSTER: ('@', "Water Mage"),(17,08)
+MONSTER: ('@', "High Ice Mage"),(17,08)
 MONSTER: ('D', "white dragon"), (17,09), asleep, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('E', "water elemental"), random, hostile
-MONSTER: ('v', "ice vortex"), random, hostile
-MONSTER: ('v', "ice vortex"), random, hostile
-MONSTER: ('v', "ice vortex"), random, hostile
-MONSTER: ('R', "rust monster"), random, hostile
+LOOP [6] { MONSTER: ('E', "ice elemental"), random, hostile }
+LOOP [3] { MONSTER: ('v', "ice vortex"), random, hostile }
 MONSTER: ('R', "rust monster"), random, hostile
 MONSTER: ('&', "ice devil"), random, hostile
 MONSTER: ('&', "ice devil"), random, hostile
-MONSTER: ('U', "water hulk"), random, hostile
-MONSTER: ('U', "water hulk"), random, hostile
-MONSTER: ('&', "water demon"), random, hostile
-MONSTER: ('&', "water demon"), random, hostile
-MONSTER: ('T', "water troll"), random, hostile
-MONSTER: ('T', "water troll"), random, hostile
-MONSTER: ('n', "water nymph"), random, hostile
-MONSTER: ('n', "water nymph"), random, hostile
+MONSTER: ('&', "ice devil"), random, hostile
+MONSTER: ('&', "ice devil"), random, hostile
+MONSTER: ('T', "ice troll"), random, hostile
+MONSTER: ('T', "ice troll"), random, hostile
+MONSTER: ('n', "ice nymph"), random, hostile
+MONSTER: ('n', "ice nymph"), random, hostile
 MONSTER: (';', "electric eel"), random, hostile
 MONSTER: (';', "electric eel"), random, hostile
 MONSTER: (';', "kraken"), random, hostile
@@ -291,37 +236,18 @@ NOMAP
 STAIR: random, up
 STAIR: random, down
 
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('R', "rust monster"), random, hostile
-MONSTER: ('R', "rust monster"), random, hostile
-MONSTER: ('R', "rust monster"), random, hostile
-MONSTER: ('n', "water nymph"), random, hostile
-MONSTER: ('n', "water nymph"), random, hostile
+LOOP [6] { OBJECT: random, random }
+
+LOOP [7] { MONSTER: ('E', "ice elemental"), random, hostile }
+LOOP [3] { MONSTER: ('v', "ice vortex"), random, hostile } 
+MONSTER: ('n', "ice nymph"), random, hostile
+MONSTER: ('n', "ice nymph"), random, hostile
 MONSTER: ('H', "frost giant"), random, hostile
 MONSTER: ('H', "frost giant"), random, hostile
 MONSTER: ('T', "ice troll"), random, hostile
 MONSTER: ('T', "ice troll"), random, hostile
 
-TRAP: random, random
-TRAP: random, random
-TRAP: random, random
-TRAP: random, random
-TRAP: random, random
-TRAP: random, random
-TRAP: random, random
+LOOP [7] { TRAP: random, random }
 
 MAZE: "Fla-filb" , 'P'
 INIT_MAP: mines, '.' , 'P' , true , true , lit, false
@@ -330,40 +256,24 @@ NOMAP
 STAIR: random, up
 STAIR: random, down
 
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('E', "water elemental"), random
-MONSTER: ('R', "rust monster"), random, hostile
-MONSTER: ('R', "rust monster"), random, hostile
+LOOP [5] { OBJECT: random, random }
+
+LOOP [6] { MONSTER: ('E', "ice elemental"), random, hostile }
+LOOP [3] { MONSTER: ('v', "ice vortex"), random, hostile } 
 MONSTER: ('&', "ice devil"), random, hostile
 MONSTER: ('&', "water demon"), random, hostile
 MONSTER: ('&', "water demon"), random, hostile
-MONSTER: ('T', "water troll"), random, hostile
-MONSTER: ('T', "water troll"), random, hostile
-MONSTER: ('H', "frost giant"), random, hostile
-MONSTER: ('H', "frost giant"), random, hostile
 MONSTER: ('T', "ice troll"), random, hostile
 MONSTER: ('T', "ice troll"), random, hostile
+MONSTER: ('T', "ice troll"), random, hostile
+MONSTER: ('T', "ice troll"), random, hostile
+MONSTER: ('H', "frost giant"), random, hostile
+MONSTER: ('H', "frost giant"), random, hostile
 MONSTER: ('U', "water hulk"), random, hostile
 MONSTER: (';', "electric eel"), random, hostile
 MONSTER: (';', "electric eel"), random, hostile
-MONSTER: ';', random, hostile
-MONSTER: ';', random, hostile
-MONSTER: ';', random, hostile
-MONSTER: ';', random, hostile
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
-TRAP: "rust", random
+LOOP [4] { MONSTER: ';', random, hostile }
+
+LOOP [8] { TRAP: "cold", random }
 TRAP: random, random
 TRAP: random, random
diff --git a/dat/Healer.des b/dat/Healer.des
index 8b851988f..3bfbbcf80 100644
--- a/dat/Healer.des
+++ b/dat/Healer.des
@@ -61,8 +61,8 @@ DOOR:locked,(50,10)
 MONSTER:('@',"Hippocrates"),(37,10) {
   OBJECT:(')',"dagger"),+5
 }
-# The treasure of Hippocrates
-OBJECT:('(',"chest"),(37,10)
+# Magic chest
+MAGIC_CHEST:(31,09)
 # intern guards for the audience chamber
 MONSTER:('@',"attendant"),(29,08)
 MONSTER:('@',"attendant"),(29,09)
diff --git a/dat/Ice.des b/dat/Ice.des
index b3d080b59..f0dd5dd9e 100644
--- a/dat/Ice.des
+++ b/dat/Ice.des
@@ -19,13 +19,13 @@ IIIIIIIIIIIIIIIIIII                 IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
 IIIIIIIIIIIIIIIIII  ...............  IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
 IIIIIIIIIIIIIIIII  ..             ..  IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
 IIIIIIIIIIIIIIII  ..   IIII    .....   IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-IIIII            ..  IIIII  .....        IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-IIII  ............  IIIII  ..     IIIIII   IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-III  ..            III    ..    IIIIIIIIII  IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIII            ..  IIIII  .....         IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIII  ............  IIIII  ..     IIIIII    IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+III  ..            III    ..    IIIIIIIIII    IIIIIIIIIIIIIIIIIIIIIIIIIIIIII
 II  ..  IIIIIIIIIIIII  ....    IIIPPPPPPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-II ..  IIIIIIIIIIIII  ..      IIPPP....PPPII  IIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-I  .... IIIIIIIIIIII ..   ...IIPP........PPII  IIIIIIIIIIIIIIIIIIIIIIIIIIIII
-I  .....  IIIIIIIIII  .....   IIPPP....PPPII  IIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+II ..  IIIIIIIIIIIII  ..      IIPPP....PPPII    IIIIIIIIIIIIIIIIIIIIIIIIIIII
+I  ...  IIIIIIIIIIII ..   ...IIPP........PPII  IIIIIIIIIIIIIIIIIIIIIIIIIIIII
+I  ....   IIIIIIIIII  .....   IIPPP....PPPII  IIIIIIIIIIIIIIIIIIIIIIIIIIIIII
 II  ...  IIIIIIIIIIII          IIIPPPPPPIII  IIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
 III     IIIIIIIIIIIIIIIIIIIIII  IIIIIIIII  IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
 IIIIIIIIIIIIIIIIIIIIIIIIIIIIIII   IIIIII  IIIIIIIIIIIIIIIIIIIIII...IIIIIIIII
@@ -50,17 +50,13 @@ STAIR: (05,12), down
 # High Ice Mage
 MONSTER: ('@', "High Ice Mage"), (36,11)
 
-# The treasure of the High Ice Mage
-OBJECT: ('(', "chest"), (37,11)
+MAGIC_CHEST:(39,11)
 
 # guards for the audience chamber
 MONSTER: ('@', "froster"), (35,10)
 MONSTER: ('@', "froster"), (35,11)
-MONSTER: ('@', "froster"), random
-MONSTER: ('@', "froster"), random
-MONSTER: ('@', "froster"), random
-MONSTER: ('@', "froster"), random
-MONSTER: ('@', "froster"), random
+
+LOOP [5] { MONSTER: ('@', "froster"), random }
 MONSTER: ('D', "baby white dragon"), random, peaceful
 MONSTER: ('D', "white dragon"), random, peaceful
 MONSTER: ('D', "white dragon"), random, peaceful
@@ -69,28 +65,17 @@ MONSTER: ('D', "white dragon"), random, peaceful
 NON_DIGGABLE:(00,00,75,19)
 
 # Random traps
-TRAP: "fire", random
-TRAP: "fire", random
-TRAP: "fire", random
-TRAP: "fire", random
-TRAP: "fire", random
-TRAP: "fire", random
+LOOP [6] { TRAP: "fire", random }
 TRAP: "falling rock", random
 TRAP: "falling rock", random
 TRAP: "magic", random
 TRAP: "magic", random
 
 # Monsters on siege duty.
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('v', "steam vortex"), random, hostile
-MONSTER: ('v', "steam vortex"), random, hostile
-MONSTER: ('v', "steam vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
+LOOP [4] { MONSTER: ('E', "fire elemental"), random, hostile }
+MONSTER: ('E', "magma elemental"), random, hostile
+LOOP [2] { MONSTER: ('v', "steam vortex"), random, hostile }
+LOOP [2] { MONSTER: ('v', "fire vortex"), random, hostile }
 MONSTER: ('c', "pyrolisk"), random, hostile
 MONSTER: ('c', "pyrolisk"), random, hostile
 MONSTER: ('d', "hell hound pup"), random, hostile
@@ -135,39 +120,20 @@ STAIR: (48,14), up
 STAIR: (20,06), down
 
 # Objects
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
+LOOP [9] { OBJECT: random, random }
 
 # Random traps
-TRAP: "fire", random
-TRAP: "fire", random
-TRAP: "fire", random
-TRAP: "fire", random
+LOOP [4] { TRAP: "fire", random }
 TRAP: "falling rock", random
 TRAP: "falling rock", random
 TRAP: random, random
 TRAP: random, random
 
 # Random monsters.
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('v', "steam vortex"), random, hostile
-MONSTER: ('v', "steam vortex"), random, hostile
-MONSTER: ('v', "steam vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
+LOOP [4] { MONSTER: ('E', "fire elemental"), random, hostile }
+LOOP [2] { MONSTER: ('E', "magma elemental"), random, hostile }
+LOOP [3] { MONSTER: ('v', "steam vortex"), random, hostile }
+LOOP [3] { MONSTER: ('v', "fire vortex"), random, hostile }
 MONSTER: (':', "salamander"), random, hostile
 MONSTER: (':', "salamander"), random, hostile
 MONSTER: ('N', "red naga"), random, hostile
@@ -227,19 +193,10 @@ DRAWBRIDGE: (17,14), north, closed
 
 # Objects
 OBJECT: ('(', "magic whistle"), (17,08), blessed, 0, name: "The Storm Whistle"
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
+LOOP [7] { OBJECT: random, random }
 
 # Random traps
-TRAP: "fire", random
-TRAP: "fire", random
-TRAP: "fire", random
-TRAP: "fire", random
+LOOP [4] { TRAP: "fire", random }
 TRAP: "falling rock", random
 TRAP: "falling rock", random
 TRAP: random, random
@@ -251,22 +208,11 @@ ALTAR: (17,08), noalign, altar
 # Random monsters.
 MONSTER: ('E', "Ragnaros"), (17,08)
 MONSTER: ('D', "red dragon"), (17,09), asleep, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('E', "fire elemental"), random, hostile
-MONSTER: ('v', "steam vortex"), random, hostile
-MONSTER: ('v', "steam vortex"), random, hostile
-MONSTER: ('v', "steam vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
-MONSTER: (':', "salamander"), random, hostile
-MONSTER: (':', "salamander"), random, hostile
-MONSTER: (':', "salamander"), random, hostile
-MONSTER: (':', "salamander"), random, hostile
+LOOP [4] { MONSTER: ('E', "fire elemental"), random, hostile }
+LOOP [2] { MONSTER: ('E', "magma elemental"), random, hostile }
+LOOP [3] { MONSTER: ('v', "steam vortex"), random, hostile }
+LOOP [3] { MONSTER: ('v', "fire vortex"), random, hostile }
+LOOP [4] { MONSTER: (':', "salamander"), random, hostile }
 MONSTER: ('N', "red naga"), random, hostile
 MONSTER: ('N', "red naga"), random, hostile
 MONSTER: ('d', "hell hound"), random, hostile
@@ -294,26 +240,14 @@ NOMAP
 STAIR: random, up
 STAIR: random, down
 
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('v', "steam vortex"), random, hostile
+LOOP [6] { OBJECT: random, random }
+
+LOOP [4] { MONSTER: ('E', "fire elemental"), random, hostile }
+MONSTER: ('E', "magma elemental"), random, hostile
 MONSTER: ('v', "steam vortex"), random, hostile
 MONSTER: ('v', "steam vortex"), random, hostile
 MONSTER: ('v', "fire vortex"), random, hostile
 MONSTER: ('v', "fire vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
 MONSTER: ('d', "hell hound"), random, hostile
 MONSTER: ('d', "hell hound"), random, hostile
 MONSTER: ('d', "hell hound pup"), random, hostile
@@ -321,13 +255,7 @@ MONSTER: ('d', "hell hound pup"), random, hostile
 MONSTER: ('H', "fire giant"), random, hostile
 MONSTER: ('H', "fire giant"), random, hostile
 
-TRAP: random, random
-TRAP: random, random
-TRAP: random, random
-TRAP: random, random
-TRAP: random, random
-TRAP: random, random
-TRAP: random, random
+LOOP [7] { TRAP: random, random }
 
 MAZE: "Ice-filb" , ' '
 INIT_MAP: mines, '.' , ' ' , true , true , lit, false
@@ -336,24 +264,14 @@ NOMAP
 STAIR: random, up
 STAIR: random, down
 
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-OBJECT: random, random
-
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('E', "fire elemental"), random
-MONSTER: ('v', "steam vortex"), random, hostile
+LOOP [5] { OBJECT: random, random }
+
+LOOP [4] { MONSTER: ('E', "fire elemental"), random, hostile }
+MONSTER: ('E', "magma elemental"), random, hostile
 MONSTER: ('v', "steam vortex"), random, hostile
 MONSTER: ('v', "steam vortex"), random, hostile
 MONSTER: ('v', "fire vortex"), random, hostile
 MONSTER: ('v', "fire vortex"), random, hostile
-MONSTER: ('v', "fire vortex"), random, hostile
 MONSTER: ('N', "red naga"), random, hostile
 MONSTER: ('N', "red naga"), random, hostile
 MONSTER: ('d', "hell hound"), random, hostile
@@ -364,10 +282,6 @@ MONSTER: ('o', "demon orc"), random, hostile
 MONSTER: ('o', "demon orc"), random, hostile
 MONSTER: ('o', "demon orc"), random, hostile
 
-TRAP: "falling rock", random
-TRAP: "falling rock", random
-TRAP: "falling rock", random
-TRAP: "falling rock", random
-TRAP: "falling rock", random
+LOOP [5] { TRAP: "falling rock", random }
 TRAP: random, random
 TRAP: random, random
diff --git a/dat/Infidel.des b/dat/Infidel.des
index 1174dfae7..e42665172 100644
--- a/dat/Infidel.des
+++ b/dat/Infidel.des
@@ -50,6 +50,10 @@ TRAP: "dart", (37, 10)
 DOOR: locked, (31, 10)
 REGION: (20, 10, 20, 10), lit, "temple", irregular
 ALTAR: (20, 10), coaligned, altar
+# Magic chest
+MAGIC_CHEST:(18,10)
+
+# Archbishop and his entourage
 MONSTER: "Archbishop of Moloch", (20, 10)
 MONSTER: "cultist", (20, 07)
 MONSTER: "cultist", (23, 08)
diff --git a/dat/Jedi.des b/dat/Jedi.des
index 3d53e2769..ada2830e9 100644
--- a/dat/Jedi.des
+++ b/dat/Jedi.des
@@ -74,12 +74,7 @@ DOOR: closed, (55,07)
 # The Jedi Master
 MONSTER: ('@', "Jedi Master"), (37,10)
 
-# His treasure
-CONTAINER: ('(', "chest"), $places[1] {
-    OBJECT: ('?', "charging")
-    OBJECT: '?'
-    OBJECT: random
-}
+MAGIC_CHEST:(37,07)
 
 # the remaining Jedi
 MONSTER: ('@', "padawan"), (38,11), peaceful
diff --git a/dat/Knight.des b/dat/Knight.des
index 94d8ab8d9..5bfaa1171 100644
--- a/dat/Knight.des
+++ b/dat/Knight.des
@@ -61,8 +61,9 @@ DOOR:closed,(04,12)
 DOOR:closed,(45,12)
 # King Arthur
 MONSTER:('@',"King Arthur"),(09,07)
-# The treasure of King Arthur
-OBJECT:('(',"chest"),(09,07)
+
+MAGIC_CHEST:(07,07)
+
 # knight guards for the watchrooms
 MONSTER:('@',"knight"),(04,02),peaceful
 MONSTER:('@',"knight"),(04,13),peaceful
diff --git a/dat/Monk.des b/dat/Monk.des
index d2cb12f17..d21c32a1c 100644
--- a/dat/Monk.des
+++ b/dat/Monk.des
@@ -76,7 +76,8 @@ DOOR:closed,(52,14)
 ALTAR:(28,09),noalign,altar
 # Master Po
 MONSTER:('@',"Master Po"),(28,10)
-# No treasure chest!
+# Magic chest
+MAGIC_CHEST:(26,09)
 # guards for the audience chamber
 MONSTER:('@',"abbot"),(32,07)
 MONSTER:('@',"abbot"),(32,08)
diff --git a/dat/Necro.des b/dat/Necro.des
index 39cbb760a..290edeafb 100644
--- a/dat/Necro.des
+++ b/dat/Necro.des
@@ -51,8 +51,7 @@ BRANCH:(63,06,63,06),(0,0,0,0)
 # Dark Lord
 MONSTER: ('@', "Dark Lord"), (25,08)
 
-# The treasure of the Dark Lord
-OBJECT: ('(', "chest"), (25,09)
+MAGIC_CHEST:(34,08)
 
 # apprentice guards for the audience chamber
 MONSTER: ('@', "embalmer"), (24,07)
diff --git a/dat/Pirate.des b/dat/Pirate.des
index a8cc34146..efd90eec7 100644
--- a/dat/Pirate.des
+++ b/dat/Pirate.des
@@ -155,24 +155,23 @@ ENDMAP
 REGION: (00,00,75,20),lit,"ordinary"
 # Portal arrival point
 BRANCH:(07,07,20,16),(24,09,52,11)
-# Stairs
+
+MAGIC_CHEST:(17,04)
+
 STAIR: (65,10),down
-# Doors
+
 DOOR: closed, (22,06)
 DOOR: closed, (22,06)
 DOOR: closed, (27,06)
 DOOR: closed, (32,06)
 DOOR: closed, (37,06)
 DOOR: closed, (42,06)
-
 DOOR: locked, (67,10)
 DOOR: locked, (71,10)
-
 DOOR: closed, (22,17)
 DOOR: closed, (29,17)
 DOOR: closed, (36,17)
 DOOR: closed, (43,17)
-
 DOOR: locked, (49,16)
 DOOR: locked, (50,15)
 DOOR: locked, (52,15)
@@ -200,9 +199,6 @@ OBJECT: ('?', "scare monster"), (52,14), cursed, 0
 # Dread Pirate (ret.)
 MONSTER: ('@', "Mayor Cummerbund"), (51,10)
 
-# The treasure of the Dread Pirate
-OBJECT: ('(', "chest"), (52,10)
-
 # Guards for the audience chamber
 MONSTER: ('@', "pirate crewmate"), (22,05)
 MONSTER: ('@', "pirate crewmate"), (27,05)
diff --git a/dat/Priest.des b/dat/Priest.des
index 9539aeea5..0828a5bae 100644
--- a/dat/Priest.des
+++ b/dat/Priest.des
@@ -71,8 +71,8 @@ MONSTER:('@',"Arch Priest"),(28,10) {
   OBJECT:('[',"robe"),+4
   OBJECT:(')',"mace"),+4
 }
-# The treasure of High Priest
-OBJECT:('(',"chest"),(27,10)
+# Magic chest
+MAGIC_CHEST:(26,09)
 # knight guards for the audience chamber
 MONSTER:('@',"acolyte"),(32,07)
 MONSTER:('@',"acolyte"),(32,08)
diff --git a/dat/Ranger.des b/dat/Ranger.des
index abdd703be..4bf79ec04 100644
--- a/dat/Ranger.des
+++ b/dat/Ranger.des
@@ -49,8 +49,8 @@ MONSTER:('@',"Orion"),(20,10) {
   OBJECT:(')',"yumi"),+4
   OBJECT:(')',"arrow"),+4,quantity:50
 }
-# The treasure of Orion
-OBJECT:('(',"chest"),(20,10)
+# Magic chest
+MAGIC_CHEST:(18,10)
 # Guards for the audience chamber
 MONSTER:('@',"hunter"),(19,09)
 MONSTER:('@',"hunter"),(20,09)
diff --git a/dat/Rogue.des b/dat/Rogue.des
index 10b3fc78c..936aecb82 100644
--- a/dat/Rogue.des
+++ b/dat/Rogue.des
@@ -106,8 +106,8 @@ MONSTER:('@',"Master of Thieves"),(36,11) {
   OBJECT:('[',"light armor"),+5
   OBJECT:(')',"dagger"),+5
 }
-# The treasure of Master of Thieves
-OBJECT:('(',"chest"),(36,11)
+# Magic chest
+MAGIC_CHEST:(35,10)
 # thug guards, room #1
 MONSTER:('@',"thug"),(28,10)
 MONSTER:('@',"thug"),(29,11)
diff --git a/dat/Samurai.des b/dat/Samurai.des
index c201c1522..a9bd16c34 100644
--- a/dat/Samurai.des
+++ b/dat/Samurai.des
@@ -56,8 +56,8 @@ MONSTER:('@',"Lord Sato"),(20,04) {
   OBJECT:('[',"splint mail"),+4
   OBJECT:(')',"katana"),+4
 }
-# The treasure of Lord Sato
-OBJECT:('(',"chest"),(20,04)
+# Magic chest
+MAGIC_CHEST:(20,06)
 # roshi guards for the audience chamber
 MONSTER:('@',"roshi"),(18,04)
 MONSTER:('@',"roshi"),(18,05)
diff --git a/dat/Slayer.des b/dat/Slayer.des
index 530d8280a..8c1a8c972 100644
--- a/dat/Slayer.des
+++ b/dat/Slayer.des
@@ -11,7 +11,8 @@
 MAZE: "Und-strt",' '
 FLAGS: noteleport, hardfloor
 GEOMETRY: center, center
-
+#0        1         2   	   3	     4		   5		 6	       7
+#123456789012345678901234567890123456789012345678901234567890123456789012345
 MAP
 ............................................................................
 ............................................................................
@@ -74,8 +75,10 @@ ALTAR: (28,09), noalign, altar
 # High Priest
 MONSTER: ('@', "Van Helsing"), (28,10)
 
-# The treasure of Van Helsing
-OBJECT: ('(', "chest"), (27,10)
+$key = { (33,07),(33,12) }
+SHUFFLE: $key
+
+MAGIC_CHEST:$key[0]
 
 # knight guards for the audience chamber
 MONSTER: ('@', "exterminator"), (32,07)
diff --git a/dat/Tourist.des b/dat/Tourist.des
index ac0400a97..a77f341d6 100644
--- a/dat/Tourist.des
+++ b/dat/Tourist.des
@@ -95,8 +95,8 @@ MONSTER: ('C',"forest centaur"),random
 MONSTER: 'C',random
 # Twoflower
 MONSTER:('@',"Twoflower"),(64,03)
-# The treasure of Twoflower
-OBJECT:('(',"chest"),(64,03)
+# Magic chest
+MAGIC_CHEST:(67,03)
 # guides for the audience chamber
 MONSTER:('@',"guide"),(29,03)
 MONSTER:('@',"guide"),(32,04)
diff --git a/dat/Valkyrie.des b/dat/Valkyrie.des
index ac8b26e0b..68d47a8e3 100644
--- a/dat/Valkyrie.des
+++ b/dat/Valkyrie.des
@@ -62,8 +62,8 @@ MONSTER:('@',"Norn"),(35,10) {
   OBJECT:('[',"banded mail"),+4
   OBJECT:(')',"long sword"),+4
 }
-# The treasure of the Norn
-OBJECT:('(',"chest"),(36,10)
+# Magic chest
+MAGIC_CHEST:(33,10)
 # valkyrie guards for the audience chamber
 MONSTER:('@',"warrior"),(27,08)
 MONSTER:('@',"warrior"),(27,09)
diff --git a/dat/Wizard.des b/dat/Wizard.des
index 7696df6bf..d965cae38 100644
--- a/dat/Wizard.des
+++ b/dat/Wizard.des
@@ -63,8 +63,8 @@ MONSTER:('@',"Neferet the Green"),(23,05) {
   OBJECT:('[',"elven cloak"),+5
   OBJECT:(')',"quarterstaff"),+5
 }
-# The treasure of the quest leader
-OBJECT:('(',"chest"),(24,05)
+# Magic chest
+MAGIC_CHEST:(25,05)
 # apprentice guards for the audience chamber
 MONSTER:('@',"apprentice"),(30,07)
 MONSTER:('@',"apprentice"),(24,06)
diff --git a/dat/Yeoman.des b/dat/Yeoman.des
index 157843ab7..49a10b1a6 100644
--- a/dat/Yeoman.des
+++ b/dat/Yeoman.des
@@ -80,6 +80,8 @@ REGION: (00,00,55,19), lit, "ordinary"
 NON_DIGGABLE: (00,00,55,19)
 NON_PASSWALL: (00,00,55,19)
 
+MAGIC_CHEST:(06,12)
+
 TRAP: "arrow", random
 TRAP: "arrow", random
 TRAP: "arrow", random
diff --git a/dat/blkmar.des b/dat/blkmar.des
index 67582a8ce..ed0d9d93b 100644
--- a/dat/blkmar.des
+++ b/dat/blkmar.des
@@ -9,11 +9,11 @@ GEOMETRY: center, center
 #123456789012345678901234567890123456789012345678901234567890123456789012345
 MAP
 0---------------------------------
-1|.....||........................|
-2||...|||.....................---|
-3|||.|| |..................---|
-4||...|||...............---|
-5|......................|
+1|.....||...................,,+,Z|
+2||...|||,....{{{{{......,.,K,---|
+3|||.|| |,,..{,,,,,{....,.,---|
+4||...|||,....{{{{{...,.---|
+5|...................,\,|
 6||...|||-------------------------------------------------------------------|
 7|||.|| |...................................................................|
 8||...|||...................................................................|
@@ -32,6 +32,12 @@ REGION: (01,08,05,11), lit, "ordinary", unfilled
 #REGION: (01,12,05,16), lit, "ordinary", unfilled
 
 BRANCH: (03,01,03,01), (0,0,0,0)
+
+# Player gets a little break room in place now.
+MAGIC_CHEST:(15,03)
+FORGE:(24,03)
+
+DOOR: open, (29,01)
 DOOR: open, (07,10)
 ENGRAVING: (03,03), engrave, "Pets are not allowed in the shop"
 ENGRAVING: (03,07), engrave, "Thieves will be killed."
diff --git a/dat/castle.des b/dat/castle.des
index 0b873939c..426ae7e2f 100644
--- a/dat/castle.des
+++ b/dat/castle.des
@@ -54,6 +54,10 @@ TELEPORT_REGION:levregion(01,00,10,20),(1,1,61,15),down
 TELEPORT_REGION:levregion(69,00,77,20),(1,1,61,15),up
 STAIR:levregion(01,00,10,20),(0,0,62,16),up
 BRANCH:levregion(69,00,77,20),(1,1,61,15)
+
+# Magic chest
+MAGIC_CHEST:(32,08)
+
 FOUNTAIN:(10,08)
 # Doors
 DOOR:locked,(07,03)
@@ -462,6 +466,9 @@ OBJECT:'!'
 
 OBJECT:('(',"chest"),$place[4]
 
+# Magic chest
+MAGIC_CHEST:(24,09)
+
 # statues behind the throne
 OBJECT:('`',"statue"),(22,07)
 OBJECT:('`',"statue"),(22,11)
@@ -472,9 +479,9 @@ IF [25%] {
   MONSTER:('H',"titan"),(23,09),hostile,asleep
 }
 IF [50%] {
-  MONSTER:'V',(23,09),asleep
+  MONSTER:'V',(23,08),asleep
 }
-MONSTER:'V',(23,09),asleep
+MONSTER:'V',(23,10),asleep
 
 # monsters in the water around the castle
 MONSTER:(';',"shark"),random
@@ -561,7 +568,9 @@ ENDMAP
 
 
 # Random registers initialization
-$place = { (15,01),(11,01),(09,01),(05,01), (03,03),(03,07), (05,09),(08,09),(12,09),(15,09) }
+$place = { (15,01),(11,01),(09,01),(05,01),
+           (03,03),(03,07),(05,09),(08,09),
+           (12,09),(15,09) }
 SHUFFLE: $place
 
 $monster = monster: { 'L','L','E','E','R','R','T','T','O','O' }
@@ -645,6 +654,9 @@ TRAP:"hole",(69,04)
 TRAP:"trap door",(33,05)
 TRAP:"trap door",(41,01)
 
+# Magic chest
+MAGIC_CHEST:(05,05)
+
 # lord of the keep
 MONSTER:'T',(06,05),asleep
 
diff --git a/dat/data.base b/dat/data.base
index d5720aded..a913b4166 100644
--- a/dat/data.base
+++ b/dat/data.base
@@ -17,6 +17,13 @@
 # following keys for that entry.  For instance, `~orc ??m*' preceding `orc*'
 # prevents "orc mummy" and "orc zombie" from matching.
 #
+alchemy
+gem alchemy
+    A lesson without pain is meaningless. That's because no one can 
+    gain without sacrificing something. But by enduring that pain 
+    and overcoming it, he shall obtain a powerful, unmatched heart... 
+    a Fullmetal heart.
+        [ Full Metal Alchemist ]
 abbathor
 	Abbathor is the sole evil dwarven god, the great master of the
 	greed and avarice that plagues so many of that otherwise noble
@@ -1130,6 +1137,7 @@ charo*n
 	of-kin would place a coin under his tongue, to pay the ferry-
 	man.
 chest
+crystal chest
 large box
 foot locker
 	Dantes rapidly cleared away the earth around the chest.  Soon
@@ -2364,6 +2372,12 @@ magic flute
 	A man's despair with joy allay,
 	Turn bachelors old to lovers gay.
 		[ The Magic Flute, by Wolfgang Amadeus Mozart ]
+magic chest
+hidden chest
+	It would be mistaken to say the Luggage was nowhere to be seen.
+	It was somewhere to be seen, it was just that the place wasn't
+	anywhere near Rincewind.
+		[ Sourcery, by Terry Pratchett ]
 # also takes fog/vapor cloud
 fog* cloud
 	The fog comes
diff --git a/dat/gehennom.des b/dat/gehennom.des
index e8c3cbcee..e64303650 100644
--- a/dat/gehennom.des
+++ b/dat/gehennom.des
@@ -1940,6 +1940,9 @@ DOOR:open,(26,16)
 DOOR:closed,(06,17)
 # Special rooms
 ALTAR:(24,09),noalign,sanctum
+
+MAGIC_CHEST:(24,08)
+
 REGION:(22,14,25,18),unlit,"morgue"
 REGION:(32,11,37,14),lit,"shop"
 REGION:(12,02,15,06),lit,"shop"
diff --git a/dat/goblintown.des b/dat/goblintown.des
index b6810f41c..8113ce1e2 100644
--- a/dat/goblintown.des
+++ b/dat/goblintown.des
@@ -68,6 +68,9 @@ IF [80%] {
 # Forge
 FORGE:(24,12)
 
+# Magic chest
+MAGIC_CHEST:(74,03)
+
 # Various objects
 CONTAINER:('(',"chest"),(23,18) {
   OBJECT:('+',"novel"),uncursed,name:"The Blacksmith's Cookbook"
diff --git a/dat/grund.des b/dat/grund.des
index e3a162056..a02e642ff 100644
--- a/dat/grund.des
+++ b/dat/grund.des
@@ -434,6 +434,8 @@ CONTAINER:('(', "iron safe"),(06,01) {
     }
     GOLD: 8700, (06,01)
     GOLD: 1d200, (06,01)
+    
+     OBJECT:('(',"magic key")
 }
 
 # arms storage
diff --git a/dat/knox.des b/dat/knox.des
index 34b7920ab..2ea5bb50b 100644
--- a/dat/knox.des
+++ b/dat/knox.des
@@ -43,10 +43,12 @@ REGION:(37,08,46,11),lit,"throne"
 #   50% chance each to move throne and/or fort's entry secret door up one row
 IF [50%] {
    MONSTER:('@',"Croesus"),(43,10),hostile
+   MAGIC_CHEST:(42,10)
 } ELSE {
    MONSTER:('@',"Croesus"),(43,09),hostile
    TERRAIN:(43,09), '\'
    TERRAIN:(43,10), '.'
+   MAGIC_CHEST:(42,09)
 }
 IF [50%] {
    TERRAIN:(47,09), 'S'
@@ -194,10 +196,12 @@ REGION:(57,06,66,09),lit,"throne"
 #   50% chance each to move throne and/or fort's entry secret door up one row
 IF [50%] {
    MONSTER:('@',"Croesus"),(63,08),hostile
+   MAGIC_CHEST:(62,08)
 } ELSE {
    MONSTER:('@',"Croesus"),(63,07),hostile
    TERRAIN:(63,07), '\'
    TERRAIN:(63,08), '.'
+   MAGIC_CHEST:(62,07)
 }
 IF [50%] {
    TERRAIN:(67,07), 'S'
@@ -319,6 +323,8 @@ STAIR: (55,10), down
 #   Throne room, with Croesus on the throne
 REGION:(62,12,75,15),lit,"throne",filled,irregular
 MONSTER:('@',"Croesus"),(66,14),hostile
+# Magic chest
+MAGIC_CHEST:(67,14)
 #   50% chance each to move fort's entry secret door up one row
 IF [50%] {
    TERRAIN:(61,13), 'S'
diff --git a/dat/mines.des b/dat/mines.des
index 421a6b090..3b3d067b5 100644
--- a/dat/mines.des
+++ b/dat/mines.des
@@ -103,6 +103,7 @@ FOUNTAIN:(25,09)
 
 # the altar's defiled; useful for BUC but never coaligned
 ALTAR:(20,13),noalign,shrine
+MAGIC_CHEST:(20,14)
 
 # set up the shop doors; could be broken down
 DOOR:random,(9,8)
@@ -302,6 +303,7 @@ SUBROOM: "candle shop", lit, (11,10), (4,3) {
 SUBROOM: "temple", lit, (19,5), (4,4) {
   ROOMDOOR: false, closed, north, random
   ALTAR:(02,02),align[0],shrine
+  MAGIC_CHEST:(02,03)
   MONSTER: ('G', "gnomish wizard"), random
   MONSTER: ('G', "gnomish wizard"), random
 }
@@ -374,7 +376,8 @@ SUBROOM:"ordinary",random,(5,9),(2,2) {
 
 SUBROOM:"temple",lit,(10,2),(3,4) {
   ROOMDOOR: false,closed,east,random
-  ALTAR:(1,1),align[0],shrine
+  ALTAR:(01,01),align[0],shrine
+  MAGIC_CHEST:(00,01)
   MONSTER: ('G', "gnomish wizard"), random
   MONSTER: ('G', "gnomish wizard"), random
 }
@@ -478,7 +481,8 @@ SUBROOM:"ordinary",random,(8,2),(2,2) {
 
 SUBROOM:"temple",lit,(11,3),(5,4) {
   ROOMDOOR: false,closed,south,random
-  ALTAR:(2,1),align[0],shrine
+  ALTAR:(02,01),align[0],shrine
+  MAGIC_CHEST:(02,00)
   MONSTER: ('G', "gnomish wizard"), random
   MONSTER: ('G', "gnomish wizard"), random
 }
@@ -693,7 +697,7 @@ OBJECT: ('`', "statue"), (38,15), montype:"gnome royal", 1
 REGION:(29,02,33,04),lit,"temple"
 DOOR:closed,(31,05)
 ALTAR:(31,03),align[0],shrine
-
+MAGIC_CHEST:(29,02)
 
 # "Zoo Town" by Derek S. Ray (SporkHack)
 #
@@ -733,6 +737,7 @@ REGION:(26,1,28,3),lit,"shop"
 REGION:(22,12,24,13),lit,"food shop"
 REGION:(31,12,36,14),lit,"temple"
 ALTAR:(35,13),align[0],shrine
+MAGIC_CHEST:(36,13)
 
 DOOR:closed,(5,2)
 DOOR:locked,(4,8)
@@ -883,6 +888,7 @@ SUBROOM: "tool shop" [30%], lit, (25,2), (3,3) {
 SUBROOM: "temple", lit, (24,6), (4,4) {
   ROOMDOOR: false, closed, west, random
   ALTAR:(02,01),align[0],shrine
+  MAGIC_CHEST:(03,01)
   MONSTER: ('G', "gnomish wizard"), random
   MONSTER: ('G', "gnomish wizard"), random
 }
@@ -979,6 +985,7 @@ SUBROOM: "ordinary", lit, (19,2),  (2,3) {
 SUBROOM: "temple", lit, (15,9), (4,4) {
   ROOMDOOR: false, closed, north, random
   ALTAR:(02,02),align[0],shrine
+  MAGIC_CHEST:(02,03)
   MONSTER: ('G', "gnomish wizard"), random
   MONSTER: ('G', "gnomish wizard"), random
 }
@@ -1061,6 +1068,8 @@ REGION: (3,3,4,5), lit, "food shop"
 REGION: (11,4,13,6), lit, "candle shop"
 REGION: (18,2,22,4), lit, "temple"
 ALTAR: (20,3), align[1], shrine
+MAGIC_CHEST:(20,4)
+
 REGION: (24,2,25,4), lit, "ordinary"
 REGION: (11,10,12,12), lit, "ordinary"
 REGION: (14,11,15,12), unlit, "ordinary"
@@ -1139,6 +1148,7 @@ REGION: (34,9,36,12), lit, "scroll shop"
 REGION: (51,07,55,09), lit, "food shop"
 REGION: (8,11,12,14), lit, "temple"
 ALTAR: (10,13), align[0], shrine
+MAGIC_CHEST:(10,14)
 
 # Protect the watch-house walls
 NON_DIGGABLE: (25,5,31,11)
@@ -1225,7 +1235,7 @@ MONSTER: ('h', "dwarf"), random
 
 #
 # Minetown variant 11
-    # Ruined & Dangerous Town
+# Ruined & Dangerous Town
 #
 MAZE: "minetn-11",' '
 #INIT_MAP:'.','-',true,true,unlit,true
@@ -1269,6 +1279,7 @@ DOOR: closed, (13,6)
 DOOR: closed, (21,6)
 
 ALTAR: (4,2), random, altar
+MAGIC_CHEST:(4,3)
 OBJECT: ('`', "boulder"), (25,2)
 OBJECT: ('`', "boulder"), (25,3)
 OBJECT: ('`', "boulder"), (27,5)
@@ -1339,7 +1350,7 @@ OBJECT: '(', random
 
 MAZE: "minetn-12",' '
 FLAGS: inaccessibles
-INIT_MAP: mines,'.',' ',true,true,lit,true
+INIT_MAP: mines,'.',' ',true,true,unlit,true
 GEOMETRY:center,center
 
 
@@ -1380,6 +1391,7 @@ FOUNTAIN: (30,11)
 # -- The masouleum
 REGION: (19,12,21,14), lit, "temple"
 ALTAR: (20,13), align[0], shrine
+MAGIC_CHEST:(20,14)
 
 # -- The big graveyard
 # local graveyard = selection.floodfill(27,14);
@@ -1455,7 +1467,8 @@ MONSTER: ('@', "watch captain"), random, peaceful
 #
 MAZE: "minend-1", ' '
 GEOMETRY:center,center
-#1234567890123456789012345678901234567890123456789012345678901234567890
+#         1         2         3         4         5         6         7
+#123456789012345678901234567890123456789012345678901234567890123456789012345
 MAP
 ------------------------------------------------------------------   ------
 |                        |.......|     |.......-...|       |.....|.       |
@@ -1524,6 +1537,13 @@ OBJECT:('*',"loadstone"),$place[4]
 OBJECT:('*',"ruby"),$place[5]
 OBJECT:('*',"worthless piece of red glass"),$place[5]
 OBJECT:('*',"luckstone"),$place[5]
+
+# magic key is buried in a chest
+ENGRAVING:$place[6],engrave,"One-Eyed Sam was here"
+CONTAINER:('(', "chest"),$place[6],buried,locked {
+  OBJECT:('(',"magic key")
+}
+
 # Random objects
 OBJECT:'*',random
 OBJECT:'*',random
@@ -1573,11 +1593,13 @@ MONSTER:'h',random
 #
 MAZE: "minend-2", ' '
 GEOMETRY:center,center
+#         1         2         3         4         5         6         7
+#123456789012345678901234567890123456789012345678901234567890123456789012345
 MAP
 ---------------------------------------------------------------------------
 |...................................................|                     |
-|.|---------S--.--|...|--------------------------|..|                     |
-|.||---|   |.||-| |...|..........................|..|                     |
+|.|---------S--.--|...|--------------------------|..|  ..                 |
+|.||---|   |.||-| |...|..........................|..|   ..                |
 |.||...| |-|.|.|---...|.............................|                ..   |
 |.||...|-|.....|....|-|..........................|..|.               ..   |
 |.||.....|-S|..|....|............................|..|..                   |
@@ -1594,6 +1616,9 @@ MAP
 ---------------------------------------------------------------------------
 ENDMAP
 
+$place = { (05,05),(22,11),(54,12),(56,02) }
+SHUFFLE: $place
+
 IF [50%] {
    TERRAIN:(55,14),'-'
    TERRAIN:(56,14),'-'
@@ -1661,6 +1686,11 @@ OBJECT:('!',"booze"),(10,09)
 OBJECT:('!',"booze"),(10,09)
 OBJECT:('!',"object detection"),(10,09)
 # Objects
+# magic key is buried in a chest
+ENGRAVING:$place[0],engrave,"Property of Croesus"
+CONTAINER:('(', "chest"),$place[0],buried,locked {
+  OBJECT:('(',"magic key")
+}
 # The Treasure chamber...
 OBJECT:('*',"luckstone"),(70,05)
 OBJECT:('*',"diamond"),(69,04)
@@ -1729,6 +1759,8 @@ MONSTER:'h',random
 MAZE:"minend-3",'-'
 FLAGS:nommap
 GEOMETRY:center,bottom
+#         1         2         3         4         5         6         7
+#123456789012345678901234567890123456789012345678901234567890123456789012345
 MAP
  - - - - - - - - - - -- -- - - . - - - - - - - - - -- - - -- - - - - . - - |
 ------...---------.-----------...-----.-------.-------     ----------------|
@@ -1752,6 +1784,10 @@ ENDMAP
 $place = { (1,15),(68,6),(1,13) }
 SHUFFLE: $place
 
+$key = { (04,12),(18,01),(24,07),
+         (31,16),(70,05),(68,13) }
+SHUFFLE: $key
+
 NON_DIGGABLE:(67,3,73,7)
 NON_DIGGABLE:(0,12,2,16)
 FOUNTAIN:(12,08)
@@ -1768,6 +1804,12 @@ STAIR:$place[2],down
 WALLIFY
 
 # Objects
+# magic key is buried in a chest
+ENGRAVING:$key[0],engrave,"X"
+CONTAINER:('(', "chest"),$key[0],buried,locked {
+  OBJECT:('(',"magic key")
+}
+
 OBJECT:('*',"luckstone"),$place[0]
 OBJECT:('*',"flint"),$place[1]
 OBJECT:('*',"diamond"),random
@@ -1835,6 +1877,8 @@ MONSTER:'e',random
 MAZE:"minend-4",' '
 FLAGS:nommap
 GEOMETRY:center,center
+#         1         2         3         4         5         6         7
+#123456789012345678901234567890123456789012345678901234567890123456789012345
 MAP
                                                                    |-----|
                                              -------        ----- |-LLLLL-|
@@ -1918,6 +1962,12 @@ OBJECT:'*',$stones[5]
 OBJECT:'*',$stones[6]
 OBJECT:'*',$stones[7]
 
+# magic key is buried in a chest
+ENGRAVING:$stones[8],engrave,"Do not dig here"
+CONTAINER:('(', "chest"),$stones[8],buried,locked {
+  OBJECT:('(',"magic key")
+}
+
 #shamans guarding the inner temple/figurine
 MONSTER:('o',"orc shaman"),(69,3),asleep,hostile
 MONSTER:('o',"orc shaman"),(71,3),asleep,hostile
@@ -2047,11 +2097,19 @@ OBJECT: ('`', "statue"), (49,09), montype: "queen bee",1
 OBJECT: ('`', "statue"), (55,09), montype: "killer bee",1
 OBJECT: ('`', "statue"), (61,09), montype: "gnome royal",1
 
+$key = { (41,04),(41,14),(63,05), (63,13) }
+SHUFFLE: $key
+
+# magic key is buried in a chest
+ENGRAVING:$key[0],engrave,"X"
+CONTAINER:('(', "chest"),$key[0],buried,locked {
+  OBJECT:('(',"magic key")
+}
 # Boulders
-OBJECT: ('`', "boulder"), (41,04)
-OBJECT: ('`', "boulder"), (41,14)
-OBJECT: ('`', "boulder"), (63,05)
-OBJECT: ('`', "boulder"), (63,13)
+OBJECT: ('`', "boulder"), $key[0]
+OBJECT: ('`', "boulder"), $key[1]
+OBJECT: ('`', "boulder"), $key[2]
+OBJECT: ('`', "boulder"), $key[3]
 
 # Treasure chamber
 #Darshan - since we need room for the downstairs,
@@ -2139,7 +2197,8 @@ MAP
 ENDMAP
 #0         1         2         3         4         5         6         7
 #01234567890123456789012345678901234567890123456789012345678901234567890
-$places = { (01,07), (03,06), (04,05), (06,04), (07,09), (10,09), (12,05), (13,08), (14,07), (16,08) }
+$places = { (01,07), (03,06), (04,05), (06,04), (07,09), 
+            (10,09), (12,05), (13,08), (14,07), (16,08) }
 SHUFFLE: $places
 
 NON_DIGGABLE: (00,00,62,18)
@@ -2153,6 +2212,12 @@ LOOP [3] { TRAP: random, random }
 LOOP [4] { TRAP: "falling rock", random }
 TRAP: "board", (17,07)
 
+# magic key is buried in a chest
+ENGRAVING:$places[0],engrave,"Property of Grund."
+CONTAINER:('(', "chest"),$places[0],buried,locked {
+  OBJECT:('(',"magic key")
+}
+
 # Mindless critters
 LOOP [10] { MONSTER: 'Z', random }
 MONSTER: 'Z', (42,10)
@@ -2236,7 +2301,7 @@ MESSAGE: "You enter the sewers of the Gnomish Mines."
 MESSAGE: "The stench of fetid sewage is barely tolerable."
 GEOMETRY:center,center
 #         1         2         3         4         5         6         7
-#12345678901234567890123456789012345678901234567890123456789012345678901234
+#123456789012345678901234567890123456789012345678901234567890123456789012345
 MAP
 ---------------------------------------------------------------------------
 |                           ---------------                               |
@@ -2300,6 +2365,7 @@ TRAP:random,random
 CONTAINER:('(',"chest"),trapped,(19,06) {
   OBJECT:'/'
   OBJECT:'+'
+  OBJECT:('(',"magic key")
   # trying to have a random tool spawn inside
   # a container could result in large box or
   # chest forming inside of it, so specifiy
@@ -2728,11 +2794,14 @@ LOOP [5] { MONSTER: 'a', random }
 
 # And to cater to a wider audience...
 MONSTER: ''', random
-MONSTER: 'D', random
 MONSTER: random, random
 MONSTER: random, random
 MONSTER: random, random
 
+# There was a random 'D' here, but it frequently resulted in out-of-depth adult dragons.
+# This is your reminder of those times.
+MONSTER: ('D', "baby violet dragon"), random, hostile
+
 # A guardian...
 OBJECT: ('`', "statue"), (56,08), montype:"mumak", 0
 [80%]: TRAP: "statue", (56,08)
diff --git a/dat/mtemple.des b/dat/mtemple.des
index 28abb6960..1b7730835 100644
--- a/dat/mtemple.des
+++ b/dat/mtemple.des
@@ -43,6 +43,7 @@ ALTAR:(40,04),noalign,shrine
 ALTAR:(40,04),noalign,shrine
 ALTAR:(40,04),noalign,shrine
 ALTAR:(40,04),noalign,shrine
+MAGIC_CHEST:(40,05)
 
 # flanking the doorway....
 TRAP: "spiked pit",(06,03)
diff --git a/dat/qlawful.des b/dat/qlawful.des
index 2be091128..29b6eb9d7 100644
--- a/dat/qlawful.des
+++ b/dat/qlawful.des
@@ -99,6 +99,11 @@ MONSTER: ('i', "imp"), (49,15), hostile
 [60%]: TRAP: "sleep gas", (49,16)
 [60%]: TRAP: "sleep gas", (48,17)
 
+$chest_pl = { (47,15), (47,17), (49,15), (49,17) }
+SHUFFLE: $chest_pl
+MAGIC_CHEST:$chest_pl[0]
+
+
 # false treasure
 MONSTER: ('$', "large pile of killer coins"), $places[0], asleep
 [80%]: MONSTER: ('$', "pile of killer coins"), $places[0], asleep
@@ -204,7 +209,7 @@ MONSTER: 'S', $places[4], asleep
 MONSTER: 's', $places[4], asleep
 [50%]: MONSTER: 's', $places[4], hostile
 
-# no temple 
+# no temple
 ALTAR: $places[5], coaligned, altar
 MONSTER: ('@', "aligned priest"), $places[5], coaligned, peaceful
 
diff --git a/dat/quest.txt b/dat/quest.txt
index 075624e0a..6424b6d15 100644
--- a/dat/quest.txt
+++ b/dat/quest.txt
@@ -1248,7 +1248,7 @@ Again, and you think possibly for the last time, you approach
 "We have had trouble concentrating on our studies!"
 %E
 %Cp Fla 00008
-"The water elementals are fierce, but they boil away under our fire!"
+"The ice elementals are fierce, but they boil away under our fire!"
 %E
 %Cp Fla 00009
 "%lC is a strange one, but he has helped defend us."
@@ -1304,11 +1304,11 @@ Go forth, and return when you feel ready."
 
 "About six months ago, I learned that a mysterious sorcerer, known
 as %n, had begun to summon horrible elementals from the plane of 
-Water.
+Ice.
 
 "%nC and his hordes of elementals swept down upon %H and stole
 %o, and seeks to bend it to his will.  
-After many brave wizards were slain by his watery servants, I
+After many brave wizards were slain by his icy servants, I
 sent forth a summons for you!
 
 "If %n can bend %o to his will, he will become
diff --git a/dat/sokoban.des b/dat/sokoban.des
index 76a2fa037..890f3b229 100644
--- a/dat/sokoban.des
+++ b/dat/sokoban.des
@@ -39,10 +39,10 @@ GEOMETRY: center, center
 #12345678901234567890123456789012345678901234567890
 MAP
 ------  ----- 
-|....|  |...| 
-|....----...| 
-|...........| 
-|..|-|.|-|..| 
+|....|--|...|
+|....|.--...|
+|...........|
+|..|-|.|-|..|
 ---------|.---
 |......|.....|
 |..----|.....|
@@ -50,7 +50,7 @@ MAP
  |.|---|.....|
  |...........|
  |..|---------
- ----         
+ ----
 ENDMAP
 BRANCH: (06,04,06,04), (0,0,0,0)
 STAIR: (06,06),up
@@ -58,7 +58,8 @@ REGION: (00,00,13,12), lit, "ordinary"
 NON_DIGGABLE: (00,00,13,12)
 NON_PASSWALL: (00,00,13,12)
 
-# Boulders
+MAGIC_CHEST:(06,02)
+
 OBJECT: ('`', "boulder"), (02,02)
 OBJECT: ('`', "boulder"), (02,03)
 OBJECT: ('`', "boulder"), (10,02)
@@ -70,7 +71,6 @@ OBJECT: ('`', "boulder"), (09,09)
 OBJECT: ('`', "boulder"), (08,10)
 OBJECT: ('`', "boulder"), (10,10)
 
-# Traps
 TRAP: "pit", (03,06)
 TRAP: "pit", (04,06)
 TRAP: "pit", (05,06)
@@ -81,11 +81,9 @@ TRAP: "pit", (05,10)
 TRAP: "pit", (06,10)
 TRAP: "pit", (07,10)
 
-# A little help
 OBJECT: ('?', "earth"), (02,11)
 OBJECT: ('?', "earth"), (03,11)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -103,8 +101,8 @@ MAP
 -------- ------
 |.|....|-|....|
 |.|-..........|
-|.||....|.....|
-|.||....|.....|
+|.|.....|.....|
+|.|-....|.....|
 |.|-----|.-----
 |.|    |......|
 |.-----|......|
@@ -118,7 +116,8 @@ REGION: (00,00,14,10), lit, "ordinary"
 NON_DIGGABLE: (00,00,14,10)
 NON_PASSWALL: (00,00,14,10)
 
-# Boulders
+MAGIC_CHEST:(06,01)
+
 OBJECT: ('`', "boulder"), (05,02)
 OBJECT: ('`', "boulder"), (06,02)
 OBJECT: ('`', "boulder"), (06,03)
@@ -132,7 +131,6 @@ OBJECT: ('`', "boulder"), (08,08)
 OBJECT: ('`', "boulder"), (09,08)
 OBJECT: ('`', "boulder"), (10,08)
 
-# Traps
 TRAP: "pit", (01,02)
 TRAP: "pit", (01,03)
 TRAP: "pit", (01,04)
@@ -144,11 +142,9 @@ TRAP: "pit", (04,08)
 TRAP: "pit", (05,08)
 TRAP: "pit", (06,08)
 
-# A little help
 OBJECT: ('?', "earth"), (01,09)
 OBJECT: ('?', "earth"), (02,09)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -170,15 +166,15 @@ GEOMETRY: center, center
 MAP
      -------
      |..|..|     --------
-------.....--- ---......---
-|......---...| |..........|
-|.|.|......|.--|........|.---
+------.....-------......---
+|......---...|.|..........|
+|.|.|......|.|.|........|.---
 |.|.--..|..|...-F-F-F-F--...|
 |.......|...................|
 |.|.--..|..|...-F-F-F-F--...|
-|.|.|......|.--|........|.---
-|......---...| |..........|
-------.....--- ---......---
+|.|.|......|.|.|........|.---
+|......---...|.|..........|
+------.....-------......---
      |..|..|     --------
      -------
 ENDMAP
@@ -187,8 +183,8 @@ STAIR: (26,06), up
 REGION: (00,00,28,12), lit, "ordinary"
 NON_DIGGABLE: (00,00,28,12)
 NON_PASSWALL: (00,00,28,12)
-OBJECT: ('?', "earth"), (16,03)
-OBJECT: ('?', "earth"), (16,09)
+MAGIC_CHEST:(14,03)
+
 OBJECT: ('`', "boulder"), (08,02)
 OBJECT: ('`', "boulder"), (08,04)
 OBJECT: ('`', "boulder"), (03,05)
@@ -199,6 +195,7 @@ OBJECT: ('`', "boulder"), (10,06)
 OBJECT: ('`', "boulder"), (03,07)
 OBJECT: ('`', "boulder"), (08,08)
 OBJECT: ('`', "boulder"), (08,10)
+
 TRAP: "pit", (15,06)
 TRAP: "pit", (16,06)
 TRAP: "pit", (17,06)
@@ -209,7 +206,9 @@ TRAP: "pit", (21,06)
 TRAP: "pit", (22,06)
 TRAP: "pit", (23,06)
 
-# Random objects
+OBJECT: ('?', "earth"), (16,03)
+OBJECT: ('?', "earth"), (16,09)
+
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -239,8 +238,8 @@ MAP
 |.-FF-.......--...|
 |............|-----
 |..---.......|
----- ------.--
-          ---
+---- ------..|
+          ----
 ENDMAP
 BRANCH: (11,14,11,14), (0,0,0,0)
 STAIR: (12,02), up
@@ -248,8 +247,9 @@ REGION: (00,00,18,15), lit, "ordinary"
 NON_DIGGABLE: (00,00,18,15)
 NON_PASSWALL: (00,00,18,15)
 DOOR: locked,  (02,02)
-OBJECT: ('?', "earth"), (01,13)
-OBJECT: ('?', "earth"), (02,13)
+
+MAGIC_CHEST:(12,12)
+
 OBJECT: ('`', "boulder"), (08,06)
 OBJECT: ('`', "boulder"), (10,06)
 OBJECT: ('`', "boulder"), (15,06)
@@ -262,6 +262,7 @@ OBJECT: ('`', "boulder"), (16,08)
 OBJECT: ('`', "boulder"), (15,09)
 OBJECT: ('`', "boulder"), (11,10)
 OBJECT: ('`', "boulder"), (13,10)
+
 TRAP: "pit", (01,03)
 TRAP: "pit", (01,04)
 TRAP: "pit", (01,05)
@@ -274,7 +275,9 @@ TRAP: "pit", (03,12)
 TRAP: "pit", (04,12)
 TRAP: "pit", (05,12)
 
-# Random objects
+OBJECT: ('?', "earth"), (01,13)
+OBJECT: ('?', "earth"), (02,13)
+
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -313,8 +316,9 @@ REGION: (00,00,15,15), lit, "ordinary"
 NON_DIGGABLE: (00,00,15,15)
 NON_PASSWALL: (00,00,15,15)
 DOOR: locked, (14,04)
-OBJECT: ('?', "earth"), (01,01)
-OBJECT: ('?', "earth"), (02,01)
+
+MAGIC_CHEST:(08,14)
+
 OBJECT: ('`', "boulder"), (02,04)
 OBJECT: ('`', "boulder"), (02,05)
 OBJECT: ('`', "boulder"), (04,05)
@@ -327,6 +331,7 @@ OBJECT: ('`', "boulder"), (07,09)
 OBJECT: ('`', "boulder"), (08,10)
 OBJECT: ('`', "boulder"), (09,10)
 OBJECT: ('`', "boulder"), (07,11)
+
 TRAP: "pit", (03,03)
 TRAP: "pit", (04,03)
 TRAP: "pit", (05,03)
@@ -339,7 +344,9 @@ TRAP: "pit", (11,03)
 TRAP: "pit", (12,03)
 TRAP: "pit", (13,03)
 
-# Random objects
+OBJECT: ('?', "earth"), (01,01)
+OBJECT: ('?', "earth"), (02,01)
+
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -374,8 +381,9 @@ STAIR: (11,07), up
 REGION: (00,00,16,12), lit, "ordinary"
 NON_DIGGABLE: (00,00,16,12)
 NON_PASSWALL: (00,00,16,12)
-OBJECT: ('?', "earth"), (14,01)
-OBJECT: ('?', "earth"), (15,01)
+
+MAGIC_CHEST:(01,01)
+
 OBJECT: ('`', "boulder"), (12,02)
 OBJECT: ('`', "boulder"), (06,03)
 OBJECT: ('`', "boulder"), (12,03)
@@ -386,6 +394,7 @@ OBJECT: ('`', "boulder"), (14,07)
 OBJECT: ('`', "boulder"), (12,09)
 OBJECT: ('`', "boulder"), (13,09)
 OBJECT: ('`', "boulder"), (14,10)
+
 TRAP: "pit", (06,07)
 TRAP: "pit", (07,07)
 TRAP: "pit", (08,07)
@@ -397,7 +406,9 @@ TRAP: "pit", (08,09)
 TRAP: "pit", (09,09)
 TRAP: "pit", (10,09)
 
-# Random objects
+OBJECT: ('?', "earth"), (14,01)
+OBJECT: ('?', "earth"), (15,01)
+
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -430,8 +441,9 @@ STAIR: (10,9), up
 REGION: (00,00,18,11), lit, "ordinary"
 NON_DIGGABLE: (00,00,18,11)
 NON_PASSWALL: (00,00,18,11)
-OBJECT: ('?', "earth"), (1,8)
-OBJECT: ('?', "earth"), (1,9)
+
+MAGIC_CHEST:(04,06)
+
 OBJECT: ('`', "boulder"), (12,2)
 OBJECT: ('`', "boulder"), (14,2)
 OBJECT: ('`', "boulder"), (9,3)
@@ -440,6 +452,7 @@ OBJECT: ('`', "boulder"), (16,4)
 OBJECT: ('`', "boulder"), (8,5)
 OBJECT: ('`', "boulder"), (10,5)
 OBJECT: ('`', "boulder"), (14,9)
+
 TRAP: "pit", (2,6)
 TRAP: "pit", (2,7)
 TRAP: "pit", (4,9)
@@ -447,6 +460,10 @@ TRAP: "pit", (5,9)
 TRAP: "pit", (6,9)
 TRAP: "pit", (7,9)
 TRAP: "pit", (8,9)
+
+OBJECT: ('?', "earth"), (1,8)
+OBJECT: ('?', "earth"), (1,9)
+
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -481,7 +498,8 @@ REGION: (00,00,11,10), lit, "ordinary"
 NON_DIGGABLE: (00,00,11,10)
 NON_PASSWALL: (00,00,11,10)
 
-# Boulders
+MAGIC_CHEST:(10,02)
+
 OBJECT: ('`', "boulder"), (08,03)
 OBJECT: ('`', "boulder"), (09,03)
 OBJECT: ('`', "boulder"), (09,04)
@@ -493,7 +511,6 @@ OBJECT: ('`', "boulder"), (09,07)
 OBJECT: ('`', "boulder"), (05,08)
 OBJECT: ('`', "boulder"), (08,08)
 
-# Traps
 TRAP: "pit", (05,03)
 TRAP: "pit", (04,03)
 TRAP: "pit", (03,03)
@@ -503,7 +520,6 @@ TRAP: "pit", (01,06)
 TRAP: "pit", (01,07)
 TRAP: "pit", (01,08)
 
-# A little help
 OBJECT: ('?', "earth"), (01,02)
 OBJECT: ('?', "earth"), (02,02)
 
@@ -543,7 +559,8 @@ REGION: (00,00,13,12), lit, "ordinary"
 NON_DIGGABLE: (00,00,13,12)
 NON_PASSWALL: (00,00,13,12)
 
-# Boulders
+MAGIC_CHEST:(9,05)
+
 OBJECT: ('`', "boulder"), (04,02)
 OBJECT: ('`', "boulder"), (06,02)
 OBJECT: ('`', "boulder"), (07,02)
@@ -556,7 +573,6 @@ OBJECT: ('`', "boulder"), (08,09)
 OBJECT: ('`', "boulder"), (11,09)
 OBJECT: ('`', "boulder"), (11,10)
 
-# Traps
 TRAP: "pit", (05,09)
 TRAP: "pit", (04,09)
 TRAP: "pit", (03,09)
@@ -568,7 +584,6 @@ TRAP: "pit", (01,04)
 TRAP: "pit", (01,03)
 TRAP: "pit", (01,02)
 
-# A little help
 OBJECT: ('?', "earth"), (01,10)
 OBJECT: ('?', "earth"), (02,10)
 
@@ -607,24 +622,21 @@ REGION: (00,00,16,10), lit, "ordinary"
 NON_DIGGABLE: (00,00,16,10)
 NON_PASSWALL: (00,00,16,10)
 
-# Boulders
+MAGIC_CHEST:(05,09)
+
 OBJECT: ('`', "boulder"), (03,02)
 OBJECT: ('`', "boulder"), (05,02)
-#
 OBJECT: ('`', "boulder"), (10,02)
 OBJECT: ('`', "boulder"), (10,03)
 OBJECT: ('`', "boulder"), (13,03)
 OBJECT: ('`', "boulder"), (14,04)
 OBJECT: ('`', "boulder"), (13,05)
-#
 OBJECT: ('`', "boulder"), (11,07)
 OBJECT: ('`', "boulder"), (12,08)
 OBJECT: ('`', "boulder"), (13,08)
-#
 OBJECT: ('`', "boulder"), (06,07)
 OBJECT: ('`', "boulder"), (05,08)
 
-# Traps
 TRAP: "pit", (07,05)
 TRAP: "pit", (06,05)
 TRAP: "pit", (05,05)
@@ -636,11 +648,9 @@ TRAP: "pit", (02,07)
 TRAP: "pit", (03,07)
 TRAP: "pit", (04,07)
 
-# A little help
 OBJECT: ('?', "earth"), (02,08)
 OBJECT: ('?', "earth"), (03,08)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -676,22 +686,20 @@ REGION: (00,00,14,12), lit, "ordinary"
 NON_DIGGABLE: (00,00,14,12)
 NON_PASSWALL: (00,00,14,12)
 
-# Boulders
+MAGIC_CHEST:(05,07)
+
 OBJECT: ('`', "boulder"), (05,10)
 OBJECT: ('`', "boulder"), (10,10)
-#
 OBJECT: ('`', "boulder"), (05,06)
 OBJECT: ('`', "boulder"), (03,05)
 OBJECT: ('`', "boulder"), (04,04)
 OBJECT: ('`', "boulder"), (05,03)
 OBJECT: ('`', "boulder"), (06,02)
-#
 OBJECT: ('`', "boulder"), (07,04)
 OBJECT: ('`', "boulder"), (08,05)
 OBJECT: ('`', "boulder"), (10,04)
 OBJECT: ('`', "boulder"), (10,06)
 
-# Traps
 TRAP: "pit", (07,02)
 TRAP: "pit", (08,02)
 TRAP: "pit", (09,02)
@@ -702,11 +710,9 @@ TRAP: "pit", (13,03)
 TRAP: "pit", (13,04)
 TRAP: "pit", (13,05)
 
-# A little help
 OBJECT: ('?', "earth"), (12,01)
 OBJECT: ('?', "earth"), (13,01)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -740,15 +746,14 @@ REGION: (00,00,14,10), lit, "ordinary"
 NON_DIGGABLE: (00,00,14,10)
 NON_PASSWALL: (00,00,14,10)
 
-# Boulders
+MAGIC_CHEST:(01,04)
+
 OBJECT: ('`', "boulder"), (02,08)
 OBJECT: ('`', "boulder"), (04,08)
 OBJECT: ('`', "boulder"), (04,06)
-#
 OBJECT: ('`', "boulder"), (02,04)
 OBJECT: ('`', "boulder"), (05,04)
 OBJECT: ('`', "boulder"), (05,02)
-#
 OBJECT: ('`', "boulder"), (07,03)
 OBJECT: ('`', "boulder"), (08,02)
 OBJECT: ('`', "boulder"), (09,03)
@@ -756,7 +761,6 @@ OBJECT: ('`', "boulder"), (10,02)
 OBJECT: ('`', "boulder"), (07,05)
 OBJECT: ('`', "boulder"), (10,05)
 
-# Traps
 TRAP: "pit", (09,08)
 TRAP: "pit", (10,08)
 TRAP: "pit", (11,08)
@@ -768,11 +772,9 @@ TRAP: "pit", (13,04)
 TRAP: "pit", (13,03)
 TRAP: "pit", (13,02)
 
-# A little help
 OBJECT: ('?', "earth"), (12,09)
 OBJECT: ('?', "earth"), (13,09)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -807,7 +809,8 @@ REGION: (00,00,14,11), lit, "ordinary"
 NON_DIGGABLE: (00,00,14,11)
 NON_PASSWALL: (00,00,14,11)
 
-# Boulders
+MAGIC_CHEST:(11,04)
+
 OBJECT: ('`', "boulder"), (03,02)
 OBJECT: ('`', "boulder"), (09,02)
 OBJECT: ('`', "boulder"), (11,02)
@@ -823,7 +826,6 @@ OBJECT: ('`', "boulder"), (06,07)
 OBJECT: ('`', "boulder"), (03,09)
 OBJECT: ('`', "boulder"), (07,09)
 
-# Traps
 TRAP: "pit", (13,05)
 TRAP: "pit", (07,06)
 TRAP: "pit", (12,06)
@@ -837,11 +839,9 @@ TRAP: "pit", (10,08)
 TRAP: "pit", (11,08)
 TRAP: "pit", (12,08)
 
-# A little help
 OBJECT: ('?', "earth"), (11,09)
 OBJECT: ('?', "earth"), (12,09)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -874,7 +874,8 @@ REGION: (00,00,14,09), lit, "ordinary"
 NON_DIGGABLE: (00,00,14,09)
 NON_PASSWALL: (00,00,14,09)
 
-# Boulders
+MAGIC_CHEST:(01,01)
+
 OBJECT: ('`', "boulder"), (02,03)
 OBJECT: ('`', "boulder"), (05,03)
 OBJECT: ('`', "boulder"), (03,04)
@@ -888,7 +889,6 @@ OBJECT: ('`', "boulder"), (10,06)
 OBJECT: ('`', "boulder"), (08,07)
 OBJECT: ('`', "boulder"), (10,07)
 
-# Traps
 TRAP: "pit", (07,02)
 TRAP: "pit", (08,02)
 TRAP: "pit", (09,02)
@@ -900,11 +900,9 @@ TRAP: "pit", (13,05)
 TRAP: "pit", (13,06)
 TRAP: "pit", (13,07)
 
-# A little help
 OBJECT: ('?', "earth"), (12,01)
 OBJECT: ('?', "earth"), (13,01)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -940,7 +938,8 @@ REGION: (00,00,13,11), lit, "ordinary"
 NON_DIGGABLE: (00,00,13,11)
 NON_PASSWALL: (00,00,13,11)
 
-# Boulders
+MAGIC_CHEST:(02,10)
+
 OBJECT: ('`', "boulder"), (02,02)
 OBJECT: ('`', "boulder"), (04,02)
 OBJECT: ('`', "boulder"), (08,02)
@@ -953,7 +952,6 @@ OBJECT: ('`', "boulder"), (05,07)
 OBJECT: ('`', "boulder"), (03,08)
 OBJECT: ('`', "boulder"), (04,09)
 
-# Traps
 TRAP: "pit", (11,03)
 TRAP: "pit", (11,04)
 TRAP: "pit", (11,05)
@@ -965,11 +963,9 @@ TRAP: "pit", (08,10)
 TRAP: "pit", (09,10)
 TRAP: "pit", (10,10)
 
-# A little help
 OBJECT: ('?', "earth"), (12,09)
 OBJECT: ('?', "earth"), (12,10)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1005,7 +1001,8 @@ REGION: (00,00,18,11), lit, "ordinary"
 NON_DIGGABLE: (00,00,18,11)
 NON_PASSWALL: (00,00,18,11)
 
-# Boulders
+MAGIC_CHEST:(03,02)
+
 OBJECT: ('`', "boulder"), (07,02)
 OBJECT: ('`', "boulder"), (03,03)
 OBJECT: ('`', "boulder"), (08,03)
@@ -1018,7 +1015,6 @@ OBJECT: ('`', "boulder"), (05,05)
 OBJECT: ('`', "boulder"), (05,07)
 OBJECT: ('`', "boulder"), (05,09)
 
-# Traps
 TRAP: "pit", (14,02)
 TRAP: "pit", (15,02)
 TRAP: "pit", (16,03)
@@ -1030,11 +1026,9 @@ TRAP: "pit", (16,08)
 TRAP: "pit", (14,10)
 TRAP: "pit", (15,10)
 
-# A little help
 OBJECT: ('?', "earth"), (15,01)
 OBJECT: ('?', "earth"), (16,01)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1070,7 +1064,8 @@ REGION: (00,00,14,11), lit, "ordinary"
 NON_DIGGABLE: (00,00,14,11)
 NON_PASSWALL: (00,00,14,11)
 
-# Boulders
+MAGIC_CHEST:(08,05)
+
 OBJECT: ('`', "boulder"), (04,03)
 OBJECT: ('`', "boulder"), (04,04)
 OBJECT: ('`', "boulder"), (05,04)
@@ -1084,7 +1079,6 @@ OBJECT: ('`', "boulder"), (11,08)
 OBJECT: ('`', "boulder"), (03,09)
 OBJECT: ('`', "boulder"), (12,09)
 
-# Traps
 TRAP: "pit", (03,01)
 TRAP: "pit", (04,01)
 TRAP: "pit", (05,01)
@@ -1096,11 +1090,9 @@ TRAP: "pit", (10,01)
 TRAP: "pit", (11,01)
 TRAP: "pit", (12,01)
 
-# A little help
 OBJECT: ('?', "earth"), (07,07)
 OBJECT: ('?', "earth"), (08,07)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1133,7 +1125,8 @@ REGION: (00,00,12,08), lit, "ordinary"
 NON_DIGGABLE: (00,00,12,08)
 NON_PASSWALL: (00,00,12,08)
 
-# Boulders
+MAGIC_CHEST:(03,06)
+
 OBJECT: ('`', "boulder"), (09,02)
 OBJECT: ('`', "boulder"), (04,04)
 OBJECT: ('`', "boulder"), (06,04)
@@ -1145,7 +1138,6 @@ OBJECT: ('`', "boulder"), (04,06)
 OBJECT: ('`', "boulder"), (06,06)
 OBJECT: ('`', "boulder"), (09,06)
 
-# Traps
 TRAP: "pit", (03,02)
 TRAP: "pit", (04,02)
 TRAP: "pit", (05,02)
@@ -1156,11 +1148,9 @@ TRAP: "pit", (01,04)
 TRAP: "pit", (01,05)
 TRAP: "pit", (01,06)
 
-# A little help
 OBJECT: ('?', "earth"), (01,01)
 OBJECT: ('?', "earth"), (02,01)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1196,7 +1186,6 @@ REGION: (00,00,28,11), lit, "ordinary"
 NON_DIGGABLE: (00,00,28,11)
 NON_PASSWALL: (00,00,28,11)
 
-# Boulders
 OBJECT: ('`', "boulder"), (03,02)
 OBJECT: ('`', "boulder"), (04,02)
 OBJECT: ('`', "boulder"), (06,02)
@@ -1218,7 +1207,6 @@ OBJECT: ('`', "boulder"), (09,09)
 OBJECT: ('`', "boulder"), (10,07)
 OBJECT: ('`', "boulder"), (10,10)
 
-# Traps
 TRAP: "hole", (12,10)
 TRAP: "hole", (13,10)
 TRAP: "hole", (14,10)
@@ -1235,7 +1223,6 @@ TRAP: "hole", (24,10)
 TRAP: "hole", (25,10)
 TRAP: "hole", (26,10)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1272,7 +1259,6 @@ REGION: (00,00,25,13), lit, "ordinary"
 NON_DIGGABLE: (00,00,25,13)
 NON_PASSWALL: (00,00,25,13)
 
-# Boulders
 OBJECT: ('`', "boulder"), (02,03)
 OBJECT: ('`', "boulder"), (08,03)
 OBJECT: ('`', "boulder"), (09,04)
@@ -1290,7 +1276,6 @@ OBJECT: ('`', "boulder"), (07,10)
 OBJECT: ('`', "boulder"), (10,10)
 OBJECT: ('`', "boulder"), (03,11)
 
-# Traps
 TRAP: "hole", (12,10)
 TRAP: "hole", (13,10)
 TRAP: "hole", (14,10)
@@ -1304,7 +1289,6 @@ TRAP: "hole", (21,10)
 TRAP: "hole", (22,10)
 TRAP: "hole", (23,10)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1365,7 +1349,6 @@ TRAP: "hole", (07,05)
 TRAP: "hole", (08,05)
 TRAP: "hole", (09,05)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1429,7 +1412,6 @@ TRAP: "hole", (06,11)
 TRAP: "hole", (07,11)
 TRAP: "hole", (08,11)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1489,7 +1471,6 @@ TRAP: "hole", (15,09)
 TRAP: "hole", (16,09)
 TRAP: "hole", (17,09)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1559,7 +1540,6 @@ TRAP: "hole", (10,10)
 TRAP: "hole", (09,11)
 TRAP: "hole", (10,11)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1707,7 +1687,6 @@ REGION: (00,00,15,13), lit, "ordinary"
 NON_DIGGABLE: (00,00,15,13)
 NON_PASSWALL: (00,00,15,13)
 
-# Boulders
 OBJECT: ('`', "boulder"), (06,02)
 OBJECT: ('`', "boulder"), (07,02)
 OBJECT: ('`', "boulder"), (02,03)
@@ -1719,7 +1698,6 @@ OBJECT: ('`', "boulder"), (07,06)
 OBJECT: ('`', "boulder"), (03,07)
 OBJECT: ('`', "boulder"), (07,09)
 
-# Traps
 TRAP: "hole", (04,08)
 TRAP: "hole", (04,09)
 TRAP: "hole", (04,10)
@@ -1767,7 +1745,6 @@ NON_PASSWALL: (00,00,15,11)
 
 DOOR: locked, (13,09)
 
-# Boulders
 OBJECT: ('`', "boulder"), (03,03)
 OBJECT: ('`', "boulder"), (06,03)
 OBJECT: ('`', "boulder"), (02,04)
@@ -1780,7 +1757,6 @@ OBJECT: ('`', "boulder"), (06,06)
 OBJECT: ('`', "boulder"), (07,06)
 OBJECT: ('`', "boulder"), (02,07)
 
-# Traps
 TRAP: "hole", (03,10)
 TRAP: "hole", (04,10)
 TRAP: "hole", (05,10)
@@ -1831,7 +1807,6 @@ REGION: (00,00,25,13), lit, "ordinary"
 NON_DIGGABLE: (00,00,26,13)
 NON_PASSWALL: (00,00,26,13)
 
-# Boulders
 OBJECT: ('`', "boulder"), (03,11)
 OBJECT: ('`', "boulder"), (05,11)
 OBJECT: ('`', "boulder"), (07,11)
@@ -1854,7 +1829,6 @@ OBJECT: ('`', "boulder"), (10,05)
 OBJECT: ('`', "boulder"), (10,03)
 OBJECT: ('`', "boulder"), (11,03)
 
-# Traps
 TRAP: "hole", (13,02)
 TRAP: "hole", (14,02)
 TRAP: "hole", (15,02)
@@ -1871,7 +1845,6 @@ TRAP: "hole", (24,03)
 TRAP: "hole", (25,04)
 TRAP: "hole", (25,05)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1909,7 +1882,6 @@ REGION: (00,00,26,13), lit, "ordinary"
 NON_DIGGABLE: (00,00,26,13)
 NON_PASSWALL: (00,00,26,13)
 
-# Boulders
 OBJECT: ('`', "boulder"), (05,03)
 OBJECT: ('`', "boulder"), (07,03)
 OBJECT: ('`', "boulder"), (09,03)
@@ -1928,7 +1900,6 @@ OBJECT: ('`', "boulder"), (10,08)
 OBJECT: ('`', "boulder"), (11,08)
 OBJECT: ('`', "boulder"), (11,06)
 
-# Traps
 TRAP: "hole", (12,10)
 TRAP: "hole", (13,10)
 TRAP: "hole", (14,10)
@@ -1943,7 +1914,6 @@ TRAP: "hole", (22,10)
 TRAP: "hole", (23,10)
 TRAP: "hole", (24,10)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -1984,7 +1954,6 @@ REGION: (00,00,25,15), lit, "ordinary"
 NON_DIGGABLE: (00,00,25,15)
 NON_PASSWALL: (00,00,25,15)
 
-# Boulders
 OBJECT: ('`', "boulder"), (10,06)
 OBJECT: ('`', "boulder"), (11,05)
 OBJECT: ('`', "boulder"), (12,06)
@@ -2007,7 +1976,6 @@ OBJECT: ('`', "boulder"), (23,06)
 #
 OBJECT: ('`', "boulder"), (06,10)
 
-# Traps
 TRAP: "hole", (08,13)
 TRAP: "hole", (07,13)
 TRAP: "hole", (06,13)
@@ -2026,7 +1994,6 @@ TRAP: "hole", (07,10)
 TRAP: "hole", (07,09)
 TRAP: "hole", (07,08)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -2071,7 +2038,6 @@ REGION: (00,00,27,17), lit, "ordinary"
 NON_DIGGABLE: (00,00,27,17)
 NON_PASSWALL: (00,00,27,17)
 
-# Boulders
 OBJECT: ('`', "boulder"), (03,03)
 OBJECT: ('`', "boulder"), (05,03)
 OBJECT: ('`', "boulder"), (07,03)
@@ -2085,7 +2051,6 @@ OBJECT: ('`', "boulder"), (10,08)
 OBJECT: ('`', "boulder"), (06,09)
 OBJECT: ('`', "boulder"), (06,10)
 
-# Traps
 TRAP: "hole", (09,16)
 TRAP: "hole", (10,16)
 TRAP: "hole", (11,16)
@@ -2097,7 +2062,6 @@ TRAP: "hole", (16,16)
 TRAP: "hole", (17,16)
 TRAP: "hole", (18,16)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -2135,7 +2099,6 @@ REGION: (00,00,17,13), lit, "ordinary"
 NON_DIGGABLE: (00,00,17,13)
 NON_PASSWALL: (00,00,17,13)
 
-# Boulders
 OBJECT: ('`', "boulder"), (09,02)
 OBJECT: ('`', "boulder"), (15,02)
 OBJECT: ('`', "boulder"), (03,03)
@@ -2149,7 +2112,6 @@ OBJECT: ('`', "boulder"), (02,08)
 OBJECT: ('`', "boulder"), (03,11)
 OBJECT: ('`', "boulder"), (04,11)
 
-# Traps
 TRAP: "hole", (04,04)
 TRAP: "hole", (08,04)
 TRAP: "hole", (02,05)
@@ -2164,7 +2126,6 @@ TRAP: "hole", (05,10)
 TRAP: "hole", (06,10)
 TRAP: "hole", (07,10)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -2198,7 +2159,6 @@ REGION: (00,00,24,07), lit, "ordinary"
 NON_DIGGABLE: (00,00,24,07)
 NON_PASSWALL: (00,00,24,07)
 
-# Boulders
 OBJECT: ('`', "boulder"), (05,02)
 OBJECT: ('`', "boulder"), (04,03)
 OBJECT: ('`', "boulder"), (04,04)
@@ -2207,7 +2167,6 @@ OBJECT: ('`', "boulder"), (09,05)
 OBJECT: ('`', "boulder"), (10,05)
 OBJECT: ('`', "boulder"), (11,05)
 
-# Traps
 TRAP: "hole", (17,02)
 TRAP: "hole", (17,03)
 TRAP: "hole", (17,04)
@@ -2215,7 +2174,6 @@ TRAP: "hole", (14,05)
 TRAP: "hole", (15,05)
 TRAP: "hole", (16,05)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -2258,7 +2216,6 @@ REGION: (00,00,25,18), lit, "ordinary"
 NON_DIGGABLE: (00,00,25,18)
 NON_PASSWALL: (00,00,25,18)
 
-# Boulders
 OBJECT: ('`', "boulder"), (12,03)
 OBJECT: ('`', "boulder"), (12,04)
 OBJECT: ('`', "boulder"), (09,06)
@@ -2277,7 +2234,6 @@ OBJECT: ('`', "boulder"), (11,14)
 OBJECT: ('`', "boulder"), (11,16)
 OBJECT: ('`', "boulder"), (12,16)
 
-# Traps
 TRAP: "hole", (15,06)
 TRAP: "hole", (16,06)
 TRAP: "hole", (17,06)
@@ -2294,7 +2250,6 @@ TRAP: "hole", (18,11)
 TRAP: "hole", (14,12)
 TRAP: "hole", (18,12)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -2330,7 +2285,6 @@ REGION: (00,00,19,11), lit, "ordinary"
 NON_DIGGABLE: (00,00,19,11)
 NON_PASSWALL: (00,00,19,11)
 
-# Boulders
 OBJECT: ('`', "boulder"), (02,02)
 OBJECT: ('`', "boulder"), (03,02)
 OBJECT: ('`', "boulder"), (05,03)
@@ -2345,7 +2299,6 @@ OBJECT: ('`', "boulder"), (03,09)
 OBJECT: ('`', "boulder"), (05,07)
 OBJECT: ('`', "boulder"), (06,06)
 
-# Traps
 TRAP: "hole", (08,09)
 TRAP: "hole", (09,09)
 TRAP: "hole", (10,09)
@@ -2357,7 +2310,6 @@ TRAP: "hole", (15,09)
 TRAP: "hole", (16,09)
 TRAP: "hole", (17,09)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -2393,7 +2345,6 @@ REGION: (00,00,19,12), lit, "ordinary"
 NON_DIGGABLE: (00,00,19,12)
 NON_PASSWALL: (00,00,19,12)
 
-# Boulders
 OBJECT: ('`', "boulder"), (04,02)
 OBJECT: ('`', "boulder"), (04,03)
 OBJECT: ('`', "boulder"), (05,03)
@@ -2411,7 +2362,6 @@ OBJECT: ('`', "boulder"), (06,09)
 OBJECT: ('`', "boulder"), (05,10)
 OBJECT: ('`', "boulder"), (05,11)
 
-# Traps
 TRAP: "hole", (07,11)
 TRAP: "hole", (08,11)
 TRAP: "hole", (09,11)
@@ -2424,7 +2374,6 @@ TRAP: "hole", (15,11)
 TRAP: "hole", (16,11)
 TRAP: "hole", (17,11)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -2496,7 +2445,6 @@ TRAP: "hole", (16,06)
 TRAP: "hole", (17,06)
 TRAP: "hole", (18,06)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -2556,7 +2504,6 @@ TRAP: "hole", (16,12)
 TRAP: "hole", (13,13)
 TRAP: "hole", (15,14)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -2596,7 +2543,6 @@ REGION: (00,00,21,15), lit, "ordinary"
 NON_DIGGABLE: (00,00,21,15)
 NON_PASSWALL: (00,00,21,15)
 
-# Boulders
 OBJECT: ('`', "boulder"), (08,04)
 OBJECT: ('`', "boulder"), (11,05)
 OBJECT: ('`', "boulder"), (12,05)
@@ -2612,7 +2558,6 @@ OBJECT: ('`', "boulder"), (08,09)
 OBJECT: ('`', "boulder"), (10,10)
 OBJECT: ('`', "boulder"), (11,11)
 
-# Traps
 TRAP: "hole", (08,01)
 TRAP: "hole", (09,01)
 TRAP: "hole", (10,01)
@@ -2626,7 +2571,6 @@ TRAP: "hole", (17,01)
 TRAP: "hole", (18,01)
 TRAP: "hole", (19,01)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -2668,7 +2612,6 @@ REGION: (00,00,24,15), lit, "ordinary"
 NON_DIGGABLE: (00,00,24,15)
 NON_PASSWALL: (00,00,24,15)
 
-# Boulders
 OBJECT: ('`', "boulder"), (05,02)
 OBJECT: ('`', "boulder"), (04,03)
 OBJECT: ('`', "boulder"), (03,06)
@@ -2687,7 +2630,6 @@ OBJECT: ('`', "boulder"), (10,11)
 OBJECT: ('`', "boulder"), (04,12)
 OBJECT: ('`', "boulder"), (08,12)
 
-# Traps
 TRAP: "hole", (09,04)
 TRAP: "hole", (10,04)
 TRAP: "hole", (11,04)
@@ -2703,7 +2645,6 @@ TRAP: "hole", (20,04)
 TRAP: "hole", (21,04)
 TRAP: "hole", (22,04)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -3046,7 +2987,6 @@ REGION: (00,00,29,11), lit, "ordinary"
 NON_DIGGABLE: (00,00,29,11)
 NON_PASSWALL: (00,00,29,11)
 
-# Boulders
 OBJECT: ('`', "boulder"), (03,03)
 OBJECT: ('`', "boulder"), (06,02)
 #
@@ -3071,7 +3011,6 @@ OBJECT: ('`', "boulder"), (06,08)
 OBJECT: ('`', "boulder"), (07,09)
 OBJECT: ('`', "boulder"), (08,08)
 
-# Traps
 TRAP: "hole", (10,10)
 TRAP: "hole", (11,10)
 TRAP: "hole", (12,10)
@@ -3091,7 +3030,6 @@ TRAP: "hole", (25,10)
 TRAP: "hole", (26,10)
 TRAP: "hole", (27,10)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -3128,7 +3066,6 @@ REGION: (00,00,20,12), lit, "ordinary"
 NON_DIGGABLE: (00,00,20,12)
 NON_PASSWALL: (00,00,20,12)
 
-# Boulders
 OBJECT: ('`', "boulder"), (03,02)
 OBJECT: ('`', "boulder"), (03,05)
 #
@@ -3147,7 +3084,6 @@ OBJECT: ('`', "boulder"), (05,09)
 OBJECT: ('`', "boulder"), (06,10)
 OBJECT: ('`', "boulder"), (08,09)
 
-# Traps
 TRAP: "hole", (07,11)
 TRAP: "hole", (08,11)
 TRAP: "hole", (09,11)
@@ -3161,7 +3097,6 @@ TRAP: "hole", (16,11)
 TRAP: "hole", (17,11)
 TRAP: "hole", (18,11)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -3199,7 +3134,6 @@ REGION: (00,00,21,13), lit, "ordinary"
 NON_DIGGABLE: (00,00,21,13)
 NON_PASSWALL: (00,00,21,13)
 
-# Boulders
 OBJECT: ('`', "boulder"), (14,10)
 OBJECT: ('`', "boulder"), (15,09)
 OBJECT: ('`', "boulder"), (16,08)
@@ -3223,7 +3157,6 @@ OBJECT: ('`', "boulder"), (02,03)
 OBJECT: ('`', "boulder"), (03,02)
 OBJECT: ('`', "boulder"), (04,02)
 
-# Traps
 TRAP: "hole", (14,11)
 TRAP: "hole", (15,11)
 TRAP: "hole", (16,11)
@@ -3240,7 +3173,6 @@ TRAP: "hole", (20,04)
 TRAP: "hole", (20,03)
 TRAP: "hole", (20,02)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -3283,7 +3215,6 @@ REGION: (00,00,25,16), lit, "ordinary"
 NON_DIGGABLE: (00,00,25,16)
 NON_PASSWALL: (00,00,25,16)
 
-# Boulders
 OBJECT: ('`', "boulder"), (10,02)
 OBJECT: ('`', "boulder"), (04,03)
 OBJECT: ('`', "boulder"), (12,03)
@@ -3319,7 +3250,6 @@ OBJECT: ('`', "boulder"), (13,13)
 OBJECT: ('`', "boulder"), (21,13)
 OBJECT: ('`', "boulder"), (15,14)
 
-# Traps
 TRAP: "hole", (04,06)
 TRAP: "hole", (05,06)
 TRAP: "hole", (06,06)
@@ -3341,7 +3271,6 @@ TRAP: "hole", (19,10)
 TRAP: "hole", (20,10)
 TRAP: "hole", (21,10)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -3388,7 +3317,6 @@ REGION: (00,00,14,19), lit, "ordinary"
 NON_DIGGABLE: (00,00,14,19)
 NON_PASSWALL: (00,00,14,19)
 
-# Boulders
 OBJECT: ('`', "boulder"), (04,02)
 OBJECT: ('`', "boulder"), (10,05)
 OBJECT: ('`', "boulder"), (02,09)
@@ -3402,7 +3330,6 @@ OBJECT: ('`', "boulder"), (08,16)
 OBJECT: ('`', "boulder"), (11,16)
 OBJECT: ('`', "boulder"), (12,17)
 
-# Traps
 TRAP: "hole", (06,02)
 TRAP: "hole", (07,02)
 TRAP: "hole", (08,02)
@@ -3414,7 +3341,6 @@ TRAP: "hole", (13,04)
 TRAP: "hole", (13,05)
 TRAP: "hole", (13,06)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -3454,7 +3380,6 @@ REGION: (00,00,35,12), lit, "ordinary"
 NON_DIGGABLE: (00,00,35,12)
 NON_PASSWALL: (00,00,35,12)
 
-# Boulders
 OBJECT: ('`', "boulder"), (05,06)
 OBJECT: ('`', "boulder"), (09,06)
 OBJECT: ('`', "boulder"), (13,06)
@@ -3467,7 +3392,6 @@ OBJECT: ('`', "boulder"), (08,09)
 OBJECT: ('`', "boulder"), (09,10)
 OBJECT: ('`', "boulder"), (13,10)
 
-# Traps
 TRAP: "hole", (19,06)
 TRAP: "hole", (20,06)
 TRAP: "hole", (21,06)
@@ -3479,7 +3403,6 @@ TRAP: "hole", (24,08)
 TRAP: "hole", (24,09)
 TRAP: "hole", (24,10)
 
-# Random objects
 # No free food here, but you can buy some from the deli.
 OBJECT: '=', random
 OBJECT: '/', random
@@ -3513,7 +3436,6 @@ REGION: (00,00,24,08), lit, "ordinary"
 NON_DIGGABLE: (00,00,24,08)
 NON_PASSWALL: (00,00,24,08)
 
-# Boulders
 # Spoiler: positions to aim for are as follows:
 # (19,02),(21,02),(16,03),(17,03),(13,04),(17,04),(20,04),
 # (21,04),(16,05),(22,05),(21,06), and the last stands at (14,05).
@@ -3531,7 +3453,6 @@ OBJECT: ('`', "boulder"), (14,05)
 OBJECT: ('`', "boulder"), (14,05)
 ENGRAVING:(17,07),burn,"How did they all end up on top of each other?"
 
-# Traps
 TRAP: "hole", (02,07)
 TRAP: "hole", (03,07)
 TRAP: "hole", (04,07)
@@ -3544,7 +3465,6 @@ TRAP: "hole", (10,07)
 TRAP: "hole", (11,07)
 TRAP: "hole", (12,07)
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -3590,7 +3510,6 @@ REGION: (00,00,25,17), lit, "ordinary"
 NON_DIGGABLE: (00,00,25,17)
 NON_PASSWALL: (00,00,25,17)
 
-# Boulders
 OBJECT: ('`', "boulder"), (03,05)
 OBJECT: ('`', "boulder"), (05,05)
 OBJECT: ('`', "boulder"), (07,05)
@@ -3610,7 +3529,6 @@ OBJECT: ('`', "boulder"), (08,10)
 OBJECT: ('`', "boulder"), (09,12)
 OBJECT: ('`', "boulder"), (03,14)
 
-# Traps
 TRAP: "hole", (08,01)
 TRAP: "hole", (09,01)
 TRAP: "hole", (10,01)
@@ -3631,7 +3549,6 @@ TRAP: "hole", (23,01)
 MONSTER: ('m', "giant mimic"), random, m_object "boulder"
 MONSTER: ('m', "giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -3694,7 +3611,6 @@ REGION: (00,00,25,16), lit, "ordinary"
 NON_DIGGABLE: (00,00,25,16)
 NON_PASSWALL: (00,00,25,16)
 
-# Boulders
 OBJECT: ('`', "boulder"), (04,04)
 OBJECT: ('`', "boulder"), (02,06)
 OBJECT: ('`', "boulder"), (03,06)
@@ -3716,7 +3632,6 @@ OBJECT: ('`', "boulder"), (10,08)
 OBJECT: ('`', "boulder"), (12,09)
 OBJECT: ('`', "boulder"), (11,10)
 
-# Traps
 TRAP: "hole", (05,01)
 TRAP: "hole", (06,01)
 TRAP: "hole", (07,01)
@@ -3739,7 +3654,6 @@ TRAP: "hole", (22,01)
 MONSTER: ('m',"giant mimic"), random, m_object "boulder"
 MONSTER: ('m',"giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -3852,7 +3766,6 @@ TRAP: "hole", (14,13)
 MONSTER: ('m',"giant mimic"), random, m_object "boulder"
 MONSTER: ('m',"giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -3965,7 +3878,6 @@ TRAP: "hole", (15,15)
 MONSTER: ('m', "giant mimic"), random, m_object "boulder"
 MONSTER: ('m', "giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -4042,7 +3954,6 @@ REGION: (00,00,28,16), lit, "ordinary"
 NON_DIGGABLE: (00,00,28,16)
 NON_PASSWALL: (00,00,28,16)
 
-# Boulders
 OBJECT: ('`', "boulder"), (06,03)
 OBJECT: ('`', "boulder"), (07,03)
 OBJECT: ('`', "boulder"), (07,04)
@@ -4066,7 +3977,6 @@ OBJECT: ('`', "boulder"), (11,13)
 OBJECT: ('`', "boulder"), (14,13)
 OBJECT: ('`', "boulder"), (11,14)
 
-# Traps
 TRAP: "hole", (08,03)
 TRAP: "hole", (09,03)
 TRAP: "hole", (10,03)
@@ -4089,7 +3999,6 @@ TRAP: "hole", (25,03)
 MONSTER: ('m',"giant mimic"), random, m_object "boulder"
 MONSTER: ('m',"giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -4163,7 +4072,6 @@ REGION: (00,00,30,15), lit, "ordinary"
 NON_DIGGABLE: (00,00,30,15)
 NON_PASSWALL: (00,00,30,15)
 
-# Boulders
 OBJECT: ('`', "boulder"), (04,02)
 OBJECT: ('`', "boulder"), (06,02)
 OBJECT: ('`', "boulder"), (08,02)
@@ -4186,7 +4094,6 @@ OBJECT: ('`', "boulder"), (12,10)
 OBJECT: ('`', "boulder"), (14,10)
 OBJECT: ('`', "boulder"), (15,10)
 
-# Traps
 TRAP: "hole", (11,13)
 TRAP: "hole", (12,13)
 TRAP: "hole", (13,13)
@@ -4209,7 +4116,6 @@ TRAP: "hole", (28,13)
 MONSTER: ('m',"giant mimic"), random, m_object "boulder"
 MONSTER: ('m',"giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -4268,7 +4174,6 @@ REGION: (00,00,28,12), lit, "ordinary"
 NON_DIGGABLE: (00,00,28,12)
 NON_PASSWALL: (00,00,28,12)
 
-# Boulders
 OBJECT: ('`', "boulder"), (02,02)
 OBJECT: ('`', "boulder"), (05,03)
 OBJECT: ('`', "boulder"), (04,04)
@@ -4285,7 +4190,6 @@ OBJECT: ('`', "boulder"), (10,09)
 OBJECT: ('`', "boulder"), (07,10)
 OBJECT: ('`', "boulder"), (08,10)
 
-# Traps
 TRAP: "hole", (18,01)
 TRAP: "hole", (19,01)
 TRAP: "hole", (20,01)
@@ -4304,7 +4208,6 @@ TRAP: "hole", (16,09)
 MONSTER:('m',"giant mimic"), random, m_object "boulder"
 MONSTER:('m',"giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -4379,7 +4282,6 @@ REGION: (00,00,26,18), lit, "ordinary"
 NON_DIGGABLE: (00,00,26,18)
 NON_PASSWALL: (00,00,26,18)
 
-# Boulders
 OBJECT: ('`', "boulder"), (05,14)
 OBJECT: ('`', "boulder"), (08,15)
 OBJECT: ('`', "boulder"), (09,14)
@@ -4405,7 +4307,6 @@ OBJECT: ('`', "boulder"), (03,07)
 OBJECT: ('`', "boulder"), (04,04)
 OBJECT: ('`', "boulder"), (04,03)
 
-# Traps
 TRAP: "hole", (18,02)
 TRAP: "hole", (19,02)
 TRAP: "hole", (20,02)
@@ -4428,7 +4329,6 @@ TRAP: "hole", (25,13)
 MONSTER:('m',"giant mimic"), (10,14), m_object "boulder"
 MONSTER:('m',"giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -4496,7 +4396,6 @@ REGION: (00,00,26,16), lit, "ordinary"
 NON_DIGGABLE: (00,00,26,16)
 NON_PASSWALL: (00,00,26,16)
 
-# Boulders
 OBJECT: ('`', "boulder"), (03,14)
 #
 OBJECT: ('`', "boulder"), (06,14)
@@ -4524,7 +4423,6 @@ OBJECT: ('`', "boulder"), (11,05)
 OBJECT: ('`', "boulder"), (12,05)
 OBJECT: ('`', "boulder"), (12,06)
 
-# Traps
 TRAP: "hole", (06,01)
 TRAP: "hole", (07,01)
 TRAP: "hole", (08,01)
@@ -4547,7 +4445,6 @@ TRAP: "hole", (23,01)
 MONSTER:('m',"giant mimic"), random, m_object "boulder"
 MONSTER:('m',"giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -4620,7 +4517,6 @@ REGION: (00,00,18,17), lit, "ordinary"
 NON_DIGGABLE: (00,00,18,17)
 NON_PASSWALL: (00,00,18,17)
 
-# Boulders
 OBJECT: ('`', "boulder"), (06,02)
 OBJECT: ('`', "boulder"), (09,03)
 OBJECT: ('`', "boulder"), (11,03)
@@ -4639,7 +4535,6 @@ OBJECT: ('`', "boulder"), (09,07)
 OBJECT: ('`', "boulder"), (13,07)
 OBJECT: ('`', "boulder"), (15,07)
 
-# Traps
 TRAP: "hole", (08,09)
 TRAP: "hole", (08,10)
 TRAP: "hole", (04,12)
@@ -4660,7 +4555,6 @@ TRAP: "hole", (09,16)
 MONSTER:('m',"giant mimic"), random, m_object "boulder"
 MONSTER:('m',"giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -4728,7 +4622,6 @@ REGION: (00,00,29,14), lit, "ordinary"
 NON_DIGGABLE: (00,00,29,14)
 NON_PASSWALL: (00,00,29,14)
 
-# Boulders
 OBJECT: ('`', "boulder"), (02,02)
 OBJECT: ('`', "boulder"), (05,02)
 OBJECT: ('`', "boulder"), (10,02)
@@ -4749,7 +4642,6 @@ OBJECT: ('`', "boulder"), (02,08)
 OBJECT: ('`', "boulder"), (04,08)
 OBJECT: ('`', "boulder"), (07,08)
 
-# Traps
 TRAP: "hole", (06,02)
 TRAP: "hole", (06,03)
 TRAP: "hole", (06,04)
@@ -4772,7 +4664,6 @@ TRAP: "hole", (19,10)
 MONSTER:('m',"giant mimic"), random, m_object "boulder"
 MONSTER:('m',"giant mimic"), random, m_object "boulder"
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
@@ -4842,7 +4733,6 @@ REGION: (00,00,30,17), lit, "ordinary"
 NON_DIGGABLE: (00,00,30,17)
 NON_PASSWALL: (00,00,30,17)
 
-# Boulders
 OBJECT: ('`', "boulder"), (02,02)
 OBJECT: ('`', "boulder"), (03,02)
 OBJECT: ('`', "boulder"), (05,02)
@@ -4876,7 +4766,6 @@ OBJECT: ('`', "boulder"), (02,11)
 OBJECT: ('`', "boulder"), (03,11)
 OBJECT: ('`', "boulder"), (11,11)
 
-# Traps
 TRAP: "hole", (19,04)
 TRAP: "hole", (19,05)
 TRAP: "hole", (19,06)
@@ -4911,7 +4800,6 @@ MONSTER:('m',"giant mimic"), random, m_object "boulder"
 
 MONSTER:('D',"baby green dragon"), $place[1]
 
-# Random objects
 OBJECT: '%', random
 OBJECT: '%', random
 OBJECT: '%', random
diff --git a/dat/symbols b/dat/symbols
index 1978852bb..146f83953 100644
--- a/dat/symbols
+++ b/dat/symbols
@@ -143,7 +143,7 @@ finish
 
 # All symbols are spaces
 start: Blank
-	Description: completely blank symbols
+        Description: completely blank symbols
         S_air: \032
         S_altar: \032
         S_amulet: \032
@@ -237,6 +237,7 @@ start: Blank
         S_lizard: \032
         S_lslant: \032
         S_magic_beam_trap: \032
+        S_magic_chest: \032
         S_magic_portal: \032
         S_magic_trap: \032
         S_mimic: \032
@@ -500,6 +501,7 @@ start: RogueEpyx
 	S_magic_portal: \x04
 	S_web: \x04
 	S_statue_trap: \x04
+	S_magic_chest: \x28		# match it to tools
 	S_magic_trap: \x04
 	S_anti_magic_trap: \x04
 	S_polymorph_trap: \x04
@@ -579,7 +581,7 @@ start: curses
 	S_ndoor: \xfe			# meta-z, centered dot
 	S_bars: \xfc			# meta-|, not-equals sign (was '#')
 	S_tree: \xe7			# meta-g, plus or minus sign
-        S_deadtree: \xe7                # meta-g, plus or minus sign
+    S_deadtree: \xe7                # meta-g, plus or minus sign
 	S_room: \xfe			# meta-z, centered dot
 	S_corr: \xe1			# meta-a, solid block
 	S_litcorr: \xe1			# meta-a, solid block
diff --git a/dat/village.des b/dat/village.des
index 326efb5b6..f3ad946d0 100644
--- a/dat/village.des
+++ b/dat/village.des
@@ -29,11 +29,11 @@ MAP
 }}}}}}}}}}}}}}}}}}},,,,,,,,,,}}}}}}}}}}}}}},},,.,T,.....,.,.....,...,..|---|
 }}}}}}}}}}}}}}},,,,..,,.,,,,.,,,}}}}}}}}}}w}w}w}w},,.....,.......,.,T,.....|
   ---------------.,.,,.,,,,,.,.,,,,,,}}}}w}w}w}w}}w},,.....,....,T,.,..|---|
-  |.......|.....|,,.,.,..,.,,.,.,,...,,, }w}w}}}}w}w}w},..,T,....,.........|
-  |.......+.....+........................ ,}w}w}w}w}w}},.,.,..,........|---|
+  |.......|.....|,,.,.,..,.,,.,.,,...,,,,}w}w}}}}w}w}w},..,T,....,.........|
+  |.......+.....+.........................,}w}w}w}w}w}},.,.,..,........|---|
   |.......|.....|----..,,,,,,.,,,.,,,,,..,.,}w}w}w}w}.,T,....,T,...,.......|
-  |.......------|...|.....,,.,,,...,.,,,,.,, }}}}}}}}  ,......,...,T,..|---|
-  |...\...S.....S...|.         .,,,,.,,,..    }}}}}}     ..........,.
+  |.......------|...|.....,,.,,,...,.,,,,.,,.}}}}}}}}  ,......,...,T,..|---|
+  |...\...S.....S...|.         .,,,,.,,,..   .}}}}}}     ..........,.
   -------------------                          }}}}
 ENDMAP
 #0123456789012345678901234567890123456789012345678901234567890123456789012345
@@ -47,6 +47,7 @@ STAIR: (25,15), up
 $places = { (41,01), (45,01), (49,01),(53,01),(73,08),(73,10),(73,12),(73,14) }
 SHUFFLE: $places
 FORGE:$places[0]
+MAGIC_CHEST:$places[1]
           
 # Regions
 # Entry Caves
@@ -174,13 +175,14 @@ CONTAINER: ('(', "chest"), (19,18) {
   # Potential easter eggs hidden within the chest...
   [5%]: OBJECT: (')', "long sword"), blessed, +3, name:"The Master Sword"
   [5%]: OBJECT: ('[', "plate mail"), blessed, +5, name:"Erdrick's Armor"
-  #[5%]: OBJECT: (')', "mallet"), blessed, +4, name:"Tendo Mallet"
+  [5%]: OBJECT: (')', "heavy war hammer"), blessed, +4, name:"Tendo Mallet"
   [5%]: OBJECT: (')', "broadsword"), blessed, +2, name:"Grandleon"
   [5%]: OBJECT: (')', "katana"), blessed, +3, name:"Kusanagi Blade"
   [15%]: OBJECT: ('[', "plate mail"), cursed, -5, name:"Alucart Mail"
   [15%]: OBJECT: (')', "submachine gun"), cursed, -6, name:"Klobb"
   [15%]: OBJECT: (')', "runesword"), cursed, -9, name:"Excalipoor"
   [10%]: OBJECT: (')', "broadsword"), cursed, +3, name:"Soul Edge"
+  OBJECT:('(',"magic key")
 }
 
 LOOP [5] { GOLD: 1d200, (19,18) }
diff --git a/doc/lev_comp.6 b/doc/lev_comp.6
index 9d238f8cb..1ed05f967 100644
--- a/doc/lev_comp.6
+++ b/doc/lev_comp.6
@@ -170,6 +170,7 @@ room_detail	: room_name
 		| altar_detail
 		| fountain_detail
 		| forge_detail
+		| magic_chest_detail
 		| sink_detail
 		| toilet_detail
 		| puddle_detail
@@ -267,7 +268,8 @@ map_detail	: monster_detail
 		| branch_region
 		| altar_detail
 		| fountain_detail
-                | forge_detail
+		| forge_detail
+		| magic_chest_detail
 		| mazewalk_detail
 		| wallify_detail
 		| ladder_detail
@@ -371,8 +373,11 @@ fountain_detail : FOUNTAIN_ID ':' coordinate
 		;
 		
 forge_detail : FORGE_ID ':' coordinate
-                ;
-
+        ;
+        
+magic_chest_detail : MAGIC_CHEST_ID ':' coordinate
+		;
+		
 vent_detail : VENT_ID ':' coordinate
 		;
 		
@@ -383,10 +388,10 @@ toilet_detail : TOILET_ID ':' coordinate
 		;
 
 puddle_detail : PUDDLE_ID ':' coordinate
-                ;
+		;
 
 sewage_detail : SEWAGE_ID ':' coordinate
-                ;
+		;
 
 pool_detail : POOL_ID ':' coordinate
 		;
@@ -523,7 +528,7 @@ The maximum size of a map is normally 76 columns by 21 rows.
 \&'|'	vertical wall
 \&'+'	a doorway (state is specified in a DOOR declaration)
 \&'s'	sewage
-\&'t'   a dead tree
+\&'t'	a dead tree
 \&'w'	shallow water
 \&'A'	open air
 \&'B'	boundary room location (for bounding unwalled irregular regions)
@@ -532,7 +537,8 @@ The maximum size of a map is normally 76 columns by 21 rows.
 \&'S'	a secret door
 \&'H'	a secret corridor
 \&'{'	a fountain
-\&'U'   a forge
+\&'U'	a forge
+\&'M'	a magic chest
 \&'\\'	a throne
 \&'K'	a sink
 \&'Z'	a toilet
diff --git a/doc/lev_comp.txt b/doc/lev_comp.txt
index 2d4a24439..3344d8241 100644
--- a/doc/lev_comp.txt
+++ b/doc/lev_comp.txt
@@ -147,6 +147,7 @@ GRAMMAR
                        | altar_detail
                        | fountain_detail
                        | forge_detail
+                       | magic_chest_detail
                        | sink_detail
                        | toilet_detail
                        | puddle_detail
@@ -245,6 +246,7 @@ GRAMMAR
                        | altar_detail
                        | fountain_detail
                        | forge_detail
+                       | magic_chest_detail
                        | mazewalk_detail
                        | wallify_detail
                        | ladder_detail
@@ -349,7 +351,10 @@ GRAMMAR
        
        forge_detail : FORGE_ID ':' coordinate
                        ;
-
+                       
+       magic_chest_detail : MAGIC_CHEST_ID ':' coordinate
+                       ;
+                       
        vent_detail : VENT_ID ':' coordinate
                        ;
                        
@@ -506,6 +511,7 @@ GRAMMAR
        'H'     a secret corridor
        '{'     a fountain
        'U'     a forge
+       'M'     a magic chest
        '\'     a throne
        'K'     a sink
        'Z'     a toilet
diff --git a/include/artilist.h b/include/artilist.h
index 5d9e5bb4e..e6026032d 100644
--- a/include/artilist.h
+++ b/include/artilist.h
@@ -99,7 +99,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
 
     A("Firewall", STAFF_OF_DIVINATION, 
       (SPFX_RESTR | SPFX_ATTK | SPFX_DEFN), 0, 0,
-      FIRE(4, 8), DFNS(AD_FIRE), NO_CARY, SEFFECT, 
+      FIRE(4, 4), DFNS(AD_FIRE), NO_CARY, SEFFECT, 
       A_LAWFUL, PM_FLAME_MAGE, NON_PM, 400L, CLR_RED, DEFAULT_MAT),
 
     A("Grayswandir", SABER,
@@ -286,6 +286,13 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
       (SPFX_RESTR | SPFX_ATTK | SPFX_DEFN), 0, 0, 
       ELEC(5, 24), DFNS(AD_ELEC), NO_CARY, 0,
       A_NEUTRAL, PM_VALKYRIE, NON_PM, 5000L, NO_COLOR, DEFAULT_MAT),
+       
+    /* Attacks deal double damage, but at the cost of hallucination.
+     * This effect is only active while the user can see. */
+    A("Mystic Eyes", LENSES,
+      (SPFX_RESTR | SPFX_SEARCH), 0, 0,
+      NO_ATTK, DFNS(AD_DETH), NO_CARY, 0,
+      A_NEUTRAL, NON_PM, NON_PM, 2000L, NO_COLOR, GEMSTONE),
 
     A("Sword of Balance", SHORT_SWORD, 
       (SPFX_RESTR | SPFX_DALIGN | SPFX_DEFN), 0, 0,
@@ -307,7 +314,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
     A("Bat from Hell", BASEBALL_BAT,
       (SPFX_RESTR), 0, 0,
       PHYS(3, 20), NO_DFNS, NO_CARY, 0, 
-      A_CHAOTIC, PM_ROGUE, NON_PM, 5000L, CLR_RED, DEFAULT_MAT),
+      A_CHAOTIC, NON_PM, NON_PM, 5000L, CLR_RED, DEFAULT_MAT),
 
     /* Yeenoghu's infamous triple-headed flail. A massive weapon reputed to have been created
      * from the thighbone and torn flesh of an ancient god he slew. An extremely lethal artifact */
@@ -325,7 +332,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
 
     A("Deep Freeze", STAFF_OF_MATTER,
       (SPFX_RESTR | SPFX_ATTK | SPFX_DEFN), 0, 0,
-      COLD(5, 8), DFNS(AD_COLD), NO_CARY, SEFFECT, 
+      COLD(4, 4), DFNS(AD_COLD), NO_CARY, SEFFECT, 
       A_CHAOTIC, PM_ICE_MAGE, NON_PM, 400L, CLR_BLUE, METAL),
 
     /* From SporkHack, but with a twist. This is the anti-Excalibur. */
@@ -344,8 +351,8 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
       PHYS(5, 0), NO_DFNS, NO_CARY, 0, 
       A_CHAOTIC, NON_PM, PM_ORC, 300L, NO_COLOR, DEFAULT_MAT),
 
-  /* Warns when elves are present, but its damage bonus applies to all targets.
-   *      (handled as special case in spec_dbon()). */
+    /* Warns when elves are present, but its damage bonus applies to all targets.
+    *      (handled as special case in spec_dbon()). */
     A("Grimtooth", ORCISH_DAGGER,
       (SPFX_RESTR | SPFX_WARN | SPFX_DFLAGH | SPFX_DEFN), 0, MH_ELF, 
       DISE(5, 6), DFNS(AD_DISE), NO_CARY, 0, 
@@ -488,14 +495,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
       (SPFX_RESTR | SPFX_ATTK), 0, 0, 
       MAST(3, 3), NO_DFNS, NO_CARY, 0, 
       A_NONE, NON_PM, NON_PM, 1000L, NO_COLOR, SILVER),
-    
-    /* Attacks deal double damage, but at the cost of hallucination.
-    *      This effect is only active while the user can see. */
-    A("Mystic Eyes", LENSES,
-      (SPFX_RESTR | SPFX_SEARCH), 0, 0, 
-      NO_ATTK, NO_DFNS, NO_CARY, 0,
-      A_NONE, NON_PM, NON_PM, 2000L, NO_COLOR, GEMSTONE),
-
+      
     A("Ogresmasher", HEAVY_WAR_HAMMER,
       (SPFX_RESTR | SPFX_WARN | SPFX_DFLAGH), 0, MH_OGRE,
       PHYS(5, 0), NO_DFNS, NO_CARY, 0,
@@ -635,7 +635,7 @@ STATIC_OVL NEARDATA struct artifact artilist[] = {
       A_NEUTRAL, PM_BARBARIAN, NON_PM, 2500L, NO_COLOR, DEFAULT_MAT),
 #endif
 
-    A("The Sceptre of Might", ROD,
+    A("The Sceptre of Might", EXECUTIONER_S_MACE,
       (SPFX_NOGEN | SPFX_RESTR | SPFX_INTEL | SPFX_DALIGN), 0, 0, PHYS(5, 0),
       DFNS(AD_MAGM), NO_CARY, CONFLICT, 
       A_LAWFUL, PM_CAVEMAN, NON_PM, 2500L,
diff --git a/include/decl.h b/include/decl.h
index 4b9dd7123..b2eadc57e 100644
--- a/include/decl.h
+++ b/include/decl.h
@@ -281,6 +281,7 @@ E NEARDATA struct obj *invent, *uarm, *uarmc, *uarmh, *uarms, *uarmg, *uarmf,
 E NEARDATA struct obj *uchain; /* defined only when punished */
 E NEARDATA struct obj *uball;
 E NEARDATA struct obj *migrating_objs;
+E NEARDATA struct obj *mchest; /* magic chest */
 E NEARDATA struct obj *billobjs;
 E NEARDATA struct obj *current_wand, *thrownobj, *kickedobj;
 
diff --git a/include/dungeon.h b/include/dungeon.h
index 06ac28fdd..bca342b43 100644
--- a/include/dungeon.h
+++ b/include/dungeon.h
@@ -212,6 +212,7 @@ typedef struct mapseen {
     d_level lev;          /* corresponding dungeon level */
     struct mapseen_feat {
         /* feature knowledge that must be calculated from levl array */
+        Bitfield(nmagicchest, 2);
         Bitfield(nforge, 2);
         Bitfield(nfount, 2);
         Bitfield(nsink, 2);
diff --git a/include/extern.h b/include/extern.h
index 8b2454e92..4cbb92639 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -119,8 +119,8 @@ E void FDECL(Sting_effects_offhand, (int));
 E int FDECL(retouch_object, (struct obj **, BOOLEAN_P, BOOLEAN_P));
 E void FDECL(retouch_equipment, (int));
 E void NDECL(mkot_trap_warn);
-E boolean FDECL(is_magic_key, (struct monst *, struct obj *));
-E struct obj *FDECL(has_magic_key, (struct monst *));
+E boolean FDECL(is_roguish_key, (struct monst *, struct obj *));
+E struct obj *FDECL(has_roguish_key, (struct monst *));
 E boolean FDECL(wielding_artifact, (int));
 E boolean FDECL(wearing_artifact, (int));
 E struct obj *FDECL(using_oprop, (long));
@@ -2395,7 +2395,7 @@ E boolean FDECL(cant_revive, (int *, BOOLEAN_P, struct obj *));
 E boolean NDECL(create_particular);
 E int FDECL(mon_to_zombie, (int));
 E boolean maybe_process_scales(struct obj *, struct obj *);
-
+E void FDECL(handle_new_property, (struct obj *));
 /* ### rect.c ### */
 
 E void NDECL(init_rect);
@@ -2702,6 +2702,7 @@ E void FDECL(cast_reflection, (struct monst *));
 E int FDECL(spelleffects, (int, BOOLEAN_P, BOOLEAN_P));
 E int FDECL(tport_spell, (int));
 E void NDECL(losespells);
+E void NDECL(forget_spell);
 E int NDECL(dovspell);
 E void FDECL(initialspell, (struct obj *));
 E boolean NDECL(studyspell);
@@ -2711,6 +2712,8 @@ E boolean FDECL(force_learn_spell, (SHORT_P));
 E int NDECL (num_spells);
 E void NDECL(dump_spells);
 E void FDECL(cast_sphere, (short otyp));
+E void NDECL(spell_nag);
+E boolean NDECL(max_spells_learned);
 
 /* ### steal.c ### */
 
@@ -2764,6 +2767,7 @@ E void FDECL(learntech, (SHORT_P,long,int));
 E void NDECL(dump_techniques);
 E int FDECL(do_pickpocket, (struct monst *));
 E int FDECL(do_breakrock, (int, int));
+E int FDECL(dazzle_chance, (struct permonst *));
 
 /* ### teleport.c ### */
 
@@ -3410,7 +3414,8 @@ E void bomb_explode(struct obj *, int, int, boolean);
 E void FDECL(wandfear, (struct obj *));
 E int FDECL(freeze_tile, (struct rm *, int, int, int));
 E boolean destroyable_oclass(char);
-int FDECL(delugehitsm, (struct monst *, int));
+E int FDECL(delugehitsm, (struct monst *, int));
+E void FDECL(scatter_chains, (int, int));
 
 #endif /* !MAKEDEFS_C && !LEV_LEX_C */
 
diff --git a/include/hack.h b/include/hack.h
index 308226686..4115daa4f 100644
--- a/include/hack.h
+++ b/include/hack.h
@@ -112,7 +112,8 @@ enum cost_alteration_types {
     COST_CORRODE = 18, /* acid damage */
     COST_FRACTURE = 19,   /* glass damage */
     COST_DETERIORATE = 20, /* other material damage */
-    COST_FERMENT = 21  /* fermentation of potion into new potion */
+    COST_TRANSMOGRIFY = 21, /* transmogrify an object */
+    COST_FERMENT = 22  /* fermentation of potion into new potion */
 };
 
 /* bitmask flags for corpse_xname();
@@ -507,6 +508,15 @@ struct ForgeRecipe {
 
 extern const struct ForgeRecipe fusions[]; /* table of fusions */
 
+struct PotionRecipe {
+    short result_typ;
+    short typ1;
+    short typ2;
+    int chance;
+};
+
+extern const struct PotionRecipe potionrecipes[]; /* table of fusions */
+
 /* indices for some special tin types */
 #define ROTTEN_TIN 0
 #define HOMEMADE_TIN 1
diff --git a/include/mondata.h b/include/mondata.h
index 1fea8e427..5c86faa45 100644
--- a/include/mondata.h
+++ b/include/mondata.h
@@ -91,6 +91,25 @@
     ((ptr) == &mons[PM_HEZROU] \
      || (ptr) == &mons[PM_SKUNK])
 
+#define immune_mgc_scare(ptr) \
+     ((ptr)->mlet == S_HUMAN \
+     || (ptr)->mlet == S_ANGEL \
+     || is_mplayer(ptr) \
+     || is_rider(ptr) \
+     || mindless(ptr) \
+     || unique_corpstat(ptr) \
+     || (ptr) == &mons[PM_HONEY_BADGER]  \
+     || (ptr) == &mons[PM_WIZARD_OF_YENDOR]  \
+     || (ptr) == &mons[PM_NEOTHELID])
+
+#define disrespects_elbereth(ptr) \
+     ((ptr)->mlet == S_HUMAN      \
+     || unique_corpstat(ptr) \
+     || (ptr) == &mons[PM_MINOTAUR] \
+     || (ptr) == &mons[PM_ELDER_MINOTAUR]  \
+     || (ptr) == &mons[PM_GIANT_PRAYING_MANTIS]  \
+     || (ptr) == &mons[PM_NEOTHELID])
+
 #define non_tameable(ptr) \
     (unique_corpstat(ptr) \
      || ((ptr)->mflags3 & M3_WANTSARTI) \
@@ -269,7 +288,9 @@
 #define carnivorous(ptr) (((ptr)->mflags1 & M1_CARNIVORE) != 0L)
 #define herbivorous(ptr) (((ptr)->mflags1 & M1_HERBIVORE) != 0L)
 #define metallivorous(ptr) (((ptr)->mflags1 & M1_METALLIVORE) != 0L)
-#define is_gem_eater(ptr)  (((ptr)->mlet == S_DRAGON || ((ptr) == &mons[PM_XORN])) != 0L)
+#define is_gem_eater(ptr) \
+        ((((ptr)->mlet == S_DRAGON && !is_pseudodragon(ptr)) \
+        || ((ptr) == &mons[PM_XORN])) != 0L)
 #define inediate(ptr) (((ptr)->mflags1 & (M1_CARNIVORE | M1_HERBIVORE \
                                           | M1_METALLIVORE)) == 0L)
 #define polyok(ptr) (((ptr)->mflags2 & M2_NOPOLY) == 0L)
diff --git a/include/obj.h b/include/obj.h
index 1d42b7e6f..c9762f65d 100644
--- a/include/obj.h
+++ b/include/obj.h
@@ -70,7 +70,8 @@ struct obj {
 #define OBJ_MIGRATING 5 /* object sent off to another level */
 #define OBJ_BURIED 6    /* object buried */
 #define OBJ_ONBILL 7    /* object on shk bill */
-#define NOBJ_STATES 8
+#define OBJ_SOMEWHERE 8 /* for magic chest */
+#define NOBJ_STATES 9
 
 #define WP_MODE_AUTO	0	/* Max firing speed */
 #define WP_MODE_BURST	1	/* 1/3 of max rate */
@@ -365,8 +366,7 @@ struct obj {
 #define Is_container(o) ((o)->otyp == MEDICAL_KIT || \
                          ((o)->otyp >= LARGE_BOX && (o)->otyp <= BAG_OF_TRICKS))
 #define Is_nonprize_container(o) (Is_container(o) && !is_soko_prize_flag(o))
-#define Is_box(o) ((o)->otyp == LARGE_BOX || (o)->otyp == CHEST \
-                   || (o)->otyp == IRON_SAFE || (o)->otyp == CRYSTAL_CHEST)
+#define Is_box(o) ((o)->otyp >= LARGE_BOX && (o)->otyp <= HIDDEN_CHEST)
 #define Is_mbag(o) ((o)->otyp == BAG_OF_HOLDING \
                     || ((o)->otyp == BAG_OF_TRICKS && (o)->spe > 0) \
                     || ((o)->otyp == BAG_OF_RATS  && (o)->spe > 0))
@@ -598,8 +598,7 @@ struct obj {
 #define ITEM_SLEEP     0x00000080L /* sleep resistance */
 #define ITEM_FLEX      0x00000100L /* stoning resistance */
 #define ITEM_FILTH     0x00000200L /* sickness resistance */
-#define ITEM_TOUGH     0x00000400L /* disintegration res 
-                                    * Makes items erosionproof and indestructible */
+#define ITEM_TOUGH     0x00000400L /* Makes items erosionproof and indestructible */
 #define ITEM_OILSKIN   0x00000800L /* permanently greased */
 #define ITEM_ESP       0x00001000L /* telepathy */
 #define ITEM_SEARCH    0x00002000L /* searching */
@@ -635,11 +634,11 @@ struct obj {
 /* Positive properties */
 #define ITEM_GOOD_PROPS (ITEM_OILSKIN | ITEM_ESP | ITEM_SEARCH \
                          | ITEM_VIGIL | ITEM_EXCEL | ITEM_SUSTAIN \
-                         | ITEM_STEALTH | ITEM_INSIGHT | ITEM_BURDEN \
-                         | ITEM_SURF | ITEM_SWIM | ITEM_RAGE | ITEM_TOUGH)
+                         | ITEM_STEALTH | ITEM_INSIGHT | ITEM_SURF \
+                         | ITEM_SWIM | ITEM_RAGE | ITEM_TOUGH)
 /* Negative properties */
 #define ITEM_BAD_PROPS (ITEM_FUMBLE | ITEM_HUNGER | ITEM_STENCH \
-                        | ITEM_TELE | ITEM_SLOW | ITEM_DANGER)
+                        | ITEM_TELE | ITEM_SLOW | ITEM_DANGER | ITEM_BURDEN)
 
 #define NON_WEP_PROPS (ITEM_FLEX)
 #define ONLY_WEP_PROPS (ITEM_RAGE | ITEM_PROWESS)
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/include/prop.h b/include/prop.h
index ae62cee9d..2a9331dbc 100644
--- a/include/prop.h
+++ b/include/prop.h
@@ -103,9 +103,10 @@ enum prop_types {
     VULN_LOUD         = 83,
     BREATHLESS        = 84,
     STABLE            = 85,
-    MAGIC_SENSE       = 86
+    MAGIC_SENSE       = 86,
+    STOMPING          = 87,
 };
-#define LAST_PROP (MAGIC_SENSE)
+#define LAST_PROP (STOMPING)
 
 /*** Where the properties come from ***/
 /* Definitions were moved here from obj.h and you.h */
diff --git a/include/rm.h b/include/rm.h
index c26638230..e881a2cae 100644
--- a/include/rm.h
+++ b/include/rm.h
@@ -65,22 +65,23 @@ enum levl_typ_types {
     STAIRS    = 26,
     LADDER    = 27,
     FORGE     = 28,
-    FOUNTAIN  = 29,
-    VENT      = 30,
-    THRONE    = 31,
-    SINK      = 32,
-    TOILET    = 33,
-    GRAVE     = 34,
-    ALTAR     = 35,
-    ICE       = 36,
-    GRASS     = 37,
-    DRAWBRIDGE_DOWN = 38,
-    AIR       = 39,
-    CLOUD     = 40,
-    PUDDLE    = 41,
-    SEWAGE    = 42,
+    MAGIC_CHEST = 29,
+    FOUNTAIN  = 30,
+    VENT      = 31,
+    THRONE    = 32,
+    SINK      = 33,
+    TOILET    = 34,
+    GRAVE     = 35,
+    ALTAR     = 36,
+    ICE       = 37,
+    GRASS     = 38,
+    DRAWBRIDGE_DOWN = 39,
+    AIR       = 40,
+    CLOUD     = 41,
+    PUDDLE    = 42,
+    SEWAGE    = 43,
     
-    MAX_TYPE  = 43,
+    MAX_TYPE  = 44,
 
     INVALID_TYPE = 127
 };
@@ -106,6 +107,7 @@ enum levl_typ_types {
 #define IS_POOL(typ) ((typ) >= POOL && (typ) <= DRAWBRIDGE_UP)
 #define IS_THRONE(typ) ((typ) == THRONE)
 #define IS_FORGE(typ) ((typ) == FORGE)
+#define IS_MAGIC_CHEST(typ) ((typ) == MAGIC_CHEST)
 #define IS_FOUNTAIN(typ) ((typ) == FOUNTAIN)
 #define IS_VENT(typ) ((typ) == VENT)
 #define IS_SINK(typ) ((typ) == SINK)
@@ -164,93 +166,94 @@ enum screen_symbols {
     S_sink      = 31,
     S_toilet    = 32,
     S_forge     = 33,
-    S_fountain  = 34,
-    S_vent      = 35,
-    S_pool      = 36,
-    S_ice       = 37,
-    S_grass     = 38,
-    S_lava      = 39,
-    S_vodbridge = 40, /* open drawbridge, vertical wall */
-    S_hodbridge = 41, /* open drawbridge, horizontal wall */
-    S_vcdbridge = 42, /* closed drawbridge, vertical wall */
-    S_hcdbridge = 43, /* closed drawbridge, horizontal wall */
-    S_air       = 44,
-    S_cloud     = 45,
-    S_puddle    = 46,
-    S_sewage    = 47,
-    S_water     = 48,
-    
+    S_magic_chest = 34,
+    S_fountain  = 35,
+    S_vent      = 36,
+    S_pool      = 37,
+    S_ice       = 38,
+    S_grass     = 39,
+    S_lava      = 40,
+    S_vodbridge = 41, /* open drawbridge, vertical wall */
+    S_hodbridge = 42, /* open drawbridge, horizontal wall */
+    S_vcdbridge = 43, /* closed drawbridge, vertical wall */
+    S_hcdbridge = 44, /* closed drawbridge, horizontal wall */
+    S_air       = 45,
+    S_cloud     = 46,
+    S_puddle    = 47,
+    S_sewage    = 48,
+    S_water     = 49,
+
 /* end dungeon characters, begin traps */
 
-    S_arrow_trap           = 49,
-    S_bolt_trap            = 50,
-    S_dart_trap            = 51,
-    S_falling_rock_trap    = 52,
-    S_squeaky_board        = 53,
-    S_bear_trap            = 54,
-    S_land_mine            = 55,
-    S_rolling_boulder_trap = 56,
-    S_sleeping_gas_trap    = 57,
-    S_rust_trap            = 58,
-    S_fire_trap            = 59,
-    S_pit                  = 60,
-    S_spiked_pit           = 61,
-    S_hole                 = 62,
-    S_trap_door            = 63,
-    S_teleportation_trap   = 64,
-    S_level_teleporter     = 65,
-    S_magic_portal         = 66,
-    S_web                  = 67,
-    S_statue_trap          = 68,
-    S_magic_trap           = 69,
-    S_anti_magic_trap      = 70,
-    S_ice_trap             = 71,
-    S_polymorph_trap       = 72,
-    S_spear_trap           = 73,
-    S_magic_beam_trap      = 74,
-    S_vibrating_square     = 75, /* for display rather than any trap effect */
-                             
-                             /* end traps, begin special effects */
-
-    S_vbeam     = 76, /* The 4 zap beam symbols.  Do NOT separate. */
-    S_hbeam     = 77, /* To change order or add, see function      */
-    S_lslant    = 78, /* zapdir_to_glyph() in display.c.           */
-    S_rslant    = 79,
-    S_digbeam   = 80, /* dig beam symbol */
-    S_flashbeam = 81, /* camera flash symbol */
-    S_boomleft  = 82, /* thrown boomerang, open left, e.g ')'    */
-    S_boomright = 83, /* thrown boomerang, open right, e.g. '('  */
-    S_ss1       = 84, /* 4 magic shield ("resistance sparkle") glyphs */
-    S_ss2       = 85,
-    S_ss3       = 86,
-    S_ss4       = 87,
-    S_poisoncloud = 88,
-    S_goodpos   = 89, /* valid position for targeting via getpos() */
+    S_arrow_trap           = 50,
+    S_bolt_trap            = 51,
+    S_dart_trap            = 52,
+    S_falling_rock_trap    = 53,
+    S_squeaky_board        = 54,
+    S_bear_trap            = 55,
+    S_land_mine            = 56,
+    S_rolling_boulder_trap = 57,
+    S_sleeping_gas_trap    = 58,
+    S_rust_trap            = 59,
+    S_fire_trap            = 60,
+    S_pit                  = 61,
+    S_spiked_pit           = 62,
+    S_hole                 = 63,
+    S_trap_door            = 64,
+    S_teleportation_trap   = 65,
+    S_level_teleporter     = 66,
+    S_magic_portal         = 67,
+    S_web                  = 68,
+    S_statue_trap          = 69,
+    S_magic_trap           = 70,
+    S_anti_magic_trap      = 71,
+    S_ice_trap             = 72,
+    S_polymorph_trap       = 73,
+    S_spear_trap           = 74,
+    S_magic_beam_trap      = 75,
+    S_vibrating_square     = 76, /* for display rather than any trap effect */
+
+    /* end traps, begin special effects */
+
+    S_vbeam     = 77, /* The 4 zap beam symbols.  Do NOT separate. */
+    S_hbeam     = 78, /* To change order or add, see function      */
+    S_lslant    = 79, /* zapdir_to_glyph() in display.c.           */
+    S_rslant    = 80,
+    S_digbeam   = 81, /* dig beam symbol */
+    S_flashbeam = 82, /* camera flash symbol */
+    S_boomleft  = 83, /* thrown boomerang, open left, e.g ')'    */
+    S_boomright = 84, /* thrown boomerang, open right, e.g. '('  */
+    S_ss1       = 85, /* 4 magic shield ("resistance sparkle") glyphs */
+    S_ss2       = 86,
+    S_ss3       = 87,
+    S_ss4       = 88,
+    S_poisoncloud = 89,
+    S_goodpos   = 90, /* valid position for targeting via getpos() */
 
     /* The 8 swallow symbols.  Do NOT separate.  To change order or add, */
     /* see the function swallow_to_glyph() in display.c.                 */
-    S_sw_tl     = 90, /* swallow top left [1]             */
-    S_sw_tc     = 91, /* swallow top center [2]    Order: */
-    S_sw_tr     = 92, /* swallow top right [3]            */
-    S_sw_ml     = 93, /* swallow middle left [4]   1 2 3  */
-    S_sw_mr     = 94, /* swallow middle right [6]  4 5 6  */
-    S_sw_bl     = 95, /* swallow bottom left [7]   7 8 9  */
-    S_sw_bc     = 96, /* swallow bottom center [8]        */
-    S_sw_br     = 97, /* swallow bottom right [9]         */
-
-    S_explode1  = 98, /* explosion top left               */
-    S_explode2  = 99, /* explosion top center             */
-    S_explode3  = 100, /* explosion top right        Ex.   */
-    S_explode4  = 101, /* explosion middle left            */
-    S_explode5  = 102, /* explosion middle center    /-\   */
-    S_explode6  = 103, /* explosion middle right     |@|   */
-    S_explode7  = 104, /* explosion bottom left      \-/   */
-    S_explode8  = 105, /* explosion bottom center          */
-    S_explode9  = 106, /* explosion bottom right           */
+    S_sw_tl     = 91, /* swallow top left [1]             */
+    S_sw_tc     = 92, /* swallow top center [2]    Order: */
+    S_sw_tr     = 93, /* swallow top right [3]            */
+    S_sw_ml     = 94, /* swallow middle left [4]   1 2 3  */
+    S_sw_mr     = 95, /* swallow middle right [6]  4 5 6  */
+    S_sw_bl     = 96, /* swallow bottom left [7]   7 8 9  */
+    S_sw_bc     = 97, /* swallow bottom center [8]        */
+    S_sw_br     = 98, /* swallow bottom right [9]         */
+
+    S_explode1  = 99, /* explosion top left               */
+    S_explode2  = 100, /* explosion top center             */
+    S_explode3  = 101, /* explosion top right        Ex.   */
+    S_explode4  = 102, /* explosion middle left            */
+    S_explode5  = 103, /* explosion middle center    /-\   */
+    S_explode6  = 104, /* explosion middle right     |@|   */
+    S_explode7  = 105, /* explosion bottom left      \-/   */
+    S_explode8  = 106, /* explosion bottom center          */
+    S_explode9  = 107, /* explosion bottom right           */
 
     /* end effects */
 
-    MAXPCHARS   = 107  /* maximum number of mapped characters */
+    MAXPCHARS   = 108  /* maximum number of mapped characters */
 
 
 };
@@ -605,6 +608,7 @@ struct levelflags {
     uchar nsinks;     /* number of sinks on the level */
     uchar ntoilets;     /* number of toilets on the level */
     uchar nforges;    /* number of forges on the level */
+    uchar nmagicchests; /* number of magic chests on the level */
     /* Several flags that give hints about what's on the level */
     Bitfield(has_shop, 1);
     Bitfield(has_vault, 1);
diff --git a/include/skills.h b/include/skills.h
index c15f03de7..4974c2269 100644
--- a/include/skills.h
+++ b/include/skills.h
@@ -82,14 +82,11 @@ enum p_skills {
 #define P_FIRST_H_TO_H P_BARE_HANDED_COMBAT
 
 /* These roles qualify for a martial arts bonus */
-#define martial_bonus() (Role_if(PM_SAMURAI) \
-                         || Role_if(PM_MONK) \
-                         || Role_if(PM_JEDI) \
-                         || Role_if(PM_UNDEAD_SLAYER))
+#define martial_bonus() (Role_if(PM_SAMURAI) || Role_if(PM_MONK))
 
 /*
  * These are the standard weapon skill levels.  It is important that
- * the lowest "valid" skill be be 1.  The code calculates the
+ * the lowest "valid" skill be 1.  The code calculates the
  * previous amount to practice by calling  practice_needed_to_advance()
  * with the current skill-1.  To work out for the UNSKILLED case,
  * a value of 0 needed.
@@ -110,7 +107,17 @@ enum skill_levels {
     P_GRAND_MASTER = 6  /* ditto */
 };
 
-#define practice_needed_to_advance(level) ((level) * (level) *20)
+/**
+ * To reach the specified skill level:
+ * P_UNSKILLED       0
+ * P_BASIC         100
+ * P_SKILLED       200
+ * P_EXPERT        400
+ * P_MASTER        800
+ * P_GRAND_MASTER 1600
+ */
+#define practice_needed_to_advance(level) (level == 0 ? 0 \
+                                           : (1 << (level-1)) * 100)
 
 /* The hero's skill in various weapons. */
 struct skills {
diff --git a/include/sp_lev.h b/include/sp_lev.h
index a9a55d758..50ed90683 100644
--- a/include/sp_lev.h
+++ b/include/sp_lev.h
@@ -71,6 +71,7 @@ enum opcode_defs {
     SPO_LADDER,
     SPO_ALTAR,
     SPO_FORGE,
+    SPO_MAGIC_CHEST,
     SPO_FOUNTAIN,
     SPO_VENT,
     SPO_SINK,
diff --git a/include/tech.h b/include/tech.h
index a9b84331e..076b53f8d 100644
--- a/include/tech.h
+++ b/include/tech.h
@@ -43,65 +43,63 @@ struct blitz_tab {
 };
 
 
-#define NO_TECH 	0
-#define T_BERSERK 	1
-#define T_KIII 		2
-#define T_RESEARCH 	3
-#define T_SURGERY 	4
-#define T_REINFORCE 	5
-#define T_FLURRY 	6
-#define T_PRACTICE 	7
-#define T_EVISCERATE 	8
-#define T_HEAL_HANDS 	9
-#define T_CALM_STEED 	10
-#define T_TURN_UNDEAD 	11
-#define T_VANISH 	12
-#define T_CUTTHROAT 	13
-#define T_BLESSING 	14
-#define T_E_FIST 	15
-#define T_PRIMAL_ROAR 	16
-#define T_LIQUID_LEAP 	17
-#define T_CRIT_STRIKE 	18
-#define T_RAISE_ZOMBIES 19
-#define T_REVIVE 	20
-#define T_TINKER 	21
-#define T_RAGE	 	22
-#define T_BLINK	 	23
-#define T_CHI_STRIKE 	24
-#define T_DRAW_ENERGY 	25
-#define T_CHI_HEALING 	26
-#define T_DISARM 	27
-#define T_DAZZLE 	28
-#define T_BLITZ 	29
-#define T_PUMMEL 	30
-#define T_G_SLAM 	31
-#define T_DASH	 	32
-#define T_POWER_SURGE 	33
-#define T_SPIRIT_BOMB 	34
-#define T_DRAW_BLOOD	35
-/* Added by Slash'EM Extended */
-#define T_WORLD_FALL	36
-#define T_CREATE_AMMO	37
-#define T_APPRAISAL	38
-#define T_BOOZE		39
-/* Added by SlashTHEM */
-#define T_SOULEATER 	40
-#define T_POWER_SHIELD  41
-#define T_JEDI_JUMP	42
-#define T_CHARGE_SABER	43
-#define T_TELEKINESIS	44
+#define NO_TECH 	        0
+#define T_BERSERK 	        1
+#define T_KIII 		        2
+#define T_RESEARCH 	        3
+#define T_SURGERY 	        4
+#define T_REINFORCE 	    5
+#define T_FLURRY 	        6
+#define T_PRACTICE 	        7
+#define T_EVISCERATE 	    8
+#define T_HEAL_HANDS 	    9
+#define T_CALM_STEED 	    10
+#define T_TURN_UNDEAD 	    11
+#define T_VANISH 	        12
+#define T_CUTTHROAT 	    13
+#define T_BLESSING 	        14
+#define T_E_FIST 	        15
+#define T_PRIMAL_ROAR 	    16
+#define T_LIQUID_LEAP 	    17
+#define T_CRIT_STRIKE 	    18
+#define T_RAISE_ZOMBIES     19
+#define T_REVIVE 	        20
+#define T_TINKER 	        21
+#define T_RAGE	 	        22
+#define T_BLINK	 	        23
+#define T_CHI_STRIKE 	    24
+#define T_DRAW_ENERGY 	    25
+#define T_CHI_HEALING 	    26
+#define T_DISARM 	        27
+#define T_DAZZLE 	        28
+#define T_BLITZ 	        29
+#define T_PUMMEL 	        30
+#define T_G_SLAM 	        31
+#define T_DASH	 	        32
+#define T_POWER_SURGE 	    33
+#define T_SPIRIT_BOMB 	    34
+#define T_DRAW_BLOOD	    35
+#define T_WORLD_FALL	    36
+#define T_CREATE_AMMO	    37
+#define T_APPRAISAL	        38
+#define T_BOOZE		        39
+#define T_SOULEATER 	    40
+#define T_POWER_SHIELD      41
+#define T_JEDI_JUMP	        42
+#define T_CHARGE_SABER	    43
+#define T_TELEKINESIS	    44
 #define T_WHISTLE_UNDEAD	45
-#define T_SPIRIT_TEMPEST 46
-#define T_FORCE_PUSH    47
-#define T_CURSE         48
-#define T_PICKPOCKET    49
-#define T_TUMBLE        50
-#define T_SUNDER        51
-#define T_BLOOD_MAGIC   52
-#define T_BREAK_ROCK    53
-#define T_UPPERCUT      54
-#define T_ICEARMOR      55
+#define T_SPIRIT_TEMPEST    46
+#define T_FORCE_PUSH        47
+#define T_CURSE             48
+#define T_PICKPOCKET        49
+#define T_TUMBLE            50
+#define T_SUNDER            51
+#define T_BLOOD_MAGIC       52
+#define T_BREAK_ROCK        53
+#define T_UPPERCUT          54
+#define T_ICEARMOR          55
 
-#define MAXTECH 56
+#define MAXTECH             56
 
 #endif /* TECH_H */
diff --git a/include/you.h b/include/you.h
index 8e1e7e8dc..36f197055 100644
--- a/include/you.h
+++ b/include/you.h
@@ -324,12 +324,14 @@ struct you {
     char ushops_entered[5]; /* ditto, shops entered this turn */
     char ushops_left[5];    /* ditto, shops exited this turn */
 
-    int uhunger;  /* refd only in eat.c and shk.c */
-    unsigned uhs; /* hunger state - see eat.c */
-    boolean ukinghill; /* records if you are carying the pirate treasure
-    (and are therefor king of the hill) */
-    int protean; /* counter for the auto-polypiling power of the chest*/
-    boolean utimestop; /* Counter for scroll of time */
+    int uhunger;            /* refd only in eat.c and shk.c */
+    unsigned uhs;           /* hunger state - see eat.c */
+    boolean ukinghill;      /* records if you are carrying the pirate treasure
+                             * (and are therefor king of the hill) */
+    int protean;            /* counter for the auto-polypiling power of the chest*/
+    boolean utimestop;      /* Counter for scroll of time */
+    boolean uacted;         /* Tracks if the player did something 
+                             * other than wait or search */
     struct prop uprops[LAST_PROP + 1];
 
     unsigned umconf;
diff --git a/include/youprop.h b/include/youprop.h
index f5c82b46d..0eb398a1d 100644
--- a/include/youprop.h
+++ b/include/youprop.h
@@ -22,6 +22,9 @@
 
 #define maybe_polyd(if_so, if_not) (Upolyd ? (if_so) : (if_not))
 
+#define Uevil_inherently (u.ualign.type == A_NONE \
+                          || Race_if(PM_VAMPIRIC))
+
 /*** Resistances to troubles ***/
 /* With intrinsics and extrinsics */
 #define HFire_resistance u.uprops[FIRE_RES].intrinsic
@@ -276,7 +279,7 @@
 
 #define HStealth u.uprops[STEALTH].intrinsic
 #define EStealth u.uprops[STEALTH].extrinsic
-#define BStealth u.uprops[STEALTH].blocked
+#define BStealth (u.uprops[STEALTH].blocked || Stomping)
 #define Stealth ((HStealth || EStealth) && !BStealth)
 
 #define HAggravate_monster u.uprops[AGGRAVATE_MONSTER].intrinsic
@@ -493,6 +496,8 @@
 
 #define Lifesaved u.uprops[LIFESAVED].extrinsic
 
+#define EStomping u.uprops[STOMPING].extrinsic
+#define Stomping (EStomping && !Levitation)
 /*
  * Some pseudo-properties.
  */
diff --git a/src/allmain.c b/src/allmain.c
index 96dc9b5cc..180c30d9e 100644
--- a/src/allmain.c
+++ b/src/allmain.c
@@ -18,8 +18,9 @@ STATIC_DCL void NDECL(do_positionbar);
 STATIC_DCL void FDECL(regen_hp, (int));
 STATIC_DCL void FDECL(interrupt_multi, (const char *));
 STATIC_DCL void FDECL(debug_fields, (const char *));
+STATIC_DCL void NDECL(init_mchest);
 STATIC_DCL void NDECL(pickup_spirits);
-
+STATIC_DCL void NDECL(update_monclock);
 
 #ifdef EXTRAINFO_FN
 static long prev_dgl_extrainfo = 0;
@@ -158,8 +159,6 @@ boolean resuming;
     struct obj *pobj, *aobj;
     int moveamt = 0, wtcap = 0, change = 0;
     /* don't make it obvious when monsters will start speeding up */
-    int timeout_start = rnd(10000) + 25000;
-    int past_clock;
     boolean monscanmove = FALSE;
     boolean elf_regen = elf_can_regen();
     boolean orc_regen = orc_can_regen();
@@ -205,6 +204,7 @@ boolean resuming;
            clairvoyance (wizard with cornuthaum perhaps?); without this,
            first "random" occurrence would always kick in on turn 1 */
         context.seer_turn = (long) rnd(30);
+        init_mchest();
         u.umovement = NORMAL_SPEED;  /* giants and tortles put their best foot forward */
     }
     context.botlx = TRUE; /* for STATUS_HILITES */
@@ -256,10 +256,11 @@ boolean resuming;
                             break; /* it's now your turn */
                     } while (monscanmove);
                     context.mon_moving = FALSE;
-                } else if (youmonst.movement < NORMAL_SPEED) {
+                } else if (u.umovement < NORMAL_SPEED) {
                     /* If a scroll of time has been read, we want the player's
                      * current turn to be extended. */
                     u.utimestop = FALSE;
+                    continue;
                 }
                 if (!monscanmove && u.umovement < NORMAL_SPEED) {
                     /* both hero and monsters are out of steam this round */
@@ -273,57 +274,9 @@ boolean resuming;
                        been purged at end of their previous round of moving */
                     for (mtmp = fmon; mtmp; mtmp = mtmp->nmon)
                         mtmp->movement += mcalcmove(mtmp);
-
-                    /* From SporkHack & UnNetHack (modified)
-                     * Vanilla generates a critter every 70-ish turns.
-                     * The rate accelerates to every 50 or so below the Castle,
-                     * and 'round every 25 turns once you've done the Invocation.
-                     * 
-                     * (From EvilHack)
-                     * We will push it even further.  Monsters post-Invocation
-                     * will almost always appear on the stairs (if present), and
-                     * much more frequently; this, along with the extra intervene()
-                     * calls, should certainly make it seem like you're wading back
-                     * through the teeming hordes.
-                     *
-                     * Aside from that, a more general clock should be put on things;
-                     * after about 50,000 turns, the frequency rate of appearance
-                     * and difficulty of monsters generated will slowly increase until
-                     * it reaches the point it will be at as if you were post-Invocation.
-                     *
-                     * The rate increases linearly with turns.  The rule of thumb is that
-                     * at turn x the rate is approximately (x / 30.0000) times the normal
-                     * rate.  Maximal rate is 8x the normal rate.
-                     * -------------------------------------------------------------------
-                     * In Hack'EM - we are going to put Yet Another Twist on monster generation
-                     * and use it to "punish" wishes. For every wish the player makes, the 
-                     * rate will increase! This lets the player have their wishes at the cost
-                     * of a harder game later.
-                     */
-                    monclock = MIN_MONGEN_RATE;
-                    /* Don't let wishes influence the fuzzer */
-                    if (!iflags.debug_fuzzer) {
-                        past_clock = moves - timeout_start;
-                        if (past_clock > 0)
-                            monclock = MIN_MONGEN_RATE * TURN_THRESHOLD / (past_clock + TURN_THRESHOLD);
-                        if (monclock > MIN_MONGEN_RATE / 2 && (u.uconduct.wishes >= 2L))
-                            monclock = MIN_MONGEN_RATE / 2;
-                        if (monclock > MIN_MONGEN_RATE / 3 && (u.uconduct.wishes >= 3L))
-                            monclock = MIN_MONGEN_RATE / 3;
-                        if (monclock > MIN_MONGEN_RATE / 4 && (u.uconduct.wishes >= 4L))
-                            monclock = MIN_MONGEN_RATE / 4;
-                        if (monclock > MIN_MONGEN_RATE / 5 && (u.uconduct.wishes >= 5L))
-                            monclock = MIN_MONGEN_RATE / 5;
-                        if (monclock > MIN_MONGEN_RATE / 6 && (u.uconduct.wishes >= 6L))
-                            monclock = MIN_MONGEN_RATE / 6;
-                        if (u.uconduct.wishes >= 7L)
-                            monclock = MAX_MONGEN_RATE;
-                    }
-		            /* make sure we don't fall off the bottom */
-                    if (monclock < MAX_MONGEN_RATE)
-                        monclock = MAX_MONGEN_RATE;
-                    if (monclock > MIN_MONGEN_RATE)
-                        monclock = MIN_MONGEN_RATE;
+                    
+                    /* Handle monster spawn rates */
+                    update_monclock();
 
                     if (!rn2(monclock)) {
                         if (u.uevent.invoked && xupstair && rn2(10))
@@ -879,6 +832,15 @@ boolean resuming;
 
 #define U_CAN_REGEN() (Regeneration || (Sleepy && u.usleep))
 
+STATIC_OVL void
+init_mchest()
+{
+    mchest = mksobj(HIDDEN_CHEST, FALSE, FALSE);
+    mchest->olocked = 1;
+    mchest->where = OBJ_SOMEWHERE;
+    return;
+}
+
 /* maybe recover some lost health (or lose some when an eel out of water) */
 STATIC_OVL void
 regen_hp(wtcap)
@@ -1439,24 +1401,18 @@ wishluck()
     /* Don't let this affect the fuzzer */
     if (iflags.debug_fuzzer)
         return 0;
-    switch (u.uconduct.wishes) {
-    case 2:
-        return -1;
-    case 3:
-        return -2;
-    case 5:
-        return -3;
-    case 7:
-        return -4;
-    case 11:
-        return -5;
-    }
+    if (u.uconduct.wishes < 2)
+        return 0;
+    
+    /* For synchronizing monster spawn rates with wishes */
+    update_monclock();
+    
     /* Technically we can only get the player to -10, 
      * so we force them to carry a virtual cursed luckstone. */
-    if (u.uconduct.wishes >= 13)
+    if (u.uconduct.wishes < 13)
+        return -(u.uconduct.wishes);
+    else
         return -10;
-
-    return 0;
 }
 
 STATIC_OVL void
@@ -1492,6 +1448,53 @@ pickup_spirits()
             }
         }
     }
+}
 
+STATIC_OVL void 
+update_monclock()
+{
+    /* From SporkHack & UnNetHack (modified)
+     * Vanilla generates a critter every 70-ish turns.
+     * The rate accelerates to every 50 or so below the Castle,
+     * and 'round every 25 turns once you've done the Invocation.
+     * 
+     * (From EvilHack)
+     * We will push it even further.  Monsters post-Invocation
+     * will almost always appear on the stairs (if present), and
+     * much more frequently; this, along with the extra intervene()
+     * calls, should certainly make it seem like you're wading back
+     * through the teeming hordes.
+     *
+     * Aside from that, a more general clock should be put on things;
+     * after about 50,000 turns, the frequency rate of appearance
+     * and difficulty of monsters generated will slowly increase until
+     * it reaches the point it will be at as if you were post-Invocation.
+     *
+     * The rate increases linearly with turns.  The rule of thumb is that
+     * at turn x the rate is approximately (x / 30.0000) times the normal
+     * rate.  Maximal rate is 8x the normal rate.
+     * -------------------------------------------------------------------
+     * In Hack'EM - we are going to put Yet Another Twist on monster generation
+     * and use it to "punish" wishes. For every wish the player makes, the 
+     * rate will increase! This lets the player have their wishes at the cost
+     * of a harder game later.
+     */
+    monclock = MIN_MONGEN_RATE;
+/* Don't let wishes influence the fuzzer */
+    if (!iflags.debug_fuzzer) {
+        for (long i = 2; i <= 7; i++) {
+            if (monclock > MIN_MONGEN_RATE / i && (u.uconduct.wishes >= i)) {
+                monclock = MIN_MONGEN_RATE / i;
+            }
+        }
+        if (u.uconduct.wishes >= 8L) {
+            monclock = MAX_MONGEN_RATE;
+        }
+    }
+    /* make sure we don't fall off the bottom */
+    if (monclock < MAX_MONGEN_RATE)
+        monclock = MAX_MONGEN_RATE;
+    if (monclock > MIN_MONGEN_RATE)
+        monclock = MIN_MONGEN_RATE;
 }
 /*allmain.c*/
diff --git a/src/apply.c b/src/apply.c
index 04d5abf7c..c09f8051e 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -2062,7 +2062,7 @@ int magic; /* 0=Physical, otherwise skill level */
     cc.y = u.uy;
     jumping_is_magic = magic;
     getpos_sethilite(display_jump_positions, get_valid_jump_position);
-    if (getpos(&cc, TRUE, "the desired position") < 0)
+    if (getpos(&cc, FALSE, "the desired position") < 0)
         return 0; /* user pressed ESC */
     if (!is_valid_jump_pos(cc.x, cc.y, magic, TRUE)) {
         return 0;
@@ -4272,7 +4272,7 @@ boolean autohit;
     }
     if (!autohit) {
         getpos_sethilite(display_polearm_positions, get_valid_polearm_position);
-        if (getpos(&cc, TRUE, "the spot to hit") < 0)
+        if (getpos(&cc, FALSE, "the spot to hit") < 0)
             return res; /* ESC; uses turn iff polearm became wielded */
     }
 
@@ -4487,7 +4487,7 @@ struct obj *obj;
     pline(where_to_hit);
     cc.x = u.ux;
     cc.y = u.uy;
-    if (getpos(&cc, TRUE, "the spot to hit") < 0)
+    if (getpos(&cc, FALSE, "the spot to hit") < 0)
         return res; /* ESC; uses turn iff grapnel became wielded */
 
     /* Calculate range; unlike use_pole(), there's no minimum for range */
@@ -5069,6 +5069,7 @@ doapply()
     case OILSKIN_SACK:
     case IRON_SAFE:
     case CRYSTAL_CHEST:
+    case HIDDEN_CHEST: /* just in case */
         res = use_container(&obj, 1, FALSE);
         break;
     case BAG_OF_TRICKS:
@@ -5081,6 +5082,7 @@ doapply()
     case LOCK_PICK:
     case CREDIT_CARD:
     case SKELETON_KEY:
+    case MAGIC_KEY:
         res = (pick_lock(obj, 0, 0, NULL) != 0);
         break;
     case PICK_AXE:
diff --git a/src/artifact.c b/src/artifact.c
index 182aef52d..9e0b07e3a 100644
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -320,6 +320,12 @@ aligntyp alignment; /* target alignment, or A_NONE */
                 if (exist_artifact(SCR_MAGIC_MAPPING, artiname(ART_MARAUDER_S_MAP)))
                     return (struct obj *) 0;
                 continue; /* pirates are not gifted artifacts */
+            } else if (by_align && Role_if(PM_INFIDEL)) {
+                obfree(otmp, (struct obj *) 0);
+                /* No further gifts for Infidels! */
+                if (exist_artifact(KNIFE, artiname(ART_SECESPITA)))
+                    return (struct obj *) 0;
+                continue;
             }
             /* found something to consider for random selection */
             if (a->alignment != A_NONE || u.ugifts > 0) {
@@ -468,6 +474,10 @@ boolean allow_detrimental;
               && (j & ONLY_WEP_PROPS))
             continue;
         
+        /* Burden doesn't really affect ring weight much */
+        if (otmp->oclass == RING_CLASS && j & ITEM_BURDEN)
+            continue;
+        
         if ((otmp->oprops & ITEM_RES_PROPS) && (j & ITEM_RES_PROPS))
             continue; /* these are mutually exclusive */
 
@@ -2278,7 +2288,7 @@ int dieroll; /* needed for Magicbane and vorpal blades */
             /* currently the only object that uses this
                is Grimtooth */
             pline_The("filthy %s %s %s%c",
-                      otmp->oartifact ? artiname(otmp->oartifact) : "weapon",
+                      otmp->oartifact ? artiname(otmp->oartifact) : (is_ammo(otmp) ? xname(otmp) : "weapon"),
                       no_sick ? "hits"
                               : rn2(2) ? "contaminates" : "infects",
                       hittee, !spec_dbon_applies ? '.' : '!');
@@ -3911,9 +3921,11 @@ struct obj *obj;
             } while (summon_loop);
             
             /* Tsk,tsk.. */
-            You_feel("guilty.");
-            adjalign(-3);
-            change_luck(-3);
+            if (!Role_if(PM_NECROMANCER)) {
+                You_feel("guilty.");
+                adjalign(-3);
+                change_luck(-3);
+            }
             break;
         }
         case DEATH_GAZE:
@@ -3983,7 +3995,7 @@ struct obj *obj;
             }
             
             /* Use at your own risk... */
-            if (u.ualign.type != A_NONE) {
+            if (!Uevil_inherently) {
                 if (u.ualign.type == A_LAWFUL) {
                     You_feel("very guilty.");
                     adjalign(-7);
@@ -4752,7 +4764,7 @@ mkot_trap_warn()
 /* Master Key is magic key if its bless/curse state meets our criteria:
    not cursed for rogues or blessed for non-rogues */
 boolean
-is_magic_key(mon, obj)
+is_roguish_key(mon, obj)
 struct monst *mon; /* if null, non-rogue is assumed */
 struct obj *obj;
 {
@@ -4768,7 +4780,7 @@ struct obj *obj;
 
 /* figure out whether 'mon' (usually youmonst) is carrying the magic key */
 struct obj *
-has_magic_key(mon)
+has_roguish_key(mon)
 struct monst *mon; /* if null, hero assumed */
 {
     struct obj *o;
@@ -4778,7 +4790,7 @@ struct monst *mon; /* if null, hero assumed */
         mon = &youmonst;
     for (o = ((mon == &youmonst) ? invent : mon->minvent); o;
          o = nxtobj(o, key, FALSE)) {
-        if (is_magic_key(mon, o))
+        if (is_roguish_key(mon, o))
             return o;
     }
     return (struct obj *) 0;
@@ -5199,6 +5211,8 @@ boolean defend;
         return "blinding";
     case AD_STUN:
         return defend ? "stun" : "stuns/magic";
+    case AD_DETH:
+        return "death";
     case AD_DREN:
         return "drain energy";
     case AD_WTHR:
diff --git a/src/bones.c b/src/bones.c
index 6720ab6eb..6911ac202 100644
--- a/src/bones.c
+++ b/src/bones.c
@@ -216,6 +216,10 @@ boolean restore;
                 /* "special prize" in this game becomes ordinary object
                    if loaded into another game */
                 otmp->record_achieve_special = NON_PM;
+            } else if (otmp->otyp == MAGIC_KEY) {
+                /* magic key becomes a regular key */
+                otmp->otyp = SKELETON_KEY;
+                set_material(otmp, BONE);
             } else if (otmp->otyp == AMULET_OF_YENDOR) {
                 /* no longer the real Amulet */
                 otmp->otyp = FAKE_AMULET_OF_YENDOR;
diff --git a/src/cmd.c b/src/cmd.c
index e98b02f5e..17c7dbd39 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1441,7 +1441,9 @@ wiz_map_levltyp(VOID_ARGS)
         if (level.flags.nforges)
             Sprintf(eos(dsc), " %c:%d", defsyms[S_forge].sym,
                     (int) level.flags.nforges);
-        
+        if (level.flags.nmagicchests)
+            Sprintf(eos(dsc), " %c:%d", defsyms[S_magic_chest].sym,
+                    (int) level.flags.nmagicchests);
         if (level.flags.has_vault)
             Strcat(dsc, " vault");
         if (level.flags.has_shop)
@@ -1561,6 +1563,7 @@ static const char *levltyp[] = {
     "stairs",
     "ladder",
     "forge",
+    "magic chest",
     "fountain",
     "vent",
     "throne",
@@ -3315,7 +3318,7 @@ int final;
     }
 
     if (monclock > 0) {
-        Sprintf(buf, "%2.2fx", (float) MIN_MONGEN_RATE / monclock);
+        Sprintf(buf, "%2.0fx", (float) MIN_MONGEN_RATE / monclock);
         enl_msg("Monster generation rate ", "is ", "was ", buf, "");
     }
 
@@ -3532,6 +3535,8 @@ int final;
         you_are("displaced", from_what(DISPLACED));
     if (Stealth)
         you_are("stealthy", from_what(STEALTH));
+    if (Stomping)
+        you_are("stomping around", from_what(STOMPING));
     if (Aggravate_monster)
         enl_msg("You aggravate", "", "d", " monsters",
                 from_what(AGGRAVATE_MONSTER));
@@ -3951,6 +3956,14 @@ int final;
     if (!u.uconduct.gnostic)
         you_have_been("an atheist");
 
+    if (!u.ugifts)
+        you_have_never("received any gifts");
+    else {
+        Sprintf(buf, "recieved %d gift%s", u.ugifts,
+                (u.ugifts > 1L) ? "es" : "");
+        you_have_X(buf);
+    }
+
     if (!u.uconduct.weaphit) {
         you_have_never("hit with a wielded weapon");
     } else if (wizard) {
@@ -4024,7 +4037,7 @@ int final;
     if (!u.uconduct.artitouch) {
         you_have_never("touched an artifact");
     }
-
+    
     if (!u.uconduct.wishes) {
         you_have_X("used no wishes");
     } else {
@@ -4056,7 +4069,7 @@ int final;
             enl_msg(You_, "have not wished", "did not wish",
                     " for any artifacts", "");
     }
-
+    
     if (!u.uconduct.pets)
        you_have_never("owned a pet");
     
@@ -5048,6 +5061,10 @@ wiz_show_stats()
               &total_obj_count, &total_obj_size);
     obj_chain(win, "migrating obj", migrating_objs, FALSE,
               &total_obj_count, &total_obj_size);
+    /* just showing mchest isn't very informative.
+       mchest items are not counted as "contained" later */
+    obj_chain(win, "magic chest contents", mchest->cobj, FALSE,
+              &total_obj_count, &total_obj_size);
     obj_chain(win, "billobjs", billobjs, FALSE,
               &total_obj_count, &total_obj_size);
     mon_invent_chain(win, "minvent", fmon, &total_obj_count, &total_obj_size);
@@ -6445,6 +6462,9 @@ boolean doit;
     if (IS_FORGE(typ)) {
         add_herecmd_menuitem(win, dodrink, "Really drink the lava from the forge?");
     }
+    if (IS_MAGIC_CHEST(typ)) {
+        add_herecmd_menuitem(win, doloot, "Loot magic chest");
+    }
     if (IS_FOUNTAIN(typ) || IS_FORGE(typ)) {
         Sprintf(buf, "Dip something into the %s",
                 defsyms[IS_FOUNTAIN(typ) ? S_fountain : S_forge].explanation);
@@ -6575,13 +6595,15 @@ int x, y, mod;
             /* here */
             if (IS_FOUNTAIN(levl[u.ux][u.uy].typ)
                 || IS_SINK(levl[u.ux][u.uy].typ)
-                || IS_TOILET(levl[u.ux][u.uy].typ)
-                || IS_FORGE(levl[u.ux][u.uy].typ)) {
+                || IS_TOILET(levl[u.ux][u.uy].typ)) {
                 cmd[0] = cmd_from_func(mod == CLICK_1 ? dodrink : dodip);
                 return cmd;
             } else if (IS_FORGE(levl[u.ux][u.uy].typ)) {
                 cmd[0] = cmd_from_func(mod == CLICK_1 ? doforging : dodip);
                 return cmd;
+            } else if (IS_MAGIC_CHEST(levl[u.ux][u.uy].typ)) {
+                cmd[0] = cmd_from_func(doloot);
+                return cmd;
             } else if (IS_THRONE(levl[u.ux][u.uy].typ)) {
                 cmd[0] = cmd_from_func(dosit);
                 return cmd;
diff --git a/src/decl.c b/src/decl.c
index 317bc1412..813425829 100644
--- a/src/decl.c
+++ b/src/decl.c
@@ -209,6 +209,8 @@ NEARDATA long wailmsg = 0L;
 
 /* objects that are moving to another dungeon level */
 NEARDATA struct obj *migrating_objs = (struct obj *) 0;
+/* magic chest */
+NEARDATA struct obj *mchest = (struct obj *) 0;
 /* objects not yet paid for */
 NEARDATA struct obj *billobjs = (struct obj *) 0;
 
diff --git a/src/detect.c b/src/detect.c
index 0877dcdb8..65707842c 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -1554,7 +1554,7 @@ struct obj **optr;
         return;
     }
     You("peer into %s...", the(xname(obj)));
-    nomul(-rnd(10));
+    nomul(-rnd(Free_action ? 2 : 10));
     multi_reason = "gazing into a crystal ball";
     nomovemsg = "";
     if (obj->spe <= 0) {
@@ -2176,6 +2176,7 @@ register int aflag; /* intrinsic autosearch vs explicit searching */
 int
 dosearch()
 {
+    u.uacted = FALSE;
     return dosearch0(0);
 }
 
diff --git a/src/dig.c b/src/dig.c
index 0d5bb00c3..fa8c1d06a 100644
--- a/src/dig.c
+++ b/src/dig.c
@@ -207,6 +207,9 @@ int x, y;
         if (verbose)
             pline_The("altar is too hard to break apart.");
         return FALSE;
+    } else if (IS_MAGIC_CHEST(levl[x][y].typ)) {
+        pline_The("magic chest is unaffected.");
+        return FALSE;
     } else if (Is_airlevel(&u.uz)) {
         if (verbose)
             You("cannot %s thin air.", verb);
@@ -616,6 +619,8 @@ int ttyp;
     } else if (IS_FORGE(lev->typ)) {
         breakforge(x, y);
         return;
+    } else if (IS_MAGIC_CHEST(lev->typ)) {
+        return;
     } else if (lev->typ == DRAWBRIDGE_DOWN
                || (is_drawbridge_wall(x, y) >= 0)) {
         int bx = x, by = y;
@@ -910,6 +915,9 @@ coord *cc;
     } else if (IS_ALTAR(old_typ)) {
         pline_The("altar is too hard to break apart.");
 
+    } else if (IS_MAGIC_CHEST(old_typ)) {
+        pline_The("magic chest is unaffected.");
+
     } else {
         typ = fillholetyp(dig_x, dig_y, FALSE);
 
@@ -1816,6 +1824,8 @@ char *msg;
         else if (ltyp == DRAWBRIDGE_DOWN   /* "lowered drawbridge" */
                  || ltyp == DBWALL)        /* "raised drawbridge" */
             supporting = "drawbridge";
+        else if (IS_MAGIC_CHEST(ltyp))
+            supporting = "magic chest";
 
         if (supporting) {
             Sprintf(msg, "The %s%ssupporting structures remain intact.",
diff --git a/src/display.c b/src/display.c
index 5cee47bd5..b2fcfb100 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1812,6 +1812,9 @@ xchar x, y;
     case FORGE:
         idx = S_forge;
         break;
+    case MAGIC_CHEST:
+        idx = S_magic_chest;
+        break;
     case FOUNTAIN:
         idx = S_fountain;
         break;
@@ -2182,6 +2185,7 @@ static const char *type_names[MAX_TYPE] = {
     "STAIRS",
     "LADDER",
     "FORGE",
+    "MAGIC_CHEST",
     "FOUNTAIN",
     "VENT",
     "THRONE",
diff --git a/src/do.c b/src/do.c
index 73705ab41..7dcb0f45b 100644
--- a/src/do.c
+++ b/src/do.c
@@ -218,8 +218,7 @@ const char *verb;
                         /* normally we'd use ohitmon() but it can call
                            drop_throw() which calls flooreffects() */
                         damage = dmgval(obj, mtmp);
-                        mtmp->mhp -= damage;
-                        if (DEADMONSTER(mtmp)) {
+                        if (damage_mon(mtmp, damage, AD_PHYS)) {
                             if (canspotmon(mtmp))
                                 pline("%s is %s!", Monnam(mtmp),
                                       (nonliving(mtmp->data)
@@ -2617,6 +2616,7 @@ long timeout;
 int
 donull()
 {
+    u.uacted = FALSE;
     return 1; /* Do nothing, but let other things happen */
 }
 
diff --git a/src/do_wear.c b/src/do_wear.c
index 28bacc4cf..fd9dba37c 100644
--- a/src/do_wear.c
+++ b/src/do_wear.c
@@ -240,8 +240,6 @@ long mask;
         }
         EFearless |= mask;
     }
-    if (props & ITEM_TOUGH)
-        EDisint_resistance |= mask;
     if (props & ITEM_OILSKIN) {
         pline("%s very tightly.", Tobjnam(otmp, "fit"));
         otmp->oprops_known |= ITEM_OILSKIN;
@@ -292,6 +290,10 @@ long mask;
                   xname(otmp), rn2(2) ? "as large as you" : "of your stature");
             otmp->oprops_known |= ITEM_STEALTH;
             EStealth &= ~mask;
+        } else if (Stomping) {
+            pline("This %s will not silence your stomping!", xname(otmp));
+            otmp->oprops_known |= ITEM_STEALTH;
+            EStealth &= ~mask;
         } else
             toggle_stealth(otmp, (EStealth & ~mask), TRUE);
     }
@@ -347,8 +349,6 @@ long mask;
         EInfravision &= ~mask;
     if (props & ITEM_RAGE)
         EFearless &= ~mask;
-    if (props & ITEM_TOUGH)
-        EDisint_resistance &= ~mask;
     if (props & ITEM_OILSKIN)
         otmp->oprops_known |= ITEM_OILSKIN;
     if (props & ITEM_ESP) {
@@ -452,7 +452,7 @@ Boots_on(VOID_ARGS)
         }
         break;
     case STOMPING_BOOTS:
-        if (!Stealth && !Levitation && !Flying) {
+        if (Stomping && !Flying) {
             You("begin stomping around very loudly.");
             makeknown(uarmf->otyp);
         }
@@ -463,6 +463,10 @@ Boots_on(VOID_ARGS)
                   xname(uarmf), rn2(2) ? "as large as you" : "of your stature");
             makeknown(uarmf->otyp);
             EStealth &= ~W_ARMF;
+        } else if (Stomping) {
+            pline("This %s will not silence your stomping!", xname(uarmf));
+            makeknown(uarmf->otyp);
+            EStealth &= ~W_ARMF;
         } else {
             toggle_stealth(uarmf, oldprop, TRUE);
         }
@@ -530,7 +534,7 @@ Boots_off(VOID_ARGS)
         }
         break;
     case STOMPING_BOOTS:
-        if (!Stealth && !Levitation && !Flying) {
+        if (!Levitation && !Flying) {
             Your("footsteps become considerably less violent.");
             makeknown(otyp);
         }
@@ -1825,6 +1829,10 @@ register struct obj *obj;
                   xname(obj), rn2(2) ? "as large as you" : "of your stature");
             learnring(obj, TRUE);
             EStealth &= ~W_RING;
+        } else if (Stomping) {
+            pline("This %s will not silence your stomping!", xname(obj));
+            learnring(obj, TRUE);
+            EStealth &= ~W_RING;
         } else {
             toggle_stealth(obj, oldprop, TRUE);
         }
@@ -2068,6 +2076,8 @@ struct obj *otmp;
             pline("With madness comes clarity.");
             post_hallucination();
         }
+        if (ublindf)
+            curse(ublindf);
     }
 
     if (ublindf && ublindf->otyp == MASK)
diff --git a/src/dokick.c b/src/dokick.c
index 60e6efcd9..bdff9f82d 100644
--- a/src/dokick.c
+++ b/src/dokick.c
@@ -836,6 +836,8 @@ const char *kickobjnam;
         what = "a toilet";        
     else if (IS_FORGE(maploc->typ))
         what = "a forge";
+    else if (IS_MAGIC_CHEST(maploc->typ))
+        what = "a magic chest";
     else if (IS_ALTAR(maploc->typ))
         what = "an altar";
     else if (IS_DRAWBRIDGE(maploc->typ))
@@ -1211,6 +1213,12 @@ boolean need_dir;
             exercise(A_DEX, TRUE);
             return 1;
         }
+        if (IS_MAGIC_CHEST(maploc->typ)) {
+            if (Levitation)
+                goto dumb;
+            pline("THUNK!"); /* same sound effect as other chests */
+            goto ouch;       /* but these are much sturdier */
+        }
         if (IS_GRAVE(maploc->typ)) {
             if (Levitation)
                 goto dumb;
diff --git a/src/dothrow.c b/src/dothrow.c
index 9c4a3e265..bf1ced39f 100644
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -180,6 +180,10 @@ int shotlimit;
             if (obj->otyp == YA && uwep && uwep->otyp == YUMI)
                 multishot++;
             break;
+        case PM_BARBARIAN:
+            if (obj->otyp == THROWING_AXE)
+                multishot++;
+            break;
         default:
             break; /* No bonus */
         }
@@ -776,8 +780,7 @@ int x, y;
         ) {
         const char *mnam, *pronoun;
         int glyph = glyph_at(x, y);
-        boolean stomping = (uarmf && uarmf->otyp == STOMPING_BOOTS 
-                            && mon->data->msize <= MZ_SMALL);
+        boolean stomping = (Stomping && mon->data->msize <= MZ_SMALL);
 
 
         mon->mundetected = 0; /* wakeup() will handle mimic */
@@ -2112,6 +2115,8 @@ register struct obj *obj; /* thrownobj or kickedobj or uwep */
     if (racial_orc(mon)
         && maybe_polyd(is_elf(youmonst.data), Race_if(PM_ELF)))
         tmp++;
+    if (Role_if(PM_BARBARIAN) && obj->otyp == THROWING_AXE)
+        tmp += 3;
     if (guaranteed_hit) {
         tmp += 1000; /* Guaranteed hit */
     }
diff --git a/src/drawing.c b/src/drawing.c
index 570f0e28c..559ec4724 100644
--- a/src/drawing.c
+++ b/src/drawing.c
@@ -175,8 +175,9 @@ const struct symdef defsyms[MAXPCHARS] = {
        { '|', "grave", C(CLR_WHITE) },               /* grave */
 /*30*/ { '\\', "opulent throne", C(HI_GOLD) },       /* throne */
        { '#', "sink", C(CLR_GRAY) },                 /* sink */
-       { '#', "toilet", C(CLR_WHITE) },               /* toilet */
+       { '#', "toilet", C(CLR_YELLOW) },             /* toilet */
        { '{', "forge", C(CLR_ORANGE) },              /* forge */
+       { '(', "magic chest", C(CLR_BRIGHT_MAGENTA) },/* magic chest */
        { '{', "fountain", C(CLR_BRIGHT_BLUE) },      /* fountain */
        { '#', "vent", C(CLR_BRIGHT_CYAN) },          /* vent */
        { '}', "water", C(CLR_BLUE) },                /* pool */
@@ -689,6 +690,7 @@ struct symparse loadsyms[] = {
     { SYM_PCHAR, S_sink, "S_sink" },
     { SYM_PCHAR, S_toilet, "S_toilet" },
     { SYM_PCHAR, S_forge, "S_forge" },
+    { SYM_PCHAR, S_magic_chest, "S_magic_chest" },
     { SYM_PCHAR, S_fountain, "S_fountain" },
     { SYM_PCHAR, S_vent, "S_vent" },
     { SYM_PCHAR, S_pool, "S_pool" },
diff --git a/src/dungeon.c b/src/dungeon.c
index 61866cee9..5c841b62f 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1678,9 +1678,14 @@ level_difficulty()
              */
 #endif /*0*/
     }
-    if ((uamul && uamul->otyp == AMULET_OF_DANGER)
-          || using_oprop(ITEM_DANGER))
+    if ((uamul && uamul->otyp == AMULET_OF_DANGER) || using_oprop(ITEM_DANGER)) {
         res += 15;
+    }
+    /* Wishes increase difficulty (unless fuzzing) */
+    if (u.uconduct.wishes > 1 && !iflags.debug_fuzzer) {
+        int bump = (u.uconduct.wishes - 1) * 2;
+        res += (bump > 20) ? 20 : bump;
+    }
     return (xchar) res;
 }
 
@@ -2371,9 +2376,19 @@ d_level *lev;
 }
 
 #define INTEREST(feat)                                                   \
-    ((feat).nfount || (feat).nsink || (feat).nthrone || (feat).naltar    \
-     || (feat).ngrave || (feat).ntree || (feat).nshop || (feat).ntemple  \
-     || (feat).nforge || (feat).ntoilet || (feat).nvent || (feat).ndeadtree)
+    ((feat).nfount \
+    || (feat).nsink \
+    || (feat).nthrone \
+    || (feat).naltar \
+    || (feat).ngrave  \
+    || (feat).ntree \
+    || (feat).nshop \
+    || (feat).ntemple \
+    || (feat).nforge \
+    || (feat).nmagicchest \
+    || (feat).ntoilet \
+    || (feat).nvent \
+    || (feat).ndeadtree)
   /* || (feat).water || (feat).ice || (feat).lava */
 
 /* returns true if this level has something interesting to print out */
@@ -2605,6 +2620,11 @@ recalc_mapseen()
                 if (count <= 3)
                     mptr->feat.nforge = count;
                 break;
+            case MAGIC_CHEST:
+                count = mptr->feat.nmagicchest + 1;
+                if (count <= 3)
+                    mptr->feat.nmagicchest = count;
+                break;
             case GRAVE:
                 count = mptr->feat.ngrave + 1;
                 if (count <= 3)
@@ -3068,6 +3088,7 @@ boolean printdun;
         }
         ADDNTOBUF("throne", mptr->feat.nthrone);
         ADDNTOBUF("forge", mptr->feat.nforge);
+        ADDNTOBUF("magic chest", mptr->feat.nmagicchest);
         ADDNTOBUF("fountain", mptr->feat.nfount);
         ADDNTOBUF("sink", mptr->feat.nsink);
         ADDNTOBUF("toilet", mptr->feat.ntoilet);
diff --git a/src/eat.c b/src/eat.c
index 7713f7f9d..cf8bc8e3b 100644
--- a/src/eat.c
+++ b/src/eat.c
@@ -54,7 +54,8 @@ char msgbuf[BUFSZ];
 /* non-rotting non-corpses; unlike lizard corpses, these items will behave
    as if rotten if they are cursed (fortune cookies handled elsewhere) */
 #define nonrotting_food(otyp) \
-    ((otyp) == LEMBAS_WAFER || (otyp) == CRAM_RATION)
+    ((otyp) == LEMBAS_WAFER || (otyp) == CRAM_RATION \
+    || (otyp) == EUCALYPTUS_LEAF)
 
 STATIC_OVL NEARDATA const char comestibles[] = { FOOD_CLASS, 0 };
 STATIC_OVL NEARDATA const char offerfodder[] = { FOOD_CLASS, AMULET_CLASS,
@@ -1219,9 +1220,70 @@ int pm;
             }
         }
         break;
-    case PM_WRAITH:
-        pluslvl(FALSE);
-        break;
+        case PM_WRAITH:
+            if (Role_if(PM_NECROMANCER)) {
+                /* Necros have the perk of vanilla wraith behavior! */
+                pluslvl(FALSE);
+                break;
+            }
+            switch(rnd(10)) {
+                case 1:
+                    You("feel that was a bad idea.");
+                    losexp("eating a wraith corpse");
+                    break;
+                case 2:
+                    You("don't feel so good ...");
+                    if (Upolyd) {
+                        u.mhmax -= 4;
+                        if (u.mhmax < 1)
+                            u.mhmax = 1;
+                    } else {
+                        u.uhpmax -= 4;
+                        if (u.uhpmax < 1)
+                            u.uhpmax = 1;
+                    }
+                    u.uenmax -= 8;
+                    if (u.uenmax < 1)
+                        u.uenmax = 1;
+                    u.uen -= 8;
+                    if (u.uen < 0)
+                        u.uen = 0;
+                    losehp(4, "eating a wraith corpse", KILLED_BY);
+                    break;
+                case 3:
+                case 4:
+                    You("feel something strange for a moment.");
+                    break;
+                case 5:
+                    You("feel physically and mentally stronger!");
+                    if (Upolyd) {
+                        u.mhmax += 4;
+                        u.mh = u.mhmax;
+                    } else {
+                        u.uhpmax += 4;
+                        u.uhp = u.uhpmax;
+                    }
+                    u.uenmax += 8;
+                    u.uen = u.uenmax;
+                    break;
+                case 6:
+                case 7:
+                case 8:
+                case 9:
+                case 10:
+                    You("feel that was a smart thing to do.");
+                    pluslvl(FALSE);
+                    break;
+                default:
+                    break;
+            }
+            if (Role_if(PM_UNDEAD_SLAYER)) {
+                /* Unbecoming of Undead Slayers  */
+                You("have disgraced your profession.");
+                adjalign(-5);
+                break;
+            }
+            break;
     case PM_HUMAN_WERERAT:
         catch_lycanthropy = PM_WERERAT;
         break;
diff --git a/src/fountain.c b/src/fountain.c
index fe28c3c34..5c76d507d 100644
--- a/src/fountain.c
+++ b/src/fountain.c
@@ -434,8 +434,13 @@ const struct ForgeRecipe fusions[] = {
     { PARAZONIUM,           DAGGER, KNIFE,              1, 1 },
     { GREAT_DAGGER,         PARAZONIUM, KNIFE,          1, 1 },
     { KNIFE,                ARROW, DART,                2, 2 },
+    { KNIFE,                ELVEN_ARROW, DART,          2, 2 },
+    { KNIFE,                ORCISH_ARROW, DART,         2, 2 },
     { STILETTO,             CROSSBOW_BOLT, KNIFE,       2, 1 },
     { SCALPEL,              KNIFE, STILETTO,            1, 1 },
+    { AKLYS,                ORCISH_SPEAR, FLAIL,        1, 1 },
+    { AKLYS,                DWARVISH_SPEAR, FLAIL,      1, 1 },
+    { AKLYS,                ELVEN_SPEAR, FLAIL,         1, 1 },
     { AKLYS,                SPEAR, FLAIL,               1, 1 },
     { SHURIKEN,             DART, DAGGER,               2, 1 },
     { CHAKRAM,              BOOMERANG, SHURIKEN,        1, 1 },
@@ -454,11 +459,11 @@ const struct ForgeRecipe fusions[] = {
     { BATTLE_AXE,           AXE, AXE,                   1, 1 },
     { DWARVISH_MATTOCK,     PICK_AXE, DWARVISH_SHORT_SWORD, 1, 1 },
     
-    { SHORT_SWORD,          CROSSBOW_BOLT, DAGGER,      2, 1 },
-    { ELVEN_SHORT_SWORD,    CROSSBOW_BOLT, ELVEN_DAGGER, 2, 1 },
+    { SHORT_SWORD,          CROSSBOW_BOLT, DAGGER,        2, 1 },
+    { ELVEN_SHORT_SWORD,    CROSSBOW_BOLT, ELVEN_DAGGER,  2, 1 },
     { ORCISH_SHORT_SWORD,   CROSSBOW_BOLT, ORCISH_DAGGER, 2, 1 },
-    { DWARVISH_SHORT_SWORD, DWARVISH_SPEAR, SHORT_SWORD, 1, 1 },
-    { GLADIUS, BROADSWORD,  SHORT_SWORD,                1, 1 },
+    { DWARVISH_SHORT_SWORD, DWARVISH_SPEAR, SHORT_SWORD,  1, 1 },
+    { GLADIUS,              BROADSWORD,  SHORT_SWORD,     1, 1 },
         
     { SCIMITAR,             KNIFE, SHORT_SWORD,         1, 1 },
     { ORCISH_SCIMITAR,      KNIFE, ORCISH_SHORT_SWORD,  1, 1 },
@@ -471,9 +476,9 @@ const struct ForgeRecipe fusions[] = {
     { RUNESWORD,            BROADSWORD, DAGGER,         1, 1 },
     
     { LONG_SWORD,           SHORT_SWORD, SHORT_SWORD,   1, 1 },
-    { ELVEN_LONG_SWORD,     ELVEN_SHORT_SWORD, ELVEN_SHORT_SWORD, 1, 1 },
+    { ELVEN_LONG_SWORD,     ELVEN_SHORT_SWORD, ELVEN_SHORT_SWORD,   1, 1 },
     { ORCISH_LONG_SWORD,    ORCISH_SHORT_SWORD, ORCISH_SHORT_SWORD, 1, 1 },
-    { KATANA, LONG_SWORD,   LONG_SWORD,                 1, 1 },
+    { KATANA,               LONG_SWORD, LONG_SWORD,                 1, 1 },
     
     { TWO_HANDED_SWORD,     LONG_SWORD, BROADSWORD,     1, 1 },
     { TSURUGI,              TWO_HANDED_SWORD, KATANA,   1, 1 },
@@ -481,15 +486,14 @@ const struct ForgeRecipe fusions[] = {
     { MACE,                 WAR_HAMMER, DAGGER,         1, 1 },
     { HEAVY_MACE,           MACE, MACE,                 1, 1 },
     { ROD,                  RUBY, MACE,                 2, 1 },
-    { EXECUTIONER_S_MACE,   HEAVY_MACE, MACE,           1, 1 },
+    { EXECUTIONER_S_MACE,   HEAVY_MACE, SPIKED_CHAIN,   1, 1 },
     
     { MORNING_STAR,         MACE, DAGGER,               1, 1 },
     { ORCISH_MORNING_STAR,  MACE, ORCISH_DAGGER,        1, 1 },
     { WAR_HAMMER,           MACE, FLAIL,                1, 1 },
     { HEAVY_WAR_HAMMER,     WAR_HAMMER, WAR_HAMMER,     1, 1 },
     { FLAIL,                MACE, MORNING_STAR,         1, 1 },
-    { TRIPLE_HEADED_FLAIL,  FLAIL, SPIKED_CHAIN,        1, 1 },
-    { SPIKED_CHAIN,         IRON_CHAIN, SHURIKEN,       1, 2 },
+    { SPIKED_CHAIN,         IRON_CHAIN, SHURIKEN,       1, 18 },
     
     { LANCE,                JAVELIN, GLAIVE,            1, 1 },
     { PARTISAN,             SPEAR, BROADSWORD,          1, 1 },
@@ -557,10 +561,11 @@ const struct ForgeRecipe fusions[] = {
     /* barding for steeds */
     { BARDING,              PLATE_MAIL, SADDLE,         1, 1 },
     { SPIKED_BARDING,       BARDING, MORNING_STAR,      1, 1 },
-    { BARDING_OF_REFLECTION, BARDING, SHIELD_OF_REFLECTION, 1, 1 },
+    { BARDING_OF_REFLECTION,BARDING, SHIELD_OF_REFLECTION, 1, 1 },
 
     /* sling bullets */
-    { SLING_BULLET, ROCK, DART, 3, 1 },
+    { SLING_BULLET,         ROCK, DART, 3, 1 },
+    { SLING_BULLET,         ROCK, FLINT, 2, 1 },
     { 0, 0, 0, 0, 0 }
 };
 
diff --git a/src/hack.c b/src/hack.c
index ddc406e16..076dacc2f 100644
--- a/src/hack.c
+++ b/src/hack.c
@@ -1873,6 +1873,8 @@ domove_core()
                3.7: used to say "solid rock" for STONE, but that made it be
                different from unmapped walls outside of rooms (and was wrong
                on arboreal levels) */
+            if (levl[x][y].seenv && IS_MAGIC_CHEST(levl[x][y].typ))
+                Strcpy(buf, "thin air"); /* acts like a chest object would */
             if (levl[x][y].seenv || IS_STWALL(levl[x][y].typ)
                 || levl[x][y].typ == SDOOR || levl[x][y].typ == SCORR) {
                 glyph = back_to_glyph(x, y);
@@ -1890,6 +1892,21 @@ domove_core()
             && weapon_type(uwep) == P_BARE_HANDED_COMBAT && Role_if(PM_MONK)) {
             do_breakrock(x, y);
             return;
+        } else if (levl[x][y].typ == IRONBARS
+            && ((levl[x][y].wall_info & W_NONDIGGABLE) == 0)
+            && weapon_type(uwep) == P_BARE_HANDED_COMBAT 
+            && uarmg && uarmg->otyp == GAUNTLETS_OF_FORCE) {
+            levl[bhitpos.x][bhitpos.y].typ = ROOM;
+            if (cansee(bhitpos.x, bhitpos.y)) {
+                Your("%s destroy the iron bars!", xname(uarmg));
+                makeknown_msg(uarmg->otyp);
+                
+            } else if (!Deaf)
+                You_hear("a lot of loud clanging sounds!");
+            scatter_chains(x, y);
+            wake_nearto(bhitpos.x, bhitpos.y, 20 * 20);
+            newsym(bhitpos.x, bhitpos.y);
+            return;
         } else {
             You("%s%s %s.",
                 !(boulder || solid) ? "" : !explo ? "harmlessly " : "futilely ",
@@ -2204,7 +2221,7 @@ domove_core()
                 if (rn2(4)) {
                     You_feel("guilty about losing your pet like this.");
                     u.ugangr++;
-                    if (u.ualign.type == A_NONE)
+                    if (Uevil_inherently)
                         adjalign(-3);
                     else
                         adjalign(-15);
@@ -2751,6 +2768,12 @@ boolean pick;
         killer.format = NO_KILLER_PREFIX;
         done(DIED);
     }
+    if (IS_MAGIC_CHEST(levl[u.ux][u.uy].typ) && !Levitation) {
+        if (!Blind)
+            You("see here a magic chest.");
+        else
+            You("feel here a magic chest.");
+    }
  spotdone:
     if (!--inspoteffects) {
         spotterrain = STONE; /* 0 */
@@ -3196,6 +3219,8 @@ pickup_checks()
             pline("It won't come off the hinges.");
         else if (IS_ALTAR(lev->typ))
             pline("Moving the altar would be a very bad idea.");
+        else if (IS_MAGIC_CHEST(lev->typ))
+            pline_The("chest is bolted down!");   /* from dnethack */
         else if (lev->typ == STAIRS)
             pline_The("stairs are solidly fixed to the %s.",
                       surface(u.ux, u.uy));
diff --git a/src/invent.c b/src/invent.c
index 65dd0c6d6..040f92eda 100644
--- a/src/invent.c
+++ b/src/invent.c
@@ -3624,6 +3624,8 @@ char *buf;
         cmap = S_toilet;  /* "toilet" */
     else if (IS_FORGE(ltyp))
         cmap = S_forge; /* "forge" */
+    else if (IS_MAGIC_CHEST(ltyp))
+        cmap = S_magic_chest; /* "magic chest" */
     else if (IS_ALTAR(ltyp)) {
         Sprintf(altbuf, "%saltar to %s (%s)",
                 ((lev->altarmask & AM_SHRINE)
@@ -3658,6 +3660,13 @@ char *buf;
 
     if (cmap >= 0)
         dfeature = defsyms[cmap].explanation;
+    if (cmap == S_magic_chest) {
+        dfeature = doname(mchest); /* hack to show lock status */
+        if (!strncmpi(dfeature, "an ", 3))
+            dfeature += 3;
+        else
+            dfeature += 2;
+    }
     if (dfeature)
         Strcpy(buf, dfeature);
     return dfeature;
@@ -3767,7 +3776,7 @@ boolean picked_some;
         }
     }
     if (!otmp || is_lava(u.ux, u.uy)
-        || (is_pool(u.ux, u.uy) && !Underwater)) {
+        || ((is_pool(u.ux, u.uy) && !Underwater))) {
         if (dfeature)
             pline1(fbuf);
         read_engr_at(u.ux, u.uy); /* Eric Backus */
diff --git a/src/lock.c b/src/lock.c
index 4fc6caddd..dc684de96 100644
--- a/src/lock.c
+++ b/src/lock.c
@@ -50,19 +50,22 @@ lock_action()
 {
     /* "unlocking"+2 == "locking" */
     static const char *actions[] = {
-        "unlocking the door",   /* [0] */
-        "unlocking the chest",  /* [1] */
-        "unlocking the box",    /* [2] */
-        "cracking the safe",    /* [3] */
-        "picking the lock"      /* [4] */
+        "unlocking the door",         /* [0] */
+        "unlocking the chest",        /* [1] */
+        "unlocking the box",          /* [2] */
+        "cracking the safe",          /* [3] */
+        "picking the lock",           /* [4] */
+        "unlocking the magic chest"   /* [5] */
     };
 
     /* if the target is currently unlocked, we're trying to lock it now */
     if (xlock.door && !(xlock.door->doormask & D_LOCKED))
         return actions[0] + 2; /* "locking the door" */
     else if (xlock.box && !xlock.box->olocked)
-        return xlock.box->otyp == CHEST ? actions[1] + 2 : xlock.box->otyp == IRON_SAFE
-                   ? actions[3] + 2 : actions[2] + 2;
+        return xlock.box->otyp == CHEST
+                   ? actions[1] + 2 : xlock.box->otyp == IRON_SAFE
+                       ? actions[3] + 2 : xlock.box->otyp == HIDDEN_CHEST
+                           ? actions[5] + 2 : actions[2] + 2;
     /* otherwise we're trying to unlock it */
     else if (xlock.picktyp == LOCK_PICK)
         return actions[4]; /* "picking the lock" */
@@ -71,8 +74,10 @@ lock_action()
     else if (xlock.door)
         return actions[0]; /* "unlocking the door" */
     else if (xlock.box)
-        return xlock.box->otyp == CHEST ? actions[1] : xlock.box->otyp == IRON_SAFE
-                   ? actions[3] : actions[2];
+        return xlock.box->otyp == CHEST
+                   ? actions[1] : xlock.box->otyp == IRON_SAFE
+                       ? actions[3] : xlock.box->otyp == HIDDEN_CHEST
+                           ? actions[5] : actions[2];
     else
         return actions[3];
 }
@@ -399,12 +404,13 @@ struct obj *
 autokey(opening)
 boolean opening; /* True: key, pick, or card; False: key or pick */
 {
-    struct obj *o, *key, *pick, *card, *akey, *apick, *acard;
+    struct obj *o, *key, *mkey, *pick, *card,
+               *akey, *amkey, *apick, *acard;
 
     /* mundane item or regular artifact or own role's quest artifact */
-    key = pick = card = (struct obj *) 0;
+    key = mkey = pick = card = (struct obj *) 0;
     /* other role's quest artifact (Rogue's Key or Tourist's Credit Card) */
-    akey = apick = acard = (struct obj *) 0;
+    akey = amkey = apick = acard = (struct obj *) 0;
     for (o = invent; o; o = o->nobj) {
         if (any_quest_artifact(o) && !is_quest_artifact(o)) {
             switch (o->otyp) {
@@ -412,6 +418,10 @@ boolean opening; /* True: key, pick, or card; False: key or pick */
                 if (!akey)
                     akey = o;
                 break;
+            case MAGIC_KEY:
+                if (!amkey)
+                    amkey = o;
+                break;
             case LOCK_PICK:
                 if (!apick)
                     apick = o;
@@ -426,9 +436,13 @@ boolean opening; /* True: key, pick, or card; False: key or pick */
         } else {
             switch (o->otyp) {
             case SKELETON_KEY:
-                if (!key || is_magic_key(&youmonst, o))
+                if (!key || is_roguish_key(&youmonst, o))
                     key = o;
                 break;
+            case MAGIC_KEY:
+                if (!mkey)
+                    mkey = o;
+                break;
             case LOCK_PICK:
                 if (!pick)
                     pick = o;
@@ -445,13 +459,18 @@ boolean opening; /* True: key, pick, or card; False: key or pick */
     if (!opening)
         card = acard = 0;
     /* only resort to other role's quest artifact if no other choice */
+    if (!key && !mkey && !pick && !card)
+        mkey = amkey;
+    /* rogues favor MKoT for its untrapping */
+    if (is_roguish_key(&youmonst, key) && Role_if(PM_ROGUE))
+        mkey = key;
     if (!key && !pick && !card)
         key = akey;
     if (!pick && !card)
         pick = apick;
     if (!card)
         card = acard;
-    return key ? key : pick ? pick : card ? card : 0;
+    return mkey ? mkey : key ? key : pick ? pick : card ? card : 0;
 }
 
 /* for doapply(); if player gives a direction or resumes an interrupted
@@ -501,7 +520,7 @@ struct obj *container; /* container, for autounlock */
             const char *action = lock_action();
 
             You("resume your attempt at %s.", action);
-            xlock.magic_key = is_magic_key(&youmonst, pick);
+            xlock.magic_key = is_roguish_key(&youmonst, pick);
             set_occupation(picklock, action, 0);
             return PICKLOCK_DID_SOMETHING;
         }
@@ -523,7 +542,8 @@ struct obj *container; /* container, for autounlock */
     if (picktyp != LOCK_PICK
         && picktyp != STETHOSCOPE
         && picktyp != CREDIT_CARD
-        && picktyp != SKELETON_KEY) {
+        && picktyp != SKELETON_KEY
+        && picktyp != MAGIC_KEY) {
         impossible("picking lock with object %d?", picktyp);
         return PICKLOCK_DID_NOTHING;
     }
@@ -563,7 +583,8 @@ struct obj *container; /* container, for autounlock */
 
         count = 0;
         c = 'n'; /* in case there are no boxes here */
-        for (otmp = level.objects[cc.x][cc.y]; otmp; otmp = otmp->nexthere)
+        otmp = IS_MAGIC_CHEST(levl[cc.x][cc.y].typ) ? mchest : level.objects[cc.x][cc.y];
+        while (otmp) {
             /* autounlock on boxes: only the one that just informed you it was
              * locked. Don't include any other boxes which might be here. */
             if ((!autounlock && Is_box(otmp)) || (otmp == container)) {
@@ -602,8 +623,10 @@ struct obj *container; /* container, for autounlock */
                     c = ynq(qbuf);
                     if (c == 'q')
                         return 0;
-                    if (c == 'n')
+                    if (c == 'n') {
+                        otmp = (otmp == mchest) ? level.objects[cc.x][cc.y] : otmp->nexthere;
                         continue;
+                    }
                 }
 
                 if (otmp->obroken) {
@@ -632,7 +655,7 @@ struct obj *container; /* container, for autounlock */
                     }
                 }
 
-                /* crystal chest can only be opened by magical means */
+                /* crystal chest can only be opened by artifacts */
                 if (otmp->otyp == CRYSTAL_CHEST && !pick->oartifact) {
                     You_cant("%s %ssuch a container with a mundane %s.",
                              verb, it ? "" : "the lock on ",
@@ -640,6 +663,15 @@ struct obj *container; /* container, for autounlock */
                     return PICKLOCK_LEARNED_SOMETHING;
                 }
 
+                /* magic chests can be opened by artifacts or purpose-made keys */
+                if (otmp->otyp == HIDDEN_CHEST
+                    && !(pick->oartifact || pick->otyp == MAGIC_KEY)) {
+                    You_cant("%s %ssuch a container with a mundane %s.",
+                             verb, it ? "" : "the lock on ",
+                             simple_typename(picktyp));
+                    return PICKLOCK_LEARNED_SOMETHING;
+                }
+
                 switch (picktyp) {
                 case CREDIT_CARD:
                     ch = ACURR(A_DEX) + 20 * Role_if(PM_ROGUE);
@@ -648,11 +680,12 @@ struct obj *container; /* container, for autounlock */
                     ch = 4 * ACURR(A_DEX) + 25 * Role_if(PM_ROGUE);
                     break;
                 case SKELETON_KEY:
+                case MAGIC_KEY:
                     ch = 75 + ACURR(A_DEX);
                     break;
-		case STETHOSCOPE:
-	            ch = 5 + 2 * ACURR(A_DEX) * Role_if(PM_ROGUE);
-		    break;
+                case STETHOSCOPE:
+                    ch = 5 + 2 * ACURR(A_DEX) * Role_if(PM_ROGUE);
+                    break;
                 default:
                     ch = 0;
                 }
@@ -661,7 +694,8 @@ struct obj *container; /* container, for autounlock */
 
                 /* small chance a cursed locking tool will break on use */
                 if (pick->cursed && !rn2(5)
-                    && picktyp != STETHOSCOPE 
+                    && picktyp != STETHOSCOPE
+                   && picktyp != MAGIC_KEY
                     && !pick->oartifact) {
                     pline("As you start to %s the %s, your %s breaks!",
                           (otmp->olocked ? "unlock" : "lock"),
@@ -678,6 +712,8 @@ struct obj *container; /* container, for autounlock */
                 xlock.door = 0;
                 break;
             }
+            otmp = (otmp == mchest) ? level.objects[cc.x][cc.y] : otmp->nexthere;
+        }
         if (c != 'y') {
             if (!count)
                 There("doesn't seem to be any sort of pickable lock here.");
@@ -754,6 +790,7 @@ struct obj *container; /* container, for autounlock */
                 ch = 3 * ACURR(A_DEX) + 30 * Role_if(PM_ROGUE);
                 break;
             case SKELETON_KEY:
+            case MAGIC_KEY:
                 ch = 70 + ACURR(A_DEX);
                 break;
             default:
@@ -762,7 +799,8 @@ struct obj *container; /* container, for autounlock */
 
             /* small chance a cursed locking tool will break on use */
             if (pick->cursed && !rn2(5)
-                && picktyp != STETHOSCOPE 
+                && picktyp != STETHOSCOPE
+                && picktyp != MAGIC_KEY
                 && !pick->oartifact) {
                 pline("As you start to %s the door, your %s breaks!",
                       ((door->doormask & D_LOCKED) ? "unlock" : "lock"),
@@ -783,7 +821,7 @@ struct obj *container; /* container, for autounlock */
     context.move = 0;
     xlock.chance = ch;
     xlock.picktyp = picktyp;
-    xlock.magic_key = is_magic_key(&youmonst, pick);
+    xlock.magic_key = is_roguish_key(&youmonst, pick);
     xlock.usedtime = 0;
     set_occupation(picklock, lock_action(), 0);
     return PICKLOCK_DID_SOMETHING;
diff --git a/src/makemon.c b/src/makemon.c
index b1e7b00fc..253ec2ddd 100644
--- a/src/makemon.c
+++ b/src/makemon.c
@@ -1631,8 +1631,8 @@ register struct monst *mtmp;
             if (rn2(2))
                 (void) mongets(mtmp, CORNUTHAUM);
             if (rn2(2))
-                (void) mongets(mtmp, rn2(13) ? AMULET_OF_GUARDING
-                                            : AMULET_OF_LIFE_SAVING);
+                (void) mongets(mtmp, rn2(4) ? (rn2(2) ? AMULET_OF_GUARDING : AMULET_OF_LIFE_SAVING)
+                                            : AMULET_OF_MAGIC_RESISTANCE);
         }
         break;
     case S_GHOST:
@@ -2581,12 +2581,23 @@ register struct monst *mtmp;
             otmp->spe = rn1(3, 3);
             (void) mpickobj(mtmp, otmp);
             
-            (void) mongets(mtmp, SPEED_BOOTS);
+            (void) mongets(mtmp, HIGH_BOOTS);
             (void) mongets(mtmp, AMULET_OF_REFLECTION);
-            (void) mongets(mtmp, CLOAK_OF_DISPLACEMENT);
             (void) mongets(mtmp, ROBE_OF_PROTECTION);
             (void) mongets(mtmp, POT_FULL_HEALING);
             break;
+        } else if (ptr == &mons[PM_HIGH_ICE_MAGE]) {
+            otmp = mksobj(QUARTERSTAFF, FALSE, FALSE);
+            otmp->blessed = otmp->oerodeproof = 1;
+            otmp->spe = rn1(3, 3);
+            otmp->oprops = ITEM_FROST;
+            (void) mpickobj(mtmp, otmp);
+            (void) mongets(mtmp, rn2(3)
+                                 ? rn1(ROBE_OF_WEAKNESS - ROBE + 1, ROBE)
+                                 : CLOAK_OF_PROTECTION);
+            (void) mongets(mtmp, POT_FULL_HEALING);
+            (void) mongets(mtmp, POT_REFLECTION);
+            break;
         }
         break;
     case S_NYMPH:
@@ -2619,6 +2630,8 @@ register struct monst *mtmp;
         }
         break;
     case S_WRAITH:
+        if (!rn2(2)) 
+            (void) mongets(mtmp, ROBE);
         if (ptr == &mons[PM_NAZGUL]) {
             otmp = mksobj(RIN_INVISIBILITY, FALSE, FALSE);
             curse(otmp);
@@ -3864,8 +3877,9 @@ int mndx, mvflagsmask, genomask;
     if (Is_mineend_level(&u.uz) && ptr == &mons[PM_VAMPIRE_MAGE])
         return FALSE;
     if (In_mines(&u.uz)
-        && (ptr == &mons[PM_ALHOON] 
+        && (ptr == &mons[PM_ALHOON]
             || ptr == &mons[PM_MASTER_MIND_FLAYER]
+            || ptr == &mons[PM_DEEPEST_ONE]
             || ptr == &mons[PM_BANSHEE]))
         return FALSE;
     
diff --git a/src/mcastu.c b/src/mcastu.c
index cf47f1340..1b07ed4c7 100644
--- a/src/mcastu.c
+++ b/src/mcastu.c
@@ -277,13 +277,13 @@ int spellnum;
  * 0: unsuccessful spell
  */
 int
-castmu(mtmp, mattk, thinks_it_foundyou, foundyou)
-register struct monst *mtmp;
+castmu(magr, mattk, thinks_it_foundyou, foundyou)
+register struct monst *magr;
 register struct attack *mattk;
 boolean thinks_it_foundyou;
 boolean foundyou;
 {
-    int dmg, ml = min(mtmp->m_lev, 50);
+    int dmg, ml = min(magr->m_lev, 50);
     int ret;
     int spellnum = 0;
     struct obj *marm;
@@ -305,13 +305,13 @@ boolean foundyou;
         do {
             spellnum = rn2(ml);
             if (mattk->adtyp == AD_SPEL)
-                spellnum = choose_magic_spell(mtmp, spellnum);
+                spellnum = choose_magic_spell(magr, spellnum);
             else
-                spellnum = choose_clerical_spell(mtmp, spellnum);
+                spellnum = choose_clerical_spell(magr, spellnum);
             /* not trying to attack?  don't allow directed spells */
             if (!thinks_it_foundyou) {
                 if (!is_undirected_spell(mattk->adtyp, spellnum)
-                    || spell_would_be_useless(mtmp, mattk->adtyp, spellnum)) {
+                    || spell_would_be_useless(magr, mattk->adtyp, spellnum)) {
                     if (foundyou)
                         impossible(
                        "spellcasting monster found you and doesn't know it?");
@@ -320,40 +320,40 @@ boolean foundyou;
                 break;
             }
         } while (--cnt > 0
-                 && spell_would_be_useless(mtmp, mattk->adtyp, spellnum));
+                 && spell_would_be_useless(magr, mattk->adtyp, spellnum));
         if (cnt == 0)
             return 0;
     }
 
     /* monster unable to cast spells? */
-    if (mtmp->mcan || mtmp->mspec_used || !ml) {
-        cursetxt(mtmp, is_undirected_spell(mattk->adtyp, spellnum));
+    if (magr->mcan || magr->mspec_used || !ml) {
+        cursetxt(magr, is_undirected_spell(mattk->adtyp, spellnum));
         return 0;
     }
 
     if (mattk->adtyp == AD_SPEL || mattk->adtyp == AD_CLRC) {
         struct obj *obj;
-        mtmp->mspec_used = 4 - mtmp->m_lev;
-        if (mtmp->mspec_used < 2)
-            mtmp->mspec_used = 2;
+        magr->mspec_used = 4 - magr->m_lev;
+        if (magr->mspec_used < 2)
+            magr->mspec_used = 2;
         /* many boss-type monsters than have two or more spell attacks
            per turn are never able to fire off their second attack due
            to mspec always being greater than 0. So set to 0 for those
            types of monsters half of the time */
         if (rn2(2)
-            && (is_dprince(mtmp->data) || is_dlord(mtmp->data)
-                || mtmp->iswiz || mtmp->isvecna
-                || mtmp->data->msound == MS_LEADER
-                || mtmp->data->msound == MS_NEMESIS
-                || mtmp->data == &mons[PM_ORACLE]
-                || mtmp->data == &mons[PM_HIGH_PRIEST]))
-            mtmp->mspec_used = 0;
+            && (is_dprince(magr->data) || is_dlord(magr->data)
+                || magr->iswiz || magr->isvecna
+                || magr->data->msound == MS_LEADER
+                || magr->data->msound == MS_NEMESIS
+                || magr->data == &mons[PM_ORACLE]
+                || magr->data == &mons[PM_HIGH_PRIEST]))
+            magr->mspec_used = 0;
 
         /* Having the EotA in inventory drops mspec to 0 */
-        for (obj = mtmp->minvent; obj; obj = obj->nobj) {
+        for (obj = magr->minvent; obj; obj = obj->nobj) {
             if (obj->oartifact
                 && obj->oartifact == ART_EYE_OF_THE_AETHIOPICA) {
-                mtmp->mspec_used = 0;
+                magr->mspec_used = 0;
                 break;
             }
         }
@@ -365,33 +365,33 @@ boolean foundyou;
     if (!foundyou && thinks_it_foundyou
         && !is_undirected_spell(mattk->adtyp, spellnum)) {
         pline("%s casts a spell at %s!",
-              canseemon(mtmp) ? Monnam(mtmp) : "Something",
-              levl[mtmp->mux][mtmp->muy].typ == WATER ? "empty water"
+              canseemon(magr) ? Monnam(magr) : "Something",
+              levl[magr->mux][magr->muy].typ == WATER ? "empty water"
                                                       : "thin air");
         return 0;
     }
 
-    if (!mtmp->mpeaceful)
+    if (!magr->mpeaceful)
         nomul(0);
-    if (rn2(ml * 10) < (mtmp->mconf ? 100 : 10)) { /* fumbled attack */
-        if (canseemon(mtmp) && !Deaf)
-            pline_The("air crackles around %s.", mon_nam(mtmp));
+    if (rn2(ml * 10) < (magr->mconf ? 100 : 10)) { /* fumbled attack */
+        if (canseemon(magr) && !Deaf)
+            pline_The("air crackles around %s.", mon_nam(magr));
         return 0;
     }
-    if (canseemon(mtmp) || !is_undirected_spell(mattk->adtyp, spellnum)) {
-        if (mtmp->mpeaceful
-            && mtmp->ispriest && inhistemple(mtmp)) {
+    if (canseemon(magr) || !is_undirected_spell(mattk->adtyp, spellnum)) {
+        if (magr->mpeaceful
+            && magr->ispriest && inhistemple(magr)) {
             ; /* cut down on the temple spam */
         } else {
             pline("%s casts a spell%s!",
-                  canseemon(mtmp) ? Monnam(mtmp) : "Something",
+                  canseemon(magr) ? Monnam(magr) : "Something",
                   is_undirected_spell(mattk->adtyp, spellnum)
                       ? ""
-                      : (Invis && !mon_prop(mtmp, SEE_INVIS)
-                         && (mtmp->mux != u.ux || mtmp->muy != u.uy))
+                      : (Invis && !mon_prop(magr, SEE_INVIS)
+                         && (magr->mux != u.ux || magr->muy != u.uy))
                             ? " at a spot near you"
                             : (Displaced
-                               && (mtmp->mux != u.ux || mtmp->muy != u.uy))
+                               && (magr->mux != u.ux || magr->muy != u.uy))
                                   ? " at your displaced image"
                                   : " at you");
         }
@@ -406,7 +406,7 @@ boolean foundyou;
         if (mattk->adtyp != AD_SPEL && mattk->adtyp != AD_CLRC) {
             impossible(
               "%s casting non-hand-to-hand version of hand-to-hand spell %d?",
-                       Monnam(mtmp), mattk->adtyp);
+                       Monnam(magr), mattk->adtyp);
             return 0;
         }
     } else if (mattk->damd)
@@ -420,7 +420,7 @@ boolean foundyou;
 
     switch (mattk->adtyp) {
     case AD_FIRE:
-        if (is_demon(mtmp->data))
+        if (is_demon(magr->data))
             pline("You're enveloped in hellfire!");
         else if (!Underwater)
             pline("You're enveloped in flames.");
@@ -432,7 +432,7 @@ boolean foundyou;
 
         if (how_resistant(FIRE_RES) == 100) {
             shieldeff(u.ux, u.uy);
-            if (is_demon(mtmp->data)) {
+            if (is_demon(magr->data)) {
                 if (Race_if(PM_DEMON) || nonliving(youmonst.data)) {
                     dmg = 0;
                 } else {
@@ -445,7 +445,7 @@ boolean foundyou;
                 dmg = 0;
             }
         } else {
-            if (is_demon(mtmp->data)
+            if (is_demon(magr->data)
                 && !(Race_if(PM_DEMON) || nonliving(youmonst.data))) {
                 pline_The("hellish flames sear your soul!");
                 dmg = resist_reduce(dmg, FIRE_RES) * 2;
@@ -494,7 +494,7 @@ boolean foundyou;
         }
         break;
     case AD_PSYC:
-        marm = which_armor(mtmp, W_ARMH);
+        marm = which_armor(magr, W_ARMH);
         pline("Your mind is being attacked!");
         
         if (Psychic_resistance ) {
@@ -502,7 +502,7 @@ boolean foundyou;
             pline("You fend off the mental attack!");
             dmg = 0;
         } else if (mindless(youmonst.data)) {
-            shieldeff(mtmp->mx, mtmp->my);
+            shieldeff(magr->mx, magr->my);
             You("are unaffected by the psionic energy!");
             dmg = 0;
         } else {
@@ -514,7 +514,7 @@ boolean foundyou;
         }
         if (Blind_telepat || Unblind_telepat) {
             dmg *= 2; /* You are more sensitive */
-            pline("%s locks on to your telepathic mind!", Monnam(mtmp));
+            pline("%s locks on to your telepathic mind!", Monnam(magr));
         }
             
         if (dmg && !rn2(4)) {
@@ -524,15 +524,15 @@ boolean foundyou;
     case AD_SPEL:   /* wizard spell */
     case AD_CLRC: { /* clerical spell */
         if (mattk->adtyp == AD_SPEL)
-            cast_wizard_spell(mtmp, dmg, spellnum);
+            cast_wizard_spell(magr, dmg, spellnum);
         else
-            cast_cleric_spell(mtmp, dmg, spellnum);
+            cast_cleric_spell(magr, dmg, spellnum);
         dmg = 0; /* done by the spell casting functions */
         break;
         }
     }
     if (dmg)
-        mdamageu(mtmp, dmg);
+        mdamageu(magr, dmg);
     return (ret);
 }
 
@@ -553,11 +553,11 @@ int dmg;
 }
 
 STATIC_OVL int
-m_destroy_armor(mattk, mdef)
-struct monst *mattk, *mdef;
+m_destroy_armor(magr, mdef)
+struct monst *magr, *mdef;
 {
     boolean udefend = (mdef == &youmonst),
-            uattk = (mattk == &youmonst);
+            uattk = (magr == &youmonst);
     int erodelvl = rnd(3);
     struct obj *oatmp;
 
@@ -580,7 +580,7 @@ struct monst *mattk, *mdef;
                     pline("%s shines brightly.", The(xname(oatmp)));
                 pline("%s is immune to %s destructive magic.",
                       The(xname(oatmp)),
-                      uattk ? "your" : s_suffix(mon_nam(mattk)));
+                      uattk ? "your" : s_suffix(mon_nam(magr)));
             }
             return 0;
         } else if (oatmp && oatmp->oprops & ITEM_TOUGH) {
@@ -1643,12 +1643,12 @@ register struct attack *mattk;
 }
 
 int
-castmm(mtmp, mdef, mattk)
-struct monst *mtmp;
+castmm(magr, mdef, mattk)
+struct monst *magr;
 struct monst *mdef;
 struct attack *mattk;
 {
-    int dmg, ml = min(mtmp->m_lev, 50);
+    int dmg, ml = min(magr->m_lev, 50);
     int ret;
     int spellnum = 0;
 
@@ -1668,25 +1668,25 @@ struct attack *mattk;
         do {
             spellnum = rn2(ml);
             if (mattk->adtyp == AD_SPEL)
-                spellnum = choose_magic_spell(mtmp, spellnum);
+                spellnum = choose_magic_spell(magr, spellnum);
             else
-                spellnum = choose_clerical_spell(mtmp, spellnum);
+                spellnum = choose_clerical_spell(magr, spellnum);
         /* not trying to attack?  don't allow directed spells */
         } while (--cnt > 0
-                 && mspell_would_be_useless(mtmp, mdef, mattk->adtyp, spellnum));
+                 && mspell_would_be_useless(magr, mdef, mattk->adtyp, spellnum));
         if (cnt == 0)
             return 0;
     }
 
     /* monster unable to cast spells? */
-    if (mtmp->mcan || mtmp->mspec_used || !ml) {
-        if (canseemon(mtmp)) {
+    if (magr->mcan || magr->mspec_used || !ml) {
+        if (canseemon(magr)) {
             if (is_undirected_spell(mattk->adtyp, spellnum))
                 pline("%s points all around, then curses.",
-                      Monnam(mtmp));
+                      Monnam(magr));
             else
                 pline("%s points at %s, then curses.",
-                      Monnam(mtmp), mon_nam(mdef));
+                      Monnam(magr), mon_nam(mdef));
         } else if ((!(moves % 4) || !rn2(4))) {
             if (!Deaf)
                 Norep("You hear a mumbled curse.");
@@ -1696,49 +1696,49 @@ struct attack *mattk;
 
     if (mattk->adtyp == AD_SPEL || mattk->adtyp == AD_CLRC) {
         struct obj *obj;
-        mtmp->mspec_used = 4 - mtmp->m_lev;
-        if (mtmp->mspec_used < 2)
-            mtmp->mspec_used = 2;
+        magr->mspec_used = 4 - magr->m_lev;
+        if (magr->mspec_used < 2)
+            magr->mspec_used = 2;
         /* many boss-type monsters than have two or more spell attacks
            per turn are never able to fire off their second attack due
            to mspec always being greater than 0. So set to 0 for those
            types of monsters, either sometimes or all of the time
            depending on how powerful they are or what their role is */
         if (rn2(3) /* mspec 0 two thirds of the time */
-            && (is_dlord(mtmp->data)
-                || mtmp->data->msound == MS_LEADER
-                || mtmp->data->msound == MS_NEMESIS
-                || mtmp->data == &mons[PM_ORACLE]
-                || mtmp->data == &mons[PM_HIGH_PRIEST]))
-            mtmp->mspec_used = 0;
-
-        if (is_dprince(mtmp->data) || mtmp->iswiz || mtmp->isvecna)
+            && (is_dlord(magr->data)
+                || magr->data->msound == MS_LEADER
+                || magr->data->msound == MS_NEMESIS
+                || magr->data == &mons[PM_ORACLE]
+                || magr->data == &mons[PM_HIGH_PRIEST]))
+            magr->mspec_used = 0;
+
+        if (is_dprince(magr->data) || magr->iswiz || magr->isvecna)
             /* mspec 0 always */
-            mtmp->mspec_used = 0;
+            magr->mspec_used = 0;
 
         /* Having the EotA in inventory drops mspec to 0 */
-        for (obj = mtmp->minvent; obj; obj = obj->nobj) {
+        for (obj = magr->minvent; obj; obj = obj->nobj) {
             if (obj->oartifact
                 && obj->oartifact == ART_EYE_OF_THE_AETHIOPICA) {
-                mtmp->mspec_used = 0;
+                mdef->mspec_used = 0;
                 break;
             }
         }
     }
 
-    if (rn2(ml * 10) < (mtmp->mconf ? 100 : 20)) {	/* fumbled attack */
-        if (canseemon(mtmp) && !Deaf)
-            pline_The("air crackles around %s.", mon_nam(mtmp));
+    if (rn2(ml * 10) < (mdef->mconf ? 100 : 20)) {	/* fumbled attack */
+        if (canseemon(mdef) && !Deaf)
+            pline_The("air crackles around %s.", mon_nam(mdef));
         return 0;
     }
 
     if (canseemon(mdef)
         && !is_undirected_spell(mattk->adtyp, spellnum))
-        pline("%s casts a spell at %s!", Monnam(mtmp), mon_nam(mdef));
+        pline("%s casts a spell at %s!", Monnam(magr), mon_nam(mdef));
 
-    if (canseemon(mtmp)
+    if (canseemon(magr)
         && is_undirected_spell(mattk->adtyp, spellnum))
-        pline("%s casts a spell!", Monnam(mtmp));
+        pline("%s casts a spell!", Monnam(magr));
 
     if (mattk->damd)
         dmg = d((int) ((ml / 2) + mattk->damn), (int) mattk->damd);
@@ -1750,7 +1750,7 @@ struct attack *mattk;
     switch (mattk->adtyp) {
     case AD_FIRE:
         if (canseemon(mdef)) {
-            if (is_demon(mtmp->data))
+            if (is_demon(magr->data))
                 pline("%s is enveloped in hellfire!", Monnam(mdef));
             else if (!mon_underwater(mdef))
                 pline("%s is enveloped in flames.", Monnam(mdef));
@@ -1765,7 +1765,7 @@ struct attack *mattk;
         if (resists_fire(mdef) || defended(mdef, AD_FIRE)) {
             shieldeff(mdef->mx, mdef->my);
             
-            if (is_demon(mtmp->data)) {
+            if (is_demon(magr->data)) {
                 if (!(nonliving(mdef->data) || is_demon(mdef->data))) {
                     if (canseemon(mdef))
                         pline_The("hellish flames sear %s soul!",
@@ -1793,7 +1793,7 @@ struct attack *mattk;
         break;
     case AD_WIND:
         You("are blasted by wind!");
-        hurtle(u.ux - mtmp->mx, u.uy - mtmp->my, dmg, TRUE);
+        hurtle(u.ux - magr->mx, u.uy - magr->my, dmg, TRUE);
         dmg = 0;
         break;
     case AD_ACID:
@@ -1839,13 +1839,13 @@ struct attack *mattk;
                 /* clerical spells */
                 : (spellnum != CLC_INSECTS))) {
             if (mattk->adtyp == AD_SPEL)
-                cast_wizard_spell(mtmp, dmg, spellnum);
+                cast_wizard_spell(magr, dmg, spellnum);
             else
-               cast_cleric_spell(mtmp, dmg, spellnum);
+               cast_cleric_spell(magr, dmg, spellnum);
         } else if (mattk->adtyp == AD_SPEL) {
-            ucast_wizard_spell(mtmp, mdef, dmg, spellnum);
+            ucast_wizard_spell(magr, mdef, dmg, spellnum);
         } else {
-            ucast_cleric_spell(mtmp, mdef, dmg, spellnum);
+            ucast_cleric_spell(magr, mdef, dmg, spellnum);
         }
         dmg = 0; /* done by the spell casting functions */
         break;
@@ -1853,8 +1853,7 @@ struct attack *mattk;
     }
 
     if (dmg) {
-        mdef->mhp -= dmg;
-        if (DEADMONSTER(mdef))
+        if (damage_mon(mdef, dmg, mattk->adtyp))
             monkilled(mdef, "", mattk->adtyp);
     }
 
@@ -1862,8 +1861,8 @@ struct attack *mattk;
 }
 
 int
-castum(mtmp, mattk)
-struct monst *mtmp;
+castum(mdef, mattk)
+struct monst *mdef;
 struct attack *mattk;
 {
     int dmg, ml = mons[u.umonnum].mlevel;
@@ -1874,7 +1873,7 @@ struct attack *mattk;
     /* guard against casting another spell attack
        at an already dead monster; some monsters
        have multiple AT_MAGC attacks */
-    if (mtmp->mhp <= 0)
+    if (mdef->mhp <= 0)
         return 0;
 
     if ((mattk->adtyp == AD_SPEL || mattk->adtyp == AD_CLRC) && ml) {
@@ -1883,16 +1882,16 @@ struct attack *mattk;
         do {
             spellnum = rn2(ml);
             if (mattk->adtyp == AD_SPEL)
-                spellnum = choose_magic_spell(mtmp, spellnum);
+                spellnum = choose_magic_spell(mdef, spellnum);
             else
-                spellnum = choose_clerical_spell(mtmp, spellnum);
+                spellnum = choose_clerical_spell(mdef, spellnum);
             /* not trying to attack?  don't allow directed spells */
-            if (!mtmp || mtmp->mhp < 1) {
+            if (!mdef || mdef->mhp < 1) {
                 /* Kludge here because uspell_would_be_useless doesn't take 
                  * the targeted monster as a parameter */
                 if (spellnum == MGC_CREATE_POOL 
                     && (levl[u.ux][u.uy].typ == ROOM || levl[u.ux][u.uy].typ == CORR)
-                    && (!is_flyer(mtmp->data) && !is_floater(mtmp->data) && !amphibious(mtmp->data)))
+                    && (!is_flyer(mdef->data) && !is_floater(mdef->data) && !amphibious(mdef->data)))
                     break;
                 if (is_undirected_spell(mattk->adtyp, spellnum)
                     && !uspell_would_be_useless(mattk->adtyp, spellnum)) {
@@ -1901,7 +1900,7 @@ struct attack *mattk;
         }
 
     } while (--cnt > 0
-             && ((!mtmp && !is_undirected_spell(mattk->adtyp, spellnum))
+             && ((!mdef && !is_undirected_spell(mattk->adtyp, spellnum))
                  || uspell_would_be_useless(mattk->adtyp, spellnum)));
         if (cnt == 0) {
             You("have no spells to cast right now!");
@@ -1909,19 +1908,19 @@ struct attack *mattk;
         }
     }
 
-    if (spellnum == MGC_AGGRAVATION && !mtmp) {
+    if (spellnum == MGC_AGGRAVATION && !mdef) {
         /* choose a random monster on the level */
         int j = 0, k = 0;
 
-        for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) {
-            if (!mtmp->mtame && !mtmp->mpeaceful)
+        for (mdef = fmon; mdef; mdef = mdef->nmon) {
+            if (!mdef->mtame && !mdef->mpeaceful)
                 j++;
         }
 
         if (j > 0) {
             k = rn2(j);
-            for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) {
-                if (!mtmp->mtame && !mtmp->mpeaceful) {
+            for (mdef = fmon; mdef; mdef = mdef->nmon) {
+                if (!mdef->mtame && !mdef->mpeaceful) {
                     if (--k < 0)
                         break;
                 }
@@ -1929,12 +1928,12 @@ struct attack *mattk;
         }
     }
 
-    directed = mtmp && !is_undirected_spell(mattk->adtyp, spellnum);
+    directed = mdef && !is_undirected_spell(mattk->adtyp, spellnum);
 
     /* unable to cast spells? */
     if (u.uen < ml) {
         if (directed)
-            You("point at %s, then curse.", mon_nam(mtmp));
+            You("point at %s, then curse.", mon_nam(mdef));
         else
             You("point all around, then curse.");
         return 0;
@@ -1950,7 +1949,7 @@ struct attack *mattk;
     }
 
     You("cast a spell%s%s!", directed ? " at " : "",
-        directed ? mon_nam(mtmp) : "");
+        directed ? mon_nam(mdef) : "");
 
     /* As these are spells, the damage is related to the level
      * of the monster casting the spell. */
@@ -1963,97 +1962,96 @@ struct attack *mattk;
 
     switch (mattk->adtyp) {
     case AD_FIRE:
-        if (canseemon(mtmp)) {
+        if (canseemon(mdef)) {
             if (is_demon(youmonst.data))
-                pline("%s is enveloped in hellfire!", Monnam(mtmp));
-            else if (!mon_underwater(mtmp))
-                pline("%s is enveloped in flames.", Monnam(mtmp));
+                pline("%s is enveloped in hellfire!", Monnam(mdef));
+            else if (!mon_underwater(mdef))
+                pline("%s is enveloped in flames.", Monnam(mdef));
             else {
                 pline("The flames are quenched by the water around %s.",
-                      mon_nam(mtmp));
+                      mon_nam(mdef));
                 dmg = 0;
                 break;
             }
         }
       
-        if (resists_fire(mtmp) || defended(mtmp, AD_FIRE)) {
-            shieldeff(mtmp->mx, mtmp->my);
+        if (resists_fire(mdef) || defended(mdef, AD_FIRE)) {
+            shieldeff(mdef->mx, mdef->my);
             if (is_demon(youmonst.data)) {
-                if (!(nonliving(mtmp->data) || is_demon(mtmp->data))) {
-                    if (canseemon(mtmp))
+                if (!(nonliving(mdef->data) || is_demon(mdef->data))) {
+                    if (canseemon(mdef))
                         pline_The("hellish flames sear %s soul!",
-                                  s_suffix(mon_nam(mtmp)));
+                                  s_suffix(mon_nam(mdef)));
                     dmg = (dmg + 1) / 2;
                 } else {
                     dmg = 0;
                 }
             } else {
-                if (canseemon(mtmp))
-                    pline("But %s resists the effects.", mhe(mtmp));
+                if (canseemon(mdef))
+                    pline("But %s resists the effects.", mhe(mdef));
                 dmg = 0;
             }
         }
         break;
     case AD_COLD:
-        if (canseemon(mtmp))
-            pline("%s is covered in frost.", Monnam(mtmp));
-        if (resists_cold(mtmp) || defended(mtmp, AD_COLD)) {
-            shieldeff(mtmp->mx, mtmp->my);
-            if (canseemon(mtmp))
-                pline("But %s resists the effects.", mhe(mtmp));
+        if (canseemon(mdef))
+            pline("%s is covered in frost.", Monnam(mdef));
+        if (resists_cold(mdef) || defended(mdef, AD_COLD)) {
+            shieldeff(mdef->mx, mdef->my);
+            if (canseemon(mdef))
+                pline("But %s resists the effects.", mhe(mdef));
             dmg = 0;
         }
         break;
     case AD_ACID:
-        if (canseemon(mtmp)) {
-            if (!mon_underwater(mtmp))
-                pline("%s is covered in acid.", Monnam(mtmp));
+        if (canseemon(mdef)) {
+            if (!mon_underwater(mdef))
+                pline("%s is covered in acid.", Monnam(mdef));
             else {
                 pline("The acid dissipates harmlessly in the water around %s.",
-                      mon_nam(mtmp));
+                      mon_nam(mdef));
                 dmg = 0;
                 break;
             }
         }
-        if (resists_acid(mtmp) || defended(mtmp, AD_ACID)) {
-            shieldeff(mtmp->mx, mtmp->my);
-            if (canseemon(mtmp))
-                pline("But %s resists the effects.", mhe(mtmp));
+        if (resists_acid(mdef) || defended(mdef, AD_ACID)) {
+            shieldeff(mdef->mx, mdef->my);
+            if (canseemon(mdef))
+                pline("But %s resists the effects.", mhe(mdef));
             dmg = 0;
         }
         break;
     case AD_MAGM:
-        if (canseemon(mtmp))
-            pline("%s is hit by a shower of missiles!", Monnam(mtmp));
+        if (canseemon(mdef))
+            pline("%s is hit by a shower of missiles!", Monnam(mdef));
         dmg = d((int)ml / 2 + 1, 6);
-        if (resists_magm(mtmp) || defended(mtmp, AD_MAGM)) {
-            shieldeff(mtmp->mx, mtmp->my);
-            if (canseemon(mtmp))
+        if (resists_magm(mdef) || defended(mdef, AD_MAGM)) {
+            shieldeff(mdef->mx, mdef->my);
+            if (canseemon(mdef))
                 pline("Some missiles bounce off!");
             dmg = (dmg + 1) / 2;
         }
         break;
     case AD_PSYC: {
         struct obj *pseudo = mksobj(SPE_PSIONIC_WAVE, FALSE, FALSE);
-        bhitm(mtmp, pseudo);
+        bhitm(mdef, pseudo);
         obfree(pseudo, NULL);
         break;
     }
     case AD_SPEL:   /* wizard spell */
     case AD_CLRC: { /* clerical spell */
         if (mattk->adtyp == AD_SPEL)
-            ucast_wizard_spell(&youmonst, mtmp, dmg, spellnum);
+            ucast_wizard_spell(&youmonst, mdef, dmg, spellnum);
         else
-            ucast_cleric_spell(&youmonst, mtmp, dmg, spellnum);
+            ucast_cleric_spell(&youmonst, mdef, dmg, spellnum);
         dmg = 0; /* done by the spell casting functions */
         break;
         }
     }
 
     if (dmg) {
-        mtmp->mhp -= dmg;
-        if (DEADMONSTER(mtmp))
-            killed(mtmp);
+        if (damage_mon(mdef, dmg, mattk->adtyp))
+            killed(mdef);
     }
 
     return (ret);
@@ -2072,65 +2070,65 @@ struct attack *mattk;
 */
 STATIC_OVL
 void
-ucast_wizard_spell(mattk, mtmp, dmg, spellnum)
-struct monst *mattk;
-struct monst *mtmp;
+ucast_wizard_spell(magr, mdef, dmg, spellnum)
+struct monst *magr, *mdef;
 int dmg;
 int spellnum;
 {
     boolean resisted = FALSE;
-    boolean yours = (mattk == &youmonst);
+    boolean yours = (magr == &youmonst);
 
     if (dmg == 0 && !is_undirected_spell(AD_SPEL, spellnum)) {
         impossible("cast directed wizard spell (%d) with dmg = 0?", spellnum);
         return;
     }
 
-    if (mtmp && mtmp->mhp < 1) {
+    if (mdef && mdef->mhp < 1) {
         impossible("monster already dead?");
         return;
     }
 
     switch (spellnum) {
     case MGC_DEATH_TOUCH:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("touch of death with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("touch of death with no mdef");
             return;
         }
         if (yours)
             pline("You're using the touch of death!");
-        else if (canseemon(mattk)) {
+        else if (canseemon(magr)) {
             char buf[BUFSZ];
             Sprintf(buf, "%s%s",
-                    mtmp->mtame ? "Oh no, " : "", mhe(mattk));
-            if (!mtmp->mtame)
+                    mdef->mtame ? "Oh no, " : "", mhe(magr));
+            if (!mdef->mtame)
                 *buf = highc(*buf);
 
             pline("%s's using the touch of death!", buf);
         }
 
         resisted =
-            ((resist(mtmp, 0, 0, FALSE)
-              && rn2(mons[yours ? u.umonnum : mattk->mnum].mlevel) <= 12)
-             || resists_magm(mtmp) || defended(mtmp, AD_MAGM));
-        if (immune_death_magic(mtmp->data) || is_vampshifter(mtmp)) {
-            if (yours || canseemon(mtmp))
-                pline("%s %s.", Monnam(mtmp),
-                      nonliving(mtmp->data)
+            ((resist(mdef, 0, 0, FALSE)
+              && rn2(mons[yours ? u.umonnum : magr->mnum].mlevel) <= 12)
+             || resists_magm(mdef) || defended(mdef, AD_MAGM));
+        if (immune_death_magic(mdef->data) || is_vampshifter(mdef)) {
+            if (yours || canseemon(mdef))
+                pline("%s %s.", Monnam(mdef),
+                      nonliving(mdef->data)
                           ? "seems no more dead than before"
                           : "is unaffected");
         } else if (!resisted) {
-            mtmp->mhp = -1;
+            mdef->mhp = -1;
             if (yours)
-                killed(mtmp);
-            else monkilled(mtmp, "", AD_SPEL);
+                killed(mdef);
+            else 
+                monkilled(mdef, "", AD_SPEL);
             return;
         } else {
             if (resisted)
-                shieldeff(mtmp->mx, mtmp->my);
-            if (yours || canseemon(mtmp)) {
-                if (mtmp->mtame)
-                    pline("Lucky for %s, it didn't work!", mon_nam(mtmp));
+                shieldeff(mdef->mx, mdef->my);
+            if (yours || canseemon(mdef)) {
+                if (mdef->mtame)
+                    pline("Lucky for %s, it didn't work!", mon_nam(mdef));
                 else
                     pline("Well.  That didn't work...");
             }
@@ -2138,44 +2136,44 @@ int spellnum;
         dmg = 0;
         break;
     case MGC_CANCELLATION:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("cancellation with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("cancellation with no mdef");
             return;
         }
         if (yours)
             You("%s a cancellation spell!",
                 rn2(2) ? "evoke" : "conjure up");
-        else if (canseemon(mattk))
-            pline("%s %s a cancellation spell!", Monnam(mattk),
+        else if (canseemon(magr))
+            pline("%s %s a cancellation spell!", Monnam(magr),
                   rn2(2) ? "evokes" : "conjures up");
-        (void) cancel_monst(mtmp, (struct obj *) 0, FALSE, TRUE, FALSE);
+        (void) cancel_monst(mdef, (struct obj *) 0, FALSE, TRUE, FALSE);
         break;
     case MGC_REFLECTION:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("reflection with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("reflection with no mdef");
             return;
         }
         if (yours)
             (void) cast_reflection(&youmonst);
         else
-            (void) cast_reflection(mtmp);
+            (void) cast_reflection(mdef);
         break;
     case MGC_ACID_BLAST:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("acid blast with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("acid blast with no mdef");
             return;
         }
-        if (yours || canseemon(mtmp))
-            You("douse %s in a torrent of acid!", mon_nam(mtmp));
-        explode(mtmp->mx, mtmp->my, ZT_ACID, d((u.ulevel / 2) + 4, 8),
+        if (yours || canseemon(mdef))
+            You("douse %s in a torrent of acid!", mon_nam(mdef));
+        explode(mdef->mx, mdef->my, ZT_ACID, d((u.ulevel / 2) + 4, 8),
                 WAND_CLASS, EXPL_ACID);
-        if (resists_acid(mtmp) || defended(mtmp, AD_ACID)) {
-            shieldeff(mtmp->mx, mtmp->my);
-            if (canseemon(mtmp))
+        if (resists_acid(mdef) || defended(mdef, AD_ACID)) {
+            shieldeff(mdef->mx, mdef->my);
+            if (canseemon(mdef))
                 pline("But the acid dissipates harmlessly.");
         }
         if (rn2(4))
-            erode_armor(mtmp, ERODE_CORRODE);
+            erode_armor(mdef, ERODE_CORRODE);
         /* damage is handled by explode() */
         dmg = 0;
         break;
@@ -2187,19 +2185,19 @@ int spellnum;
             if (yours)
                 demonpet();
             else
-                msummon(mattk);
+                msummon(magr);
         } else {
             register int i, j;
             int makeindex, tmp = (u.ulevel > 3) ? u.ulevel / 3 : 1;
             const char *mappear;
             coord bypos;
 
-            if (mtmp)
-                bypos.x = mtmp->mx, bypos.y = mtmp->my;
+            if (mdef)
+                bypos.x = mdef->mx, bypos.y = mdef->my;
             else if (yours)
                 bypos.x = u.ux, bypos.y = u.uy;
             else
-                bypos.x = mattk->mx, bypos.y = mattk->my;
+                bypos.x = magr->mx, bypos.y = magr->my;
 
             for (i = rnd(tmp); i > 0; --i) {
                 for (j = 0; j < 20; j++) {
@@ -2211,14 +2209,14 @@ int spellnum;
                             && !enexto(&bypos, u.ux, u.uy, &mons[makeindex]))
                             continue;
                         if (!yours
-                            && !enexto(&bypos, mattk->mx, mattk->my, &mons[makeindex]))
+                            && !enexto(&bypos, magr->mx, magr->my, &mons[makeindex]))
                             continue;
                     if ((mpet = makemon(&mons[makeindex], bypos.x, bypos.y,
-                        (yours || mattk->mtame) ? MM_EDOG : NO_MM_FLAGS)) != 0) {
+                        (yours || magr->mtame) ? MM_EDOG : NO_MM_FLAGS)) != 0) {
                         mpet->msleeping = 0;
-                        if (yours || mattk->mtame)
+                        if (yours || magr->mtame)
                             initedog(mpet);
-                        else if (mattk->mpeaceful)
+                        else if (magr->mpeaceful)
                             mpet->mpeaceful = 1;
                         else
                             mpet->mpeaceful = mpet->mtame = 0;
@@ -2235,58 +2233,60 @@ int spellnum;
                 }
             }
             mappear = (count == 1) ? "A monster appears" : "Monsters appear";
-            if (yours || canseemon(mtmp))
+            if (yours || canseemon(mdef))
                 pline("%s from nowhere!", mappear);
         }
         dmg = 0;
         break;
     }
     case MGC_AGGRAVATION:
-        if (!mtmp || mtmp->mhp < 1) {
+        if (!mdef || mdef->mhp < 1) {
             You_feel("lonely.");
             return;
         }
-        you_aggravate(mtmp);
+        you_aggravate(mdef);
         dmg = 0;
         break;
     case MGC_CURSE_ITEMS:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("curse spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("curse spell with no mdef");
             return;
         }
-        if (yours || canseemon(mtmp))
-            You_feel("as though %s needs some help.", mon_nam(mtmp));
-        mrndcurse(mtmp);
+        if (yours || canseemon(mdef))
+            You_feel("as though %s needs some help.", mon_nam(mdef));
+        mrndcurse(mdef);
         dmg = 0;
         break;
     case MGC_DESTRY_ARMR:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("destroy spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("destroy spell with no mdef");
             return;
         }
-        dmg = m_destroy_armor(mattk, mtmp);
+        dmg = m_destroy_armor(magr, mdef);
         break;
     case MGC_WEAKEN_YOU: /* drain strength */
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("weaken spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("weaken spell with no mdef");
             return;
         }
-        if (resist(mtmp, 0, 0, FALSE)) {
-            shieldeff(mtmp->mx, mtmp->my);
-            pline("%s looks momentarily weakened.", Monnam(mtmp));
+        if (resist(mdef, 0, 0, FALSE)) {
+            shieldeff(mdef->mx, mdef->my);
+            pline("%s looks momentarily weakened.", Monnam(mdef));
         } else {
-            if (mtmp->mhp < 1) {
+            if (mdef->mhp < 1) {
                 impossible("trying to drain monster that's already dead");
                 return;
             }
-            if (yours || canseemon(mtmp))
-                pline("%s suddenly seems weaker!", Monnam(mtmp));
+            if (yours || canseemon(mdef))
+                pline("%s suddenly seems weaker!", Monnam(mdef));
+            
             /* monsters don't have strength, so drain max hp instead */
-            mtmp->mhpmax -= dmg;
-            if ((mtmp->mhp -= dmg) <= 0) {
+            mdef->mhpmax -= dmg;
+            
+            if (damage_mon(mdef, dmg, AD_DRLI)) {
                 if (yours)
-                    killed(mtmp);
-                else monkilled(mtmp, "", AD_SPEL);
+                    killed(mdef);
+                else monkilled(mdef, "", AD_SPEL);
             }
         }
         dmg = 0;
@@ -2305,24 +2305,24 @@ int spellnum;
             impossible("no reason for player to cast disappear spell?");
         break;
     case MGC_STUN_YOU:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("stun spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("stun spell with no mdef");
             return;
         }
-        if (resist(mtmp, 0, 0, FALSE)) {
-            shieldeff(mtmp->mx, mtmp->my);
-            if (yours || canseemon(mtmp) 
-                  || resists_stun(mtmp->data) || defended(mtmp, AD_STUN))
-                pline("%s seems momentarily disoriented.", Monnam(mtmp));
+        if (resist(mdef, 0, 0, FALSE)) {
+            shieldeff(mdef->mx, mdef->my);
+            if (yours || canseemon(mdef) 
+                  || resists_stun(mdef->data) || defended(mdef, AD_STUN))
+                pline("%s seems momentarily disoriented.", Monnam(mdef));
         } else {
-            if (yours || canseemon(mtmp)) {
-                if (mtmp->mstun)
+            if (yours || canseemon(mdef)) {
+                if (mdef->mstun)
                     pline("%s struggles to keep %s balance.",
-                          Monnam(mtmp), mhis(mtmp));
+                          Monnam(mdef), mhis(mdef));
                 else
-                    pline("%s reels...", Monnam(mtmp));
+                    pline("%s reels...", Monnam(mdef));
             }
-            mtmp->mstun = 1;
+            mdef->mstun = 1;
         }
         dmg = 0;
         break;
@@ -2351,64 +2351,64 @@ int spellnum;
         break;
     case MGC_FIRE_BOLT:
     case MGC_ICE_BOLT:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("bolt spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("bolt spell with no mdef");
             return;
         }
-        if (yours || canseemon(mtmp)) {
-            You("blast %s with %s!", mon_nam(mtmp),
+        if (yours || canseemon(mdef)) {
+            You("blast %s with %s!", mon_nam(mdef),
                 (spellnum == MGC_FIRE_BOLT) ? "fire" : "ice");
-            explode(mtmp->mx, mtmp->my,
+            explode(mdef->mx, mdef->my,
                     (spellnum == MGC_FIRE_BOLT) ? ZT_FIRE : ZT_COLD,
                     d((u.ulevel / 5) + 1, 8), WAND_CLASS, 1);
             if (spellnum == MGC_FIRE_BOLT
-                && (resists_fire(mtmp) || defended(mtmp, AD_FIRE))) {
-                shieldeff(mtmp->mx, mtmp->my);
-                pline("But %s seems unaffected by the fire.", mon_nam(mtmp));
+                && (resists_fire(mdef) || defended(mdef, AD_FIRE))) {
+                shieldeff(mdef->mx, mdef->my);
+                pline("But %s seems unaffected by the fire.", mon_nam(mdef));
             } else if (spellnum == MGC_ICE_BOLT
-                && (resists_cold(mtmp) || defended(mtmp, AD_COLD))) {
-                shieldeff(mtmp->mx, mtmp->my);
-                pline("But %s seems unaffected by the cold.", mon_nam(mtmp));
+                && (resists_cold(mdef) || defended(mdef, AD_COLD))) {
+                shieldeff(mdef->mx, mdef->my);
+                pline("But %s seems unaffected by the cold.", mon_nam(mdef));
             }
             if (spellnum == MGC_FIRE_BOLT) {
-                (void) burnarmor(mtmp);
-                destroy_mitem(mtmp, SCROLL_CLASS, AD_FIRE);
-                destroy_mitem(mtmp, POTION_CLASS, AD_FIRE);
-                destroy_mitem(mtmp, SPBOOK_CLASS, AD_FIRE);
-                destroy_mitem(mtmp, WEAPON_CLASS, AD_FIRE);
-                (void) burn_floor_objects(mtmp->mx, mtmp->my, TRUE, FALSE);
+                (void) burnarmor(mdef);
+                destroy_mitem(mdef, SCROLL_CLASS, AD_FIRE);
+                destroy_mitem(mdef, POTION_CLASS, AD_FIRE);
+                destroy_mitem(mdef, SPBOOK_CLASS, AD_FIRE);
+                destroy_mitem(mdef, WEAPON_CLASS, AD_FIRE);
+                (void) burn_floor_objects(mdef->mx, mdef->my, TRUE, FALSE);
             }
         }
         /* damage is handled by explode() */
         dmg = 0;
         break;
     case MGC_PSI_BOLT:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("psibolt spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("psibolt spell with no mdef");
             return;
         }
-        if (resist(mtmp, 0, 0, FALSE)) {
-            shieldeff(mtmp->mx, mtmp->my);
+        if (resist(mdef, 0, 0, FALSE)) {
+            shieldeff(mdef->mx, mdef->my);
             dmg = (dmg + 1) / 2;
         }
-        if (yours || canseemon(mtmp))
-            pline("%s %s%s", Monnam(mtmp),
-                  can_flollop(mtmp->data) ? "flollops" : "winces",
+        if (yours || canseemon(mdef))
+            pline("%s %s%s", Monnam(mdef),
+                  can_flollop(mdef->data) ? "flollops" : "winces",
                   (dmg <= 5) ? "." : "!");
         break;
     case MGC_CREATE_POOL:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("create pool spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("create pool spell with no mdef");
             return;
         }
-        if (zombie_can_dig(mtmp->mx, mtmp->my)) {
-            if (yours || canseemon(mtmp)) {
-                pline("A pool appears beneath %s!", mon_nam(mtmp));
+        if (zombie_can_dig(mdef->mx, mdef->my)) {
+            if (yours || canseemon(mdef)) {
+                pline("A pool appears beneath %s!", mon_nam(mdef));
             }
-            levl[mtmp->mx][mtmp->my].typ = POOL;
-            del_engr_at(mtmp->mx, mtmp->my);
-            (void) mintrap(mtmp);
-            water_damage_chain(level.objects[mtmp->mx][mtmp->my], TRUE, 0, TRUE, mtmp->mx, mtmp->my);
+            levl[mdef->mx][mdef->my].typ = POOL;
+            del_engr_at(mdef->mx, mdef->my);
+            (void) mintrap(mdef);
+            water_damage_chain(level.objects[mdef->mx][mdef->my], TRUE, 0, TRUE, mdef->mx, mdef->my);
             spoteffects(FALSE);  /* possibly drown, notice objects */
         }
         break;
@@ -2419,27 +2419,25 @@ int spellnum;
     }
 
     if (dmg) {
-        mtmp->mhp -= dmg;
-        if (DEADMONSTER(mtmp)) {
+        if (damage_mon(mdef, dmg, AD_SPEL)) {
             if (yours)
-                killed(mtmp);
+                killed(mdef);
             else
-                monkilled(mtmp, "", AD_SPEL);
+                monkilled(mdef, "", AD_SPEL);
         }
     }
 }
 
 STATIC_OVL
 void
-ucast_cleric_spell(mattk, mtmp, dmg, spellnum)
-struct monst *mattk;
-struct monst *mtmp;
+ucast_cleric_spell(magr, mdef, dmg, spellnum)
+struct monst *magr, *mdef;
 int dmg;
 int spellnum;
 {
     int aligntype;
     static const char *Moloch = "Moloch";
-    boolean yours = (mattk == &youmonst);
+    boolean yours = (magr == &youmonst);
     struct monst *minion = (struct monst *) 0;
 
     if (dmg == 0 && !is_undirected_spell(AD_CLRC, spellnum)) {
@@ -2447,19 +2445,19 @@ int spellnum;
         return;
     }
 
-    if (mtmp && mtmp->mhp < 1) {
+    if (mdef && mdef->mhp < 1) {
         impossible("monster already dead?");
         return;
     }
 
     switch (spellnum) {
     case CLC_SUMMON_ELM:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("summon elemental spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("summon elemental spell with no mdef");
             return;
         }
 
-        aligntype = yours ? u.ualign.type : mon_aligntyp(mattk);
+        aligntype = yours ? u.ualign.type : mon_aligntyp(magr);
         minion = summon_minion(aligntype, FALSE);
         if (minion && canspotmon(minion))
             pline("A %s of %s appears!",
@@ -2469,109 +2467,109 @@ int spellnum;
         break;
     case CLC_GEYSER:
         /* this is physical damage, not magical damage */
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("geyser spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("geyser spell with no mdef");
             return;
         }
-        if (yours || canseemon(mtmp))
+        if (yours || canseemon(mdef))
             pline("A sudden geyser slams into %s from nowhere!",
-                  mon_nam(mtmp));
+                  mon_nam(mdef));
         dmg = d(8, 6);
-        (void) erode_armor(mtmp, ERODE_RUST);
+        (void) erode_armor(mdef, ERODE_RUST);
         break;
     case CLC_FIRE_PILLAR:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("fire pillar spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("fire pillar spell with no mdef");
             return;
         }
-        if (yours || canseemon(mtmp))
+        if (yours || canseemon(mdef))
             pline("A pillar of fire strikes all around %s!",
-                  mon_nam(mtmp));
-        if (resists_fire(mtmp) || defended(mtmp, AD_FIRE)) {
-            shieldeff(mtmp->mx, mtmp->my);
+                  mon_nam(mdef));
+        if (resists_fire(mdef) || defended(mdef, AD_FIRE)) {
+            shieldeff(mdef->mx, mdef->my);
             dmg = 0;
         } else
             dmg = d(8, 6);
-        (void) burnarmor(mtmp);
-        destroy_mitem(mtmp, SCROLL_CLASS, AD_FIRE);
-        destroy_mitem(mtmp, POTION_CLASS, AD_FIRE);
-        destroy_mitem(mtmp, SPBOOK_CLASS, AD_FIRE);
-        destroy_mitem(mtmp, WEAPON_CLASS, AD_FIRE);
-        (void) burn_floor_objects(mtmp->mx, mtmp->my, TRUE, FALSE);
+        (void) burnarmor(mdef);
+        destroy_mitem(mdef, SCROLL_CLASS, AD_FIRE);
+        destroy_mitem(mdef, POTION_CLASS, AD_FIRE);
+        destroy_mitem(mdef, SPBOOK_CLASS, AD_FIRE);
+        destroy_mitem(mdef, WEAPON_CLASS, AD_FIRE);
+        (void) burn_floor_objects(mdef->mx, mdef->my, TRUE, FALSE);
         break;
     case CLC_LIGHTNING: {
         boolean reflects;
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("lightning spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("lightning spell with no mdef");
             return;
         }
 
-        if (yours || canseemon(mtmp))
+        if (yours || canseemon(mdef))
             pline("A bolt of lightning strikes down at %s from above!",
-                  mon_nam(mtmp));
-        reflects = mon_reflects(mtmp, "It bounces off %s %s.");
-        if (reflects || resists_elec(mtmp) || defended(mtmp, AD_ELEC)) {
+                  mon_nam(mdef));
+        reflects = mon_reflects(mdef, "It bounces off %s %s.");
+        if (reflects || resists_elec(mdef) || defended(mdef, AD_ELEC)) {
             shieldeff(u.ux, u.uy);
             dmg = 0;
             if (reflects)
                 break;
         } else
             dmg = d(8, 6);
-        destroy_mitem(mtmp, WAND_CLASS, AD_ELEC);
-        destroy_mitem(mtmp, RING_CLASS, AD_ELEC);
+        destroy_mitem(mdef, WAND_CLASS, AD_ELEC);
+        destroy_mitem(mdef, RING_CLASS, AD_ELEC);
         break;
     }
     case CLC_CURSE_ITEMS:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("curse spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("curse spell with no mdef");
             return;
         }
-        if (yours || canseemon(mtmp))
-            You_feel("as though %s needs some help.", mon_nam(mtmp));
-        mrndcurse(mtmp);
+        if (yours || canseemon(mdef))
+            You_feel("as though %s needs some help.", mon_nam(mdef));
+        mrndcurse(mdef);
         dmg = 0;
         break;
     case CLC_INSECTS: {
         /* Try for insects, and if there are none
            left, go for (sticks to) snakes.  -3. */
         struct permonst *pm = mkclass(S_ANT, 0);
-        struct monst *mtmp2 = (struct monst *) 0;
+        struct monst *mdef2 = (struct monst *) 0;
         char let = (pm ? S_ANT : S_SNAKE);
         boolean success;
         int i;
         coord bypos;
         int quan;
 
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("insect spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("insect spell with no mdef");
             return;
         }
 
-        if (mtmp)
-            bypos.x = mtmp->mx, bypos.y = mtmp->my;
+        if (mdef)
+            bypos.x = mdef->mx, bypos.y = mdef->my;
         else if (yours)
             bypos.x = u.ux, bypos.y = u.uy;
         else
-            bypos.x = mattk->mx, bypos.y = mattk->my;
+            bypos.x = magr->mx, bypos.y = magr->my;
 
         quan = (mons[u.umonnum].mlevel < 2) ? 1 :
          	rnd(mons[u.umonnum].mlevel / 2);
         if (quan < 3) quan = 3;
             success = pm ? TRUE : FALSE;
         for (i = 0; i <= quan; i++) {
-            if (!enexto(&bypos, mtmp->mx, mtmp->my, mtmp->data))
+            if (!enexto(&bypos, mdef->mx, mdef->my, mdef->data))
                 break;
             if ((pm = mkclass(let, 0)) != 0
-                && (mtmp2 = makemon(pm, bypos.x, bypos.y, NO_MM_FLAGS)) != 0) {
+                && (mdef2 = makemon(pm, bypos.x, bypos.y, NO_MM_FLAGS)) != 0) {
                 success = TRUE;
-                mtmp2->msleeping = 0;
-                if (yours || mattk->mtame)
-                    (void) tamedog(mtmp2, (struct obj *) 0);
-                else if (mattk->mpeaceful)
-                    mtmp2->mpeaceful = 1;
+                mdef2->msleeping = 0;
+                if (yours || magr->mtame)
+                    (void) tamedog(mdef2, (struct obj *) 0);
+                else if (magr->mpeaceful)
+                    mdef2->mpeaceful = 1;
                 else
-                    mtmp2->mpeaceful = 0;
-                set_malign(mtmp2);
+                    mdef2->mpeaceful = 0;
+                set_malign(mdef2);
             }
         }
 
@@ -2582,70 +2580,70 @@ int spellnum;
                 You("transforms a clump of sticks into snakes!");
             else
                 You("summon insects!");
-        } else if (canseemon(mtmp)) {
+        } else if (canseemon(mdef)) {
             if (!success)
                 pline("%s casts at a clump of sticks, but nothing happens.",
-                      Monnam(mattk));
+                      Monnam(magr));
             else if (let == S_SNAKE)
                 pline("%s transforms a clump of sticks into snakes!",
-                      Monnam(mattk));
+                      Monnam(magr));
             else
-                pline("%s summons insects!", Monnam(mattk));
+                pline("%s summons insects!", Monnam(magr));
         }
         dmg = 0;
         break;
     }
     case CLC_BLIND_YOU:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("blindness spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("blindness spell with no mdef");
             return;
         }
         /* note: resists_blnd() doesn't apply here */
-        if (!mtmp->mblinded
-            && haseyes(mtmp->data)) {
-            if (!resists_blnd(mtmp)) {
-                int num_eyes = eyecount(mtmp->data);
-                if (yours || canseemon(mtmp))
-                    pline("Scales cover %s %s!", s_suffix(mon_nam(mtmp)),
+        if (!mdef->mblinded
+            && haseyes(mdef->data)) {
+            if (!resists_blnd(mdef)) {
+                int num_eyes = eyecount(mdef->data);
+                if (yours || canseemon(mdef))
+                    pline("Scales cover %s %s!", s_suffix(mon_nam(mdef)),
                           (num_eyes == 1) ? "eye" : "eyes");
-                mtmp->mblinded = 127;
+                mdef->mblinded = 127;
             }
             dmg = 0;
         } else if (!yours)
             impossible("no reason for monster to cast blindness spell?");
         break;
     case CLC_PARALYZE:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("paralysis spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("paralysis spell with no mdef");
             return;
         }
-        if (resist(mtmp, 0, 0, FALSE)) {
-            shieldeff(mtmp->mx, mtmp->my);
-            if (yours || canseemon(mtmp))
-                pline("%s stiffens briefly.", Monnam(mtmp));
+        if (resist(mdef, 0, 0, FALSE)) {
+            shieldeff(mdef->mx, mdef->my);
+            if (yours || canseemon(mdef))
+                pline("%s stiffens briefly.", Monnam(mdef));
         } else {
-            if (yours || canseemon(mtmp))
-                pline("%s is frozen in place!", Monnam(mtmp));
+            if (yours || canseemon(mdef))
+                pline("%s is frozen in place!", Monnam(mdef));
             dmg = 4 + mons[u.umonnum].mlevel;
-            mtmp->mcanmove = 0;
-            mtmp->mfrozen = dmg;
+            mdef->mcanmove = 0;
+            mdef->mfrozen = dmg;
         }
         dmg = 0;
         break;
     case CLC_CONFUSE_YOU:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("confusion spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("confusion spell with no mdef");
             return;
         }
-        if (resist(mtmp, 0, 0, FALSE)) {
-            shieldeff(mtmp->mx, mtmp->my);
-            if (yours || canseemon(mtmp))
-                pline("%s seems momentarily dizzy.", Monnam(mtmp));
+        if (resist(mdef, 0, 0, FALSE)) {
+            shieldeff(mdef->mx, mdef->my);
+            if (yours || canseemon(mdef))
+                pline("%s seems momentarily dizzy.", Monnam(mdef));
         } else {
-            if (yours || canseemon(mtmp))
-                pline("%s seems %sconfused!", Monnam(mtmp),
-                      mtmp->mconf ? "more " : "");
-            mtmp->mconf = 1;
+            if (yours || canseemon(mdef))
+                pline("%s seems %sconfused!", Monnam(mdef),
+                      mdef->mconf ? "more " : "");
+            mdef->mconf = 1;
         }
         dmg = 0;
         break;
@@ -2663,50 +2661,50 @@ int spellnum;
         }
         break;
     case CLC_VULN_YOU:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("vulnerable spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("vulnerable spell with no mdef");
             return;
         }
 
-        if (yours || canseemon(mtmp)) {
+        if (yours || canseemon(mdef)) {
             dmg = rnd(5);
             pline("A %s film oozes over %s exterior!",
-                  Blind ? "slimy" : vulntext[dmg], mhis(mtmp));
+                  Blind ? "slimy" : vulntext[dmg], mhis(mdef));
             switch (dmg) {
             case 1:
-                if ((mtmp->data->mflags4 & M4_VULNERABLE_FIRE) != 0
-                    || mtmp->vuln_fire)
+                if ((mdef->data->mflags4 & M4_VULNERABLE_FIRE) != 0
+                    || mdef->vuln_fire)
                     return;
-                mtmp->vuln_fire = rnd(100) + 150;
-                pline("%s is more inflammable.", Monnam(mtmp));
+                mdef->vuln_fire = rnd(100) + 150;
+                pline("%s is more inflammable.", Monnam(mdef));
                 break;
             case 2:
-                if ((mtmp->data->mflags4 & M4_VULNERABLE_COLD) != 0
-                    || mtmp->vuln_cold)
+                if ((mdef->data->mflags4 & M4_VULNERABLE_COLD) != 0
+                    || mdef->vuln_cold)
                     return;
-                mtmp->vuln_cold = rnd(100) + 150;
-                pline("%s is extremely chilly.", Monnam(mtmp));
+                mdef->vuln_cold = rnd(100) + 150;
+                pline("%s is extremely chilly.", Monnam(mdef));
                 break;
             case 3:
-                if ((mtmp->data->mflags4 & M4_VULNERABLE_ELEC) != 0
-                    || mtmp->vuln_elec)
+                if ((mdef->data->mflags4 & M4_VULNERABLE_ELEC) != 0
+                    || mdef->vuln_elec)
                     return;
-                mtmp->vuln_elec = rnd(100) + 150;
-                pline("%s is overly conductive.", Monnam(mtmp));
+                mdef->vuln_elec = rnd(100) + 150;
+                pline("%s is overly conductive.", Monnam(mdef));
                 break;
             case 4:
-                if ((mtmp->data->mflags4 & M4_VULNERABLE_ACID) != 0
-                    || mtmp->vuln_acid)
+                if ((mdef->data->mflags4 & M4_VULNERABLE_ACID) != 0
+                    || mdef->vuln_acid)
                     return;
-                mtmp->vuln_acid = rnd(100) + 150;
-                pline("%s is easily corrodable.", Monnam(mtmp));
+                mdef->vuln_acid = rnd(100) + 150;
+                pline("%s is easily corrodable.", Monnam(mdef));
                 break;
             case 5:
-                if ((mtmp->data->mflags4 & M4_VULNERABLE_LOUD) != 0
-                    || mtmp->vuln_loud)
+                if ((mdef->data->mflags4 & M4_VULNERABLE_LOUD) != 0
+                    || mdef->vuln_loud)
                     return;
-                mtmp->vuln_loud = rnd(100) + 150;
-                pline("%s is hyperacute.", Monnam(mtmp));
+                mdef->vuln_loud = rnd(100) + 150;
+                pline("%s is hyperacute.", Monnam(mdef));
                 break;
             default:
                 break;
@@ -2715,29 +2713,29 @@ int spellnum;
         dmg = 0;
         break;
     case CLC_OPEN_WOUNDS:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("wound spell with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("wound spell with no mdef");
             return;
         }
-        if (resist(mtmp, 0, 0, FALSE)) {
-            shieldeff(mtmp->mx, mtmp->my);
+        if (resist(mdef, 0, 0, FALSE)) {
+            shieldeff(mdef->mx, mdef->my);
             dmg = (dmg + 1) / 2;
         }
         /* not canseemon; if you can't see it you don't know it was wounded */
         if (yours) {
             if (dmg <= 5)
-                pline("%s looks itchy!", Monnam(mtmp));
+                pline("%s looks itchy!", Monnam(mdef));
             else if (dmg <= 10)
-                pline("Wounds appear on %s!", mon_nam(mtmp));
+                pline("Wounds appear on %s!", mon_nam(mdef));
             else if (dmg <= 20)
-                pline("Severe wounds appear on %s!", mon_nam(mtmp));
+                pline("Severe wounds appear on %s!", mon_nam(mdef));
             else
-                pline("%s is covered in wounds!", Monnam(mtmp));
+                pline("%s is covered in wounds!", Monnam(mdef));
         }
         break;
     case CLC_PROTECTION:
-        if (!mtmp || mtmp->mhp < 1) {
-            impossible("protection with no mtmp");
+        if (!mdef || mdef->mhp < 1) {
+            impossible("protection with no mdef");
             return;
         }
         if (yours)
@@ -2750,12 +2748,11 @@ int spellnum;
     }
 
     if (dmg) {
-        mtmp->mhp -= dmg;
-        if (DEADMONSTER(mtmp)) {
+        if (damage_mon(mdef, dmg, AD_CLRC)) {
             if (yours)
-                killed(mtmp);
+                killed(mdef);
             else
-                monkilled(mtmp, "", AD_CLRC);
+                monkilled(mdef, "", AD_CLRC);
         }
     }
 }
diff --git a/src/mhitm.c b/src/mhitm.c
index 51805b4cd..c93a168cf 100644
--- a/src/mhitm.c
+++ b/src/mhitm.c
@@ -2933,14 +2933,14 @@ int dmg;
                 pline("%s shudders!", Before);
 
             dmg += (mdef->mhpmax + 1) / 2;
-            mdef->mhp -= dmg;
-            dmg = 0;
-            if (DEADMONSTER(mdef)) {
+            
+            if (damage_mon(mdef, dmg, AD_PHYS)) {
                 if (magr == &youmonst)
                     xkilled(mdef, XKILL_GIVEMSG | XKILL_NOCORPSE);
                 else
                     monkilled(mdef, "", AD_RBRE);
             }
+            dmg = 0;
         } else if (newcham(mdef, (struct permonst *) 0, FALSE, FALSE)) {
             if (vis) { /* either seen or adjacent */
                 boolean was_seen = !!strcmpi("It", Before),
@@ -3146,7 +3146,7 @@ struct obj *mwep;
                             if (rn2(40)) {
                                 if (canseemon(magr))
                                     pline("%s partially disintegrates!", Monnam(magr));
-                                magr->mhp -= rnd(4);
+                                damage_mon(magr, rnd(4), AD_PHYS);
                             } else {
                                 if (canseemon(magr))
                                     pline("%s is disintegrated completely!", Monnam(magr));
diff --git a/src/mhitu.c b/src/mhitu.c
index 6374a4712..7d055fc20 100644
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -1071,7 +1071,7 @@ register struct monst *mtmp;
                         }
                     } else {
                         missmu(mtmp, tmp, j, mattk);
-                        if (uarms && !rn2(3))
+                        if (uarms && !rn2(7))
                             use_skill(P_SHIELD, 1);
                         /* if the attacker dies from a glancing blow off
                            of a piece of the player's armor, and said armor
@@ -1125,7 +1125,7 @@ register struct monst *mtmp;
                         sum[i] = gulpmu(mtmp, mattk);
                     } else {
                         missmu(mtmp, tmp, j, mattk);
-                        if (uarms && !rn2(3))
+                        if (uarms && !rn2(7))
                             use_skill(P_SHIELD, 1);
                     }
                 } else if (is_swallower(mtmp->data)) {
@@ -1221,7 +1221,7 @@ register struct monst *mtmp;
                         sum[i] = hitmu(mtmp, mattk);
                     } else {
                         missmu(mtmp, tmp, j, mattk);
-                        if (uarms && !rn2(3))
+                        if (uarms && !rn2(7))
                             use_skill(P_SHIELD, 1);
                     }
                     /* KMH -- Don't accumulate to-hit bonuses */
@@ -3404,6 +3404,12 @@ struct monst *mtmp;
 struct attack *mattk;
 {
     int fate, dmg = d((int) mattk->damn, (int) mattk->damd);
+    int maxrange = 128;
+    
+    if (mtmp->data == &mons[PM_SCREAMER] 
+        || mtmp->data == &mons[PM_GIBBERLING])
+        maxrange = 9;
+    
     long lcount;
     boolean wakeup, has_toque = uarmh && uarmh->otyp == TOQUE;
     /* TODO: Are there polyforms that are deaf too? */
@@ -3415,7 +3421,7 @@ struct attack *mattk;
      * Only screams when a certain distance from our hero,
      * can see them, and has the available mspec.
      */
-    if (distu(mtmp->mx, mtmp->my) > 128 || !m_canseeu(mtmp)
+    if (distu(mtmp->mx, mtmp->my) > maxrange || !m_canseeu(mtmp)
         || mtmp->mspec_used)
         return FALSE;
 
@@ -3525,13 +3531,15 @@ struct attack *mattk;
         stop_occupation();
         break;
     case AD_SONG:
-        /* Harpies have an entracing song that paralyzes */
+        /* Harpies have an entrancing song that paralyzes */
         if (!can_hear)
             break; /* No inventory effects */
-        if (m_canseeu(mtmp) && !u.usleep)
-            pline("%s releases a hypnotic melody!", Monnam(mtmp));
-        else
-            You("dream of singing angels...");
+        if (m_canseeu(mtmp)) {
+            if (!u.usleep)
+                pline("%s releases a hypnotic melody!", Monnam(mtmp));
+            else
+                You("dream of singing angels...");
+        }
 
         if (how_resistant(SONIC_RES) > 50)
             break; /* No inventory damage! */
@@ -4878,17 +4886,16 @@ struct attack *mattk;
             tmp += destroy_mitem(mtmp, WEAPON_CLASS, AD_FIRE);
         tmp += destroy_mitem(mtmp, POTION_CLASS, AD_FIRE);
         
-        if ((mtmp->mhp -= tmp) <= 0) {
-            xkilled(mtmp,0);
-            if (mtmp->mhp > 0) 
-                return 1;
+        if (damage_mon(mtmp, tmp, AD_FIRE)) {
+            xkilled(mtmp, 0);
             return 2;
+        } else {
+            return 1;
         }
     }
     
-    /* Ice Mage gets a passive cold attack that grows as they get stronger
-     * and their ice armor becomes more powerful. We'll delay it a few levels
-     * so really low level ice mages have to work for it. */
+    /* Ice Armor tech for Ice Mages. As they get stronger their 
+     * ice armor becomes more powerful. */
     if (tech_inuse(T_ICEARMOR)) {
         int icetmp = icebonus();
         if (resists_cold(mtmp) || defended(mtmp, AD_COLD)) {
@@ -4906,11 +4913,11 @@ struct attack *mattk;
                 tmp += destroy_mitem(mtmp, POTION_CLASS, AD_COLD);
             
             showdmg(tmp, FALSE);
-            if ((mtmp->mhp -= tmp) <= 0) {
+            if (damage_mon(mtmp, tmp, AD_COLD)) {
                 xkilled(mtmp, 0);
-                if (mtmp->mhp > 0)
-                    return 1;
                 return 2;
+            } else {
+                return 1;
             }
         }
     }
@@ -5000,7 +5007,8 @@ struct attack *mattk;
                     if (rn2(40)) {
                         if (canseemon(mtmp))
                             pline("%s partially disintegrates!", Monnam(mtmp));
-                        mtmp->mhp -= rnd(4);
+                        if (damage_mon(mtmp, rnd(4), AD_PHYS))
+                            xkilled(mtmp, XKILL_NOMSG | XKILL_NOCORPSE);
                     } else {
                         if (canseemon(mtmp))
                             pline("%s is disintegrated completely!", Monnam(mtmp));
@@ -5018,10 +5026,10 @@ struct attack *mattk;
                         } else {
                             xkilled(mtmp, XKILL_NOMSG | XKILL_NOCORPSE);
                         }
-                        if (!DEADMONSTER(mtmp))
-                            return 1;
-                        return 2;
                     }
+                    if (!DEADMONSTER(mtmp))
+                        return 1;
+                    return 2;
                 }
             }
             if (mtmp->mhp < 1) {
diff --git a/src/minion.c b/src/minion.c
index 01e7f0504..1fbfa1513 100644
--- a/src/minion.c
+++ b/src/minion.c
@@ -561,7 +561,7 @@ gain_guardian_angel()
 
     Hear_again(); /* attempt to cure any deafness now (divine
                      message will be heard even if that fails) */
-    if (Conflict || u.ualign.type == A_NONE) {
+    if (Conflict || Uevil_inherently) {
         if (!Deaf)
             pline("A voice booms:");
         else
diff --git a/src/mklev.c b/src/mklev.c
index 9016ee9a7..aee72c6a8 100644
--- a/src/mklev.c
+++ b/src/mklev.c
@@ -857,6 +857,7 @@ clear_level_structures()
     level.bonesinfo = (struct cemetery *) 0;
 
     level.flags.nforges = 0;
+    level.flags.nmagicchests = 0;
     level.flags.nfountains = 0;
     level.flags.nvents = 0;
     level.flags.nsinks = 0;
diff --git a/src/mkobj.c b/src/mkobj.c
index 0571b0e39..021ba6af8 100644
--- a/src/mkobj.c
+++ b/src/mkobj.c
@@ -550,6 +550,7 @@ struct obj *obj;
     case OBJ_ONBILL:
     case OBJ_MIGRATING:
     case OBJ_BURIED:
+    case OBJ_SOMEWHERE:
     default:
         return (struct obj *) 0;
     case OBJ_INVENT:
@@ -729,7 +730,7 @@ static const char *const alteration_verbs[] = {
     "cancel", "drain", "uncharge", "unbless", "uncurse", "disenchant",
     "degrade", "dilute", "erase", "burn", "neutralize", "destroy", "splatter",
     "bite", "open", "break the lock on", "rust", "rot", "tarnish", "fracture", 
-    "deteriorate", "ferment"
+    "deteriorate", "transmogrify", "ferment"
 };
 
 /* possibly bill for an object which the player has just modified */
@@ -1032,6 +1033,10 @@ boolean artif;
                 otmp->olocked = 1;
                 mkbox_cnts(otmp);
                 break;
+            case HIDDEN_CHEST: /* should not happen unless wizmode wishing */
+                otmp->olocked = 0;
+                otmp->otrapped = 0;
+                break;
             case CRYSTAL_CHEST:
                 otmp->olocked = 1;
                 otmp->otrapped = 0;
@@ -1467,7 +1472,9 @@ struct obj *body;
             }
         }
     /* corpse of an actual zombie */
-    } else if (body->zombie_corpse && !body->norevive) {
+    } else if (body->zombie_corpse && !body->norevive
+          /* Priests have a chance to put down zombies for good. */
+          && !(Role_if(PM_PRIEST) && rn2(3))) {
         for (age = 2; age <= ROT_AGE; age++) {
             if (!rn2(ZOMBIE_REVIVE_CHANCE)) { /* zombie revives */
                 action = ZOMBIFY_MON; /* if buried, can dig itself out */
@@ -1834,7 +1841,7 @@ register struct obj *obj;
     
     /* Items with burden property */
     if (obj->oprops & ITEM_BURDEN)
-        wt *= 4;
+        wt *= 8;
     
     return (wt ? wt * (int) obj->quan : ((int) obj->quan + 1) >> 1);
 }
@@ -2444,6 +2451,9 @@ struct obj *obj;
     case OBJ_ONBILL:
         extract_nobj(obj, &billobjs);
         break;
+    case OBJ_SOMEWHERE:
+        extract_nobj(obj, &mchest);
+        break;
     default:
         panic("obj_extract_self");
         break;
@@ -2781,6 +2791,7 @@ obj_sanity_check()
 
     objlist_sanity(invent, OBJ_INVENT, "invent sanity");
     objlist_sanity(migrating_objs, OBJ_MIGRATING, "migrating sanity");
+    objlist_sanity(mchest, OBJ_SOMEWHERE, "magic chest sanity");
     objlist_sanity(level.buriedobjlist, OBJ_BURIED, "buried sanity");
     objlist_sanity(billobjs, OBJ_ONBILL, "bill sanity");
 
@@ -3663,6 +3674,17 @@ static const struct icp rod_materials[] = {
     { 3, PLATINUM},
 };
 
+/* Fun material! */
+static const struct icp unihorn_materials[] = {
+        {30, GLASS},
+        {30, BONE},
+        {20, GOLD},
+        { 5, WOOD},
+        { 5, GEMSTONE},
+        { 5, PLASTIC},
+        { 5, SILVER},
+};
+
 static const struct icp sling_bullet_materials[] = {
     {65, IRON},
     {15, METAL},
@@ -3705,6 +3727,8 @@ struct obj* obj;
         case GRAPPLING_HOOK:
         case IRON_SAFE:
         case CRYSTAL_CHEST:
+        case HIDDEN_CHEST:
+        case MAGIC_KEY:
         case LEATHER_DRUM:
         case DRUM_OF_EARTHQUAKE:
         case LAND_MINE:
@@ -3798,6 +3822,8 @@ struct obj* obj;
             return sling_bullet_materials;
         case SABER:
             return shiny_materials;
+        case UNICORN_HORN:
+            return unihorn_materials;
         default:
             break;
     }
@@ -3994,7 +4020,7 @@ warp_material(struct obj* obj, boolean by_you)
     if (origmat != obj->material) {
         /* Charge for the cost of the object */
         if (by_you)
-            costly_alteration(obj, COST_DRAIN);
+            costly_alteration(obj, COST_TRANSMOGRIFY);
         return TRUE;
     }
     return FALSE;
diff --git a/src/mkroom.c b/src/mkroom.c
index f9f8f7567..8ce3b97ec 100644
--- a/src/mkroom.c
+++ b/src/mkroom.c
@@ -1333,8 +1333,6 @@ realzoomon() {
     else if (i > 45)
         return rn2(3) ? &mons[PM_PANTHER] 
                       : &mons[PM_HIPPO];
-    else if (i > 25)
-        return &mons[PM_LANDSHARK];
     else if (i > 25)
         return &mons[PM_JAGUAR];
     else if (i > 15)
@@ -1549,6 +1547,9 @@ int sym;
     case S_forge:
         typ = FORGE;
         break;
+    case S_magic_chest:
+        typ = MAGIC_CHEST;
+        break;
     case S_fountain:
         typ = FOUNTAIN;
         break;
diff --git a/src/mon.c b/src/mon.c
index 28e64224b..297537c69 100644
--- a/src/mon.c
+++ b/src/mon.c
@@ -635,23 +635,6 @@ unsigned corpseflags;
         break;
     case PM_TIAMAT:
         goto default_1;
-    case PM_TIGER:
-        if (!mtmp->mrevived && !rn2(100)) {
-            int otyp;
-            for (otyp = bases[RING_CLASS]; otyp < bases[RING_CLASS+1];
-                 ++otyp) {
-                const char *s;
-                if ((s = OBJ_DESCR(objects[otyp])) != 0
-                    && !strcmp(s, "tiger eye"))
-                    break;
-            }
-            if (otyp >= bases[RING_CLASS + 1])
-                impossible("No tiger eye ring?");
-            else {
-                obj = mksobj_at(otyp, x, y, FALSE, FALSE);
-            }
-        }
-        goto default_1;
     case PM_WHITE_UNICORN:
     case PM_GRAY_UNICORN:
     case PM_BLACK_UNICORN:
@@ -1074,15 +1057,14 @@ register struct monst *mtmp;
         int dam = d(3, 12);
         if (canseemon(mtmp))
             pline_The("water burns %s flesh!", s_suffix(mon_nam(mtmp)));
-        mtmp->mhp -= dam;
         if (mtmp->mhpmax > dam)
             mtmp->mhpmax -= (dam + 1) / 2;
-        if (DEADMONSTER(mtmp)) {
+        
+        if (damage_mon(mtmp, dam, AD_PHYS)) {
             if (canseemon(mtmp))
                 pline("%s dies.", Monnam(mtmp));
             mondead(mtmp);
-            if (DEADMONSTER(mtmp))
-                return 1;
+            return 1;
         }
         return 0;
     }
@@ -1255,6 +1237,7 @@ mcalcdistress()
 {
     struct monst *mtmp;
     struct obj *obj, *otmp;
+    int wither;
 
     for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) {
         if (DEADMONSTER(mtmp))
@@ -1426,8 +1409,8 @@ mcalcdistress()
 
         /* wither away */
         if (mtmp->mwither) {
-            mtmp->mhp -= (rnd(2) - (regenerates(mtmp->data) ? 1 : 0));
-            if (DEADMONSTER(mtmp)) {
+            wither = rnd(2) - (regenerates(mtmp->data) ? 1 : 0);
+            if (damage_mon(mtmp, wither, AD_WTHR)) {
                 if (canspotmon(mtmp))
                     pline("%s withers away completely!", Monnam(mtmp));
 
@@ -2269,18 +2252,32 @@ register const char *str;
     if (is_floater(mtmp->data) || can_levitate(mtmp))
         return FALSE;
 
-    for (otmp = level.objects[mtmp->mx][mtmp->my]; otmp; otmp = otmp2) {
+    if (IS_MAGIC_CHEST(levl[mtmp->mx][mtmp->my].typ)) {
+        /* set temporarily to make the for loop smoother,
+           too many continues to change it to a while nicely. */
+        mchest->nexthere = level.objects[mtmp->mx][mtmp->my];
+        otmp = mchest;
+    } else {
+        otmp = level.objects[mtmp->mx][mtmp->my];
+    }
+    for (; otmp; otmp = otmp2) {
         otmp2 = otmp->nexthere;
-        if (Is_box(otmp) || otmp->otyp == ICE_BOX) {
+        if (Is_box(otmp) || otmp->otyp == ICE_BOX
+            || (Is_allbag(otmp) && !can_carry(mtmp, otmp))) {
             if (nohands(mtmp->data) || r_verysmall(mtmp))
                 continue;
             if (otmp->olocked) {
                 if ((nohands(mtmp->data) || r_verysmall(mtmp)
                     || otmp->otyp == IRON_SAFE
                     || otmp->otyp == CRYSTAL_CHEST
+                    || (otmp->otyp == HIDDEN_CHEST
+                        && !m_carrying(mtmp, MAGIC_KEY))
+                        /* monsters don't think to use artifacts on either
+                           magic or crystal chests */
                     || (!m_carrying(mtmp, SKELETON_KEY)
                         && !m_carrying(mtmp, LOCK_PICK)
-                        && !m_carrying(mtmp, CREDIT_CARD)))
+                        && !m_carrying(mtmp, CREDIT_CARD)
+                        && !m_carrying(mtmp, MAGIC_KEY)))
                     && !mtmp->iswiz && !is_rider(mtmp->data))
                     continue;
                 waslocked = TRUE;
@@ -2300,6 +2297,7 @@ register const char *str;
                 }
                 otmp->olocked = 0;
                 (void) chest_trap(mtmp, otmp, FINGER, FALSE);
+                mchest->nexthere = (struct obj *) 0;
                 return TRUE;
             }
             for (otmp3 = otmp->cobj; otmp3; otmp3 = otmp4) {
@@ -2316,7 +2314,8 @@ register const char *str;
                         continue;
                     if (!touch_artifact(otmp3, mtmp))
                         continue;
-                    if (!can_carry(mtmp, otmp3))
+                    carryamt = can_carry(mtmp, otmp3);
+                    if (carryamt == 0)
                         continue;
                     if (is_pool(mtmp->mx, mtmp->my))
                         continue;
@@ -2336,11 +2335,16 @@ register const char *str;
                     }
                     otmp->olocked = 0;
                     mloot_container(mtmp, otmp, vismon);
+                    otmp->owt = weight(otmp);
                     newsym(mtmp->mx, mtmp->my);
+                    mchest->nexthere = (struct obj *) 0;
                     return TRUE;
                 }
             }
         }
+        /* magic chests can be looted but not picked up. */
+        if (otmp == mchest)
+            continue;
 
         /* Nymphs take everything.  Most monsters don't pick up corpses. */
         if (!str ? searches_for_item(mtmp, otmp)
@@ -2375,9 +2379,11 @@ register const char *str;
             /* let them try and equip it on the next turn */
             check_gear_next_turn(mtmp);
             newsym(mtmp->mx, mtmp->my);
+            mchest->nexthere = (struct obj *) 0;
             return TRUE; /* pick only one object */
         }
     }
+    mchest->nexthere = (struct obj *) 0;
     return FALSE;
 }
 
@@ -4562,8 +4568,7 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
      */
     if (((always_peaceful(mdat) && mtmp->malign <= 0)
         || (mtmp->isshk && !is_zombie(mdat)))
-        && u.ualign.type != A_CHAOTIC
-        && u.ualign.type != A_NONE) {
+        && u.ualign.type != A_CHAOTIC && !Uevil_inherently) {
         HTelepat &= ~INTRINSIC;
         change_luck(-2);
         You("murderer!");
@@ -4585,7 +4590,7 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
     /* adjust alignment points */
     if (mtmp->m_id == quest_status.leader_m_id) { /* REAL BAD! */
         quest_status.leader_is_dead = TRUE;
-        if (u.ualign.type != A_NONE) {
+        if (!Uevil_inherently) {
             if (canspotmon(mtmp))
                 You_feel("very guilty.");
             else
@@ -4603,14 +4608,14 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
         if (!quest_status.killed_leader)
             adjalign((int) (ALIGNLIM / 4));
     } else if (mdat->msound == MS_GUARDIAN) { /* Bad */
-        if (u.ualign.type != A_NONE) {
+        if (!Uevil_inherently) {
             if (canspotmon(mtmp))
                 You_feel("guilty.");
             else
                 You("have a vague sense of guilt.");
             adjalign(-(int) (ALIGNLIM / 8));
         }
-        if (u.ualign.type == A_NONE)
+        if (Uevil_inherently)
             ; /* Moloch's indifference */
         else
             u.ugangr++;
@@ -4629,7 +4634,7 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
         else if (u.ualign.type == A_NONE && mdat->maligntyp == A_LAWFUL)
             adjalign((int) (ALIGNLIM / 4)); /* Infidel-only BIG bonus */
     } else if (mtmp->mtame) {
-        if (u.ualign.type == A_NONE) {
+        if (Uevil_inherently) {
             if (canspotmon(mtmp))
                 You_feel("guilty.");
             else
@@ -4645,7 +4650,7 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
         /* your god is mighty displeased... */
         if (!Deaf) {
             if (!Hallucination) {
-                if (u.ualign.type == A_NONE)
+                if (Uevil_inherently)
                     You_hear("sinister laughter off in the distance...");
                 else
                     You_hear("the rumble of distant thunder...");
@@ -4661,7 +4666,7 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
                            uhis(), mdat->mname);
         }
     } else if (mtmp->mpeaceful) {
-        if (u.ualign.type != A_NONE) {
+        if (!Uevil_inherently) {
             if (canspotmon(mtmp))
                 You_feel("guilty.");
             else
@@ -4681,22 +4686,6 @@ int xkill_flags; /* 1: suppress message, 2: suppress corpse, 4: pacifist */
                                mtmp->former_rank.mnum,
                                mtmp->former_rank.female));
     }
-    if (is_gnome(mtmp->data) && !is_undead(mtmp->data)) {
-        if (!rn2(25) && !(mtmp->mflee || mtmp->msleeping
-                          || mtmp->mstun || mtmp->mconf || mtmp->mfrozen)) {
-            for (otmp = invent; otmp; otmp = otmp->nobj) {
-                if (otmp->otyp == EGG && otmp->corpsenm == NON_PM) {
-                    if (canseemon(mtmp))
-                        pline("%s looks at you and is immediately agitated.",
-                              Monnam(mtmp));
-                    if (!Deaf)
-                        verbalize("Ahhhh!  Eggs!  %s has eggs!!",
-                                  (flags.female) ? "She" : "He");
-                    monflee(mtmp, d(2, 6) + 10, TRUE, TRUE);
-                }
-            }
-        }
-    }
 }
 
 /* changes the monster into a stone monster of the same type
@@ -5044,6 +5033,7 @@ void
 m_respond(mtmp)
 struct monst *mtmp;
 {
+    struct obj *otmp;
     int i;
     if (mtmp->data->msound == MS_SHRIEK) {
         if (!Deaf && !(uarmh && uarmh->otyp == TOQUE)) {
@@ -5094,6 +5084,24 @@ struct monst *mtmp;
                 break;
             }
     }
+
+    if (is_gnome(mtmp->data) && !is_undead(mtmp->data)) {
+        if (!rn2(25) && !(mtmp->mflee || mtmp->msleeping
+                          || mtmp->mstun || mtmp->mconf || mtmp->mfrozen)) {
+            for (otmp = invent; otmp; otmp = otmp->nobj) {
+                if (otmp->otyp == EGG && otmp->corpsenm == NON_PM) {
+                    if (canseemon(mtmp))
+                        pline("%s looks at you and is immediately agitated.",
+                              Monnam(mtmp));
+                    if (!Deaf)
+                        verbalize("Ahhhh!  Eggs!  %s has eggs!!",
+                                  (flags.female) ? "She" : "He");
+                    monflee(mtmp, d(2, 6) + 10, TRUE, TRUE);
+                    break;
+                }
+            }
+        }
+    }
     /* Frightful presence! */
     boolean roaring_dragon = mtmp->data->msound == MS_MEGAROAR
                              && !mtmp->mpeaceful
@@ -5164,7 +5172,7 @@ boolean via_attack;
            it's intentionally larger than the 1s and 2s that are normally
            given for this sort of thing. */
         /* reduce to 3 (average) when alignment is already very low */
-        if (u.ualign.type != A_NONE) {
+        if (!Uevil_inherently) {
             You_feel("like a hypocrite.");
             adjalign(-1);
         } else
@@ -5205,7 +5213,8 @@ boolean via_attack;
             }
         } else {
             /* Prevent guilt spam in Black Market when angering everybody */
-            if (u.ualign.type != A_NONE && !Is_blackmarket(&u.uz)) { /* Infidels are supposed to be bad */
+            /* Infidels are supposed to be bad */
+            if (!Uevil_inherently && !Is_blackmarket(&u.uz)) {
                 if (canspotmon(mtmp))
                     You_feel("guilty.");
                 else
@@ -5302,7 +5311,7 @@ boolean via_attack;
                                    perhaps reduce tameness? */
                             } else {
                                 mon->mpeaceful = 0;
-                                if (u.ualign.type != A_NONE && !Is_blackmarket(&u.uz)) {
+                                if (!Uevil_inherently && !Is_blackmarket(&u.uz)) {
                                     if (canspotmon(mon))
                                         You_feel("guilty.");
                                     else
@@ -6424,6 +6433,7 @@ kill_genocided_monsters()
     kill_eggs(invent);
     kill_eggs(fobj);
     kill_eggs(migrating_objs);
+    kill_eggs(mchest);
     kill_eggs(level.buriedobjlist);
 }
 
@@ -6506,9 +6516,10 @@ boolean yourfault;
     
     if (DEADMONSTER(mon) || DRAINEDMONSTER(mon)) {
         /*pline("%s dies!", Monnam(mon));*/
-        if (yourfault)
-            xkilled(mon, XKILL_NOMSG);
-        else
+        if (yourfault) {
+            xkilled(mon, XKILL_GIVEMSG);
+            
+        } else
             monkilled(mon, "", AD_DRLI);
         return TRUE;
     }
diff --git a/src/monmove.c b/src/monmove.c
index 8698540fd..b0525652a 100644
--- a/src/monmove.c
+++ b/src/monmove.c
@@ -214,13 +214,7 @@ struct monst *mtmp;
      */
     if (mtmp->iswiz
         || is_lminion(mtmp)
-        || is_mplayer(mtmp->data)
-        || is_rider(mtmp->data)
-        || mtmp->data->mlet == S_HUMAN
-        || mtmp->data->mlet == S_ANGEL
-        || mtmp->data == &mons[PM_HONEY_BADGER]
-        || mtmp->data == &mons[PM_NEOTHELID]
-        || unique_corpstat(mtmp->data)
+        || immune_mgc_scare(mtmp->data)
         || (mtmp->isshk && inhishop(mtmp))
         || (mtmp->ispriest && inhistemple(mtmp))
         || mtmp->mberserk)
@@ -260,13 +254,9 @@ struct monst *mtmp;
     return (sengr_at("Elbereth", x, y, TRUE)
             && ((u.ux == x && u.uy == y)
                 || (Displaced && mtmp->mux == x && mtmp->muy == y))
-            && !(mtmp->isshk || mtmp->isgd || !mtmp->mcansee
-                 || mtmp->mpeaceful || mtmp->data->mlet == S_HUMAN
-                 || mtmp->data == &mons[PM_MINOTAUR]
-                 || mtmp->data == &mons[PM_ELDER_MINOTAUR]
-                 || mtmp->data == &mons[PM_GIANT_PRAYING_MANTIS]
-                 || mtmp->data == &mons[PM_NEOTHELID]
-                 || unique_corpstat(mtmp->data)
+            && !(mtmp->isshk || mtmp->isgd 
+                 || !mtmp->mcansee || mtmp->mpeaceful
+                 || disrespects_elbereth(mtmp->data)
                  || Inhell || In_endgame(&u.uz)));
 }
 
@@ -508,7 +498,7 @@ int *inrange, *nearby, *scared;
                     || (!mtmp->mpeaceful && in_your_sanctuary(mtmp, 0, 0)))) {
         *scared = 1;
         monflee(mtmp, rnd(rn2(7) ? 10 : 100), TRUE, TRUE);
-        if (u.ualign.type == A_NONE && !context.coward
+        if (Uevil_inherently && !context.coward
             && sengr_at("Elbereth", seescaryx, seescaryy, TRUE)) {
             /* Followers of Moloch aren't supposed
              * to hide behind other gods. */
@@ -1172,20 +1162,23 @@ xchar nix,niy;
 
 STATIC_OVL boolean
 likes_contents(mtmp, container)
-register struct monst *mtmp;
-register struct obj *container;
+struct monst *mtmp;
+struct obj *container;
 {
-    boolean likegold = 0, likegems = 0, likeobjs = 0, likemagic = 0, uses_items = 0;
+    boolean likegold = 0, likegems = 0,
+            likeobjs = 0, likemagic = 0, uses_items = 0;
     boolean can_open = 0, can_unlock = 0;
-    register int pctload = (curr_mon_load(mtmp) * 100) / max_mon_load(mtmp);
-    register struct obj *otmp;
+    int pctload = (curr_mon_load(mtmp) * 100) / max_mon_load(mtmp);
+    struct obj *otmp;
 
     can_open = !(nohands(mtmp->data) || r_verysmall(mtmp)
-                 || container->otyp == IRON_SAFE || container->otyp == CRYSTAL_CHEST);
+                 || container->otyp == IRON_SAFE
+                 || container->otyp == CRYSTAL_CHEST);
     can_unlock = ((can_open
                   && (m_carrying(mtmp, SKELETON_KEY)
                       || m_carrying(mtmp, LOCK_PICK)
-                      || m_carrying(mtmp, CREDIT_CARD)))
+                      || m_carrying(mtmp, CREDIT_CARD)
+                      || m_carrying(mtmp, MAGIC_KEY)))
                   || mtmp->iswiz || is_rider(mtmp->data));
 
     if (!Is_nonprize_container(container))
@@ -1194,27 +1187,37 @@ register struct obj *container;
     if (container->olocked && !can_unlock)
         return FALSE;
 
-    likegold = (likes_gold(mtmp->data) && pctload < 95 && !can_levitate(mtmp));
-    likegems = (likes_gems(mtmp->data) && pctload < 85 && !can_levitate(mtmp));
+    if (container->otyp == HIDDEN_CHEST
+        && container->olocked && !m_carrying(mtmp, MAGIC_KEY))
+        return FALSE;
+
+    likegold = (likes_gold(mtmp->data) && pctload < 95
+                && !can_levitate(mtmp));
+    likegems = (likes_gems(mtmp->data) && pctload < 85
+                && !can_levitate(mtmp));
     uses_items = (!mindless(mtmp->data) && !is_animal(mtmp->data)
                   && pctload < 75);
-    likeobjs = (likes_objs(mtmp->data) && pctload < 75 && !can_levitate(mtmp));
-    likemagic = (likes_magic(mtmp->data) && pctload < 85 && !can_levitate(mtmp));
+    likeobjs = (likes_objs(mtmp->data) && pctload < 75
+                && !can_levitate(mtmp));
+    likemagic = (likes_magic(mtmp->data) && pctload < 85
+                 && !can_levitate(mtmp));
 
-    if (!likegold && !likegems && !uses_items && !likeobjs && !likemagic)
+    if (!likegold && !likegems && !uses_items
+        && !likeobjs && !likemagic)
         return FALSE;
 
     for (otmp = container->cobj; otmp; otmp = otmp->nobj) {
         if (((likegold && otmp->oclass == COIN_CLASS)
               || (likeobjs && index(practical, otmp->oclass)
-                  && (otmp->otyp != CORPSE || (mtmp->data->mlet == S_NYMPH
-                      && !is_rider(&mons[otmp->corpsenm]))))
+                  && (otmp->otyp != CORPSE
+                      || (mtmp->data->mlet == S_NYMPH
+                          && !is_rider(&mons[otmp->corpsenm]))))
              || (likemagic && index(magical, otmp->oclass))
              || (uses_items && searches_for_item(mtmp, otmp))
              || (likegems && otmp->oclass == GEM_CLASS
                  && otmp->material != MINERAL))
-            && touch_artifact(otmp, mtmp))
-	    return TRUE;
+            && touch_artifact(otmp, mtmp) && can_carry(mtmp, otmp))
+            return TRUE;
     }
     return FALSE;
 }
@@ -1563,7 +1566,22 @@ register int after;
             oomy = min(ROWNO - 1, omy + minr);
             lmx = max(1, omx - minr);
             lmy = max(0, omy - minr);
-            for (otmp = fobj; otmp; otmp = otmp->nobj) {
+            otmp = fobj;
+            if (level.flags.nmagicchests) {
+                int mcx, mcy;
+                for (mcx = lmx; mcx <= oomx; ++mcx) {
+                    for (mcy = lmy; mcy <= oomy; ++mcy) {
+                        if (IS_MAGIC_CHEST(levl[mcx][mcy].typ)) {
+                            mchest->nobj = fobj;
+                            mchest->ox = mcx;
+                            mchest->oy = mcy;
+                            otmp = mchest;
+                            break;
+                        }
+                    }
+                }
+            }
+            for (; otmp; otmp = otmp->nobj) {
                 /* monsters may pick rocks up, but won't go out of their way
                    to grab them; this might hamper sling wielders, but it cuts
                    down on move overhead by filtering out most common item */
@@ -1637,12 +1655,16 @@ register int after;
                             gy = otmp->oy;
                             if (gx == omx && gy == omy) {
                                 mmoved = 3; /* actually unnecessary */
+                                mchest->ox = mchest->oy = 0;
+                                mchest->nobj = (struct obj *) 0;
                                 goto postmov;
                             }
                         }
                     }
                 }
             }
+            mchest->ox = mchest->oy = 0;
+            mchest->nobj = (struct obj *) 0;
         } else if (likegold) {
             /* don't try to pick up anything else, but use the same loop */
             uses_items = 0;
@@ -1911,7 +1933,7 @@ register int after;
     } while (0)
 
                 /* if mon has MKoT, disarm door trap; no message given */
-                if (btrapped && has_magic_key(mtmp)) {
+                if (btrapped && has_roguish_key(mtmp)) {
                     /* BUG: this lets a vampire or blob or a doorbuster
                        holding the Key disarm the trap even though it isn't
                        using that Key when squeezing under or smashing the
@@ -2023,7 +2045,9 @@ register int after;
             } else
                 newsym(mtmp->mx, mtmp->my);
         }
-        if (OBJ_AT(mtmp->mx, mtmp->my) && mtmp->mcanmove) {
+        if ((OBJ_AT(mtmp->mx, mtmp->my)
+            || IS_MAGIC_CHEST(levl[mtmp->mx][mtmp->my].typ))
+            && mtmp->mcanmove) {
             /* recompute the likes tests, in case we polymorphed
              * or if the "likegold" case got taken above */
             if (setlikes) {
@@ -2097,10 +2121,10 @@ register int after;
 
                 if (likeobjs)
                     picked |= mpickstuff(mtmp, practical);
-		if (mhp > mtmp->mhp) {
+                if (mhp > mtmp->mhp) {
                     mmoved = 3;
-		    goto end;
-		}
+                    goto end;
+                }
 
                 if (likemagic)
                     picked |= mpickstuff(mtmp, magical);
diff --git a/src/monst.c b/src/monst.c
index 90d078f4c..7a9d18b74 100644
--- a/src/monst.c
+++ b/src/monst.c
@@ -190,7 +190,7 @@ NEARDATA struct permonst mons[] = {
           NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
         SIZ(20, 5, MS_ANT, MZ_TINY), MR_POISON, MR_POISON,
         M1_ANIMAL | M1_NOHANDS | M1_OVIPAROUS | M1_POIS | M1_CARNIVORE,
-        M2_HOSTILE, 0, 0, 0, 8, CLR_GRAY),
+        M2_HOSTILE, 0, 0, 0, 11, CLR_GRAY),
     MON("gibberslug", S_ANT,                             /* SpliceHack */
         LVL(5, 12, 10, 0, -2), (G_HELL | G_GENO | G_SGROUP | 1),
         A(ATTK(AT_STNG, AD_DRDX, 4, 3), 
@@ -1363,13 +1363,13 @@ NEARDATA struct permonst mons[] = {
         M1_POIS | M1_FLY | M1_THICK_HIDE, 
         M2_STALK | M2_HOSTILE | M2_NASTY, 0, 0, 0, 10, CLR_YELLOW),
     MON("nupperibo", S_IMP,                                     /* Slash'EM */
-        LVL(7, 12, 0, 20, -7), (G_GENO | 1),
-        A(ATTK(AT_CLAW, AD_DRST, 3, 4), 
-          ATTK(AT_BITE, AD_DRLI, 1, 6),
+        LVL(10, 9, 0, 20, -7), (G_HELL | G_GENO | 1),
+        A(ATTK(AT_CLAW, AD_DRST, 5, 4), 
+          ATTK(AT_BITE, AD_DRLI, 2, 6),
           NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
-        SIZ(20, 10, MS_CUSS, MZ_TINY), MR_ACID, 0,
+        SIZ(20, 10, MS_CUSS, MZ_TINY), MR_ACID | MR_POISON, 0,
         M1_REGEN, M2_WANDER | M2_STALK, 
-        M3_INFRAVISIBLE | M3_INFRAVISION | M3_TRAITOR, 0, 0, 9, CLR_GREEN),
+        M3_INFRAVISIBLE | M3_INFRAVISION | M3_TRAITOR, 0, 0, 10, CLR_GREEN),
     MON("redcap", S_IMP,                                      /* SpliceHack */
         LVL(10, 15, 2, 30, 7), (G_GENO | 1),
         A(ATTK(AT_BITE, AD_PHYS, 1, 2), 
@@ -1974,7 +1974,7 @@ NEARDATA struct permonst mons[] = {
         M1_WALLWALK | M1_ANIMAL | M1_NOHANDS
             | M1_CARNIVORE | M1_OVIPAROUS | M1_THICK_HIDE | M1_NOTAKE,
         M2_HOSTILE | M2_STRONG | M2_JUMPER, 
-        0, 0, 0, 9, CLR_GRAY),
+        0, 0, 0, 10, CLR_GRAY),
     MON("wumpus", S_QUADRUPED,
         LVL(8, 3, 2, 10, 0), (G_GENO | 1),
         A(ATTK(AT_BITE, AD_PHYS, 3, 6), 
@@ -2257,7 +2257,7 @@ NEARDATA struct permonst mons[] = {
         SIZ(150, 100, MS_GROWL, MZ_SMALL), MR_POISON, 0,
         M1_SWIM | M1_ANIMAL | M1_NOHANDS | M1_OMNIVORE | M1_TUNNEL
             | M1_THICK_HIDE, M2_HOSTILE | M2_STRONG,
-        M3_INFRAVISIBLE | M3_BERSERK, 0, 0, 12, CLR_BLACK),
+        M3_INFRAVISIBLE | M3_BERSERK, 0, 0, 12, CLR_BRIGHT_MAGENTA),
     /*
      * spiders & scorpions
      * Note: (keep webmaker() in sync if new critters are added)
@@ -3510,7 +3510,7 @@ NEARDATA struct permonst mons[] = {
           ATTK(AT_CLAW, AD_PHYS, 4, 4), 
           ATTK(AT_CLAW, AD_PHYS, 4, 4),
           ATTK(AT_ENGL, AD_DGST, 2, 10), 
-          ATTK(AT_NONE, AD_COLD, 0, 1)),
+          ATTK(AT_NONE, AD_COLD, 0, 6)),
         SIZ(WT_DRAGON, NUT_DRAGON, MS_ROAR, MZ_GIGANTIC), MR_COLD | MR_SONIC, MR_COLD,
         M1_FLY | M1_THICK_HIDE | M1_NOHANDS | M1_SEE_INVIS | M1_OVIPAROUS
             | M1_CARNIVORE,
@@ -3708,7 +3708,7 @@ NEARDATA struct permonst mons[] = {
     MON("ice elemental", S_ELEMENTAL,                         /* SpliceHack */
         LVL(8, 12, 2, 30, 0), (G_NOCORPSE | G_NOGEN),
         A(ATTK(AT_CLAW, AD_PHYS, 5, 6), 
-          ATTK(AT_NONE, AD_COLD, 0, 4),
+          ATTK(AT_NONE, AD_COLD, 0, 6),
           ATTK(AT_SPIT, AD_COLD, 1, 6),
           NO_ATTK, NO_ATTK, NO_ATTK),
         SIZ(2500, 0, MS_SILENT, MZ_LARGE), 
@@ -4633,7 +4633,7 @@ struct permonst _mons2[] = {
         SIZ(WT_HUMAN, 200, MS_SILENT, MZ_HUMAN),
         MR_COLD | MR_SLEEP | MR_POISON | MR_ACID | MR_DRAIN | MR_SICK, 0,
         M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID | M1_POIS,
-        M2_HOSTILE, M3_INFRAVISION, 0, MH_UNDEAD, 9, CLR_YELLOW),
+        M2_HOSTILE, M3_INFRAVISION, 0, MH_UNDEAD, 12, CLR_YELLOW),
     MON("giant mummy", S_MUMMY,
         LVL(8, 14, 3, 30, -7), (G_GENO | G_NOCORPSE | 1),
         A(ATTK(AT_CLAW, AD_WTHR, 3, 4), 
@@ -5702,13 +5702,13 @@ struct permonst _mons2[] = {
         0, MH_UNDEAD, 6, CLR_BLACK),
     MON("skeletal pirate", S_ZOMBIE,                          /* SpliceHack */
         LVL(5, 8, 4, 0, 0), (G_SGROUP | G_NOCORPSE | 1),
-     	  A(ATTK(AT_WEAP, AD_PHYS, 1, 6), 
+     	  A(ATTK(AT_WEAP, AD_PHYS, 1, 8), 
           NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK), 
         SIZ(300, 5, MS_BONES, MZ_HUMAN),
         MR_COLD | MR_SLEEP | MR_POISON | MR_STONE | MR_DRAIN | MR_SICK, 0,
         M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID | M1_SWIM,
         M2_WANDER | M2_HOSTILE | M2_STRONG | M2_COLLECT | M2_NASTY,
-      	M3_INFRAVISION | M3_TRAITOR, 0, MH_UNDEAD, 7, CLR_WHITE),
+      	M3_INFRAVISION | M3_TRAITOR, 0, MH_UNDEAD, 11, CLR_WHITE),
     MON("ghast", S_ZOMBIE,                                      /* Slash'EM */
         LVL(4, 6, 10, 0, -2), (G_GENO | G_NOCORPSE | 1),
         A(ATTK(AT_CLAW, AD_PLYS, 1, 2),
@@ -7241,6 +7241,15 @@ struct permonst _mons2[] = {
           NO_ATTK),
         SIZ(30, 30, MS_SILENT, MZ_SMALL), 0, 0,
         M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE, M2_HOSTILE, 0, 0, 0, 3, CLR_BROWN),
+    /* Only appears when playing as caveman/cavewoman */
+    MON("compsognathus", S_LIZARD,                             /* SpliceHack */
+        LVL(3, 15, 5, 0, 0), (G_NOGEN | G_VLGROUP | 6),
+        A(ATTK(AT_BITE, AD_PHYS, 1, 4),
+          ATTK(AT_CLAW, AD_PHYS, 1, 2),
+          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
+        SIZ(25, 25, MS_SILENT, MZ_TINY), 0, 0,
+        M1_SWIM | M1_AMPHIBIOUS | M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
+        M2_HOSTILE | M2_FLANK, 0, 0, 0, 4, CLR_WHITE),
     MON("sea tortle", S_LIZARD,                                 /* EvilHack */
         LVL(2, 5, 0, 0, 3), (G_GENO | G_NOHELL | G_SGROUP | 1),
         A(ATTK(AT_WEAP, AD_PHYS, 1, 6), 
@@ -7364,7 +7373,7 @@ struct permonst _mons2[] = {
         SIZ(1500, 400, MS_MUMBLE, MZ_HUMAN), MR_SLEEP | MR_COLD, MR_COLD,
         M1_HUMANOID | M1_SLITHY | M1_THICK_HIDE | M1_POIS | M1_SWIM,
         M2_STALK | M2_HOSTILE | M2_STRONG | M2_COLLECT | M2_MAGIC,
-        M3_INFRAVISION, M4_VULNERABLE_FIRE, 0, 13, CLR_WHITE),
+        M3_INFRAVISION, M4_VULNERABLE_FIRE, 0, 13, CLR_BRIGHT_BLUE),
     MON("giant crocodile", S_LIZARD,                            /* EvilHack */
         LVL(12, 9, 1, 0, 0), (G_GENO | 1),
         A(ATTK(AT_BITE, AD_PHYS, 4, 4), 
@@ -7489,10 +7498,8 @@ struct permonst _mons2[] = {
         MH_HUMAN, 12, CLR_YELLOW),
     MON("flame mage", S_HUMAN,                                  /* Slash'EM */
         LVL(10, 12, 10, 3, 0), G_NOGEN,
-        A(ATTK(AT_WEAP, AD_PHYS, 1, 6), 
-          ATTK(AT_WEAP, AD_PHYS, 1, 6),
-          ATTK(AT_MAGC, AD_SPEL, 0, 0), 
-          NO_ATTK, NO_ATTK, NO_ATTK),
+        A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
+          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
         SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), 0, 0,
         M1_HUMANOID | M1_OMNIVORE,
         M2_NOPOLY | M2_STRONG | M2_COLLECT | M2_MAGIC | M2_HOSTILE,
@@ -7507,10 +7514,8 @@ struct permonst _mons2[] = {
         MH_HUMAN, 12, CLR_YELLOW),
     MON("ice mage", S_HUMAN,                                    /* Slash'EM */
         LVL(10, 12, 10, 3, 0), G_NOGEN,
-        A(ATTK(AT_WEAP, AD_PHYS, 1, 6), 
-          ATTK(AT_WEAP, AD_PHYS, 1, 6),
-          ATTK(AT_MAGC, AD_SPEL, 0, 0), 
-          NO_ATTK, NO_ATTK, NO_ATTK),
+        A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
+          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
         SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), 0, 0,
         M1_HUMANOID | M1_OMNIVORE,
         M2_NOPOLY | M2_STRONG | M2_COLLECT | M2_MAGIC | M2_HOSTILE,
@@ -7552,9 +7557,8 @@ struct permonst _mons2[] = {
         M3_INFRAVISIBLE, 0, MH_HUMAN, 12, CLR_YELLOW),
     MON("necromancer", S_HUMAN,                                 /* Slash'EM */
         LVL(10, 12, 10, 3, 0), G_NOGEN,
-        A(ATTK(AT_WEAP, AD_PHYS, 1, 6), 
-          ATTK(AT_MAGC, AD_SPEL, 0, 0), 
-          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
+        A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
+          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
         SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), MR_DRAIN | MR_SICK, 0,
         M1_HUMANOID | M1_OMNIVORE,
         M2_NOPOLY | M2_STRONG | M2_COLLECT | M2_MAGIC | M2_HOSTILE,
@@ -7624,7 +7628,7 @@ struct permonst _mons2[] = {
         A(ATTK(AT_WEAP, AD_PHYS, 1, 6),
           ATTK(AT_WEAP, AD_PHYS, 1, 6),
           NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
-        SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), MR_DRAIN  | MR_SICK, 0,
+        SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), MR_DRAIN | MR_SICK, 0,
         M1_HUMANOID | M1_OMNIVORE,
         M2_NOPOLY | M2_STRONG | M2_FEMALE | M2_COLLECT | M2_HOSTILE,
         M3_INFRAVISIBLE, 0, MH_HUMAN, 12, CLR_BLACK),
@@ -7676,7 +7680,8 @@ struct permonst _mons2[] = {
         LVL(12, 24, -2, 70, 15), (G_UNIQ | G_NOGEN | G_NOCORPSE),
         A(ATTK(AT_BUTT, AD_PHYS, 3, 12), 
           ATTK(AT_KICK, AD_PHYS, 3, 6),
-          NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
+          ATTK(AT_SCRE, AD_FEAR, 2, 4),
+          NO_ATTK, NO_ATTK, NO_ATTK),
         SIZ(1500, 300, MS_NEIGH, MZ_LARGE),
         MR_POISON | MR_FIRE | MR_COLD | MR_ELEC | MR_DRAIN,
         MR_POISON | MR_FIRE | MR_COLD | MR_ELEC,
@@ -7788,15 +7793,16 @@ struct permonst _mons2[] = {
             | M2_COLLECT | M2_MAGIC,
         M3_CLOSE | M3_INFRAVISIBLE, 0, MH_HUMAN, 22, HI_LORD),
     MON("High Ice Mage", S_HUMAN,                               /* Slash'EM */
-        LVL(20, 12, 0, 40, 0), (G_NOGEN | G_UNIQ),
-        A(ATTK(AT_WEAP, AD_PHYS, 1, 6), 
-          ATTK(AT_WEAP, AD_PHYS, 1, 6),
-          ATTK(AT_MAGC, AD_SPEL, 0, 0), 
+        LVL(20, 15, 0, 90, 0), (G_NOGEN | G_UNIQ),
+        A(ATTK(AT_WEAP, AD_PHYS, 4, 10),
+          ATTK(AT_MAGC, AD_SPEL, 2, 8),
+          ATTK(AT_CLAW, AD_SAMU, 2, 4),
           NO_ATTK, NO_ATTK, NO_ATTK),
-        SIZ(WT_HUMAN, 400, MS_LEADER, MZ_HUMAN), MR_POISON, 
-        MR_POISON, M1_HUMANOID | M1_OMNIVORE,
-        M2_NOPOLY | M2_PNAME | M2_PEACEFUL | M2_STRONG 
-            | M2_MALE | M2_COLLECT | M2_MAGIC, 
+        SIZ(WT_HUMAN, 400, MS_LEADER, MZ_HUMAN), 
+        MR_COLD | MR_POISON | MR_DRAIN, MR_COLD | MR_POISON,
+        M1_HUMANOID | M1_OMNIVORE, M2_NOPOLY | M2_PEACEFUL 
+            | M2_STRONG | M2_STALK | M2_NASTY | M2_MALE 
+            | M2_COLLECT | M2_MAGIC, 
         M3_CLOSE | M3_INFRAVISIBLE, 0, MH_HUMAN, 24, HI_LORD),
     MON("Archbishop of Moloch", S_HUMAN,                        /* EvilHack */
         LVL(20, 15, 0, 90, A_NONE), (G_NOGEN | G_UNIQ),
@@ -7889,7 +7895,8 @@ struct permonst _mons2[] = {
           ATTK(AT_WEAP, AD_PHYS, 2, 6),
           ATTK(AT_CLAW, AD_SAMU, 2, 4), 
           NO_ATTK, NO_ATTK, NO_ATTK),
-        SIZ(WT_HUMAN, 400, MS_LEADER, MZ_HUMAN), MR_SLEEP | MR_POISON | MR_STONE, 0,
+        SIZ(WT_HUMAN, 400, MS_LEADER, MZ_HUMAN), 
+        MR_SLEEP | MR_POISON | MR_STONE, 0,
         M1_HUMANOID | M1_OMNIVORE,
         M2_NOPOLY | M2_PEACEFUL | M2_STRONG | M2_MALE | M2_GREEDY
             | M2_JEWELS | M2_COLLECT | M2_MAGIC,
@@ -8009,19 +8016,6 @@ struct permonst _mons2[] = {
             | M2_NASTY | M2_FEMALE | M2_COLLECT | M2_MAGIC,
         M3_WANTSARTI | M3_WAITFORU | M3_INFRAVISIBLE, 0,
         MH_HUMAN, 25, HI_LORD),
-    MON("Water Mage", S_HUMAN,                                  /* Slash'EM */
-        LVL(25, 10, -10, 10, 20), (G_NOGEN | G_UNIQ),
-        A(ATTK(AT_MAGC, AD_SPEL, 0, 0), 
-          ATTK(AT_MAGC, AD_SPEL, 0, 0),
-          ATTK(AT_WEAP, AD_PHYS, 1, 6), 
-          ATTK(AT_CLAW, AD_SAMU, 1, 4),
-          NO_ATTK, NO_ATTK),
-        SIZ(WT_HUMAN, 400, MS_NEMESIS, MZ_HUMAN), 
-        MR_POISON | MR_DRAIN, MR_POISON, 
-        M1_HUMANOID | M1_OMNIVORE,
-        M2_NOPOLY | M2_STRONG | M2_STALK | M2_HOSTILE | M2_NASTY |
-        M2_COLLECT | M2_MAGIC, 
-        M3_WANTSARTI | M3_WAITFORU | M3_INFRAVISIBLE, 0, MH_HUMAN, 34, HI_LORD),
     MON("Cyclops", S_GIANT,
         LVL(18, 12, 0, 0, -15), (G_NOGEN | G_UNIQ),
         A(ATTK(AT_WEAP, AD_PHYS, 4, 8), 
diff --git a/src/muse.c b/src/muse.c
index 54ba4f476..eb0ae1309 100644
--- a/src/muse.c
+++ b/src/muse.c
@@ -2726,9 +2726,10 @@ struct monst *mtmp;
             monstseesu(M_SEEN_FIRE);
             burn_away_slime();
             if (Half_spell_damage)
-                num = (num + 1) / 2;
+                losehp(((num + 1) / 2), "scroll of fire", KILLED_BY_AN);
             else
                 losehp(num, "scroll of fire", KILLED_BY_AN);
+            
             for (mtmp2 = fmon; mtmp2; mtmp2 = mtmp2->nmon) {
                 if (DEADMONSTER(mtmp2))
                     continue;
@@ -2737,10 +2738,9 @@ struct monst *mtmp;
                 if (dist2(mtmp2->mx, mtmp2->my, mtmp->mx, mtmp->my) < 3) {
                     if (resists_fire(mtmp2) || defended(mtmp2, AD_FIRE))
                         continue;
-                    damage_mon(mtmp2, num, AD_FIRE);
                     if (resists_cold(mtmp2)) /* natural resistance */
-                        mtmp2->mhp -= 3 * num;
-                    if (DEADMONSTER(mtmp2)) {
+                        num *= 3;
+                    if (damage_mon(mtmp2, num, AD_FIRE)) {
                         mondied(mtmp2);
                         break;
                     }
@@ -3859,7 +3859,8 @@ struct obj *obj;
             || typ == HORN_OF_BLASTING 
             || typ == MAGIC_FLUTE)
             return (obj->spe > 0 && can_blow(mon));
-        if (typ == SKELETON_KEY || typ == LOCK_PICK || typ == CREDIT_CARD)
+        if (typ == SKELETON_KEY || typ == LOCK_PICK
+            || typ == CREDIT_CARD || typ == MAGIC_KEY)
             return TRUE;
         if ((typ == BAG_OF_HOLDING && !obj->cursed) || typ == OILSKIN_SACK
             || typ == SACK || (typ == BAG_OF_TRICKS && obj->spe > 0))
diff --git a/src/music.c b/src/music.c
index 9b581ee0e..093d78030 100644
--- a/src/music.c
+++ b/src/music.c
@@ -332,6 +332,8 @@ int force;
                 if (cansee(x, y))
                     pline_The("forge falls into a chasm.");
                 goto do_pit;
+            case MAGIC_CHEST:
+                break;
             case ALTAR:
                 /* always preserve the high altars */
                 if (Is_astralevel(&u.uz) || Is_sanctum(&u.uz))
diff --git a/src/objects.c b/src/objects.c
index 00fcd1001..90e9e7600 100644
--- a/src/objects.c
+++ b/src/objects.c
@@ -180,7 +180,7 @@ WEAPON("athame", None,
 WEAPON("parazonium", "triangular dagger",                      /* SpliceHack */
        0, 1, 0, 0,  1,  12,  15,  6,  4, 1, S,   P_DAGGER, METAL, HI_METAL),
 WEAPON("stake", None,                               /* Slash'EM */
-       1, 0, 0, 0,  5,  20,  20,  6,  6, 0, P,   P_DAGGER, WOOD, HI_WOOD),
+       1, 1, 0, 0,  5,  20,  20,  6,  6, 0, P,   P_DAGGER, WOOD, HI_WOOD),
 WEAPON("great dagger", None,                               /* Slash'EM */
        1, 0, 0, 0,  0,  20,  30,  6,  7, 2, P,   P_DAGGER, METAL, CLR_BLACK),
 WEAPON("pencil", None,
@@ -211,13 +211,13 @@ WEAPON("battle-axe", "double-headed axe", /* "double-bitted"? */
 
 /* swords */
 WEAPON("short sword", None,
-       1, 0, 0, 0,  8,  30,  10,  6,  8, 0, P,   P_SHORT_SWORD, IRON, HI_METAL),
+       1, 0, 0, 0,  8,  30,  10,  6,  8, 1, P,   P_SHORT_SWORD, IRON, HI_METAL),
 WEAPON("elven short sword", "runed short sword",
-       0, 0, 0, 0,  2,  11,  10,  8,  8, 0, P,   P_SHORT_SWORD, WOOD, HI_WOOD),
+       0, 0, 0, 0,  2,  11,  10,  8,  8, 1, P,   P_SHORT_SWORD, WOOD, HI_WOOD),
 WEAPON("orcish short sword", "crude short sword",
-       0, 0, 0, 0,  3,  30,  10,  5,  8, 0, P,   P_SHORT_SWORD, IRON, CLR_BLACK),
+       0, 0, 0, 0,  3,  30,  10,  5,  8, 1, P,   P_SHORT_SWORD, IRON, CLR_BLACK),
 WEAPON("dwarvish short sword", "broad short sword",
-       0, 0, 0, 0,  2,  30,  10,  7,  8, 0, P,   P_SHORT_SWORD, IRON, HI_METAL),
+       0, 0, 0, 0,  2,  30,  10,  7,  8, 1, P,   P_SHORT_SWORD, IRON, HI_METAL),
 WEAPON("gladius", None,                                        /* SpliceHack */
        1, 0, 0, 0,  1,  30,  10, 10,  6, 2, S,   P_SHORT_SWORD, IRON, HI_METAL),
 WEAPON("scimitar", "curved sword",
@@ -685,7 +685,7 @@ BOOTS("water walking boots", "jungle boots",
 BOOTS("jumping boots", "hiking boots",
       0, 1,    JUMPING, 12, 2, 20, 50, 9, 0, LEATHER, HI_LEATHER),
 BOOTS("stomping boots", "steel-toed boots",                    /* SpliceHack */
-      0, 1,          0, 12, 2, 20, 50, 9, 0, IRON, HI_LEATHER),
+      0, 1,   STOMPING, 12, 2, 20, 50, 9, 0, IRON, HI_LEATHER),
 BOOTS("elven boots", "mud boots",
       0, 1,    STEALTH, 12, 2, 15,  8, 9, 0, LEATHER, HI_LEATHER),
 BOOTS("kicking boots", "buckled boots",
@@ -828,6 +828,12 @@ CONTAINER("chest",            None, 1, 0, 0, 25, 600,  16, WOOD, HI_WOOD),
 CONTAINER("iron safe",        None, 1, 0, 0, 10, 900,  50, IRON, HI_METAL),  /* EvilHack/Un */
 CONTAINER("crystal chest",    None, 1, 1, 0,  1, 500,  20, GEMSTONE, CLR_WHITE), /* EvilHack */
 CONTAINER("ice box",          None, 1, 0, 0,  5, 900,  42, PLASTIC, CLR_WHITE),
+/* define as object so it's unwishable. base type is "hidden chest" to avoid conflict
+   with terrain type name, but description is "magic chest" so player gets correct
+   feedback when they loot it. it should always remain unidentified. */
+OBJECT(OBJ("hidden chest", "magic chest"),                             \
+       BITS(0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, P_NONE, GEMSTONE),        \
+       0, TOOL_CLASS, 0, 0, 5000, 999, 0, 0, 0, 0, 5000, CLR_MAGENTA),
 CONTAINER("medical kit",     "bag", 0, 0, 0, 10,   5, 500, LEATHER, HI_LEATHER),
 CONTAINER("sack",            "bag", 0, 0, 0, 35,  15,   2, CLOTH, HI_CLOTH),
 CONTAINER("oilskin sack",    "bag", 0, 0, 0,  5,  15, 100, CLOTH, HI_CLOTH),
@@ -837,9 +843,10 @@ CONTAINER("bag of tricks",   "bag", 0, 1, 1, 20,  15, 100, CLOTH, HI_CLOTH),
 #undef CONTAINER
 
 /* lock opening tools */
-TOOL("skeleton key",       "key", 0, 0, 0, 0,  80,   3,  10, BONE, CLR_WHITE),
-TOOL("lock pick",           None, 1, 0, 0, 0,  60,   4,  20, METAL, HI_METAL),
-TOOL("credit card",         None, 1, 0, 0, 0,  15,   1,  10, PLASTIC, CLR_WHITE),
+TOOL("skeleton key",       "key", 0, 0, 0, 0,  80,   3,   10, BONE, CLR_WHITE),
+TOOL("lock pick",           None, 1, 0, 0, 0,  60,   4,   20, METAL, HI_METAL),
+TOOL("credit card",         None, 1, 0, 0, 0,  15,   1,   10, PLASTIC, CLR_WHITE),
+TOOL("magic key",   "ornate key", 0, 0, 1, 0,   0,   5, 1000, GEMSTONE, CLR_RED),
 /* light sources */
 TOOL("tallow candle",   "candle", 0, 1, 0, 0,  20,   2,  10, WAX, CLR_WHITE),
 TOOL("wax candle",      "candle", 0, 1, 0, 0,   5,   2,  20, WAX, CLR_WHITE),
diff --git a/src/objnam.c b/src/objnam.c
index cba7a7a40..5a8af41d5 100644
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -44,12 +44,12 @@ struct Jitem {
 #define Strcasecpy(dst, src) (void) strcasecpy(dst, src)
 
 /* true for gems/rocks that should have " stone" appended to their names */
-#define GemStone(typ)                                                  \
+#define GemStone(typ) \
     (typ == FLINT                                                      \
-     || (objects[typ].oc_material == GEMSTONE                          \
+     || ((objects[typ].oc_material == GEMSTONE                         \
          && (typ != DILITHIUM_CRYSTAL && typ != RUBY && typ != DIAMOND \
              && typ != SAPPHIRE && typ != BLACK_OPAL && typ != EMERALD \
-             && typ != OPAL)))
+             && typ != OPAL)) && objects[typ].oc_class == GEM_CLASS))
 
 STATIC_OVL struct Jitem Japanese_items[] = { 
     { SHORT_SWORD, "wakizashi" },
@@ -603,12 +603,6 @@ boolean has_of;
                 Strcpy(of, " and");
         }
     }
-    if (props & ITEM_TOUGH) {
-        if ((props_known & ITEM_TOUGH) || dump_prop_flag) {
-            Strcat(buf, of), Strcat(buf, " toughness"),
-                    Strcpy(of, " and");
-        }
-    }
     if (props & ITEM_PROWESS) {
         if ((props_known & ITEM_PROWESS) || dump_prop_flag) {
             Strcat(buf, of), Strcat(buf, " prowess"),
@@ -826,7 +820,7 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
                 && !objects[obj->otyp].oc_name_known)
             || (obj->oartifact && not_fully_identified(obj))))
         Strcat(buf, "magical ");
-
+    
     switch (obj->oclass) {
     case AMULET_CLASS:
         if (obj->material != objects[typ].oc_material && dknown) {
@@ -917,7 +911,7 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
             && ((obj->oprops_known & ITEM_OILSKIN)
                 || dump_prop_flag))
             Strcat(buf, "oilskin ");
-
+            
         if ((obj->material != objects[typ].oc_material
              || force_material_name(typ)) && dknown) {
             Strcat(buf, materialnm[obj->material]);
@@ -1383,7 +1377,10 @@ char *prefix;
                is_glass(obj) ? "fractured " :
                is_corrodeable(obj) ? "corroded " : "rotted ");
     }
-    if (rknown && obj->oerodeproof) {
+    if (obj->dknown && (obj->oprops & ITEM_TOUGH)
+         && ((obj->oprops_known & ITEM_TOUGH) || dump_prop_flag))
+        Strcat(prefix, "tough ");
+    else if (rknown && obj->oerodeproof) {
         if (iscrys)
             Strcat(prefix, "fixed ");
         else if (is_glass(obj))
@@ -3734,6 +3731,7 @@ const char *str;
         "bat from hell", /* not the "bat" monster */
         "jedi jump",     /* not the "jedi" monster */
         "Thiefbane",     /* not the "thief" rank */
+        "sling bullet",     /* not the "thief" rank */
         "Houchou",       /* not something... */
     };
     int i;
@@ -4623,14 +4621,19 @@ struct obj *no_wish;
      * and tins), or append something--anything at all except for
      * " object", but " trap" is suggested--to either the trap
      * name or the object name.
+     * Similarly, wishing for a "magic chest" will give the terrain
+     * unless specifically wishing for a "magic chest object."
      */
-    if (wizard && (!strncmpi(bp, "bear", 4) || !strncmpi(bp, "land", 4))) {
+    if (wizard && (!strncmpi(bp, "bear", 4) || !strncmpi(bp, "land", 4)
+        || !strncmpi (bp, "magic chest", 11))) {
         boolean beartrap = (lowc(*bp) == 'b');
-        char *zp = bp + 4; /* skip "bear"/"land" */
+        boolean landmine = (lowc(*bp) == 'l');
+        boolean four = (beartrap || landmine);
+        char *zp = bp + (four ? 4 : 11); /* skip "bear"/"land" */
 
         if (*zp == ' ')
             ++zp; /* embedded space is optional */
-        if (!strncmpi(zp, beartrap ? "trap" : "mine", 4)) {
+        if (four && !strncmpi(zp, beartrap ? "trap" : "mine", 4)) {
             zp += 4;
             if (trapped == 2 || !strcmpi(zp, " object")) {
                 /* "untrapped <foo>" or "<foo> object" */
@@ -4646,6 +4649,14 @@ struct obj *no_wish;
             }
             /* [no prefix or suffix; we're going to end up matching
                the object name and getting a disarmed trap object] */
+        } else {
+            if (!strcmpi(zp, "object")) {
+                typ = HIDDEN_CHEST;
+                goto typfnd;
+            } else {
+                Strcpy(bp, "magic chest");
+                goto wiztrap;
+            }
         }
     }
 
@@ -4903,6 +4914,11 @@ struct obj *no_wish;
             level.flags.ntoilets++;
             pline("A toilet.");
             madeterrain = TRUE;
+        } else if (!BSTRCMPI(bp, p - 11, "magic chest")) {
+            lev->typ = MAGIC_CHEST;
+            level.flags.nmagicchests++;
+            pline("A magic chest.");
+            madeterrain = TRUE;
         } else if (!BSTRCMPI(bp, p - 5, "forge")) {
             lev->typ = FORGE;
             level.flags.nforges++;
@@ -5424,7 +5440,11 @@ struct obj *no_wish;
 
         if (otmp->oclass == ARMOR_CLASS || otmp->oclass == RING_CLASS)
             objprops &= ~ONLY_WEP_PROPS;
-
+        
+        /* Burden doesn't really affect ring weight much */
+        if (otmp->oclass == RING_CLASS)
+            objprops &= ~ITEM_BURDEN;
+        
         objprops = rm_redundant_oprops(otmp, objprops);
 
         /* The player cannot wish for properties */
diff --git a/src/options.c b/src/options.c
index 9783c8aad..051921ebc 100644
--- a/src/options.c
+++ b/src/options.c
@@ -4985,6 +4985,8 @@ doset() /* changing options via menu by Per Liboriussen */
         reglyph_darkroom();
         (void) doredraw();
     }
+
+    update_inventory();
     return 0;
 }
 
diff --git a/src/pager.c b/src/pager.c
index b3c924687..5ea79b24d 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -473,6 +473,7 @@ char *buf, *monbuf;
     struct monst *mtmp = (struct monst *) 0;
     struct permonst *pm = (struct permonst *) 0;
     int glyph;
+    char *releasep;
     boolean printed_blood = FALSE;
 
     buf[0] = monbuf[0] = '\0';
@@ -598,6 +599,10 @@ char *buf, *monbuf;
             Sprintf(eos(buf), "%s", waterbody_name(x, y));
             printed_blood = TRUE;
             break;
+        case S_magic_chest:
+            Strcpy(buf, releasep = doname(mchest));
+            maybereleaseobuf(releasep);
+            break;
         case S_stone:
             if (!levl[x][y].seenv) {
                 Strcpy(buf, "unexplored");
@@ -990,14 +995,12 @@ struct permonst * pm;
     ADDRESIST(pm_resistance(pm, MR2_JUMPING), "jump");
     ADDRESIST(pm_resistance(pm, MR2_WATERWALK), "walk on water");
     APPENDC(is_outflanker(pm), "flank");
-    
-    APPENDC(is_berserker(pm), "berserk");
+    APPENDC(is_berserker(pm), "go berserk");
     APPENDC(can_betray(pm), "betray you");
     APPENDC(non_tameable(pm), "not be tamed");
-    
     APPENDC(webmaker(pm), "spin webs");
     APPENDC(needspick(pm), "mine");
-    APPENDC(is_berserker(pm), "go berserk");
+   
     if (!needspick(pm))
         APPENDC(tunnels(pm), "dig");
     if (*buf) {
@@ -1023,9 +1026,6 @@ struct permonst * pm;
         else if (vegetarian(pm))
             MONPUTSTR("May be eaten by vegetarians.");
     }
-    if (has_blood(pm)) {
-        MONPUTSTR("May be drunk by vampiric monsters.");
-    }
     if (pm == &mons[PM_HECATONCHEIRE])
         MONPUTSTR("Attacks up to 100 times.");
     if (pm == &mons[PM_HYDRA])
@@ -1035,6 +1035,26 @@ struct permonst * pm;
             polyok(pm) ? "" : "not ");
     MONPUTSTR(buf);
 
+    if (disrespects_elbereth(pm)) {
+        MONPUTSTR("Does not respect Elbereth.");
+    }
+    if (immune_mgc_scare(pm)) {
+        MONPUTSTR("Immune to magical scaring.");
+    }
+    
+    /* Dazzle info */
+    if (Race_if(PM_VAMPIRIC)) {
+        if (has_blood(pm)) {
+            MONPUTSTR("May be drunk by vampiric monsters.");
+        }
+        if (!haseyes(pm))
+            MONPUTSTR("Immune to vampiric dazzling.");
+        else {
+            Sprintf(buf2, "Chance of dazzling %d%% (estimate from base level)", dazzle_chance(pm));
+            MONPUTSTR(buf2);
+        }
+    }
+
     /* Attacks */
     buf[0] = buf2[0] = '\0';
     for (i = 0; i < 6; i++) {
@@ -1107,6 +1127,8 @@ char *usr_text;
                                           : (oc.oc_dir == IMMEDIATE ? "Beam"
                                                                     : "Ray"));
     const struct ForgeRecipe *recipe;
+    const struct PotionRecipe *precipe;
+    boolean has_recipes = FALSE;
     boolean wielded, carried, potion_known;
     boolean weptool = (boolean) (oc.oc_class == TOOL_CLASS && oc.oc_skill != P_NONE);
     /* If it's an artifact, we always have it in obj. */
@@ -1301,8 +1323,8 @@ char *usr_text;
         if (obj->oprops & ITEM_FILTH) OBJPUTSTR("Grants sickness resistance");
         if (obj->oprops & ITEM_DANGER) OBJPUTSTR("Grants infravision with increased difficulty");
         if (obj->oprops & ITEM_RAGE) OBJPUTSTR("Grants rage and fearlessness");
-        if (obj->oprops & ITEM_PROWESS) OBJPUTSTR("Grants prowess in technical skills");
-        if (obj->oprops & ITEM_TOUGH) OBJPUTSTR("Grants disintegration resistance, indestructible item");
+        if (obj->oprops & ITEM_PROWESS) OBJPUTSTR("Grants skill bonuses");
+        if (obj->oprops & ITEM_TOUGH) OBJPUTSTR("Indestructible item");
         if (obj->oprops & ITEM_OILSKIN) OBJPUTSTR("Permanently greased");
         if (obj->oprops & ITEM_FUMBLE) OBJPUTSTR("Grants fumbling");
     }
@@ -1318,10 +1340,10 @@ char *usr_text;
         if (obj->oprops & ITEM_HUNGER) OBJPUTSTR("Grants hunger");
         if (obj->oprops & ITEM_STENCH) OBJPUTSTR("Grants aggravate monster");
         if (obj->oprops & ITEM_TELE) OBJPUTSTR("Grants teleportation");
-        if (obj->oprops & ITEM_SLOW) OBJPUTSTR("Grants lethargy");
+        if (obj->oprops & ITEM_SLOW) OBJPUTSTR("Grants slowness");
         if (obj->oprops & ITEM_SUSTAIN) OBJPUTSTR("Grants fixed abilities");
         if (obj->oprops & ITEM_STEALTH) OBJPUTSTR("Grants stealth");
-        if (obj->oprops & ITEM_BURDEN) OBJPUTSTR("Grants stability, weights 4x more");
+        if (obj->oprops & ITEM_BURDEN) OBJPUTSTR("Grants stability; item weighs 4x more");
         if (obj->oprops & ITEM_SURF) OBJPUTSTR("Grants water walking");
         if (obj->oprops & ITEM_SWIM) OBJPUTSTR("Grants swimming");
     }
@@ -1340,7 +1362,7 @@ char *usr_text;
         else if (objdescr_is(&dummy, "mud boots"))
             OBJPUTSTR("Protects against drowning attacks (mud boots)");
         else if (objdescr_is(&dummy, "hiking boots"))
-            OBJPUTSTR("Increases carrying capacity (hiking boots");
+            OBJPUTSTR("Increases carrying capacity (hiking boots)");
         else if (objdescr_is(&dummy, "jungle boots"))
             OBJPUTSTR("Reduces the severity of leg wounds (jungle boots)");
         else if (objdescr_is(&dummy, "old gloves"))
@@ -1546,6 +1568,7 @@ char *usr_text;
         case BAG_OF_TRICKS:
         case CHEST:
         case CRYSTAL_CHEST:
+        case HIDDEN_CHEST:
         case ICE_BOX:
         case IRON_SAFE:
         case KEG:
@@ -1557,6 +1580,7 @@ char *usr_text;
         case CREDIT_CARD:
         case LOCK_PICK:
         case SKELETON_KEY:
+        case MAGIC_KEY:
             subclass = "unlocking tool";
             break;
         case LANTERN:
@@ -1746,9 +1770,10 @@ char *usr_text;
     /* cost, wt should go next */
     buf[0] = '\0';
     if (is_artifact) {
-        Sprintf(buf, "Weighs %d aum.", oc.oc_weight);
+        if (obj)
+            Sprintf(buf, "Base weight %d aum.", oc.oc_weight);
     } else if (reveal_info) {
-        Sprintf(buf, "Base cost %d, weighs %d aum.", oc.oc_cost, oc.oc_weight);
+        Sprintf(buf, "Base cost %d, base weight %d aum.", oc.oc_cost, oc.oc_weight);
     } else {
         int base_cost = oc.oc_cost;
         for (i = 0; i < NUM_OBJECTS; i++) {
@@ -1763,9 +1788,9 @@ char *usr_text;
         }
 
         if (base_cost > 0) {
-            Sprintf(buf, "Base cost %d, weighs %d aum.", oc.oc_cost, oc.oc_weight);
+            Sprintf(buf, "Base cost %d, base weight %d aum.", oc.oc_cost, oc.oc_weight);
         } else {
-            Sprintf(buf, "Weighs %d aum.", oc.oc_weight);
+            Sprintf(buf, "Base weight %d aum.", oc.oc_weight);
         }
     }
     OBJPUTSTR(buf);
@@ -1781,9 +1806,7 @@ char *usr_text;
     }
 
     /* forge recipes */
-    boolean has_recipes = FALSE;
-    if (reveal_info && !is_artifact
-          && (oc.oc_class == WEAPON_CLASS || oc.oc_class == ARMOR_CLASS)) {
+    if (reveal_info && !is_artifact) {
         for (recipe = fusions; recipe->result_typ; recipe++) {
             if (otyp == recipe->typ1 || otyp == recipe->typ2
                 || otyp == recipe->result_typ) {
@@ -1800,6 +1823,28 @@ char *usr_text;
             }
         }
     }
+    
+    /* potion alchemy */
+    has_recipes = FALSE;
+    if (reveal_info) {
+        for (precipe = potionrecipes; precipe->result_typ; precipe++) {
+            if (otyp == precipe->typ1 || otyp == precipe->typ2
+                || otyp == precipe->result_typ) {
+                if (!has_recipes) {
+                    OBJPUTSTR("");
+                    OBJPUTSTR("Potion alchemy recipes (#dip):");
+                    has_recipes = TRUE;
+                }
+                Sprintf(buf, "     %s + %s = %s%s",
+                        OBJ_NAME(objects[precipe->typ1]),
+                        OBJ_NAME(objects[precipe->typ2]),
+                        OBJ_NAME(objects[precipe->result_typ]),
+                        precipe->chance == 1 ? "" : "(1/3)" );
+                OBJPUTSTR(buf);
+            }
+        }
+    }
+    
     /* gem alchemy */
     if (oc.oc_class == GEM_CLASS && reveal_info) {
         struct obj *potion = mksobj(POT_ACID, FALSE, FALSE);
@@ -1823,7 +1868,8 @@ char *usr_text;
         }
     }
 
-    if (reveal_info && otyp == POT_ACID) {
+    if (reveal_info && (otyp == POT_ACID 
+            || (usr_text && !strcmp(usr_text, "gem alchemy")))) {
         OBJPUTSTR("");
         OBJPUTSTR("Gem alchemy recipes:");
         OBJPUTSTR("(Dipping a gem into this can alchemize a new potion)");
@@ -2417,11 +2463,12 @@ char *supplemental_name;
                                 do_mon_lookup = FALSE;
                             }
                         }
-                    } else if (otyp != STRANGE_OBJECT) {
+                    } else if (otyp != STRANGE_OBJECT 
+                            || !strcmp(encycl_matched, "gem alchemy")) {
                         do_obj_lookup = TRUE;
                     }
                     datawin = create_nhwindow(NHW_MENU);
-
+                    
                     if (!flags.lookup_data) {
                         ; /* do nothing, 'pokedex' is disabled */
                     }
@@ -2687,6 +2734,8 @@ struct permonst **for_supplement;
             if (alt_i++ == 2)
                 i = 0; /* undo loop increment */
             x_str = defsyms[i].explanation;
+            if (i == S_magic_chest)
+                continue; /* don't mention it when asking what '(' is */
             if (submerged && !strcmp(x_str, defsyms[0].explanation))
                 x_str = "land"; /* replace "dark part of a room" */
             /* alt_i is now 3 or more and no longer of interest */
diff --git a/src/pickup.c b/src/pickup.c
index 2a7f1bde2..abc1176d8 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1709,6 +1709,11 @@ boolean countem;
     struct obj *cobj, *nobj;
     int container_count = 0;
 
+    if (IS_MAGIC_CHEST(levl[x][y].typ)) {
+        ++container_count;
+        if (!countem)
+            return container_count;
+    }
     for (cobj = level.objects[x][y]; cobj; cobj = nobj) {
         nobj = cobj->nexthere;
         if (Is_nonprize_container(cobj)) {
@@ -1796,16 +1801,27 @@ int cindex, ccount; /* index of this container (1..N), number of them (N) */
             case CHEST:
                 unlocktool = autokey(TRUE);
                 break;
+            case HIDDEN_CHEST:
+                /* artifact unlocking tools can also unlock magic chests,
+                   but don't give that away by suggesting them (same logic
+                   as with crystal chests [see below comment]) */
+                unlocktool = carrying(MAGIC_KEY);
+                break;
             default:
                 /* Don't prompt for crystal chest; only artifact unlocking
-                 * tools can unlock it, and we don't want to give that away
-                 * by suggesting them automatically to the user. */
+                   tools can unlock them, and we don't want to give that
+                   away by suggesting them automatically to the user */
                 break;
             }
 
-            if (unlocktool)
-                /* pass ox and oy to avoid direction prompt */
-                return (pick_lock(unlocktool, cobj->ox, cobj->oy, cobj) != 0);
+            if (unlocktool) {
+                /* pass ox and oy to avoid direction prompt.
+                   fake the hidden chest coordinates, since it has none. */
+                if (cobj->otyp == HIDDEN_CHEST)
+                    return (pick_lock(unlocktool, u.ux, u.uy, cobj) != 0);
+                else
+                    return (pick_lock(unlocktool, cobj->ox, cobj->oy, cobj) != 0);
+            }
         }
         return 0;
     }
@@ -1916,6 +1932,11 @@ doloot()
             win = create_nhwindow(NHW_MENU);
             start_menu(win);
 
+            if (IS_MAGIC_CHEST(levl[cc.x][cc.y].typ)) {
+                any.a_obj = mchest;
+                add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
+                         doname(mchest), MENU_UNSELECTED);
+            }
             for (cobj = level.objects[cc.x][cc.y]; cobj;
                  cobj = cobj->nexthere)
                 if (Is_nonprize_container(cobj)) {
@@ -1942,6 +1963,12 @@ doloot()
             if (n != 0)
                 c = 'y';
         } else {
+            if (IS_MAGIC_CHEST(levl[cc.x][cc.y].typ)) {
+                anyfound = TRUE;
+                timepassed |= do_loot_cont(&mchest, 1, 1);
+                if (abort_looting)
+                    return timepassed;
+            }
             for (cobj = level.objects[cc.x][cc.y]; cobj; cobj = nobj) {
                 nobj = cobj->nexthere;
 
@@ -3376,7 +3403,14 @@ dotip()
                 win = create_nhwindow(NHW_MENU);
                 start_menu(win);
 
-                for (cobj = level.objects[cc.x][cc.y], i = 0; cobj;
+                i = 0;
+                if (IS_MAGIC_CHEST(levl[cc.x][cc.y].typ)) {
+                    ++i;
+                    any.a_obj = mchest;
+                    add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
+                             doname(mchest), MENU_UNSELECTED);
+                }
+                for (cobj = level.objects[cc.x][cc.y]; cobj;
                      cobj = cobj->nexthere)
                     if (Is_nonprize_container(cobj)) {
                         ++i;
@@ -3418,13 +3452,25 @@ dotip()
                     return 0;
                 /* else pick-from-invent below */
             } else {
+                if (IS_MAGIC_CHEST(levl[cc.x][cc.y].typ)) {
+                    c = ynq(safe_qbuf(qbuf, "There is ", " here, tip it?",
+                                      mchest, doname, ansimpleoname,
+                                      "container"));
+                    if (c == 'q')
+                        return 0;
+                    if (c != 'n') {
+                        tipcontainer(mchest);
+                        /* can only tip one container at a time */
+                        return 1;
+                    }
+                }
                 for (cobj = level.objects[cc.x][cc.y]; cobj; cobj = nobj) {
                     nobj = cobj->nexthere;
                     if (!Is_nonprize_container(cobj))
                         continue;
                     c = ynq(safe_qbuf(qbuf, "There is ", " here, tip it?",
-                                      cobj,
-                                      doname, ansimpleoname, "container"));
+                                      cobj, doname, ansimpleoname,
+                                      "container"));
                     if (c == 'q')
                         return 0;
                     if (c == 'n')
@@ -3645,6 +3691,13 @@ struct obj *box; /* or bag */
     struct obj *targetbox = (struct obj *) 0;
     boolean cancelled = FALSE;
 
+    /* magic chests are too heavy to tip. also, they don't have a location.
+       return before anyone notices! */
+    if (box->otyp == HIDDEN_CHEST) {
+        pline_The("chest is bolted down!");
+        return;
+    }
+
     /* box is either held or on floor at hero's spot; no need to check for
        nesting; when held, we need to update its location to match hero's;
        for floor, the coordinate updating is redundant */
diff --git a/src/polyself.c b/src/polyself.c
index 0e61abaab..32f2eab7d 100644
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -1799,9 +1799,7 @@ dogaze()
                     }
                     if (lev > rn2(20))
                         (void) destroy_mitem(mtmp, POTION_CLASS, AD_COLD);
-                    if (dmg)
-                        mtmp->mhp -= dmg;
-                    if (DEADMONSTER(mtmp))
+                    if (damage_mon(mtmp, dmg, AD_COLD))
                         killed(mtmp);
                 } else if (adtyp == AD_PLYS) {
                     You("fix %s with an aberrant glare...", mon_nam(mtmp));
diff --git a/src/potion.c b/src/potion.c
index f9bc61853..dd56dc6b9 100644
--- a/src/potion.c
+++ b/src/potion.c
@@ -17,6 +17,7 @@ STATIC_DCL void NDECL(ghost_from_bottle);
 STATIC_DCL boolean
 FDECL(H2Opotion_dip, (struct obj *, struct obj *, BOOLEAN_P, const char *));
 STATIC_DCL void FDECL(dipsink, (struct obj *));
+STATIC_DCL void FDECL(quiet_unwear, (struct obj *));
 
 /* force `val' to be within valid range for intrinsic timeout value */
 STATIC_OVL long
@@ -925,13 +926,22 @@ register struct obj *otmp;
         u.uhunger += 50 + rnd(50); /* You feel refreshed */
         newuhs(FALSE);
         
-        forget((!otmp->blessed? ALL_SPELLS : 0) | ALL_MAP);
-        
-        if (Hallucination)
-            pline("Hakuna matata!");
-        else if (!Psychic_resistance)
-            You_feel("your memories dissolve.");
+        if (otmp->blessed && ACURR(A_INT) > 12 && num_spells() > 0) {
+            if (yn("Do you want to forget your last spell?") != 'y') {
+                goto forget_routine;
+            } else {
+                forget_spell();
+            }
+        } else {
+forget_routine:
+            forget((!otmp->blessed ? ALL_SPELLS : 0) | ALL_MAP);
 
+            if (Hallucination)
+                pline("Hakuna matata!");
+            else if (!Psychic_resistance)
+                You_feel("your memories dissolve.");
+        }
+        
         /* Blessed amnesia makes you forget lycanthropy, sickness */
         if (otmp->blessed) {
             if (u.ulycn >= LOW_PM && !Race_if(PM_HUMAN_WEREWOLF)) {
@@ -958,7 +968,7 @@ register struct obj *otmp;
         unkn++;
         if (is_undead(youmonst.data) || is_demon(raceptr(&youmonst))
             || u.ualign.type <= A_CHAOTIC) {
-            int dice = (u.ualign.type == A_NONE) ? 4 : 2;
+            int dice = Uevil_inherently ? 4 : 2;
             if (otmp->blessed) {
                 pline("This burns like %s!", hliquid("acid"));
                 exercise(A_CON, FALSE);
@@ -1020,7 +1030,7 @@ register struct obj *otmp;
             nomovemsg = "You awake with a headache.";
         }
         /* liquid courage */
-        make_fearless(itimeout_incr(HFearless, d(8, 4)), FALSE);
+        make_fearless(itimeout_incr(HFearless, d(8, otmp->blessed ? 6 : 3)), FALSE);
         break;
     case POT_ENLIGHTENMENT:
         if (otmp->cursed) {
@@ -1871,6 +1881,7 @@ int how;
     int distance, tx, ty;
     struct obj *saddle = (struct obj *) 0;
     struct obj *barding = (struct obj *) 0;
+    struct obj *ohit = (struct obj *) 0;
     boolean hit_saddle = FALSE, hit_barding = FALSE,
             your_fault = (how <= POTHIT_HERO_THROW 
                     || how == POTHIT_HERO_ENGULF);
@@ -1971,11 +1982,51 @@ int how;
             break;
         case POT_AMNESIA:
             /* Uh-oh! */
-            if (uarmh && is_helmet(uarmh) && rn2(10 - (uarmh->cursed ? 8 : 0))) {
-                if (uarmh->oprops & ITEM_OILSKIN && !Blind)
-                    pline_The("sparkling water slides off %s", yobjnam(uarmh, (char *) 0));
+            switch (rnd(7)) {
+                case 1:
+                    if (uarmh)
+                        ohit = uarmh;
+                    break;
+                case 2:
+                    if (uarmf)
+                        ohit = uarmf;
+                    break;
+                case 3:
+                    /* Gloves sort of protect rings */
+                    if (uarmg && rn2(3))
+                        ohit = uarmg;
+                    else
+                        ohit = rn2(2) ? uleft : uright;
+                    break;
+                case 4:
+                    /* Armor layers can protect each-other */
+                    if (uarmc)
+                        ohit = uarmc;
+                    else if (uarm)
+                        ohit = uarm;
+                    else if (uarmu)
+                        ohit = uarmu;
+                    break;
+                case 5:
+                    if (uarms)
+                        ohit = uarms;
+                    break;
+                case 6:
+                    if (uwep)
+                        ohit = uwep;
+                    break;
+                case 7:
+                    if (uswapwep)
+                        ohit = uswapwep;
+                    break;
+            }
+            
+            if (ohit && rn2(10 - (ohit->cursed ? 8 : 0))) {
+                if (ohit->oprops & ITEM_OILSKIN && !Blind)
+                    pline_The("sparkling water slides off %s", 
+                              yobjnam(ohit, (char *) 0));
                 else
-                    amnesia_wet(obj, uarmh, your_fault);
+                    amnesia_wet(obj, ohit, your_fault);
             }
             break;
         case POT_HALLUCINATION:
@@ -2722,6 +2773,8 @@ register struct obj *o1, *o2;
 {
     int o1typ = o1->otyp, o2typ = o2->otyp;
     const char *potion_descr;
+    const struct PotionRecipe *recipe;
+    
     /* cut down on the number of cases below */
     if (o1->oclass == POTION_CLASS
         && (o2typ == POT_GAIN_LEVEL 
@@ -2736,79 +2789,11 @@ register struct obj *o1, *o2;
         o2typ = o1->otyp;
     }
 
-    switch (o1typ) {
-    case POT_HEALING:
-        if (o2typ == POT_SPEED)
-            return POT_EXTRA_HEALING;
-        /*FALLTHRU*/
-    case POT_EXTRA_HEALING:
-    case POT_FULL_HEALING:
-        if (o2typ == POT_GAIN_LEVEL || o2typ == POT_GAIN_ENERGY)
-            return (o1typ == POT_HEALING) ? POT_EXTRA_HEALING
-                   : (o1typ == POT_EXTRA_HEALING) ? POT_FULL_HEALING
-                     : POT_GAIN_ABILITY;
-        /*FALLTHRU*/
-    case UNICORN_HORN:
-        switch (o2typ) {
-        case POT_SICKNESS:
-            return POT_FRUIT_JUICE;
-        case POT_HALLUCINATION:
-        case POT_BLINDNESS:
-        case POT_CONFUSION:
-        case POT_BLOOD:
-        case POT_VAMPIRE_BLOOD:
-            return POT_WATER;
-        }
-        break;
-    case AMETHYST: /* "a-methyst" == "not intoxicated" */
-        if (o2typ == POT_BOOZE)
-            return POT_FRUIT_JUICE;
-        break;
-    case POT_GAIN_LEVEL:
-    case POT_GAIN_ENERGY:
-        switch (o2typ) {
-        case POT_CONFUSION:
-            return (rn2(3) ? POT_BOOZE : POT_ENLIGHTENMENT);
-        case POT_HEALING:
-            return POT_EXTRA_HEALING;
-        case POT_EXTRA_HEALING:
-            return POT_FULL_HEALING;
-        case POT_FULL_HEALING:
-            return POT_GAIN_ABILITY;
-        case POT_FRUIT_JUICE:
-            return POT_SEE_INVISIBLE;
-        case POT_BOOZE:
-            return POT_HALLUCINATION;
+    for (recipe = potionrecipes; recipe->result_typ; recipe++) {
+        if ((o1typ == recipe->typ1 && o2typ == recipe->typ2)) {
+            if (recipe->chance == 1 || !rn2(recipe->chance))
+                return recipe->result_typ;
         }
-        break;
-    case POT_FRUIT_JUICE:
-        switch (o2typ) {
-        case POT_SICKNESS:
-            return POT_SICKNESS;
-        case POT_BLOOD:
-            return POT_BLOOD;
-        case POT_VAMPIRE_BLOOD:
-            return POT_VAMPIRE_BLOOD;
-        case POT_ENLIGHTENMENT:
-        case POT_SPEED:
-            return POT_BOOZE;
-        case POT_GAIN_LEVEL:
-        case POT_GAIN_ENERGY:
-            return POT_SEE_INVISIBLE;
-        }
-        break;
-    case POT_ENLIGHTENMENT:
-        switch (o2typ) {
-        case POT_LEVITATION:
-            if (rn2(3))
-                return POT_GAIN_LEVEL;
-            break;
-        case POT_FRUIT_JUICE:
-            return POT_BOOZE;
-        case POT_BOOZE:
-            return POT_CONFUSION;
-        }
-        break;
     }
     
     /* MRKR: Extra alchemical effects. */
@@ -2826,6 +2811,64 @@ register struct obj *o1, *o2;
     return STRANGE_OBJECT;
 }
 
+/* potion alchemy recipes */
+const struct PotionRecipe potionrecipes[] = {
+    /* ranged weapons */
+    { POT_EXTRA_HEALING,    POT_HEALING, POT_SPEED,         1 },
+    { POT_EXTRA_HEALING,    POT_HEALING, POT_GAIN_LEVEL,    1 },
+    { POT_EXTRA_HEALING,    POT_HEALING, POT_GAIN_ENERGY,   1 },
+    
+    { POT_FULL_HEALING,     POT_EXTRA_HEALING, POT_GAIN_LEVEL, 1 },
+    { POT_FULL_HEALING,     POT_EXTRA_HEALING, POT_GAIN_ENERGY,1 },
+   
+    { POT_GAIN_ABILITY,     POT_FULL_HEALING, POT_GAIN_LEVEL,  1 },
+    { POT_GAIN_ABILITY,     POT_FULL_HEALING, POT_GAIN_ENERGY, 1 },
+    
+    { POT_FRUIT_JUICE,      UNICORN_HORN, POT_SICKNESS,      1 },
+    { POT_WATER,            UNICORN_HORN, POT_HALLUCINATION, 1 },
+    { POT_WATER,            UNICORN_HORN, POT_BLINDNESS,     1 },
+    { POT_WATER,            UNICORN_HORN, POT_CONFUSION,     1 },
+    { POT_WATER,            UNICORN_HORN, POT_BLOOD,         1 },
+    { POT_WATER,            UNICORN_HORN, POT_VAMPIRE_BLOOD, 1 },
+    
+    { POT_FRUIT_JUICE,      AMETHYST,     POT_BOOZE,         1 },
+    
+    { POT_ENLIGHTENMENT,    POT_GAIN_LEVEL, POT_CONFUSION,   3 },
+        /* If not enlightenment, than booze */
+    { POT_BOOZE,            POT_GAIN_LEVEL, POT_CONFUSION,   1 },
+    { POT_EXTRA_HEALING,    POT_GAIN_LEVEL, POT_HEALING,     1 },
+    { POT_FULL_HEALING,     POT_GAIN_LEVEL, POT_EXTRA_HEALING, 1 },
+    { POT_GAIN_ABILITY,     POT_GAIN_LEVEL, POT_FULL_HEALING,1 },
+    { POT_SEE_INVISIBLE,    POT_GAIN_LEVEL, POT_FRUIT_JUICE, 1 },
+    { POT_HALLUCINATION,    POT_GAIN_LEVEL, POT_BOOZE,       1 },
+
+    { POT_ENLIGHTENMENT,    POT_GAIN_ENERGY, POT_CONFUSION,  3 },
+        /* If not enlightenment, than booze */
+    { POT_BOOZE,            POT_GAIN_ENERGY, POT_CONFUSION,  1 },
+    { POT_EXTRA_HEALING,    POT_GAIN_ENERGY, POT_HEALING,    1 },
+    { POT_FULL_HEALING,     POT_GAIN_ENERGY, POT_EXTRA_HEALING, 1 },
+    { POT_GAIN_ABILITY,     POT_GAIN_ENERGY, POT_FULL_HEALING,  1 },
+    { POT_SEE_INVISIBLE,    POT_GAIN_ENERGY, POT_FRUIT_JUICE,   1 },
+    { POT_HALLUCINATION,    POT_GAIN_ENERGY, POT_BOOZE,      1 },
+    
+    { POT_SICKNESS,         POT_FRUIT_JUICE, POT_SICKNESS,   1 },
+    { POT_BLOOD,            POT_FRUIT_JUICE, POT_BLOOD,      1 },
+    { POT_VAMPIRE_BLOOD,    POT_FRUIT_JUICE, POT_VAMPIRE_BLOOD, 1 },
+    { POT_BOOZE,            POT_FRUIT_JUICE, POT_ENLIGHTENMENT, 1 },
+    { POT_BOOZE,            POT_FRUIT_JUICE, POT_SPEED,      1 },
+    { POT_SEE_INVISIBLE,    POT_FRUIT_JUICE, POT_GAIN_LEVEL, 1 },
+    { POT_SEE_INVISIBLE,    POT_FRUIT_JUICE, POT_GAIN_ENERGY,1 },
+
+    { POT_VAMPIRE_BLOOD,    POT_BLOOD, POT_VAMPIRE_BLOOD, 1 },
+    
+    { POT_GAIN_LEVEL,       POT_ENLIGHTENMENT, POT_LEVITATION, 3 },
+    { POT_BOOZE,            POT_ENLIGHTENMENT, POT_FRUIT_JUICE, 1 },
+    { POT_CONFUSION,        POT_ENLIGHTENMENT, POT_BOOZE,       1 },
+    
+    { ELVEN_DAGGER,         POT_GAIN_ENERGY, KNIFE,         1 },
+    { 0, 0, 0, 0 }
+};
+
 const char *
 gem_to_potion(otyp)
 int otyp;
@@ -3628,9 +3671,35 @@ dodip()
             update_inventory();
             return 1;
         }
+    } else if (potion->otyp == POT_INVULNERABILITY) {
+        if (obj->oartifact)
+            ; /* Already pretty indestructible */
+        else if (obj->oprops & ITEM_TOUGH)
+            ; /* Already has toughness */
+        else if (is_missile(obj) || is_ammo(obj))
+            ; /* Ammo and missiles not eligible */
+        else if (obj->oclass != WEAPON_CLASS 
+                && obj->oclass != ARMOR_CLASS
+                && obj->oclass != AMULET_CLASS
+                && obj->oclass != TOOL_CLASS
+                && obj->oclass != RING_CLASS)
+            ; /* Some items should not be indestructible: 
+ *              * food, potions, scrolls, etc */
+        else {
+            obj->oprops |= ITEM_TOUGH;
+            obj->oprops_known |= ITEM_TOUGH;
+            pline("%s covered by a %s %s %s!", Yobjnam2(obj, "are"),
+                  obj->cursed ? "mottled" : "shimmering",
+                  hcolor(obj->cursed ? NH_BLACK : NH_GOLDEN),
+                  obj->cursed ? "glow"
+                          : (is_shield(obj) ? "layer" : "shield"));
+            useup(potion);
+            update_inventory();
+            return 1;
+        }
     }
-    /* removing erosion from items */
-    else if (potion->otyp == POT_RESTORE_ABILITY && !potion->cursed
+     /* removing erosion from items */
+     else if (potion->otyp == POT_RESTORE_ABILITY && !potion->cursed
              && erosion_matters(obj) && (obj->oeroded || obj->oeroded2)) {
         obj->oeroded = obj->oeroded2 = 0;
         pline("%s as good as new!", Yobjnam2(obj, Blind ? "feel" : "look"));
@@ -4183,25 +4252,8 @@ int *res;
     if (carried(obj)) {
         if (obj == uskin) 
             rehumanize();
-        /* Quietly remove worn item if no longer compatible --ALI */
-        owornmask = obj->owornmask;
-        if (owornmask & W_ARM && !is_suit(obj))
-            owornmask &= ~W_ARM;
-        if (owornmask & W_ARMC && !is_cloak(obj))
-            owornmask &= ~W_ARMC;
-        if (owornmask & W_ARMH && !is_helmet(obj))
-            owornmask &= ~W_ARMH;
-        if (owornmask & W_ARMS && !is_shield(obj))
-            owornmask &= ~W_ARMS;
-        if (owornmask & W_ARMG && !is_gloves(obj))
-            owornmask &= ~W_ARMG;
-        if (owornmask & W_ARMF && !is_boots(obj))
-            owornmask &= ~W_ARMF;
-        if (owornmask & W_ARMU && !is_shirt(obj))
-            owornmask &= ~W_ARMU;
-        if (owornmask & W_TOOL && obj->otyp != BLINDFOLD &&
-          obj->otyp != TOWEL && obj->otyp != LENSES)
-            owornmask &= ~W_TOOL;
+        owornmask = obj->owornmask;;
+        quiet_unwear(obj);
         otyp2 = obj->otyp;
         obj->otyp = otyp;
         remove_worn_item(obj, TRUE);
@@ -4209,9 +4261,7 @@ int *res;
         obj->owornmask = owornmask;
         setworn(obj, obj->owornmask);
         set_wear(obj);
-        /* puton_worn_item(obj); */
     }
-
     
      if ((obj->otyp == BAG_OF_HOLDING || Bad_bag(obj)) 
           && Has_contents(obj)) {
@@ -4256,6 +4306,36 @@ int *res;
     return obj;
 }
 
+void
+quiet_unwear(obj)
+struct obj *obj;
+{
+    long owornmask = obj->owornmask;;
+    
+    /* Quietly remove worn item if no longer compatible --ALI */
+    if (owornmask & W_ARM && !is_suit(obj))
+        owornmask &= ~W_ARM;
+    if (owornmask & W_ARMC && !is_cloak(obj))
+        owornmask &= ~W_ARMC;
+    if (owornmask & W_ARMH && !is_helmet(obj))
+        owornmask &= ~W_ARMH;
+    if (owornmask & W_ARMS && !is_shield(obj))
+        owornmask &= ~W_ARMS;
+    if (owornmask & W_ARMG && !is_gloves(obj))
+        owornmask &= ~W_ARMG;
+    if (owornmask & W_ARMF && !is_boots(obj))
+        owornmask &= ~W_ARMF;
+    if (owornmask & W_ARMU && !is_shirt(obj))
+        owornmask &= ~W_ARMU;
+    if (owornmask & W_TOOL 
+            && obj->otyp != BLINDFOLD 
+            && obj->otyp != TOWEL
+            && obj->otyp != MASK
+            && obj->otyp != GOGGLES
+            && obj->otyp != LENSES)
+        owornmask &= ~W_TOOL;
+}
+
 int
 obj2upgrade(int otyp)
 {
@@ -4440,11 +4520,13 @@ obj2upgrade(int otyp)
     /* tools */
     
     case SACK: return OILSKIN_SACK;
-    case OILSKIN_SACK: return SACK;
     
-    case BAG_OF_HOLDING: return BAG_OF_TRICKS;     
+    case OILSKIN_SACK: return BAG_OF_HOLDING;
     case BAG_OF_TRICKS: return BAG_OF_HOLDING;
-
+    case BAG_OF_RATS: return BAG_OF_HOLDING;
+    
+    case BAG_OF_HOLDING: return SACK;
+    
     case SKELETON_KEY: return LOCK_PICK;
     case LOCK_PICK: return SKELETON_KEY;
         
diff --git a/src/pray.c b/src/pray.c
index 50bbbf828..01691ab99 100644
--- a/src/pray.c
+++ b/src/pray.c
@@ -1129,7 +1129,12 @@ gcrownu()
         You_feel("unworthy.");
     }
     update_inventory();
-
+    
+    /* The altar can't handle the transference of all that power! */
+    pline("The altar cracks in two and is destroyed!");
+    levl[u.ux][u.uy].typ = ROOM;
+    
+    
     /* lastly, confer an extra skill slot/credit beyond the
        up-to-29 you can get from gaining experience levels */
     add_weapon_skill(1);
@@ -1469,8 +1474,9 @@ aligntyp g_align;
                     otmp->material = objects[otmp->otyp].oc_material;
                     otmp->owt = weight(otmp);
                 }
-                if (!u.uconduct.literate && (otmp->otyp != SPE_BLANK_PAPER)
-                    && !known_spell(otmp->otyp)) {
+                if (!u.uconduct.literate && !max_spells_learned()
+                      && otmp->otyp != SPE_BLANK_PAPER
+                      && !known_spell(otmp->otyp)) {
                     if (force_learn_spell(otmp->otyp))
                         pline("Divine knowledge of %s fills your mind!",
                               OBJ_NAME(objects[otmp->otyp]));
@@ -2365,6 +2371,11 @@ dosacrifice()
                         makeknown(otmp->otyp);
                         discover_artifact(otmp->oartifact);
                     }
+                    if (!Role_if(PM_INFIDEL) && u.ugifts > 2
+                        && (rnd(6 + u.ugifts) <= u.ugifts)) {
+                        pline("The altar cracks in two and is destroyed!");
+                        levl[u.ux][u.uy].typ = ROOM;
+                    }
                     livelog_printf(LL_DIVINEGIFT | LL_ARTIFACT,
                                    "had %s bestowed upon %s by %s",
                                    otmp->oartifact
@@ -2397,7 +2408,7 @@ dosacrifice()
                 return 1;
             } else if (!rnl(30 + u.ulevel)) {
                 /* Random item blessed/cursed */
-                if (Role_if(PM_INFIDEL) && u.ualign.type==A_NONE)
+                if (Role_if(PM_INFIDEL) && u.ualign.type == A_NONE)
                     moloch_gives_curse();
                 else
                     god_gives_benefit();
diff --git a/src/priest.c b/src/priest.c
index 961c355a7..837e96025 100644
--- a/src/priest.c
+++ b/src/priest.c
@@ -610,6 +610,7 @@ void
 priest_talk(priest)
 register struct monst *priest;
 {
+    struct obj *gypgold;
     boolean coaligned = p_coaligned(priest);
     boolean strayed = (u.ualign.record < 0);
 
@@ -738,6 +739,15 @@ register struct monst *priest;
             }
         }
     }
+    /* The priest never carries cash; it might get stolen! */
+    if ((gypgold = findgold(priest->minvent, TRUE)) != 0) {
+        if (canspotmon(priest))
+            pline("%s gold %s.", s_suffix(Monnam(priest)),
+                  canseemon(priest) ? "vanishes" : "seems to vanish");
+        obj_extract_self(gypgold);
+        obfree(gypgold, (struct obj *) 0);
+    }
+    /*m_useup(priest, gypgold);*/
 }
 
 struct monst *
diff --git a/src/questpgr.c b/src/questpgr.c
index d0d33b42e..c558e0e6d 100644
--- a/src/questpgr.c
+++ b/src/questpgr.c
@@ -246,6 +246,9 @@ unsigned whichchains;
     if (!qarti && (whichchains & (1 << OBJ_BURIED)) != 0)
         qarti = find_qarti(level.buriedobjlist);
 
+    if (!qarti && (whichchains & (1 << OBJ_SOMEWHERE)) != 0)
+        qarti = find_qarti(mchest);
+
     return qarti;
 }
 
diff --git a/src/read.c b/src/read.c
index bd7c72c71..646e4008c 100644
--- a/src/read.c
+++ b/src/read.c
@@ -49,6 +49,7 @@ STATIC_PTR void specified_id(void);
 STATIC_PTR void seffect_cloning(struct obj **);
 STATIC_PTR void NDECL(do_acquirement);
 
+
 STATIC_OVL boolean
 learnscrolltyp(scrolltyp)
 short scrolltyp;
@@ -818,7 +819,7 @@ struct monst *mtmp;
     is_blessed = curse_bless > 0;
     
     /* Scrolls of charging now ID charge count, as well as doing
-               the charging, unless cursed. */
+       the charging, unless cursed. */
     if (is_blessed)
         obj->known = 1;
     
@@ -901,7 +902,7 @@ struct monst *mtmp;
                               : 0; /* monsters wear but don't charge rings */
 
         /* destruction depends on current state, not adjustment */
-        if (obj->spe > rn2(7) || obj->spe <= -5) {
+        if (obj->spe > rn2(6) + 3 || (is_cursed && obj->spe <= -5)) {
             if (yours) {
                 pline("%s momentarily, then %s!", Yobjnam2(obj, "pulsate"),
                       otense(obj, "explode"));
@@ -918,8 +919,7 @@ struct monst *mtmp;
                 else
                     You_hear("an explosion.");
                 m_useup(mtmp, obj);
-                mtmp->mhp -= 3 * abs(obj->spe);
-                if (mtmp->mhp <= 0) {
+                if (damage_mon(mtmp, 3 * abs(obj->spe), AD_ELEC)) {
                     if (canseemon(mtmp))
                         pline("%s is killed by the explosion!",
                               Monnam(mtmp));
@@ -2197,12 +2197,12 @@ struct obj *sobj; /* sobj - scroll or fake spellbook for spell */
             else
                 pline("Time slows down to a crawl around you!");
             bonus = 50 + bcsign(sobj) * 25;
-            youmonst.movement += bonus;
+            u.umovement += bonus;
             u.utimestop = TRUE;
         }
         /* Time is an illusion. Lunchtime doubly so. 
          * ― Douglas Adams, The Hitchhiker's Guide to the Galaxy */
-        morehungry(rn1(30, abs(bonus) * 5));
+        morehungry(rn1(30, abs(bonus) * 2));
         break;
     }
     case SCR_TELEPORTATION:
@@ -2360,20 +2360,27 @@ struct obj *sobj; /* sobj - scroll or fake spellbook for spell */
                 otmp->oprops = 0;
                 otmp->oprops_known = 0;
             }
-            /* Maybe change or add a property. Depends on luck.
+            /* Maybe change or add a property. 
+             * 
+             * Adding to a magical item depends on luck.
              * The percent is chance of success:
              *  LUCK:     <0      0     +2     +5     +8    +11
              * 	SUCCESS: 0.5%  20.0%  39.5%  59.0%  78.5%  98.0%
              * 	
              * 	If cursed the property is always wiped.
              */
-            else if ((sblessed || otmp->oprops) && rnl(5) == 0) {
+            else if (sblessed || otmp->oprops) {
+                if (objects[otmp->otyp].oc_magic && !rnl(5) == 0) {
+                    pline1(nothing_happens);
+                    break;
+                }
                 pline("%s with a fluorescent blue light!", Yobjnam2(otmp, "glow"));
-                otmp->oprops = 0;
-                otmp->oprops_known = 0;
-                create_oprop(otmp, TRUE);
+                handle_new_property(otmp);
+                /* Reveal the property */
+                otmp->oprops_known = otmp->oprops;
             } else {
                 pline1(nothing_happens);
+                break;
             }
         } else if (scursed) {
             pline("%s with a sickly green light!", Yobjnam2(otmp, "glow"));
@@ -2381,7 +2388,7 @@ struct obj *sobj; /* sobj - scroll or fake spellbook for spell */
             otmp->oerodeproof = 0;
             if (valid_obj_material(otmp, PLASTIC)) {
                 otmp->material = PLASTIC;
-                costly_alteration(otmp, COST_DRAIN);
+                costly_alteration(otmp, COST_TRANSMOGRIFY);
             } else
                 warp_material(otmp, TRUE);
             break;
@@ -2391,6 +2398,7 @@ struct obj *sobj; /* sobj - scroll or fake spellbook for spell */
             pline("%s with a strange yellow light!", Yobjnam2(otmp, "glow"));
             warp_material(otmp, TRUE);
         }
+        known = TRUE;
         update_inventory();
         break;
     }
@@ -2546,7 +2554,7 @@ struct obj *sobj; /* sobj - scroll or fake spellbook for spell */
                 pline("Where do you want to center the explosion?");
                 getpos_sethilite(display_stinking_cloud_positions,
                                  get_valid_stinking_cloud_pos);
-                (void) getpos(&cc, TRUE, "the desired position");
+                (void) getpos(&cc, FALSE, "the desired position");
                 if (!is_valid_stinking_cloud_pos(cc.x, cc.y, FALSE)) {
                     /* try to reach too far, get burned */
                     cc.x = u.ux;
@@ -2603,6 +2611,8 @@ struct obj *sobj; /* sobj - scroll or fake spellbook for spell */
         known = TRUE;
         if (confused || sblessed) {
             You_feel("culpable.");
+            hold_another_object(mksobj(IRON_CHAIN, FALSE, FALSE),
+                                "It slips away from you.", (char*)0, (char*)0);
             break;
         }
         punish(sobj);
@@ -2633,7 +2643,7 @@ struct obj *sobj; /* sobj - scroll or fake spellbook for spell */
         cc.y = u.uy;
         getpos_sethilite(display_stinking_cloud_positions,
                          get_valid_stinking_cloud_pos);
-        if (getpos(&cc, TRUE, "the desired position") < 0) {
+        if (getpos(&cc, FALSE, "the desired position") < 0) {
             pline1(Never_mind);
             break;
         }
@@ -2772,10 +2782,8 @@ struct obj *sobj; /* sobj - scroll or fake spellbook for spell */
                         dam += d(3, 3);
                     if (!rn2(3))
                         (void) destroy_mitem(mtmp, POTION_CLASS, AD_COLD);
-                    /* mtmp->mhp -= dam;*/
-                    damage_mon(mtmp, dam, AD_COLD);
-            
-                    if (DEADMONSTER(mtmp)) {
+
+                    if (damage_mon(mtmp, dam, AD_COLD)) {
                         killed(mtmp);
                     }
                 }
@@ -3040,14 +3048,16 @@ mwand_explode(mon, obj)
 register struct monst *mon;
 register struct obj *obj;
 {
+    int dmg = 0;
     if (canseemon(mon))
         pline("%s %s vibrates violently and explodes!",
               s_suffix(Monnam(mon)), xname(obj));
     else if (!Deaf)
         You_hear("an explosion.");
-    mon->mhp -= rnd(2 * (mon->mhpmax + 1) / 3);
+    dmg = rnd(2 * (mon->mhpmax + 1) / 3);
     m_useup(mon, obj);
-    if (mon->mhp <= 0) {
+    
+    if (damage_mon(mon, dmg, AD_MAGM)) {
     	if (canseemon(mon))
             pline("%s is killed by the explosion!", Monnam(mon));
         mondied(mon);
@@ -4292,4 +4302,45 @@ struct obj *otmp, *sobj;
     return TRUE;
 }
 
+void
+handle_new_property(otmp)
+struct obj *otmp;
+{
+    long old_wornmask = otmp->owornmask;
+    long old_oprops = otmp->oprops;
+    boolean was_twoweap = u.twoweap;
+    
+    remove_worn_item(otmp, FALSE);
+    otmp->oprops = 0;
+    otmp->oprops_known = 0;
+
+    /* Do our best to add a property. */
+    for (int i = 0; i < 1000; i++) {
+        create_oprop(otmp, TRUE);
+        if (otmp->oprops && otmp->oprops != old_oprops)
+            break;
+    }
+
+    if (old_wornmask) {
+        /* wearslot() returns a mask which might have multiple bits set;
+           narrow that down to the bit(s) currently in use */
+        /* if the new form can be worn in the same slot, make it so */
+        if ((old_wornmask & W_WEP) != 0L) {
+            setuwep(otmp);
+            if (was_twoweap && uwep && !bimanual(uwep))
+                u.twoweap = TRUE;
+        } else if ((old_wornmask & W_SWAPWEP) != 0L) {
+            setuswapwep(otmp);
+            if (was_twoweap && uswapwep)
+                u.twoweap = TRUE;
+        } else if ((old_wornmask & W_QUIVER) != 0L) {
+            setuqwep(otmp);
+        } else {
+            setworn(otmp, old_wornmask);
+        }
+        set_wear(otmp);
+    }
+    /* Handle burden property */
+    otmp->owt = weight(otmp);
+}
 /*read.c*/
diff --git a/src/restore.c b/src/restore.c
index f8b0fe5ff..aa66011df 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -657,6 +657,7 @@ unsigned int *stuckid, *steedid, *fearedmonid;
     restore_timers(fd, RANGE_GLOBAL, FALSE, 0L);
     restore_light_sources(fd);
     invent = restobjchn(fd, FALSE, FALSE);
+    mchest = restobjchn(fd, FALSE, FALSE);
 
     /* restore dangling (not on floor or in inventory) ball and/or chain */
     bc_obj = restobjchn(fd, FALSE, FALSE);
diff --git a/src/role.c b/src/role.c
index 0fab21980..99a4d669b 100644
--- a/src/role.c
+++ b/src/role.c
@@ -176,14 +176,14 @@ const struct Role roles[] = {
         { "Disintegrator", 0 },   /* WAC was Incinerator */
         { "Flame-Master",  0 } },
       "Earth", "Fire", "Ash", /* Special */
-      "Fla", "the great Circle of Flame", "the Water Mage's Cave",
+      "Fla", "the great Circle of Flame", "the High Ice Mage's Cave",
       PM_FLAME_MAGE, 
       NON_PM, 
       PM_HELL_HOUND_PUP,
       PM_HIGH_FLAME_MAGE, 
       PM_IGNITER,
-      PM_WATER_MAGE,
-      PM_WATER_ELEMENTAL, 
+      PM_HIGH_ICE_MAGE,
+      PM_ICE_ELEMENTAL, 
       PM_RUST_MONSTER, 
       S_ELEMENTAL, 
       S_RUSTMONST,
diff --git a/src/save.c b/src/save.c
index d86231b67..c05c44edf 100644
--- a/src/save.c
+++ b/src/save.c
@@ -346,6 +346,9 @@ register int fd, mode;
        pointers into invent (uwep, uarmg, uamul, &c) are set to Null too */
     saveobjchn(fd, &invent, mode);
 
+    /* it's just the one object, but saveobj doesn't do everything needed */
+    saveobjchn(fd, &mchest, mode);
+
     /* save ball and chain if they happen to be in an unusal state */
     save_bc(fd, mode);
 
@@ -1499,6 +1502,7 @@ freedynamicdata()
     free_timers(RANGE_GLOBAL);
     free_light_sources(RANGE_GLOBAL);
     freeobjchn(invent);
+    freeobjchn(mchest);
     freeobjchn(migrating_objs);
     freemonchn(migrating_mons);
     freemonchn(mydogs); /* ascension or dungeon escape */
diff --git a/src/shk.c b/src/shk.c
index e61241d65..44eea11c8 100644
--- a/src/shk.c
+++ b/src/shk.c
@@ -26,7 +26,7 @@ STATIC_DCL void FDECL(kops_gone, (BOOLEAN_P));
      || Race_if((mon)->mnum))
 
 #define hostile_shk(mon) \
-    ((erac_race_hostile(mon) || u.ualign.type == A_NONE) \
+    ((erac_race_hostile(mon) || Uevil_inherently) \
      && !is_izchak(mon, FALSE))
 
 #define muteshk(shkp) \
@@ -94,7 +94,7 @@ static int FDECL(shk_uncurse, (const char *, struct monst *));
 static int FDECL(shk_weapon_works, (const char *, struct monst *, long svc_type));
 static int FDECL(shk_armor_works, (const char *, struct monst *, long svc_type));
 static int FDECL(shk_property, (const char *, struct monst *));
-static int FDECL(shk_charge, (const char *, struct monst *, char svc_type));
+static int FDECL(shk_charge, (const char *, struct monst *, boolean premier));
 static int FDECL(shk_rumor, (const char *, struct monst *));
 static int FDECL(shk_firearms, (const char *, struct monst *));
 static int FDECL(shk_tinker, (const char *, struct monst *));
@@ -642,7 +642,7 @@ struct monst *shkp;
     livelog_printf(LL_ACHIEVE, "stole %ld %s worth of merchandise from %s %s",
                    total, currency(total), s_suffix(shkname(shkp)),
                    shtypes[eshkp->shoptype - SHOPBASE].name);
-    if (!Role_if(PM_ROGUE) && u.ualign.type != A_NONE) { 
+    if (!Role_if(PM_ROGUE) && !Uevil_inherently) { 
         if (u.ualign.type == A_LAWFUL)
             You_feel("guilty."); /* stealing is unlawful */
         adjalign(-sgn(u.ualign.type));
@@ -1494,7 +1494,7 @@ dopay()
         pline("Pay whom?");
         cc.x = u.ux;
         cc.y = u.uy;
-        if (getpos(&cc, TRUE, "the creature you want to pay") < 0)
+        if (getpos(&cc, FALSE, "the creature you want to pay") < 0)
             return 0; /* player pressed ESC */
         cx = cc.x;
         cy = cc.y;
@@ -1808,6 +1808,12 @@ shk_other_services()
     if (!shkp)
         return result;
     
+    /* Could be ressurected Izchak */
+    if (!has_erac(shkp)) {
+        pline("Sorry, I have no services to offer you.");
+        return result;
+    }
+    
     shkdat = &mons[ERAC(shkp)->rmnum];
     
     /* Init your name */
@@ -2033,10 +2039,10 @@ shk_other_services()
             result = shk_armor_works(slang, shkp, SHK_ARM_ENC);
             break;
         case 18:
-            result = shk_charge(slang, shkp, 'b');
+            result = shk_charge(slang, shkp, FALSE);
             break;
         case 19:
-            result = shk_charge(slang, shkp, 'p');
+            result = shk_charge(slang, shkp, TRUE);
             break;
         case 20:
             result = shk_rumor(slang, shkp);
@@ -2475,6 +2481,8 @@ unsigned id;
         return obj;
     if ((obj = o_on(id, migrating_objs)) != 0)
         return obj;
+    if ((obj = o_on(id, mchest)) != 0)
+        return obj;
 
     /* not found yet; check inventory for members of various monst lists */
     mmtmp[0] = fmon;
@@ -3954,7 +3962,7 @@ long ident_type;
     int i, charge;
     boolean ripoff = FALSE;
     boolean premium;
-
+    
     for (i = 0; i < IDENTIFY_TYPES; i++) {
         if (ident_type != id_types[i].svc_type) {
             continue;
@@ -3963,7 +3971,11 @@ long ident_type;
             return 0;
         break;
     }
-
+    if (obj->unpaid) {
+        verbalize("You'll have to buy it first...");
+        return 0;
+    }
+    
     if (ident_type == SHK_ID_WEAPON || ident_type == SHK_ID_ARMOR)
         premium = TRUE;
     
@@ -3975,7 +3987,8 @@ long ident_type;
         if (premium
               && obj->bknown 
               && obj->rknown 
-              && obj->known) 
+              && obj->known
+              && obj->oprops == obj->oprops_known) 
             ripoff = TRUE;
     }
 
@@ -3986,8 +3999,10 @@ long ident_type;
         }
         pline("%s chuckles greedily...", mon_nam(shkp));
         charge = base_id_charge(obj);
-    } else if (!premium)
-        charge = base_id_charge(obj);       /* basic */    
+    } else if (!premium 
+        /* Give a little break on weapons and armor */
+        || ident_type == SHK_ID_WEAPON || ident_type == SHK_ID_ARMOR)
+        charge = base_id_charge(obj);       /* basic */
     else {
         charge = base_id_charge(obj) * 2;   /* premier */
     }
@@ -4032,6 +4047,10 @@ struct monst *shkp;
 
     if (!(obj = getobj(identify_types, "uncurse")))
         return 0;
+    if (obj->unpaid) {
+        verbalize("You'll have to buy it first...");
+        return 0;
+    }
 
     if (obj->bknown && !obj->cursed && !Confusion && !Hallucination) {
         pline("That item is not cursed!");
@@ -4088,6 +4107,10 @@ long svc_type;
     
     if (!obj)
         return 0;
+    if (obj->unpaid) {
+        verbalize("You'll have to buy it first...");
+        return 0;
+    }
 
     /* Check if you asked for a non weapon tool to be improved */
     if (obj->oclass == TOOL_CLASS && !is_weptool(obj))
@@ -4195,8 +4218,12 @@ long svc_type;
     struct obj *obj;
     int charge;
 
-    if ( !(obj = getobj(armor_types, "improve")))
+    if (!(obj = getobj(armor_types, "improve")))
         return 0;
+    if (obj->unpaid) {
+        verbalize("You'll have to buy it first...");
+        return 0;
+    }
 
     switch (svc_type) {
     case SHK_ARM_FIX:
@@ -4290,6 +4317,10 @@ struct monst *shkp;
     obj = getobj(all_count, "enhance");
     if (!obj)
         return 0;
+    if (obj->unpaid) {
+        verbalize("You'll have to buy it first...");
+        return 0;
+    }
 
     if (shk_class_match(WEAPON_CLASS, shkp) == SHK_MATCH
         && obj->oclass != WEAPON_CLASS ) {
@@ -4308,7 +4339,7 @@ struct monst *shkp;
     if (obj->oprops) {
         verbalize("Your %s already has a property, I could *try* to remove it...", xname(obj));
         charge = 250;
-        shk_smooth_charge(&charge, 200, NOBOUND);
+        shk_smooth_charge(&charge, 250, NOBOUND);
         if (shk_offer_price(slang, charge, shkp) == FALSE)
             return 0;
         if (!rn2(4)) {
@@ -4324,7 +4355,13 @@ struct monst *shkp;
         return 0;
     } else {
         verbalize("Imbue your %s with special power!", xname(obj));
-        charge = 2000;
+        
+        /* Magical items cost quite a bit more */
+        if (objects[obj->otyp].oc_magic) {
+            charge = 2250;
+        } else
+            charge = 750;
+        
         shk_smooth_charge(&charge, 50, NOBOUND);
         if (shk_offer_price(slang, charge, shkp) == FALSE)
             return 0;
@@ -4332,8 +4369,12 @@ struct monst *shkp;
         verbalize("No refunds or exchanges!");
         if (Hallucination) {
             Your("%s to dissemble into pieces!", aobjnam(obj, "seem"));
-        } else
-            create_oprop(obj, TRUE);
+            
+        } else {
+            handle_new_property(obj);
+            /* Reveal the property */
+            obj->oprops_known = obj->oprops;
+        }
     }
     fully_identify_obj(obj);
     update_inventory();
@@ -4343,7 +4384,7 @@ struct monst *shkp;
 }
 
 static int
-shk_charge(const char *slang, struct monst *shkp, char svc_type)
+shk_charge(const char *slang, struct monst *shkp, boolean premier)
 {
     struct obj *obj = NULL;
     struct obj *tobj;
@@ -4353,42 +4394,37 @@ shk_charge(const char *slang, struct monst *shkp, char svc_type)
     obj = getobj(all_count, "charge");
     if (!obj) 
         return 0;
-
-    if (shk_class_match(WAND_CLASS, shkp) == SHK_MATCH 
-            && obj->oclass != WAND_CLASS ) {
-        verbalize("I only can charge wands.");
-        return 0;
-    } else if (shk_class_match(TOOL_CLASS, shkp) == SHK_MATCH
-               && obj->oclass != TOOL_CLASS) {
-        verbalize("I only can charge tools.");
-        return 0;
-    } else if (shk_class_match(RING_CLASS, shkp) == SHK_MATCH
-               && obj->oclass != RING_CLASS) {
-        verbalize("I only can charge rings.");
+    if (obj->unpaid) {
+        verbalize("You'll have to buy it first...");
         return 0;
     }
-#if 0 /* Disabled charging spellbooks */
-    else if (shk_class_match(SPBOOK_CLASS, shkp) == SHK_MATCH 
-             && obj->oclass != SPBOOK_CLASS) {
-        verbalize("I only can charge spellbooks.");
-        return 0;
+
+    if (premier) {
+        if (shk_class_match(WAND_CLASS, shkp) == SHK_MATCH
+            && obj->oclass != WAND_CLASS) {
+            verbalize("I only offer premium charging on wands.");
+            return 0;
+        } else if (shk_class_match(TOOL_CLASS, shkp) == SHK_MATCH
+                   && obj->oclass != TOOL_CLASS) {
+            verbalize("I only offer premium charging on tools.");
+            return 0;
+        } else if (shk_class_match(RING_CLASS, shkp) == SHK_MATCH
+                   && obj->oclass != RING_CLASS) {
+            verbalize("I only offer premium charging on rings.");
+            return 0;
+        }
     }
-#endif
         
     /*
     ** Wand shops can offer special service!
     ** Extra charges (for a lot of extra money!)
     */
-    if (svc_type == 'b')
-        charge = 300;
+    if (!premier)
+        charge = 250;
     else
         charge = 1000;
-
-    /* Wands of wishing should be hard to get recharged */
-    if (obj->otyp == WAN_WISHING)
-        charge *= 3;
-    else
-        shk_smooth_charge(&charge, 100, 1000);
+    
+    shk_smooth_charge(&charge, 100, 1000);
     
     if (shk_offer_price(slang, charge, shkp) == FALSE)
         return 0;
@@ -4399,7 +4435,7 @@ shk_charge(const char *slang, struct monst *shkp, char svc_type)
     }
     
     invlet = obj->invlet;
-    recharge(obj, (svc_type == 'b') ? 0 : 1, &youmonst);
+    recharge(obj, !premier ? 0 : 1, &youmonst);
 
     /*
     ** Did the object blow up?  We need to check this in a way that has 
@@ -4421,13 +4457,11 @@ shk_charge(const char *slang, struct monst *shkp, char svc_type)
     /* Wands get special treatment */
     if (obj->oclass == WAND_CLASS) {
         if (obj->otyp == WAN_WISHING) {
-            if (svc_type == 'p') 
+            if (premier) 
                 obj->spe++; /* Premier gives you ONE more charge */
             verbalize("Since you'll have everything you always wanted,");
             verbalize("...How about loaning me some money?");
-            money2mon(shkp, money_cnt(invent));
             makeknown(obj->otyp);
-            bot();
         } else {
             /* Basic: recharge() will have given 1 charge.
             ** Premier: recharge() will have given 5-10, say.
@@ -4552,12 +4586,16 @@ const char *slang;
 struct monst *shkp;
 {
     register struct obj *obj;
-    int charge = 2000; /* Gnomes are greedy */
+    int charge = 500; /* Gnomes are greedy */
     int res = 0;
 
     if (!(obj = getobj(identify_types, "have tinkered")))
         return 0;
-    
+    if (obj->unpaid) {
+        verbalize("You'll have to buy it first...");
+        return 0;
+    }
+
     if (ACURR(A_INT) < 13) {
        charge += 1000;
     }
@@ -5715,7 +5753,7 @@ boolean cant_mollify;
         } else
             growl(shkp);
         hot_pursuit(shkp);
-        if (u.ualign.type != A_NONE)
+        if (!Uevil_inherently)
             adjalign(-sgn(u.ualign.type));
     }
 }
@@ -6594,6 +6632,15 @@ struct monst* shkp;
         verbalize("Bugger off, you filthy little %s. Don't come begging around here!", urace.noun);
         return;
     }
+    /* Deaf */
+    if (Deaf)
+        return;
+    if (u.usleep) {
+        You("dream that there are great deals at the local shop.");
+        return;
+    }
+    /* Sleeping/paralyzed */
+    
     switch (ESHK(shkp)->shoptype) {
         default:
             verbalize(general_wares[rn2(CRYNUMBER)], urace.noun);
diff --git a/src/shknam.c b/src/shknam.c
index 7972b3111..d7dc6c1ce 100644
--- a/src/shknam.c
+++ b/src/shknam.c
@@ -897,11 +897,12 @@ int shp_indx;
     /* wands and potions also similar... */
     case WAND_CLASS:
     case POTION_CLASS:
-        switch (rnd(4)) {
+        switch (rnd(8)) {
         case 1: srace = PM_ELF; break;
         case 2: srace = PM_GNOME; break;
         case 3: srace = PM_NYMPH; break;
         case 4: srace = PM_HUMAN; break;
+        default:  srace = PM_VAMPIRIC; break;
         }
         break;
     case TOOL_CLASS:
@@ -920,11 +921,12 @@ int shp_indx;
     /* and scrolls and books fall to spellcasters */
     case SCROLL_CLASS:
     case SPBOOK_CLASS:
-        switch (rnd(4)) {
+        switch (rnd(5)) {
         case 1: srace = PM_ILLITHID; break;
         case 2: srace = PM_HUMAN; break;
         case 3: srace = PM_GNOME; break;
         case 4: srace = PM_ELF; break;
+        case 5: srace = PM_VAMPIRIC; break;
         }
         break;
     default:
@@ -955,7 +957,7 @@ int shp_indx;
     eshkp->customer[0] = '\0';
     /* WAC init services */
     init_shk_services(shk);
-    shkmoney = 1000L + 30L * (long) rnd(100);  /* initial capital */
+    shkmoney = 2250L + 65L * (long) rnd(100);  /* initial capital */
     /* [CWC] Lets not create the money yet until we see if the
          shk is a black marketeer, else we'll have to create
        another money object, if GOLDOBJ is defined */
@@ -1248,9 +1250,6 @@ struct monst *shk;
             maybe_add_svc(shk, SHK_ID_WAND);
         if (!rn2(5))
             maybe_add_svc(shk, SHK_ID_ARMOR);
-        /* Only wand shops offer premium charging */
-        if (!rn2(4) && (shk_class_match(WAND_CLASS, shk) == SHK_MATCH)) 
-            maybe_add_svc(shk, SHK_CHG_PRE);
     } 
     else if (shk_class_match(FOOD_CLASS, shk) == SHK_MATCH) {
         maybe_add_svc(shk, SHK_ID_FOOD);
@@ -1290,15 +1289,23 @@ struct monst *shk;
             maybe_add_svc(shk, SHK_PROP);
     }
     
-    /* Charging services */
+    /* Charging services: If these shops offer charging, they
+     * always offer both basic and premium. However, they
+     * are restricted to their own specialty of items. */
     if (     (shk_class_match(WAND_CLASS, shk) == SHK_MATCH) 
           || (shk_class_match(TOOL_CLASS, shk) == SHK_MATCH)
-          || (shk_class_match(RING_CLASS, shk) == SHK_MATCH)
-          || (shk_class_match(RANDOM_CLASS, shk) == SHK_MATCH)) {
-        if (!rn2(4)) 
+          || (shk_class_match(RING_CLASS, shk) == SHK_MATCH)) {
+        if (!rn2(4)) {
             maybe_add_svc(shk, SHK_CHG_BAS);
+            maybe_add_svc(shk, SHK_CHG_PRE);
+        }
     }
 
+    /* General/junk stores can only offer basic charging, 
+     * but they can charge anything. */
+    if (shk_class_match(RANDOM_CLASS, shk) == SHK_GENERAL && !rn2(4))
+        maybe_add_svc(shk, SHK_CHG_BAS);
+    
     if (!strcmp(shtypes[ESHK(shk)->shoptype-SHOPBASE].name, "pet store")) {
         if (!(ESHK(shk)->services & SHK_ID_FOOD) && !rn2(2))
             maybe_add_svc(shk, SHK_ID_FOOD);
diff --git a/src/sit.c b/src/sit.c
index 1822e2086..4f24fd5c5 100644
--- a/src/sit.c
+++ b/src/sit.c
@@ -170,6 +170,10 @@ dosit()
         You(sit_message, "stairs");
     } else if (typ == LADDER) {
         You(sit_message, "ladder");
+    } else if (typ == MAGIC_CHEST) {
+        You(sit_message, defsyms[S_magic_chest].explanation);
+        /* more ergonomic than most chests */
+        pline("It's surprisingly comfortable!");
     } else if (typ == VENT) {
         You(sit_message, "grate");
     } else if (IS_FORGE(typ)) {
diff --git a/src/sp_lev.c b/src/sp_lev.c
index 475baad77..7d9a47bcb 100644
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -688,7 +688,8 @@ count_features()
       = level.flags.nsinks 
         = level.flags.nvents 
           = level.flags.nforges 
-            = level.flags.ntoilets = 0;
+            = level.flags.nmagicchests
+              = level.flags.ntoilets = 0;
     
     for (y = 0; y < ROWNO; y++)
         for (x = 0; x < COLNO; x++) {
@@ -701,6 +702,8 @@ count_features()
                 level.flags.nsinks++;
             else if (typ == FORGE)
                 level.flags.nforges++;
+            else if (typ == MAGIC_CHEST)
+                level.flags.nmagicchests++;
             else if (typ == TOILET)
                 level.flags.ntoilets++;
         }
@@ -4529,6 +4532,9 @@ struct sp_coder *coder;
     case SPO_FORGE:
         typ = FORGE;
         break;
+    case SPO_MAGIC_CHEST:
+        typ = MAGIC_CHEST;
+        break;
     case SPO_SINK:
         typ = SINK;
         break;
@@ -5715,6 +5721,7 @@ sp_lev *lvl;
         case SPO_TOILET:
         case SPO_POOL:
         case SPO_FORGE:
+        case SPO_MAGIC_CHEST:
         case SPO_FOUNTAIN:
         case SPO_VENT:
         case SPO_PUDDLE:
diff --git a/src/spell.c b/src/spell.c
index 02144b049..18f63f316 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -13,26 +13,27 @@
    eligible to reread the spellbook and regain 100% retention (the threshold
    used to be 1000 turns, which was 10% of the original 10000 turn retention
    period but didn't get adjusted when that period got doubled to 20000) */
-#define KEEN            20000
-#define CAST_BOOST 	    500	/* memory increase for successful casting */
-#define REINFORCE_BOOST 20000	/* memory increase for reinforce memory */
-#define MAX_KNOW 	    100000	/* Absolute Max timeout */
+#define KEEN            10000
+#define CAST_BOOST 	    500	    /* memory increase for successful casting */
+#define REINFORCE_BOOST 10000	/* memory increase for reinforce memory */
+#define MAX_KNOW 	    70000	/* Absolute Max timeout */
+/* Most spells a player can learn */
+#define SPELL_LIMIT     ((ACURR(A_WIS) + ACURR(A_INT) + 5) \
+                          / (primary_caster() ? (Role_if(PM_WIZARD) ? 3 : 4) : 12))
 
 /* x: need to add 1 when used for reading a spellbook rather than for hero
    initialization; spell memory is decremented at the end of each turn,
    including the turn on which the spellbook is read; without the extra
    increment, the hero used to get cheated out of 1 turn of retention */
 #define incrnknow(spell, x) (spl_book[spell].sp_know = KEEN + (x))
-#define boostknow(spell, boost)  spl_book[spell].sp_know = ((spl_book[spell].sp_know + boost > MAX_KNOW) ? MAX_KNOW \
-				 : spl_book[spell].sp_know + boost)
+#define boostknow(spell, boost)  spl_book[spell].sp_know = \
+                ((spl_book[spell].sp_know + boost > MAX_KNOW) \
+                    ? MAX_KNOW \
+				    : spl_book[spell].sp_know + boost)
 #define spellev(spell) spl_book[spell].sp_lev
 #define spellname(spell) OBJ_NAME(objects[spellid(spell)])
-
-/* Added 10 more spell slots (from SlashEM) */
-#define spellet(spell)	\
-	((char) ((spell < 26) ? ('a' + spell) : \
-	        (spell < 52) ? ('A' + spell - 26) : \
-		(spell < 62) ? ('0' + spell - 52) : 0 ))
+#define spellet(spell) \
+    ((char) ((spell < 26) ? ('a' + spell) : ('A' + spell - 26)))
 
 STATIC_DCL int FDECL(spell_let_to_idx, (CHAR_P));
 STATIC_DCL boolean FDECL(cursed_book, (struct obj * bp));
@@ -51,6 +52,7 @@ STATIC_DCL char *FDECL(spellretention, (int, char *));
 STATIC_DCL int NDECL(throwspell);
 STATIC_DCL void FDECL(spell_backfire, (int));
 STATIC_DCL boolean FDECL(spell_aim_step, (genericptr_t, int, int));
+STATIC_DCL boolean NDECL(primary_caster);
 
 static const char clothes[] = { ARMOR_CLASS, 0 };
 
@@ -370,6 +372,15 @@ learn(VOID_ARGS)
     boolean costly = TRUE;
     struct obj *book = context.spbook.book;
     
+    if (max_spells_learned()) {
+        if (ACURR(A_INT) == AMAX(A_INT) 
+            && ACURR(A_WIS) == AMAX(A_WIS))
+            You("are not capable of learning any new spells (right now).");
+        else
+            You("are not capable of learning any new spells.");
+        return 0;
+    }
+    
     /* JDS: lenses give 50% faster reading; 33% smaller read time */
     if (context.spbook.delay && ublindf && ublindf->otyp == LENSES && rn2(2))
         context.spbook.delay++;
@@ -1516,8 +1527,12 @@ boolean wiz_cast;
     }
 
     /* gain skill for successful cast */
+    /* Skill gain for spells is faster than skill gain for weapons;
+       four times faster when at basic skill or lower, two times
+       when above. */
     if (!wiz_cast)
-        use_skill(skill, spellev(spell));
+    use_skill(skill, (spellev(spell) * ((role_skill <= P_BASIC 
+                                         && can_advance(skill, FALSE)) ? 4 : 2)));
 
     /* WAC successful casting increases solidity of knowledge */
 	boostknow(spell, CAST_BOOST);
@@ -1555,7 +1570,7 @@ throwspell()
     pline("Where do you want to cast the spell?");
     cc.x = u.ux;
     cc.y = u.uy;
-    if (getpos(&cc, TRUE, "the desired position") < 0)
+    if (getpos(&cc, FALSE, "the desired position") < 0)
         return 0; /* user pressed ESC */
     /* The number of moves from hero to where the spell drops.*/
     if (distmin(u.ux, u.uy, cc.x, cc.y) > 10) {
@@ -1712,6 +1727,21 @@ losespells()
     }
 }
 
+/* Completely remove the last spell in our spell library */
+void
+forget_spell()
+{
+    int n, lastspell;
+
+    for (n = 0; n < MAXSPELL; ++n)
+        if (spellid(n) == NO_SPELL)
+            break;
+    lastspell = n - 1;
+    
+    Your("%s spell has been forgotten.", spellname(lastspell));
+    spellknow(lastspell) = 0;
+    spellid(lastspell) = NO_SPELL;
+}
 /*
  * Allow player to sort the list of known spells.  Manually swapping
  * pairs of them becomes very tedious once the list reaches two pages.
@@ -2033,7 +2063,7 @@ int spell;
     int difficulty;
     int skill;
     int dex_adjust;
-    boolean paladin_bonus, primary_casters, non_casters;
+    boolean paladin_bonus, is_spellcaster, non_casters;
 
     /* Calculate intrinsic ability (splcaster) */
 
@@ -2066,14 +2096,8 @@ int spell;
     paladin_bonus = Role_if(PM_KNIGHT) && spell_skilltype(spellid(spell)) == P_ENCHANTMENT_SPELL;
 
     /* Casting roles */
-    primary_casters = (Role_if(PM_HEALER) 
-                       || Role_if(PM_PRIEST)
-                       || Role_if(PM_FLAME_MAGE)
-                       || Role_if(PM_ICE_MAGE)
-                       || Role_if(PM_NECROMANCER)
-                       || Role_if(PM_WIZARD) 
-                       || Role_if(PM_INFIDEL));
-
+    is_spellcaster = primary_caster();
+    
     non_casters = (Role_if(PM_ARCHEOLOGIST) 
                    || Role_if(PM_BARBARIAN) 
                    || Role_if(PM_CAVEMAN)
@@ -2252,7 +2276,7 @@ int spell;
         && !is_robe(uarm)) {
 #define PENALTY_NON_CASTER (spellev(spell) * 10)
 #define PENALTY_PRI_CASTER (spellev(spell) * 10) - 30
-        if (primary_casters && spellev(spell) >= 4)
+        if (is_spellcaster && spellev(spell) >= 4)
             chance -= PENALTY_PRI_CASTER;
         if (non_casters)
             chance -= PENALTY_NON_CASTER;
@@ -2355,12 +2379,12 @@ studyspell()
         if (spellknow(spell_no) <= 0) {
             You("are unable to focus your memory of the spell.");
             return (FALSE);
-        } else if (spellknow(spell_no) <= 1000) {
+        } else if (spellknow(spell_no) <= (KEEN / 2)) {
             Your("focus and reinforce your memory of the spell.");
             boostknow(spell_no, REINFORCE_BOOST);
             exercise(A_WIS, TRUE);      /* extra study */
             return (TRUE);
-        } else /* 1000 < spellknow(spell_no) <= 5000 */
+        } else
             You("know that spell quite well already.");
     }
     return (FALSE);
@@ -2482,4 +2506,32 @@ dump_spells()
     }
 }
 
+void
+spell_nag()
+{
+    /* Check for fading spells */
+    for (int i = 0; i < MAXSPELL && spellid(i) != NO_SPELL; i++) {
+        if (spellknow(i) == 100) {
+            Your("%s spell is fading!", spellname(i));
+        }
+    }
+}
+
+STATIC_OVL boolean
+primary_caster() {
+    return (Role_if(PM_HEALER)
+            || Role_if(PM_PRIEST)
+            || Role_if(PM_FLAME_MAGE)
+            || Role_if(PM_ICE_MAGE)
+            || Role_if(PM_NECROMANCER)
+            || Role_if(PM_WIZARD)
+            || Role_if(PM_INFIDEL));
+}
+
+boolean
+max_spells_learned()
+{
+    return num_spells() >= SPELL_LIMIT;
+}
+
 /*spell.c*/
diff --git a/src/steed.c b/src/steed.c
index 0ba6077da..cee0537ce 100644
--- a/src/steed.c
+++ b/src/steed.c
@@ -998,6 +998,12 @@ int x, y;
                    mon->mstate, buf);
         return;
     }
+    /* If monster was trapped, it's possible that while engulfing it
+     * may change position. Ex: A green slime engulfing a monster can end
+     * up in a different position than it started after finishing the engulf. */
+    if (mon->mtrapped && mon->mx != x && mon->my != y)
+        mon->mtrapped = 0;
+
     mon->mx = x, mon->my = y;
     level.monsters[x][y] = mon;
 }
diff --git a/src/tech.c b/src/tech.c
index ddbfda5f1..356c7880b 100644
--- a/src/tech.c
+++ b/src/tech.c
@@ -147,8 +147,9 @@ STATIC_OVL NEARDATA const char *tech_names[] = {
 
 /* Roles */
 static const struct innate_tech
-    arc_tech[] = { 
-        { 1, T_RESEARCH, 1 },
+    arc_tech[] = {
+        { 1, T_APPRAISAL, 1 },
+        { 3, T_RESEARCH, 1 },
         { 0, 0, 0 } 
     },
     bar_tech[] = { 
@@ -234,7 +235,6 @@ static const struct innate_tech
         { 0, 0, 0 } 
     },
     pir_tech[] = {
-        { 1, T_PRACTICE, 1 },
         { 1, T_TUMBLE, 1 },
         { 5, T_SUNDER, 1 },
         { 0, 0, 0 } 
@@ -951,27 +951,27 @@ int tech_no;
                 return 0;
             res = blitz_pummel();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_BLITZ:
             res = doblitz();
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(1000, 1500); /* Premium tech */
             break;
         case T_E_FIST:
             res = blitz_e_fist();;
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_CHI_STRIKE:
             res = blitz_chi_strike();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_CHI_HEALING:
             res = tech_chiheal();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_G_SLAM:
             /* Called outside of blitz_pummel to work with doblitz */
@@ -979,7 +979,7 @@ int tech_no;
                 return 0;
             res = blitz_g_slam();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_UPPERCUT:
             /* Called outside of blitz_pummel to work with doblitz */
@@ -987,7 +987,7 @@ int tech_no;
                 return 0;
             res = blitz_uppercut();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_DASH:
             /* Called outside of blitz_pummel to work with doblitz */
@@ -995,20 +995,21 @@ int tech_no;
                 return 0;
             res = blitz_dash();
             if (res)
-                t_timeout = rn1(50, 25);
+                t_timeout = rn1(100, 100);
             break;
         case T_POWER_SURGE:
             res = blitz_power_surge();
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(1000, 1500);
             break;
         case T_SPIRIT_BOMB:
             /* Called outside of blitz_pummel to work with doblitz */
             if (!getdir(NULL))
                 return 0;
             res = blitz_spirit_bomb();
+            /* Also costs potentially all your energy */
             if (res)
-                t_timeout = rn1(250, 250);
+                t_timeout = rn1(500, 1000);
             break;
 
             /* --- REGULAR TECHS --- */
@@ -1016,30 +1017,28 @@ int tech_no;
         case T_RESEARCH:
             res = tech_research();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_EVISCERATE:
             res = tech_eviscerate();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_BERSERK:
             res = tech_berserk();
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_ICEARMOR:
             res = tech_icearmor();
             if (res) {
-                t_timeout = rn1(500, 500);
-                if (carrying_arti(ART_STORM_WHISTLE))
-                    t_timeout /= 2;
+                t_timeout = rn1(500, 1000);
             }
             break;
         case T_REINFORCE:
             res = tech_reinforce();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_FLURRY:
             res = tech_flurry();
@@ -1049,134 +1048,142 @@ int tech_no;
         case T_APPRAISAL:
             res = tech_appraisal();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(100, 100);
             break;
         case T_PRACTICE:
             res = tech_practice();
+            /* This costs time, but for the roles that get this tech, 
+             * we don't want it to have an overly high timeout */
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(100, 100); /* Utility tech */
             break;
         case T_SURGERY:
             res = tech_surgery();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_HEAL_HANDS:
             res = tech_healhands();
             if (res)
-                t_timeout = rn1(500, 500);;
+                t_timeout = rn1(500, 1000);;
             break;
         case T_KIII:
             res = tech_kiii();
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_CALM_STEED:
             res = tech_calmsteed();
             if (res)
-                t_timeout = 250;
+                t_timeout = rn1(100, 100); /* Utility tech */
             break;
         case T_TURN_UNDEAD:
             /* Due to Undead Slayer Vampire being a playable combination */
             if (Race_if(PM_VAMPIRIC)) {
                 You("shudder at the thought."); 
             } else {
+                /* No timeout, since there was none for #turn */
                 res = turn_undead();
             }
             break;
         case T_VANISH:
             res = tech_vanish();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_CRIT_STRIKE:
             res = tech_critstrike();
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_CUTTHROAT:
             res = tech_cutthroat();
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_BLESSING:
             res = tech_blessing();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_CURSE:
             res = tech_curse();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_PRIMAL_ROAR:
             res = tech_primalroar();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_LIQUID_LEAP:
             res = tech_liquidleap();
             if (res)
-                t_timeout = rn1(250, 250);
+                t_timeout = rn1(500, 500);
             break;
         case T_RAISE_ZOMBIES:
             res = tech_raisezombies();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_WHISTLE_UNDEAD:
             res = tech_whistledead();
-            if (res)
-                t_timeout = rn1(100, 100);
+            /* No timeout - nice perk for necromancers */
             break;
         case T_REVIVE:
             res = tech_revive();
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_TINKER:
             res = tech_tinker();
-            /* No timeout */
+            /* No timeout - this costs time */
             break;
         case T_RAGE:
             res = tech_rage();
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_BLINK:
             res = tech_blink();
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_DRAW_ENERGY:
             res = tech_drawenergy();
             if (res)
-                t_timeout = rn1(1000, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_PICKPOCKET:
             res = tech_pickpocket();
-            /* No timeout */
+            /* No timeout - the cost is failure 
+             * or possibly angering peacefuls */
             break;
         case T_DISARM:
-            res = tech_disarm(); /* No timeout */
+            res = tech_disarm();
+            /* No timeout - the cost is failure 
+             * or possibly angering peacefuls */
             break;
         case T_DAZZLE:
             res = tech_dazzle();
             if (res)
-                t_timeout = rn1(50, 25);
+                t_timeout = rn1(100, 100); /* Utility tech */
             break;
         case T_SPIRIT_TEMPEST:
             res = tech_spirittempest();
+            /* This also costs potentially all of our energy */
             if (res)
-                t_timeout = rn1(250, 250);
+                t_timeout = rn1(500, 1000);
             break;
         case T_DRAW_BLOOD:
-            res = tech_drawblood(); /* No timeout */
+            res = tech_drawblood();
+            /* No timeout - This costs a phial and an XP level */
             break;
         case T_JEDI_JUMP:
             res = tech_jedijump();
+            /* This also costs 10 energy */
             if (res)
-                t_timeout = rn1(50, 25);
+                t_timeout = rn1(100, 100);
             break;
         case T_BOOZE:
             res = tech_booze();
@@ -1185,53 +1192,56 @@ int tech_no;
             break;
         case T_SOULEATER:
             res = tech_souleater();
+            /* This also costs half of our HP */
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_POWER_SHIELD:
             res = tech_shieldblock();
+            /* While active this costs energy for each block */
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_TELEKINESIS:
             /* Set t_inuse=1 temporarily so the use of telekinesis can be seen in shk.c */
             tech_list[tech_no].t_inuse = 1;
             res = tech_telekinesis();
             tech_list[tech_no].t_inuse = 0;
-
             if (res)
-                t_timeout = 250;
+                t_timeout = rn1(100, 100);
             break;
         case T_FORCE_PUSH:
             res = tech_forcepush();
             if (res)
-                t_timeout = rn1(250, 250);
+                t_timeout = rn1(500, 500);
             break;
         case T_CHARGE_SABER:
             res = tech_chargesaber();
             if (res)
-                t_timeout = rn1(500, 500);
+                t_timeout = rn1(500, 1000);
             break;
         case T_TUMBLE:
             res = tech_tumble();
             if (res)
-                t_timeout = rn1(50, 25);
+                t_timeout = rn1(100, 100); /* Utility tech */
             break;
         case T_SUNDER:
             res = tech_sunder();
             if (res)
-                t_timeout = rn1(50, 25);
+                t_timeout = rn1(500, 500);
             break;
         case T_BLOOD_MAGIC:
             res = tech_bloodmagic();
+            /* This potentially costs lots of HP! */
             if (res)
-                t_timeout = rn1(250, 250);
+                t_timeout = rn1(500, 1000);
             break;
         case T_BREAK_ROCK:
             if (!getdir(NULL))
                 return 0;
             res = do_breakrock(u.dx + u.ux, u.dy + u.uy);
-            /* No timeout */
+            /* No timeout - this can take a little time 
+             * and requires training */
             break;
         default:
             pline("Error!  No such effect (%i)", tech_no);
@@ -1273,6 +1283,7 @@ int dam;
         if (mtmp)
             You("%s the attack with your shield.",
                 rn2(2) ? "block" : "deflect");
+        use_skill(P_SHIELD, 1);
         /* The projectile blocking has a message in thitu */
     } else if (mtmp) {
         if (rn2(2))
@@ -1363,6 +1374,7 @@ void
 tech_timeout()
 {
     int i;
+    
     for (i = 0; i < MAXTECH; i++) {
         if (techid(i) == NO_TECH)
               continue;
@@ -1449,6 +1461,9 @@ tech_timeout()
             }
         }
 
+        if (!u.uacted)
+            continue; /* No timeout for doing nothing */
+            
         if (techtout(i) == 1) {
               pline("Your %s technique is ready to be used!", techname(i));
               stop_occupation();
@@ -1470,7 +1485,7 @@ tech_timeout()
             || (u.uhunger > (Race_if(PM_HOBBIT) ? 3000 : 1000))
             || (u.uhunger < 50))
             && rn2(10))
-              return;
+              continue;
 
         if (techtout(i) > 0)
               techtout(i)--;
@@ -2905,24 +2920,17 @@ tech_flurry()
 }
 
 int
-tech_appraisal()
-{
+tech_appraisal() {
     if (!uwep) {
-         You("are not wielding anything!");
-    } else if (weapon_type(uwep) == P_NONE) {
-         You("examine %s.", doname(uwep));
-         uwep->known = TRUE;
-         You("discover it is %s.", doname(uwep));
-         update_inventory();
-         return 1;
-    } else {
-        You("examine %s.", doname(uwep));
-        uwep->known = TRUE;
-        You("discover it is %s.", doname(uwep));
-        update_inventory();
-        return 1;
+        You("are not wielding anything!");
+        return 0;
     }
-    return 0;
+    You("examine %s.", doname(uwep));
+    uwep->known = TRUE;
+    uwep->oprops_known = TRUE;
+    You("discover it is %s.", doname(uwep));
+    update_inventory();
+    return 1;
 }
 
 int
@@ -3536,6 +3544,23 @@ tech_dazzle()
     return 1;
 }
 
+int
+dazzle_chance(pm)
+struct permonst * pm;
+{
+    int d1, d2, combos = 0;
+    int daznum = techlev(get_tech_no(T_DAZZLE)) - pm->mlevel;
+    
+    for (d1 = 0; d1 < 6; d1++) {
+        for (d2 = 0; d2 < 6; d2++) {
+            if ((d1 + d2 + daznum) > 10)
+                combos++;
+        }
+    }
+    return (100*combos) / 36;
+}
+
+
 int
 tech_drawblood()
 {
diff --git a/src/timeout.c b/src/timeout.c
index 8a597a47a..93d444ef1 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -107,6 +107,7 @@ const struct propname {
     { WITHERING, "withering away" },
     { STABLE,    "extraodinarily stable" },
     { LIFESAVED, "life will be saved" },
+    { STOMPING, "stomping" },
     {  0, 0 },
 };
 
@@ -639,7 +640,12 @@ nh_timeout()
     
     /* WAC -- check for timeout of specials */
 	tech_timeout();
-
+    
+    /* This helps track if the player merely waited or searched
+     * during their turn. If they didn't do anything else, we won't
+     * reward them with expiring their tech cooldowns. */
+    u.uacted = TRUE;
+    
     if (HPasses_walls)
         phasing_dialogue();
     if (u.uinvulnerable)
@@ -998,6 +1004,7 @@ nh_timeout()
             }
         }
 
+    spell_nag();
     run_timers();
 }
 
@@ -2861,6 +2868,7 @@ struct obj *obj;
     switch (obj->where) {
     case OBJ_INVENT:
     case OBJ_MIGRATING:
+    case OBJ_SOMEWHERE:
         return FALSE;
     case OBJ_FLOOR:
     case OBJ_BURIED:
diff --git a/src/trap.c b/src/trap.c
index c5e49eb98..bd47c264e 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -1125,7 +1125,7 @@ unsigned trflags;
         }
         if (!Fumbling && !undestroyable_trap(ttype)
             && ttype != ANTI_MAGIC && !forcebungle && !plunged
-            && !conj_pit && !adj_pit && (uarmf && uarmf->otyp != STOMPING_BOOTS)
+            && !conj_pit && !adj_pit && !Stomping
             && (!rn2(5) || (is_pit(ttype)
                             && is_clinger(youmonst.data)))) {
                 You("escape %s %s.", (ttype == ARROW_TRAP && !trap->madeby_u)
@@ -1686,7 +1686,8 @@ unsigned trflags;
                     pline("It smells sort of %s in here.",
                           Hallucination ? "purple" : "funky");
                 }
-                incr_itimeout(&HHallucination,rnd(50) + 50);
+                if (!Breathless)
+                    incr_itimeout(&HHallucination,rnd(50) + 50);
             }
             break;
         } else {
@@ -1859,7 +1860,9 @@ unsigned trflags;
         if (u.usteed) {
             /* trap hits steed instead of you */
             (void) steedintrap(trap, (struct obj *) 0);
-        } else if (Levitation || Flying) {
+        } else if (Levitation) {
+            pline("But it isn't long enough to reach you.");
+        } else if (Flying && !rn2(2)) {
             pline("But it isn't long enough to reach you.");
         } else if (thick_skinned(youmonst.data)) {
             pline("But it breaks off against your thick hide.");
@@ -2092,24 +2095,34 @@ STATIC_OVL void
 doicetrap(box)
 struct obj *box;	/* at the moment only for floor traps */
 {
-    int num = 0;
-    num = d(4, 4);
+    int num = d(4, 8);
+    boolean lost_resistance = FALSE;
+    
     if (box) {
         impossible("doicetrap() called with non-null box.");
         return;
     }
 
     pline("A freezing cloud shoots up from the %s!", surface(u.ux, u.uy));
-    if (how_resistant(SONIC_RES) > 90) {
+    if (how_resistant(COLD_RES) > 90) {
         shieldeff(u.ux, u.uy);
-        num = 0;
+        num = rn2(3);
+        if (!rn2(3)) {
+            pline("Mist flash-freezes around you as your heat is sucked away!");
+            if (HCold_resistance && !Fixed_abil) {
+                decr_resistance(&HCold_resistance, rnd(25) + 25);
+                You_feel("alarmingly cooler.");
+                lost_resistance = TRUE;
+            }
+        }
     }
 
     num = resist_reduce(num, COLD_RES);
-    if (!num)
-        You("are uninjured.");
-    else
-        losehp(num, "freezing cloud", KILLED_BY_AN);
+    if (!num) {
+        if (!lost_resistance)
+            You("are uninjured.");
+    } else
+        losehp(num, "flash freeze", KILLED_BY_AN);
     
     destroy_item(POTION_CLASS, AD_COLD);
     u_slow_down();
@@ -2867,16 +2880,24 @@ register struct monst *mtmp;
             if (resists_cold(mtmp)) {
                 if (in_sight) {
                     shieldeff(mtmp->mx,mtmp->my);
-                    pline("%s is uninjured.", Monnam(mtmp));
+                    if (!rn2(3)) {
+                        if (mtmp->mintrinsics & MR_COLD) {
+                            mtmp->mintrinsics &= ~MR_COLD;
+                            pline("%s momentarily %s.", Monnam(mtmp),
+                                  makeplural(locomotion(mtmp->data, "stumble")));
+                        }
+                    } else
+                        pline("%s is uninjured.", Monnam(mtmp));
                 }
             } else {
-                int num = d(2,4);
+                int num = d(4, 8);
                 if (thitm(0, mtmp, (struct obj *)0, num, FALSE))
                     trapkilled = TRUE;
                 else if (!rn2(2))
                     (void) destroy_mitem(mtmp, POTION_CLASS, AD_COLD);
             }
-            if (see_it) seetrap(trap);
+            if (see_it) 
+                seetrap(trap);
             break; 
         case FIRE_TRAP:
         mfiretrap:
@@ -3217,7 +3238,7 @@ register struct monst *mtmp;
                 if (in_sight) {
                     seetrap(trap);
                 }
-                if (!rn2(27))
+                if (!rn2(7))
                     deltrap(trap);
             }
             break;
@@ -5443,7 +5464,7 @@ boolean force;
     }
     /* 'force' is true for #invoke; make it be true for #untrap if
        carrying MKoT */
-    if (!force && has_magic_key(&youmonst))
+    if (!force && has_roguish_key(&youmonst))
         force = TRUE;
 
     ttmp = t_at(x, y);
@@ -5973,10 +5994,9 @@ boolean disarm;
                     }
                 }
             } else {
-                mon->mhp -= d(6, 6);
-                if (mon->mhp <= 0) {
+                if (damage_mon(mon, d(6, 6), AD_FIRE)) {
                     if (canseemon(mon))
-                        pline("%s is killed by the explosion!", Monnam(mon));
+                        pline("%s is blasted by the explosion!", Monnam(mon));
                     mondied(mon);
                 }
             }
@@ -5992,14 +6012,12 @@ boolean disarm;
                 poisoned("gas cloud", A_STR, "cloud of poison gas", 15, FALSE);
                 exercise(A_CON, FALSE);
             } else if (!(resists_poison(mon) || defended(mon, AD_DRST))) {
-                int dmg = rnd(15);
-                if (!rn2(10))
-                    dmg = mon->mhp;
-                mon->mhp -= dmg;
-                if (mon->mhp <= 0) {
-                    if (canseemon(mon))
-                        pline("%s is unaffected.", Monnam(mon));
+                int dmg = !rn2(10) ? mon->mhp : rnd(15);
+                if (damage_mon(mon, dmg, AD_DRST)) {
+                    mondied(mon);
                 }
+            } else if (canseemon(mon)) {
+                pline("%s is unaffected.", Monnam(mon));
             }
             break;
         case 16:
@@ -6015,20 +6033,11 @@ boolean disarm;
                     pline("A needle pricks %s %s.", s_suffix(mon_nam(mon)),
                           mbodypart(mon, bodypart));
                 if (!(resists_poison(mon) || defended(mon, AD_DRST))) {
-                    int dmg = rnd(10);
-
-                    if (!rn2(10))
-                        dmg = mon->mhp;
-                    mon->mhp -= dmg;
-                    if (mon->mhp <= 0) {
-                        if (canseemon(mon))
-                            pline("%s is killed!", Monnam(mon));
+                    int dmg = !rn2(10) ?  mon->mhp : rnd(10);
+                    if (damage_mon(mon, dmg, AD_DRST))
                         mondied(mon);
-                    }
-                } else {
-                    if (canseemon(mon))
-                        pline("%s is killed!", Monnam(mon));
-                    mondied(mon);
+                } else if (canseemon(mon)) {
+                    pline("%s is unaffected!", Monnam(mon));
                 }
             }
             break;
@@ -6115,13 +6124,10 @@ boolean disarm;
 
                 (void) destroy_mitem(mon, RING_CLASS, AD_ELEC);
                 (void) destroy_mitem(mon, WAND_CLASS, AD_ELEC);
+                
                 if (!(resists_elec(mon) || defended(mon, AD_ELEC))) {
-                    mon->mhp -= d(4, 4);
-                    if (mon->mhp <= 0) {
-                        if (canseemon(mon))
-                            pline("%s is killed!", Monnam(mon));
+                    if (damage_mon(mon, d(4, 4), AD_ELEC))
                         mondied(mon);
-                    }
                 } else if (canseemon(mon)) {
                     pline("%s doesn't seem to be affected.", Monnam(mon));
                 }
@@ -6469,8 +6475,7 @@ boolean nocorpse;
                 searmsg(NULL, mon, obj, TRUE);
             }
         }
-        mon->mhp -= dam;
-        if (DEADMONSTER(mon)) {
+        if (damage_mon(mon, dam, AD_PHYS)) {
             int xx = mon->mx, yy = mon->my;
 
             monkilled(mon, "", nocorpse ? -AD_RBRE : AD_PHYS);
diff --git a/src/u_init.c b/src/u_init.c
index 542b752c1..da05afb1a 100644
--- a/src/u_init.c
+++ b/src/u_init.c
@@ -222,7 +222,7 @@ struct trobj Ranger[] = {
 struct trobj Rogue[] = {
 #define R_DAGGERS 1
 #define R_DARTS   2
-    { SHORT_SWORD, 0, WEAPON_CLASS, 1, UNDEF_BLESS },
+    { SHORT_SWORD, 1, WEAPON_CLASS, 1, UNDEF_BLESS },
     { DAGGER, 0, WEAPON_CLASS, 10, 0 }, /* quan is variable */
     { DART, 0, WEAPON_CLASS, 25, UNDEF_BLESS },
     { LIGHT_ARMOR, 1, ARMOR_CLASS, 1, UNDEF_BLESS },
@@ -236,7 +236,7 @@ struct trobj Rogue[] = {
 struct trobj Samurai[] = {
 #define S_ARROWS 3
     { KATANA, 0, WEAPON_CLASS, 1, UNDEF_BLESS },
-    { SHORT_SWORD, 0, WEAPON_CLASS, 1, UNDEF_BLESS }, /* wakizashi */
+    { SHORT_SWORD, 3, WEAPON_CLASS, 1, UNDEF_BLESS }, /* wakizashi */
     { YUMI, 0, WEAPON_CLASS, 1, UNDEF_BLESS },
     { YA, 0, WEAPON_CLASS, 25, UNDEF_BLESS }, /* variable quan */
     { SPLINT_MAIL, 0, ARMOR_CLASS, 1, UNDEF_BLESS },
@@ -656,7 +656,7 @@ static const struct def_skill Skill_J[] = {
     { P_ENCHANTMENT_SPELL, P_SKILLED }, /* special spell is charm monster */
     { P_RIDING, P_SKILLED },
     { P_TWO_WEAPON_COMBAT, P_BASIC }, 
-    { P_MARTIAL_ARTS, P_EXPERT },
+    { P_BARE_HANDED_COMBAT, P_EXPERT },
     { P_NONE, 0 }
 };
 static const struct def_skill Skill_K[] = {
@@ -904,7 +904,7 @@ static const struct def_skill Skill_U[] = {
     { P_ENCHANTMENT_SPELL, P_SKILLED },
     { P_ESCAPE_SPELL, P_SKILLED },
     { P_MATTER_SPELL, P_BASIC },
-    { P_MARTIAL_ARTS, P_MASTER }, /* Buffy the Vampire Slayer */
+    { P_BARE_HANDED_COMBAT, P_MASTER }, /* Buffy the Vampire Slayer */
     { P_TWO_WEAPON_COMBAT, P_BASIC },
     { P_SHIELD, P_EXPERT },
     { P_NONE, 0 }
@@ -1730,6 +1730,7 @@ u_init()
     if (Role_if(PM_CAVEMAN) || Role_if(PM_CAVEWOMAN)) {
         mons[PM_VELOCIRAPTOR].geno &= ~(G_NOGEN);
         mons[PM_T_REX].geno &= ~(G_NOGEN);
+        mons[PM_COMPSOGNATHUS].geno &= ~(G_NOGEN);
     }
     
     /* If we have at least one spell, force starting Pw to be 5,
@@ -2157,11 +2158,15 @@ register struct trobj *origtrop;
             && valid_obj_material(obj, COPPER))
             set_material(obj, COPPER);
 
-        /* Do the same for orcs and mithril objects.
-           Currently not a concern, but may be in the future */
+        /* Do the same for orcs and mithril objects */
         if (Race_if(PM_ORC) && obj->material == MITHRIL
             && valid_obj_material(obj, IRON))
             set_material(obj, IRON);
+
+        /* Do the same for vampires and silver objects */
+        if (Race_if(PM_VAMPIRE) && obj->material == SILVER
+            && valid_obj_material(obj, BONE))
+            set_material(obj, BONE);
         
         /* Holy wafers do damage to chaotic players */
         if (u.ualign.type == A_CHAOTIC && obj->otyp == HOLY_WAFER)
@@ -2306,8 +2311,8 @@ register struct trobj *origtrop;
         if (obj->oclass == AMULET_CLASS)
             setworn(obj, W_AMUL);
 
-        if (obj->oclass == TOOL_CLASS &&
-            obj->otyp == LENSES && !ublindf)
+        if (obj->oclass == TOOL_CLASS && !ublindf
+            && (obj->otyp == LENSES || obj->otyp == GOGGLES))
             setworn(obj, W_TOOL);
         
         /* Don't allow gear with object properties
diff --git a/src/uhitm.c b/src/uhitm.c
index 8484264c4..a469bfe1a 100644
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -452,14 +452,13 @@ register struct monst *mtmp;
     if (is_safepet(mtmp) && !context.forcefight) {
         if (!uwep || !u_bloodthirsty()) {
             /* There are some additional considerations: this won't work
-             * if in a shop or Punished or you miss a random roll or
+             * if in a shop or you miss a random roll or
              * if you can walk thru walls and your pet cannot (KAA) or
              * if your pet is a long worm with a tail.
              * There's also a chance of displacing a "frozen" monster:
              * sleeping monsters might magically walk in their sleep.
              */
-            boolean foo = (Punished || !rn2(7)
-                           || (is_longworm(mtmp->data) && mtmp->wormno)),
+            boolean foo = (!rn2(7) || (is_longworm(mtmp->data) && mtmp->wormno)),
                     inshop = FALSE;
             char *p;
 
@@ -494,8 +493,8 @@ register struct monst *mtmp;
     }
     
 
-    if (uarmf && uarmf->otyp == STOMPING_BOOTS && !Levitation) {
-        if ((mtmp->data->msize <= MZ_SMALL && (verysmall(mtmp->data) || !rn2(4))) 
+    if (Stomping) {
+        if ((mtmp->data->msize <= MZ_SMALL && (verysmall(mtmp->data) || !rn2(10))) 
             || (Race_if(PM_GIANT) && mtmp->data->msize == MZ_MEDIUM && !rn2(40))) {
             You("stomp on %s!", mon_nam(mtmp));
             xkilled(mtmp, XKILL_GIVEMSG);
@@ -1689,7 +1688,7 @@ int dieroll;
                            of shield */
                         if (obj->otyp == SMALL_SHIELD)
                             tmp += rn2(3) + 1;
-                        else if  (obj->otyp == TOWER_SHIELD)
+                        else if (obj->otyp == TOWER_SHIELD)
                             tmp += rn2(12) + 1;
                         else
                             tmp += rn2(6) + 2;
@@ -2324,7 +2323,8 @@ int dieroll;
             && !rn2(max(2, uwep->spe) && !uwep->known)) {
             You("have become quite familiar with %s.",
                 yobjnam(uwep, (char *) 0));
-            uwep->known = TRUE;
+            fully_identify_obj(uwep);
+            discover_object(uwep->otyp, TRUE, TRUE);
             update_inventory();
         }
     }
@@ -3757,8 +3757,7 @@ register struct attack *mattk;
             if (!Deaf)
                 pline("%s cries out in pain!",
                       Monnam(mdef));
-            mdef->mhp -= rnd(5);
-            if (mdef->mhp <= 0)
+            if (damage_mon(mdef, rnd(5), AD_PHYS))
                 xkilled(mdef, XKILL_GIVEMSG);
             if (mdef && DEADMONSTER(mdef)) {
                 /* Other monsters may have died too, but return 2 if the actual
@@ -3789,8 +3788,7 @@ register struct attack *mattk;
                     pline("%s cries out in anguish!", Monnam(mdef));
             }
             
-            mdef->mhp -= tmp;
-            if (mdef->mhp <= 0)
+            if (damage_mon(mdef, tmp, AD_PSYC))
                 xkilled(mdef, XKILL_GIVEMSG);
             if (mdef && DEADMONSTER(mdef)) {
                 /* Other monsters may have died too, but return 2 if the actual
@@ -4392,6 +4390,8 @@ boolean weapon_attacks; /* skip weapon attacks if false */
             /* [ALI] Vampires are also smart. They avoid biting
                monsters if doing so would be fatal */
             if ((i > 0 && is_vampire(youmonst.data))
+                /* ... unless they are impaired */
+                && (!Stunned && !Confusion && !Hallucination)
                 && ((how_resistant(DISINT_RES) < 50
                         && (mon->data == &mons[PM_BLACK_DRAGON]
                             || mon->data == &mons[PM_ANTIMATTER_VORTEX]))
diff --git a/src/weapon.c b/src/weapon.c
index 558ff6cb5..15c8acd79 100644
--- a/src/weapon.c
+++ b/src/weapon.c
@@ -17,6 +17,8 @@ STATIC_DCL void FDECL(skill_advance, (int));
 static int dmgval_core(struct obj*, struct monst*, struct damage_info_t*);
 static void FDECL(mon_ignite_lightsaber, (struct obj *, struct monst *));
 STATIC_PTR int NDECL(practice);
+static int FDECL(skill_crosstrain_bonus, (int));
+static void FDECL(rnd_crosstrain, (int));
 
 /*WAC practicing needs a delay counter*/
 static NEARDATA schar delay;            /* moves left for practice */
@@ -482,7 +484,7 @@ struct damage_info_t *damage_info)
         tmp += otmp->spe;
 
         /* adjust for various materials */
-        if (otmp->material == GLASS || otmp->material == GEMSTONE) {
+        if (otmp->material == GLASS) {
             /* glass is extremely sharp */
             if (objects[otmp->otyp].oc_dir & PIERCE) {
                 tmp += 3;
@@ -1952,8 +1954,9 @@ static const struct skill_range {
 int
 enhance_weapon_skill()
 {
-    int pass, i, n, len, longest, to_advance, eventually_advance, maxxed_cnt;
-    char buf[BUFSZ], sklnambuf[BUFSZ], maxsklnambuf[BUFSZ], percentbuf[BUFSZ];
+    int pass, i, n,  len, longest, crosstrain, to_advance, 
+        eventually_advance, maxxed_cnt;
+    char buf[BUFSZ], sklnambuf[BUFSZ], maxsklnambuf[BUFSZ], percentbuf[BUFSZ], crosstrainbuf[BUFSZ];
     const char *prefix;
     menu_item *selected;
     anything any;
@@ -1964,7 +1967,7 @@ enhance_weapon_skill()
         speedy = TRUE;
 
     do {
-        /* find longest available skill name, count those that can advance */
+        /* count skills that can advance */
         to_advance = eventually_advance = maxxed_cnt = 0;
         for (longest = 0, i = 0; i < P_NUM_SKILLS; i++) {
             if (P_RESTRICTED(i))
@@ -2041,6 +2044,12 @@ enhance_weapon_skill()
                             ? "    "
                             : "";
 
+                crosstrain = skill_crosstrain_bonus(i);
+                if (crosstrain > 1 && P_SKILL(i) < P_MAX_SKILL(i))
+                    Sprintf(crosstrainbuf, " x%d", crosstrain);
+                else
+                    Strcpy(crosstrainbuf, "    ");
+                
                 (void) skill_level_name(P_SKILL(i), sklnambuf);
                 (void) skill_level_name(P_MAX_SKILL(i), maxsklnambuf);
 
@@ -2053,26 +2062,26 @@ enhance_weapon_skill()
 
                 if (wizard) {
                     if (!iflags.menu_tab_sep)
-                        Sprintf(buf, " %s%-*s %-12s %5d(%4d)", prefix,
+                        Sprintf(buf, " %s%-*s %-12s %5d(%4d)%s", prefix,
                                 longest, P_NAME(i), sklnambuf, P_ADVANCE(i),
-                                practice_needed_to_advance(P_SKILL(i)));
+                                practice_needed_to_advance(P_SKILL(i)),crosstrainbuf);
                     else
-                        Sprintf(buf, " %s%s\t%s\t%5d(%4d)", prefix, P_NAME(i),
-                                sklnambuf, P_ADVANCE(i),
-                                practice_needed_to_advance(P_SKILL(i)));
+                        Sprintf(buf, " %s%s\t%s\t%5d(%4d)%s", prefix,
+                                P_NAME(i), sklnambuf, P_ADVANCE(i), 
+                                practice_needed_to_advance(P_SKILL(i)), crosstrainbuf);
                 } else {
                     if (!iflags.menu_tab_sep) {
                         if (Role_if(PM_MONK))
-                            Sprintf(buf, " %s %-*s [ %12s / %-12s ] %4s", prefix,
+                            Sprintf(buf, " %s %-*s [ %12s / %-12s ] %4s%s", prefix,
                                     longest, P_NAME(i), sklnambuf, maxsklnambuf,
-                                    percentbuf);
+                                    percentbuf, crosstrainbuf);
                         else
-                            Sprintf(buf, " %s %-*s [ %9s / %-9s ] %4s", prefix,
+                            Sprintf(buf, " %s %-*s [ %9s / %-9s ] %4s%s", prefix,
                                     longest, P_NAME(i), sklnambuf, maxsklnambuf,
-                                    percentbuf);
+                                    percentbuf, crosstrainbuf);
                     } else {
-                        Sprintf(buf, " %s%s\t[ %s\t /%s ] %4s", prefix, P_NAME(i),
-                                sklnambuf, maxsklnambuf, percentbuf);
+                        Sprintf(buf, " %s%s\t[ %s\t /%s ] %4s%s", prefix, P_NAME(i),
+                                sklnambuf, maxsklnambuf, percentbuf, crosstrainbuf);
                     }
                 }
                 any.a_int = can_advance(i, speedy) ? i + 1 : 0;
@@ -2147,7 +2156,8 @@ int degree;
         if (using_oprop(ITEM_PROWESS))
             degree *= 2;
 
-        P_ADVANCE(skill) += degree;
+        P_ADVANCE(skill) += degree * skill_crosstrain_bonus(skill);
+        rnd_crosstrain(skill);
         if (!advance_before && can_advance(skill, FALSE))
             give_may_advance_msg(skill);
     }
@@ -2343,18 +2353,10 @@ struct obj *weapon;
         default:
             impossible(bad_skill, P_SKILL(type)); /* fall through */
         case P_ISRESTRICTED:
-        case P_UNSKILLED:
-            bonus = -4;
-            break;
-        case P_BASIC:
-            bonus = 0;
-            break;
-        case P_SKILLED:
-            bonus = 3;
-            break;
-        case P_EXPERT:
-            bonus = 5;
-            break;
+        case P_UNSKILLED:   bonus = -4;break;
+        case P_BASIC:       bonus = 0; break;
+        case P_SKILLED:     bonus = 3; break;
+        case P_EXPERT:      bonus = 5; break;
         }
     } else if (type == P_TWO_WEAPON_COMBAT) {
         skill = P_SKILL(P_TWO_WEAPON_COMBAT);
@@ -2364,53 +2366,12 @@ struct obj *weapon;
         default:
             impossible(bad_skill, skill); /* fall through */
         case P_ISRESTRICTED:
-        case P_UNSKILLED:
-            bonus = -9;
-            break;
-        case P_BASIC:
-            bonus = -5;
-            break;
-        case P_SKILLED:
-            bonus = -3;
-            break;
-        case P_EXPERT:
-            bonus = 0; /* if you're an expert, there shouldn't be a penalty */
-            break;
+        case P_UNSKILLED:   bonus = -9; break;
+        case P_BASIC:       bonus = -5; break;
+        case P_SKILLED:     bonus = -3; break;
+        /* if you're an expert, there shouldn't be a penalty */
+        case P_EXPERT:      bonus = 0;  break;
         }
-        
-#if 0 /* This was introduced in EvilHack - we are disabling it to allow more 
-       * freedom with two-weaponing */
-        /* Heavy things are hard to use in your offhand unless you're
-           very good at what you're doing, or are very strong (see below) */
-        switch (P_SKILL(P_TWO_WEAPON_COMBAT)) {
-        default:
-            impossible(bad_skill, P_SKILL(P_TWO_WEAPON_COMBAT)); /* fall through */
-        case P_ISRESTRICTED:
-        case P_UNSKILLED:
-            maxweight = 20; /* can use tridents/javelins, crysknives, unicorn horns
-                               or anything lighter */
-            break;
-        case P_BASIC:
-            maxweight = 30; /* can use short swords/spears or a mace */
-            break;
-        case P_SKILLED:
-            maxweight = 40; /* can use sabers/long swords */
-            break;
-        case P_EXPERT:
-            maxweight = 70; /* expert level can offhand any one-handed weapon */
-            break;
-        }
-
-        /* basically no restrictions if you're a giant, or have giant strength */
-        if ((uarmg && uarmg->otyp == GAUNTLETS_OF_POWER)
-            || maybe_polyd(is_giant(youmonst.data), Race_if(PM_GIANT)))
-            maxweight = 200;
-
-        if (uswapwep && uswapwep->owt > maxweight) {
-            /* feedback handled in attack() */
-            bonus = -30;
-        }
-#endif
     } else if (type == P_BARE_HANDED_COMBAT) {
         /*
          *        b.h. m.a. giant b.h. m.a.
@@ -2436,16 +2397,11 @@ struct obj *weapon;
     if (u.usteed) {
         switch (P_SKILL(P_RIDING)) {
         case P_ISRESTRICTED:
-        case P_UNSKILLED:
-            bonus -= 2;
-            break;
-        case P_BASIC:
-            bonus -= 1;
-            break;
-        case P_SKILLED:
-            break;
-        case P_EXPERT:
-            break;
+        case P_UNSKILLED:bonus -= 2; break;
+        case P_BASIC:    bonus -= 1; break;
+        case P_SKILLED:              break;
+        /* but an expert can use the added momentum */
+        case P_EXPERT:   bonus += 2; break;
         }
         if (u.twoweap)
             bonus -= 2;
@@ -2494,19 +2450,11 @@ struct obj *weapon;
         default:
             impossible("weapon_dam_bonus: bad skill %d", P_SKILL(type));
         /* fall through */
-        case P_ISRESTRICTED:
-        case P_UNSKILLED:
-            bonus = -2;
-            break;
-        case P_BASIC:
-            bonus = 0;
-            break;
-        case P_SKILLED:
-            bonus = 1;
-            break;
-        case P_EXPERT:
-            bonus = 2;
-            break;
+        case P_ISRESTRICTED:bonus = -5;break;
+        case P_UNSKILLED:   bonus = -2;break;
+        case P_BASIC:       bonus = 0; break;
+        case P_SKILLED:     bonus = 1; break;
+        case P_EXPERT:      bonus = 3; break;
         }
     } else if (type == P_TWO_WEAPON_COMBAT) {
         skill = P_SKILL(P_TWO_WEAPON_COMBAT);
@@ -2515,18 +2463,10 @@ struct obj *weapon;
         switch (skill) {
         default:
         case P_ISRESTRICTED:
-        case P_UNSKILLED:
-            bonus = -3;
-            break;
-        case P_BASIC:
-            bonus = -1;
-            break;
-        case P_SKILLED:
-            bonus = 0;
-            break;
-        case P_EXPERT:
-            bonus = 1;
-            break;
+        case P_UNSKILLED:   bonus = -3;break;
+        case P_BASIC:       bonus = -1;break;
+        case P_SKILLED:     bonus = 0; break;
+        case P_EXPERT:      bonus = 2; break;
         }
     } else if (type == P_BARE_HANDED_COMBAT) {
         /*
@@ -2548,34 +2488,21 @@ struct obj *weapon;
     if ((u.usteed || Race_if(PM_CENTAUR))
         && type != P_TWO_WEAPON_COMBAT) {
         switch (P_SKILL(P_RIDING)) {
-        case P_ISRESTRICTED:
-        case P_UNSKILLED:
-            break;
-        case P_BASIC:
-            break;
-        case P_SKILLED:
-            bonus += 1;
-            break;
-        case P_EXPERT:
-            bonus += 2;
-            break;
+        case P_ISRESTRICTED:break;
+        case P_UNSKILLED:   break;
+        case P_BASIC:       break;
+        case P_SKILLED:     bonus += 2; break;
+        case P_EXPERT:      bonus += 5; break;
         }
     }
     
     /* Jedi are simply better */
     if (Role_if(PM_JEDI) && weapon && is_lightsaber(weapon)) {
         switch (P_SKILL(type)) {
-        case P_EXPERT: 
-            bonus += 4; 
-            break; /* fall through removed by Amy */
-        case P_SKILLED: 
-            bonus += 2; 
-            break;
-        case P_BASIC: 
-            bonus += 1; 
-            break;
-        case P_UNSKILLED: 
-            break;
+        case P_EXPERT:  bonus += 4; break;
+        case P_SKILLED: bonus += 2; break;
+        case P_BASIC:   bonus += 1; break;
+        case P_UNSKILLED:           break;
         default: 
             impossible("unknown lightsaber skill for a jedi"); 
             break;
@@ -2770,4 +2697,154 @@ practice()
     You("finish your practice session.");
     return 0;
 }
+
+
+/*
+ * Weapon skill groups:
+ * Advanced skills will cross-train lesser skills they share a group with.
+ * A weapon skill may belong to more than one group.
+ */
+#define PG_SHORT_BLADES		0x00000001L
+#define PG_CHOPPING_BLADES	0x00000002L
+#define PG_SWORDS		    0x00000004L
+#define PG_BLUDGEONS		0x00000008L
+#define PG_FLAILS		    0x00000010L
+#define PG_POLEARMS		    0x00000020L
+#define PG_LAUNCHERS		0x00000040L
+#define PG_THROWN		    0x00000080L
+#define PG_OFFENSIVE		0x00000100L
+#define PG_DEFENSIVE		0x00000200L
+#define PG_MYSTICAL		    0x00000400L
+
+const long weapon_skill_groups[] = {
+        /* P_DAGGER */		    PG_SHORT_BLADES,
+        /* P_KNIFE */		    PG_SHORT_BLADES,
+        /* P_AXE */			    PG_CHOPPING_BLADES,
+        /* P_PICK_AXE */		PG_CHOPPING_BLADES,
+        /* P_SHORT_SWORD */		PG_SHORT_BLADES | PG_SWORDS,
+        /* P_BROAD_SWORD */		PG_CHOPPING_BLADES | PG_SWORDS,
+        /* P_LONG_SWORD */		PG_SWORDS,
+        /* P_TWO_HANDED_SWORD */PG_SWORDS,
+        /* PN_SABER */		    PG_SWORDS,
+        /* P_CLUB */		    PG_BLUDGEONS,
+        /* P_MACE */		    PG_BLUDGEONS,
+        /* P_MORNING_STAR */	PG_BLUDGEONS | PG_FLAILS,
+        /* P_FLAIL */		    PG_BLUDGEONS | PG_FLAILS,
+        /* PN_HAMMER */		    PG_BLUDGEONS,
+        /* P_QUARTERSTAFF */	PG_BLUDGEONS | PG_POLEARMS,
+        /* PN_POLEARMS */		PG_POLEARMS,
+        /* P_SPEAR */		    PG_POLEARMS,
+        /* P_TRIDENT */		    PG_POLEARMS,
+        /* PN_LIGHTSABER */		PG_SWORDS,
+        /* P_LANCE */		    PG_POLEARMS,
+        /* P_BOW */			    PG_LAUNCHERS,
+        /* P_SLING */		    PG_LAUNCHERS | PG_THROWN,
+        /* PN_FIREARMS */		PG_LAUNCHERS,
+        /* P_CROSSBOW */		PG_LAUNCHERS,
+        /* P_DART */		    PG_THROWN,
+        /* P_SHURIKEN */		PG_THROWN,
+        /* P_BOOMERANG */		PG_THROWN,
+        /* P_WHIP */		    PG_FLAILS,
+        /* P_UNICORN_HORN */	PG_POLEARMS,
+
+        /* PN_ATTACK_SPELL */       PG_OFFENSIVE,
+        /* PN_HEALING_SPELL */      PG_DEFENSIVE,
+        /* PN_DIVINATION_SPELL */   PG_MYSTICAL,
+        /* PN_ENCHANTMENT_SPELL */  PG_OFFENSIVE | PG_MYSTICAL,
+        /* PN_NECRO_SPELL */        PG_OFFENSIVE,
+        /* PN_ESCAPE_SPELL */       PG_DEFENSIVE,
+        /* PN_MATTER_SPELL */       PG_OFFENSIVE | PG_DEFENSIVE,
+};
+
+/*
+ * How much to accelerate training of a skill based on related skills.
+ *
+ * Cross-training should never punish the player for advancing a skill,
+ * so the amount is based on the greater of its training points and its
+ * advancement level.
+ */
+STATIC_OVL int 
+skill_crosstrain_bonus(int skill)
+{
+    int base_skill, highest_skill, i;
+
+    if (skill < P_FIRST_WEAPON || skill > P_LAST_SPELL)
+        return 1;
+
+    /* find greatest skill level based solely on training points */
+    base_skill = P_UNSKILLED;
+    for (i = P_EXPERT; i > P_UNSKILLED; i--) {
+        /* getting the training points for the _current_ level is awkward */
+        if (P_ADVANCE(skill) >= practice_needed_to_advance(i - 1)) {
+            base_skill = i;
+            break;
+        }
+    }
+    /* if advancement level exceeds points (e.g. wizard mode), catch it too */
+    if (base_skill < P_SKILL(skill))
+        base_skill = P_SKILL(skill);
+
+    /* find highest related weapon skill advancement */
+    highest_skill = P_ISRESTRICTED;
+    for (i = P_FIRST_WEAPON; i <= P_LAST_SPELL; i++) {
+        if (i == skill)
+            continue;
+        if ((weapon_skill_groups[(long) skill - P_FIRST_WEAPON] &
+             weapon_skill_groups[(long) i - P_FIRST_WEAPON]) == 0)
+            continue;
+        if (P_SKILL(i) > highest_skill)
+            highest_skill = P_SKILL(i);
+    }
+
+    return max(highest_skill - base_skill + 1, 1);
+}
+
+STATIC_OVL void
+rnd_crosstrain(int skill)
+{
+    if (skill < P_FIRST_WEAPON || skill > P_LAST_SPELL)
+        return;
+    switch (P_SKILL(skill)) {
+        case P_EXPERT:
+            if (rn2(3))
+                return;
+            break;
+        case P_SKILLED:
+            if (skill <= P_LAST_WEAPON ? rn2(7) : rn2(5))
+                return;
+            break;
+        case P_BASIC:
+            if (skill <= P_LAST_WEAPON ? rn2(13) : rn2(7))
+                return;
+            break;
+        default:
+            impossible("rnd_crosstrain: bad skill %d", P_SKILL(skill)); 
+            /* fall through */
+        case P_ISRESTRICTED:
+        case P_UNSKILLED:
+            return;
+    }
+
+    for (int i = P_FIRST_WEAPON; i <= P_LAST_SPELL; i++) {
+        if (i == skill)
+            continue;
+        /* Is the potential skill maxxed out? */
+        if (P_SKILL(i) >= P_MAX_SKILL(i))
+            continue;
+        if (!can_practice(i))
+            continue;
+        /* Players need to advance once a skill reaches 100% to keep benefiting */
+        if ((int) P_ADVANCE(i) >= 
+              practice_needed_to_advance(P_SKILL(i)))
+            continue;
+        /* Fudge factor to spread out the skills */
+        if (Luck > 2 ? !rn2(4) : rn2(4))
+            continue;
+        if ((weapon_skill_groups[(long) skill - P_FIRST_WEAPON] &
+             weapon_skill_groups[(long) i - P_FIRST_WEAPON]) != 0) {
+            P_ADVANCE(i) += 1;
+        }
+    }
+}
+
 /*weapon.c*/
diff --git a/src/wield.c b/src/wield.c
index 9e58b0e40..78ba585ef 100644
--- a/src/wield.c
+++ b/src/wield.c
@@ -197,9 +197,6 @@ register struct obj *obj;
         if (olduwep->oprops & ITEM_RAGE) {
             EFearless &= ~W_WEP;
         }
-        if (olduwep->oprops & ITEM_TOUGH) {
-            EDisint_resistance &= ~W_WEP;
-        }
     }
 
     if (uwep && uwep == obj) {
@@ -250,6 +247,10 @@ register struct obj *obj;
                       xname(uwep), rn2(2) ? "as large as you" : "of your stature");
                 uwep->oprops_known |= ITEM_STEALTH;
                 EStealth &= ~W_WEP;
+            } else if (Stomping) {
+                pline("This %s will not silence your stomping!",  xname(uwep));
+                uwep->oprops_known |= ITEM_STEALTH;
+                EStealth &= ~W_WEP;
             } else
                 toggle_stealth(uwep, (EStealth & ~W_WEP), TRUE);
         }
@@ -292,9 +293,6 @@ register struct obj *obj;
             }
             EFearless |= W_WEP;
         }
-        if (uwep->oprops & ITEM_TOUGH) {
-            EDisint_resistance |= W_WEP;
-        }
     }
 
     /* Note: Explicitly wielding a pick-axe will not give a "bashing"
@@ -581,10 +579,6 @@ register struct obj *obj;
         if (olduswapwep->oprops & ITEM_RAGE) {
             EFearless &= ~W_SWAPWEP;
         }
-        /* Toughness */
-        if (olduswapwep->oprops & ITEM_TOUGH) {
-            EDisint_resistance &= ~W_SWAPWEP;
-        }
     }
 
     if (uswapwep == obj && u.twoweap) {
@@ -635,6 +629,10 @@ register struct obj *obj;
                       xname(uswapwep), rn2(2) ? "as large as you" : "of your stature");
                 uswapwep->oprops_known |= ITEM_STEALTH;
                 EStealth &= ~W_SWAPWEP;
+            } else if (Stomping) {
+                pline("This %s will not silence your stomping!", xname(uswapwep));
+                uswapwep->oprops_known |= ITEM_STEALTH;
+                EStealth &= ~W_SWAPWEP;
             } else
                 toggle_stealth(uswapwep, (EStealth & ~W_SWAPWEP), TRUE);
         }
@@ -677,9 +675,6 @@ register struct obj *obj;
             }
             EFearless |= W_SWAPWEP;
         }
-        if (uswapwep->oprops & ITEM_TOUGH) {
-            EDisint_resistance |= W_SWAPWEP;
-        }
     }
 }
 
diff --git a/src/worn.c b/src/worn.c
index 6fab8f75a..92936ca7d 100644
--- a/src/worn.c
+++ b/src/worn.c
@@ -1162,6 +1162,7 @@ clear_bypasses()
         otmp->bypass = 0;
     for (otmp = migrating_objs; otmp; otmp = otmp->nobj)
         otmp->bypass = 0;
+    mchest->bypass = 0;
     for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) {
         if (DEADMONSTER(mtmp))
             continue;
diff --git a/src/zap.c b/src/zap.c
index 098bd4b0a..1cddc6ff2 100644
--- a/src/zap.c
+++ b/src/zap.c
@@ -965,6 +965,7 @@ boolean adjacentok; /* False: at obj's spot only, True: nearby is allowed */
  *      OBJ_INVENT      if in hero's inventory; return 0.
  *      OBJ_FLOOR       if on the floor; return 0.
  *      OBJ_BURIED      if buried; return 0.
+ *      OBJ_SOMEWHERE   if in magic chest; return 0.
  *      OBJ_MINVENT     if in monster's inventory; return monster.
  * container_nesting is updated with the nesting depth of the containers
  * if applicable.
@@ -1076,7 +1077,8 @@ boolean by_hero;
          */
         || (container && (container->olocked || container_nesting > 2
                           || container->otyp == STATUE
-                          || (container->otyp == BAG_OF_HOLDING && rn2(40))))
+                          || (container->otyp == BAG_OF_HOLDING && rn2(40))
+                          || container->otyp == HIDDEN_CHEST))
         /* if buried zombie cannot dig itself out, do not revive */
         || (is_zomb && corpse->where == OBJ_BURIED && !zombie_can_dig(x, y)))
         return (struct monst *) 0;
@@ -1419,6 +1421,9 @@ register struct obj *obj;
                 obj->otyp = SCR_BLANK_PAPER;
                 obj->spe = 0;
             }
+            /* Scrolls of amnesia are uncancelable. */
+            if (obj->otyp == SCR_AMNESIA)
+                break;
             break;
         case SPBOOK_CLASS:
             if (otyp != SPE_CANCELLATION && otyp != SPE_NOVEL
@@ -3851,6 +3856,8 @@ struct obj *obj; /* wand or spell */
                    && on_level(&u.uz, &qstart_level) && !ok_to_quest()) {
             pline_The("stairs seem to ripple momentarily.");
             disclose = TRUE;
+        } else if (IS_MAGIC_CHEST(levl[x][y].typ) && u.dz > 0) {
+            disclose = boxlock(mchest, obj);
         }
         /* down will release you from bear trap or web */
         if (u.dz > 0 && u.utrap) {
@@ -3890,6 +3897,8 @@ struct obj *obj; /* wand or spell */
                 stackobj(otmp);
             }
             newsym(x, y);
+        } else if (!striking && IS_MAGIC_CHEST(levl[x][y].typ) && u.dz > 0) {
+            disclose = boxlock(mchest, obj);
         } else if (u.dz > 0 && ttmp) {
             if (!striking && closeholdingtrap(&youmonst, &disclose)) {
                 ; /* now stuck in web or bear trap */
@@ -4393,13 +4402,15 @@ struct obj **pobj; /* object tossed/used, set to NULL
 
         if (typ == IRONBARS
             && ((levl[bhitpos.x][bhitpos.y].wall_info & W_NONDIGGABLE) == 0)
-            && ((!(weapon == KICKED_WEAPON || weapon == THROWN_WEAPON) && obj->otyp == SPE_FORCE_BOLT)
+            && ((!(weapon == KICKED_WEAPON || weapon == THROWN_WEAPON)
+                 && obj->otyp == SPE_FORCE_BOLT)
                 || (weapon == ZAPPED_WAND && obj->otyp == WAN_STRIKING))) {
             levl[bhitpos.x][bhitpos.y].typ = ROOM;
             if (cansee(bhitpos.x, bhitpos.y))
                 pline_The("iron bars are blown apart!");
             else if (!Deaf)
                 You_hear("a lot of loud clanging sounds!");
+            scatter_chains(x, y);
             wake_nearto(bhitpos.x, bhitpos.y, 20 * 20);
             newsym(bhitpos.x, bhitpos.y);
             /* stop the bolt here; it takes a lot of energy to destroy bars */
@@ -4407,7 +4418,8 @@ struct obj **pobj; /* object tossed/used, set to NULL
             break;
         } else if (typ == IRONBARS
                    && ((levl[bhitpos.x][bhitpos.y].wall_info & W_NONDIGGABLE) != 0)
-                   && ((!(weapon == KICKED_WEAPON || weapon == THROWN_WEAPON) && obj->otyp == SPE_FORCE_BOLT)
+                   && ((!(weapon == KICKED_WEAPON || weapon == THROWN_WEAPON)
+                        && obj->otyp == SPE_FORCE_BOLT)
                        || (weapon == ZAPPED_WAND && obj->otyp == WAN_STRIKING))) {
             if (cansee(bhitpos.x, bhitpos.y))
                 pline_The("iron bars vibrate, but are otherwise intact.");
@@ -4534,6 +4546,22 @@ struct obj **pobj; /* object tossed/used, set to NULL
                 learnwand(obj);
         }
 
+        if (weapon == ZAPPED_WAND && typ == MAGIC_CHEST) {
+            boolean learn_it = FALSE;
+
+            switch (obj->otyp) {
+            case WAN_OPENING:
+            case SPE_KNOCK:
+            case WAN_LOCKING:
+            case SPE_WIZARD_LOCK:
+                if (boxlock(mchest, obj))
+                    learn_it = TRUE;
+                break;
+            }
+            if (learn_it)
+                learnwand(obj);
+        }
+
         if (weapon == ZAPPED_WAND)
             maybe_explode_trap(t_at(bhitpos.x, bhitpos.y), obj);
 
@@ -5119,6 +5147,8 @@ struct obj **ootmp; /* to return worn armor for caller to disintegrate */
         tmp = ((3 * tmp) + 1) / 2;
     debugpline3("zapped monster hp = %d (= %d - %d)", mon->mhp - tmp,
                 mon->mhp, tmp);
+    /* Not calling damage_mon here so that showdmg can display
+     * correct source */
     showdmg(tmp, FALSE);
     mon->mhp -= tmp;
     return tmp;
@@ -5489,11 +5519,12 @@ boolean u_caused;
         obj2 = obj->nexthere;
         
         if (is_glass(obj)
-            || obj->otyp == STATUE
-              || obj->otyp == BOULDER) {
+            || obj->otyp == STATUE || obj->otyp == BOULDER) {
             
             if (obj_resists(obj, 2, 100))
                 continue;
+            if (obj->otyp == POT_INVULNERABILITY)
+                continue;
             
             scrquan = obj->quan; /* number present */
             delquan = 0L;        /* number to destroy */
@@ -6235,8 +6266,7 @@ boolean moncast;
         break;
 
     case ZT_SONIC: {
-        int i, xx = x, yy = y;
-        struct obj *otmp;
+        int xx = x, yy = y;
         t = t_at(x, y);
         
         if (find_drawbridge(&xx, &yy)) {
@@ -6270,15 +6300,7 @@ boolean moncast;
                     if (see_it)
                         newsym(x, y);
                 }
-                /* scatter some debris (not as much as a drawbridge! */
-                for (i = rn2(3); i > 0; --i) {
-                    otmp = mksobj_at(IRON_CHAIN, 
-                                     rn2(2) ? x : xx, 
-                                     rn2(2) ? y : yy, TRUE, FALSE);
-                    /* a force of 5 here would yield a radius of 2 for
-                       iron chain; anything less produces a radius of 1 */
-                    (void) scatter(otmp->ox, otmp->oy, 1, MAY_HIT, otmp);
-                }
+                scatter_chains(x, y);
             }
         } else if (IS_TOILET(lev->typ)) {
             rangemod -= 1;
@@ -6678,6 +6700,10 @@ int osym, dmgtyp;
         (dmgtyp == AD_ELEC && EShock_resistance))
         return;
     
+    /* Potions of invulnerability are... invulnerable */
+    if (obj->otyp == POT_INVULNERABILITY)
+        return;
+    
     physical_damage = FALSE;
     xresist = skip = 0;
     /* lint suppression */
@@ -7370,7 +7396,10 @@ makewish()
                        "wished for \"%s\"", bufcpy);
 
     if ((adjust = wishluck())) {
-        change_luck(adjust == -10 ? -10 : -1);
+        if (adjust == -2 || adjust == -10)
+            change_luck(adjust);
+        else
+             change_luck(-1);
         set_moreluck();
     }
     if (otmp != &zeroobj) {
@@ -7676,4 +7705,19 @@ int tmp;
 }
 
 
+void
+scatter_chains(x, y)
+int x, y;
+{
+    struct obj *otmp;
+    int i;
+    /* scatter some debris (not as much as a drawbridge! */
+    for (i = rn2(3); i > 0; --i) {
+        otmp = mksobj_at(IRON_CHAIN, x, y, TRUE, FALSE);
+        /* a force of 5 here would yield a radius of 2 for
+           iron chain; anything less produces a radius of 1 */
+        (void) scatter(otmp->ox, otmp->oy, 1, MAY_HIT, otmp);
+    }
+}
+
 /*zap.c*/
diff --git a/sys/share/lev_yacc.c b/sys/share/lev_yacc.c
index b3150921f..7a9f7c877 100644
--- a/sys/share/lev_yacc.c
+++ b/sys/share/lev_yacc.c
@@ -4897,11 +4897,14 @@ case 406:
                   }
 break;
 case 407:
+{                     add_opvars(splev, "o", VA_PASS1(SPO_MAGIC_CHEST));
+                  }
+case 408:
 {
                       add_opvars(splev, "o", VA_PASS1(SPO_PUDDLE));
                   }
 break;
-case 408:
+case 409:
 {
                       add_opvars(splev, "o", VA_PASS1(SPO_SEWAGE));
                   }
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
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/util/lev_comp.l b/util/lev_comp.l
index 67dfd33c5..1b60fb5c0 100644
--- a/util/lev_comp.l
+++ b/util/lev_comp.l
@@ -161,6 +161,7 @@ PORTAL		ST_RET(PORTAL_ID);
 TELEPORT_REGION	ST_RET(TELEPRT_ID);
 BRANCH		ST_RET(BRANCH_ID);
 FORGE		ST_RET(FORGE_ID);
+MAGIC_CHEST	ST_RET(MAGIC_CHEST_ID);
 FOUNTAIN	ST_RET(FOUNTAIN_ID);
 VENT	    ST_RET(VENT_ID);
 SINK		ST_RET(SINK_ID);
diff --git a/util/lev_comp.y b/util/lev_comp.y
index 0478e525a..cb72dd093 100644
--- a/util/lev_comp.y
+++ b/util/lev_comp.y
@@ -198,7 +198,7 @@ extern char curr_token[512];
 %token	<i> MAZEWALK_ID WALLIFY_ID REGION_ID FILLING IRREGULAR JOINED
 %token	<i> ALTAR_ID LADDER_ID STAIR_ID NON_DIGGABLE_ID NON_PASSWALL_ID ROOM_ID
 %token	<i> PORTAL_ID TELEPRT_ID BRANCH_ID LEV MINERALIZE_ID
-%token	<i> CORRIDOR_ID GOLD_ID ENGRAVING_ID FORGE_ID FOUNTAIN_ID VENT_ID PUDDLE_ID SEWAGE_ID POOL_ID SINK_ID TOILET_ID NONE
+%token	<i> CORRIDOR_ID GOLD_ID ENGRAVING_ID FORGE_ID MAGIC_CHEST_ID FOUNTAIN_ID VENT_ID PUDDLE_ID SEWAGE_ID POOL_ID SINK_ID TOILET_ID NONE
 %token	<i> RAND_CORRIDOR_ID DOOR_STATE LIGHT_STATE CURSE_TYPE ENGRAVING_TYPE
 %token	<i> DIRECTION RANDOM_TYPE RANDOM_TYPE_BRACKET A_REGISTER
 %token	<i> ALIGNMENT LEFT_OR_RIGHT CENTER TOP_OR_BOT ALTAR_TYPE UP_OR_DOWN
@@ -506,6 +506,7 @@ levstatement 	: message
 		| mineralize
 		| fountain_detail
 		| forge_detail
+		| magic_chest_detail
 		| gold_detail
 		| switchstatement
 		| forstatement
@@ -1900,10 +1901,15 @@ teleprt_detail	: /* empty */
 		;
 
 forge_detail : FORGE_ID ':' ter_selection
-                  {
-                      add_opvars(splev, "o", VA_PASS1(SPO_FORGE));
-                  }
-                ;
+		  {
+		      add_opvars(splev, "o", VA_PASS1(SPO_FORGE));
+		  }
+		;
+
+magic_chest_detail : MAGIC_CHEST_ID ':' ter_selection
+		  {
+		      add_opvars(splev, "o", VA_PASS1(SPO_MAGIC_CHEST));
+		  }
 
 fountain_detail : FOUNTAIN_ID ':' ter_selection
 		  {
@@ -1923,16 +1929,16 @@ toilet_detail : TOILET_ID ':' ter_selection
 		;
 
 puddle_detail : PUDDLE_ID ':' ter_selection
-                  {
-                      add_opvars(splev, "o", VA_PASS1(SPO_PUDDLE));
-                  }
-                ;
+		  {
+		      add_opvars(splev, "o", VA_PASS1(SPO_PUDDLE));
+		  }
+		;
 
 sewage_detail : SEWAGE_ID ':' ter_selection
-                  {
-                      add_opvars(splev, "o", VA_PASS1(SPO_SEWAGE));
-                  }
-                ;
+		  {
+		      add_opvars(splev, "o", VA_PASS1(SPO_SEWAGE));
+		  }
+		;
 
 pool_detail : POOL_ID ':' ter_selection
 		  {
diff --git a/util/lev_main.c b/util/lev_main.c
index 21eec8efc..6fbf255dc 100644
--- a/util/lev_main.c
+++ b/util/lev_main.c
@@ -1384,6 +1384,8 @@ char c;
         return (SCORR);
     case 'U':
         return (FORGE);
+    case 'M':
+        return (MAGIC_CHEST);
     case '{':
         return (FOUNTAIN);
     case '\\':
diff --git a/win/share/monsters.txt b/win/share/monsters.txt
index 63a62f487..6792edfee 100644
--- a/win/share/monsters.txt
+++ b/win/share/monsters.txt
@@ -13660,7 +13660,26 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 717 (sea tortle)
+# tile 717 (compsognathus)
+{
+  ................
+  ................
+  ................
+  ................
+  ....FF..........
+  .FFKJAF.........
+  .....JF.........
+  .....JJJFFF.....
+  ....FKJFJJJJF...
+  ....FKJFJJFFFFFF
+  ....FJJCKFJKK...
+  .....JJKJJ......
+  ........K.......
+  ........K.......
+  .......LL.......
+  ................
+}
+# tile 718 (sea tortle)
 {
   ................
   ................
@@ -13679,7 +13698,7 @@ Z = (195, 195, 195)
   .DD.............
   ................
 }
-# tile 718 (baby crocodile)
+# tile 719 (baby crocodile)
 {
   ................
   ................
@@ -13698,7 +13717,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 719 (lizard)
+# tile 720 (lizard)
 {
   ................
   ................
@@ -13717,7 +13736,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 720 (tortle shaman)
+# tile 721 (tortle shaman)
 {
   ................
   ................
@@ -13736,7 +13755,7 @@ Z = (195, 195, 195)
   .DD.............
   ................
 }
-# tile 721 (rhaumbusun)
+# tile 722 (rhaumbusun)
 {
   FA.....FA.......
   .GFA..FA.FA.....
@@ -13755,7 +13774,7 @@ Z = (195, 195, 195)
   ........KCA..DA.
   ................
 }
-# tile 722 (chameleon)
+# tile 723 (chameleon)
 {
   ................
   ................
@@ -13774,7 +13793,7 @@ Z = (195, 195, 195)
   .DD.............
   ................
 }
-# tile 723 (crocodile)
+# tile 724 (crocodile)
 {
   ................
   ................
@@ -13793,7 +13812,7 @@ Z = (195, 195, 195)
   .DF.............
   ................
 }
-# tile 724 (velociraptor)
+# tile 725 (velociraptor)
 {
   ................
   ................
@@ -13812,7 +13831,7 @@ Z = (195, 195, 195)
   ........JGGAA...
   ................
 }
-# tile 725 (giant turtle)
+# tile 726 (giant turtle)
 {
   ................
   ................
@@ -13831,7 +13850,7 @@ Z = (195, 195, 195)
   .DD.............
   ................
 }
-# tile 726 (gila monster)
+# tile 727 (gila monster)
 {
   ................
   ................
@@ -13850,7 +13869,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 727 (komodo dragon)
+# tile 728 (komodo dragon)
 {
   ................
   ................
@@ -13869,7 +13888,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 728 (salamander)
+# tile 729 (salamander)
 {
   ................
   ................
@@ -13888,7 +13907,7 @@ Z = (195, 195, 195)
   ..ACCA..........
   ...AAA..........
 }
-# tile 729 (T-Rex)
+# tile 730 (T-Rex)
 {
   ...KKKK.........
   .KKKKNKJ........
@@ -13907,7 +13926,7 @@ Z = (195, 195, 195)
   ..AAAAJKAAAAKJA.
   ...AJJKKAAAAKKJJ
 }
-# tile 730 (frost salamander)
+# tile 731 (frost salamander)
 {
   ................
   ................
@@ -13926,7 +13945,7 @@ Z = (195, 195, 195)
   ..ACCA..........
   ...AAA..........
 }
-# tile 731 (giant crocodile)
+# tile 732 (giant crocodile)
 {
   ................
   ................
@@ -13945,7 +13964,7 @@ Z = (195, 195, 195)
   .DF.............
   ................
 }
-# tile 732 (bad egg)
+# tile 733 (bad egg)
 {
   ................
   ................
@@ -13964,7 +13983,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 733 (killer tripe ration)
+# tile 734 (killer tripe ration)
 {
   ................
   ................
@@ -13983,7 +14002,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 734 (killer food ration)
+# tile 735 (killer food ration)
 {
   ...JJA..........
   ...BPA..........
@@ -14002,7 +14021,7 @@ Z = (195, 195, 195)
   ....KKCKKKCKKA..
   .....AAAAAAAA...
 }
-# tile 735 (pile of killer coins)
+# tile 736 (pile of killer coins)
 {
   ................
   ................
@@ -14021,7 +14040,7 @@ Z = (195, 195, 195)
   .........HA.....
   ...........HA...
 }
-# tile 736 (large pile of killer coins)
+# tile 737 (large pile of killer coins)
 {
   ................
   ................
@@ -14040,7 +14059,7 @@ Z = (195, 195, 195)
   .........HA...HA
   ......HA...HA...
 }
-# tile 737 (huge pile of killer coins)
+# tile 738 (huge pile of killer coins)
 {
   ................
   ................
@@ -14059,7 +14078,7 @@ Z = (195, 195, 195)
   .........HCA.HCA
   .......HCA.HCA..
 }
-# tile 738 (archeologist)
+# tile 739 (archeologist)
 {
   ................
   ................
@@ -14078,7 +14097,7 @@ Z = (195, 195, 195)
   .....CJJ.JKJ....
   ................
 }
-# tile 739 (barbarian)
+# tile 740 (barbarian)
 {
   ................
   ................
@@ -14097,7 +14116,7 @@ Z = (195, 195, 195)
   .....LLA.LLA....
   ................
 }
-# tile 740 (bard)
+# tile 741 (bard)
 {
   ................
   ................
@@ -14116,7 +14135,7 @@ Z = (195, 195, 195)
   ....BPPPPPPE....
   ................
 }
-# tile 741 (caveman)
+# tile 742 (caveman)
 {
   ................
   ................
@@ -14135,7 +14154,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 742 (cavewoman)
+# tile 743 (cavewoman)
 {
   ................
   ................
@@ -14154,7 +14173,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 743 (convict)
+# tile 744 (convict)
 {
   ................
   ................
@@ -14173,7 +14192,7 @@ Z = (195, 195, 195)
   .....LLA.LLA....
   ................
 }
-# tile 744 (flame mage)
+# tile 745 (flame mage)
 {
   ................
   .........HD.....
@@ -14192,7 +14211,7 @@ Z = (195, 195, 195)
   ....HDDDDDDC....
   ................
 }
-# tile 745 (healer)
+# tile 746 (healer)
 {
   ................
   .......NN.......
@@ -14211,7 +14230,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 746 (ice mage)
+# tile 747 (ice mage)
 {
   ................
   .........PN.....
@@ -14230,7 +14249,7 @@ Z = (195, 195, 195)
   ....PNNNNNNB....
   ................
 }
-# tile 747 (infidel)
+# tile 748 (infidel)
 {
   ................
   ................
@@ -14249,7 +14268,7 @@ Z = (195, 195, 195)
   .....CJJ.JKJ....
   ................
 }
-# tile 748 (jedi)
+# tile 749 (jedi)
 {
   .......BBB......
   ......BBB.......
@@ -14268,7 +14287,7 @@ Z = (195, 195, 195)
   ......AMMMMMMMMA
   .......AAMMMMMA.
 }
-# tile 749 (knight)
+# tile 750 (knight)
 {
   ................
   ................
@@ -14287,7 +14306,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 750 (monk)
+# tile 751 (monk)
 {
   ................
   ................
@@ -14306,7 +14325,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 751 (necromancer)
+# tile 752 (necromancer)
 {
   ................
   .........AAP....
@@ -14325,7 +14344,7 @@ Z = (195, 195, 195)
   ....AAAAAAAA....
   ................
 }
-# tile 752 (priest)
+# tile 753 (priest)
 {
   ................
   ................
@@ -14344,7 +14363,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 753 (priestess)
+# tile 754 (priestess)
 {
   ................
   .......JJ.......
@@ -14363,7 +14382,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 754 (pirate)
+# tile 755 (pirate)
 {
   ................
   .....ADDD.......
@@ -14382,7 +14401,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 755 (ranger)
+# tile 756 (ranger)
 {
   ................
   ................
@@ -14401,7 +14420,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 756 (rogue)
+# tile 757 (rogue)
 {
   ................
   ................
@@ -14420,7 +14439,7 @@ Z = (195, 195, 195)
   .....KKA.KKA....
   ................
 }
-# tile 757 (samurai)
+# tile 758 (samurai)
 {
   ................
   ................
@@ -14439,7 +14458,7 @@ Z = (195, 195, 195)
   .....IIA.IIA....
   ................
 }
-# tile 758 (tourist)
+# tile 759 (tourist)
 {
   ................
   ................
@@ -14458,7 +14477,7 @@ Z = (195, 195, 195)
   .....LLA.LLA....
   ................
 }
-# tile 759 (undead slayer)
+# tile 760 (undead slayer)
 {
   ................
   ................
@@ -14477,7 +14496,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 760 (valkyrie)
+# tile 761 (valkyrie)
 {
   ................
   ................
@@ -14496,7 +14515,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 761 (yeoman)
+# tile 762 (yeoman)
 {
   ................
   .......OHA......
@@ -14515,7 +14534,7 @@ Z = (195, 195, 195)
   .....DDA.DDA....
   ................
 }
-# tile 762 (wizard)
+# tile 763 (wizard)
 {
   ................
   .........BP.....
@@ -14534,7 +14553,7 @@ Z = (195, 195, 195)
   ....BPPPPPPE....
   ................
 }
-# tile 763 (long worm tail)
+# tile 764 (long worm tail)
 {
   ........ILLLL...
   ......IILLAA....
@@ -14553,7 +14572,7 @@ Z = (195, 195, 195)
   .LLLIIIILLLA....
   ...LLLLLAAA.....
 }
-# tile 764 (Nightmare)
+# tile 765 (Nightmare)
 {
   ................
   ................
@@ -14573,7 +14592,7 @@ Z = (195, 195, 195)
   ................
 }
 
-# tile 765 (Beholder)
+# tile 766 (Beholder)
 {
   ....OA..OA......
   ..OA.DADA.OA.OA.
@@ -14592,7 +14611,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 766 (Lord Carnarvon)
+# tile 767 (Lord Carnarvon)
 {
   .......JJ.......
   ......KJJJ......
@@ -14611,7 +14630,7 @@ Z = (195, 195, 195)
   .....PPA.PPA....
   ................
 }
-# tile 767 (Pelias)
+# tile 768 (Pelias)
 {
   ................
   .......JJ.......
@@ -14630,7 +14649,7 @@ Z = (195, 195, 195)
   .....PPA.PPA....
   ................
 }
-# tile 768 (Shaman Karnov)
+# tile 769 (Shaman Karnov)
 {
   ................
   .......JJA......
@@ -14649,7 +14668,7 @@ Z = (195, 195, 195)
   .....LLA.LLA....
   ................
 }
-# tile 769 (Earendil)
+# tile 770 (Earendil)
 {
   .........G......
   ....B..GGF..B...
@@ -14668,7 +14687,7 @@ Z = (195, 195, 195)
   .....AAAAAA.....
   ................
 }
-# tile 770 (Elwing)
+# tile 771 (Elwing)
 {
   .........G......
   ....B..GGF..B...
@@ -14687,7 +14706,7 @@ Z = (195, 195, 195)
   .....AAAAAA.....
   ................
 }
-# tile 771 (High Flame Mage)
+# tile 772 (High Flame Mage)
 {
   .........HD.....
   ......HHHDC.....
@@ -14706,7 +14725,7 @@ Z = (195, 195, 195)
   ...ADDDDDDDC....
   ................
 }
-# tile 772 (Robert the Lifer)
+# tile 773 (Robert the Lifer)
 {
   ................
   ................
@@ -14725,7 +14744,7 @@ Z = (195, 195, 195)
   .....LLA.LLA....
   ................
 }
-# tile 773 (Hippocrates)
+# tile 774 (Hippocrates)
 {
   ................
   ....LLLCCD......
@@ -14744,7 +14763,7 @@ Z = (195, 195, 195)
   .LCCCCCCCDA.....
   ................
 }
-# tile 774 (High Ice Mage)
+# tile 775 (High Ice Mage)
 {
   .........PN.....
   ......PPPNB.....
@@ -14763,7 +14782,7 @@ Z = (195, 195, 195)
   ...ANNNNNNNB....
   ................
 }
-# tile 775 (Archbishop of Moloch)
+# tile 776 (Archbishop of Moloch)
 {
   .INI............
   IIIII.KDDK......
@@ -14782,7 +14801,7 @@ Z = (195, 195, 195)
   ..CADDDJJDDDAA..
   ................
 }
-# tile 776 (Jedi Master)
+# tile 777 (Jedi Master)
 {
   ......AAAAA.....
   .....AKLKKLA....
@@ -14801,7 +14820,7 @@ Z = (195, 195, 195)
   ALLLLLALLLLLLALA
   ALLLLLALLLLLALA.
 }
-# tile 777 (King Arthur)
+# tile 778 (King Arthur)
 {
   ................
   ................
@@ -14820,7 +14839,7 @@ Z = (195, 195, 195)
   ....PPAA.PPA....
   ................
 }
-# tile 778 (Master Po)
+# tile 779 (Master Po)
 {
   ................
   .......LL.......
@@ -14839,7 +14858,7 @@ Z = (195, 195, 195)
   ..JACCCCCCCCAA..
   ................
 }
-# tile 779 (Dark Lord)
+# tile 780 (Dark Lord)
 {
   .........AA.....
   ......AAAAA.....
@@ -14858,7 +14877,7 @@ Z = (195, 195, 195)
   ...AAAAAAAAA....
   ................
 }
-# tile 780 (Mayor Cummerbund)
+# tile 781 (Mayor Cummerbund)
 {
   ......AOA.......
   ....AAOAAAA.....
@@ -14877,7 +14896,7 @@ Z = (195, 195, 195)
   ....JJA.JJA.....
   ................
 }
-# tile 781 (Arch Priest)
+# tile 782 (Arch Priest)
 {
   ..N.............
   .NNN..JLLJ......
@@ -14896,7 +14915,7 @@ Z = (195, 195, 195)
   ..HACCCJJCCCAA..
   ................
 }
-# tile 782 (Orion)
+# tile 783 (Orion)
 {
   ................
   ................
@@ -14915,7 +14934,7 @@ Z = (195, 195, 195)
   ......BPAPAA.A..
   .....PPA.PPA....
 }
-# tile 783 (Master of Thieves)
+# tile 784 (Master of Thieves)
 {
   ................
   ...H.....H......
@@ -14934,7 +14953,7 @@ Z = (195, 195, 195)
   ...JJA..JJA.....
   ................
 }
-# tile 784 (Lord Sato)
+# tile 785 (Lord Sato)
 {
   .....AAA........
   .....AAA........
@@ -14953,7 +14972,7 @@ Z = (195, 195, 195)
   ..IIIA.IIIAA....
   ................
 }
-# tile 785 (Twoflower)
+# tile 786 (Twoflower)
 {
   ................
   ................
@@ -14972,7 +14991,7 @@ Z = (195, 195, 195)
   .....LLA.LLA....
   ................
 }
-# tile 786 (Van Helsing)
+# tile 787 (Van Helsing)
 {
   ................
   .......CDA......
@@ -14991,7 +15010,7 @@ Z = (195, 195, 195)
   ....KKJA.KJKA...
   ................
 }
-# tile 787 (Norn)
+# tile 788 (Norn)
 {
   ................
   ................
@@ -15010,7 +15029,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 788 (Neferet the Green)
+# tile 789 (Neferet the Green)
 {
   ................
   ................
@@ -15029,7 +15048,7 @@ Z = (195, 195, 195)
   ...BPPPPPPPE....
   ................
 }
-# tile 789 (Chief Yeoman Warder)
+# tile 790 (Chief Yeoman Warder)
 {
   .......AAA......
   .......AAA......
@@ -15048,7 +15067,7 @@ Z = (195, 195, 195)
   .....HHA.HHA....
   ................
 }
-# tile 790 (Minion of Huhetotl)
+# tile 791 (Minion of Huhetotl)
 {
   ...OP......PO...
   ...OODDDDDDOOD..
@@ -15067,7 +15086,7 @@ Z = (195, 195, 195)
   ..CDDDAAA.DDDK..
   ................
 }
-# tile 791 (Thoth Amon)
+# tile 792 (Thoth Amon)
 {
   ................
   ......OJJO......
@@ -15086,7 +15105,7 @@ Z = (195, 195, 195)
   .....PPA.PPA....
   ................
 }
-# tile 792 (Annam)
+# tile 793 (Annam)
 {
   ....PPDDDDAA....
   ....PDDDDDDDA...
@@ -15105,7 +15124,7 @@ Z = (195, 195, 195)
   .....BPPABPPAAAA
   ...LLLLJ.BLLLKAA
 }
-# tile 793 (Warden Arianna)
+# tile 794 (Warden Arianna)
 {
   ................
   ................
@@ -15124,26 +15143,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 794 (Water Mage)
-{
-  .........BE.....
-  ......BBBEP.....
-  .....BEEEPA.....
-  ...A.BAAAPA.....
-  ..AEAEAAAPA.....
-  ...A.ELLLPA.....
-  ...A.BELLP......
-  ..PAEEBAAPA.AAA.
-  ..PAEEEBBPPAAAA.
-  ..PAE.EBEPPPAA..
-  ..PA..BEEPALAA..
-  ...A.PEEEPAAAA..
-  ...A.BEEEPAA.A..
-  ...ABEEEEEPA....
-  ...AEEEEEEEP....
-  ................
-}
-# tile 795 (Cyclops)
+# tile 796 (Cyclops)
 {
   ................
   ....LLLLL.......
@@ -15162,7 +15162,7 @@ Z = (195, 195, 195)
   ....CJJJCLAAAAAA
   ..LLLLL.LLLLLAA.
 }
-# tile 796 (Ragnaros)
+# tile 797 (Ragnaros)
 {
   .........GK.....
   ......GGGKF.....
@@ -15181,7 +15181,7 @@ Z = (195, 195, 195)
   ...AKCKKKKCF....
   ................
 }
-# tile 797 (Paladin)
+# tile 798 (Paladin)
 {
   ................
   ................
@@ -15200,7 +15200,7 @@ Z = (195, 195, 195)
   .B..............
   ................
 }
-# tile 798 (Lord Sidious)
+# tile 799 (Lord Sidious)
 {
   .....AAAA.......
   ....AWWUUA......
@@ -15219,7 +15219,7 @@ Z = (195, 195, 195)
   WWWWWWWAUAAUUAWA
   WWWWWWWAUAAAAWA.
 }
-# tile 799 (Ixoth)
+# tile 800 (Ixoth)
 {
   ....O......O....
   ....O......O....
@@ -15238,7 +15238,7 @@ Z = (195, 195, 195)
   ..CDDDAAA.DDDK..
   ................
 }
-# tile 800 (Master Kaen)
+# tile 801 (Master Kaen)
 {
   ................
   .......KKA......
@@ -15257,7 +15257,7 @@ Z = (195, 195, 195)
   ...KJJJJJJJJJA..
   ................
 }
-# tile 801 (Maugneshaagar)
+# tile 802 (Maugneshaagar)
 {
   ................
   .AP.AP....AP.AP.
@@ -15276,7 +15276,7 @@ Z = (195, 195, 195)
   ..AAAAPP.AAAAP..
   ................
 }
-# tile 802 (Nalzok)
+# tile 803 (Nalzok)
 {
   ....O......O....
   ....O......O....
@@ -15295,7 +15295,7 @@ Z = (195, 195, 195)
   ..CDDDAAA.DDDK..
   ................
 }
-# tile 803 (Blackbeard's Ghost)
+# tile 804 (Blackbeard's Ghost)
 {
   ..AAAOA.........
   ..AANAAA.....ONO
@@ -15314,7 +15314,7 @@ Z = (195, 195, 195)
   .PP.PPOPPP...P..
   .O...P....P.....
 }
-# tile 804 (Scorpius)
+# tile 805 (Scorpius)
 {
   .....JLJLJAA....
   ....JA.JCJCKAA..
@@ -15333,7 +15333,7 @@ Z = (195, 195, 195)
   ...D...JAAJA.JJ.
   ........JA.JA...
 }
-# tile 805 (Master Assassin)
+# tile 806 (Master Assassin)
 {
   ................
   ................
@@ -15352,7 +15352,7 @@ Z = (195, 195, 195)
   .....AAA.AAA....
   ................
 }
-# tile 806 (Ashikaga Takauji)
+# tile 807 (Ashikaga Takauji)
 {
   ................
   ................
@@ -15371,7 +15371,7 @@ Z = (195, 195, 195)
   .....IIA.IIA....
   ................
 }
-# tile 807 (Count Dracula)
+# tile 808 (Count Dracula)
 {
   ................
   ..N..AAAA.......
@@ -15390,7 +15390,7 @@ Z = (195, 195, 195)
   ..N.AAPP..AP....
   ................
 }
-# tile 808 (Lord Surtur)
+# tile 809 (Lord Surtur)
 {
   ....PPDDDDAA....
   ....PDDDDDDDA...
@@ -15409,7 +15409,7 @@ Z = (195, 195, 195)
   .....BPPABPPAAAA
   ...LLLLJ.BLLLKAA
 }
-# tile 809 (Dark One)
+# tile 810 (Dark One)
 {
   ................
   ......AAA.......
@@ -15428,7 +15428,7 @@ Z = (195, 195, 195)
   AAAAAAAAAAAAAAAA
   ................
 }
-# tile 810 (Colonel Blood)
+# tile 811 (Colonel Blood)
 {
   .......AAP......
   .......AAP......
@@ -15447,7 +15447,7 @@ Z = (195, 195, 195)
   ....KKJP.CJJ....
   ................
 }
-# tile 811 (student)
+# tile 812 (student)
 {
   ................
   ................
@@ -15466,7 +15466,7 @@ Z = (195, 195, 195)
   .....CJJ.JKJ....
   ................
 }
-# tile 812 (chieftain)
+# tile 813 (chieftain)
 {
   ................
   ................
@@ -15485,7 +15485,7 @@ Z = (195, 195, 195)
   .....LLA.LLA....
   ................
 }
-# tile 813 (neanderthal)
+# tile 814 (neanderthal)
 {
   ................
   ................
@@ -15504,7 +15504,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 814 (High-elf)
+# tile 815 (High-elf)
 {
   .........G......
   .......GGF......
@@ -15523,7 +15523,7 @@ Z = (195, 195, 195)
   ......GFAFAA....
   .....KLA.LKA....
 }
-# tile 815 (inmate)
+# tile 816 (inmate)
 {
   ................
   ................
@@ -15542,7 +15542,7 @@ Z = (195, 195, 195)
   .....LLA.LLA....
   ................
 }
-# tile 816 (igniter)
+# tile 817 (igniter)
 {
   ................
   ................
@@ -15561,7 +15561,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 817 (froster)
+# tile 818 (froster)
 {
   ................
   ................
@@ -15580,7 +15580,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 818 (attendant)
+# tile 819 (attendant)
 {
   ................
   ................
@@ -15599,7 +15599,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 819 (padawan)
+# tile 820 (padawan)
 {
   ................
   ................
@@ -15618,7 +15618,7 @@ Z = (195, 195, 195)
   ....JJJ.JJJ.....
   ................
 }
-# tile 820 (jedi trainer)
+# tile 821 (jedi trainer)
 {
   .......BBB......
   ......BBB.......
@@ -15637,7 +15637,7 @@ Z = (195, 195, 195)
   ......AMMMMMMMMA
   .......AAMMMMMA.
 }
-# tile 821 (templar)
+# tile 822 (templar)
 {
   ................
   ................
@@ -15656,7 +15656,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 822 (cultist)
+# tile 823 (cultist)
 {
   ................
   ................
@@ -15675,7 +15675,7 @@ Z = (195, 195, 195)
   ..ADCDDJJKDK....
   ................
 }
-# tile 823 (page)
+# tile 824 (page)
 {
   ................
   ................
@@ -15694,7 +15694,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 824 (abbot)
+# tile 825 (abbot)
 {
   ................
   ................
@@ -15713,7 +15713,7 @@ Z = (195, 195, 195)
   ....CDCCCDDA.A..
   ...CCCCCCCDD....
 }
-# tile 825 (embalmer)
+# tile 826 (embalmer)
 {
   ................
   ................
@@ -15732,7 +15732,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 826 (acolyte)
+# tile 827 (acolyte)
 {
   ................
   ................
@@ -15751,7 +15751,7 @@ Z = (195, 195, 195)
   ....LCCCCCDD....
   ................
 }
-# tile 827 (pirate crewmate)
+# tile 828 (pirate crewmate)
 {
   ................
   ................
@@ -15770,7 +15770,7 @@ Z = (195, 195, 195)
   ....JJA.JJA.....
   ................
 }
-# tile 828 (hunter)
+# tile 829 (hunter)
 {
   ................
   ................
@@ -15789,7 +15789,7 @@ Z = (195, 195, 195)
   ....JPPA.PPA....
   ................
 }
-# tile 829 (thug)
+# tile 830 (thug)
 {
   ................
   ................
@@ -15808,7 +15808,7 @@ Z = (195, 195, 195)
   .....KKA.KKA....
   ................
 }
-# tile 830 (musician)
+# tile 831 (musician)
 {
   ................
   ................
@@ -15827,7 +15827,7 @@ Z = (195, 195, 195)
   ....BPPPPPPE....
   ................
 }
-# tile 831 (ninja)
+# tile 832 (ninja)
 {
   ................
   ................
@@ -15846,7 +15846,7 @@ Z = (195, 195, 195)
   .....AAA.AAA....
   ................
 }
-# tile 832 (ronin)
+# tile 833 (ronin)
 {
   ................
   ................
@@ -15865,7 +15865,7 @@ Z = (195, 195, 195)
   .....PPA.PPA....
   ................
 }
-# tile 833 (roshi)
+# tile 834 (roshi)
 {
   ................
   ................
@@ -15884,7 +15884,7 @@ Z = (195, 195, 195)
   .....PPA.PPA....
   ................
 }
-# tile 834 (guide)
+# tile 835 (guide)
 {
   ................
   ................
@@ -15903,7 +15903,7 @@ Z = (195, 195, 195)
   .....LLA.LLA....
   ................
 }
-# tile 835 (exterminator)
+# tile 836 (exterminator)
 {
   ................
   .......KJA......
@@ -15922,7 +15922,7 @@ Z = (195, 195, 195)
   ....JJJAJJJAAA..
   ...AAAAAAAAAA...
 }
-# tile 836 (warrior)
+# tile 837 (warrior)
 {
   .....O....O.....
   .....NO..ON.....
@@ -15941,7 +15941,7 @@ Z = (195, 195, 195)
   .....KLA.LKA....
   ................
 }
-# tile 837 (apprentice)
+# tile 838 (apprentice)
 {
   ................
   ................
@@ -15960,7 +15960,7 @@ Z = (195, 195, 195)
   ....BPPPPPPE....
   ................
 }
-# tile 838 (Yeoman Warder)
+# tile 839 (Yeoman Warder)
 {
   ................
   ................
@@ -15979,7 +15979,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 839 (invisible monster)
+# tile 840 (invisible monster)
 {
   ................
   ................
diff --git a/win/share/objects.txt b/win/share/objects.txt
index bd4b32dd6..76ef78cf6 100644
--- a/win/share/objects.txt
+++ b/win/share/objects.txt
@@ -5728,7 +5728,26 @@ Z = (195, 195, 195)
   NBBBBBBBBBBPAA..
   .AAAAAAAAAAAA...
 }
-# tile 300 (bag / medical kit)
+# tile 300 (magic chest / hidden chest)
+{
+  ................
+  ................
+  ................
+  ................
+  ....NNNNNNNNNNN.
+  ...NPIIIIIIIINP.
+  ..NPPIIIIIIINPP.
+  .NPPPIIIIIINPPP.
+  NNNNNNNNNNNPPPP.
+  NIIIIIIIIIIPPPPA
+  NNNNIIIIIIIPPPPA
+  NIIIIIIIIIIPPPPA
+  NNIIIIIIIIIPPPAA
+  NIIIIIIIIIIPPAA.
+  NIIIIIIIIIIPAA..
+  .AAAAAAAAAAAA...
+}
+# tile 301 (bag / medical kit)
 {
   ................
   ................
@@ -5747,7 +5766,7 @@ Z = (195, 195, 195)
   ........APP.....
   ................
 }
-# tile 301 (bag / sack)
+# tile 302 (bag / sack)
 {
   ................
   ................
@@ -5766,7 +5785,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 302 (bag / oilskin sack)
+# tile 303 (bag / oilskin sack)
 {
   ................
   ................
@@ -5785,7 +5804,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 303 (bag / bag of holding)
+# tile 304 (bag / bag of holding)
 {
   ................
   ................
@@ -5804,7 +5823,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 304 (bag / bag of rats)
+# tile 305 (bag / bag of rats)
 {
   ................
   ................
@@ -5823,7 +5842,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 305 (bag / bag of tricks)
+# tile 306 (bag / bag of tricks)
 {
   ................
   ................
@@ -5842,7 +5861,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 306 (key / skeleton key)
+# tile 307 (key / skeleton key)
 {
   ................
   ................
@@ -5861,7 +5880,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 307 (lock pick)
+# tile 308 (lock pick)
 {
   ................
   ................
@@ -5880,7 +5899,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 308 (credit card)
+# tile 309 (credit card)
 {
   ................
   ................
@@ -5899,7 +5918,26 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 309 (candle / tallow candle)
+# tile 310 (ornate key / magic key)
+{
+  ................
+  ................
+  ................
+  ................
+  ................
+  ................
+  ..OO............
+  .O.DOOOOOOOOOO..
+  .OD.ODDDDODODOD.
+  .OD.OD...OD.DOD.
+  ..OO.D....D...D.
+  ...DD...........
+  ................
+  ................
+  ................
+  ................
+}
+# tile 311 (candle / tallow candle)
 {
   ................
   ................
@@ -5918,7 +5956,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 310 (candle / wax candle)
+# tile 312 (candle / wax candle)
 {
   ................
   ................
@@ -5937,7 +5975,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 311 (candle / magic candle)
+# tile 313 (candle / magic candle)
 {
   ................
   ................
@@ -5956,7 +5994,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 312 (lantern)
+# tile 314 (lantern)
 {
   ................
   ................
@@ -5975,7 +6013,7 @@ Z = (195, 195, 195)
   .....AAAAAAA....
   ................
 }
-# tile 313 (lamp / oil lamp)
+# tile 315 (lamp / oil lamp)
 {
   ................
   ................
@@ -5994,7 +6032,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 314 (lamp / magic lamp)
+# tile 316 (lamp / magic lamp)
 {
   ................
   ................
@@ -6013,7 +6051,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 315 (expensive camera)
+# tile 317 (expensive camera)
 {
   ................
   ................
@@ -6032,7 +6070,7 @@ Z = (195, 195, 195)
   ...PPPPPPPPPPPP.
   ................
 }
-# tile 316 (looking glass / mirror)
+# tile 318 (looking glass / mirror)
 {
   ................
   ................
@@ -6051,7 +6089,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 317 (wooden barrel / keg)
+# tile 319 (wooden barrel / keg)
 {
   ................
   ................
@@ -6070,7 +6108,7 @@ Z = (195, 195, 195)
   .AKKKJKKKJKKKAAA
   ..AAAAAAAAAAAA..
 }
-# tile 318 (glass orb / crystal ball)
+# tile 320 (glass orb / crystal ball)
 {
   ................
   ................
@@ -6089,7 +6127,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 319 (plastic orb / eight ball)
+# tile 321 (plastic orb / eight ball)
 {
   ................
   ................
@@ -6108,7 +6146,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 320 (lenses)
+# tile 322 (lenses)
 {
   ................
   ................
@@ -6127,7 +6165,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 321 (goggles)
+# tile 323 (goggles)
 {
   ................
   ................
@@ -6146,7 +6184,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 322 (blindfold)
+# tile 324 (blindfold)
 {
   ................
   ................
@@ -6165,7 +6203,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 323 (towel)
+# tile 325 (towel)
 {
   ................
   ................
@@ -6184,7 +6222,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 324 (saddle)
+# tile 326 (saddle)
 {
   ................
   ................
@@ -6203,7 +6241,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 325 (barding)
+# tile 327 (barding)
 {
   ................
   ................
@@ -6222,7 +6260,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 326 (spiked barding)
+# tile 328 (spiked barding)
 {
   ................
   ................
@@ -6241,7 +6279,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 327 (polished barding / barding of reflection)
+# tile 329 (polished barding / barding of reflection)
 {
   ................
   ................
@@ -6260,7 +6298,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 328 (leash)
+# tile 330 (leash)
 {
   ................
   ................
@@ -6279,7 +6317,7 @@ Z = (195, 195, 195)
   .....AAAA.......
   ................
 }
-# tile 329 (stethoscope)
+# tile 331 (stethoscope)
 {
   ................
   ................
@@ -6298,7 +6336,7 @@ Z = (195, 195, 195)
   ........AAA.....
   ................
 }
-# tile 330 (tinning kit)
+# tile 332 (tinning kit)
 {
   ................
   ................
@@ -6317,7 +6355,7 @@ Z = (195, 195, 195)
   ......AAA.......
   ................
 }
-# tile 331 (tin opener)
+# tile 333 (tin opener)
 {
   ................
   ................
@@ -6336,7 +6374,7 @@ Z = (195, 195, 195)
   ........AA......
   ................
 }
-# tile 332 (can of grease)
+# tile 334 (can of grease)
 {
   ................
   ................
@@ -6355,7 +6393,7 @@ Z = (195, 195, 195)
   .......AAAA.....
   ................
 }
-# tile 333 (figurine)
+# tile 335 (figurine)
 {
   ................
   ................
@@ -6374,7 +6412,7 @@ Z = (195, 195, 195)
   .....JJJJJAA....
   ................
 }
-# tile 334 (mask)
+# tile 336 (mask)
 {
   ................
   ................
@@ -6393,7 +6431,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 335 (marker / magic marker)
+# tile 337 (marker / magic marker)
 {
   ................
   ................
@@ -6412,7 +6450,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 336 (land mine)
+# tile 338 (land mine)
 {
   ................
   ................
@@ -6431,7 +6469,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 337 (beartrap)
+# tile 339 (beartrap)
 {
   ................
   ................
@@ -6450,7 +6488,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 338 (whistle / pea whistle)
+# tile 340 (whistle / pea whistle)
 {
   ................
   ................
@@ -6469,7 +6507,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 339 (whistle / magic whistle)
+# tile 341 (whistle / magic whistle)
 {
   ................
   ................
@@ -6488,7 +6526,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 340 (flute / flute)
+# tile 342 (flute / flute)
 {
   ................
   ................
@@ -6507,7 +6545,7 @@ Z = (195, 195, 195)
   ..A.............
   ................
 }
-# tile 341 (flute / magic flute)
+# tile 343 (flute / magic flute)
 {
   ................
   ................
@@ -6526,7 +6564,7 @@ Z = (195, 195, 195)
   ..A.............
   ................
 }
-# tile 342 (horn / tooled horn)
+# tile 344 (horn / tooled horn)
 {
   ................
   ................
@@ -6545,7 +6583,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 343 (horn / frost horn)
+# tile 345 (horn / frost horn)
 {
   ................
   ................
@@ -6564,7 +6602,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 344 (horn / fire horn)
+# tile 346 (horn / fire horn)
 {
   ................
   ................
@@ -6583,7 +6621,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 345 (horn / horn of blasting)
+# tile 347 (horn / horn of blasting)
 {
   ................
   ................
@@ -6602,7 +6640,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 346 (horn / horn of plenty)
+# tile 348 (horn / horn of plenty)
 {
   ................
   ................
@@ -6621,7 +6659,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 347 (harp / harp)
+# tile 349 (harp / harp)
 {
   ................
   ................
@@ -6640,7 +6678,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 348 (harp / magic harp)
+# tile 350 (harp / magic harp)
 {
   ................
   ................
@@ -6659,7 +6697,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 349 (bell)
+# tile 351 (bell)
 {
   ................
   .......KA.......
@@ -6678,7 +6716,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 350 (bugle)
+# tile 352 (bugle)
 {
   ................
   ................
@@ -6697,7 +6735,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 351 (lute)
+# tile 353 (lute)
 {
   ................
   ................
@@ -6716,7 +6754,7 @@ Z = (195, 195, 195)
   .AJJAA..........
   ..AA............
 }
-# tile 352 (bagpipe)
+# tile 354 (bagpipe)
 {
   ................
   ...PPP..........
@@ -6735,7 +6773,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 353 (drum / leather drum)
+# tile 355 (drum / leather drum)
 {
   ................
   ................
@@ -6754,7 +6792,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 354 (drum / drum of earthquake)
+# tile 356 (drum / drum of earthquake)
 {
   ................
   ................
@@ -6773,7 +6811,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 355 (pick-axe)
+# tile 357 (pick-axe)
 {
   ................
   ................
@@ -6792,7 +6830,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 356 (spoon)
+# tile 358 (spoon)
 {
   ................
   ................
@@ -6811,7 +6849,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 357 (fishing pole)
+# tile 359 (fishing pole)
 {
   ................
   ...........JJJA.
@@ -6830,7 +6868,7 @@ Z = (195, 195, 195)
   .JJA.......OOA..
   ................
 }
-# tile 358 (iron hook / grappling hook)
+# tile 360 (iron hook / grappling hook)
 {
   .............N..
   ..............P.
@@ -6849,7 +6887,7 @@ Z = (195, 195, 195)
   ..OOA..OOOA.....
   ....OOOAA.......
 }
-# tile 359 (torch)
+# tile 361 (torch)
 {
   ................
   ................
@@ -6868,7 +6906,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 360 (unicorn horn)
+# tile 362 (unicorn horn)
 {
   ................
   ................
@@ -6887,7 +6925,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 361 (bandage)
+# tile 363 (bandage)
 {
   ................
   ................
@@ -6906,7 +6944,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 362 (phial)
+# tile 364 (phial)
 {
   ................
   ................
@@ -6925,7 +6963,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 363 (candelabrum / Candelabrum of Invocation)
+# tile 365 (candelabrum / Candelabrum of Invocation)
 {
   .......N........
   .......D........
@@ -6944,7 +6982,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 364 (engraved silver bell / Bell of Opening)
+# tile 366 (engraved silver bell / Bell of Opening)
 {
   ................
   .......OA.......
@@ -6963,7 +7001,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 365 (tripe ration)
+# tile 367 (tripe ration)
 {
   ................
   ................
@@ -6982,7 +7020,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 366 (corpse)
+# tile 368 (corpse)
 {
   ................
   .....D.DPLN.....
@@ -7001,7 +7039,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 367 (eyeball)
+# tile 369 (eyeball)
 {
   ................
   ................
@@ -7020,7 +7058,7 @@ Z = (195, 195, 195)
   .......OOOPAAA..
   ................
 }
-# tile 368 (severed hand)
+# tile 370 (severed hand)
 {
   ................
   ................
@@ -7039,7 +7077,7 @@ Z = (195, 195, 195)
   ........AAA.....
   ................
 }
-# tile 369 (egg)
+# tile 371 (egg)
 {
   ................
   ................
@@ -7058,7 +7096,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 370 (meatball)
+# tile 372 (meatball)
 {
   ................
   ................
@@ -7077,7 +7115,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 371 (meat stick)
+# tile 373 (meat stick)
 {
   ................
   ................
@@ -7096,7 +7134,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 372 (huge chunk of meat)
+# tile 374 (huge chunk of meat)
 {
   ................
   ................
@@ -7115,7 +7153,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 373 (meat ring)
+# tile 375 (meat ring)
 {
   ................
   ................
@@ -7134,7 +7172,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 374 (glob of gray ooze)
+# tile 376 (glob of gray ooze)
 {
   ................
   ................
@@ -7153,7 +7191,7 @@ Z = (195, 195, 195)
   ...AAA.AAAAA....
   ................
 }
-# tile 375 (glob of brown pudding)
+# tile 377 (glob of brown pudding)
 {
   ................
   ................
@@ -7172,7 +7210,7 @@ Z = (195, 195, 195)
   ...AAA.AAAAA....
   ................
 }
-# tile 376 (glob of green slime)
+# tile 378 (glob of green slime)
 {
   ................
   ................
@@ -7191,7 +7229,7 @@ Z = (195, 195, 195)
   ...AAA.AAAAA....
   ................
 }
-# tile 377 (glob of blood pudding)
+# tile 379 (glob of blood pudding)
 {
   ................
   ................
@@ -7210,7 +7248,7 @@ Z = (195, 195, 195)
   ...AAA.AAAAA....
   ................
 }
-# tile 378 (glob of gel)
+# tile 380 (glob of gel)
 {
   ................
   ................
@@ -7229,7 +7267,7 @@ Z = (195, 195, 195)
   ...AAA.AAAAA....
   ................
 }
-# tile 379 (glob of moldy pudding)
+# tile 381 (glob of moldy pudding)
 {
   ................
   ................
@@ -7248,7 +7286,7 @@ Z = (195, 195, 195)
   ...AAA.AAAAA....
   ................
 }
-# tile 380 (glob of black pudding)
+# tile 382 (glob of black pudding)
 {
   ................
   ................
@@ -7267,7 +7305,7 @@ Z = (195, 195, 195)
   ...AAA.AAAAA....
   ................
 }
-# tile 381 (kelp frond)
+# tile 383 (kelp frond)
 {
   ....FA..........
   ....FFA.........
@@ -7286,7 +7324,7 @@ Z = (195, 195, 195)
   .....FFFFA......
   ......FFFFA.....
 }
-# tile 382 (eucalyptus leaf)
+# tile 384 (eucalyptus leaf)
 {
   ................
   ................
@@ -7305,7 +7343,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 383 (apple)
+# tile 385 (apple)
 {
   ................
   ................
@@ -7324,7 +7362,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 384 (orange)
+# tile 386 (orange)
 {
   ................
   ................
@@ -7343,7 +7381,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 385 (mushroom)
+# tile 387 (mushroom)
 {
   ................
   ................
@@ -7362,7 +7400,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 386 (pear)
+# tile 388 (pear)
 {
   ................
   ................
@@ -7381,7 +7419,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 387 (asian pear)
+# tile 389 (asian pear)
 {
   ................
   ................
@@ -7400,7 +7438,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 388 (melon)
+# tile 390 (melon)
 {
   ................
   ................
@@ -7419,7 +7457,7 @@ Z = (195, 195, 195)
   ......AAA.......
   ................
 }
-#tile 389 (pineapple)
+#tile 391 (pineapple)
 {
   ................
   .........GA.....
@@ -7438,7 +7476,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 390 (banana)
+# tile 392 (banana)
 {
   ................
   ................
@@ -7457,7 +7495,7 @@ Z = (195, 195, 195)
   .....AAAAA......
   ................
 }
-# tile 391 (carrot)
+# tile 393 (carrot)
 {
   ................
   ..........F..F..
@@ -7476,7 +7514,7 @@ Z = (195, 195, 195)
   ...A............
   ................
 }
-# tile 392 (sprig of catnip)
+# tile 394 (sprig of catnip)
 {
   ................
   ................
@@ -7495,7 +7533,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 393 (sprig of wolfsbane)
+# tile 395 (sprig of wolfsbane)
 {
   ................
   ................
@@ -7514,7 +7552,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 394 (clove of garlic)
+# tile 396 (clove of garlic)
 {
   ................
   ................
@@ -7533,7 +7571,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 395 (slime mold)
+# tile 397 (slime mold)
 {
   ................
   ................
@@ -7552,7 +7590,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 396 (lump of royal jelly)
+# tile 398 (lump of royal jelly)
 {
   ................
   ................
@@ -7571,7 +7609,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 397 (cream pie)
+# tile 399 (cream pie)
 {
   ................
   ................
@@ -7590,7 +7628,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 398 (apple pie)
+# tile 400 (apple pie)
 {
   ................
   ................
@@ -7609,7 +7647,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 399 (pumpkin pie)
+# tile 401 (pumpkin pie)
 {
   ................
   ................
@@ -7628,7 +7666,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 400 (sandwich)
+# tile 402 (sandwich)
 {
   ................
   ................
@@ -7647,7 +7685,7 @@ Z = (195, 195, 195)
   .......AAAAAA...
   ................
 }
-# tile 401 (candy bar)
+# tile 403 (candy bar)
 {
   ................
   ................
@@ -7666,7 +7704,7 @@ Z = (195, 195, 195)
   ....A...........
   ................
 }
-# tile 402 (slice of cake)
+# tile 404 (slice of cake)
 {
   ................
   ........D.......
@@ -7685,7 +7723,7 @@ Z = (195, 195, 195)
   ......AAA.......
   ................
 }
-# tile 403 (fruitcake)
+# tile 405 (fruitcake)
 {
   ................
   ........D.......
@@ -7704,7 +7742,7 @@ Z = (195, 195, 195)
   ......AAA.......
   ................
 }
-# tile 404 (fortune cookie)
+# tile 406 (fortune cookie)
 {
   ................
   ................
@@ -7723,7 +7761,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 405 (pancake)
+# tile 407 (pancake)
 {
   ................
   ................
@@ -7742,7 +7780,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 406 (tortilla)
+# tile 408 (tortilla)
 {
   ................
   ................
@@ -7762,7 +7800,7 @@ Z = (195, 195, 195)
   ................
 }
 
-# tile 407 (cheese)
+# tile 409 (cheese)
 {
   ................
   ................
@@ -7781,7 +7819,7 @@ Z = (195, 195, 195)
   ....AAAAAAA.....
   ................
 }
-# tile 408 (pill)
+# tile 410 (pill)
 {
   ................
   ................
@@ -7800,7 +7838,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 409 (holy wafer)
+# tile 411 (holy wafer)
 {
   ................
   ................
@@ -7819,7 +7857,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 410 (lembas wafer)
+# tile 412 (lembas wafer)
 {
   ................
   ................
@@ -7838,7 +7876,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 411 (cram ration)
+# tile 413 (cram ration)
 {
   ................
   ...JKA..........
@@ -7857,7 +7895,7 @@ Z = (195, 195, 195)
   .....AAAAAA.....
   ................
 }
-# tile 412 (food ration)
+# tile 414 (food ration)
 {
   ...JJA..........
   ...BPA..........
@@ -7876,7 +7914,7 @@ Z = (195, 195, 195)
   ....KKKKKKKKKA..
   .....AAAAAAAA...
 }
-# tile 413 (K-ration)
+# tile 415 (K-ration)
 {
   ................
   ................
@@ -7895,7 +7933,7 @@ Z = (195, 195, 195)
   ....KKKKKKKKKA..
   .....AAAAAAAA...
 }
-# tile 414 (C-ration)
+# tile 416 (C-ration)
 {
   ................
   ................
@@ -7914,7 +7952,7 @@ Z = (195, 195, 195)
   ....KKKKKKKKKA..
   .....AAAAAAAA...
 }
-# tile 415 (tin)
+# tile 417 (tin)
 {
   ................
   ................
@@ -7933,7 +7971,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 416 (ruby / gain ability)
+# tile 418 (ruby / gain ability)
 {
   ................
   ................
@@ -7952,7 +7990,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 417 (metallic / reflection)
+# tile 419 (metallic / reflection)
 {
   ................
   ................
@@ -7971,7 +8009,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 418 (purple-red / regeneration) {
+# tile 420 (purple-red / regeneration) {
   ................
   ................
   ................
@@ -7989,7 +8027,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 419 (pink / restore ability)
+# tile 421 (pink / restore ability)
 {
   ................
   ................
@@ -8008,7 +8046,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 420 (orange / confusion)
+# tile 422 (orange / confusion)
 {
   ................
   ................
@@ -8027,7 +8065,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 421 (luminescent / clairvoyance)
+# tile 423 (luminescent / clairvoyance)
 {
   ................
   ................
@@ -8046,7 +8084,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 422 (yellow / blindness)
+# tile 424 (yellow / blindness)
 {
   ................
   ................
@@ -8065,7 +8103,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 423 (muddy / ESP)
+# tile 425 (muddy / ESP)
 {
   ................
   ................
@@ -8084,7 +8122,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 424 (emerald / paralysis)
+# tile 426 (emerald / paralysis)
 {
   ................
   ................
@@ -8103,7 +8141,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 425 (dark green / speed)
+# tile 427 (dark green / speed)
 {
   ................
   ................
@@ -8122,7 +8160,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 426 (cyan / levitation)
+# tile 428 (cyan / levitation)
 {
   ................
   ................
@@ -8141,7 +8179,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 427 (sky blue / hallucination)
+# tile 429 (sky blue / hallucination)
 {
   ................
   ................
@@ -8160,7 +8198,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 428 (indigo / invisibility)
+# tile 430 (indigo / invisibility)
 {
   ................
   ................
@@ -8179,7 +8217,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 429 (magenta / see invisible)
+# tile 431 (magenta / see invisible)
 {
   ................
   ................
@@ -8198,7 +8236,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 430 (amber / healing)
+# tile 432 (amber / healing)
 {
   ................
   ................
@@ -8217,7 +8255,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 431 (puce / extra healing)
+# tile 433 (puce / extra healing)
 {
   ................
   ................
@@ -8236,7 +8274,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 432 (milky / gain level)
+# tile 434 (milky / gain level)
 {
   ................
   ................
@@ -8255,7 +8293,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 433 (icy / invulnerability)
+# tile 435 (icy / invulnerability)
 {
   ................
   ................
@@ -8274,7 +8312,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 434 (swirly / enlightenment)
+# tile 436 (swirly / enlightenment)
 {
   ................
   ................
@@ -8293,7 +8331,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 435 (bubbly / monster detection)
+# tile 437 (bubbly / monster detection)
 {
   ................
   ................
@@ -8312,7 +8350,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 436 (smoky / object detection)
+# tile 438 (smoky / object detection)
 {
   ................
   ................
@@ -8331,7 +8369,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 437 (cloudy / gain energy)
+# tile 439 (cloudy / gain energy)
 {
   ................
   ................
@@ -8350,7 +8388,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 438 (effervescent / sleeping)
+# tile 440 (effervescent / sleeping)
 {
   ................
   ................
@@ -8369,7 +8407,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 439 (black / full healing)
+# tile 441 (black / full healing)
 {
   ................
   ................
@@ -8388,7 +8426,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 440 (golden / polymorph)
+# tile 442 (golden / polymorph)
 {
   ................
   ................
@@ -8407,7 +8445,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 441 (brown / booze)
+# tile 443 (brown / booze)
 {
   ................
   ................
@@ -8426,7 +8464,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 442 (fizzy / sickness)
+# tile 444 (fizzy / sickness)
 {
   ................
   ................
@@ -8445,7 +8483,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 443 (dark / fruit juice)
+# tile 445 (dark / fruit juice)
 {
   ................
   ................
@@ -8464,7 +8502,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 444 (white / acid)
+# tile 446 (white / acid)
 {
   ................
   ................
@@ -8483,7 +8521,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 445 (murky / oil)
+# tile 447 (murky / oil)
 {
   ................
   ................
@@ -8502,7 +8540,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 446 (clear / water)
+# tile 448 (clear / water)
 {
   ................
   ................
@@ -8521,7 +8559,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 447 (sparkling / amnesia)
+# tile 449 (sparkling / amnesia)
 {
   ................
   ................
@@ -8540,7 +8578,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 448 (blood-red / blood)
+# tile 450 (blood-red / blood)
 {
   MMMMMMMMMMMMMMMM
   MMMMMMMMMMMMMMMM
@@ -8559,7 +8597,7 @@ Z = (195, 195, 195)
   MMMMMMMMMMMMMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 449 (blood-red / vampire blood)
+# tile 451 (blood-red / vampire blood)
 {
   MMMMMMMMMMMMMMMM
   MMMMMMMMMMMMMMMM
@@ -8578,7 +8616,7 @@ Z = (195, 195, 195)
   MMMMMMMMMMMMMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 450 (ZELGO MER / enchant armor)
+# tile 452 (ZELGO MER / enchant armor)
 {
   ................
   ................
@@ -8597,7 +8635,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 451 (JUYED AWK YACC / destroy armor)
+# tile 453 (JUYED AWK YACC / destroy armor)
 {
   ................
   ................
@@ -8616,7 +8654,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 452 (NR 9 / confuse monster)
+# tile 454 (NR 9 / confuse monster)
 {
   ................
   ................
@@ -8635,7 +8673,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 453 (XIXAXA XOXAXA XUXAXA / scare monster)
+# tile 455 (XIXAXA XOXAXA XUXAXA / scare monster)
 {
   ................
   ................
@@ -8654,7 +8692,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 454 (PRATYAVAYAH / remove curse)
+# tile 456 (PRATYAVAYAH / remove curse)
 {
   ................
   ................
@@ -8673,7 +8711,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 455 (DAIYEN FOOELS / enchant weapon)
+# tile 457 (DAIYEN FOOELS / enchant weapon)
 {
   ................
   ................
@@ -8692,7 +8730,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 456 (LEP GEX VEN ZEA / create monster)
+# tile 458 (LEP GEX VEN ZEA / create monster)
 {
   ................
   ................
@@ -8711,7 +8749,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 457 (PRIRUTSENIE / taming)
+# tile 459 (PRIRUTSENIE / taming)
 {
   ................
   ................
@@ -8730,7 +8768,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 458 (ELBIB YLOH / genocide)
+# tile 460 (ELBIB YLOH / genocide)
 {
   ................
   ................
@@ -8749,7 +8787,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 459 (4OFAE OF9 SCC9 / elementalism)
+# tile 461 (4OFAE OF9 SCC9 / elementalism)
 {
   ................
   ................
@@ -8768,7 +8806,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 460 (VERR YED HORRE / light)
+# tile 462 (VERR YED HORRE / light)
 {
   ................
   ................
@@ -8787,7 +8825,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 461 (TEMP USF UGIT / time)
+# tile 463 (TEMP USF UGIT / time)
 {
   ................
   ................
@@ -8806,7 +8844,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 462 (VENZAR BORGAVVE / teleportation)
+# tile 464 (VENZAR BORGAVVE / teleportation)
 {
   ................
   ................
@@ -8825,7 +8863,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 463 (THARR / gold detection)
+# tile 465 (THARR / gold detection)
 {
   ................
   ................
@@ -8844,7 +8882,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 464 (YUM YUM / food detection)
+# tile 466 (YUM YUM / food detection)
 {
   ................
   ................
@@ -8863,7 +8901,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 465 (POTESTAS / knowledge)
+# tile 467 (POTESTAS / knowledge)
 {
   ................
   ................
@@ -8882,7 +8920,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 466 (KERNOD WEL / identify)
+# tile 468 (KERNOD WEL / identify)
 {
   ................
   ................
@@ -8901,7 +8939,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 467 (TRATS ARL / air)
+# tile 469 (TRATS ARL / air)
 {
   ................
   ................
@@ -8920,7 +8958,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 468 (TLON UQBAR / transmogrify)
+# tile 470 (TLON UQBAR / transmogrify)
 {
   ................
   ................
@@ -8939,7 +8977,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 469 (ELAM EBOW / magic mapping)
+# tile 471 (ELAM EBOW / magic mapping)
 {
   ................
   ................
@@ -8958,7 +8996,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 470 (DUAM XNAHT / amnesia)
+# tile 472 (DUAM XNAHT / amnesia)
 {
   ................
   ................
@@ -8977,7 +9015,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 471 (AQUE BRAGH / flood)
+# tile 473 (AQUE BRAGH / flood)
 {
   ................
   ................
@@ -8996,7 +9034,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 472 (ANDOVA BEGARIN / fire)
+# tile 474 (ANDOVA BEGARIN / fire)
 {
   ................
   ................
@@ -9015,7 +9053,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 473 (KIRJE / earth)
+# tile 475 (KIRJE / earth)
 {
   ................
   ................
@@ -9034,7 +9072,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 474 (VE FORBRYDERNE / punishment)
+# tile 476 (VE FORBRYDERNE / punishment)
 {
   ................
   ................
@@ -9053,7 +9091,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 475 (HACKEM MUCHE / charging)
+# tile 477 (HACKEM MUCHE / charging)
 {
   ................
   ................
@@ -9072,7 +9110,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 476 (TOYL ENT RUBLE / cloning)
+# tile 478 (TOYL ENT RUBLE / cloning)
 {
   ................
   ................
@@ -9091,7 +9129,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 477 (VELOX NEB / stinking cloud)
+# tile 479 (VELOX NEB / stinking cloud)
 {
   ................
   ................
@@ -9110,7 +9148,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 478 (HZLRC KSTSBD MPFNG / acquirement)
+# tile 480 (HZLRC KSTSBD MPFNG / acquirement)
 {
   ................
   ................
@@ -9129,7 +9167,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 479 (OOBID IBBOB / ice)
+# tile 481 (OOBID IBBOB / ice)
 {
   ................
   ................
@@ -9148,7 +9186,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 480 (FOOBIE BLETCH / magic detection)
+# tile 482 (FOOBIE BLETCH / magic detection)
 {
   ................
   ................
@@ -9167,7 +9205,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 481 (TEMOV)
+# tile 483 (TEMOV)
 {
   ................
   ................
@@ -9186,7 +9224,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 482 (GARVEN DEH)
+# tile 484 (GARVEN DEH)
 {
   ................
   ................
@@ -9205,7 +9243,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 483 (READ ME)
+# tile 485 (READ ME)
 {
   ................
   ................
@@ -9224,7 +9262,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 484 (ETAOIN SHRDLU)
+# tile 486 (ETAOIN SHRDLU)
 {
   ................
   ................
@@ -9243,7 +9281,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 485 (LOREM IPSUM)
+# tile 487 (LOREM IPSUM)
 {
   ................
   ................
@@ -9262,7 +9300,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 486 (FNORD)
+# tile 488 (FNORD)
 {
   ................
   ................
@@ -9281,7 +9319,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 487 (KO BATE)
+# tile 489 (KO BATE)
 {
   ................
   ................
@@ -9300,7 +9338,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 488 (ABRA KA DABRA)
+# tile 490 (ABRA KA DABRA)
 {
   ................
   ................
@@ -9319,7 +9357,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 489 (ASHPD SODALG)
+# tile 491 (ASHPD SODALG)
 {
   ................
   ................
@@ -9338,7 +9376,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 490 (ZLORFIK)
+# tile 492 (ZLORFIK)
 {
   ................
   ................
@@ -9357,7 +9395,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 491 (GNIK SISI VLE)
+# tile 493 (GNIK SISI VLE)
 {
   ................
   ................
@@ -9376,7 +9414,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 492 (HAPAX LEGOMENON)
+# tile 494 (HAPAX LEGOMENON)
 {
   ................
   ................
@@ -9395,7 +9433,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 493 (EIRIS SAZUN IDISI)
+# tile 495 (EIRIS SAZUN IDISI)
 {
   ................
   ................
@@ -9414,7 +9452,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 494 (PHOL ENDE WODAN)
+# tile 496 (PHOL ENDE WODAN)
 {
   ................
   ................
@@ -9433,7 +9471,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 495 (GHOTI)
+# tile 497 (GHOTI)
 {
   ................
   ................
@@ -9452,7 +9490,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 496 (MAPIRO MAHAMA DIROMAT)
+# tile 498 (MAPIRO MAHAMA DIROMAT)
 {
   ................
   ................
@@ -9471,7 +9509,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 497 (VAS CORP BET MANI)
+# tile 499 (VAS CORP BET MANI)
 {
   ................
   ................
@@ -9490,7 +9528,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 498 (XOR OTA)
+# tile 500 (XOR OTA)
 {
   ................
   ................
@@ -9509,7 +9547,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 499 (STRC PRST SKRZ KRK)
+# tile 501 (STRC PRST SKRZ KRK)
 {
   ................
   ................
@@ -9528,7 +9566,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 500 (NYEHEHE)
+# tile 502 (NYEHEHE)
 {
   ................
   ................
@@ -9547,7 +9585,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 501 (ELPHE MONATER)
+# tile 503 (ELPHE MONATER)
 {
   ................
   ................
@@ -9566,7 +9604,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 502 (ABAJ)
+# tile 504 (ABAJ)
 {
   ................
   ................
@@ -9585,7 +9623,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 503 (CONG LAT URAT ION)
+# tile 505 (CONG LAT URAT ION)
 {
   ................
   ................
@@ -9604,7 +9642,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 504 (DESUM TETRAL)
+# tile 506 (DESUM TETRAL)
 {
   ................
   ................
@@ -9623,7 +9661,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 505 (NHINRL)
+# tile 507 (NHINRL)
 {
   ................
   ................
@@ -9642,7 +9680,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 506 (ISAY INAY)
+# tile 508 (ISAY INAY)
 {
   ................
   ................
@@ -9661,7 +9699,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 507 (PEBCAK RTFM)
+# tile 509 (PEBCAK RTFM)
 {
   ................
   ................
@@ -9680,7 +9718,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 508 (KA TET)
+# tile 510 (KA TET)
 {
   ................
   ................
@@ -9699,7 +9737,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 509 (stamped / mail)
+# tile 511 (stamped / mail)
 {
   ................
   ................
@@ -9718,7 +9756,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 510 (unlabeled / blank paper)
+# tile 512 (unlabeled / blank paper)
 {
   ................
   ................
@@ -9737,7 +9775,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 511 (parchment / dig)
+# tile 513 (parchment / dig)
 {
   ................
   ................
@@ -9756,7 +9794,7 @@ Z = (195, 195, 195)
   .......DDDAA....
   ................
 }
-# tile 512 (vellum / magic missile)
+# tile 514 (vellum / magic missile)
 {
   ................
   ................
@@ -9775,7 +9813,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 513 (ragged / fireball)
+# tile 515 (ragged / fireball)
 {
   ................
   ................
@@ -9794,7 +9832,7 @@ Z = (195, 195, 195)
   ......OOJJAA....
   ................
 }
-# tile 514 (dog eared / cone of cold)
+# tile 516 (dog eared / cone of cold)
 {
   ................
   ................
@@ -9813,7 +9851,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 515 (mottled / sleep)
+# tile 517 (mottled / sleep)
 {
   ................
   ................
@@ -9832,7 +9870,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 516 (stained / finger of death)
+# tile 518 (stained / finger of death)
 {
   ................
   ................
@@ -9851,7 +9889,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 517 (electric blue / lightning)
+# tile 519 (electric blue / lightning)
 {
   ................
   ................
@@ -9870,7 +9908,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 518 (olive green / poison blast)
+# tile 520 (olive green / poison blast)
 {
   ................
   ................
@@ -9889,7 +9927,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 519 (acid green / acid blast)
+# tile 521 (acid green / acid blast)
 {
   ................
   ................
@@ -9908,7 +9946,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 520 (ghostly / sonic boom)
+# tile 522 (ghostly / sonic boom)
 {
   ................
   ................
@@ -9927,7 +9965,7 @@ Z = (195, 195, 195)
   .......UUUAA....
   ................
 }
-# tile 521 (worn / psionic wave)
+# tile 523 (worn / psionic wave)
 {
   ................
   ................
@@ -9946,7 +9984,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 522 (red / force bolt)
+# tile 524 (red / force bolt)
 {
   ................
   ................
@@ -9965,7 +10003,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 523 (velvet / drain life)
+# tile 525 (velvet / drain life)
 {
   ................
   ................
@@ -9984,7 +10022,7 @@ Z = (195, 195, 195)
   .......EEEAA....
   ................
 }
-# tile 524 (black / summon undead)
+# tile 526 (black / summon undead)
 {
   ................
   ................
@@ -10003,7 +10041,7 @@ Z = (195, 195, 195)
   .......AAA......
   ................
 }
-# tile 525 (dark / command undead)
+# tile 527 (dark / command undead)
 {
   ................
   ................
@@ -10022,7 +10060,7 @@ Z = (195, 195, 195)
   ....AAABBBA.....
   .......AAA......
 }
-# tile 526 (pink / knock)
+# tile 528 (pink / knock)
 {
   ................
   ................
@@ -10041,7 +10079,7 @@ Z = (195, 195, 195)
   .......IIIAA....
   ................
 }
-# tile 527 (dark green / wizard lock)
+# tile 529 (dark green / wizard lock)
 {
   ................
   ................
@@ -10060,7 +10098,7 @@ Z = (195, 195, 195)
   .......FFFAA....
   ................
 }
-# tile 528 (silver / polymorph)
+# tile 530 (silver / polymorph)
 {
   ................
   ................
@@ -10079,7 +10117,7 @@ Z = (195, 195, 195)
   .......PPPAA....
   ................
 }
-# tile 529 (platinum / repair armor)
+# tile 531 (platinum / repair armor)
 {
   ................
   ................
@@ -10098,7 +10136,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 530 (decrepit / reflection)
+# tile 532 (decrepit / reflection)
 {
   ................
   ................
@@ -10117,7 +10155,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 531 (canvas / flame sphere)
+# tile 533 (canvas / flame sphere)
 {
   ................
   ................
@@ -10136,7 +10174,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 532 (hardcover / freeze sphere)
+# tile 534 (hardcover / freeze sphere)
 {
   ................
   ................
@@ -10155,7 +10193,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 533 (shining / cancellation)
+# tile 535 (shining / cancellation)
 {
   ....N...........
   .......N........
@@ -10174,7 +10212,7 @@ Z = (195, 195, 195)
   .......PPPAA....
   ................
 }
-# tile 534 (feathered / fire bolt)
+# tile 536 (feathered / fire bolt)
 {
   ................
   ................
@@ -10193,7 +10231,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 535 (light green / slow monster)
+# tile 537 (light green / slow monster)
 {
   ................
   ................
@@ -10212,7 +10250,7 @@ Z = (195, 195, 195)
   .......GGGAA....
   ................
 }
-# tile 536 (light blue / cause fear)
+# tile 538 (light blue / cause fear)
 {
   ................
   ................
@@ -10231,7 +10269,7 @@ Z = (195, 195, 195)
   .......BBBAA....
   ................
 }
-# tile 537 (magenta / charm monster)
+# tile 539 (magenta / charm monster)
 {
   ................
   ................
@@ -10250,7 +10288,7 @@ Z = (195, 195, 195)
   .......IIIAA....
   ................
 }
-# tile 538 (orange / confuse monster)
+# tile 540 (orange / confuse monster)
 {
   ................
   ................
@@ -10269,7 +10307,7 @@ Z = (195, 195, 195)
   .......CCCAA....
   ................
 }
-# tile 539 (purple / haste self)
+# tile 541 (purple / haste self)
 {
   ................
   ................
@@ -10288,7 +10326,7 @@ Z = (195, 195, 195)
   .......IIIAA....
   ................
 }
-# tile 540 (tan / levitation)
+# tile 542 (tan / levitation)
 {
   ................
   ................
@@ -10307,7 +10345,7 @@ Z = (195, 195, 195)
   .......KKKAA....
   ................
 }
-# tile 541 (gold / teleport away)
+# tile 543 (gold / teleport away)
 {
   ................
   ................
@@ -10326,7 +10364,7 @@ Z = (195, 195, 195)
   .......HHHAA....
   ................
 }
-# tile 542 (ochre / passwall)
+# tile 544 (ochre / passwall)
 {
   ................
   ................
@@ -10345,7 +10383,7 @@ Z = (195, 195, 195)
   .......DDDAA....
   ................
 }
-# tile 543 (dark brown / invisibility)
+# tile 545 (dark brown / invisibility)
 {
   ................
   ................
@@ -10364,7 +10402,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 544 (thin / jumping)
+# tile 546 (thin / jumping)
 {
   ................
   ................
@@ -10383,7 +10421,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 545 (cloth / light)
+# tile 547 (cloth / light)
 {
   ................
   ................
@@ -10402,7 +10440,7 @@ Z = (195, 195, 195)
   .......PPPAA....
   ................
 }
-# tile 546 (leathery / detect monsters)
+# tile 548 (leathery / detect monsters)
 {
   ................
   ................
@@ -10421,7 +10459,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 547 (cyan / detect food)
+# tile 549 (cyan / detect food)
 {
   ................
   ................
@@ -10440,7 +10478,7 @@ Z = (195, 195, 195)
   .......BBBAA....
   ................
 }
-# tile 548 (violet / detect unseen)
+# tile 550 (violet / detect unseen)
 {
   ................
   ................
@@ -10459,7 +10497,7 @@ Z = (195, 195, 195)
   .......IIIAA....
   ................
 }
-# tile 549 (gray / detect treasure)
+# tile 551 (gray / detect treasure)
 {
   ................
   ................
@@ -10478,7 +10516,7 @@ Z = (195, 195, 195)
   .......PPPAA....
   ................
 }
-# tile 550 (dark blue / clairvoyance)
+# tile 552 (dark blue / clairvoyance)
 {
   ................
   ................
@@ -10497,7 +10535,7 @@ Z = (195, 195, 195)
   .......EEEAA....
   ................
 }
-# tile 551 (faded / enlighten)
+# tile 553 (faded / enlighten)
 {
   ................
   ................
@@ -10516,7 +10554,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 552 (bronze / identify)
+# tile 554 (bronze / identify)
 {
   ................
   ................
@@ -10535,7 +10573,7 @@ Z = (195, 195, 195)
   .......CCCAA....
   ................
 }
-# tile 553 (dusty / magic mapping)
+# tile 555 (dusty / magic mapping)
 {
   ................
   ................
@@ -10554,7 +10592,7 @@ Z = (195, 195, 195)
   .KAKA..JJJAA....
   ................
 }
-# tile 554 (white / healing)
+# tile 556 (white / healing)
 {
   ................
   ................
@@ -10573,7 +10611,7 @@ Z = (195, 195, 195)
   .......PNNAA....
   ................
 }
-# tile 555 (yellow / cure blindness)
+# tile 557 (yellow / cure blindness)
 {
   ................
   ................
@@ -10592,7 +10630,7 @@ Z = (195, 195, 195)
   .......HHHAA....
   ................
 }
-# tile 556 (plaid / extra healing)
+# tile 558 (plaid / extra healing)
 {
   ................
   ................
@@ -10611,7 +10649,7 @@ Z = (195, 195, 195)
   .......EFDAA....
   ................
 }
-# tile 557 (light brown / restore ability)
+# tile 559 (light brown / restore ability)
 {
   ................
   ................
@@ -10630,7 +10668,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 558 (thick / stone to flesh)
+# tile 560 (thick / stone to flesh)
 {
   ................
   ................
@@ -10649,7 +10687,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 559 (indigo / cure sickness)
+# tile 561 (indigo / cure sickness)
 {
   ................
   ................
@@ -10668,7 +10706,7 @@ Z = (195, 195, 195)
   .......EEEAA....
   ................
 }
-# tile 560 (turquoise / create monster)
+# tile 562 (turquoise / create monster)
 {
   ................
   ................
@@ -10687,7 +10725,7 @@ Z = (195, 195, 195)
   .......FBBAA....
   ................
 }
-# tile 561 (wrinkled / remove curse)
+# tile 563 (wrinkled / remove curse)
 {
   ................
   ................
@@ -10706,7 +10744,7 @@ Z = (195, 195, 195)
   ......JJKKAA....
   ................
 }
-# tile 562 (copper / turn undead)
+# tile 564 (copper / turn undead)
 {
   ................
   ................
@@ -10725,7 +10763,7 @@ Z = (195, 195, 195)
   .......JCJAA....
   ................
 }
-# tile 563 (glittering / create familiar)
+# tile 565 (glittering / create familiar)
 {
   ................
   ................
@@ -10744,7 +10782,7 @@ Z = (195, 195, 195)
   .......PPPAN....
   .......N........
 }
-# tile 564 (dull / protection)
+# tile 566 (dull / protection)
 {
   ................
   ................
@@ -10763,7 +10801,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 565 (deep)
+# tile 567 (deep)
 {
   ................
   ................
@@ -10782,7 +10820,7 @@ Z = (195, 195, 195)
   .......IIIAA....
   ................
 }
-# tile 566 (big)
+# tile 568 (big)
 {
   ................
   .....KD.........
@@ -10801,7 +10839,7 @@ Z = (195, 195, 195)
   .......DDDAA....
   ................
 }
-# tile 567 (fuzzy)
+# tile 569 (fuzzy)
 {
   ................
   ................
@@ -10820,7 +10858,7 @@ Z = (195, 195, 195)
   ..A.AAAFFFA.....
   ....A..AAA......
 }
-# tile 568 (spotted)
+# tile 570 (spotted)
 {
   ................
   ................
@@ -10839,7 +10877,7 @@ Z = (195, 195, 195)
   .......EEEAA....
   ................
 }
-# tile 569 (colorful)
+# tile 571 (colorful)
 {
   ................
   ................
@@ -10858,7 +10896,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 570 (long)
+# tile 572 (long)
 {
   ................
   ................
@@ -10877,7 +10915,7 @@ Z = (195, 195, 195)
   .......EEEAA....
   ................
 }
-# tile 571 (rainbow)
+# tile 573 (rainbow)
 {
   ................
   ................
@@ -10896,7 +10934,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 572 (tattered)
+# tile 574 (tattered)
 {
   ................
   ................
@@ -10915,7 +10953,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 573 (wide)
+# tile 575 (wide)
 {
   ................
   ................
@@ -10934,7 +10972,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 574 (left-handed)
+# tile 576 (left-handed)
 {
   ................
   ................
@@ -10953,7 +10991,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 575 (psychedelic)
+# tile 577 (psychedelic)
 {
   ................
   ................
@@ -10972,7 +11010,7 @@ Z = (195, 195, 195)
   .......PPPAA....
   ................
 }
-# tile 576 (spiral-bound)
+# tile 578 (spiral-bound)
 {
   ................
   ................
@@ -10991,7 +11029,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 577 (stapled)
+# tile 579 (stapled)
 {
   ................
   ................
@@ -11010,7 +11048,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 578 (stylish)
+# tile 580 (stylish)
 {
   ................
   ................
@@ -11029,7 +11067,7 @@ Z = (195, 195, 195)
   .......DCDAA....
   ................
 }
-# tile 579 (tartan)
+# tile 581 (tartan)
 {
   ................
   .....PPPPA......
@@ -11048,7 +11086,7 @@ Z = (195, 195, 195)
   .......PPPAA....
   ................
 }
-# tile 580 (chartreuse)
+# tile 582 (chartreuse)
 {
   ................
   ................
@@ -11067,7 +11105,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 581 (crimson)
+# tile 583 (crimson)
 {
   ................
   ................
@@ -11086,7 +11124,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 582 (charcoal)
+# tile 584 (charcoal)
 {
   ................
   ................
@@ -11105,7 +11143,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 583 (plain / blank paper)
+# tile 585 (plain / blank paper)
 {
   ................
   ................
@@ -11124,7 +11162,7 @@ Z = (195, 195, 195)
   .......JJJAA....
   ................
 }
-# tile 584 (paperback / novel)
+# tile 586 (paperback / novel)
 {
   ................
   ................
@@ -11143,7 +11181,7 @@ Z = (195, 195, 195)
   .......EEEAA....
   ................
 }
-# tile 585 (papyrus / Book of the Dead)
+# tile 587 (papyrus / Book of the Dead)
 {
   ................
   ................
@@ -11162,7 +11200,7 @@ Z = (195, 195, 195)
   .......AAA......
   ................
 }
-# tile 586 (glass / light)
+# tile 588 (glass / light)
 {
   ................
   ................
@@ -11181,7 +11219,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 587 (balsa / detection)
+# tile 589 (balsa / detection)
 {
   ................
   ................
@@ -11200,7 +11238,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 588 (crystal / enlightenment)
+# tile 590 (crystal / enlightenment)
 {
   ................
   ................
@@ -11219,7 +11257,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 589 (bamboo / healing)
+# tile 591 (bamboo / healing)
 {
   ................
   .........F......
@@ -11238,7 +11276,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 590 (maple / create monster)
+# tile 592 (maple / create monster)
 {
   ................
   ................
@@ -11257,7 +11295,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 591 (crusty / fear)
+# tile 593 (crusty / fear)
 {
   ................
   ................
@@ -11276,7 +11314,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 592 (pine / wishing)
+# tile 594 (pine / wishing)
 {
   ................
   ................
@@ -11295,7 +11333,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 593 (oak / nothing)
+# tile 595 (oak / nothing)
 {
   ................
   ................
@@ -11314,7 +11352,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 594 (plastic / wonder)
+# tile 596 (plastic / wonder)
 {
   ................
   ................
@@ -11333,7 +11371,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 595 (green / wind)
+# tile 597 (green / wind)
 {
   ................
   ................
@@ -11352,7 +11390,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 596 (ebony / striking)
+# tile 598 (ebony / striking)
 {
   ................
   ................
@@ -11371,7 +11409,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 597 (marble / make invisible)
+# tile 599 (marble / make invisible)
 {
   ................
   ................
@@ -11390,7 +11428,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 598 (tin / slow monster)
+# tile 600 (tin / slow monster)
 {
   ................
   ................
@@ -11409,7 +11447,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 599 (brass / speed monster)
+# tile 601 (brass / speed monster)
 {
   ................
   ................
@@ -11428,7 +11466,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 600 (copper / undead turning)
+# tile 602 (copper / undead turning)
 {
   ................
   ................
@@ -11447,7 +11485,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 601 (ceramic / draining)
+# tile 603 (ceramic / draining)
 {
   ................
   ................
@@ -11466,7 +11504,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 602 (silver / polymorph)
+# tile 604 (silver / polymorph)
 {
   ................
   ................
@@ -11485,7 +11523,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 603 (platinum / cancellation)
+# tile 605 (platinum / cancellation)
 {
   ................
   ................
@@ -11504,7 +11542,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 604 (iridium / teleportation)
+# tile 606 (iridium / teleportation)
 {
   ................
   ................
@@ -11523,7 +11561,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 605 (black / create horde)
+# tile 607 (black / create horde)
 {
   ................
   ................
@@ -11542,7 +11580,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 606 (bronze / extra healing)
+# tile 608 (bronze / extra healing)
 {
   ................
   ................
@@ -11561,7 +11599,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 607 (zinc / opening)
+# tile 609 (zinc / opening)
 {
   ................
   ................
@@ -11580,7 +11618,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 608 (aluminum / locking)
+# tile 610 (aluminum / locking)
 {
   ................
   ................
@@ -11599,7 +11637,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 609 (uranium / probing)
+# tile 611 (uranium / probing)
 {
   ................
   ................
@@ -11618,7 +11656,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 610 (iron / digging)
+# tile 612 (iron / digging)
 {
   ................
   ................
@@ -11637,7 +11675,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 611 (steel / magic missile)
+# tile 613 (steel / magic missile)
 {
   ................
   ................
@@ -11656,7 +11694,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 612 (hexagonal / fire)
+# tile 614 (hexagonal / fire)
 {
   ................
   ................
@@ -11675,7 +11713,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 613 (short / cold)
+# tile 615 (short / cold)
 {
   ................
   ................
@@ -11694,7 +11732,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 614 (runed / sleep)
+# tile 616 (runed / sleep)
 {
   ................
   ................
@@ -11713,7 +11751,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 615 (long / death)
+# tile 617 (long / death)
 {
   ................
   .............NO.
@@ -11732,7 +11770,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 616 (curved / lightning)
+# tile 618 (curved / lightning)
 {
   ................
   .......NO.......
@@ -11751,7 +11789,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 617 (octagonal / poison gas)
+# tile 619 (octagonal / poison gas)
 {
   ................
   ................
@@ -11770,7 +11808,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 618 (twisted / corrosion)
+# tile 620 (twisted / corrosion)
 {
   ................
   .............KK.
@@ -11789,7 +11827,7 @@ Z = (195, 195, 195)
   ..A.............
   ................
 }
-# tile 619 (titanium / noise)
+# tile 621 (titanium / noise)
 {
   ................
   ................
@@ -11808,7 +11846,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 620 (driftwood / deluge)
+# tile 622 (driftwood / deluge)
 {
   ................
   ................
@@ -11828,7 +11866,7 @@ Z = (195, 195, 195)
   ................
 }
 
-# tile 621 (spiked)
+# tile 623 (spiked)
 {
   ................
   ................
@@ -11847,7 +11885,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 622 (jeweled)
+# tile 624 (jeweled)
 {
   ................
   ................
@@ -11866,7 +11904,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 623 (forked)
+# tile 625 (forked)
 {
   ................
   ................
@@ -11885,7 +11923,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 624 (quartz)
+# tile 626 (quartz)
 {
   ................
   ................
@@ -11904,7 +11942,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 625 (walnut)
+# tile 627 (walnut)
 {
   ................
   ................
@@ -11923,7 +11961,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 626 (mahogany)
+# tile 628 (mahogany)
 {
   ................
   ................
@@ -11942,7 +11980,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 627 (cedar)
+# tile 629 (cedar)
 {
   ................
   ................
@@ -11961,7 +11999,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 628 (chrome)
+# tile 630 (chrome)
 {
   ................
   ................
@@ -11980,7 +12018,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 629 (nickel)
+# tile 631 (nickel)
 {
   ................
   ................
@@ -11999,7 +12037,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 630 (mithril)
+# tile 632 (mithril)
 {
   ................
   ................
@@ -12018,7 +12056,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 631 (grooved)
+# tile 633 (grooved)
 {
   ................
   ................
@@ -12037,7 +12075,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 632 (bent)
+# tile 634 (bent)
 {
   ................
   ................
@@ -12056,7 +12094,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 633 (bone)
+# tile 635 (bone)
 {
   ................
   ................
@@ -12075,7 +12113,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 634 (alabaster)
+# tile 636 (alabaster)
 {
   ................
   ................
@@ -12094,7 +12132,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 635 (orichalcum)
+# tile 637 (orichalcum)
 {
   ................
   ................
@@ -12113,7 +12151,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 636 (electrum)
+# tile 638 (electrum)
 {
   ................
   ................
@@ -12132,7 +12170,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 637 (holly)
+# tile 639 (holly)
 {
   ................
   ................
@@ -12151,7 +12189,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 638 (pliable)
+# tile 640 (pliable)
 {
   ................
   ................
@@ -12170,7 +12208,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 639 (dragon-bone)
+# tile 641 (dragon-bone)
 {
   .............O..
   ............NO..
@@ -12189,7 +12227,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 640 (golden)
+# tile 642 (golden)
 {
   ................
   ................
@@ -12208,7 +12246,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 641 (gilded)
+# tile 643 (gilded)
 {
   ................
   ................
@@ -12227,7 +12265,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 642 (thin)
+# tile 644 (thin)
 {
   ................
   ................
@@ -12246,7 +12284,7 @@ Z = (195, 195, 195)
   .OAA............
   .AA.............
 }
-# tile 643 (porcelain)
+# tile 645 (porcelain)
 {
   ................
   ................
@@ -12265,7 +12303,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 644 (gold piece)
+# tile 646 (gold piece)
 {
   ................
   ................
@@ -12284,7 +12322,7 @@ Z = (195, 195, 195)
   .........HA.....
   ...........HA...
 }
-# tile 645 (white / dilithium crystal)
+# tile 647 (white / dilithium crystal)
 {
   ................
   ................
@@ -12303,7 +12341,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 646 (white / diamond)
+# tile 648 (white / diamond)
 {
   ................
   ................
@@ -12322,7 +12360,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 647 (red / ruby)
+# tile 649 (red / ruby)
 {
   ................
   ................
@@ -12341,7 +12379,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 648 (orange / jacinth)
+# tile 650 (orange / jacinth)
 {
   ................
   ................
@@ -12360,7 +12398,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 649 (blue / sapphire)
+# tile 651 (blue / sapphire)
 {
   ................
   ................
@@ -12379,7 +12417,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 650 (black / black opal)
+# tile 652 (black / black opal)
 {
   ................
   ................
@@ -12398,7 +12436,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 651 (green / emerald)
+# tile 653 (green / emerald)
 {
   ................
   ................
@@ -12417,7 +12455,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 652 (green / turquoise)
+# tile 654 (green / turquoise)
 {
   ................
   ................
@@ -12436,7 +12474,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 653 (yellow / citrine)
+# tile 655 (yellow / citrine)
 {
   ................
   ................
@@ -12455,7 +12493,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 654 (green / aquamarine)
+# tile 656 (green / aquamarine)
 {
   ................
   ................
@@ -12474,7 +12512,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 655 (yellowish brown / amber)
+# tile 657 (yellowish brown / amber)
 {
   ................
   ................
@@ -12493,7 +12531,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 656 (yellowish brown / topaz)
+# tile 658 (yellowish brown / topaz)
 {
   ................
   ................
@@ -12512,7 +12550,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 657 (black / jet)
+# tile 659 (black / jet)
 {
   ................
   ................
@@ -12531,7 +12569,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 658 (white / opal)
+# tile 660 (white / opal)
 {
   ................
   ................
@@ -12550,7 +12588,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 659 (yellow / chrysoberyl)
+# tile 661 (yellow / chrysoberyl)
 {
   ................
   ................
@@ -12569,7 +12607,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 660 (red / garnet)
+# tile 662 (red / garnet)
 {
   ................
   ................
@@ -12588,7 +12626,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 661 (violet / amethyst)
+# tile 663 (violet / amethyst)
 {
   ................
   ................
@@ -12607,7 +12645,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 662 (red / jasper)
+# tile 664 (red / jasper)
 {
   ................
   ................
@@ -12626,7 +12664,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 663 (violet / fluorite)
+# tile 665 (violet / fluorite)
 {
   ................
   ................
@@ -12645,7 +12683,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 664 (black / obsidian)
+# tile 666 (black / obsidian)
 {
   ................
   ................
@@ -12664,7 +12702,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 665 (orange / agate)
+# tile 667 (orange / agate)
 {
   ................
   ................
@@ -12683,7 +12721,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 666 (green / jade)
+# tile 668 (green / jade)
 {
   ................
   ................
@@ -12702,7 +12740,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 667 (white / worthless piece of white glass)
+# tile 669 (white / worthless piece of white glass)
 {
   ................
   ................
@@ -12721,7 +12759,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 668 (blue / worthless piece of blue glass)
+# tile 670 (blue / worthless piece of blue glass)
 {
   ................
   ................
@@ -12740,7 +12778,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 669 (red / worthless piece of red glass)
+# tile 671 (red / worthless piece of red glass)
 {
   ................
   ................
@@ -12759,7 +12797,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 670 (yellowish brown / worthless piece of yellowish brown glass)
+# tile 672 (yellowish brown / worthless piece of yellowish brown glass)
 {
   ................
   ................
@@ -12778,7 +12816,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 671 (orange / worthless piece of orange glass)
+# tile 673 (orange / worthless piece of orange glass)
 {
   ................
   ................
@@ -12797,7 +12835,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 672 (yellow / worthless piece of yellow glass)
+# tile 674 (yellow / worthless piece of yellow glass)
 {
   ................
   ................
@@ -12816,7 +12854,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 673 (black / worthless piece of black glass)
+# tile 675 (black / worthless piece of black glass)
 {
   ................
   ................
@@ -12835,7 +12873,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 674 (green / worthless piece of green glass)
+# tile 676 (green / worthless piece of green glass)
 {
   ................
   ................
@@ -12854,7 +12892,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 675 (violet / worthless piece of violet glass)
+# tile 677 (violet / worthless piece of violet glass)
 {
   ................
   ................
@@ -12873,7 +12911,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 676 (gray / luckstone)
+# tile 678 (gray / luckstone)
 {
   ................
   ................
@@ -12892,7 +12930,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 677 (gray / healthstone)
+# tile 679 (gray / healthstone)
 {
   ................
   ................
@@ -12911,7 +12949,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 678 (gray / loadstone)
+# tile 680 (gray / loadstone)
 {
   ................
   ................
@@ -12930,7 +12968,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 679 (gray / touchstone)
+# tile 681 (gray / touchstone)
 {
   ................
   ................
@@ -12949,7 +12987,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 680 (gray / whetstone)
+# tile 682 (gray / whetstone)
 {
   ................
   ................
@@ -12968,7 +13006,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 681 (gray / flint)
+# tile 683 (gray / flint)
 {
   ................
   ................
@@ -12987,7 +13025,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 682 (shiny / sling bullet)
+# tile 684 (shiny / sling bullet)
 {
   ................
   ................
@@ -13006,7 +13044,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 683 (rock)
+# tile 685 (rock)
 {
   ................
   ................
@@ -13025,7 +13063,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 684 (boulder)
+# tile 686 (boulder)
 {
   ................
   ................
@@ -13044,7 +13082,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 685 (statue)
+# tile 687 (statue)
 {
   ................
   ........JJ......
@@ -13063,7 +13101,7 @@ Z = (195, 195, 195)
   .....JJJJJJAA...
   ................
 }
-# tile 686 (heavy iron ball)
+# tile 688 (heavy iron ball)
 {
   ................
   ................
@@ -13082,7 +13120,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 687 (iron chain)
+# tile 689 (iron chain)
 {
   ................
   ................
@@ -13101,7 +13139,7 @@ Z = (195, 195, 195)
   ...........PP.PA
   ............AA..
 }
-# tile 688 (splash of venom / blinding venom)
+# tile 690 (splash of venom / blinding venom)
 {
   ................
   ................
@@ -13120,7 +13158,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 689 (splash of venom / acid venom)
+# tile 691 (splash of venom / acid venom)
 {
   ................
   ................
@@ -13139,7 +13177,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 690 (snowball)
+# tile 692 (snowball)
 {
   ................
   ................
@@ -13158,7 +13196,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 691 (spike)
+# tile 693 (spike)
 {
   ................
   ................
@@ -13177,7 +13215,7 @@ Z = (195, 195, 195)
   .......N........
   ................
 }
-# tile 692 (spirit)
+# tile 694 (spirit)
 {
   ABCDEFGHIJKLMNOP
   BAAAAAAAAAAAAAAO
diff --git a/win/share/other.txt b/win/share/other.txt
index cea2f06f2..57659030f 100644
--- a/win/share/other.txt
+++ b/win/share/other.txt
@@ -673,7 +673,26 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 34 (fountain)
+# tile 34 (magic chest)
+{
+  ................
+  ................
+  ................
+  ................
+  ....NNNNNNNNNNN.
+  ...NPIIIIIIIINP.
+  ..NPPIIIIIIINPP.
+  .NPPPIIIIIINPPP.
+  NNNNNNNNNNNPPPP.
+  NIIIIIIIIIIPPPPA
+  NNNNIIIIIIIPPPPA
+  NIIIIIIIIIIPPPPA
+  NNIIIIIIIIIPPPAA
+  NIIIIIIIIIIPPAA.
+  NIIIIIIIIIIPAA..
+  .AAAAAAAAAAAA...
+}
+# tile 35 (fountain)
 {
   ....E....E......
   ..EEEE..EEE.....
@@ -692,7 +711,7 @@ Z = (195, 195, 195)
   ....AAAAAAAAA...
   ................
 }
-# tile 35 (vent)
+# tile 36 (vent)
 {
   ................
   ................
@@ -711,7 +730,7 @@ Z = (195, 195, 195)
   ................
   .....NNNNNNNNNNN
 }
-# tile 36 (pool)
+# tile 37 (pool)
 {
   ..........NNN...
   .EEEE....NE.EN..
@@ -730,7 +749,7 @@ Z = (195, 195, 195)
   .E..EE...E..EEE.
   EE....EEE.....EE
 }
-# tile 37 (ice)
+# tile 38 (ice)
 {
   NNNNNNNNNNNNNNNN
   NNNNNNNNNNNNNNNN
@@ -749,7 +768,7 @@ Z = (195, 195, 195)
   NNNNNNNNNNNNNNNN
   NNNNNNNNNNNNNNNN
 }
-# tile 38 (grass)
+# tile 39 (grass)
 {
   GFFFGFFFFFFGFFFF
   FFFFFFFFGFFFFGFF
@@ -768,7 +787,7 @@ Z = (195, 195, 195)
   FFFFFFFFFGFFFFFG
   GFFFGFFFFFFGFFFG
 }
-# tile 39 (molten lava)
+# tile 40 (molten lava)
 {
   DDDDDDCDDDDDDDDD
   DDDDDCDKDDDDDDDD
@@ -787,7 +806,7 @@ Z = (195, 195, 195)
   DDDDKKDDDDCDDDDD
   DDDDDDDDDDDKDDDD
 }
-# tile 40 (vertical open drawbridge)
+# tile 41 (vertical open drawbridge)
 {
   EKKAKKKKKKKAKKAE
   EJKKKKKKKKKKKJAA
@@ -806,7 +825,7 @@ Z = (195, 195, 195)
   EEJJJJJJJJJJJAAA
   EJKKKKKKKKKKKJAA
 }
-# tile 41 (horizontal open drawbridge)
+# tile 42 (horizontal open drawbridge)
 {
   EEEEEEEEEEEEEEEE
   JEJKJEJKJEJKJEJK
@@ -825,7 +844,7 @@ Z = (195, 195, 195)
   AAAAAAAAAAAAAAAA
   AAAEAAAEAAAEAAAE
 }
-# tile 42 (vertical closed drawbridge)
+# tile 43 (vertical closed drawbridge)
 {
   ................
   ..JKJ.JKJ.JKJ...
@@ -844,7 +863,7 @@ Z = (195, 195, 195)
   ...AAA.AAA.AAA..
   ................
 }
-# tile 43 (horizontal closed drawbridge)
+# tile 44 (horizontal closed drawbridge)
 {
   ................
   ..JJJJJJJJJJJ...
@@ -863,7 +882,7 @@ Z = (195, 195, 195)
   ...AAAAAAAAAAA..
   ................
 }
-# tile 44 (air)
+# tile 45 (air)
 {
   BBBBBBBBBBBBBBBB
   BBBBBBBBBBBBBBBB
@@ -882,7 +901,7 @@ Z = (195, 195, 195)
   BBBBBBBBBBBBBBBB
   BBBBBBBBBBBBBBBB
 }
-# tile 45 (cloud)
+# tile 46 (cloud)
 {
   BBBBBBBBBBBBBBBB
   BBBBBNNNNNNNBBBB
@@ -901,7 +920,7 @@ Z = (195, 195, 195)
   BBBBBBOOOOBBBBBB
   BBBBBBBBBBBBBBBB
 }
-# tile 46 (shallow water)
+# tile 47 (shallow water)
 {
   ..........NNN...
   .BBBB....NB.BN..
@@ -920,7 +939,7 @@ Z = (195, 195, 195)
   .B..BB...B..BBB.
   BB....BBB.....BB
 }
-# tile 47 (sewage)
+# tile 48 (sewage)
 {
   ..........NNN...
   .FFFF....NF.FN..
@@ -939,7 +958,7 @@ Z = (195, 195, 195)
   .F..FF...F..FFF.
   FF....FFF.....FF
 }
-# tile 48 (water)
+# tile 49 (water)
 {
   EEEEEEEEEEEEEEEE
   EEEEEEEEEEEEEEEE
@@ -958,7 +977,7 @@ Z = (195, 195, 195)
   EEEEEEEEEEEEEEEE
   EEEEEEEEEEEEEEEE
 }
-# tile 49 (arrow trap)
+# tile 50 (arrow trap)
 {
   ................
   .....DDDDD......
@@ -977,7 +996,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 50 (bolt trap)
+# tile 51 (bolt trap)
 {
   ................
   .....DDDDD......
@@ -996,7 +1015,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 51 (dart trap)
+# tile 52 (dart trap)
 {
   ................
   .....DDDDD......
@@ -1015,7 +1034,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 52 (falling rock trap)
+# tile 53 (falling rock trap)
 {
   ................
   .....DDDDD......
@@ -1034,7 +1053,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 53 (squeaky board)
+# tile 54 (squeaky board)
 {
   ................
   .....DDDDD......
@@ -1053,7 +1072,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 54 (bear trap)
+# tile 55 (bear trap)
 {
   ................
   .....DDDDD......
@@ -1072,7 +1091,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 55 (land mine)
+# tile 56 (land mine)
 {
   ................
   .....DDDDD......
@@ -1091,7 +1110,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 56 (rolling boulder trap)
+# tile 57 (rolling boulder trap)
 {
   ................
   .....DDDDD......
@@ -1110,7 +1129,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 57 (sleeping gas trap)
+# tile 58 (sleeping gas trap)
 {
   ................
   .....DDDDD......
@@ -1129,7 +1148,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 58 (rust trap)
+# tile 59 (rust trap)
 {
   ................
   .....DDDDD......
@@ -1148,7 +1167,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 59 (fire trap)
+# tile 60 (fire trap)
 {
   ................
   .....DDDDD......
@@ -1167,7 +1186,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 60 (pit)
+# tile 61 (pit)
 {
   AAAAAAAAAAAAAAAA
   A.AAAAAAAAAAAABA
@@ -1186,7 +1205,7 @@ Z = (195, 195, 195)
   A.PPPPPPPPPPPPPA
   AAAAAAAAAAAAAAAA
 }
-# tile 61 (spiked pit)
+# tile 62 (spiked pit)
 {
   AAAAAAAAAAAAAAAA
   A.AAAAAAAAAAAABA
@@ -1205,7 +1224,7 @@ Z = (195, 195, 195)
   A.PPPPPPPPPPPPPA
   AAAAAAAAAAAAAAAA
 }
-# tile 62 (hole)
+# tile 63 (hole)
 {
   ................
   ......AAAA......
@@ -1224,7 +1243,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 63 (trap door)
+# tile 64 (trap door)
 {
   AAAAAAAAAAAAAAAA
   A.AAAAAAAAAAAABA
@@ -1243,7 +1262,7 @@ Z = (195, 195, 195)
   A.PPPPPPPPPPPPPA
   AAAAAAAAAAAAAAAA
 }
-# tile 64 (teleportation trap)
+# tile 65 (teleportation trap)
 {
   ................
   .....DDDDD......
@@ -1262,7 +1281,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 65 (level teleporter)
+# tile 66 (level teleporter)
 {
   ................
   .....DDADD......
@@ -1281,7 +1300,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 66 (magic portal)
+# tile 67 (magic portal)
 {
   ................
   .....DDDDD......
@@ -1300,7 +1319,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 67 (web)
+# tile 68 (web)
 {
   OAOA.OA...O....O
   .O.NNNN.NOA..OOA
@@ -1319,7 +1338,7 @@ Z = (195, 195, 195)
   .OA.............
   OA..............
 }
-# tile 68 (statue trap)
+# tile 69 (statue trap)
 {
   ................
   .....DDDDD......
@@ -1338,7 +1357,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 69 (magic trap)
+# tile 70 (magic trap)
 {
   ................
   .....DDDDD......
@@ -1357,7 +1376,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 70 (anti-magic field)
+# tile 71 (anti-magic field)
 {
   ................
   ......DDDDD.....
@@ -1376,7 +1395,7 @@ Z = (195, 195, 195)
   .....AAAAA......
   ................
 }
-# tile 71 (polymorph trap)
+# tile 72 (polymorph trap)
 {
   ................
   .....DDDDD......
@@ -1395,7 +1414,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 72 (ice trap)
+# tile 73 (ice trap)
 {
  ................
   ......DDDDD.....
@@ -1414,7 +1433,7 @@ Z = (195, 195, 195)
   .....AAAAA......
   ................
 }
-# tile 73 (spear trap)
+# tile 74 (spear trap)
 {
   ................
   .....DDDDD......
@@ -1433,7 +1452,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 74 (magic beam trap)
+# tile 75 (magic beam trap)
 {
   ................
   .....DDDDD......
@@ -1452,7 +1471,7 @@ Z = (195, 195, 195)
   ......AAAAA.....
   ................
 }
-# tile 75 (vibrating square)
+# tile 76 (vibrating square)
 {
   ................
   ................
@@ -1471,7 +1490,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 76 (vertical beam)
+# tile 77 (vertical beam)
 {
   .......NN.......
   ......NN........
@@ -1490,7 +1509,7 @@ Z = (195, 195, 195)
   .........NN.....
   ........NN......
 }
-# tile 77 (horizontal beam)
+# tile 78 (horizontal beam)
 {
   ................
   ................
@@ -1509,7 +1528,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 78 (left slant beam)
+# tile 79 (left slant beam)
 {
   NNNNN...........
   ....N...........
@@ -1528,7 +1547,7 @@ Z = (195, 195, 195)
   ............N...
   ............NNNN
 }
-# tile 79 (right slant beam)
+# tile 80 (right slant beam)
 {
   ............NNNN
   ............N...
@@ -1547,7 +1566,7 @@ Z = (195, 195, 195)
   ....N...........
   NNNNN...........
 }
-# tile 80 (dig beam)
+# tile 81 (dig beam)
 {
   ....AAAA........
   ..A....AA..AA...
@@ -1566,7 +1585,7 @@ Z = (195, 195, 195)
   ....AA....AAA...
   ................
 }
-# tile 81 (flash beam)
+# tile 82 (flash beam)
 {
   ................
   .....NNNNNN.....
@@ -1585,7 +1604,7 @@ Z = (195, 195, 195)
   .....NNNNNN.....
   ................
 }
-# tile 82 (boom left)
+# tile 83 (boom left)
 {
   ................
   ................
@@ -1604,7 +1623,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 83 (boom right)
+# tile 84 (boom right)
 {
   ................
   ................
@@ -1623,7 +1642,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 84 (shield1)
+# tile 85 (shield1)
 {
   ................
   .....I....I.....
@@ -1642,7 +1661,7 @@ Z = (195, 195, 195)
   .....I....I.....
   ................
 }
-# tile 85 (shield2)
+# tile 86 (shield2)
 {
   ................
   .CCCCCCCCCCCCCCC
@@ -1661,7 +1680,7 @@ Z = (195, 195, 195)
   .CCCCCCCCCCCCCC.
   ................
 }
-# tile 86 (shield3)
+# tile 87 (shield3)
 {
   .......HH.......
   .......HH.......
@@ -1680,7 +1699,7 @@ Z = (195, 195, 195)
   .......HH.......
   .......HH.......
 }
-# tile 87 (shield4)
+# tile 88 (shield4)
 {
   ................
   ......NNNNN.....
@@ -1699,7 +1718,7 @@ Z = (195, 195, 195)
   .....NNNNN......
   ................
 }
-# tile 88 (poison cloud)
+# tile 89 (poison cloud)
 {
   BBBBBBBBBBBBBBBB
   BBBBBFFFFFFFBBBB
@@ -1718,7 +1737,7 @@ Z = (195, 195, 195)
   BBBBBBGGGGBBBBBB
   BBBBBBBBBBBBBBBB
 }
-# tile 89 (valid position)
+# tile 90 (valid position)
 {
   ................
   ................
@@ -1737,7 +1756,7 @@ Z = (195, 195, 195)
   .......FF.......
   ................
 }
-# tile 90 (swallow top left)
+# tile 91 (swallow top left)
 {
   AAAAAAADDDDDDAAA
   AAAAADDDDDDDDDDD
@@ -1756,7 +1775,7 @@ Z = (195, 195, 195)
   AAAADDDDDD......
   AAAADDDDDD......
 }
-# tile 91 (swallow top center)
+# tile 92 (swallow top center)
 {
   AAAAAAAAAAAAAAAA
   DDAAAAAAAAAAAAAA
@@ -1775,7 +1794,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 92 (swallow top right)
+# tile 93 (swallow top right)
 {
   AAAAAAAAAAAAAAAA
   AAADDDDDAAAAAAAA
@@ -1794,7 +1813,7 @@ Z = (195, 195, 195)
   ....DDDDDDDDDDDD
   ....DDDDDDDDDDDA
 }
-# tile 93 (swallow middle left)
+# tile 94 (swallow middle left)
 {
   AAAADDDDDD......
   AAAADDDDDDD.....
@@ -1813,7 +1832,7 @@ Z = (195, 195, 195)
   DDDDDDD.........
   DDCCDDD.........
 }
-# tile 94 (swallow middle right)
+# tile 95 (swallow middle right)
 {
   ....DDDDDDDDDDDA
   ....DDDDDDDDDDDA
@@ -1832,7 +1851,7 @@ Z = (195, 195, 195)
   ......DDDDDDDDAA
   .......DDDDDDDAA
 }
-# tile 95 (swallow bottom left )
+# tile 96 (swallow bottom left )
 {
   DDDCDDD.........
   DDDCDDD.........
@@ -1851,7 +1870,7 @@ Z = (195, 195, 195)
   AAAAAAAAAAAADDDD
   AAAAAAAAAAAAAADD
 }
-# tile 96 (swallow bottom center)
+# tile 97 (swallow bottom center)
 {
   ................
   ................
@@ -1870,7 +1889,7 @@ Z = (195, 195, 195)
   DDDDDDDDDDDDDDDD
   DDDDDDDDDDDDDDAA
 }
-# tile 97 (swallow bottom right)
+# tile 98 (swallow bottom right)
 {
   ......DDDDDDDDAA
   ......DDDDDDDDDA
@@ -1889,7 +1908,7 @@ Z = (195, 195, 195)
   DDAAAAAAAAAAAAAA
   AAAAAAAAAAAAAAAA
 }
-# tile 98 (explosion top left)
+# tile 99 (explosion top left)
 {
   ................
   ................
@@ -1908,7 +1927,7 @@ Z = (195, 195, 195)
   ..AAAA..AAAA....
   ..AAA..AAAAA....
 }
-# tile 99 (explosion top centre)
+# tile 100 (explosion top centre)
 {
   ................
   ................
@@ -1927,7 +1946,7 @@ Z = (195, 195, 195)
   ........A.A.APAA
   .PA...APAAAAAAAA
 }
-# tile 100 (explosion top right)
+# tile 101 (explosion top right)
 {
   ................
   ................
@@ -1946,7 +1965,7 @@ Z = (195, 195, 195)
   AA.A..A.AAAA....
   A.AA..A.AAAAA...
 }
-# tile 101 (explosion middle left)
+# tile 102 (explosion middle left)
 {
   ..AAA.A.AAA.....
   ..AAA.AAAAA.AP..
@@ -1965,7 +1984,7 @@ Z = (195, 195, 195)
   ..A.A...AAP...PA
   ....A.........PA
 }
-# tile 102 (explosion middle center)
+# tile 103 (explosion middle center)
 {
   APAAA..PPAPAAAAA
   .APA..A.AAAPAAA.
@@ -1984,7 +2003,7 @@ Z = (195, 195, 195)
   AAAAAAAAAAAAA.AA
   AAAAAAAAAAA.HH..
 }
-# tile 103 (explosion middle right)
+# tile 104 (explosion middle right)
 {
   ..AAA.A.A.AAAA..
   ..AAAAA.A.AAAA..
@@ -2003,7 +2022,7 @@ Z = (195, 195, 195)
   AAA...AAAAAAA...
   ....PPAAAAAAAA..
 }
-# tile 104 (explosion bottom left)
+# tile 105 (explosion bottom left)
 {
   ....A.......A..P
   ....A.......AA..
@@ -2022,7 +2041,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 105 (explosion bottom center)
+# tile 106 (explosion bottom center)
 {
   PPPAAAAAPAAA.A..
   AAPPAAPPPPA.A...
@@ -2041,7 +2060,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 106 (explosion bottom right)
+# tile 107 (explosion bottom right)
 {
   ....P..AAAAAAA..
   ..A..A.AA.A.AA..
@@ -2060,7 +2079,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 107 (explosion noxious 0)
+# tile 108 (explosion noxious 0)
 {
   ................
   ................
@@ -2079,7 +2098,7 @@ Z = (195, 195, 195)
   ..FFFF..FFFF....
   ..FFF..FFFFF....
 }
-# tile 108 (explosion noxious 1)
+# tile 109 (explosion noxious 1)
 {
   ................
   ................
@@ -2098,7 +2117,7 @@ Z = (195, 195, 195)
   ........F.F.FGFF
   .GH...HGHHFFFFFF
 }
-# tile 109 (explosion noxious 2)
+# tile 110 (explosion noxious 2)
 {
   ................
   ................
@@ -2117,7 +2136,7 @@ Z = (195, 195, 195)
   FF.F..F.FFFF....
   F.FF..F.FFFFF...
 }
-# tile 110 (explosion noxious 3)
+# tile 111 (explosion noxious 3)
 {
   ..FFF.F.FFF.....
   ..FFF.FFFFF.FG..
@@ -2136,7 +2155,7 @@ Z = (195, 195, 195)
   ..F.F...FHG...GH
   ....F.........GH
 }
-# tile 111 (explosion noxious 4)
+# tile 112 (explosion noxious 4)
 {
   FGHFF..GGFGHFFFF
   .HGH..F.FFHGFHF.
@@ -2155,7 +2174,7 @@ Z = (195, 195, 195)
   HHHHNHNHN.GGG.GF
   GGGGNHHHGGG.HH..
 }
-# tile 112 (explosion noxious 5)
+# tile 113 (explosion noxious 5)
 {
   ..FFF.F.F.FFFF..
   ..FFFFF.F.FFFF..
@@ -2174,7 +2193,7 @@ Z = (195, 195, 195)
   HFH...FFFFFFF...
   ....GGFFFFFFFF..
 }
-# tile 113 (explosion noxious 6)
+# tile 114 (explosion noxious 6)
 {
   ....F.......H..G
   ....F.......FH..
@@ -2193,7 +2212,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 114 (explosion noxious 7)
+# tile 115 (explosion noxious 7)
 {
   GGGHHHHHGHHH.H..
   HHGGHHGGGGH.F...
@@ -2212,7 +2231,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 115 (explosion noxious 8)
+# tile 116 (explosion noxious 8)
 {
   ....G..FFFFFFF..
   ..F..F.FF.F.FF..
@@ -2231,7 +2250,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 116 (explosion muddy 0)
+# tile 117 (explosion muddy 0)
 {
   ................
   ................
@@ -2250,7 +2269,7 @@ Z = (195, 195, 195)
   ..JJJJKKJJJJKKKK
   ..JJJKKJJJJJKKKK
 }
-# tile 117 (explosion muddy 1)
+# tile 118 (explosion muddy 1)
 {
   ................
   ................
@@ -2269,7 +2288,7 @@ Z = (195, 195, 195)
   KKKKKKKKJKJKJCJJ
   KCLKKKLCLLJJJJJJ
 }
-# tile 118 (explosion muddy 2)
+# tile 119 (explosion muddy 2)
 {
   ................
   ................
@@ -2288,7 +2307,7 @@ Z = (195, 195, 195)
   JJKJKKJKJJJJ....
   JKJJKKJKJJJJJ...
 }
-# tile 119 (explosion muddy 3)
+# tile 120 (explosion muddy 3)
 {
   ..JJJKJKJJJKKKKK
   ..JJJKJJJJJKJCKK
@@ -2307,7 +2326,7 @@ Z = (195, 195, 195)
   ..J.JKKKJLCKKKCL
   ....JKKKKKKKKKCL
 }
-# tile 120 (explosion muddy 4)
+# tile 121 (explosion muddy 4)
 {
   JCLJJKKCCJCLJJJJ
   KLCLKKJKJJLCJLJK
@@ -2326,7 +2345,7 @@ Z = (195, 195, 195)
   LLLLCLCLCKCCCKCJ
   CCCCCLLLCCCKLLKK
 }
-# tile 121 (explosion muddy 5)
+# tile 122 (explosion muddy 5)
 {
   KKJJJKJKJKJJJJ..
   KKJJJJJKJKJJJJ..
@@ -2345,7 +2364,7 @@ Z = (195, 195, 195)
   LJLKKKJJJJJJJ...
   KKKKCCJJJJJJJJ..
 }
-# tile 122 (explosion muddy 6)
+# tile 123 (explosion muddy 6)
 {
   ....JKKKKKKKLKKC
   ....JKKKKKKKJLKK
@@ -2364,7 +2383,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 123 (explosion muddy 7)
+# tile 124 (explosion muddy 7)
 {
   CCCLLLLLCLLLKLKK
   LLCCLLCCCCLKJKKK
@@ -2383,7 +2402,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 124 (explosion muddy 8)
+# tile 125 (explosion muddy 8)
 {
   KKKKCKKJJJJJJJ..
   KKJKKJKJJKJKJJ..
@@ -2402,7 +2421,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 125 (explosion wet 0)
+# tile 126 (explosion wet 0)
 {
   ................
   ................
@@ -2421,7 +2440,7 @@ Z = (195, 195, 195)
   ..EEEEPPEEEEPPPP
   ..EEEPPEEEEEPPPP
 }
-# tile 126 (explosion wet 1)
+# tile 127 (explosion wet 1)
 {
   ................
   ................
@@ -2440,7 +2459,7 @@ Z = (195, 195, 195)
   PPPPPPPPEPEPEBEE
   PBNPPPNBEEEEEEEE
 }
-# tile 127 (explosion wet 2)
+# tile 128 (explosion wet 2)
 {
   ................
   ................
@@ -2459,7 +2478,7 @@ Z = (195, 195, 195)
   EEPEPPEPEEEE....
   EPEEPPEPEEEEE...
 }
-# tile 128 (explosion wet 3)
+# tile 129 (explosion wet 3)
 {
   ..EEEPEPEEEPPPPP
   ..EEEPEEEEEPEBPP
@@ -2478,7 +2497,7 @@ Z = (195, 195, 195)
   ..E.EPPPENBPPPBE
   ....EPPPPPPPPPBE
 }
-# tile 129 (explosion wet 4)
+# tile 130 (explosion wet 4)
 {
   EBNEEPPBBEBNEEEE
   PNBNPPEPEEEBENEP
@@ -2497,7 +2516,7 @@ Z = (195, 195, 195)
   EEEEEEEEEPBBBPBE
   BBBBEEEEBBBPNNPP
 }
-# tile 130 (explosion wet 5)
+# tile 131 (explosion wet 5)
 {
   PPEEEPEPEPEEEE..
   PPEEEEEPEPEEEE..
@@ -2516,7 +2535,7 @@ Z = (195, 195, 195)
   NENPPPEEEEEEE...
   PPPPBBEEEEEEEE..
 }
-# tile 131 (explosion wet 6)
+# tile 132 (explosion wet 6)
 {
   ....EPPPPPPPNPPB
   ....EPPPPPPPENPP
@@ -2535,7 +2554,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 132 (explosion wet 7)
+# tile 133 (explosion wet 7)
 {
   BBBEEEEEBEEEPEPP
   EEBBEEBBBBEPEPPP
@@ -2554,7 +2573,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 133 (explosion wet 8)
+# tile 134 (explosion wet 8)
 {
   PPPPBPPEEEEEEE..
   PPEPPEPEEPEPEE..
@@ -2573,7 +2592,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 134 (explosion magical 0)
+# tile 135 (explosion magical 0)
 {
   ................
   ................
@@ -2592,7 +2611,7 @@ Z = (195, 195, 195)
   ..EEEEIIEEEEIIII
   ..EEEIIEEEEEIIII
 }
-# tile 135 (explosion magical 1)
+# tile 136 (explosion magical 1)
 {
   ................
   ................
@@ -2611,7 +2630,7 @@ Z = (195, 195, 195)
   IIIIIIIIEIEIELEE
   ILHIIIHLHHEEEEEE
 }
-# tile 136 (explosion magical 2)
+# tile 137 (explosion magical 2)
 {
   ................
   ................
@@ -2630,7 +2649,7 @@ Z = (195, 195, 195)
   EEIEIIEIEEEE....
   EIEEIIEIEEEEE...
 }
-# tile 137 (explosion magical 3)
+# tile 138 (explosion magical 3)
 {
   ..EEEIEIEEEIIIII
   ..EEEIEEEEEIEIII
@@ -2649,7 +2668,7 @@ Z = (195, 195, 195)
   ..E.EIIIENIIIIIN
   ....EIIIIIIIIIIN
 }
-# tile 138 (explosion magical 4)
+# tile 139 (explosion magical 4)
 {
   EINEEIIIIEINEEEE
   ININIIEIEENIENEI
@@ -2668,7 +2687,7 @@ Z = (195, 195, 195)
   NNNNNNNNNIIIIIIE
   IIIINNNNIIIINNII
 }
-# tile 139 (explosion magical 5)
+# tile 140 (explosion magical 5)
 {
   IIEEEIEIEIEEEE..
   IIEEEEEIEIEEEE..
@@ -2687,7 +2706,7 @@ Z = (195, 195, 195)
   NENIIIEEEEEEE...
   IIIIIIEEEEEEEE..
 }
-# tile 140 (explosion magical 6)
+# tile 141 (explosion magical 6)
 {
   ....EIIIIIIIHIII
   ....EIIIIIIIEHII
@@ -2706,7 +2725,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 141 (explosion magical 7)
+# tile 142 (explosion magical 7)
 {
   IIINNNNNINNNINII
   NNIINNIIIINIEIII
@@ -2725,7 +2744,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 142 (explosion magical 8)
+# tile 143 (explosion magical 8)
 {
   IIIIIIIEEEEEEE..
   IIEIIEIEEIEIEE..
@@ -2744,7 +2763,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 143 (explosion fiery 0)
+# tile 144 (explosion fiery 0)
 {
   ................
   ................
@@ -2763,7 +2782,7 @@ Z = (195, 195, 195)
   ..DDDDCCDDDDCCCC
   ..DDDCCDDDDDCCCC
 }
-# tile 144 (explosion fiery 1)
+# tile 145 (explosion fiery 1)
 {
   ................
   ................
@@ -2782,7 +2801,7 @@ Z = (195, 195, 195)
   CCCCCCCCDCDCDLDD
   CLHCCCHLHHDDDDDD
 }
-# tile 145 (explosion fiery 2)
+# tile 146 (explosion fiery 2)
 {
   ................
   ................
@@ -2801,7 +2820,7 @@ Z = (195, 195, 195)
   DDCDCCDCDDDD....
   DCDDCCDCDDDDD...
 }
-# tile 146 (explosion fiery 3)
+# tile 147 (explosion fiery 3)
 {
   ..DDDCDCDDDCCCCC
   ..DDDCDDDDDCDLCC
@@ -2820,7 +2839,7 @@ Z = (195, 195, 195)
   ..D.DCCCDHLCCCLH
   ....DCCCCCCCCCLH
 }
-# tile 147 (explosion fiery 4)
+# tile 148 (explosion fiery 4)
 {
   DLHDDCCLLDLHDDDD
   CHLHCCDCDDHLDHDC
@@ -2839,7 +2858,7 @@ Z = (195, 195, 195)
   HHHHNHNHNCLLLCLD
   LLLLNHHHLLLCHHCC
 }
-# tile 148 (explosion fiery 5)
+# tile 149 (explosion fiery 5)
 {
   CCDDDCDCDCDDDD..
   CCDDDDDCDCDDDD..
@@ -2858,7 +2877,7 @@ Z = (195, 195, 195)
   HDHCCCDDDDDDD...
   CCCCLLDDDDDDDD..
 }
-# tile 149 (explosion fiery 6)
+# tile 150 (explosion fiery 6)
 {
   ....DCCCCCCCHCCL
   ....DCCCCCCCDHCC
@@ -2877,7 +2896,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 150 (explosion fiery 7)
+# tile 151 (explosion fiery 7)
 {
   LLLHHHHHLHHHCHCC
   HHLLHHLLLLHCDCCC
@@ -2896,7 +2915,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 151 (explosion fiery 8)
+# tile 152 (explosion fiery 8)
 {
   CCCCLCCDDDDDDD..
   CCDCCDCDDCDCDD..
@@ -2915,7 +2934,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 152 (explosion frosty 0)
+# tile 153 (explosion frosty 0)
 {
   ................
   ................
@@ -2934,7 +2953,7 @@ Z = (195, 195, 195)
   ..EEEEPPNBEEPPPP
   ..EEEPPEEEEEPPPP
 }
-# tile 153 (explosion frosty 1)
+# tile 154 (explosion frosty 1)
 {
   ................
   ................
@@ -2953,7 +2972,7 @@ Z = (195, 195, 195)
   PPPPPPPPEPEPEBEE
   PBNPPPNBNNEEEEEE
 }
-# tile 154 (explosion frosty 2)
+# tile 155 (explosion frosty 2)
 {
   ................
   ................
@@ -2972,7 +2991,7 @@ Z = (195, 195, 195)
   EEPEPPEPEEEE....
   EPEEPPEPEEEEE...
 }
-# tile 155 (explosion frosty 3)
+# tile 156 (explosion frosty 3)
 {
   ..EEEPEPEEEPPPPP
   ..EEEPEEEEEPEBPP
@@ -2991,7 +3010,7 @@ Z = (195, 195, 195)
   ..E.EPPPENBPPPBN
   ....EPPPPPPPPPBN
 }
-# tile 156 (explosion frosty 4)
+# tile 157 (explosion frosty 4)
 {
   EBNEEPPBBEBNEEEE
   PNBNPPEPEENBENEP
@@ -3010,7 +3029,7 @@ Z = (195, 195, 195)
   NNNNNNNNNPBBBPBE
   BBBBNNNNBBBPNNPP
 }
-# tile 157 (explosion frosty 5)
+# tile 158 (explosion frosty 5)
 {
   PPEEEPEPEPEEEE..
   PPEEEEEPEPEEEE..
@@ -3029,7 +3048,7 @@ Z = (195, 195, 195)
   NENPPPEEEEEEE...
   PPPPBBEEEEEEEE..
 }
-# tile 158 (explosion frosty 6)
+# tile 159 (explosion frosty 6)
 {
   ....EPPPPPPPNPPB
   ....EPPPPPPPENPP
@@ -3048,7 +3067,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 159 (explosion frosty 7)
+# tile 160 (explosion frosty 7)
 {
   BBBNNNNNBNNNPNPP
   NNBBNNBBBBNPEPPP
@@ -3067,7 +3086,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 160 (explosion frosty 8)
+# tile 161 (explosion frosty 8)
 {
   PPPPBPPEEEEEEE..
   PPEPPEPEEPEPEE..
@@ -3086,7 +3105,7 @@ Z = (195, 195, 195)
   ...........N....
   ................
 }
-# tile 161 (explosion acid 0)
+# tile 162 (explosion acid 0)
 {
   ................
   ................
@@ -3105,7 +3124,7 @@ Z = (195, 195, 195)
   ..FFFF..FFFF....
   ..FFF..FFFFF....
 }
-# tile 162 (explosion acid 1)
+# tile 163 (explosion acid 1)
 {
   ................
   ................
@@ -3124,7 +3143,7 @@ Z = (195, 195, 195)
   ........F.F.FGFF
   .GH...HGHHFFFFFF
 }
-# tile 163 (explosion acid 2)
+# tile 164 (explosion acid 2)
 {
   ................
   ................
@@ -3143,7 +3162,7 @@ Z = (195, 195, 195)
   FF.F..F.FFFF....
   F.FF..F.FFFFF...
 }
-# tile 164 (explosion acid 3)
+# tile 165 (explosion acid 3)
 {
   ..FFF.F.FFF.....
   ..FFF.FFFFF.FG..
@@ -3162,7 +3181,7 @@ Z = (195, 195, 195)
   ..F.F...FHG...GH
   ....F.........GH
 }
-# tile 165 (explosion acid 4)
+# tile 166 (explosion acid 4)
 {
   FGHFF..GGFGHFFFF
   .HGH..F.FFHGFHF.
@@ -3181,7 +3200,7 @@ Z = (195, 195, 195)
   HHHHNHNHN.GGG.GF
   GGGGNHHHGGG.HH..
 }
-# tile 166 (explosion acid 5)
+# tile 167 (explosion acid 5)
 {
   ..FFF.F.F.FFFF..
   ..FFFFF.F.FFFF..
@@ -3200,7 +3219,7 @@ Z = (195, 195, 195)
   HFH...FFFFFFF...
   ....GGFFFFFFFF..
 }
-# tile 167 (explosion acid 6)
+# tile 168 (explosion acid 6)
 {
   ....F.......H..G
   ....F.......FH..
@@ -3219,7 +3238,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 168 (explosion acid 7)
+# tile 169 (explosion acid 7)
 {
   GGGHHHHHGHHH.H..
   HHGGHHGGGGH.F...
@@ -3238,7 +3257,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 169 (explosion acid 8)
+# tile 170 (explosion acid 8)
 {
   ....G..FFFFFFF..
   ..F..F.FF.F.FF..
@@ -3257,7 +3276,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 170 (zap 0 0)
+# tile 171 (zap 0 0)
 {
   .......II.......
   ......IIII......
@@ -3276,7 +3295,7 @@ Z = (195, 195, 195)
   ......IIII......
   .......II.......
 }
-# tile 171 (zap 0 1)
+# tile 172 (zap 0 1)
 {
   ................
   ................
@@ -3295,7 +3314,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 172 (zap 0 2)
+# tile 173 (zap 0 2)
 {
   III.............
   IIII............
@@ -3314,7 +3333,7 @@ Z = (195, 195, 195)
   ............IIII
   .............III
 }
-# tile 173 (zap 0 3)
+# tile 174 (zap 0 3)
 {
   .............III
   ............IIII
@@ -3333,7 +3352,7 @@ Z = (195, 195, 195)
   IIII............
   III.............
 }
-# tile 174 (zap 1 0)
+# tile 175 (zap 1 0)
 {
   .......CC.......
   ......CCCC......
@@ -3352,7 +3371,7 @@ Z = (195, 195, 195)
   ......CCCC......
   .......CC.......
 }
-# tile 175 (zap 1 1)
+# tile 176 (zap 1 1)
 {
   ................
   ................
@@ -3371,7 +3390,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 176 (zap 1 2)
+# tile 177 (zap 1 2)
 {
   CCC.............
   CCCC............
@@ -3390,7 +3409,7 @@ Z = (195, 195, 195)
   ............CCCC
   .............CCC
 }
-# tile 177 (zap 1 3)
+# tile 178 (zap 1 3)
 {
   .............CCC
   ............CCCC
@@ -3409,7 +3428,7 @@ Z = (195, 195, 195)
   CCCC............
   CCC.............
 }
-# tile 178 (zap 2 0)
+# tile 179 (zap 2 0)
 {
   .......NN.......
   ......NNNN......
@@ -3428,7 +3447,7 @@ Z = (195, 195, 195)
   ......NNNN......
   .......NN.......
 }
-# tile 179 (zap 2 1)
+# tile 180 (zap 2 1)
 {
   ................
   ................
@@ -3447,7 +3466,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 180 (zap 2 2)
+# tile 181 (zap 2 2)
 {
   NNN.............
   NNNN............
@@ -3466,7 +3485,7 @@ Z = (195, 195, 195)
   ............NNNN
   .............NNN
 }
-# tile 181 (zap 2 3)
+# tile 182 (zap 2 3)
 {
   .............NNN
   ............NNNN
@@ -3485,7 +3504,7 @@ Z = (195, 195, 195)
   NNNN............
   NNN.............
 }
-# tile 182 (zap 3 0)
+# tile 183 (zap 3 0)
 {
   .......BB.......
   ......BBBB......
@@ -3504,7 +3523,7 @@ Z = (195, 195, 195)
   ......BBBB......
   .......BB.......
 }
-# tile 183 (zap 3 1)
+# tile 184 (zap 3 1)
 {
   ................
   ................
@@ -3523,7 +3542,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 184 (zap 3 2)
+# tile 185 (zap 3 2)
 {
   BBB.............
   BBBB............
@@ -3542,7 +3561,7 @@ Z = (195, 195, 195)
   ............BBBB
   .............BBB
 }
-# tile 185 (zap 3 3)
+# tile 186 (zap 3 3)
 {
   .............BBB
   ............BBBB
@@ -3561,7 +3580,7 @@ Z = (195, 195, 195)
   BBBB............
   BBB.............
 }
-# tile 186 (zap 4 0)
+# tile 187 (zap 4 0)
 {
   .......AA.......
   ......AAAA......
@@ -3580,7 +3599,7 @@ Z = (195, 195, 195)
   ......AAAA......
   .......AA.......
 }
-# tile 187 (zap 4 1)
+# tile 188 (zap 4 1)
 {
   ................
   ................
@@ -3599,7 +3618,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 188 (zap 4 2)
+# tile 189 (zap 4 2)
 {
   AAA.............
   AAAA............
@@ -3618,7 +3637,7 @@ Z = (195, 195, 195)
   ............AAAA
   .............AAA
 }
-# tile 189 (zap 4 3)
+# tile 190 (zap 4 3)
 {
   .............AAA
   ............AAAA
@@ -3637,7 +3656,7 @@ Z = (195, 195, 195)
   AAAA............
   AAA.............
 }
-# tile 190 (zap 5 0)
+# tile 191 (zap 5 0)
 {
   .......NN.......
   ......NNNN......
@@ -3656,7 +3675,7 @@ Z = (195, 195, 195)
   ......NNNN......
   .......NN.......
 }
-# tile 191 (zap 5 1)
+# tile 192 (zap 5 1)
 {
   ................
   ................
@@ -3675,7 +3694,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 192 (zap 5 2)
+# tile 193 (zap 5 2)
 {
   NNN.............
   NNNN............
@@ -3694,7 +3713,7 @@ Z = (195, 195, 195)
   ............NNNN
   .............NNN
 }
-# tile 193 (zap 5 3)
+# tile 194 (zap 5 3)
 {
   .............NNN
   ............NNNN
@@ -3713,7 +3732,7 @@ Z = (195, 195, 195)
   NNNN............
   NNN.............
 }
-# tile 194 (zap 6 0)
+# tile 195 (zap 6 0)
 {
   .......FF.......
   ......FFFF......
@@ -3732,7 +3751,7 @@ Z = (195, 195, 195)
   ......FFFF......
   .......FF.......
 }
-# tile 195 (zap 6 1)
+# tile 196 (zap 6 1)
 {
   ................
   ................
@@ -3751,7 +3770,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 196 (zap 6 2)
+# tile 197 (zap 6 2)
 {
   FFF.............
   FFFF............
@@ -3770,7 +3789,7 @@ Z = (195, 195, 195)
   ............FFFF
   .............FFF
 }
-# tile 197 (zap 6 3)
+# tile 198 (zap 6 3)
 {
   .............FFF
   ............FFFF
@@ -3789,7 +3808,7 @@ Z = (195, 195, 195)
   FFFF............
   FFF.............
 }
-# tile 198 (zap 7 0)
+# tile 199 (zap 7 0)
 {
   .......GG.......
   ......GGGG......
@@ -3808,7 +3827,7 @@ Z = (195, 195, 195)
   ......GGGG......
   .......GG.......
 }
-# tile 199 (zap 7 1)
+# tile 200 (zap 7 1)
 {
   ................
   ................
@@ -3827,7 +3846,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 200 (zap 7 2)
+# tile 201 (zap 7 2)
 {
   GGG.............
   GGGG............
@@ -3846,7 +3865,7 @@ Z = (195, 195, 195)
   ............GGGG
   .............GGG
 }
-# tile 201 (zap 7 3)
+# tile 202 (zap 7 3)
 {
   .............GGG
   ............GGGG
@@ -3865,7 +3884,7 @@ Z = (195, 195, 195)
   GGGG............
   GGG.............
 }
-# tile 202 (zap 8 0)
+# tile 203 (zap 8 0)
 {
   .......PP.......
   ......PPPP......
@@ -3884,7 +3903,7 @@ Z = (195, 195, 195)
   ......PPPP......
   .......PP.......
 }
-# tile 203 (zap 8 1)
+# tile 204 (zap 8 1)
 {
   ................
   ................
@@ -3903,7 +3922,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 204 (zap 8 2)
+# tile 205 (zap 8 2)
 {
   PPP.............
   PPPP............
@@ -3922,7 +3941,7 @@ Z = (195, 195, 195)
   ............PPPP
   .............PPP
 }
-# tile 205 (zap 8 3)
+# tile 206 (zap 8 3)
 {
   .............PPP
   ............PPPP
@@ -3941,7 +3960,7 @@ Z = (195, 195, 195)
   PPPP............
   PPP.............
 }
-# tile 206 (zap 9 0)
+# tile 207 (zap 9 0)
 {
   .......NN.......
   ......NNNN......
@@ -3960,7 +3979,7 @@ Z = (195, 195, 195)
   ......NNNN......
   .......NN.......
 }
-# tile 207 (zap 9 1)
+# tile 208 (zap 9 1)
 {
   ................
   ................
@@ -3979,7 +3998,7 @@ Z = (195, 195, 195)
   ................
   ................
 }
-# tile 208 (zap 9 2)
+# tile 209 (zap 9 2)
 {
   NNN.............
   NNNN............
@@ -3998,7 +4017,7 @@ Z = (195, 195, 195)
   ............NNNN
   .............NNN
 }
-# tile 209 (zap 9 3)
+# tile 210 (zap 9 3)
 {
   .............NNN
   ............NNNN
@@ -4017,7 +4036,7 @@ Z = (195, 195, 195)
   NNNN............
   NNN.............
 }
-# tile 210 (warning 0)
+# tile 211 (warning 0)
 {
   ................
   ................
@@ -4036,7 +4055,7 @@ Z = (195, 195, 195)
   .......AA.......
   ................
 }
-# tile 211 (warning 1)
+# tile 212 (warning 1)
 {
   ................
   ................
@@ -4055,7 +4074,7 @@ Z = (195, 195, 195)
   .......AA.......
   ................
 }
-# tile 212 (warning 2)
+# tile 213 (warning 2)
 {
   ................
   ................
@@ -4074,7 +4093,7 @@ Z = (195, 195, 195)
   .......AA.......
   ................
 }
-# tile 213 (warning 3)
+# tile 214 (warning 3)
 {
   ................
   ................
@@ -4093,7 +4112,7 @@ Z = (195, 195, 195)
   .......AA.......
   ................
 }
-# tile 214 (warning 4)
+# tile 215 (warning 4)
 {
   ................
   ................
@@ -4112,7 +4131,7 @@ Z = (195, 195, 195)
   .......AA.......
   ................
 }
-# tile 215 (warning 5)
+# tile 216 (warning 5)
 {
   ................
   ................
@@ -4131,7 +4150,7 @@ Z = (195, 195, 195)
   .......AA.......
   ................
 }
-# tile 216 (sub mine walls 0)
+# tile 217 (sub mine walls 0)
 {
   AJJKKKACJAAJJJAA
   AJKKKACLJJAJJJJA
@@ -4150,7 +4169,7 @@ Z = (195, 195, 195)
   AAJACKCKKJJJAJAA
   AAJCKKJAAAJJJJJA
 }
-# tile 217 (sub mine walls 1)
+# tile 218 (sub mine walls 1)
 {
   AJAAAAAAJJAAAJAA
   JJJAAAJJJJJAAAAJ
@@ -4169,7 +4188,7 @@ Z = (195, 195, 195)
   JJJJJJJJJJJJJJJJ
   AAAAAAAAAAAAAAAA
 }
-# tile 218 (sub mine walls 2)
+# tile 219 (sub mine walls 2)
 {
   AAAAAAKCCKKJAAAA
   AAAAKKCLCJKJJAAA
@@ -4188,7 +4207,7 @@ Z = (195, 195, 195)
   AAJACKCKKJJJAJAA
   AAJCKKJAAAJJJJJA
 }
-# tile 219 (sub mine walls 3)
+# tile 220 (sub mine walls 3)
 {
   AAAAAAKCCKKJAAAA
   AAAAKKCLCJKJJAAA
@@ -4207,7 +4226,7 @@ Z = (195, 195, 195)
   AAJACKCKKJJJAJAA
   AAJCKKJAAAJJJJJA
 }
-# tile 220 (sub mine walls 4)
+# tile 221 (sub mine walls 4)
 {
   AKKKAAKKKKAAJJJA
   AKKAAKCCCJJJAAJA
@@ -4226,7 +4245,7 @@ Z = (195, 195, 195)
   AJJJJJJJJJJJJJJJ
   AAAAAAAAAAAAAAAA
 }
-# tile 221 (sub mine walls 5)
+# tile 222 (sub mine walls 5)
 {
   AKKAAAKKAAAAJJJA
   AKAAKKLCKAAAAAJA
@@ -4245,7 +4264,7 @@ Z = (195, 195, 195)
   JJJJJJJJJJJJJJJA
   AAAAAAAAAAAAAAAA
 }
-# tile 222 (sub mine walls 6)
+# tile 223 (sub mine walls 6)
 {
   AAAAAAKCCKKJAAAA
   AAAAKCCLCJKJJAAA
@@ -4264,7 +4283,7 @@ Z = (195, 195, 195)
   AAJACKCKKJJJAJAA
   AAJCKKJAAAJJJJJA
 }
-# tile 223 (sub mine walls 7)
+# tile 224 (sub mine walls 7)
 {
   AKKAAAKKKKAAJJJA
   AKAAKKLCCJJJAAJA
@@ -4283,7 +4302,7 @@ Z = (195, 195, 195)
   JJJJJJJJJJJJJJJJ
   AAAAAAAAAAAAAAAA
 }
-# tile 224 (sub mine walls 8)
+# tile 225 (sub mine walls 8)
 {
   AAAAAAKCCKKJAAAA
   AAAAKCCLCJKJJAAA
@@ -4302,7 +4321,7 @@ Z = (195, 195, 195)
   AAJACKCKKJJJAJAA
   AAJCKKJAAAJJJJJA
 }
-# tile 225 (sub mine walls 9)
+# tile 226 (sub mine walls 9)
 {
   AKKAACKCCKKJAJJA
   AKACKKKLLJKJJAJA
@@ -4321,7 +4340,7 @@ Z = (195, 195, 195)
   AAJACKCKKJJJAJAA
   AAJCKKJAAAJJJJJA
 }
-# tile 226 (sub mine walls 10)
+# tile 227 (sub mine walls 10)
 {
   AKKAACKCCKKJAJJA
   AKACKKCLCJKJJAJA
@@ -4340,7 +4359,7 @@ Z = (195, 195, 195)
   AAJACKCKKJJJAJAA
   AAJCKKJAAAJJJJJA
 }
-# tile 227 (sub gehennom walls 0)
+# tile 228 (sub gehennom walls 0)
 {
   ALLDAJ11111JLLDA
   ADDDAJ1J11JJDDDA
@@ -4359,7 +4378,7 @@ Z = (195, 195, 195)
   AJJJAJJ1111JJJJA
   AD11AJJ1111JD1JA
 }
-# tile 228 (sub gehennom walls 1)
+# tile 229 (sub gehennom walls 1)
 {
   AAALDDAAAAALDDAA
   DDDLDDAJDDDLDDAJ
@@ -4378,7 +4397,7 @@ Z = (195, 195, 195)
   JJJJJJJJJJJJJJJJ
   AAAAAAAAAAAAAAAA
 }
-# tile 229 (sub gehennom walls 2)
+# tile 230 (sub gehennom walls 2)
 {
   AAALLLLDDDDDDAAA
   LLLLAAJJ1111DJJJ
@@ -4397,7 +4416,7 @@ Z = (195, 195, 195)
   AJJJAJJ1111JJJJA
   AD11AJJ1111JD1JA
 }
-# tile 230 (sub gehennom walls 3)
+# tile 231 (sub gehennom walls 3)
 {
   AAALLLLDDDDDDAAA
   LLLLAAJJ1111DJJJ
@@ -4416,7 +4435,7 @@ Z = (195, 195, 195)
   AJJJAJJ1111JJJJA
   AD11AJJ1111JD1JA
 }
-# tile 231 (sub gehennom walls 4)
+# tile 232 (sub gehennom walls 4)
 {
   AAALLLLDDDDDDAAA
   LLLLAAJJ1111DJJJ
@@ -4435,7 +4454,7 @@ Z = (195, 195, 195)
   JJJJJJJJJJJJJJJJ
   AAAAAAAAAAAAAAAA
 }
-# tile 232 (sub gehennom walls 5)
+# tile 233 (sub gehennom walls 5)
 {
   AAALLLLDDDDDDAAA
   LLLLAAJJ1111DJJJ
@@ -4454,7 +4473,7 @@ Z = (195, 195, 195)
   JJJJJJJJJJJJJJJJ
   AAAAAAAAAAAAAAAA
 }
-# tile 233 (sub gehennom walls 6)
+# tile 234 (sub gehennom walls 6)
 {
   AAALLLLDDDDDDAAA
   LLLLAAJJ1111DJJJ
@@ -4473,7 +4492,7 @@ Z = (195, 195, 195)
   AJJJAJJ1111JJJJA
   AD11AJJ1111JD1JA
 }
-# tile 234 (sub gehennom walls 7)
+# tile 235 (sub gehennom walls 7)
 {
   AAALLLLDDDDDDAAA
   LLLLAAJJ1111DJJJ
@@ -4492,7 +4511,7 @@ Z = (195, 195, 195)
   JJJJJJJJJJJJJJJJ
   AAAAAAAAAAAAAAAA
 }
-# tile 235 (sub gehennom walls 8)
+# tile 236 (sub gehennom walls 8)
 {
   AAALLLLDDDDDDAAA
   LLLLAAJJ1111DJJJ
@@ -4511,7 +4530,7 @@ Z = (195, 195, 195)
   AJJJAJJ1111JJJJA
   AD11AJJ1111JD1JA
 }
-# tile 236 (sub gehennom walls 9)
+# tile 237 (sub gehennom walls 9)
 {
   AAALLLLDDDDDDAAA
   LLLLAAJJ1111DJJJ
@@ -4530,7 +4549,7 @@ Z = (195, 195, 195)
   AJJJAJJ1111JJJJA
   AD11AJJ1111JD1JA
 }
-# tile 237 (sub gehennom walls 10)
+# tile 238 (sub gehennom walls 10)
 {
   AAALLLLDDDDDDAAA
   LLLLAAJJ1111DJJJ
@@ -4549,7 +4568,7 @@ Z = (195, 195, 195)
   AJJJAJJ1111JJJJA
   AD11AJJ1111JD1JA
 }
-# tile 238 (sub knox walls 0)
+# tile 239 (sub knox walls 0)
 {
   AJJJAAACJAAAJJJA
   AJJJAACLJJAAJJJA
@@ -4568,7 +4587,7 @@ Z = (195, 195, 195)
   AAJAAACKKJAAAJAA
   ACJJAAAAAAAACJJA
 }
-# tile 239 (sub knox walls 1)
+# tile 240 (sub knox walls 1)
 {
   AJAAAJAAAJAAAJAA
   JJJAAAJAJJJAAAJA
@@ -4587,7 +4606,7 @@ Z = (195, 195, 195)
   KJJACJJAKJJACJJA
   AAAAAAAAAAAAAAAA
 }
-# tile 240 (sub knox walls 2)
+# tile 241 (sub knox walls 2)
 {
   AAAAAAKCJKAAAAAA
   AAAAKKCLKJKKAAAA
@@ -4606,7 +4625,7 @@ Z = (195, 195, 195)
   AAJAAACKKJAAAJAA
   ACJJAAAAAAAACJJA
 }
-# tile 241 (sub knox walls 3)
+# tile 242 (sub knox walls 3)
 {
   AAAAAAKCJKAAAAAA
   AAAAKKCLKJKKAAAA
@@ -4625,7 +4644,7 @@ Z = (195, 195, 195)
   AAJAAACKKJAAAJAA
   ACJJAAAAAAAACJJA
 }
-# tile 242 (sub knox walls 4)
+# tile 243 (sub knox walls 4)
 {
   AAAAAAKCJKAAAAAA
   AAAAKKCLKJKKAAAA
@@ -4644,7 +4663,7 @@ Z = (195, 195, 195)
   KJJACJJAKJJACJJA
   AAAAAAAAAAAAAAAA
 }
-# tile 243 (sub knox walls 5)
+# tile 244 (sub knox walls 5)
 {
   AAAAAAKCJKAAAAAA
   AAAAKKCLKJKKAAAA
@@ -4663,7 +4682,7 @@ Z = (195, 195, 195)
   KJJACJJAKJJACJJA
   AAAAAAAAAAAAAAAA
 }
-# tile 244 (sub knox walls 6)
+# tile 245 (sub knox walls 6)
 {
   AAAAAAKCJKAAAAAA
   AAAAKKCLKJKKAAAA
@@ -4682,7 +4701,7 @@ Z = (195, 195, 195)
   AAJAAACKKJAAAJAA
   ACJJAAAAAAAACJJA
 }
-# tile 245 (sub knox walls 7)
+# tile 246 (sub knox walls 7)
 {
   AAAAAAKCJKAAAAAA
   AAAAKKCLKJKKAAAA
@@ -4701,7 +4720,7 @@ Z = (195, 195, 195)
   KJJACJJAKJJACJJA
   AAAAAAAAAAAAAAAA
 }
-# tile 246 (sub knox walls 8)
+# tile 247 (sub knox walls 8)
 {
   AAAAAAKCJKAAAAAA
   AAAAKKCLKJKKAAAA
@@ -4720,7 +4739,7 @@ Z = (195, 195, 195)
   AAJAAACKKJAAAJAA
   ACJJAAAAAAAACJJA
 }
-# tile 247 (sub knox walls 9)
+# tile 248 (sub knox walls 9)
 {
   AAAAAAKCJKAAAAAA
   AAAAKKCLKJKKAAAA
@@ -4739,7 +4758,7 @@ Z = (195, 195, 195)
   AAJAAACKKJAAAJAA
   ACJJAAAAAAAACJJA
 }
-# tile 248 (sub knox walls 10)
+# tile 249 (sub knox walls 10)
 {
   AAAAAAKCJKAAAAAA
   AAAAKKCLKJKKAAAA
@@ -4758,7 +4777,7 @@ Z = (195, 195, 195)
   AAJAAACKKJAAAJAA
   ACJJAAAAAAAACJJA
 }
-# tile 249 (sub sokoban walls 0)
+# tile 250 (sub sokoban walls 0)
 {
   ANNBA1EEEEE1NNBA
   ABBBA1E1EE11BBBA
@@ -4777,7 +4796,7 @@ Z = (195, 195, 195)
   A111A11EEEE1111A
   ABEEA11EEEE1BE1A
 }
-# tile 250 (sub sokoban walls 1)
+# tile 251 (sub sokoban walls 1)
 {
   AAANBBAAAAANBBAA
   BBBNBBA1BBBNBBA1
@@ -4796,7 +4815,7 @@ Z = (195, 195, 195)
   1111111111111111
   AAAAAAAAAAAAAAAA
 }
-# tile 251 (sub sokoban walls 2)
+# tile 252 (sub sokoban walls 2)
 {
   AAANNNNBBBBBBAAA
   NNNNAA11EEEEB111
@@ -4815,7 +4834,7 @@ Z = (195, 195, 195)
   A111A11EEEE1111A
   ABEEA11EEEE1BE1A
 }
-# tile 252 (sub sokoban walls 3)
+# tile 253 (sub sokoban walls 3)
 {
   AAANNNNBBBBBBAAA
   NNNNAA11EEEEB111
@@ -4834,7 +4853,7 @@ Z = (195, 195, 195)
   A111A11EEEE1111A
   ABEEA11EEEE1BE1A
 }
-# tile 253 (sub sokoban walls 4)
+# tile 254 (sub sokoban walls 4)
 {
   AAANNNNBBBBBBAAA
   NNNNAA11EEEEB111
@@ -4853,7 +4872,7 @@ Z = (195, 195, 195)
   1111111111111111
   AAAAAAAAAAAAAAAA
 }
-# tile 254 (sub sokoban walls 5)
+# tile 255 (sub sokoban walls 5)
 {
   AAANNNNBBBBBBAAA
   NNNNAA11EEEEB111
@@ -4872,7 +4891,7 @@ Z = (195, 195, 195)
   1111111111111111
   AAAAAAAAAAAAAAAA
 }
-# tile 255 (sub sokoban walls 6)
+# tile 256 (sub sokoban walls 6)
 {
   AAANNNNBBBBBBAAA
   NNNNAA11EEEEB111
@@ -4891,7 +4910,7 @@ Z = (195, 195, 195)
   A111A11EEEE1111A
   ABEEA11EEEE1BE1A
 }
-# tile 256 (sub sokoban walls 7)
+# tile 257 (sub sokoban walls 7)
 {
   AAANNNNBBBBBBAAA
   NNNNAA11EEEEB111
@@ -4910,7 +4929,7 @@ Z = (195, 195, 195)
   1111111111111111
   AAAAAAAAAAAAAAAA
 }
-# tile 257 (sub sokoban walls 8)
+# tile 258 (sub sokoban walls 8)
 {
   AAANNNNBBBBBBAAA
   NNNNAA11EEEEB111
@@ -4929,7 +4948,7 @@ Z = (195, 195, 195)
   A111A11EEEE1111A
   ABEEA11EEEE1BE1A
 }
-# tile 258 (sub sokoban walls 9)
+# tile 259 (sub sokoban walls 9)
 {
   AAANNNNBBBBBBAAA
   NNNNAA11EEEEB111
@@ -4948,7 +4967,7 @@ Z = (195, 195, 195)
   A111A11EEEE1111A
   ABEEA11EEEE1BE1A
 }
-# tile 259 (sub sokoban walls 10)
+# tile 260 (sub sokoban walls 10)
 {
   AAANNNNBBBBBBAAA
   NNNNAA11EEEEB111
diff --git a/win/share/tilemap.c b/win/share/tilemap.c
index f69264cad..e2ba84d7d 100644
--- a/win/share/tilemap.c
+++ b/win/share/tilemap.c
@@ -551,6 +551,7 @@ struct {
 {S_sink,     "sink", "sink"},
 {S_toilet,   "toilet", "toilet"},
 {S_forge,    "forge", "forge"},
+{S_magic_chest, "magic chest", "magic chest"},
 {S_fountain, "fountain", "fountain"},
 {S_vent,     "vent",     "vent"},
 {S_pool,     "pool", "water"},
@@ -593,28 +594,28 @@ struct {
 {S_spear_trap,           "spear trap", "spear trap"},
 {S_magic_beam_trap,      "magic beam trap", "magic beam trap"},
 {S_vibrating_square,     "vibrating square", "vibrating square"},
-{S_vbeam,                "vertical beam", "cmap 76"},
-{S_hbeam,                "horizontal beam", "cmap 77"},
-{S_lslant,               "left slant beam", "cmap 78"},
-{S_rslant,               "right slant beam", "cmap 79"},
-{S_digbeam,              "dig beam", "cmap 80"},
-{S_flashbeam,            "flash beam", "cmap 81"},
-{S_boomleft,             "boom left", "cmap 82"},
-{S_boomright,            "boom right", "cmap 83"},
-{S_ss1,                  "shield1", "cmap 84"},
-{S_ss2,                  "shield2", "cmap 85"},
-{S_ss3,                  "shield3", "cmap 86"},
-{S_ss4,                  "shield4", "cmap 87"},
+{S_vbeam,                "vertical beam", "cmap 77"},
+{S_hbeam,                "horizontal beam", "cmap 78"},
+{S_lslant,               "left slant beam", "cmap 79"},
+{S_rslant,               "right slant beam", "cmap 80"},
+{S_digbeam,              "dig beam", "cmap 81"},
+{S_flashbeam,            "flash beam", "cmap 82"},
+{S_boomleft,             "boom left", "cmap 83"},
+{S_boomright,            "boom right", "cmap 84"},
+{S_ss1,                  "shield1", "cmap 85"},
+{S_ss2,                  "shield2", "cmap 86"},
+{S_ss3,                  "shield3", "cmap 87"},
+{S_ss4,                  "shield4", "cmap 88"},
 {S_poisoncloud,          "poison cloud", "poison cloud"},
 {S_goodpos,              "valid position", "valid position"},
-{S_sw_tl,                "swallow top left", "cmap 90"},
-{S_sw_tc,                "swallow top center", "cmap 91"},
-{S_sw_tr,                "swallow top right", "cmap 92"},
-{S_sw_ml,                "swallow middle left", "cmap 93"},
-{S_sw_mr,                "swallow middle right", "cmap 94"},
-{S_sw_bl,                "swallow bottom left ", "cmap 95"},
-{S_sw_bc,                "swallow bottom center", "cmap 96"},
-{S_sw_br,                "swallow bottom right", "cmap 97"},
+{S_sw_tl,                "swallow top left", "cmap 91"},
+{S_sw_tc,                "swallow top center", "cmap 92"},
+{S_sw_tr,                "swallow top right", "cmap 93"},
+{S_sw_ml,                "swallow middle left", "cmap 94"},
+{S_sw_mr,                "swallow middle right", "cmap 95"},
+{S_sw_bl,                "swallow bottom left ", "cmap 96"},
+{S_sw_bc,                "swallow bottom center", "cmap 97"},
+{S_sw_br,                "swallow bottom right", "cmap 98"},
 
 {S_explode1,             "explosion top left", "explosion dark 0"},
 {S_explode2,             "explosion top centre", "explosion dark 1"},
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"