diff -Naurbd slashem-0.0.8E0/Files slashem-0.0.8E1/Files
--- slashem-0.0.8E0/Files	2005-07-02 08:31:37.000000000 +0100
+++ slashem-0.0.8E1/Files	2006-05-15 12:08:59.000000000 +0100
@@ -24,7 +24,7 @@
 opthelp         oracle.des      oracles.txt     pet_mark.pbm    quest.txt
 rats.des        rumors.fal      rumors.tru      sea.des         sokoban.des
 spiders.des     stor-1.des      stor-2.des      stor-3.des      template.des
-tomb.des        tower.des       wizhelp         yendor.des
+tomb.des        tower.des       wizhelp         yendor.des	lethe.des
 
 doc:
 (files for all versions)
diff -Naurbd slashem-0.0.8E0/configure slashem-0.0.8E1/configure
--- slashem-0.0.8E0/configure	2005-07-02 08:31:37.000000000 +0100
+++ slashem-0.0.8E1/configure	2006-05-15 12:08:59.000000000 +0100
@@ -1,5 +1,4 @@
 #! /bin/sh
-# From configure.ac Revision: .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for SLASHEM 0.0.8.
 #
@@ -912,6 +911,8 @@
   --enable-autopickup-exceptions
                           Exceptions to autopickup (experimental)
                           (default=yes)
+  --enable-wizmode=USER   enable wizard mode for the specified user
+                          (default=wizard)
 
 Some influential environment variables:
   CC          C compiler
@@ -1373,7 +1374,7 @@
 
 
 
-
+# $Revision: 1.7.2.1 $
 ac_aux_dir=
 for ac_dir in sys/autoconf $srcdir/sys/autoconf; do
   if test -f $ac_dir/install-sh; then
@@ -5172,51 +5173,75 @@
    fi
 
 
+echo "$as_me:$LINENO: checking whether to enable wizmode" >&5
+echo $ECHO_N "checking whether to enable wizmode... $ECHO_C" >&6
+# Check whether --enable-wizmode or --disable-wizmode was given.
+if test "${enable_wizmode+set}" = set; then
+  enableval="$enable_wizmode"
+  if test "$enableval" != no; then enable_wizmode=yes; wizard=$enableval;
+	else enable_wizmode=no; fi
+else
+  enable_wizmode=yes; wizard="wizard"
+fi;
+if test "$enable_wizmode" != "no" ; then
+	echo "$as_me:$LINENO: result: yes (user $wizard)" >&5
+echo "${ECHO_T}yes (user $wizard)" >&6
+
+cat >>confdefs.h <<_ACEOF
+#define WIZARD "$wizard"
+_ACEOF
+
+else
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
 NETHACK_LINKS=
 if test ${srcdir}/include/file.h -nt include/file.h ; then
-	   NETHACK_LINKS="${LINKS_LIST} include/file.h:include/file.h"
+	   NETHACK_LINKS="${NETHACK_LINKS} include/file.h:include/file.h"
 	fi
 if test ${srcdir}/dat/data.base -nt dat/data.base ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/data.base:dat/data.base"
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/data.base:dat/data.base"
 	fi
-if test ${srcdir}/dat/rumors.tru:dat/rumors.tru -nt dat/rumors.tru:dat/rumors.tru ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/rumors.tru:dat/rumors.tru:dat/rumors.tru:dat/rumors.tru"
+if test ${srcdir}/dat/rumors.tru -nt dat/rumors.tru ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/rumors.tru:dat/rumors.tru"
 	fi
-if test ${srcdir}/dat/rumors.fal:dat/rumors.fal -nt dat/rumors.fal:dat/rumors.fal ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/rumors.fal:dat/rumors.fal:dat/rumors.fal:dat/rumors.fal"
+if test ${srcdir}/dat/rumors.fal -nt dat/rumors.fal ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/rumors.fal:dat/rumors.fal"
 	fi
-if test ${srcdir}/dat/quest.txt:dat/quest.txt -nt dat/quest.txt:dat/quest.txt ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/quest.txt:dat/quest.txt:dat/quest.txt:dat/quest.txt"
+if test ${srcdir}/dat/quest.txt -nt dat/quest.txt ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/quest.txt:dat/quest.txt"
 	fi
-if test ${srcdir}/dat/oracles.txt:dat/oracles.txt -nt dat/oracles.txt:dat/oracles.txt ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/oracles.txt:dat/oracles.txt:dat/oracles.txt:dat/oracles.txt"
+if test ${srcdir}/dat/oracles.txt -nt dat/oracles.txt ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/oracles.txt:dat/oracles.txt"
 	fi
-if test ${srcdir}/dat/dungeon.def:dat/dungeon.def -nt dat/dungeon.def:dat/dungeon.def ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/dungeon.def:dat/dungeon.def:dat/dungeon.def:dat/dungeon.def"
+if test ${srcdir}/dat/dungeon.def -nt dat/dungeon.def ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/dungeon.def:dat/dungeon.def"
 	fi
-if test ${srcdir}/dat/help:dat/help -nt dat/help:dat/help ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/help:dat/help:dat/help:dat/help"
+if test ${srcdir}/dat/help -nt dat/help ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/help:dat/help"
 	fi
-if test ${srcdir}/dat/hh:dat/hh -nt dat/hh:dat/hh ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/hh:dat/hh:dat/hh:dat/hh"
+if test ${srcdir}/dat/hh -nt dat/hh ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/hh:dat/hh"
 	fi
-if test ${srcdir}/dat/cmdhelp:dat/cmdhelp -nt dat/cmdhelp:dat/cmdhelp ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/cmdhelp:dat/cmdhelp:dat/cmdhelp:dat/cmdhelp"
+if test ${srcdir}/dat/cmdhelp -nt dat/cmdhelp ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/cmdhelp:dat/cmdhelp"
 	fi
-if test ${srcdir}/dat/history:dat/history -nt dat/history:dat/history ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/history:dat/history:dat/history:dat/history"
+if test ${srcdir}/dat/history -nt dat/history ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/history:dat/history"
 	fi
-if test ${srcdir}/dat/opthelp:dat/opthelp -nt dat/opthelp:dat/opthelp ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/opthelp:dat/opthelp:dat/opthelp:dat/opthelp"
+if test ${srcdir}/dat/opthelp -nt dat/opthelp ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/opthelp:dat/opthelp"
 	fi
-if test ${srcdir}/dat/wizhelp:dat/wizhelp -nt dat/wizhelp:dat/wizhelp ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/wizhelp:dat/wizhelp:dat/wizhelp:dat/wizhelp"
+if test ${srcdir}/dat/wizhelp -nt dat/wizhelp ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/wizhelp:dat/wizhelp"
 	fi
-if test ${srcdir}/dat/gypsy.txt:dat/gypsy.txt -nt dat/gypsy.txt:dat/gypsy.txt ; then
-	   NETHACK_LINKS="${LINKS_LIST} dat/gypsy.txt:dat/gypsy.txt:dat/gypsy.txt:dat/gypsy.txt"
+if test ${srcdir}/dat/gypsy.txt -nt dat/gypsy.txt ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} dat/gypsy.txt:dat/gypsy.txt"
 	fi
-if test ${srcdir}/win/share/tile_t.h:win/share/tile_t.h -nt win/share/tile_t.h:win/share/tile_t.h ; then
-	   NETHACK_LINKS="${LINKS_LIST} win/share/tile_t.h:win/share/tile_t.h:win/share/tile_t.h:win/share/tile_t.h"
+if test ${srcdir}/win/share/tile_t.h -nt win/share/tile_t.h ; then
+	   NETHACK_LINKS="${NETHACK_LINKS} win/share/tile_t.h:win/share/tile_t.h"
 	fi
 
           ac_config_links="$ac_config_links ${NETHACK_LINKS}"
@@ -6347,8 +6372,9 @@
   fi
   # Run the commands associated with the file.
   case $ac_file in
-    include/autoconf.h ) sed 's,^/\* \(#undef .*\) \*/,\1,' < include/autoconf.h \
-        > include/autoconf.new
+    include/autoconf.h ) sed -e 's,^/\* \(#undef .*\) \*/,\1,' \
+        -e 's,#define \([^ ]*\),#undef \1\n&,' \
+        < include/autoconf.h > include/autoconf.new
       mv include/autoconf.new \
         include/autoconf.h ;;
   esac
diff -Naurbd slashem-0.0.8E0/dat/data.base slashem-0.0.8E1/dat/data.base
--- slashem-0.0.8E0/dat/data.base	2005-07-02 08:31:37.000000000 +0100
+++ slashem-0.0.8E1/dat/data.base	2006-05-15 12:08:59.000000000 +0100
@@ -1,5 +1,5 @@
 #	SCCS Id: @(#)data.base	3.4	2003/07/23
-#	    $Id: data.base,v 1.14 2003/12/11 09:49:05 j_ali Exp $
+#	    $Id: data.base,v 1.14.4.1 2005/07/09 18:54:38 j_ali Exp $
 #   Copyright (c) 1994, 1995, 1996 by the NetHack Development Team
 #   Copyright (c) 1994 by Boudewijn Wayers
 #   Copyright (c) 2002 by the Slash'EM Development Team
@@ -1176,6 +1176,11 @@
 	them difficult to deal with, even on the rare occasions when
 	they are friendly.
 	[ The Tough Guide to Fantasyland, by Diana Wynne Jones ]
+demonology
+	The study of demons, including the knowledge of the foul and
+	unspeakable acts necessary to summon one.  If you do summon
+	one, you'd best hope your contract with it is good, for it will
+	attack you if it is not.
 *deva
 	Devas are the descendants of plane-touched aasimon.  They have
 	feathery wings that may be vestigial or functional.
@@ -1409,6 +1414,9 @@
 	water, and earth.  Some mystics have postulated the necessity
 	for a fifth type, the spirit elemental, but none have ever
 	been encountered, at least on this plane of existence.
+elementalism
+	The study of the elements and elemental beings, including the
+	risky art of summoning and binding such dangerous entities.
 ~elf ??m*
 ~elf* cl*
 *elf*
diff -Naurbd slashem-0.0.8E0/dat/dungeon.def slashem-0.0.8E1/dat/dungeon.def
--- slashem-0.0.8E0/dat/dungeon.def	2005-07-02 08:31:37.000000000 +0100
+++ slashem-0.0.8E1/dat/dungeon.def	2006-05-15 12:08:59.000000000 +0100
@@ -1,9 +1,8 @@
-#	SCCS Id: @(#)dungeon.def	3.3	96/03/10
-# Copyright (c) 1990-92 by M. Stephenson
+#	SCCS Id: @(#)dungeon.def	3.4	1996/03/10
+#	Copyright (c) 1990-95 by M. Stephenson
 # NetHack may be freely redistributed.  See license for details.
 #
 # The dungeon description file for Slash'em.
-# Modified by KMH for the balance patch.
 #
 # Note:   The order of the definition of dungeons in this file
 #         reflects in their order of creation in the real dungeon.
@@ -13,6 +12,47 @@
 #		If two dungeons have overlapping ranges for their entry
 #		points, then you should list the dungeon with the _least_
 #		number of choices for its branch level _first_.
+#
+# 	Bones IDs allocated:
+#
+# 		Dngn	Level	Allocation
+# 		D	4-47	Normal levels in the Dungeons of Doom
+# 		D	B	Big room
+# 		D	K	Kobolds
+# 		D	N	Nymphs
+# 		D	O	Oracle
+# 		D	R	Rats, Rogue (CONFLICT)
+# 		D	T	The mall
+# 		G	G	Geryon
+# 		G	J	Juiblex
+# 		G	K	nkai-a
+# 		G	L	nkai-b
+# 		G	O	Orcus
+# 		G	P	Pleasant valley
+# 		G	V	Valley of the Dead
+# 		G	X	Wizard tower middle level
+# 		G	Y	Yeenoghu
+# 		G	Z	nkai-z
+# 		E	F	Elysian fields
+# 		E	G	Guild of disgruntled adventurers
+# 		Q	*	Various quest levels
+# 		L	A	Asmodeus
+# 		L	S	leth-a
+# 		L	B	Baalzebub
+# 		L	T	lethe-b
+# 		L	U	leth-c
+# 		L	D	Dispater
+# 		L	V	leth-d
+# 		L	E	Demogorgon
+# 		L	W	lethe-e
+# 		L	X	lethe-f
+# 		L	Y	lethe-g
+# 		L	Z	lethe-z
+# 		M	4-15	Normal levels in the Gnomish Mines
+# 		M	E	Mineend
+# 		M	M	Mine King
+# 		M	T	Minetown
+# 		T	*	Various levels in Vlad's tower
 
 ### The Dungeons of Doom ###
 # The main dungeon is from 42 to 47 levels deep...
@@ -31,6 +71,12 @@
 #   the entrance to levels 2 to 4.
 BRANCH:		"The Gnomish Mines" @ (2, 3)
 
+# This is the escape route to the surface. We use the "dummy" level
+# of the elemental planes for this purpose because in doing so we
+# assign the correct depth to the planes. It's not actually possible
+# to get to the planes via this route.
+BRANCH:		"The Elemental Planes" @ (1, 0) no_down up -1
+
 #
 #   New mall is on levels 5 to 6, 75% chance.
 #   There shouldn't be any other special levels down to the Oracle.
@@ -81,11 +127,6 @@
 #   And the levels...
 LEVEL:		"nymph" "N" @ (23, 2) 45
 RNDLEVEL:	"bigrm" "B" @ (20, 7) 15 5
-#   Storage room (treasure) on levels 19-26, 66% of the time
-#   "Unused 'cause they suck"?
-RNDLEVEL:	"stor" "S" @ (19, 8) 66 3
-#   Rounding out the bottom levels
-LEVEL:		"guild" "G" @ (26, 6) 50
 
 
 # The famous Fort Ludios...
@@ -98,11 +139,6 @@
 LEVEL:			"castle" "none" @ (-1, 0)
 CHAINBRANCH:	"Gehennom" "castle" + (0, 0) no_down
 
-
-# Branch to the endgame...
-BRANCH:			"The Elemental Planes" @ (1, 0) no_down up -2
-
-
 ### Gehennom ###
 #
 # Now re-worked for 3.1, hell is hopefully going to be a little
@@ -118,37 +154,29 @@
 # Note:   Gehennom *must* be the second dungeon defined so that
 #         monsters can properly migrate here under certain
 #         circumstances.
-#
-# [Tom] tried to remove most of the non-unique levels (i.e. lame mazes)
-# also tried to organize it a little -- demons before the wizard, devils
-# after.
 
-DUNGEON:        "Gehennom" "G" (17, 0)
+DUNGEON:        "Gehennom" "G" (13, 0)
 DESCRIPTION:    mazelike
 DESCRIPTION:    hellish
 ALIGNMENT:      noalign
 LEVEL:          "valley" "V" @ (1, 0)
-LEVEL:          "sanctum" "none" @ (-1, 0)
-# Tower before wiz, please
-BRANCH:         "Vlad's Tower" @ (3, 10) up -1
-# Dr. Frankenstein's Lab
-BRANCH:         "Frankenstein's Lab" @ (3, 10) up
-# The demon levels
-LEVEL:          "juiblex" "J" @ (2, 5)
-LEVEL:          "yeenoghu" "E" @ (2, 5)
-LEVEL:          "orcus" "O" @ (2, 5)
-LEVEL:          "demogorg" "D" @ (2, 5)
-# Half-way down
-LEVEL:          "wizard1" "none" @ (7, 0)
+LEVEL:          "wizard1" "none" @ (4, 4)
 CHAINLEVEL:     "wizard2" "X" "wizard1" + (1, 0)
 CHAINLEVEL:     "wizard3" "Y" "wizard1" + (2, 0)
-# The devil levels
-LEVEL:          "baalz" "B" @ (10, 6)
-LEVEL:          "geryon" "R" @ (10, 6)
-LEVEL:          "dispater" "S" @ (10, 6)
-LEVEL:          "asmodeus" "A" @ (10, 6)
-LEVEL:          "fakewiz1" "F" @ (10, 6)
-LEVEL:          "fakewiz2" "G" @ (10, 6)
+# Tower before wiz, please
+CHAINBRANCH:    "Vlad's Tower" "wizard1" + (-2, 2) up -1
+# Dr. Frankenstein's Lab
+CHAINBRANCH:    "Frankenstein's Lab" "wizard1" + (-2, 2) up
+LEVEL:          "pvalley" "P" @ (2, 8)
+LEVEL:          "juiblex" "J" @ (2, 8)
+LEVEL:          "orcus" "O" @ (2, 8)
+LEVEL:          "geryon" "G" @ (2, 8)
+LEVEL:          "yeenoghu" "Y" @ (2, 8)
+RNDLEVEL:       "nkai-a" "K" @ (10, 0) 2
+LEVEL:          "nkai-b" "L" @ (11, 0)
+LEVEL:          "nkai-c" "M" @ (12, 0)
+LEVEL:          "nkai-z" "Z" @ (13, 0)
+BRANCH:         "The Lethe Gorge" @ (13, 0) down -1
 
 
 ### Gnomish Mines ###
@@ -162,7 +190,6 @@
 RNDLEVEL:	"minend" "E" @ (-2, 0) 3
 LEVEL:		"mineking" "M" @ (-1, 0)
 
-
 ### The Quest Dungeon ###
 #   This is a proto-dungeon.  The level file names will be prepended with
 #   the role code (eg, Arc, Val) during initialization.
@@ -273,6 +300,60 @@
 DESCRIPTION:    mazelike
 LEVEL:          "frnknstn" "none" @ (1, 0)
 
+#
+#       The Wizards Tower
+#
+#       It has been removed from Gehennom, and it is surrounded by stone.
+#       Must not allow bones files for its top level.
+#
+#DUNGEON:        "Wizards Tower" "W" (3, 0)
+#DESCRIPTION:    mazelike
+#ALIGNMENT:      chaotic
+#LEVEL:          "wizard1" "none" @ (1, 0)
+#LEVEL:          "wizard2" "X"    @ (2, 0)
+#LEVEL:          "wizard3" "Y"    @ (3, 0)
+
+#
+#       The Lethe Gorge.
+#
+DUNGEON:        "The Lethe Gorge" "L" (13, 0)
+ALIGNMENT:      unaligned
+DESCRIPTION:    mazelike
+RNDLEVEL:       "leth-a" "S" @ (1, 0) 2
+BRANCH:		"The Labyrinth" @ (2, 0) stair up -1
+LEVEL:          "asmodeus" "A" @ (2, 10)
+LEVEL:          "baalz" "B" @ (2, 10)
+LEVEL:          "dispater" "D" @ (2, 10)
+LEVEL:          "lethe-b" "T" @ (2, 10)
+LEVEL:          "demogorg" "E" @ (2, 10)
+RNDLEVEL:       "leth-c" "U" @ (2, 10) 2
+RNDLEVEL:       "leth-d" "V" @ (2, 10) 2
+LEVEL:          "lethe-e" "W" @ (2, 10)
+LEVEL:          "lethe-f" "X" @ (2, 10)
+LEVEL:          "lethe-g" "Y" @ (2, 10)
+LEVEL:          "lethe-z" "Z" @ (12, 0)
+LEVEL:          "sanctum" "none" @ (13, 0)
+
+#
+#       The Labyrinth
+#
+DUNGEON:        "The Labyrinth" "S" (4, 0)
+ALIGNMENT:      unaligned
+RNDLEVEL:	"stor" "none" @ (1, 0) 3
+BRANCH:         "Elysium" @ (2, 0) stair up -1
+LEVEL:		"laby-a" "none" @ (2, 0)
+LEVEL:		"laby-b" "none" @ (3, 0)
+LEVEL:		"laby-c" "none" @ (4, 0)
+
+#
+#       Elysium
+#
+DUNGEON:        "Elysium" "E" (4, 0)
+ALIGNMENT:      unaligned
+LEVEL:		"olympus" "none" @ (1, 0)
+LEVEL:		"elysian" "F" @ (2, 0)
+LEVEL:		"guild" "G" @ (3, 0)
+LEVEL:		"minos" "none" @ (4, 0)
 
 ### The Endgame levels ###
 #
diff -Naurbd slashem-0.0.8E0/dat/elysium.des slashem-0.0.8E1/dat/elysium.des
--- slashem-0.0.8E0/dat/elysium.des	1970-01-01 01:00:00.000000000 +0100
+++ slashem-0.0.8E1/dat/elysium.des	2006-05-15 12:08:59.000000000 +0100
@@ -0,0 +1,274 @@
+# $Id $
+# Copyright (c) 2005 by J. Ali Harlow
+# NetHack may be freely redistributed.  See license for details.
+#
+#       Mount Olympus: gateway to the elemental planes.
+#
+MAZE: "olympus",' '
+FLAGS: noteleport
+GEOMETRY:center,center
+MAP
+     ...                        II}    ......  . ..       ...  ....    }}}  
+    .T                      ...II }} }}}...T......        .... ...   }}} }} 
+    ..        ..        ....III....}}} }}.}}}.......       ........ }}      
+     .. .   ..PP..   ...T  II     T.....}}}.}}}T...PPP...T.........}}       
+       .T. .PPPPPP...  T. II            ......}}}}..TPP.......}}}T}}        
+          .PPPP         .II           .....TT...T}........}}}}}T}}} .....   
+          .     II   II  I .          ..T..T..T..}}....}}}}}...... ........ 
+         .  .  I  III  I I  .        ..T.TT....T.}}...}}}......... .........
+        .   .  I  -----I II .       .....T..T..T..}}.}}........... .........
+        .    .  I |CCC|I  I .     ..  .T..T..T..T..}}}............. ......  
+       .      I  ICC.CC|I I .    .    ..T...T.T......................       
+       .     I I  |CCC|I  I .          T.T.TT..T............................
+      . .  II    I-----I II .           ...T..T......T......................
+     .   .II .    IIIII  I  .    .       .................T......TT.........
+   ..    II   ..   I    I  .  TT.T.  ... ........T.................T........
+  .T   III      . I       .  T..T.T..   ......T.................T.T..T......
+   .  II  .      II.   ... .T.T..T.      .........T.........   .............
+  ...}}. .      II    .T    .T.TT.T     .... ...............     .T.T... ...
+ ...}}...        II    ..              ....  ...     ......      .......  ..
+  .}}...        II                      ...   ....     ...          ...    .
+ENDMAP
+# Random Monsters
+RANDOM_MONSTERS: '@', 'h'
+# Dungeon Description
+REGION:(00,00,75,19),lit,"ordinary"
+# Portal to endgame
+PORTAL:(20,10,20,10),(0,0,0,0),"earth"
+# Stairs
+STAIR:(70,7),down
+# Boulders fallen from the mountain
+OBJECT:'`',"boulder",(19,16)
+
+#
+#	The Elysian fields: Final resting place of worthy mortals.
+#
+# References:
+#	Virgil's Aeneid 6.637ff
+#	Homer's Odyssey 4.563-569
+MAZE: "elysian",' '
+FLAGS: noteleport
+GEOMETRY:center,center
+MAP
+  ..T.....T....T                                          .T..T..           
+  T....T....T....     ..                            ...  ...T..T..T         
+  .T.T...T......T.  .....    ...       ...       .........T...T..T..        
+ ...T.....T....T.T....  ..  .....    ..T...T.  .....   ..T..T..T...T        
+ .T....T....T.......     ....  ..    T...T...T...       T....T...T          
+ ....T...T.....T.T        ..   .. ....T....T....        .T..T..T.           
+ .T...T.....T...T              .........T....T.            ...              
+ T..T...T..T...T               .... T..T..T.T.              ..              
+  .T..T...T..T.               ..    .T...T..                 ..             
+   ..T..T..T.                ..      ......                  ..             
+     ..T..T.                 ..         ...                 ..              
+        ..                  ..           ..                 ..              
+         ..    .....       ..            ..      .T..T.      ..             
+          ...T.T...T.T    ...             ..    .T..T...T    ..             
+           .T....T....T  ...              .....T..T...T..    ..             
+           ..T.T...T...T....               .....T...T...T  ...              
+           T....T.T..T.....                   T....T..T......               
+            .T.....T.  ...                    .T.T..T..T....                
+              ....                             ...T..T..                    
+                                                                            
+ENDMAP
+# Random Monsters
+RANDOM_MONSTERS: '@', 'h'
+# Dungeon Description
+REGION:(00,00,75,19),lit,"ordinary"
+# Stairs
+STAIR:(00,00,75,19),(0,0,0,0),down
+STAIR:(00,00,75,19),(0,0,0,0),up
+# Armour, etc., of the great line of Teucer
+OBJECT:')',random,random
+OBJECT:')',random,random
+OBJECT:')',random,random
+OBJECT:')',random,random
+OBJECT:'[',random,random
+OBJECT:'[',random,random
+OBJECT:'[',random,random
+OBJECT:'[',random,random
+MONSTER:'u',"warhorse",random,peaceful
+MONSTER:'u',"warhorse",random,peaceful
+MONSTER:'u',"warhorse",random,peaceful
+MONSTER:'u',"warhorse",random,peaceful
+MONSTER:'u',"horse",random,peaceful
+MONSTER:'u',"horse",random,peaceful
+# Flavour
+MONSTER:' ',"ghost",random,"Orpheus",peaceful
+MONSTER:' ',"ghost",random,"Musaeus",peaceful
+MONSTER:' ',"ghost",random,"Anchises",peaceful
+
+#
+#       Minos' castle: Judge of the Underworld
+#
+# References:
+#	Dante's Inferno canto 5.1-12
+#	Virgil's Aeneid 6.432-433
+#	Ovidius' Metamorphoses 9.436-440
+MAZE: "minos",' '
+FLAGS: noteleport
+GEOMETRY:center,center
+MAP
+............................................................................
+............................................................................
+............................................................................
+.............|----|.......................................|----|............
+.............|....|---------------------------------------|....|............
+.............|--+-|.......................................|-+--|............
+...............|...............-------+-------...............|..............
+...............|...............|.............|...............|..............
+...............|...............|.............|...............|..............
+...............|...............|.............|...............|..............
+...............+...............|......\......|...............+..............
+...............|...............---------------...............|..............
+...............|...............|....|...|....|...............|..............
+...............|...............+....|...|....+...............|..............
+...............|...............-------S------|...............|..............
+.............|--+-|.......................................|-+--|............
+.............|....|---------------------------------------|....|............
+.............|----|.......................................|----|............
+............................................................................
+............................................................................
+ENDMAP
+# Random Monsters
+RANDOM_MONSTERS: '@', 'h'
+# The king on his throne
+MONSTER:'S',"king cobra",(38,10),"Minos"
+# Dungeon Description
+REGION:(00,00,75,19),lit,"ordinary"
+# Stairs
+BRANCH:(38,12,38,12),(0,0,0,0)
+STAIR:(38,2),up
+
+#
+#       Labyrinth: Home to the minotaur
+#
+# References:
+#	Virgil's Aeneid 6.14-33
+#	Ovidius' Metamorphoses 8.152-174
+MAZE: "laby-a",' '
+FLAGS: noteleport, nommap
+GEOMETRY:center,center
+MAP
+                   ##                                                       
+        ##        #  #                                                      
+          ## #    #  #                                                      
+            # #    #  #                                                     
+               #  #    ##                                                   
+          ##    ##       #                          #                       
+         #  #           #                          # #  #                   
+     ##  #   #  ##     #    ##                  ###   ##                    
+    #  ##     ##  #     #  #  #                #   ##                       
+   #               #     ##    # ##  ###      #   #  ##                     
+    #  ##      #    ##          #  #####       # #  #  #                    
+    #    #    # #                    ###        #  # #  #                   
+     #    #  #   ## #  ##      #  #               #   ##                    
+     #  ##  #      # ##      ## #  #             #                          
+    #  #   #            #   #    ###  ##          #                         
+   #   # #  #         ## ###  ##     #  #          #      #                 
+   #    # #  #     ##        #  ##    #  # ##    ## #    # ## ##            
+    #      ##  ####  #  ##    #   #  #    #  #  #    # ##    #              
+     #  ##    #     #  #  ## #     ##         #  #    #                     
+      ##  ####       ##     #                  ##                           
+                                                                            
+ENDMAP
+NON_DIGGABLE:(00,00,75,20)
+NON_PASSWALL:(00,00,75,20)
+STAIR:(8,1),down
+STAIR:(7,10),down
+STAIR:(21,10),down
+STAIR:(24,12),down
+STAIR:(34,12),down
+STAIR:(56,6),up
+STAIR:(63,16),down
+BRANCH:(38,10,38,10),(0,0,0,0)
+
+MAZE: "laby-b",' '
+FLAGS: noteleport, nommap
+GEOMETRY:center,center
+MAP
+                 #  ##   #   ##       #                                     
+     ####       # ##  # # ###  ###   # #                                    
+    #         ##       #          # #   #                #                  
+   #  ###       #             ###  #     # ##       ##  # #                 
+   # #   #      #    ##          #        #        #  ##   #                
+    #  ##      #   ##  ##         #        ##      #        #     ##        
+      #       #          #    #  #           #  #   # #    #    ##  ##      
+     #        #        #  #  # #  ##          ## #  #  #  #           #     
+    #          #    ### #  ##   #   ##            # #   #  # ##     ##      
+     #        #         #      #      #   #      #   # #    #  #  ##        
+      ##       #   ##    ##   #       #  # #     #  #   ###     ##  #   ##  
+                ###        #  #       # #  #  #   #  #     ####      ###  # 
+            #           ###    ##      #    ## #   # #         ####       # 
+         ### ##    #                           #   #  ##    ##     ###   #  
+       ##      # ## #            ##        ####          ###  ####   #  #   
+      #     ##  #    #      #  ##  ###   ##      ##### ##    #    #  # #    
+       #      #       ###  # ##       ###    ####     #       ###  #   #    
+        ### #  #         ##     ##  #      ##      ##   ##    #     ####    
+           # ##                   ## ####     ### #  #### #   #             
+                                         #####   ##        ###              
+                                                                            
+ENDMAP
+NON_DIGGABLE:(00,00,75,20)
+NON_PASSWALL:(00,00,75,20)
+STAIR:(14,2),down
+STAIR:(19,5),down
+STAIR:(30,3),down
+STAIR:(44,3),down
+STAIR:(64,6),down
+STAIR:(20,8),down
+STAIR:(57,10),down
+STAIR:(51,13),down
+STAIR:(12,15),down
+STAIR:(32,17),down
+STAIR:(43,17),down
+STAIR:(8,1),up
+STAIR:(7,10),up
+STAIR:(20,10),up
+STAIR:(24,12),up
+STAIR:(32,12),up
+STAIR:(64,16),up
+
+MAZE: "laby-c",' '
+FLAGS: noteleport, nommap
+GEOMETRY:center,center
+MAP
+              ####   ##                                                     
+             #    ###  #                                                    
+            #  ##       #                                                   
+            #    #      #      #            #                               
+             #    #    #      #              #   ##                         
+              #  #  ###      #                # #  #          ###           
+              #  #           #  #          #  #  #  #        #  #           
+               #  ##          ## ###    ### ##   #   ##       #             
+                #   #               #  #        #      ###     #            
+               #                    #### ##      #        # ###             
+              #                    ######  #      ###  ##  #                
+              #                     ####    ###      ##                     
+             #                      #  #       #                            
+            #                 ## ###    ### ##  ###                         
+             #               #  #          #  #                             
+           ##                #                #                             
+                              #              #                              
+                               #            #                               
+                                                                            
+                                                                            
+                                                                            
+ENDMAP
+NON_DIGGABLE:(00,00,75,20)
+NON_PASSWALL:(00,00,75,20)
+STAIR:(15,2),up
+STAIR:(31,3),up
+STAIR:(44,3),up
+STAIR:(20,5),up
+STAIR:(64,6),up
+STAIR:(20,8),up
+STAIR:(56,10),up
+STAIR:(50,13),up
+STAIR:(11,15),up
+STAIR:(31,17),up
+STAIR:(44,17),up
+BRANCH:(37,10,37,10),(0,0,0,0)
+MONSTER:'H',"minotaur",(38,10)
+OBJECT:')',"battle-axe",(38,10)
+
diff -Naurbd slashem-0.0.8E0/dat/gehennom.des slashem-0.0.8E1/dat/gehennom.des
--- slashem-0.0.8E0/dat/gehennom.des	2005-07-02 08:31:37.000000000 +0100
+++ slashem-0.0.8E1/dat/gehennom.des	2006-05-15 12:08:59.000000000 +0100
@@ -3,51 +3,75 @@
 #       Copyright (c) 1992 by M. Stephenson and Izchak Miller
 # NetHack may be freely redistributed.  See license for details.
 #
+# The design of the gehennom dungeon has many sources of inspiration.
+# The major ones are as follows:
+#
+# Judaism
+#	The name Gehennom comes from the hebrew Ge Hinnom (Valley of Hinnom)
+#	which was located just outside Jerusalem and used as a place of
+#	child sacrifice.  Refs: 2 Chronicles 33:6, 2 Kings 23:10.
+#
+# Homer
+#	Describes a River of Flaming Fire (ie., Phlegethon) and a rocky
+#	pinnacle where Odysseus built an altar.  Ref: The Odyssey 10.500ff
+#
+# Dante
+#	Dante's seventh circle of hell provides many ideas.
+#						Ref: Inferno cantos 12-17.
+#
+# Lovecraft
+#	Lovercraft describes N'kai as lightless openings in the ground
+#	containing great worlds of unknown life.
+#				Refs: The Whisper in Darkness, The Mound.
 
 MAZE: "valley", ' '
-FLAGS: hardfloor
+FLAGS: noteleport,hardfloor,nommap,phlegethon
 GEOMETRY:center,center
 MAP
-----------------------------------------------------------------------------
-|...S.|..|.....|  |.....-|      |................|   |...............| |...|
-|---|.|.--.---.|  |......--- ----..........-----.-----....---........---.-.|
-|   |.|.|..| |.| --........| |.............|   |.......---| |-...........--|
-|   |...S..| |.| |.......-----.......------|   |--------..---......------- |
-|----------- |.| |-......| |....|...-- |...-----................----       |
-|.....S....---.| |.......| |....|...|  |..............-----------          |
-|.....|.|......| |.....--- |......---  |....---.......|                    |
-|.....|.|------| |....--   --....-- |-------- ----....---------------      |
-|.....|--......---BBB-|     |...--  |.......|    |..................|      |
-|..........||........-|    --...|   |.......|    |...||.............|      |
-|.....|...-||-........------....|   |.......---- |...||.............--     |
-|.....|--......---...........--------..........| |.......---------...--    |
-|.....| |------| |--.......--|   |..B......----- -----....| |.|  |....---  |
-|.....| |......--| ------..| |----..B......|       |.--------.-- |-.....---|
-|------ |........|  |.|....| |.....----BBBB---------...........---.........|
-|       |........|  |...|..| |.....|  |-.............--------...........---|
-|       --.....-----------.| |....-----.....----------     |.........----  |
-|        |..|..B...........| |.|..........|.|              |.|........|    |
-----------------------------------------------------------------------------
+----------------------------------------------RRRR--------------------------
+|...| |...............|   |................| RRRR |-.....|  |.....|..|.S...|
+|.-.---........---....-----.-----..........--RRRR |......|  |.---.--.|.|---|
+|--...........-| |---.......|   |.............RRRR|......-- |.| |..|.|.|   |
+| -------......---..--------|   |------.......RRRR---.....| |.| |..S...|   |
+|  ---- ----................-----...| --...|...RRRRF.....-| |.| -----------|
+|---..---- -----------..............|  |...|...RRRR--.....| |.---....S.....|
+|........------      -FF---..---....|  ---......RRRR|.....| |......|.|.....|
+|.............--------..------ --BB----| --.....RRRR--....| |------|.|.....|
+|---.....................--    |.......|  --...| RRRR|-BBB---......--|.....|
+|  ----..............||...|    |.......|   |...--RRRR|.....|...||....S.....|
+|     --.............||...| ----.......|   |.....RRRR|.....S..-||-...|.....|
+|    --...----.----.......| |..........--------.RRRR......---......--|.....|
+|  ---....|  |.| ----..---------..........|..RRR.RRR..|...---------| |.....|
+|---.....-| --.---..----.......---........RRRRRRR.R------.B.|......| |.....|
+RRRRRRRR..---...........RRRRRR..BBBBB--RRRRRRRRRRR...|.|---........| ------|
+RRRRRRRRRRRRRRR.....RRRRRRRRRRRRRRRRRRRRRRRRRRRRR..|...|  |........|       |
+RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR|..-----------.....--       |
+|   RRRRRRRRRRRRRRRRRRRRRR    RRRRRRRRRRRR...   |.........B....|..|        |
+-----------RRRRRRRRRRRR-----------------------------------------------------
 ENDMAP
 # Dungeon Description
 # The shrine to Moloch.
-REGION:(01,06,05,14),lit,"temple"
+REGION:(70,06,74,14),lit,"temple"
 # The Morgues
-REGION:(19,01,24,08),unlit,"morgue",filled,true
-REGION:(09,14,16,18),unlit,"morgue",filled,true
-REGION:(37,09,43,14),unlit,"morgue",filled,true
+REGION:(52,01,57,08),unlit,"morgue",filled,true
+REGION:(59,14,66,18),unlit,"morgue",filled,true
+REGION:(32,09,42,14),unlit,"morgue",filled,true
 # Stairs
-STAIR:(01,01),down
+STAIR:(74,01),down
 # Branch location
-BRANCH:(66,17,66,17),(0,0,0,0)
+BRANCH:(05,09,05,09),(0,0,0,0)
+ENGRAVING:(06,09),engrave,"You won't get it up the steps"
+TELEPORT_REGION:(01,06,20,11),(0,0,0,0),down
 
 # Secret Doors
-DOOR:locked,(04,01)
-DOOR:locked,(08,04)
-DOOR:locked,(06,06)
+DOOR:locked,(71,01)
+DOOR:locked,(67,04)
+DOOR:locked,(69,06)
+DOOR:locked,(69,10)
+DOOR:locked,(59,11)
 
 # The altar of Moloch.
-ALTAR:(03,10),noalign,shrine
+ALTAR:(72,10),noalign,shrine
 
 # Non diggable walls - everywhere!
 NON_DIGGABLE:(00,00,75,19)
@@ -85,15 +109,15 @@
 OBJECT:'[',random,random
 OBJECT:'[',random,random
 OBJECT:'[',random,random
-OBJECT:'[',random,random
-OBJECT:')',random,random
+OBJECT[50%]:'[',random,random
 OBJECT:')',random,random
 OBJECT:')',random,random
 OBJECT:')',random,random
+OBJECT[50%]:')',random,random
 #
 # Some random loot.
 #
-OBJECT:'*',"ruby",random
+OBJECT[50%]:'*',"ruby",random
 OBJECT:'*',random,random
 OBJECT:'*',random,random
 OBJECT:'!',random,random
@@ -113,13 +137,13 @@
 OBJECT:'(',random,random
 
 # (Not so) Random traps.
-TRAP:"spiked pit", (05,02)
-TRAP:"spiked pit", (14,05)
-TRAP:"sleep gas", (03,01)
-TRAP:"board", (21,12)
+TRAP[25%]:"spiked pit", (70,02)
+TRAP[25%]:"spiked pit", (61,05)
+TRAP[25%]:"sleep gas", (72,01)
+TRAP:"board", (56,12)
 TRAP:"board", random
-TRAP:"dart", (60,01)
-TRAP:"dart", (26,17)
+TRAP:"dart", (15,01)
+TRAP:"dart", (49,17)
 TRAP:"anti magic", random
 TRAP:"anti magic", random
 TRAP:"magic", random
@@ -142,15 +166,16 @@
 # Some undead nasties for good measure
 MONSTER:'V',random,random
 MONSTER:'V',random,random
-MONSTER:'V',random,random
-MONSTER:'Z',random,random
+MONSTER[50%]:'V',random,random
 MONSTER:'Z',random,random
 MONSTER:'Z',random,random
 MONSTER:'Z',random,random
+MONSTER[50%]:'Z',random,random
 MONSTER:'M',random,random
 MONSTER:'M',random,random
 MONSTER:'M',random,random
-MONSTER:'M',random,random
+MONSTER[50%]:'M',random,random
+
 #
 # The Juiblex level
 #
@@ -239,6 +264,7 @@
 MONSTER:'j',random,random
 MONSTER:'j',random,random
 MONSTER:'j',random,random
+MONSTER:'P',"shoggoth",random
 MONSTER:'P',random,random
 MONSTER:'P',random,random
 MONSTER:'P',random,random
@@ -268,95 +294,84 @@
 TRAP:"anti magic",random
 TRAP:"magic",random
 TRAP:"magic",random
+
 #
-# The Orcus Level
+# The New Orcus Level
 #
 MAZE:"orcus",random
-FLAGS: noteleport,shortsighted
-GEOMETRY:right,center
+FLAGS: noteleport,shortsighted,phlegethon,hardfloor
+GEOMETRY:center,center
 # A ghost town
 MAP
-.|....|....|....|..............|....|........
-.|....|....|....|..............|....|........
-.|....|....|....|--...-+-------|.............
-.|....|....|....|..............+.............
-.|.........|....|..............|....|........
-.--+-...-+----+--....-------...--------.+----
-.....................|.....|.................
-.....................|.....|.................
-.--+----....-+---....|.....|...----------+---
-.|....|....|....|....---+---...|......|......
-.|.........|....|..............|......|......
-.----...---------.....-----....+......|......
-.|........................|....|......|......
-.----------+-...--+--|....|....----------+---
-.|....|..............|....+....|.............
-.|....+.......|......|....|....|.............
-.|....|.......|......|....|....|.............
+ -----                        --------------------
+ |...|..       .............. |.......|.....|....|     |..........----------
+ |...|...........----------.. |.......|.....|....|.....|..........|........|
+ |...+...........|........|...|.......|--+-----+--.....B..........|........|
+ -----..---+---..|........+...----+----.............{..B..........+......\.|
+ |...+..|.....|..|........|.................------.....B..........|........|
+ |...|..|.....|..----------..RRRRRRR........+....|.....|..........|........|
+ |...|..--...--.........RRRRRRRRRRRRRRRRR...|....|.....|..........------S---
+ -----RRRR.R.RRRR...RRRRRRRRRRRRRRRRRRRRRRRR------.....---------+--   |...|
+RRRRRRRRRRR.RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR..............   |...|
+RRRRRRRRRR.R.RRRRRRRRRRRRRRR-----------RRRRRRRRRRRRRRRRR............  -----
+RRRRRRRR--...--RRRRRRRR.....|.........|..RRRRRRRRRRRRRRRRRRRRR.......
+RRRR....|.....|.............|.........+......RRRRRRRRRRRRRRRRRRRRRRRRRRR
+-------.|.....|..----B----..|.........|................RRRRRRRRRRRRRRRRRRRRR
+|.....|.---+---..|.......|..-----------..-----+----..............RRRRRRRRRRR
+|.....|..........B.......B...............|........|..-------...........RRRRR
+|--+--|...----+---.......-----+----------|........|..|.....-----...--+-----
+   ...... |......|.......|........|......+........|..+.....|...+.. |......|
+          |......|.......|........|......|........|  |.....|...|   |......|
+          -----------------------------------------  -----------   --------
 ENDMAP
-MAZEWALK:(00,06),west
 # Entire main area
-REGION:(01,00,44,16),unlit,"ordinary"
-STAIR:(33,15),down
-STAIR:levregion(01,00,12,20),levregion(20,01,70,20),up
-BRANCH:levregion(01,00,12,20),levregion(20,01,70,20)
-TELEPORT_REGION:levregion(01,00,12,20),levregion(20,01,70,20)
-# Wall "ruins"
-OBJECT:'`',"boulder",(19,02)
-OBJECT:'`',"boulder",(20,02)
-OBJECT:'`',"boulder",(21,02)
-OBJECT:'`',"boulder",(36,02)
-OBJECT:'`',"boulder",(36,03)
-OBJECT:'`',"boulder",(06,04)
-OBJECT:'`',"boulder",(05,05)
-OBJECT:'`',"boulder",(06,05)
-OBJECT:'`',"boulder",(07,05)
-OBJECT:'`',"boulder",(39,05)
-OBJECT:'`',"boulder",(08,08)
-OBJECT:'`',"boulder",(09,08)
-OBJECT:'`',"boulder",(10,08)
-OBJECT:'`',"boulder",(11,08)
-OBJECT:'`',"boulder",(06,10)
-OBJECT:'`',"boulder",(05,11)
-OBJECT:'`',"boulder",(06,11)
-OBJECT:'`',"boulder",(07,11)
-OBJECT:'`',"boulder",(21,11)
-OBJECT:'`',"boulder",(21,12)
-OBJECT:'`',"boulder",(13,13)
-OBJECT:'`',"boulder",(14,13)
-OBJECT:'`',"boulder",(15,13)
-OBJECT:'`',"boulder",(14,14)
+REGION:(01,00,75,19),unlit,"ordinary"
+STAIR:(71,04),down
+STAIR:(61,18),up
+BRANCH:(39,01,48,02),(00,00,00,00)
+TELEPORT_REGION:(26,17,40,18),(00,00,00,00)
 # Doors
-DOOR:closed,(23,02)
-DOOR:open,(31,03)
-DOOR:nodoor,(03,05)
-DOOR:closed,(09,05)
-DOOR:closed,(14,05)
-DOOR:closed,(40,05)
-DOOR:open,(03,08)
-DOOR:nodoor,(13,08)
-DOOR:open,(41,08)
-DOOR:closed,(24,09)
-DOOR:closed,(31,11)
-DOOR:open,(11,13)
-DOOR:closed,(18,13)
-DOOR:closed,(41,13)
-DOOR:open,(26,14)
-DOOR:closed,(06,15)
+DOOR:random,(69,16)
+DOOR:random,(63,17)
+DOOR:random,(53,17)
+DOOR:random,(46,14)
+DOOR:locked,(41,17)
+DOOR:closed,(38,12)
+DOOR:random,(30,16)
+DOOR:random,(14,16)
+DOOR:closed,(11,14)
+DOOR:random,(03,16)
+DOOR:random,(05,05)
+DOOR:random,(05,03)
+DOOR:locked,(11,04)
+DOOR:nodoor,(26,04)
+DOOR:random,(34,04)
+DOOR:random,(41,03)
+DOOR:random,(44,06)
+DOOR:closed,(66,04)
+DOOR:locked,(64,08)
+DOOR:locked,(72,07)
 # Special rooms
-ALTAR:(24,07),noalign,sanctum
-REGION:(22,12,25,16),unlit,"morgue"
-REGION:(32,09,37,12),lit,"shop"
-REGION:(12,00,15,04),lit,"shop"
+ALTAR:(31,12),noalign,sanctum
+REGION:(18,14,24,18),unlit,"morgue"
+REGION:(56,01,65,07),unlit,"morgue"
+REGION:(01,14,05,15),unlit,"shop"
+REGION:(39,01,43,02),unlit,"shop"
+REGION:(18,03,25,05),unlit,"temple"
+ALTAR:(20,04),noncoaligned,altar
+OBJECT:'%',"corpse",(23,03),"priest",0
 # Some traps.
 TRAP:"spiked pit", random
 TRAP:"sleep gas", random
 TRAP:"anti magic", random
+TRAP:"anti magic", random
 TRAP:"fire", random
 TRAP:"fire", random
 TRAP:"fire", random
 TRAP:"magic", random
 TRAP:"magic", random
+TRAP:"magic", random
+TRAP:"rust", random
 # Some random objects
 OBJECT:random,random,random
 OBJECT:random,random,random
@@ -368,258 +383,438 @@
 OBJECT:random,random,random
 OBJECT:random,random,random
 OBJECT:random,random,random
+OBJECT:random,random,random
+OBJECT[50%]:random,random,random
 # The resident nasty
-MONSTER:'&',"Orcus",(33,15)
+MONSTER:'&',"Orcus",(71,04)
 # And its preferred companions
-MONSTER:'Z',"human zombie",(32,15)
-MONSTER:' ',"shade",(32,14)
-MONSTER:' ',"shade",(32,16)
-MONSTER:'V',"vampire",(35,16)
-MONSTER:'V',"vampire",(35,14)
-MONSTER:'V',"vampire lord",(36,14)
-MONSTER:'V',"vampire lord",(36,15)
+MONSTER:'Z',"human zombie",(69,03)
+MONSTER:' ',"shade",(67,06)
+MONSTER:' ',"shade",(73,02)
+MONSTER:'V',"vampire",(73,05)
+MONSTER:'V',"vampire",(69,04)
+MONSTER:'V',"vampire lord",(70,05)
+MONSTER:'V',"vampire lord",(72,06)
+# Some loot...
+CONTAINER:'(',"chest",(71,09)
+OBJECT:'!',"amnesia",contained
+OBJECT:'?',"demonology",contained
+CONTAINER:'(',"chest",(72,09)
+OBJECT:'!',"sickness",contained
+OBJECT:'"',"amulet of strangulation",contained
+CONTAINER:'(',"chest",(73,09)
+OBJECT:'!',"blindness",contained
+OBJECT:'?',"create monster",contained
+# ...and a guardian
+MONSTER:'P',"green slime",(71,08)
+MONSTER:'P',"green slime",(73,08)
+# ...and one final trap
+TRAP:"sleep gas",(72,08)
 # Randomly placed companions
 MONSTER:'Z',"skeleton",random
 MONSTER:'Z',"skeleton",random
 MONSTER:'Z',"skeleton",random
 MONSTER:'Z',"skeleton",random
-MONSTER:'Z',"skeleton",random
+MONSTER[66%]:'Z',"skeleton",random
+MONSTER[33%]:'Z',"skeleton",random
 MONSTER:' ',"shade",random
 MONSTER:' ',"shade",random
 MONSTER:' ',"shade",random
 MONSTER:' ',"shade",random
+MONSTER[50%]:' ',"shade",random
 MONSTER:'Z',"giant zombie",random
 MONSTER:'Z',"giant zombie",random
 MONSTER:'Z',"giant zombie",random
+MONSTER[50%]:'Z',"giant zombie",random
 MONSTER:'Z',"ettin zombie",random
 MONSTER:'Z',"ettin zombie",random
 MONSTER:'Z',"ettin zombie",random
+MONSTER[50%]:'Z',"ettin zombie",random
 MONSTER:'Z',"human zombie",random
 MONSTER:'Z',"human zombie",random
 MONSTER:'Z',"human zombie",random
+MONSTER[50%]:'Z',"human zombie",random
 MONSTER:'V',"vampire",random
 MONSTER:'V',"vampire",random
 MONSTER:'V',"vampire",random
+MONSTER[66%]:'V',"vampire",random
+MONSTER[33%]:'V',"vampire",random
 MONSTER:'V',"vampire lord",random
 MONSTER:'V',"vampire lord",random
+MONSTER[50%]:'V',"vampire lord",random
 # A few more for the party
 MONSTER:random,random,random
 MONSTER:random,random,random
 MONSTER:random,random,random
-MONSTER:random,random,random
-MONSTER:random,random,random
+MONSTER[50%]:random,random,random
+
 #
-# The Asmodeus Level
+# The New Asmodeus Level
 #
 MAZE:"asmodeus",random
-FLAGS: noteleport
+FLAGS: noteleport,lethe,hardfloor
 # First part
 GEOMETRY:half-left,center
 MAP
----------------------
-|.............|.....|
-|.............S.....|
-|---+------------...|
-|.....|.........|-+--
-|..---|.........|....
-|..|..S.........|....
-|..|..|.........|....
-|..|..|.........|-+--
-|..|..-----------...|
-|..S..........|.....|
----------------------
+                                          RRRR                          ----
+--------------------    -------         |RRRR--                         |..|
+|............S.....|    |.....|------   --RRRR--------------       #####+..|
+|---+-----------...|    |.....|.....|------RRRR|...........|       #    |..|
+|.....|........|-+------|.....|.....|.....FRRRRF...........|    ---+--- ----
+|..---|........|........|.....|.....|.....|RRRR|..{..{..{..|    |.....|
+|..|..S........|..........................|R.|R............+##H#S.....S#
+|..|..|........|........|.....|.....|.....|RRRR|..{..{..{..|    |.....|
+|..|..|........|-+------|.....|.....|.....FRRRRF...........|    ---+---
+|..|..-----S----...|    |.....|.....|------RRRR|...........|       H
+|..S.....|...|.....|    |.....|------    |RRRR--------------       H
+---------|...|------    -------         --RRRR|  --------          H
+         |...|            ###           |RRRR----|......|          #
+         |...|              #  ###       RRRR| |.+......+###########
+     -----+++-----    ####  #  #         RRRR  |.+......+###########
+     |...........|    #     ######  ----  RRRR --|......|          #
+     |...........S#####     #    #  |..|  RRRR   --------       ---+---
+     |...........|    #     #    ###+..|   RRRR                 |.....|
+     |.....\.....|    #######       |..|   RRRR                 |.....|
+     -------------                  ----  RRRR                  -------
 ENDMAP
-STAIR:levregion(01,00,6,20),levregion(6,1,70,16),up
-BRANCH:levregion(01,00,6,20),levregion(6,1,70,16)
-TELEPORT_REGION:levregion(01,00,6,20),levregion(6,1,70,16)
-
+STAIR:(65,17),up
+STAIR:(11,16),down
+BRANCH:(73,01,74,03),(00,00,00,00)
+TELEPORT_REGION:(60,12,65,14),(00,00,00,00)
 # Doors
-DOOR:closed,(04,03)
-DOOR:locked,(18,04)
-DOOR:closed,(18,08)
-#
-STAIR:(13,07),down
+DOOR:locked,(67,16)
+DOOR:locked,(56,14)
+DOOR:locked,(56,13)
+DOOR:locked,(49,14)
+DOOR:locked,(49,13)
+DOOR:locked,(67,08)
+DOOR:locked,(67,04)
+DOOR:locked,(72,02)
+DOOR:locked,(64,06)
+DOOR:locked,(70,06)
+DOOR:locked,(17,08)
+DOOR:locked,(17,04)
+DOOR:locked,(13,02)
+DOOR:locked,(04,03)
+DOOR:locked,(03,10)
+DOOR:locked,(06,06)
+DOOR:locked,(11,09)
+DOOR:closed,(10,14)
+DOOR:closed,(11,14)
+DOOR:closed,(12,14)
+DOOR:locked,(17,16)
+DOOR:locked,(36,17)
+# Drawbridges
+DRAWBRIDGE:(46,06),west,closed
+DRAWBRIDGE:(43,06),west,closed
 # Non diggable walls
-NON_DIGGABLE:(00,00,20,11)
-# Entire main area
-REGION:(01,01,20,10),unlit,"ordinary"
+NON_DIGGABLE:(00,00,75,19)
+# Regions of light and dark
+REGION:(00,00,75,19),unlit,"ordinary"
+REGION:(25,02,29,05),unlit,"lemurepit"
+REGION:(31,03,35,05),unlit,"lemurepit"
+REGION:(37,04,41,05),unlit,"lemurepit"
+REGION:(37,07,41,08),unlit,"lemurepit"
+REGION:(31,07,35,09),unlit,"lemurepit"
+REGION:(25,07,29,10),unlit,"lemurepit"
+REGION:(48,03,58,09),lit,"ordinary"
+REGION:(06,15,16,18),lit,"ordinary"
 # The fellow in residence
-MONSTER:'&',"Asmodeus",(12,07)
+MONSTER:'&',"Asmodeus",(11,16)
+# His close friends
+MONSTER:'&',"marilith",(08,16),asleep
+MONSTER:'&',"marilith",(09,17),asleep
+MONSTER:'&',"succubus",(14,16),asleep
+MONSTER:'&',"succubus",(13,17),asleep
+MONSTER:'&',"incubus",(11,18),asleep
+MONSTER:'&',"barbed devil",(10,13),asleep
+MONSTER:'&',"barbed devil",(12,13),asleep
+# A few traps on the way in
+TRAP:"board",(10,12)
+TRAP:"board",(11,12)
+TRAP:"board",(12,12)
+TRAP:"fire",(11,11)
+TRAP:"fire",(10,10)
+TRAP:"fire",(12,10)
+# The 'fake' throne room
+MONSTER:'&',random,(07,04)
+MONSTER:'&',random,(14,04)
+MONSTER:'&',random,(07,08)
+MONSTER:'&',random,(14,08)
+OBJECT:'!',"invisibility",(07,04)
+OBJECT:'!',"invisibility",(14,04)
+OBJECT:'!',"invisibility",(07,08)
+OBJECT:'!',"invisibility",(14,08)
+MONSTER:'m',"giant mimic", (11,06), m_feature "staircase down"
+TRAP:"magic",(09,06)
+TRAP:"magic",(13,06)
+TRAP:"magic",(11,05)
+TRAP:"magic",(11,07)
 # Some random weapons and armor.
 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
 OBJECT:'!',random,random
 OBJECT:'!',random,random
 OBJECT:'?',random,random
 OBJECT:'?',random,random
 OBJECT:'?',random,random
-# Some traps.
-TRAP:"spiked pit", (05,02)
-TRAP:"fire", (08,06)
-TRAP:"sleep gas", random
-TRAP:"anti magic", random
-TRAP:"fire", random
-TRAP:"magic", random
-TRAP:"magic", random
-# Random monsters.
-MONSTER:' ',"ghost",(11,07)
-MONSTER:'&',"horned devil",(10,05)
-MONSTER:'L',random,random
-# Some Vampires for good measure
-MONSTER:'V',random,random
-MONSTER:'V',random,random
-MONSTER:'V',random,random
-# Second part
-GEOMETRY:half-right,center
-MAP
----------------------------------
-................................|
-................................+
-................................|
----------------------------------
-ENDMAP
-MAZEWALK:(32,02),east
-# Non diggable walls
-NON_DIGGABLE:(00,00,32,04)
-DOOR:closed,(32,02)
-MONSTER:'&',random,random
-MONSTER:'&',random,random
-MONSTER:'&',random,random
-TRAP:"anti magic", random
-TRAP:"fire", random
-TRAP:"magic", random
+# Traps in the outer chambers
+TRAP:"spiked pit",(02,08)
+TRAP:"anti magic",(21,06)
+TRAP:"sleep gas",(19,05)
+TRAP:"fire",(56,06)
+TRAP:"rust",(53,06)
+TRAP:"spiked pit",(50,03)
+TRAP:"polymorph",(69,02)
+# Teleport scrolls are kept in a closet
+OBJECT:'?',"teleportation",(63,06)
+# Traps in the inner spiral
+TRAP:"magic",(22,14)
+TRAP:"anti magic",(26,18)
+TRAP:"fire",(28,13)
+TRAP:"spiked pit",(32,13)
+# Treasure room
+GOLD:500,(38,16)
+GOLD:500,(38,17)
+GOLD:500,(38,18)
+OBJECT:'"',"amulet of change",(37,16)
+OBJECT:'=',"hunger",(37,18),cursed,0
+OBJECT:'*',"diamond",(38,16),cursed,0,"The Tears of Koth"
+OBJECT:'*',"ruby",(38,17),cursed,0,"The Heart of Cassanova"
+OBJECT:'*',"emerald",(38,18),cursed,0,"The Eye of Hera"
+MONSTER:'&',random,(38,16)
+MONSTER:'&',random,(38,17)
+MONSTER:'&',random,(38,18)
+# Outer Trap Room
+GOLD:1,(48,13)
+GOLD:1,(48,14)
+OBJECT:'?',"fire",(48,13),cursed,0
+OBJECT:'?',"earth",(48,14),cursed,0
+TRAP:"magic",(48,13)
+TRAP:"land mine",(48,14)
+GOLD:1,(51,12)
+GOLD:1,(50,14)
+GOLD:1,(52,15)
+GOLD:1,(53,13)
+TRAP:"fire",(54,13)
+TRAP:"fire",(54,14)
+TRAP:"magic",(52,12)
+TRAP:"magic",(52,15)
+TRAP:"spiked pit",(51,13)
+TRAP:"anti magic",(50,14)
+OBJECT:'!',"polymorph",(50,13)
+OBJECT:'?',"demonology",(50,12),cursed,0
+OBJECT:'?',"elementalism",(50,12),cursed,0
+# Guardians in the fountain room
+MONSTER:'&',random,(49,04)
+MONSTER:'&',random,(49,08)
+MONSTER:'&',random,(52,04)
+MONSTER:'&',random,(52,08)
+MONSTER:'V',random,(55,04)
+MONSTER:'V',random,(55,08)
+# Guardians in the outer chamber
+MONSTER:'d',"hell hound",(67,06)
+MONSTER:'d',"hell hound",(69,06)
+MONSTER:'d',"hell hound",(68,05)
+MONSTER:'d',"hell hound",(68,07)
+# Guardian in the branch chamber
+MONSTER:'j',"blue jelly",(73,02)
+# Greeting in the outer chamber
+MONSTER:'i',"imp",(69,17)
+OBJECT:'[',"helm of opposite alignment",(65,17),cursed,-2
+OBJECT:'*',"loadstone",(65,18),cursed,0
+OBJECT:'"',"amulet of strangulation",(65,18),cursed,0
 
 #
-# The Baalzebub level
+# The New Baalzebub level
 #
 MAZE:"baalz",random
-FLAGS: noteleport
-GEOMETRY:right,center
+FLAGS: noteleport,lethe,hardfloor
+GEOMETRY:center,center
 MAP
--------------------------------------------------
-|                    ---               ----      
-|          ----      |   ------------  |         
-| ------      |  --------|..........|---         
-| |....|  -------|...........--------------      
----....|--|..................S............|----  
-....--....S..----------------|............S...|  
----....|--|..................|............|----  
-| |....|  -------|...........-----S--------      
-| ------      |  --------|..........|---         
-|          ----     |    ------------  |         
-|                   ---                ----      
--------------------------------------------------
+      RR   RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR                  
+  ..RR...R ...RR....RRRR.....RR...RR.R..R.R.R....RR.R  RR.RR...    .....    
+ .RR..RRR..RRR...RRR....RR.F...RRR..R.RR.R.R..F.R..R.RRR...  RR. #.......   
+ R..  RRRRRRRR.F.RRRRRRRRFFFRRRRRRRRRRRRRRRFFFFRRRR.R....RR.R... # ......   
+ .RRRRRRRRRRRRRFFFFRRRRRRFRRR------------RRFRRRRRRRR.RR.R..... R.#          
+  .RRRFFFFFFRRRRRRFRR--------|..........|FFFRRRRRRRRRR.....RRR...  .R...    
+ .RRRRF....FRR-------|...........--------------RRRRRRRRRR.....  R... .R.R   
+ R.R---....|--|..................S............|----RRRRR...R.R ...R......   
+ ..R|...--....S..----------------|..........\.S...|RRRRRRR.....RR...  R..R  
+ .RR---....|--|..................|............|----RRRRRRRRR.....RR.....R.  
+  .RRRF....FRR-------|...........-----S--------RRRRRRRRR.....RR.....R R..   
+ .R.RRFFFFFFRRRRRRFRR--------|..........|FFFRRRRRRRR  R....R..RR..  ....RR  
+ R.R.RRRRRRRRRRFFFFRRRRRFRRRR------------RRFRRRRRRR   ..RR...R...R... R.    
+ RR.R.RRRRRRRR.F.RRRRRRRFFFRRRRRRRRRRRRRRRRFFFFRR... R...R.....RR.RR ...R   
+  .  R..RRRRRR...RRRRRRRR.F.RRRRR....RRRRRRRR.F....R...R...R....R...R ...R  
+ RR. . ..RRRRRRR.RRRR...R...RR...RR....RRRRRR...RR..R....R...R...RR...R     
+ R..R.R.R..  .R.R.R...R..RR...RR...RRR...RR...R.....R.R..R...RR..R  .R..    
+ RR..R.R.R.. R.R.R.R..R.R.RR....RRR...RRR....RR...RR......RR... .RR .....   
+   RR.RR..RR..RRR...R...RR....RRRRRRRR....RR......R....RRR..RR.R......      
+      RRR   RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR    RRR          
 ENDMAP
-STAIR:levregion(01,00,15,20),levregion(15,1,70,16),up
-BRANCH:levregion(01,00,15,20),levregion(15,1,70,16)
-TELEPORT_REGION:levregion(01,00,15,20),levregion(15,1,70,16)
-NON_DIGGABLE:(00,00,46,12)
-MAZEWALK:(00,06),west
-STAIR:(44,06),down
+# Regions
+REGION:(00,00,75,19),unlit,"ordinary"
+REGION:(68,01,72,03),lit,"ordinary"
+# Stairs
+STAIR:(69,02),up
+STAIR:(48,08),down
+BRANCH:(16,15,75,19),(00,00,00,00)
+TELEPORT_REGION:(16,15,75,19),(00,00,00,00)
+# Non diggable walls
+NON_DIGGABLE:(00,00,75,19)
+# Doors
+DOOR:locked,(14,08)
+DOOR:locked,(38,10)
+DOOR:locked,(33,07)
+DOOR:locked,(46,08)
+# Drawbridges
+DRAWBRIDGE:(03,08),east,closed
 # The fellow in residence
-MONSTER:'&',"Baalzebub",(35,06)
+MONSTER:'&',"Baalzebub",(44,08)
 # Some random weapons and armor.
 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
+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
 OBJECT:'?',random,random
 OBJECT:'?',random,random
 # Some traps.
 TRAP:"spiked pit", random
+TRAP:"spiked pit", random
 TRAP:"fire", random
+TRAP:"fire", random
+TRAP:"sleep gas", random
 TRAP:"sleep gas", random
 TRAP:"anti magic", random
-TRAP:"fire", random
+TRAP:"anti magic", random
+TRAP:"rust", random
+TRAP:"rust", random
+TRAP:"rust", random
+TRAP:"magic", random
+TRAP:"magic", random
 TRAP:"magic", random
 TRAP:"magic", random
 # Random monsters.
-MONSTER:' ',"ghost",(37,07)
-MONSTER:'&',"horned devil",(32,05)
-MONSTER:'&',"barbed devil",(38,07)
+MONSTER:' ',"ghost",(39,08)
+MONSTER:'&',"horned devil",(29,06)
+MONSTER:'&',"barbed devil",(29,10)
 MONSTER:'L',random,random
+MONSTER:' ',"ghost",random
+MONSTER:' ',"ghost",random
+MONSTER:' ',"shade",random
+MONSTER[50%]:' ',"shade",random
+MONSTER:'&',random,random
+MONSTER:'&',random,random
+MONSTER:'&',"horned devil",random
+MONSTER:'&',"horned devil",random
+MONSTER:'&',"horned devil",random
+MONSTER[50%]:'&',"horned devil",random
+MONSTER:'i',"lemure",random
+MONSTER:'i',"lemure",random
+MONSTER:'i',"lemure",random
+MONSTER:'i',"lemure",random
+MONSTER[50%]:'i',"lemure",random
 # Some Vampires for good measure
 MONSTER:'V',random,random
 MONSTER:'V',random,random
 MONSTER:'V',random,random
+# And a few blobby things, borrowed from Big J.
+MONSTER:'F',random,random
+MONSTER:'F',random,random
+MONSTER:'F',random,random
+MONSTER:'P',"green slime",random
+MONSTER:'P',random,random
+MONSTER:'P',random,random
+MONSTER[50%]:'P',random,random
 
-# [Tom]
+#
 # The Yeenoghu level
 #
+# Authors:
+#	Tom Proudfoot
+#	Mik Clarke
+#
+# Yeenoghu is the demon lord of the Gnolls, a secretive, silent
+# race of mountain dwelling creatures.
+#
 MAZE:"yeenoghu",random
-FLAGS: noteleport
-GEOMETRY:right,center
+FLAGS: noteleport,hardfloor,phlegethon
+GEOMETRY:center,center
 MAP
--------------------------------------------------
-| ---------|  |----------|                       
-| |....S...|--|......|...------------            
-| |....|...|  |......-...S..........|           
-| |....|-------..........|...------S-------      
----....|--|..............|...|............|----  
-..........S..............|---|.....\......S...|  
----....|--|..............|...|............|----  
-| |....|-------..........|...--------------      
-| |....|...|  |......-...S..........|            
-| |....S...|--|......|...------------            
-| ---------|  |----------|                       
--------------------------------------------------
+       RRRR       .....  ..    ----------- ------------               ...
+  ....  RRRR    ...   H ....  .|....|....| |......S...-------------- ..P...
+ ......  RRRR   H   .H......H..|....|....| |FFFFFF|...S..........+.|  ... .
+  ....  RRRR   ...H..  .....   |....|S--S---..........|...--------------  .
+   . H RRRR  .....      ...  ---....|..F.......{......|S--|............|--S-
+   H ..RRRRH......H..    ..H........|..F......{.{.....F...+.........\..S...|
+ ...   RRRR  ....   ...      ---....|..F.......{......|---|............|----
+......  RRRR        .....  ..H.|....|---S---..........|...--------------  .
+.......FRRRR   ..    ...  ... .|....|....| |FFFFFF|...S..........+.| .. ...
+ ......FFFFF.....H..     ....H.|....S....| |......S...--------------  ......
+  ..   RRRRF.  .. .....H.. ..  ----------- ------------...   .... ..H.. ..
+   .  RRRR  ..  . ...    H  ..     .....     ...H.....H. H .H.  ...   H  .H.
+   H   RRRR  .  .  .  .H..   .H.    .....   ...          ...   ...  ...    .
+   ..   RRRR  H H    .. ...    ...  ...... .....H. .H........   H  .....  ..
+ .....   RRRR .... .H.  ....  .. .H....... H ..  ... ...... .H. ..H....  ...
+  ....H..R.R.H...... ..  ...  H     ......H.    ..    ....    ...     .H...
+ ....   R.R.   ....   .. ...H...     ..... .H......  ......H.H.....     ..
+       RRRR            .H..    .....H...      ...     ....     ...
 ENDMAP
-STAIR:levregion(01,00,15,20),levregion(15,1,70,16),up
-BRANCH:levregion(01,00,15,20),levregion(15,1,70,16)
-TELEPORT_REGION:levregion(01,00,15,20),levregion(15,1,70,16)
-NON_DIGGABLE:(00,00,46,12)
-MAZEWALK:(00,06),west
-STAIR:(44,06),down
-# The fellow in residence
-MONSTER:'&',"Yeenoghu",(35,06)
-# Some random weapons and armor.
-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
-OBJECT:'?',random,random
-# Some traps.
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"magic", random
-TRAP:"magic", random
-TRAP:"magic", random
-TRAP:"magic", random
-# Random monsters.
-MONSTER:'Z',"ghoul",random
-MONSTER:'Z',"ghoul",random
-MONSTER:'Z',"ghoul",random
-MONSTER:'Z',"ghoul",random
-MONSTER:'Z',"ghoul",random
-MONSTER:'Z',"ghoul",random
-MONSTER:'Z',"ghoul",random
-MONSTER:'Z',"ghoul",random
-MONSTER:'Z',"ghast",random
-MONSTER:'Z',"ghast",random
-MONSTER:'Z',"ghast",random
-MONSTER:'Z',"ghast",random
-MONSTER:'Z',"ghast",random
-MONSTER:'Z',"ghast",random
-MONSTER:'G',"gnoll",random
-MONSTER:'G',"gnoll",random
-MONSTER:'G',"gnoll",random
-MONSTER:'G',"gnoll",random
-MONSTER:'G',"gnoll",random
-MONSTER:'G',"gnoll",random
-MONSTER:'G',"gnoll",random
-MONSTER:'G',"gnoll",random
+#
+# Regions
+REGION:(00,00,67,17),unlit,"ordinary"
+REGION:(68,00,75,17),unlit,"ordinary"
+REGION:(59,04,70,06),lit,"ordinary"
+
+# Branch and teleport points
+BRANCH:(00,11,75,17),(00,00,00,00)
+TELEPORT_REGION:(00,11,75,17),(00,00,00,00)
+
+# Protect the walls
+NON_DIGGABLE:(00,00,75,17)
+
+# Stairs up and down
+STAIR:(69,13),up
+STAIR:(73,05),down
+
+# Doors
+DOOR:locked,(36,09)
+DOOR:locked,(37,03)
+DOOR:locked,(40,03)
+DOOR:locked,(40,07)
+DOOR:locked,(50,01)
+DOOR:locked,(50,09)
+DOOR:locked,(54,08)
+DOOR:locked,(54,02)
+DOOR:locked,(55,04)
+DOOR:locked,(58,05)
+DOOR:locked,(65,02)
+DOOR:locked,(65,08)
+DOOR:locked,(71,05)
+DOOR:locked,(74,04)
+
+# A few random citizens
 MONSTER:'G',"gnoll",random
 MONSTER:'G',"gnoll",random
 MONSTER:'G',"gnoll",random
@@ -629,399 +824,2057 @@
 MONSTER:'G',"gnoll",random
 MONSTER:'G',"gnoll",random
 MONSTER:'G',"gnoll",random
+MONSTER:'G',"gnoll chieftain",random
+MONSTER:'G',"gnoll chieftain",random
+MONSTER:'G',"gnoll shaman",random
 
-# [Tom]
-# The Geryon level
+# A few random hazards
+MONSTER:'e',random,random
+MONSTER:'e',random,random
+MONSTER:'e',random,random
+MONSTER:'e',random,random
+MONSTER:random,random,random
+MONSTER:random,random,random
+MONSTER:random,random,random
+
+# Some random junk
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+OBJECT:')',random,random,cursed,-1
+OBJECT:')',random,random,cursed,-1
+OBJECT:')',random,random,cursed,-1
+OBJECT:'[',random,random,cursed,-1
+OBJECT:'[',random,random,cursed,-1
+OBJECT:'[',random,random,cursed,-1
+OBJECT:'%',random,random,cursed,+0
+OBJECT:'%',random,random,cursed,+0
+OBJECT:'%',random,random,cursed,+0
+
+# Fishies in the river
+MONSTER:';',random,(10,02)
+MONSTER:';',random,(09,05)
+MONSTER:';',random,(09,08)
+MONSTER:';',random,(08,10)
+MONSTER:';',random,(10,13)
+MONSTER:';',random,(08,16)
+
+# Flying things
+MONSTER:'B',random,(12,02)
+MONSTER:'B',random,(06,11)
+MONSTER:'a',random,(11,07)
+MONSTER:'a',random,(11,13)
+
+# The first camp...
+MONSTER:'G',"gnoll",(54,13)
+MONSTER:'G',"gnoll",(57,15)
+MONSTER:'G',"gnoll",(56,17)
+MONSTER:'G',"gnoll chieftain",(55,14)
+
+# The second camp...
+MONSTER:'G',"gnoll",(41,14)
+MONSTER:'G',"gnoll",(41,16)
+MONSTER:'G',"gnoll",(38,17)
+MONSTER:'G',"gnoll",(36,13)
+MONSTER:'G',"gnoll chieftain",(38,14)
+MONSTER:'G',"gnoll warrior",(39,12)
+MONSTER:'G',"gnoll shaman",(37,12)
+OBJECT:'(',"chest",(35,11)
+
+# Third camp
+MONSTER:'G',"gnoll",(25,13)
+MONSTER:'G',"gnoll",(26,15)
+
+# Fourth camp
+MONSTER:'G',"gnoll warrior",(15,14)
+MONSTER:'G',"gnoll",(17,14)
+MONSTER:'G',"gnoll",(18,16)
+MONSTER:'G',"gnoll warrior",(15,16)
+
+# Fifth camp
+MONSTER:'G',"gnoll warrior",(04,16)
+MONSTER:'G',"gnoll warrior",(05,14)
+MONSTER:'G',"gnoll warrior",(03,14)
+
+# Sixth Camp
+MONSTER:'G',"gnoll warrior",(02,10)
+MONSTER:'G',"gnoll warrior",(02,06)
+MONSTER:'G',"gnoll",(01,07)
+MONSTER:'G',"gnoll",(01,09)
+MONSTER:'G',"gnoll",(05,08)
+MONSTER:'G',"gnoll chieftain",(02,08)
+MONSTER:'G',"gnoll shaman",(06,09)
+OBJECT:'(',"chest",(00,08)
+
+# Seventh Camp
+MONSTER:'G',"gnoll warrior",(04,03)
+MONSTER:'G',"gnoll warrior",(02,03)
+MONSTER:'G',"gnoll warrior",(06,02)
+MONSTER:'G',"gnoll warrior",(03,01)
+
+# Eighth Camp
+MONSTER:'G',"gnoll warrior",(13,04)
+MONSTER:'G',"gnoll warrior",(13,06)
+MONSTER:'G',"gnoll warrior",(15,03)
+MONSTER:'G',"gnoll warrior",(17,04)
+MONSTER:'G',"gnoll chieftain",(15,06)
+# Loot
+OBJECT:'%',random,(20,07)
+OBJECT:'%',random,(21,08)
+OBJECT:'%',random,(22,08)
+OBJECT:'%',random,(23,08)
+OBJECT:'*',random,(24,07)
+OBJECT:'*',random,(23,07)
+OBJECT:'*',random,(22,06)
+
+# Nineth Camp
+MONSTER:'G',"gnoll warrior",(23,03)
+MONSTER:'G',"gnoll warrior",(24,01)
+MONSTER:'G',"gnoll warrior",(26,04)
+MONSTER:'G',"gnoll warrior",(27,03)
+MONSTER:'G',"gnoll chieftain",(27,01)
+MONSTER:'G',"gnoll shaman",(25,00)
+MONSTER:'G',"gnoll shaman",(26,00)
+
+# Entrance Chamber
+MONSTER:'Z',"skeleton",(32,01),hostile,asleep
+MONSTER:'Z',"skeleton",(33,01),hostile,asleep
+MONSTER:'Z',"skeleton",(34,01),hostile,asleep
+MONSTER:'Z',"skeleton",(35,01),hostile,asleep
+MONSTER:'Z',"skeleton",(32,09),hostile,asleep
+MONSTER:'Z',"skeleton",(33,09),hostile,asleep
+MONSTER:'Z',"skeleton",(34,09),hostile,asleep
+MONSTER:'Z',"skeleton",(35,09),hostile,asleep
+TRAP:"board",(32,05)
+TRAP:"board",(32,06)
+TRAP:"magic",(34,05)
+TRAP:"magic",(35,05)
+
+# Southern Antiroom
+MONSTER:'G',"gnoll warrior",(37,08),hostile
+MONSTER:'G',"gnoll warrior",(40,09),hostile
+
+# Pool Room
+MONSTER:'D',"black dragon",(38,05),hostile
+MONSTER:'D',random,(46,01),hostile
+MONSTER:'D',random,(46,09),hostile
+MONSTER:'h',"master mind flayer",(56,05),hostile
+OBJECT:'/',"cancellation",(56,05)
+OBJECT:'/',"lightning",(56,05)
+OBJECT:'!',"full healing",(56,05)
+MONSTER:''',"iron golem",(47,05),hostile,asleep
 #
-MAZE:"geryon",random
-FLAGS: noteleport
-GEOMETRY:right,center
-MAP
--------------------------------------------------
-| ------------|----------|                       
-| |....S......|..........|---------------------  
-| |....|......S..........S...|......|.........|  
-| |---S--------..........|...------S-----S-...|  
----...........|..........|...S............|--S-  
-..............|-S--------|---|............|...|  
----...........|..........|...|............|----  
-| |---------S--..........|...----------S-----    
-| |....|......|..........S..........|.......|    
-| |....S......|..........|----------|.......|    
-| ------------|----------|          ---------    
--------------------------------------------------
-ENDMAP
-STAIR:levregion(01,00,15,20),levregion(15,1,70,16),up
-BRANCH:levregion(01,00,15,20),levregion(15,1,70,16)
-TELEPORT_REGION:levregion(01,00,15,20),levregion(15,1,70,16)
-NON_DIGGABLE:(00,00,46,12)
-MAZEWALK:(00,06),west
-STAIR:(44,06),down
+MONSTER:'G',"gnoll warrior",(41,06),hostile
+MONSTER:'G',"gnoll warrior",(42,06),hostile
+MONSTER:'G',"gnoll warrior",(41,04),hostile
+MONSTER:'G',"gnoll warrior",(42,04),hostile
+MONSTER:'G',"gnoll warrior",(51,02),hostile
+MONSTER:'G',"gnoll warrior",(53,04),hostile
+MONSTER:'G',"gnoll warrior",(53,06),hostile
+MONSTER:'G',"gnoll shaman",(48,04),hostile
+MONSTER:'G',"gnoll shaman",(48,06)
+
+# Northern Antiroom
+MONSTER:'&',"nalfeshnee",(38,01),hostile
+MONSTER:'&',"vrock",(39,02),hostile
+
+# Southern Entrance
+MONSTER:random,random,(56,07),hostile
+MONSTER:random,random,(57,08),hostile
+MONSTER:random,random,(60,08),hostile
+MONSTER:random,random,(63,08),hostile
+TRAP:"polymorph",(64,08)
+TRAP:"anti magic",(66,08)
+
+# Northern Entrance
+MONSTER:'G',"gnoll warrior",(56,03),hostile
+MONSTER:'G',"gnoll warrior",(57,02),hostile
+MONSTER:'G',"gnoll shaman",(62,02),hostile
+TRAP:"web",(59,02)
+TRAP:"pit",(60,02)
+TRAP:"anti magic",(64,02)
+TRAP:"fire",(66,02)
+
+# Entrance Hall
+TRAP:"board",(57,05)
+
+# The throne room
 # The fellow in residence
-MONSTER:'&',"Geryon",(35,06)
-# Some random weapons and armor.
-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
-OBJECT:'?',random,random
-# Some traps.
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-# Random monsters.
-MONSTER:'H',"minotaur",random
-MONSTER:'H',"minotaur",random
-MONSTER:'H',"minotaur",random
-MONSTER:'H',"minotaur",random
-MONSTER:'H',"minotaur",random
-MONSTER:'H',"minotaur",random
-MONSTER:'H',"minotaur",random
-MONSTER:'H',"minotaur",random
-MONSTER:'&',"horned devil",random
-MONSTER:'&',"horned devil",random
-MONSTER:'&',"horned devil",random
-MONSTER:'&',"horned devil",random
-MONSTER:'&',"barbed devil",random
-MONSTER:'&',"barbed devil",random
-MONSTER:'&',"barbed devil",random
+MONSTER:'&',"Yeenoghu",(68,05)
+# A small hareem
+MONSTER:'&',"succubus",(65,04)
+MONSTER:'&',"succubus",(65,05)
+MONSTER:'&',"succubus",(65,06)
+MONSTER:'u',"pony",(64,05)
+# Some guards
+MONSTER:'G',"gnoll warrior",(59,04),hostile
+MONSTER:'G',"gnoll warrior",(59,06),hostile
+MONSTER:'&',"bone devil",(60,04)
+MONSTER:'&',"bone devil",(60,06)
+MONSTER:'&',"hezrou",(63,04)
+MONSTER:'&',"hezrou",(63,06)
+MONSTER:'&',"balrog",(70,04)
+MONSTER:'&',"balrog",(70,06)
+# And his advisors
+MONSTER:'G',"gnoll shaman",(67,04),hostile
+MONSTER:'G',"gnoll shaman",(67,06),hostile
+# A little loot
+OBJECT:'(',"chest",(70,05)
 
-# [Tom]
-# The Demogorgon level
+# The stair well
+MONSTER:'P',"green slime",(74,05),asleep,hostile
+
+# The treasure room
+MONSTER:'Z',"skeleton",(71,02),asleep,hostile
+MONSTER:'Z',"skeleton",(71,00),asleep,hostile
+MONSTER:'L',"master lich",(70,01),asleep,hostile
+OBJECT:'(',"chest",(69,01)
+OBJECT:'*',random,(69,01)
+OBJECT:'*',random,(69,01)
+OBJECT:'*',random,(69,01)
+OBJECT:'*',random,(69,01)
+
+
+#
+# A demogorgan level
+#
+# Don't be fooled by Demogorgons apparently greek name, he was
+# created during the 12th century by a transcription error.
+# He is very loosly associated with power, might and dark
+# underground forces.
 #
 MAZE:"demogorg",random
-FLAGS: noteleport
-GEOMETRY:right,center
+FLAGS: noteleport,lethe,hardfloor
+GEOMETRY:center,center
 MAP
--------------------------------------------------
-| ------------|------------------                
-| |}}}}}}}}}}}|}...}......}}}}}}|--------------  
-| |}}}}}}}}}}}|....}}...}...}}}}S...|.........|  
-| |-----}}-----...}...}.......}}|--S-----S-...|  
----....}}}}...|.....}}....}..}}}|...|.....|--S-  
-.......}}}}...|-S----------------...|.....|...|  
----..}}}}}}...|}..|      |...S..S...|.....|----  
-| |-}}}--------...|      |...-------|--S-----    
-| |}}}}|......S...|      |..........S.......|    
-| |}}}}S......|..}|      |----------|.......|    
-| ------------|----                 ---------    
--------------------------------------------------
+             RRRRRRRR                     RR      RRRRR    RRRR             
+  .... ....IIIRRRIRR        ....    ..   IIIR    RIIIRRRRRRRRRIIR     ....  
+  ........IIIRRIIIIRRRRII..+..... ....+.IIRRII IRRRIIIIRRIRRRIIIR..  .....  
+  ..  ...IIIRRIIIIIIRIIRII.    .....   .IIRRIIIRRRIIIIIRIIIRIIIRRI..  ....  
+    .IIIRRRRIIIIIIRIIIRRII...  R..   IIIRRRIIIIRRIIIIRIIIIIRRIRRII..   #    
+  ...IIIIIIRRIIIIRRRIIIIRRRIII  RR     RRRRRRIIRIIIIIRRIIIIRRIIIIRII..###   
+ ...RIIIIIIIIRRIIRRIRRRRIIIRRRR         RRIIIRRRRRRRRRIIIIRRIIIIRRRII. #    
+ ..IRIIIIIIIRRRRRIIIRRIIRRIIIIRRI   -----RIIIIRRIIIRRRRIIRRRRIIIIRRRI  ##   
+ ..IIRIIIIIRRRIIIIIRRIIIIIRRIIIRII  |...|RIIIIIRRIIIRRRRRIIIRRRRRIIRR   #   
+  IIIIRRIIIIRRIIIIRRIIIIIRRRRIRRRII |...| RRIIIIRIIIIRRIIIIRRRIIIIRR    #   
+   IIIIRRRIRIIRIIIIRRIIIIIRRRRIRRRIR--+--  IRRIIRRIIIIIRIIIIRRRIIIIRR.  ..  
+   RIIIIIIRIIIIRRRRIIRRRIIIRRRRRRIIRR|.|    IIRRRIIIIIRRRIIRRRIRIIIIRR. ... 
+  IIRIIIIIRIIIIIRIIIIIRRRRRIRRRRRRIRRF.|     IIIRRRRIIIIRRRRIIIRRIIRRR.#... 
+ IIIRRIIIRRRIIIIIRIIIIIRIIIIIRRRIIRR |.|      IIIRIIRRRRRIIIRRIIRRIIIRI  .. 
+ IIIIRRIIRIIRIIIRRRRIIIRRIIIIRIIIRR---S----  IIIRIIIIRRIIIIIRRRIIRIIRRR  #  
+ .IIIIIRRIIIIRRRRRRRRIIIRRIIIIRRIR |......|    RRRIIIIRRIIIIIRRRRIRRR    #  
+ ...IIIIRRRIIIIRRRIIIRIIIRIIIIIRR  |.\....|     .IIIIRRIIIIIRRRIIIRR. ....  
+ ....IIIIRRRRIIRRIIIIRRIIRIIIII    |......S## ##..IIIIRRIIIRRRIIIRR. ...... 
+  ....IIIIRRRRRR      RRRIIII      -------- ###  ....IIIRRRRRRRIIR..#.....  
+           RRRR        RRRR                              RRRRRRRRRRR        
 ENDMAP
-STAIR:levregion(01,00,15,20),levregion(15,1,70,16),up
-BRANCH:levregion(01,00,15,20),levregion(15,1,70,16)
-TELEPORT_REGION:levregion(01,00,15,20),levregion(15,1,70,16)
-NON_DIGGABLE:(00,00,46,12)
-MAZEWALK:(00,06),west
-STAIR:(44,06),down
+# Regions
+REGION:(00,00,34,19),unlit,"ordinary"
+REGION:(40,00,75,19),unlit,"ordinary"
+REGION:(24,00,39,05),unlit,"ordinary"
+REGION:(36,15,41,17),lit,"ordinary"
+REGION:(38,10,38,12),unlit,"ordinary"
+REGION:(37,08,39,09),lit,"ordinary"
+# Stairs
+STAIR:(02,17),up
+STAIR:(37,08),down
+BRANCH:(67,01,75,19),(00,00,00,00)
+TELEPORT_REGION:(67,01,75,19),(00,00,00,00)
+# Non diggable walls
+NON_DIGGABLE:(00,00,75,19)
+# Doors
+DOOR:locked,(27,02)
+DOOR:locked,(38,02)
+DOOR:locked,(42,17)
+DOOR:locked,(38,14)
+DOOR:locked,(38,10)
+# The master
+MONSTER:'&',"Demogorgon",(37,16)
+OBJECT:'(',"frost horn",(37,16)
+# His court
+MONSTER:'&',"ice devil",(38,15)
+MONSTER:'&',"ice devil",(38,17)
+MONSTER:'&',"bone devil",(40,15)
+MONSTER:'&',"bone devil",(40,17)
+MONSTER:'&',"succubus",(36,15)
+MONSTER:'&',"succubus",(36,17)
+MONSTER:'b',"gelatinous cube",(41,15)
+MONSTER:'b',"gelatinous cube",(41,17)
+# His doorbell
+TRAP:"board",(43,17)
+# The final guardians
+MONSTER:'j',"blue jelly",(37,08)
+MONSTER:'j',"blue jelly",(37,09)
+MONSTER:'j',"blue jelly",(38,08)
+MONSTER:'j',"blue jelly",(38,09)
+MONSTER:'j',"blue jelly",(39,08)
+MONSTER:'j',"blue jelly",(39,09)
+# A family of Ice Trolls
+MONSTER:'T',"ice troll",(02,01)
+MONSTER[90%]:'T',"ice troll",(02,02)
+MONSTER[80%]:'T',"ice troll",(02,03)
+MONSTER[70%]:'T',"ice troll",(03,01)
+MONSTER[50%]:'T',"ice troll",(03,02)
+MONSTER[30%]:'T',"ice troll",(04,01)
+MONSTER[10%]:'T',"ice troll",(06,02)
+# This is fun with all that ice around here...
+OBJECT[50%]:'/',"fire",(03,02)
+# A few Yetis
+MONSTER:'Y',"yeti",(33,03)
+MONSTER:'Y',"yeti",(30,01)
+MONSTER:'Y',"yeti",(36,02)
+MONSTER[75%]:'Y',"yeti",(28,02)
+MONSTER[75%]:'Y',"yeti",(37,02)
+MONSTER[50%]:'Y',"yeti",(30,02)
+MONSTER[50%]:'Y',"yeti",(37,02)
+MONSTER[50%]:'Y',"yeti",(33,04)
+# Stray Frost giants
+MONSTER:'H',"frost giant",(20,13)
+MONSTER:'H',"frost giant",(20,12)
+MONSTER:'H',"frost giant",(20,14)
+MONSTER:'H',"frost giant",(21,14)
+# Dragons
+MONSTER:'D',"white dragon",(71,02),asleep
+OBJECT:'(',"chest",(69,02)
+GOLD:random,(73,01)
+MONSTER:'D',"silver dragon",(73,11),asleep
+OBJECT:'(',"chest",(74,11)
+GOLD:random,(74,12)
+MONSTER:'D',"gray dragon",(71,17),asleep
+OBJECT:'(',"chest",(74,17)
+GOLD:random,(70,16)
+# Finally some wolves
+MONSTER:'d',"winter wolf",(57,10)
+MONSTER[90%]:'d',"winter wolf",(58,08)
+MONSTER[60%]:'d',"winter wolf",(53,10)
+MONSTER[30%]:'d',"winter wolf",(57,05)
+
+#
+# The Geryon level
+#
+# Authors:
+#	Tom Proudfoot
+#	Mik Clarke
+#
+# Geryon was a three-bodied giant in the Labour of Hercules
+# and the personification of Fraud in the Inferno. He appears
+# at the inner edge of the seventh circle and carries Dante
+# down the great barrier to the eight circle.
+#
+MAZE:"geryon",random
+FLAGS: noteleport,hardfloor,phlegethon
+GEOMETRY:center,center
+MAP
+                                  RRRR  ......   LLL    .LLLL  LLL          
+   ..        ......LLL           RRRR  ..... . LLLLLL  .LLLLLLLLLLLLLLLL    
+  ....    .....LLLL.....        RRRR     ... ..LLLLLLLLLLLLL .LLLLL LLLLL.  
+ ....      ...L      ...        RRRR  .-----  ...LLL    LLL   ..LL   LLL.   
+  ..        .      ....          RRRR..|...|------------FFF-         ....   
+   .     ....      .           ..RRRR..S...|...S...........|----------S---  
+   ..   ......   .....        ....RRRR.---+-FF.|....RRR....S...|L...L|...|  
+    ......LL... ..  ...      .....RRRR..L|...F.|....RRR....|--S|..\..S...|  
+   ..  ...LLL....  ......     ....RRRR..L|...F.|...........|...|.....|--+-  
+  ..    ......    ...L..     ....RRRR...L|FFFF.|------------...|.....|...|  
+ .....   ...    ....LL.... .....RRRR....L|.....|    |...S..S...|L...L|----  
+  ....   .        ...... ... ..RRRR....---+----- . |..-------|---S----      
+  ..   ...       ..          .RRRR.....S...|   LLL |.........|.......|      
+ ..   ..         .    ..      RRRR.....|...|  LL   |--FFF----|.......|      
+ .  ...       .....  ...L      RRRR....---S-   LLL    LLL    ----S----      
+ ....L..    ....  .....LL       RRRR      .     LLL  LLLLL     LL.LL        
+  ...LL......      ...LLLLL  LLLLRRR      ..   LLLLLLLLLLLLLL LLLL.LL       
+   ......           .LLL  LLLL  RRRR       ....LLLLL.....LLLLLL...LL        
+                                 RRRR         ......LLLLL......LLLL         
+ENDMAP
+
+# Regions
+REGION:(00,00,75,18),unlit,"ordinary"
+
+# Branch and teleport points
+BRANCH:(00,00,24,18),(00,00,00,00)
+TELEPORT_REGION:(00,00,24,18),(00,00,00,00)
+
+# Protect the walls
+NON_DIGGABLE:(35,00,75,18)
+
+# Stairs up and down
+STAIR:(02,03),up
+STAIR:(41,01),down
+
+# Doors
+DOOR:locked,(39,05)
+DOOR:locked,(39,12)
+DOOR:locked,(42,06)
+DOOR:locked,(42,11)
+DOOR:locked,(42,14)
+DOOR:locked,(47,05)
+DOOR:locked,(59,06)
+DOOR:locked,(62,07)
+DOOR:locked,(59,10)
+DOOR:locked,(56,10)
+DOOR:locked,(65,14)
+DOOR:locked,(65,11)
+DOOR:locked,(69,07)
+DOOR:locked,(72,08)
+DOOR:locked,(70,05)
+
+DRAWBRIDGE:(40,08),east,closed
+
+# A few random demons
+
+MONSTER:'&',random,random
+MONSTER:'&',random,random
+MONSTER:'&',random,random
+MONSTER:'&',random,random
+
+# A few random traps
+
+TRAP:"fire",random
+TRAP:"fire",random
+TRAP:"fire",random
+TRAP:"fire",random
+TRAP:"fire",random
+TRAP:"fire",random
+TRAP:"fire",random
+TRAP:"fire",random
+
+TRAP:"magic",random
+TRAP:"magic",random
+TRAP:"magic",random
+
+TRAP:"anti magic",random
+TRAP:"anti magic",random
+
+# Outer defences
+
+MONSTER:'X',"xorn",(10,05),asleep,hostile
+MONSTER:'X',"xorn",(02,10),asleep,hostile
+MONSTER:'X',"xorn",(11,09),asleep,hostile
+MONSTER:'X',"xorn",(16,01),asleep,hostile
+MONSTER:'X',"xorn",(22,08),asleep,hostile
+
+MONSTER:'H',"fire giant",(03,15),asleep,hostile
+MONSTER:'H',"fire giant",(04,17),asleep,hostile
+MONSTER:'H',"fire giant",(06,14),asleep,hostile
+MONSTER:'H',"fire giant",(06,17),asleep,hostile
+MONSTER:'H',"fire giant",(08,16),asleep,hostile
+
+MONSTER:'E',"fire elemental",(11,08),asleep,hostile
+MONSTER:'E',"fire elemental",(05,16),asleep,hostile
+MONSTER:'E',"fire elemental",(17,02),asleep,hostile
+MONSTER:'E',"fire elemental",(20,10),asleep,hostile
+MONSTER:'E',"fire elemental",(22,17),asleep,hostile
+MONSTER:'E',"fire elemental",(24,15),asleep,hostile
+
+MONSTER:'d',"hell hound",(21,08),asleep,hostile
+MONSTER:'d',"hell hound",(19,10),asleep,hostile
+MONSTER:'d',"hell hound",(23,09),asleep,hostile
+MONSTER:'d',"hell hound",(21,11),asleep,hostile
+
+MONSTER:'D',"red dragon",(21,15),asleep,hostile
+
+TRAP:"board",(06,07)
+TRAP:"board",(01,14)
+TRAP:"board",(09,11)
+TRAP:"board",(12,04)
+TRAP:"board",(18,06)
+TRAP:"board",(19,05)
+TRAP:"board",(11,16)
+TRAP:"board",(17,13)
+TRAP:"board",(19,15)
+
+# Guardians at the crossing
+
+MONSTER:'B',random,(32,05),asleep,hostile
+MONSTER:'B',random,(35,06),asleep,hostile
+MONSTER:'B',random,(30,12),asleep,hostile
+MONSTER:'B',random,(34,11),asleep,hostile
+
+MONSTER:'&',"hezrou",(31,08),asleep,hostile
+MONSTER:'&',"hezrou",(29,12),asleep,hostile
+MONSTER:'&',"hezrou",(33,08),asleep,hostile
+MONSTER:'&',"hezrou",(31,07),asleep,hostile
+
+MONSTER:'&',"nalfeshnee",(37,09),asleep,hostile
+MONSTER:'&',"nalfeshnee",(35,12),asleep,hostile
+MONSTER:'&',"nalfeshnee",(39,10),asleep,hostile
+
+MONSTER:'E',"fire elemental",(35,04),asleep,hostile
+MONSTER:'E',"fire elemental",(32,14),asleep,hostile
+
+TRAP:"board",(28,10)
+TRAP:"board",(32,07)
+
+# The cage trap
+
+MONSTER:'D',"black dragon",(43,09)
+
+MONSTER:'&',"pit fiend",(41,05)
+
+MONSTER:'&',"pit fiend",(41,12)
+
+MONSTER:'&',"nalfeshnee",(46,10)
+MONSTER:'&',"bone devil",(46,08)
+MONSTER:'&',"bone devil",(44,05)
+MONSTER:'&',"bone devil",(46,05)
+
+# The water room
+
+MONSTER:'&',"water demon",(50,06)
+MONSTER:'&',"water demon",(51,08)
+MONSTER:'&',"water demon",(55,08)
+MONSTER:'&',"water demon",(56,05)
+
+MONSTER:'n',"water nymph",(48,06)
+MONSTER:'n',"water nymph",(49,08)
+MONSTER:'n',"water nymph",(56,08)
+MONSTER:'n',"water nymph",(58,06)
+MONSTER:'n',"water nymph",(53,05)
+MONSTER:'n',"water nymph",(53,08)
+
+MONSTER:'&',"nalfeshnee",(58,08)
+
+MONSTER:'g',"gremlin",(48,08)
+
+# Secret rooms and passages are empty
+
+# Gallery
+
+MONSTER:'L',"arch-lich",(56,12),asleep,hostile
+
+MONSTER:'&',"nalfeshnee",(55,12)
+MONSTER:'&',"nalfeshnee",(54,12)
+MONSTER:'D',"blue dragon",(59,12)
+
+TRAP:"board",(54,10)
+
+# Southern Lava Walk
+
+MONSTER:'E',"fire elemental",(48,16)
+MONSTER:'E',"fire elemental",(55,17)
+MONSTER:'E',"fire elemental",(63,16)
+
+MONSTER:':',"salamander",(52,17)
+MONSTER:':',"salamander",(62,18)
+
+MONSTER:'V',"fire vampire",(68,16)
+
+MONSTER:'D',"red dragon",(49,11)
+OBJECT:'(',"chest",(49,11)
+OBJECT:'*',"ruby",(49,11)
+OBJECT:'*',"ruby",(49,11)
+OBJECT:'*',random,(49,11)
+OBJECT:'*',random,(49,11)
+OBJECT:'*',random,(49,11)
+OBJECT:'*',random,(49,11)
+OBJECT:'*',random,(49,11)
+OBJECT:'*',random,(49,11)
+GOLD:random,(49,11)
+
+# Antichamber and throne room
+
+MONSTER:''',random,(65,12),asleep,hostile
+MONSTER:''',random,(64,12),asleep,hostile
+MONSTER:''',random,(66,12),asleep,hostile
+
+MONSTER:'&',"nalfeshnee",(62,13)
+MONSTER:'&',"nalfeshnee",(68,13)
+
+TRAP:"board",(65,13)
+TRAP:"magic",(64,13)
+TRAP:"magic",(66,13)
+
 # The fellow in residence
-MONSTER:'&',"Demogorgon",(06,06)
-# Some random weapons and armor.
-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
-OBJECT:'?',random,random
-# Random monsters.
-MONSTER:'P',random,random
-MONSTER:'P',random,random
-MONSTER:'P',random,random
-MONSTER:'P',random,random
-MONSTER:'P',random,random
-MONSTER:'P',random,random
-MONSTER:'P',random,random
-MONSTER:'P',random,random
-MONSTER:'P',random,random
-MONSTER:'j',random,random
-MONSTER:'j',random,random
-MONSTER:'j',random,random
-MONSTER:'j',random,random
-MONSTER:'j',random,random
-MONSTER:'j',random,random
-MONSTER:'j',random,random
-MONSTER:'F',random,random
-MONSTER:'F',random,random
-MONSTER:'F',random,random
-MONSTER:'F',random,random
-MONSTER:'F',random,random
-MONSTER:'&',"hezrou",random
-MONSTER:'&',"hezrou",random
-MONSTER:'&',"hezrou",random
-MONSTER:'&',"hezrou",random
-MONSTER:'&',"hezrou",random
-MONSTER:'&',"hezrou",random
-MONSTER:'&',"hezrou",random
-MONSTER:'&',"hezrou",random
-MONSTER:'&',"hezrou",random
-MONSTER:'&',"hezrou",random
-MONSTER:'&',"vrock",random
-MONSTER:'&',"vrock",random
-MONSTER:'&',"vrock",random
-MONSTER:'&',"vrock",random
-MONSTER:'&',"vrock",random
-MONSTER:'&',"vrock",random
 
-# [Tom]
+MONSTER:'&',"Geryon",(66,07)
+
+MONSTER:'&',"pit fiend",(65,08)
+MONSTER:'&',"balrog",(67,08)
+MONSTER:'&',"marilith",(64,09)
+MONSTER:'&',"nalfeshnee",(68,09)
+MONSTER:'&',"succubus",(67,07)
+MONSTER:'&',"succubus",(65,07)
+
+MONSTER:'V',"fire vampire",(66,18)
+
+OBJECT:'(',"chest",(66,06)
+OBJECT:'(',"chest",(64,08)
+OBJECT:'(',"chest",(68,08)
+
+# Fake stairs
+
+MONSTER:'m',"giant mimic",(71,09),m_feature "staircase down"
+
+# Northern Lava Walk
+
+MONSTER:'E',"fire elemental",(64,02)
+MONSTER:'E',"fire elemental",(57,02)
+MONSTER:'E',"fire elemental",(50,01)
+
+MONSTER:':',"salamander",(54,02)
+MONSTER:':',"salamander",(67,01)
+
+MONSTER:'V',"fire vampire",(57,00)
+
+# Exit chamber
+
+MONSTER:'&',"pit fiend",(42,01),asleep,hostile
+
+TRAP:"board",(45,01)
+
+#
 # The Dispater level
 #
+# Authors:
+#	Tom Proudfoot
+#	Mik Clarke
+#
+# Dispaters origins are in the Roman god of the underworld.
+# originally Dis Pater (rich father) he is associated with
+# wealth (naturally found underground).
+#
 MAZE:"dispater",random
-FLAGS: noteleport
+FLAGS: noteleport,hardfloor,lethe
 GEOMETRY:right,center
 MAP
--------------------------------------------------
-| ----------------------------------------|--    
-| |.....|.....................|...|...|...S.|    
-| |.--|.|.-------------------.|.|.|.|.|.|.|.|    
-| |...|.|...................|.|.|.|.|.|.|.|.|    
-----|.|.|-----------------|.|.|.|.|.|.|.|.|S---  
-....|.|.|.................|.|.|.|.|.|.|.|.|...|  
----.|.|.|.|--------------.|.|.|.|.|.|.|.|.|----  
-| |.|.|.|.|...............|.|.|.|.|.|.|.|.| |    
-| |.|.|.|.|.--------------|.|.|.|.|.|.|.|.| |    
-| |...|...|.................|...|...|...|.| |    
-| -------------------------------------------    
--------------------------------------------------
+              RRRR                               
+---------       RRRR    ..        ....     ------
+|...|.S.|     ..RRRR. .....     .......----|.S..|
+|.|S|.|S|    ..RRRR..  ....    .. .... |...----.|
+|.|...|.|    .RRRR..      ..  ..       |...S..|.|
+|.-------..  .RRRR.     ........    ----S----.|.|
+|.|.....|......RRRR..........  -----|.....|.S.|.|
+|.|.--|.|.......RRRR...... .   |....+.....|.|.|.|
+|.|...|S|  ...  RRRR.....  .|---+-----S---|.|.S.|
+-S-S|.|.|....  RRRR   ... ..+............ |S---.|
+....|S--|S|....RRRR  ...... | .........\..F...|.|
+-S-S|...|.|.....RRRR....  ..+............ |----S|
+|.|.|.|.|S| ... RRRR.....  .|---+-----S---|..S..|
+|.|.|.|.|.| ..  RRRR ..... ..  |....+.....|-----|
+|.|...|...|  ..RRRR.... ..  .. -----|.....S....| 
+|.---------  .RRRR...    .. ..      -------....| 
+|.....|     .. RRRR...  .....  ...  .... .+....| 
+|----.|    ....RRRR .. .. ...... .... ....------ 
+|.S...|      .RRRR...   .....      .....         
+-------        RRRR                                 
 ENDMAP
-STAIR:levregion(01,00,15,20),levregion(15,1,70,16),up
-BRANCH:levregion(01,00,15,20),levregion(15,1,70,16)
-TELEPORT_REGION:levregion(01,00,15,20),levregion(15,1,70,16)
-NON_DIGGABLE:(00,00,46,12)
-MAZEWALK:(00,06),west
-STAIR:(44,06),down
-# The fellow in residence
-MONSTER:'&',"Dispater",(18,06)
-# Some random weapons and armor.
-OBJECT:'[',random,random
-OBJECT:'[',random,random
-OBJECT:')',random,random
-OBJECT:')',random,random
+
+# Regions
+REGION:(00,00,48,19),unlit,"ordinary"
+
+# Branch and Teleport points
+BRANCH:levregion(01,00,74,19),levregion(26,00,74,19)
+TELEPORT_REGION:levregion(01,00,74,19),levregion(26,00,74,19)
+
+# Protect the walls
+NON_DIGGABLE:(00,00,48,19)
+
+# Maze the rest of the level
+MAZEWALK:(00,10),west
+
+# Stairs
+STAIR:levregion(01,00,74,19),levregion(26,00,74,19),up
+STAIR:(43,12),down
+
+# Doors
+DOOR:locked,(01,09)
+DOOR:locked,(03,09)
+DOOR:locked,(01,11)
+DOOR:locked,(03,11)
+DOOR:locked,(05,10)
+DOOR:locked,(07,08)
+DOOR:locked,(09,10)
+DOOR:locked,(09,12)
+DOOR:locked,(02,18)
+DOOR:locked,(03,03)
+DOOR:locked,(06,02)
+DOOR:locked,(07,03)
+
+DOOR:locked,(28,09)
+DOOR:locked,(28,11)
+DOOR:locked,(32,08)
+DOOR:locked,(32,12)
+DOOR:locked,(38,08)
+DOOR:locked,(38,12)
+DOOR:locked,(36,07)
+DOOR:locked,(36,13)
+DOOR:locked,(40,05)
+DOOR:locked,(43,04)
+DOOR:locked,(45,02)
+DOOR:locked,(44,06)
+DOOR:locked,(46,08)
+DOOR:locked,(43,09)
+DOOR:locked,(47,11)
+DOOR:locked,(45,12)
+DOOR:locked,(42,14)
+DOOR:locked,(42,16)
+
+# Some random money
+GOLD:random,random
+GOLD:random,random
+GOLD:random,random
+GOLD:random,random
+GOLD:random,random
+GOLD:random,random
+GOLD:random,random
+GOLD:random,random
+GOLD:random,random
+GOLD:random,random
+
+# Some random gems
 OBJECT:'*',random,random
-OBJECT:'!',random,random
-OBJECT:'!',random,random
-OBJECT:'?',random,random
-OBJECT:'?',random,random
-OBJECT:'?',random,random
-# Some traps.
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-TRAP:"fire", random
-# Random monsters.
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"lemure",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"imp",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'i',"nupperibo",random
-MONSTER:'&',"horned devil",random
-MONSTER:'&',"horned devil",random
-MONSTER:'&',"horned devil",random
-MONSTER:'&',"horned devil",random
-MONSTER:'&',"barbed devil",random
-MONSTER:'&',"barbed devil",random
-MONSTER:'&',"barbed devil",random
-MONSTER:'&',"barbed devil",random
-MONSTER:'&',"barbed devil",random
-MONSTER:'&',"barbed devil",random
-MONSTER:'&',"bone devil",random
-MONSTER:'&',"bone devil",random
-MONSTER:'&',"bone devil",random
-MONSTER:'&',"bone devil",random
-MONSTER:'&',"bone devil",random
-MONSTER:'&',"bone devil",random
-MONSTER:'&',"bone devil",random
-MONSTER:'&',"bone devil",random
-MONSTER:'&',"bone devil",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
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+
+# Some random traps
+TRAP:random,random
+TRAP:random,random
+TRAP:random,random
+TRAP:random,random
+TRAP:random,random
+TRAP:random,random
+TRAP:"fire",random
+TRAP:"fire",random
+TRAP:"fire",random
+TRAP:"fire",random
+TRAP:"fire",random
+TRAP:"fire",random
+
+# Gold in the outer vaults
+MONSTER:''',"gold golem",(07,04)
+OBJECT:'*',random,(07,04)
+
+MONSTER:''',"gold golem",(07,02)
+OBJECT:'*',random,(07,02)
+
+MONSTER:''',"gold golem",(03,04)
+OBJECT:'*',random,(03,04)
+
+MONSTER:''',"gold golem",(07,09)
+OBJECT:'*',random,(07,09)
+
+MONSTER:''',"gold golem",(01,18)
+OBJECT:'*',random,(01,18)
+
+MONSTER:''',"gold golem",(09,11)
+OBJECT:'*',random,(09,11)
+
+# A river of gold?
+
+GOLD:random,(15,02)
+GOLD:random,(14,03)
+GOLD:random,(13,05)
+GOLD:random,(14,06)
+GOLD:random,(15,07)
+GOLD:random,(14,10)
+GOLD:random,(15,11)
+GOLD:random,(14,14)
+GOLD:random,(13,15)
+GOLD:random,(14,17)
+GOLD:random,(13,18)
+
+GOLD:random,(20,02)
+GOLD:random,(19,03)
+GOLD:random,(18,04)
+GOLD:random,(19,06)
+GOLD:random,(20,07)
+GOLD:random,(21,08)
+GOLD:random,(20,11)
+GOLD:random,(20,12)
+GOLD:random,(19,14)
+GOLD:random,(18,15)
+GOLD:random,(19,16)
+GOLD:random,(18,18)
+
+# Outer Guardians
+MONSTER:''',"crystal golem",(11,06)
+MONSTER:''',"ruby golem",(12,11)
+MONSTER:''',"sapphire golem",(13,04)
+MONSTER:''',"diamond golem",(13,15)
+
+# Fishies in the river
+MONSTER:';',random,(17,02)
+MONSTER:';',random,(15,05)
+MONSTER:';',random,(18,08)
+MONSTER:';',random,(17,11)
+MONSTER:';',random,(16,14)
+MONSTER:';',random,(17,17)
+
+# Nearside Guardians
+MONSTER:''',"ruby golem",(26,04)
+MONSTER:''',"ruby golem",(25,15)
+MONSTER:''',"sapphire golem",(29,05)
+MONSTER:''',"sapphire golem",(27,13)
+MONSTER:''',"diamond golem",(25,10)
+
+# The fellow in residence
+MONSTER:'&',"Dispater",(39,10)
+
+# His court
+MONSTER:'&',"nalfeshnee",(38,09),asleep,hostile
+MONSTER:'&',"nalfeshnee",(38,11),asleep,hostile
+
+MONSTER:'&',"succubus",(39,09),asleep,hostile
+MONSTER:'&',"incubus",(39,11),asleep,hostile
+
+MONSTER:''',"diamond golem",(35,09),asleep,hostile
+MONSTER:''',"diamond golem",(35,11),asleep,hostile
+
+# His guards
+MONSTER:'&',"ice devil",(31,09),asleep,hostile
+MONSTER:'&',"ice devil",(33,09),asleep,hostile
+MONSTER:'&',"ice devil",(31,11),asleep,hostile
+MONSTER:'&',"ice devil",(31,11),asleep,hostile
+MONSTER:'&',"ice devil",(30,10),asleep,hostile
+
+# Some doorbells
+TRAP:"board",(27,09)
+TRAP:"board",(27,11)
+TRAP:"board",(29,09)
+TRAP:"board",(29,09)
+TRAP:"board",(32,09)
+TRAP:"board",(32,11)
+
+# Traps for the unwary
+TRAP:"anti magic",(32,07)
+TRAP:"anti magic",(32,13)
+TRAP:"magic",(33,07)
+TRAP:"magic",(33,13)
+TRAP:"polymorph",(34,07)
+TRAP:"polymorph",(34,13)
+TRAP:"magic",(35,07)
+TRAP:"magic",(35,13)
+TRAP:"fire",(37,07)
+TRAP:"fire",(37,13)
+
+# Northern antichamber
+MONSTER:'&',random,(40,07)
+MONSTER:'&',random,(38,06)
+OBJECT:'(',"chest",(41,06)
+OBJECT:'(',"chest",(41,07)
+
+# Southern antichamber
+MONSTER:'&',random,(40,13)
+MONSTER:'&',random,(38,14)
+OBJECT:'(',"chest",(41,14)
+OBJECT:'(',"chest",(41,13)
+
+# Escape Room
+TRAP:"polymorph",(44,15)
+TRAP:"magic",(45,15)
+MONSTER:''',"diamond golem",(43,15),asleep,hostile
+
+# Northern Vault
+TRAP:"board",(40,04)
+GOLD:random,(40,03)
+OBJECT:'*',random,(40,03)
+OBJECT:'*',random,(40,03)
+GOLD:random,(41,03)
+OBJECT:'*',random,(41,03)
+OBJECT:'*',random,(41,03)
+GOLD:random,(42,03)
+OBJECT:'*',random,(42,03)
+OBJECT:'*',random,(42,03)
+GOLD:random,(40,04)
+OBJECT:'*',random,(40,04)
+OBJECT:'*',random,(40,04)
+GOLD:random,(41,04)
+OBJECT:'*',random,(41,04)
+OBJECT:'*',random,(41,04)
+GOLD:random,(42,04)
+OBJECT:'*',random,(42,04)
+OBJECT:'*',random,(42,04)
+MONSTER:'m',"giant mimic",(42,04)
+
+# Animate Gold
+MONSTER:''',"gold golem",(43,07)
+MONSTER:''',"gold golem",(45,06)
+MONSTER:''',"gold golem",(47,04)
+MONSTER:''',"gold golem",(47,12)
+
+# Exit chamber (and ref to old TV show - Saphire and Steel)
+MONSTER:''',"sapphire golem",(44,12)
+MONSTER:''',"steel golem",(43,12)
+GOLD:random,(43,12)
+GOLD:random,(44,12)
+GOLD:random,(46,12)
+GOLD:random,(47,12)
+
+# Barred Vault
+MONSTER:''',"sapphire golem",(43,10)
+MONSTER:''',"sapphire golem",(44,10)
+MONSTER:''',"sapphire golem",(45,10)
+GOLD:random,(43,10)
+GOLD:random,(44,10)
+GOLD:random,(45,10)
+OBJECT:'*',"diamond",(43,10)
+OBJECT:'*',"ruby",(43,10)
+OBJECT:'*',"loadstone",(43,10)
+OBJECT:'*',"emerald",(43,10)
+OBJECT:'*',"sapphire",(43,10)
+OBJECT:'*',"amethyst",(44,10)
+OBJECT:'*',"jade",(44,10)
+OBJECT:'*',"opal",(44,10)
+OBJECT:'*',"luckstone",(44,10)
+OBJECT:'*',"jacinth",(44,10)
+OBJECT:'*',"aquamarine",(45,10)
+OBJECT:'*',"fluorite",(45,10)
+OBJECT:'*',"loadstone",(45,10)
+OBJECT:'*',"jasper",(45,10)
+OBJECT:'*',"citrine",(45,10)
 
 #
-# The Sanctum Level
+#       Pleaseant Valley.
 #
-MAZE:"sanctum", ' '
-FLAGS: noteleport,hardfloor
+#       Green hills, trees, sheep, nymphs and people.
+#       Oh, and some of Vlad's minions.
+#
+MAZE: "pvalley",' '
+FLAGS: hardfloor,phlegethon
 GEOMETRY:center,center
 MAP
-----------------------------------------------------------------------------
-|             --------------                                               |
-|             |............|             -------                           |
-|       -------............-----         |.....|                           |
-|       |......................|        --.....|            ---------      |
-|    ----......................---------|......----         |.......|      |
-|    |........---------..........|......+.........|     ------+---..|      |
-|  ---........|.......|..........--S----|.........|     |........|..|      |
-|  |..........|.......|.............|   |.........-------..----------      |
-|  |..........|.......|..........----   |..........|....|..|......|        |
-|  |..........|.......|..........|      --.......----+---S---S--..|        |
-|  |..........---------..........|       |.......|.............|..|        |
-|  ---...........................|       -----+-------S---------S---       |
-|    |...........................|          |...| |......|    |....|--     |
-|    ----.....................----          |...---....---  ---......|     |
-|       |.....................|             |..........|    |.....----     |
-|       -------...........-----             --...-------    |.....|        |
-|             |...........|                  |...|          |.....|        |
-|             -------------                  -----          -------        |
-----------------------------------------------------------------------------
+                                       -----------------
+  ....            ...T..T.             |...|...|...|...|              ....
+ ......    T....T..T......T.     .T....--.---.---.---.--.           ##..{..
+  ...    .....T.......T......T............................T.      ###  ...
+  #      .  T....T..T.....T....T.......T.........T.............   #
+  ##    .T....T.....T...T..T........T...............T............ ..
+   #   ....T.....T.....T......T...........T..............T...........
+ ....##.  ....T......T...T..T....................T.............T.......|---|
+ ....  .. T..   ...RRRRRRRRRRRRRR.....T......T.......................T.....|
+      ......  RRRRRRRRRRRRRRRRRRRRRRR.................T................|---|
+RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR........................T..........|
+RRRRRRRRRRRRRRRRRRR..........RRRRRRRRRRRRRR.R....T.......T.............|---|
+RRRRRRRRRRRRRRR.................RRRRRRRRRR.R.R.R.R..................T......|
+  ---------------....................RRRR.R.R.R.RR.R.............T.....|---|
+  |.......|.....|........................R.R.RRRR.R.R.R....T...............|
+  |.......+.....+..........................R.R.R.R.R.RR................|---|
+  |.......|.....|----.......................R.R.R.R.R..T......T............|
+  |.......------|...|....................... RRRRRRRR  ............T...|---|
+  |...\...S.....S...|.         ...........    RRRRRR     ............
+  -------------------                          RRRR
 ENDMAP
-REGION:(15,07,21,10),lit,"temple"
-ALTAR:(18,08),noalign,sanctum
-REGION:(41,06,48,11),unlit,"morgue",filled,true
+# Randomize some monsters
+RANDOM_MONSTERS:'V','S','E','H','M','O','R','T','&','Z'
+# Regions
+# Entry Caves
+REGION:(01,01,06,03),unlit,"ordinary"
+REGION:(01,07,04,08),unlit,"ordinary"
+# The wild wood
+REGION:(07,01,31,09),lit,"ordinary"
+# North Eastern Fields
+REGION:(32,02,70,18),lit,"ordinary"
+# Fountain
+REGION:(66,01,74,05),unlit,"ordinary"
+# South Western Fields
+REGION:(01,10,32,18),lit,"ordinary"
+# Northern huts
+REGION:(40,01,42,01),unlit,"ordinary"
+REGION:(44,01,46,01),unlit,"ordinary"
+REGION:(48,01,50,01),unlit,"ordinary"
+REGION:(52,01,54,01),unlit,"ordinary"
+# Eastern Huts
+REGION:(72,08,74,08),unlit,"ordinary"
+REGION:(72,10,74,10),unlit,"ordinary"
+REGION:(72,12,74,12),unlit,"ordinary"
+REGION:(72,14,74,14),unlit,"ordinary"
+REGION:(72,16,74,16),unlit,"ordinary"
+# Tower
+REGION:(11,14,15,16),unlit,"ordinary"
+REGION:(03,14,09,17),unlit,"ordinary"
+REGION:(11,18,15,18),unlit,"ordinary"
+REGION:(17,17,19,18),unlit,"ordinary"
+# Stairs and Branch
+STAIR:(13,18),down
+STAIR:(03,02),up
+BRANCH:(18,17,18,17),(00,00,00,00)
+# Doors
+DOOR:locked,(16,15)
+DOOR:locked,(10,15)
+DOOR:locked,(10,18)
+DOOR:locked,(16,18)
+# Sea monsters for the river
+MONSTER:';',random,(03,11)
+MONSTER:';',random,(11,11)
+MONSTER:';',random,(21,09)
+MONSTER:';',random,(30,10)
+MONSTER:';',random,(36,11)
+MONSTER:';',random,(42,13)
+MONSTER:';',random,(47,14)
+MONSTER:';',random,(49,17)
+# An assortment of nymphs
+MONSTER:'n',random,(37,04)
+MONSTER:'n',random,(42,07)
+MONSTER:'n',random,(41,09)
+MONSTER:'n',random,(47,13)
+MONSTER:'n',random,(51,16)
+MONSTER:'n',random,(31,06)
+MONSTER:'n',random,(54,13)
+MONSTER:'n',random,(31,07)
+MONSTER:'n',random,(25,03)
+MONSTER:'n',random,(20,02)
+MONSTER:'n',random,(18,06)
+MONSTER:'n',random,(13,04)
+# A few people
+MONSTER:'@',"healer",(41,01),peaceful
+MONSTER:'@',"rogue",(46,01),peaceful
+MONSTER:'@',"barbarian",(49,01),peaceful
+MONSTER:'@',"ranger",(53,01),peaceful
+MONSTER:'@',"wizard",(73,08),peaceful
+MONSTER:'@',"samurai",(73,10),peaceful
+MONSTER:'@',"knight",(73,14),peaceful
+MONSTER:'@',"valkyrie",(73,16),peaceful
+# A few sheep and and a couple of goats
+MONSTER:'q',"sheep",(47,05),peaceful
+MONSTER:'q',"lamb",(48,06),peaceful
+MONSTER:'q',"sheep",(48,04),peaceful
+MONSTER:'q',"sheep",(55,06),peaceful
+MONSTER:'q',"lamb",(54,05),peaceful
+MONSTER:'q',"sheep",(57,04),peaceful
+MONSTER:'q',"sheep",(58,05),peaceful
+MONSTER:'q',"sheep",(56,06),peaceful
+MONSTER:'q',"lamb",(58,08),peaceful
+MONSTER:'q',"goat",(60,17),peaceful
+MONSTER:'q',"goat",(64,16),peaceful
+MONSTER:'c',"chicken",(63,12),peaceful
+MONSTER:'c',"chicken",(65,11),peaceful
+MONSTER:'c',"chicken",(64,09),peaceful
+# Watch Dogs
+MONSTER:'d',"winter wolf",(12,14),asleep,hostile
+MONSTER:'d',"winter wolf",(14,15),asleep,hostile
+MONSTER:'d',"winter wolf",(12,16),asleep,hostile
+MONSTER:'@',"werewolf",(11,15),asleep,hostile
+# Monsters in the Throne Room
+MONSTER:monster[0],random,(03,14),asleep
+MONSTER:monster[1],random,(03,15),asleep
+MONSTER:monster[2],random,(03,16),asleep
+MONSTER:monster[3],random,(03,17),asleep
+MONSTER:monster[4],random,(04,14),asleep
+MONSTER:monster[5],random,(04,15),asleep
+MONSTER:monster[6],random,(04,16),asleep
+MONSTER:monster[7],random,(04,17),asleep
+MONSTER:monster[8],random,(05,14),asleep
+MONSTER:monster[9],random,(05,15),asleep
+MONSTER:monster[0],random,(05,16),asleep
+MONSTER:monster[1],random,(05,17),asleep
+MONSTER:monster[2],random,(06,14),asleep
+MONSTER:monster[3],random,(06,15),asleep
+MONSTER:monster[4],random,(06,16),asleep
+MONSTER:monster[5],random,(06,17),asleep
+MONSTER:monster[6],random,(07,14),asleep
+MONSTER:monster[7],random,(07,15),asleep
+MONSTER:monster[8],random,(07,16),asleep
+MONSTER:monster[9],random,(07,17),asleep
+MONSTER:monster[0],random,(08,14),asleep
+MONSTER:monster[1],random,(08,15),asleep
+MONSTER:monster[2],random,(08,16),asleep
+MONSTER:monster[3],random,(08,17),asleep
+MONSTER:monster[4],random,(09,14),asleep
+MONSTER:monster[5],random,(09,15),asleep
+MONSTER:monster[6],random,(09,16),asleep
+MONSTER:monster[7],random,(09,17),asleep
+# Custodians
+MONSTER:'L',"master lich",(06,18),asleep,hostile
+OBJECT:'?',"demonology",(06,18)
+OBJECT:'=',"free action",(06,18)
+MONSTER:'V',"vampire lord",(04,18),asleep,hostile
+OBJECT:'!',random,(04,18)
+MONSTER:'V',"vampire lord",(08,18),asleep,hostile
+OBJECT:'!',random,(08,18)
+MONSTER:''',"iron golem",(14,18),asleep,hostile
+MONSTER:''',"iron golem",(19,18),asleep,hostile
+# Musicians (should only be present on Sundays)
+MONSTER:'Y',"monkey",(15,02)
+OBJECT:'(',"wooden harp",(15,02)
+MONSTER:'Y',"monkey",(25,03)
+OBJECT:'(',"bugle",(25,03)
+MONSTER:'Y',"monkey",(19,06)
+OBJECT:'(',"leather drum",(19,06)
+MONSTER:'Y',"monkey",(29,04)
+OBJECT:'(',"tooled horn",(15,02)
+# Loot
+OBJECT:'(',"chest",(15,18)
+OBJECT:'%',random,random
+OBJECT:'%',random,random
+OBJECT:'%',random,random
+OBJECT:'%',random,random
+OBJECT:'%',random,random
+OBJECT:random,random,random
+OBJECT:random,random,random
+OBJECT:random,random,random
+OBJECT:random,random,random
+OBJECT:random,random,random
+# Traps outside the door
+TRAP:"spiked pit",(17,14)
+TRAP:"spiked pit",(18,14)
+TRAP:"spiked pit",(20,15)
+TRAP:"magic",(21,14)
+TRAP:"magic",(29,16)
+TRAP:"magic",(19,12)
+TRAP:"magic",(25,13)
+TRAP:"magic",(33,15)
+TRAP:"magic",(39,16)
+TRAP:"magic",(27,17)
+TRAP:"anti magic",(15,15)
+TRAP:"pit",(26,03)
+TRAP:"pit",(21,06)
+TRAP:"pit",(30,05)
+TRAP:"board",(19,03)
+
+#	Cthulhu's Sanctum
+#
+#	Cthulhu was the high priest of the old ones, the mediator
+#	between them and their arcane gods.  For nethack, it seems
+#	reasonable to cast him as the great priest of Moloch, to whom
+#	the amulet has been entrusted for safe keeping.
+#
+MAZE: "sanctum",' '
+FLAGS: hardfloor,noteleport,nommap
+GEOMETRY:center,center
+MAP
+                .........         PP...          -----  RRRRRRRRR---------RR
+  .......     ...............    ...PPP..        |...|...RRRRRR..|.......|.R
+ ....PP...###S................   ...PP.  .       |...+...RRRRR...+.......+.R
+  .......     ...........   ...         .        |...|..RRRRRRR..|.......|.R
+                .......      ...  ----- .  ----- -----RRRRRRRRR..---------RR
+     ........   ++            ..  |...|-S--|...|    |RRRRRRRRRR..RRRRRRRRRRR
+    ... .. .......     ...... ..  |...|....|...|    |RRRRRR..............RRR
+   ..................      -S-++--|...|....|...|    |RRRR...........--------
+ PP... .PP. ... ... ....   |......|-+----+---+------|RRR............|PP....|
+ P.....PPPP............... |..PP..+.................|R..............+......|
+ P.....PPPP............... |..PP..+.................|R..............+......|
+ PP... .PP. ... ... ....   |......|S--+----+--+-----|RRR............|PP....|
+   ..................      -S-++---.|...|....|..|   |RRRR...........--------
+    ... .. .......     ...... ..   .|...|....|..|   |RRRRRR..............RRR
+     ........   ++            ..   .|...|----|..|   |RRRRRRRRRR..RRRRRRRRRRR
+                .......      ...   .-----    ---------RRRRRRRRR..---------RR
+  .......     ...........   ...    .      ...    |...|..RRRRRRR..|.......|.R
+ ....PP...###S................      ...  ..R..   |...+...RRRRR...+.......+.R
+  .......     ...............          .. ...    |...|...RRRRRR..|.......|.R
+                .........                        -----  RRRRRRRRR---------RR
+ENDMAP
+
+# Random Places for Cthulhu to be with the Amulet
+RANDOM_PLACES:(04,09),(04,10),(03,02),(03,17),(34,02),(44,17),(16,02),(16,17)
+
 # Non diggable walls
-NON_DIGGABLE:(00,00,75,19)
+#NON_DIGGABLE:(00,00,75,19)
 # Invisible barrier separating the left & right halves of the level
-NON_PASSWALL:(37,00,39,19)
+#NON_PASSWALL:(48,00,49,19)
+
+# Regions
+#
+# Temple interior  
+REGION:(00,00,52,19),unlit,"ordinary"
+
+# Outer landing  
+REGION:(53,00,75,19),lit,"ordinary"
+
+# Outside Chambers
+REGION:(66,01,72,03),unlit,"ordinary"
+REGION:(69,08,74,11),unlit,"ordinary"
+REGION:(66,16,72,18),unlit,"ordinary"
+
+# Main Temple
+ALTAR:(04,09),noalign,sanctum
+ALTAR:(04,10),noalign,sanctum
+REGION:(01,05,23,14),unlit,"temple"
+
+# Northern Temple (Inner)
+ALTAR:(03,02),noalign,sanctum
+REGION:(01,01,09,03),unlit,"temple"
+
+# Northern Temple (Outer)
+ALTAR:(16,02),noalign,sanctum
+REGION:(14,00,26,04),unlit,"temple"
+
+# Souther Temple (Inner)
+ALTAR:(03,17),noalign,sanctum
+REGION:(01,16,09,18),unlit,"temple"
+
+# Southern Temple (Outer)
+ALTAR:(16,17),noalign,sanctum
+REGION:(14,15,26,19),unlit,"temple"
+
+# North Eastern Temple
+ALTAR:(36,01),noalign,sanctum
+REGION:(33,00,39,02),unlit,"temple"
+
+# South Eastern Tample
+ALTAR:(44,17),noalign,sanctum
+REGION:(40,16,45,18),unlit,"temple"
+
+# Stairs and Branch
+STAIR:(28,09,29,10),(00,00,00,00),up
+BRANCH:(73,09,74,10),(00,00,00,00)
+
+# Drawbridges
+DRAWBRIDGE:(53,09),west,closed
+DRAWBRIDGE:(53,10),west,closed
+
 # Doors
-DOOR:closed,(40,06)
-DOOR:locked,(62,06)
-DOOR:closed,(46,12)
-DOOR:closed,(53,10)
-# Surround the temple with fire
-TRAP:"fire",(13,05)
-TRAP:"fire",(14,05)
-TRAP:"fire",(15,05)
-TRAP:"fire",(16,05)
-TRAP:"fire",(17,05)
-TRAP:"fire",(18,05)
-TRAP:"fire",(19,05)
-TRAP:"fire",(20,05)
-TRAP:"fire",(21,05)
-TRAP:"fire",(22,05)
-TRAP:"fire",(23,05)
-TRAP:"fire",(13,12)
-TRAP:"fire",(14,12)
-TRAP:"fire",(15,12)
-TRAP:"fire",(16,12)
-TRAP:"fire",(17,12)
-TRAP:"fire",(18,12)
-TRAP:"fire",(19,12)
-TRAP:"fire",(20,12)
-TRAP:"fire",(21,12)
-TRAP:"fire",(22,12)
-TRAP:"fire",(23,12)
-TRAP:"fire",(13,06)
-TRAP:"fire",(13,07)
-TRAP:"fire",(13,08)
-TRAP:"fire",(13,09)
-TRAP:"fire",(13,10)
-TRAP:"fire",(13,11)
-TRAP:"fire",(23,06)
-TRAP:"fire",(23,07)
-TRAP:"fire",(23,08)
-TRAP:"fire",(23,09)
-TRAP:"fire",(23,10)
-TRAP:"fire",(23,11)
-# Some traps.
-TRAP:"spiked pit", random
-TRAP:"fire", random
-TRAP:"sleep gas", random
-TRAP:"anti magic", random
-TRAP:"fire", random
-TRAP:"magic", random
-# Some random objects
-OBJECT:'[',random,random
+DOOR:closed,(68,09)
+DOOR:closed,(68,10)
+DOOR:locked,(65,02)
+DOOR:locked,(73,02)
+DOOR:locked,(65,17)
+DOOR:locked,(73,17)
+DOOR:closed,(53,02)
+DOOR:closed,(53,17)
+DOOR:closed,(36,08)
+DOOR:closed,(41,08)
+DOOR:closed,(45,08)
+DOOR:closed,(38,11)
+DOOR:closed,(43,11)
+DOOR:closed,(46,11)
+DOOR:locked,(35,11)
+DOOR:locked,(40,05)
+DOOR:locked,(34,09)
+DOOR:locked,(34,10)
+DOOR:locked,(16,05)
+DOOR:locked,(17,05)
+DOOR:locked,(16,14)
+DOOR:locked,(17,14)
+DOOR:locked,(30,07)
+DOOR:locked,(31,07)
+DOOR:locked,(30,12)
+DOOR:locked,(31,12)
+DOOR:locked,(13,02)
+DOOR:locked,(13,17)
+DOOR:locked,(28,07)
+DOOR:locked,(28,12)
+
+# Sea monsters for the river
+MONSTER:';',random,(59,01)
+MONSTER:';',random,(57,04)
+MONSTER:';',random,(54,07)
+MONSTER:';',random,(54,13)
+MONSTER:';',random,(58,15)
+MONSTER:';',random,(60,18)
+MONSTER:';',random,(70,05)
+MONSTER:';',random,(72,14)
+
+# Platform Guardians
+MONSTER:'L',"master lich",(52,02),asleep,hostile
+OBJECT:'/',"lightning",(52,02)
+OBJECT:'(',"chest",(51,02)
+MONSTER:'B',"nightgaunt",(56,01),asleep,hostile
+
+MONSTER:'L',"master lich",(52,17),asleep,hostile
+OBJECT:'/',"lightning",(52,17)
+OBJECT:'(',"chest",(51,17)
+MONSTER:'B',"nightgaunt",(56,18),asleep,hostile
+
+# Landing Guards
+MONSTER:'h',"deepest one",(56,08),asleep,hostile
+OBJECT:'!',random,(56,08)
+MONSTER:'h',"deepest one",(61,08),asleep,hostile
+OBJECT:'/',random,(61,08)
+MONSTER:'h',"deepest one",(56,11),asleep,hostile
+OBJECT:'!',random,(56,11)
+MONSTER:'h',"deepest one",(61,13),asleep,hostile
+OBJECT:'/',random,(61,13)
+
+# Northern barracks
+MONSTER:'h',"deeper one",(67,01),asleep,hostile
+OBJECT:'(',"chest",(68,01)
+MONSTER:'h',"deeper one",(69,01),asleep,hostile
+OBJECT:'(',"chest",(70,01)
+MONSTER:'h',"deeper one",(71,01),asleep,hostile
+MONSTER:'h',"deeper one",(67,03),asleep,hostile
+OBJECT:'(',"chest",(68,03)
+MONSTER:'h',"deeper one",(69,03),asleep,hostile
+OBJECT:'(',"chest",(70,03)
+MONSTER:'h',"deeper one",(71,03),asleep,hostile
+
+# Southern barracks
+MONSTER:'h',"deeper one",(67,16),asleep,hostile
+OBJECT:'(',"chest",(68,16)
+MONSTER:'h',"deeper one",(69,16),asleep,hostile
+OBJECT:'(',"chest",(70,16)
+MONSTER:'h',"deeper one",(71,16),asleep,hostile
+MONSTER:'h',"deeper one",(67,18),asleep,hostile
+OBJECT:'(',"chest",(68,18)
+MONSTER:'h',"deeper one",(69,18),asleep,hostile
+OBJECT:'(',"chest",(70,18)
+MONSTER:'h',"deeper one",(71,18),asleep,hostile
+
+# Traps on the landing
+TRAP:"board",(65,08)
+TRAP:"board",(65,11)
+TRAP:"board",(61,08)
+TRAP:"board",(61,11)
+TRAP:"board",(58,08)
+TRAP:"board",(58,11)
+TRAP:"board",(63,02)
+TRAP:"board",(63,17)
+TRAP:"board",(55,02)
+TRAP:"board",(55,17)
+
+# Guardians one the inner temples
+MONSTER:'h',"mind flayer",(47,09),asleep,hostile
+OBJECT:'/',"striking",(47,09)
+MONSTER:'h',"mind flayer",(49,10),asleep,hostile
+OBJECT:'/',"striking",(49,10)
+
+# Priests, in the chambers before the temple
+MONSTER:'@',"aligned priest",(35,06),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(37,06),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(39,06),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(42,06),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(44,05),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(46,05),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(37,13),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(39,12),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(41,12),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(44,13),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(46,12),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(47,13),noalign,asleep,hostile
+
+# Door bell for the inner temple
+TRAP:"board",(35,09)
+TRAP:"board",(35,10)
+
+# Guardians one the inner temples
+MONSTER:'&',"marilith",(33,08),asleep,hostile
+MONSTER:'&',"marilith",(33,11),asleep,hostile
+MONSTER:'&',"marilith",(28,08),asleep,hostile
+MONSTER:'&',"marilith",(28,08),asleep,hostile
+MONSTER:';',"kraken",(29,09),asleep,hostile
+
+# Main Temple
+TRAP:"fire",(15,06)
+TRAP:"magic",(16,06)
+TRAP:"fire",(17,06)
+TRAP:"fire",(15,13)
+TRAP:"magic",(16,13)
+TRAP:"fire",(17,13)
+MONSTER:';',"kraken",(09,10),asleep,hostile
+MONSTER:'B',random,(05,07),asleep,hostile
+MONSTER:'B',random,(05,10),asleep,hostile
+MONSTER:'B',random,(08,14),asleep,hostile
+MONSTER:'B',random,(10,08),asleep,hostile
+MONSTER:'B',random,(13,06),asleep,hostile
+MONSTER:'B',random,(14,09),asleep,hostile
+MONSTER:'B',random,(15,12),asleep,hostile
+MONSTER:'B',random,(18,10),asleep,hostile
+MONSTER:'B',random,(21,08),asleep,hostile
+OBJECT:'(',"chest",(02,09)
+OBJECT:'(',"chest",(02,10)
+
+# Northern Temple (Outer)
+TRAP:"fire",(25,01)
+TRAP:"fire",(25,02)
+TRAP:"magic",(26,01)
+TRAP:"magic",(26,02)
+TRAP:"fire",(27,01)
+TRAP:"fire",(27,02)
+MONSTER:'@',"aligned priest",(20,01),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(19,03),noalign,asleep,hostile
+MONSTER:'@',"wererat",(19,03),noalign,asleep,hostile
+OBJECT:'(',"chest",(14,02)
+
+# Northern Temple (Inner)
+TRAP:"board",(09,02)
+MONSTER:';',"kraken",(05,02),asleep,hostile
+MONSTER:'P',"shoggoth",(04,02),asleep,hostile
+OBJECT:'(',"chest",(01,02)
+
+# Southern Temple (Outer)
+TRAP:"fire",(25,17)
+TRAP:"fire",(25,18)
+TRAP:"magic",(26,17)
+TRAP:"magic",(26,18)
+TRAP:"fire",(27,17)
+TRAP:"fire",(27,18)
+MONSTER:'@',"aligned priest",(20,16),noalign,asleep,hostile
+MONSTER:'@',"aligned priest",(19,18),noalign,asleep,hostile
+MONSTER:'@',"werewolf",(17,17),noalign,asleep,hostile
+OBJECT:'(',"chest",(14,17)
+
+# Southern Temple (Inner)
+TRAP:"board",(09,17)
+MONSTER:';',"kraken",(05,17),asleep,hostile
+MONSTER:'V',"star vampire",(04,17),asleep,hostile
+OBJECT:'(',"chest",(01,17)
+
+# North Eastern Temple
+TRAP:"board",(39,01)
+MONSTER:';',"kraken",(36,01),asleep,hostile
+MONSTER:''',"iron golem",(35,02),asleep,hostile
+MONSTER:'P',"green slime",(38,02),asleep,hostile
+OBJECT:'(',"chest",(33,01)
+
+# South Eastern Temple
+TRAP:"board",(37,17)
+MONSTER:';',"kraken",(43,17),asleep,hostile
+MONSTER:'P',"shoggoth",(42,16),asleep,hostile
+MONSTER:'P',"green slime",(42,18),asleep,hostile
+OBJECT:'(',"chest",(45,17)
+
+# Cthulhu is in one of the temples (he is generated with the amulet)
+MONSTER:'&',"Cthulhu",place[0],asleep,hostile
+
+# Northern Shuggoth Run
+TRAP:"teleport",(28,06)
+MONSTER:'P',"shoggoth",(27,06),asleep,hostile
+MONSTER:'P',"shoggoth",(25,06),asleep,hostile
+MONSTER:'P',"shoggoth",(23,06),asleep,hostile
+
+# Southern Shuggoth Run
+TRAP:"teleport",(28,13)
+MONSTER:'P',"shoggoth",(27,13),asleep,hostile
+MONSTER:'P',"shoggoth",(25,13),asleep,hostile
+MONSTER:'P',"shoggoth",(23,13),asleep,hostile
+
+
+
+
+#
+#	The Gulf of N'Kai
+#
+#	A dark, bare place haunted by Night gaunts, Byakhee, Demons
+#	and Gugs.  A suitably dire place for the wizard to hide his
+#	tower.  Beware of the shoggoths.
+#
+#	Unlike most of the other gehennom levels, these are not
+#	hardfloor, allowing the player to fall through to deeper
+#	levels of the gulf.
+#
+
+#
+# An introductory level...
+#
+MAZE: "nkai-a-1",' '
+FLAGS: phlegethon
+GEOMETRY:center,center
+MAP
+                                 RRRR                                       
+   ..      ......        ....   RRRR  ..........  ......  ...... ....     . 
+ .. ... ... .. .. ...  ...  ... RRR R ... . .. ... .. ..  ... ... ..... ... 
+ .... ... .. ..  ..  ...  ..   RR RR R..     ...     ... ... ..  ..   ...   
+   ..  ..  ...  ..  ..   ..  .R RR.R..R..  ...  ..  ..   ..   .. ..  ..   . 
+    ....  ..   ..    ..  .. ..R..RR.RR..  ..     ....   ....   ...  .... .. 
+   ..    ....   ..  ..   ....  R..RRR.R  ....  ...  ... .. .. .. .. ..  ..  
+  ..   ...  .. ..  .... ..  ..R  ..RRR.R  ....  ...  ....  ....   ...  ...  
+ .... ..     ...  ..  ...   .R.  .RR.RR. ..  .... ....  ....  .. .. ....    
+  .....   .... .. ..   ... ...R..RR...R...  ..      ... .. ....  ..  ..     
+    .... ..     ...      .... .R.R.R.R..  ...   ..  . ...   ..   ...  ..    
+   ..  ...    ... ..    ..  .  R RR.R.R  ..   ...  ....    ....   ..   ..   
+  ..  .. ..  ..    ..  ..   ..  RR.R R  .... ...    ....  ..  .. ....  ...  
+   ....   .. ..   .... ... .... .RR R R ...... ... ..  ....    .... .  .... 
+    .... ..  ...   ..   ....  ..RR.R R R.....    ...    ..      ... .. .... 
+  .... ...     .....     .......R.R.R.R.R...    .. .... ...   ...   .. ...  
+ ....   ....  ... ...   .........R.R.R.R...    ...   .....   .....   ...    
+  .... ... ....     ......  ......R.R.RR..   ....      ........  ...     .. 
+    .....    .....    ...     ...  R.RRR.   ......       ....      .......  
+                                   RRRR                                     
+ENDMAP
+# Regions
+# The whole gulf is dark and quiet
+REGION:(01,01,75,19),unlit,"morgue",unfilled
+# Stairs and Branch
+STAIR:(03,08),down
+STAIR:(73,14),up
+BRANCH:(01,01,74,18),(00,00,00,00)
+# Sea monsters for the river
+MONSTER:';',random,(34,02)
+MONSTER:';',random,(35,08)
+MONSTER:';',random,(39,07)
+MONSTER:';',random,(37,12)
+MONSTER:';',random,(32,14)
+MONSTER:';',random,(38,18)
+# Some random flappy things
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+# Some not so random flappy things
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+# A few undead
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',random,random
+MONSTER:'Z',random,random
+MONSTER:'Z',random,random
+MONSTER:'W',random,random
+MONSTER:'V',random,random
+# A couple of slithy things
+MONSTER:'P',random,random
+MONSTER:'P',random,random
+MONSTER:'P',"shoggoth",random
+# Some random objects (no potions or food)
+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
 OBJECT:'[',random,random
 OBJECT:'[',random,random
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+# A few traps
+TRAP:"spiked pit",random
+TRAP:"spiked pit",random
+TRAP:"spiked pit",random
+TRAP:"magic",random
+TRAP:"magic",random
+TRAP:"magic",random
+TRAP:"magic",random
+TRAP:"anti magic",random
+TRAP:"anti magic",random
+TRAP:"anti magic",random
+TRAP:"pit",random
+TRAP:"pit",random
+TRAP:"pit",random
+TRAP:"board",random
+TRAP:"board",random
+TRAP:"board",random
+#
+
+#
+# An alternate introductory level...
+#
+MAZE: "nkai-a-2",' '
+FLAGS: phlegethon
+GEOMETRY:center,center
+MAP
+                                 RRRR                                       
+ ...    .....            ...    RR..RR  ....        .....       .....   ... 
+ ...  ....  ..     ... ... ....R.R..R.R   ...    ..........   ...   .....   
+  .  ...     ...  .. ...    ..R.R....R.R    . .......    .......    ..  ..  
+  ....         .....   .... .R.R.....R..R   ....     ...      .......  ..   
+    ...   .... .. ..    ..  R..R....R...R. ...     ...... ....      ....    
+   .. ..... ....   ..  ..  R....R..R...R.....    .....  ...   ...   . ...   
+  ..    ..   ..     ....  R.R..R.R..R.R..      ....  ........  .... .   ..  
+ ..    ....   ...  .. ... .R....RRR..RRR...  ...     ...........  ...    .  
+  ..   .. ..    ....   ....R...R.RRRRR.RR ...  .... ........  ..   ..    .  
+  ... ..   ...  .. ...   ...R.R...RRR...R  ..    ....  ...     .. ...    .. 
+    ...      ....    ...  ..R..R...RRR...R   ...   ..    ...    ....    ... 
+   .....    ..  ...    ....  RR...RRR...R..    ..   ..     ..  ..  ..   ..  
+  ... ...    ..  ..     ..   .R....RRR...R..   ...   .... ... ... ..    .   
+ ...    ...   ....  ...  ......R....RRR.R. .. .. ...   .... ... ...   ...   
+ ...     ... ... ..   .....  ...R....RRR.   ...   .....      ..    ....     
+  ...     ....     ..  ...    ...R..RRR.     .    .   .....      .... ..    
+   ....  ....  ...  ....    ...   R..RRR... .... ... ..   ........     ...  
+  ... ....  .... .....    ....     RRR.R  ... .... ...    .   ......    ... 
+                                   RRRR                                     
+ENDMAP
+# Regions
+# The whole gulf is dark and quiet
+REGION:(01,01,75,19),unlit,"morgue",unfilled
+# Stairs and Branch
+STAIR:(57,08),down
+STAIR:(02,02),up
+BRANCH:(01,01,74,18),(45,04,68,15)
+# Sea monsters for the river
+MONSTER:';',random,(33,02)
+MONSTER:';',random,(36,08)
+MONSTER:';',random,(39,07)
+MONSTER:';',random,(37,12)
+MONSTER:';',random,(31,14)
+MONSTER:';',random,(37,17)
+# Some random flappy things
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+# Some not so random flappy things
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+# A few undead
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',random,random
+MONSTER:'Z',random,random
+MONSTER:'Z',random,random
+MONSTER:'W',random,random
+MONSTER:'V',random,random
+# A couple of slithy things
+MONSTER:'P',random,random
+MONSTER:'P',random,random
+MONSTER:'P',"shoggoth",random
+# Some random objects (no potions or food)
+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
+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
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+# A few traps
+TRAP:"spiked pit",random
+TRAP:"spiked pit",random
+TRAP:"spiked pit",random
+TRAP:"magic",random
+TRAP:"magic",random
+TRAP:"magic",random
+TRAP:"magic",random
+TRAP:"anti magic",random
+TRAP:"anti magic",random
+TRAP:"anti magic",random
+TRAP:"pit",random
+TRAP:"pit",random
+TRAP:"pit",random
+TRAP:"board",random
+TRAP:"board",random
+TRAP:"board",random
+#
+
+#
+# The level with the wizards fortress...
+#
+MAZE: "nkai-b",' '
+FLAGS: phlegethon
+GEOMETRY:center,center
+MAP
+                                 RRRR                                       
+ ..  ..   .     .. ....  .... ....RRRR.....  ...       .......     ....     
+  .. .   ...   .  ......... ... .RRRR.R  .....      ....  .. ..   .   .   . 
+   .... ..  . .     ....        R.RRRR.R           ..  ..    ......      .. 
+ ...  ...    ...             ... R.RRR. R  ....  ...    ... ...   ...  ..   
+  .    ....  .  ...    .........R.R R.RRR ........        ...       ...     
+ ..  ...  ....   .   .... .....R R.R R...R... ...  ...     ..      ... .    
+ ......  ..  .........      ... R R.R.....R.   ..... ..   ....     ..   ... 
+  ... ....    ........ ...  .....RRR...  R..   ..     ...... ..  ...     .  
+  ..    ...  .....   ... .......R.R R.  R.R ......      ...   ....  ...  .. 
+   ..  .  .... ...   .    .. . R R.R.R R.R  ...  ...    ..    .....    ...  
+    ...    ..  ..  ..  }}     ..R...R.R.R R.....   ... ..    .   ... ...    
+   ....   ..   ....  .}}}}}    R.... R.R...R  ...   .....   ..  .. ... .    
+ .... ..  .   ...   .}}---}}  R R.. R.R...R.   ...  ..  ..     ...     ..   
+ ....  .. ......   .}}}|.|}}}} R R R.R R.R.   .......    ..   ......    .   
+ ...    ... ...   . }---.---}}    R.R R.R      ......     .....    ..  ..   
+   ......    ..    .}|.....|}..    RR..RR  ...  ..  ..     ...  ..  ....    
+  ...   .......  .. }---.---}}.. ...RRRR  .......    ...  ..   ......  .. . 
+   .       ...   .. }|.S.|}}} .... RRRR    ....        ....   .....     ... 
+                    }-----}}       RRRR                                     
+ENDMAP
+# Regions
+# The whole gulf is dark and quiet
+REGION:(01,01,75,19),unlit,"morgue",unfilled
+# Stairs, Branches and the wizards portal
+STAIR:(64,17),down
+STAIR:(03,17),up
+#BRANCH:(22,18,22,18),(00,00,00,00)
+PORTAL:(22,18,22,18),(0,0,0,0),"wizard3"
+# The wizard gets a drawbridge...
+DRAWBRIDGE:(28,16),west,closed
+# One secret door
+DOOR:locked,(23,18)
+# One sneaky trap
+TRAP:"magic",(24,16)
+# The Wizard has some guards
+MONSTER:''',"iron golem",(22,16),hostile,asleep
+MONSTER:'d',"hell hound",(24,14),hostile,asleep
+MONSTER:'P',"green slime",(24,18),hostile,asleep
+MONSTER:'Z',"skeleton",(26,16),hostile,asleep
+# And a door bell...
+TRAP:"board",(29,16)
+# Sea monsters for the river
+MONSTER:';',random,(35,02)
+MONSTER:';',random,(35,08)
+MONSTER:';',random,(42,07)
+MONSTER:';',random,(39,12)
+MONSTER:';',random,(31,12)
+MONSTER:';',random,(38,17)
+MONSTER:';',random,(27,18)
+MONSTER:';',"kraken",(28,15)
+MONSTER:';',random,(23,12)
+# Some random flappy things
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+# Some not so random flappy things
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+# A few undead
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',random,random
+MONSTER:'Z',random,random
+MONSTER:'Z',random,random
+MONSTER:'W',random,random
+MONSTER:'V',random,random
+# A couple of slithy things
+MONSTER:'P',random,random
+MONSTER:'P',random,random
+MONSTER:'P',"shoggoth",random
+MONSTER:'P',"shoggoth",random
+# A small tribe of ghouls
+MONSTER:'Z',"gug",(43,16),hostile,asleep
+MONSTER:'Z',"gug",(44,17),hostile,asleep
+MONSTER:'Z',"gug",(45,18),hostile,asleep
+MONSTER:'Z',"gug",(43,18),hostile,asleep
+MONSTER:'Z',"gug",(45,16),hostile,asleep
+# And some toys for them...
+OBJECT:'/',"death",(43,16)
+OBJECT:'?',"demonology",(44,17),cursed,0
+OBJECT:'?',"create monster",(45,18),cursed,0
+# Some random objects (no potions or food)
 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
+OBJECT:'[',random,random
+OBJECT:'[',random,random
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+OBJECT:'*',random,random
+# A few traps
+TRAP:"spiked pit",random
+TRAP:"spiked pit",random
+TRAP:"spiked pit",random
+TRAP:"magic",(31,17)
+TRAP:"magic",random
+TRAP:"magic",random
+TRAP:"magic",random
+TRAP:"magic",random
+TRAP:"anti magic",random
+TRAP:"anti magic",random
+TRAP:"anti magic",random
+TRAP:"pit",random
+TRAP:"pit",random
+TRAP:"pit",random
+TRAP:"board",random
+TRAP:"board",random
+TRAP:"board",random
+TRAP:"board",(47,17)
+#
+
+#
+# A third gulf level...
+#
+MAZE: "nkai-c",' '
+FLAGS: phlegethon
+GEOMETRY:center,center
+MAP
+                                 RRRR                                       
+  ...   ...            ...      RRRR   ....        .    .       ..... ....  
+  ...  .......       ... ...  ...RRRR   .......     .   ...    ..   ....... 
+  . ..  ...  ..    ...     .....RRRRRR        ..    ..    ......       ...  
+     ....     ...  .    .... ..RRRRRRRRR       ......    ....  ...          
+      . ..   .. ....  ...    RRRRRRRRRRRR..    .. ..   ...    .. ...   ..   
+      .  .. ..     ....      RRRRRRRRRRRRR... ..  ... .. ......    .. ..    
+     ..   ...       ..      RRRRRRR.RRRRRRRR...   .....   ..  .     ....    
+   ...     ..        ..  .RRRRRRRR-.--RRRRR       ....   ..        .. ...   
+  .. ..  .....      .......RRRRRR......RRRRRRR.    ....   ...    ...    ..  
+ ..   ....   ..    .. .  RRRRRRR.|...|RRRRRRR...   ....    .... ..       .. 
+  ..   ..     ..  .. ...  RRRRRRR--...RRRRRR.. ..  ....       ...       ..  
+   .. ..       ....    .    RRRRRR...RRRRRRR.   .. ....      .. ...     ..  
+   ......    ... ..    ...   RRRRRR.RRRRRRR      .....     ...    ..    ..  
+   H .. ..  ..   ..   ..       RRRRRRRRRRR.       ....    .. ...   ......   
+  ..     ....     .. ..   ....  RRRRRRRR....      ....  ...    .....        
+   ....    ..      ....  ..  .. .RRRRRR. ...     ...... .    ...   ......   
+  ......    ....  ..  .. ..   ....RRRRR.  ...  ...    ...  ... ..    ...... 
+   ....        ....    .....    ..RRRR.     ....        ....    ..    ....  
+                                   RRRR                                     
+ENDMAP
+# Regions
+# The whole gulf is dark and quiet
+REGION:(01,01,75,19),unlit,"morgue",unfilled
+# Stairs and Branch
+STAIR:(05,17),down
+STAIR:(72,02),up
+BRANCH:(01,01,74,18),(30,06,40,14)
+# Sea monsters for the river
+MONSTER:';',random,(35,02)
+MONSTER:';',random,(35,08)
+MONSTER:';',random,(42,09)
+MONSTER:';',random,(39,12)
+MONSTER:';',random,(31,12)
+MONSTER:';',random,(38,17)
+# Some random flappy things
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+MONSTER:'B',random,random
+# Some not so random flappy things
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"nightgaunt",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+MONSTER:'B',"byakhee",random
+# A few undead
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',"gug",random
+MONSTER:'Z',random,random
+MONSTER:'Z',random,random
+MONSTER:'Z',random,random
+MONSTER:'W',random,random
+MONSTER:'V',random,random
+# A couple of slithy thin