New Crypt+Lair maps and monster colour overrides for 0.3.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2413 c06c8d41-db1a-0410-9941-cceddc491573

8 files changed, 777 insertions, 309 deletions

diff --git a/crawl-ref/source/dat/clua/loadmaps.lua b/crawl-ref/source/dat/clua/loadmaps.lua
index daefb3e0bb..f8e0f0a9b4 100644
--- a/crawl-ref/source/dat/clua/loadmaps.lua
+++ b/crawl-ref/source/dat/clua/loadmaps.lua
@@ -9,7 +9,7 @@
 local des_files = {
    "bazaar.des", "entry.des", "elf.des", "float.des", "hells.des", "hive.des",
    "lab.des", "lair.des", "large.des", "mini.des", "orc.des", "pan.des",
-   "portal.des", "temple.des", "vaults.des", "zot.des"
+   "portal.des", "temple.des", "vaults.des", "crypt.des", "zot.des"
 }
 
 for _, file in ipairs(des_files) do
diff --git a/crawl-ref/source/dat/crypt.des b/crawl-ref/source/dat/crypt.des
new file mode 100644
index 0000000000..04336e7f93
--- /dev/null
+++ b/crawl-ref/source/dat/crypt.des
@@ -0,0 +1,643 @@
+##############################################################################
+# crypt.des: Maps for the Crypt and Tomb.
+##############################################################################
+
+##############################################################################
+# Crypt minivaults
+
+##############################################################################
+#	small crypt building
+NAME:   minicrypt_bobbens
+TAGS:   mini_float allow_dup
+DEPTH:  Crypt
+MONS:   necromancer
+MONS:   large zombie/small zombie/large skeleton/small skeleton
+MONS:   flying skull
+MAP
+  ccccccc  
+ cc2c2c2cc 
+ccc+c+c+ccc
+c2+.....+2c
+ccc..1..ccc
+c2+.3.3.+2c
+ccc.....ccc
+c2+.....+2c
+ccc.....ccc
+c2+.....+2c
+cccc+c+cccc
+ENDMAP
+
+############################################################################
+# death oozes - they're sort of like garden slugs
+NAME:   minigarden_bobbens
+TAGS:   allow_dup
+DEPTH:  Crypt
+MONS:   death ooze
+KFEAT:  f = .
+KMONS:  f = w:2 col:darkgrey plant/w:1 col:lightgrey plant
+SUBST:  p = f:2 .:1
+SUBST:  1 = 1:3 .:1
+MAP
+..........
+..p1pp.p..
+.pp.pp..p.
+.ppp.1.p..
+..p1pp.p..
+...pppp1..
+.p.pfffp..
+..ppfffp..
+..p.1p1p..
+.1.p..pp..
+..........
+ENDMAP
+
+############################################################################
+# Tomb entries
+
+############################################################################
+#	simple entrance
+NAME:   tomb_entry_simple_bobbens
+ORIENT: float
+TAGS:   tomb_entry no_monster_gen no_item_gen
+MONS:   guardian mummy
+MONS:   sphinx
+# crawl will rotate for the rest of possibilities
+: if crawl.coinflip() then
+KFEAT:  A = =
+KFEAT:  B = c
+: else
+KFEAT:  A = c
+KFEAT:  B = =
+: end
+MAP
+cccc.cccc
+c1.....1c
+c.ccccc.c
+c.c.2.c.c
+..c.O.c..
+c.c...c.c
+c.cABcc.c
+c1.....1c
+cccc.cccc
+ENDMAP
+
+############################################################################
+# forgotten tomb entrance
+NAME:   tomb_entry_forgotten_bobbens
+ORIENT: float
+TAGS:   tomb_entry no_monster_gen
+KFEAT:  f = .
+KMONS:  f = w:2 col:darkgrey plant/w:1 col:lightgrey plant
+SUBST:  p = f.
+MAP
+cccccccccc
+cfffffppp.
+cfOfffppp.
+cffffppp..
+cffpppp.. 
+cppppp..  
+cppp...   
+cpp..     
+c...      
+ENDMAP
+
+############################################################################
+# she sells tomb entry shells by the sea shore
+NAME:   tomb_entry_shell_bobbens
+TAGS:   tomb_entry no_monster_gen no_item_gen
+FLAGS:  no_rotate
+MONS:   guardian mummy
+MONS:   mummy priest
+MAP
+          c      
+        ccc..    
+      ccc.c1.    
+    ccc......    
+   cc.....c1.    
+  cc......cccc   
+ cc.......c..ccc 
+ c........c....cc
+cc1.......c.O2..c
+c.....1...c.....c
+c.....ccUcc.....c
+cc.....ccc1.....c
+ cc............cc
+  ccc........1cc 
+    ccc.....ccc  
+      ccccccc    
+ENDMAP
+
+############################################################################
+#	churchlike map with customizeable monster sets
+#
+NAME:   church_of_pain_bobbens
+ORIENT: float
+TAGS:   no_monster_gen no_item_gen
+PLACE:  Crypt:5
+# MONSTER LAYOUT
+# boss (1)
+# boss guard (2)
+# secondary boss (3)
+# support (4)
+# primary guard (5)
+# advanced guard (6)
+# in tombs (7)
+
+# 30% - skeletal (standard)
+# 30% - vampire (pretty hardcore, with easier bosses)
+# 30% - ghost
+# 10% - mummy (pretty evil)
+
+# skeletal monsters
+: local brnd = crawl.random2(13)
+: if brnd > 8 then
+MONS:   ancient lich
+MONS:   skeletal dragon
+MONS:   lich
+MONS:   necromancer
+MONS:   skeletal warrior
+MONS:   flying skull
+MONS:   skeletal warrior/w:20 large skeleton/w:5 small skeleton/w:5 nothing
+# vampire layout
+: elseif brnd > 4 then
+MONS:   vampire mage
+MONS:   spectral warrior
+MONS:   vampire knight
+MONS:   vampire
+MONS:   skeletal warrior/wraith
+MONS:   dancing weapon
+MONS:   vampire/skeletal warrior/large zombie/w:5 small zombie/wraith/w:5 nothing
+# ghost layout
+: elseif brnd > 0 then
+MONS:   curse skull
+MONS:   crystal golem
+MONS:   lich
+MONS:   spectral warrior
+MONS:   flayed ghost/wraith/freezing wraith/spectral warrior
+MONS:   flying skull
+MONS:   flayed ghost/wraith/freezing wraith/spectral warrior/hungry ghost/large zombie/w:5 small zombie/w:5 nothing
+# mummy layout - rare
+: else
+MONS:   greater mummy
+MONS:   sphinx
+MONS:   mummy priest
+MONS:   mummy priest
+MONS:   guardian mummy
+MONS:   flying skull
+MONS:   mummy/guardian mummy/w:5 nothing
+: end
+SUBST:  ; = .:6 ~:2 ^:1
+MAP
+           xxxxvvvvvvvvvvvvvvvvvxxxx           
+           xxxvv..WWWWWWWWWWW..vvxxx           
+           xxvv..WWWWWWWWWWWWW..vvxx           
+           xxv...WWWb.b.b.bWWW...vxx           
+           xxv...WWb$$|*|$$bWW...vxx           
+     xxxxxxxxv...WW.$||1||$.WW...vxxxxxxxx     
+     xxccccccv...WWb$$|*|$$bWW...vccccccxx     
+     xxc|*cccv...WWWb.b.b.bWWW...vccc*|cxx     
+     xxc$$$ccvv..WWWWWWWWWWWWW..vvcc$$$cxx     
+xxxxxxxc;;;|ccvv..WWWWWWWWWWW..vvcc|;;;cxxxxxxx
+xxccccccc=cccccv...............vccccc=cccccccxx
+xxcU$.....cxxxxvv....2...2....vvxxxxc.....$Ucxx
+xxc$.3....cxxxxxvv.....6.....vvxxxxxc....3.$cxx
+xxc.......cxxxxxvvv.6.....6.vvvxxxxxc.......cxx
+xxc.......cxxxxxvvvvv.....vvvvvxxxxxc.......cxx
+xxc...5.5.cxxxxxvvvvvvv+vvvvvvvxxxxxc.5.5...cxx
+xxccccc+cccxxxxxvcccccU.Ucccccvxxxxxccc+cccccxx
+xxxxxxc;cxxxxxxxvc.U.cc+cc.U.cvxxxxxxxc;cxxxxxx
+    xxc.cxxxxxccccG..F;^;F..Gccccxxxxxc.cxx    
+    xxc;cccccccG....45...54....Gccccccc;cxx    
+    xxc.;;;;;;+.................+;;;;;;.cxx    
+    xxc;cccccccG.......C.......Gccccccc;cxx    
+    xxc.c|$$+;ccc56.........65cccxxxxcc.cxx    
+  xxxxc;c|*$c;ccc5...........5cccxxxxcc;cxxxx  
+xxxxccc+ccc|c;=7+.............+7ccccccc+cccxxxx
+xxccc.5.5.ccccccc..c.......c..ccccccc.5.5.cccxx
+xxc7+.....+7ccc7+.............+7ccc7+.....+7cxx
+xxccc.....ccccccc..c.......c..ccccccc.....cccxx
+xxc7+.....+7ccc7+.............+7ccc7+.....+7cxx
+xxccc.....ccccccc..c.55555.c..ccccccc.....cccxx
+xxc7+.....+7ccc7+.............+7ccc7+.....+7cxx
+xxccc.....ccccccc..c6.6.6.6c..ccccccc.....cccxx
+xxc7+.....+7ccc7+.............+7ccc7+.....+7cxx
+xxccc.5.5.ccccccc..c.......c..ccccccc.5.5.cccxx
+xxxxccc+cccxxxc7+.............+7=$*cccc+cccxxxx
+   xxc...cxxxxccc..c.......c..ccc||ccc...cxx   
+   xxc.4.cxxxxc7+.............+7cccccc.4.cxx   
+   xxc.|.cxxxxccc..c.......c..cccxxxxc.|.cxx   
+   xxcccccxxxxc7+.............+7cxxxxcccccxx   
+   xxxxxxxxxxxccc....c...c....cccxxxxxxxxxxx   
+            xxxxc5.Vcc...ccV.5cxxxx            
+              xxcccccc...ccccccxx              
+              xxc..;;;...;;;..cxx              
+              xxc;;vcccccccv;;cxx              
+                c..;;;...;;;..c                
+                cccccc@c@cccccc                
+ENDMAP
+
+
+############################################################################
+#	gigantic sort of aquatic base, pretty good looking :)
+#
+NAME:   cryptofortress_bobbens
+ORIENT: encompass
+TAGS:   no_monster_gen no_item_gen no_pool_fixup
+FLAGS:  no_rotate no_vmirror
+PLACE:  Crypt:5
+KFEAT:  A = w
+KMONS:  A = flying skull
+KFEAT:  B = .
+KMONS:  B = ancient lich
+KFEAT:  D = .
+KMONS:  D = skeletal dragon
+KFEAT:  V = .
+KMONS:  V = vampire knight
+KFEAT:  X = .
+KMONS:  X = dancing weapon
+KFEAT:  L = .
+KMONS:  L = lich
+KFEAT:  I = .
+KMONS:  I = iron golem
+KFEAT:  G = .
+KMONS:  G = crystal golem
+KFEAT:  z = .
+KMONS:  z = skeletal warrior
+KFEAT:  N = .
+KMONS:  N = necromancer
+KFEAT:  H = .
+KMONS:  H = hell knight
+KFEAT:  M = .
+KMONS:  M = large zombie/small zombie/large skeleton/small skeleton/ghoul/necrophage
+KFEAT:  h = .
+KMONS:  h = titan zombie/dragon zombie/golden dragon zombie
+# red metal walls
+COLOUR: = = red
+COLOUR: r = red
+SUBST:  r = v
+MAP
+vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+vwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwvvvvvvvvvvvvvvvvvvvvvvvvvvvvwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwv..........................vAwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwv.........rrrrrrrr.........vAAAwwwwwwwwwwwv
+vwwwwwwwwwwwwwwv.........r||||||r.........vAAAAAAwwwwwwwwv
+vwwwwwwvvvvvvvvv......rr=rr****rr=rr......vvvvvvvvvwwwwwwv
+vwwwwwwv.......v......r$$*rr++rr*$$r......v.......vwwwwwwv
+vwwwwwwv....H..v.....rrrr|r$$$$r|rrrr.....v.......vwwwwwwv
+vwwwwwwv....H..+........rrr$$$$rrr........+.h..H..vwwwwwwv
+vwwwwwwv....H..v......L...r$$$$r...L......v....H..vwwwwwwv
+vwwwwwwv.h.vvvvv...rrr....rr++rr....rrr...v....H..vwwwwwwv
+vwwwwwwv...v...vv....rr.rrrU..Urrr.rr....vvv+v....vwwwwwwv
+vwwwwwwv...v.X..vv....rrr........rrr....vv...vvvvvvwwwwwwv
+vwwwwwwv...+.....vv....r.U..BC..U.r....vvvv.....+Mvwwwwwwv
+vwwwwwwv...v..V.$vvv...rr........rr...vvvM+.....vvvwwwwwwv
+vwwwwwwv...v...$*v.vv...rrrU..Urrr...vv.vvv.....+Mvwwwwwwv
+vwwwwwwv...vvvvvvv..vv....rr..rr....vv..vM+.....vvvwwwwwwv
+vwwwwwwv...vvv...v...vv............vv...vvv.....+Mvwwwwwwv
+vwwwwwwv...vv....+....vv..........vv....+....N..vvvwwwwwwv
+vwwwwwwv...vNz...v.....vv........vv.....vvv.....+Mvwwwwwwv
+vwwwwwwv...v.M...v....G.vv......vvI.....vM+.....vvvwwwwwwv
+vwwwwwwv...v....vv....vvvvvvvvvvvvvv....vvv.....+Mvwwwwwwv
+vwwwwwAv.......vv....vv.....ll.....vv....vvv+v..vvvwwwwwwv
+vwwwwwAv......vv....vv..............vv....vvMv..+Mvwwwwwwv
+vwwwwAAv.....vv....vv................vv....vvv..vvvwwwwwwv
+vwwwAAAv.....v....vv.......N..N.......vv....vv..+Mvwwwwwwv
+vwvvvvvvvvvvvvv+vvvvv+vv.Mzz..zzM.vv+vvvvv+vvvvvvvvvvvvvwv
+vwvv.........v..I.v....v..........v....v.........v..%*vvwv
+vwvv.........v....v....v..........v....v.........v...$vvwv
+vwvv.........+....v....v..........v....v.....X..V+....vvwv
+vwvv....D....v....v..z.v..........v.z..v.........v....vvwv
+vwvvv....z...v....+...Nvr........rvN...+......X..vvvvvvvwv
+vwwvv........v....v..z.vrr......rrv.z..v.............vvwwv
+vwwvvv.......+....v....vrrrr++rrrrv....v............vvvwwv
+vwwwvv.......v....v....vrrUz..zUrrv....v............vvwwwv
+vwwwvvvvvvvvvvvvvvvv+vvvrI......Irvvv+vvvvvvvvvvvvvvvvwwwv
+vwwwwvvv|**$$v.........vrrrr++rrrrv.........v$$**|vvvwwwwv
+vwwwwwvvv|*$$+.........vrrww..wwrrv.........+$$*|vvvwwwwwv
+vwwwwwwvvv*$$v...X.....vrwAw..wAwrv...X.....v$$*vvvAwwwwwv
+vwwwwwwwwvvv$v....G....vwwww..wwwwv..G......v$vvvAAwwwwwwv
+vwwwwwwwwwvvvv.........vwwww..wwwwv.........vvvvwwwwwwwwwv
+vwwwwwwwwwwwvvvv.......vwwww..wwwwv.......vvvvwwwwwwwwwwwv
+vwwwwwwwwwwwwwvvvv.....vwwww..wwwwv.....vvvvwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwvvvvv..vwwww..wwwwv..vvvvvwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwvvvvvAwww..wwwAvvvvvwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwvvAwww..wwwAvvwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwAwwww..wwwwAwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwwww..wwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwwww..wwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwwww..wwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwwww..wwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwwww..wwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwAww....wwAwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwww....wwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwww...(..wwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwAwww.[..{.wwwAwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwww....wwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwAwwwwwwAwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwv
+vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ENDMAP
+
+##############################################################################
+# The three Tomb levels: these should generally be of a confusing layout.
+##############################################################################
+
+##############################################################################
+# Tomb:1
+#
+NAME:    tomb_1
+PLACE:   Tomb:1
+ORIENT:  encompass
+#
+SHUFFLE: ([{, AB), ]}, FIJKL/fijkl, _-
+SUBST:   A=|*, B=|*
+SUBST:   f = F, i = G, j = G, k = G, l = F
+SUBST:   I = G:900 6
+SUBST:   J = G:750 6
+SUBST:   K = G:550 6
+SUBST:   L = G:300 6
+SUBST:   - = T
+SUBST:   _ = F 6 ^:30 .:30
+SUBST:   T = ^ .
+SUBST:   t = ~ .:50
+SUBST:   ' = ^ ':200
+SUBST:   ' = 5 .:100  
+SUBST:   2 = 2 1:2 .
+SUBST:   1 = 1 2:3 .
+SUBST:   3 = 3., 4 = 4., 5 = 5.
+#
+MONS:    mummy, guardian mummy, mummy priest, sphinx, greater mummy
+MONS:    silver statue / orange crystal statue / ice statue
+#
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxx(.............................[..............................{xxxxxxxxx
+xxxxxxxxx..............................................................xxxxxxxxx
+xxxxxxxxx..............................................................xxxxxxxxx
+xxxxxxxxx..............................................................xxxxxxxxx
+xxxxxxxxx..............................................................xxxxxxxxx
+xxxxxxxxx..........ccccccccccccccccccccccccccccccccccccccccccc.........xxxxxxxxx
+xxxxxxxxx..........ccccccccccccccccccccccccccccccccccccccccccc.........xxxxxxxxx
+xxxxxxxxx..........cc'''''''''''''''''''''''''''''''''''''''cc.........xxxxxxxxx
+xxxxxxxxx..........cc'''''''''''''''''''''''''''''''''''''''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''ccccccccccccccccccccccccccccccccccc''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..ttttttttttc................ctt)c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..ccccccccctc..3..........2..ct-tc''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..cA22c111ctc....3..........5c_ttc''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..c2c222ctttc......2.........+cccc''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..ccccccccccc.5........3...3..5..c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c.................................c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c............3.............3....2.c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''cccccccccccccc.......2...2........c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c............c....................c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c............c.................3..c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..cccccccc..c..........2..2......c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..ctttc1Bc..c....................c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..ctctc11c..c...3.......3........c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..ctct11cc..c..............2.....c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..ctcccccc..c.......2............c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..cttttttt..c.3...............2..c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c..ccccccccccc....2.....3.........c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c.......5.........................c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c.................................c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''ccccccccccccccTTTTTTTcccccccccccccc''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c'''''''''''ccc+++++ccc'''''''''''c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c'''''''''''cc.2...2.cc'''''''''''c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c''ccccccc''cc.L...L.cc''ccccccc''c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c''cc.322c''cc.......cc''c22.'cc''c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c''c]'c22c''cc.2...2.cc''c22c.}c''c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c''cccc''c''cc.K...K.cc''c3'cccc''c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c''''''''c''cc.......cc''c''''''''c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''c''''''''c''cc.2...2.cc''c''''''''c''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''cccccccccc''cc.J...J.cc''cccccccccc''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''''''''''''''cc.......cc''''''''''''''cc.........xxxxxxxxx
+xxxxxxxxx..........cc''''''''''''''cc.......cc''''''''''''''cc.........xxxxxxxxx
+xxxxxxxxx..........cccccccccccccccccc.I...I.cccccccccccccccccc.........xxxxxxxxx
+xxxxxxxxx..........cccccccccccccccccc.......cccccccccccccccccc.........xxxxxxxxx
+xxxxxxxxx.............................4...4............................xxxxxxxxx
+xxxxxxxxx.............................F...F............................xxxxxxxxx
+xxxxxxxxx...........................4.4...4.4..........................xxxxxxxxx
+xxxxxxxxx..............................................................xxxxxxxxx
+xxxxxxxxx..............................................................xxxxxxxxx
+xxxxxxxxx...........................4..V.V..4..........................xxxxxxxxx
+xxxxxxxxx..............................................................xxxxxxxxx
+xxxxxxxxx.............................4...4............................xxxxxxxxx
+xxxxxxxxx..............................................................xxxxxxxxx
+xxxxxxxxx...........................4.......4..........................xxxxxxxxx
+xxxxxxxxx..............................................................xxxxxxxxx
+xxxxxxxxx..............................................................xxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
+
+###############################################################################
+# Tomb:2
+#
+NAME:    tomb_2
+PLACE:   Tomb:2
+# Can be rotated!
+ORIENT:  encompass
+#
+SHUFFLE: ABCD[, Ww/Yy/Zz, Uu/Vv, Qq/Rr/Ss
+SUBST:   W=', w=c, Y=T, y=+, Z=T, z=+
+SUBST:   U=', u=c, V=T, v=+
+SUBST:   Q=', q=c, R=T, r=+, S=T, s=+
+#
+SHUFFLE: ])}def
+SUBST:   d=", e=", f="
+#
+SUBST:   T = ^ .
+SUBST:   ' = ^ ':100
+SUBST:   ' = 1:5 2:5 3:1 .:89
+SUBST:   " = ^ ":50
+SUBST:   " = 2:3 3:1 .:96
+#
+# Number of ' symbols is 211+3=214, hence statistically in the lower 
+# circumference we'll have 10.7 mummies, another 10.7 guardian mummies
+# and 2.1 mummy priests.
+# Number of " symbols is 205+3=208, hence the upper circumference
+# has in mean 4.0 mummy priests and 8.3 guardian mummies.
+#
+# Perhaps to do: use KFEAT to make mummies possibly appear at T spots.
+#                have clustering of 1, 2 in the lower area as before?
+#
+MONS: mummy, guardian mummy, mummy priest, greater mummy
+#
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""""c""""""c"""""{""""c""""""""c"""""""ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""""c"""""TcT""""""""TcT""""""TcT""""""ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""""c"""2"T+T""""""""T+T""2"""T+T""""""ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc"""TcT""""TcT""""""""TcT""""""TcT""""""ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""TT+T"""""c""""""""""c""""""""c"""""""ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccccc+ccccccccccccccccccccccccccccccc""""ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""TTc.............................c"3""ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""""c.............................c""""ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""3"c..ccc4.................4ccc..c"""fccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""""c..ccc...................ccc..c""""ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""""c..ccc.........1.........ccc..c)""}ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""""c..ccc.....2.......2.....ccc..cccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""""c.............................c''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcce"""c.............................cT'''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc""""c........c...........c........+T'''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc]""dc.............................cT'''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccccccc.....3........(........3.....c''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc''''c.............................c'QQQccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc'''Tc........c...........c........cccqcccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc'''T+.............................c'QQQccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc'''Tc.............................c''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc'ZZZc..ccc.....2.......2.....ccc..c''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccczcc..ccc.........1.........ccc..c''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc'ZZZc..ccc...................ccc..c''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccA'''c..ccc4.................4ccc..c''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc'YYYc.............................c''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccccycc.............................cRRR[ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc'YYYc.............................ccrccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc''''ccccc+ccccccccccccccc+cccccccccRRR'ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc''''''c'TTTc''''''''''''cTT''''''c'''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc'''''WcW''UcU''''''''''VcV''''''ScS''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc'''''WwW''UuU''''''''''VvV''''''SsS''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc'''''WcW''UcU''''''''''VcV''''''ScS''''ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccB'''''c''''cC'''''''''''c''''''''c''''Dccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
+
+
+#############################################################################
+# Tomb:3
+#
+NAME:    tomb_3
+PLACE:   Tomb:3
+ORIENT:  encompass
+FLAGS:   no_rotate
+#
+SUBST:   ' : " $ ':80
+SUBST:   ' = " $
+SUBST:   " = ^:1 .
+SUBST:   $ = *:2 |:1 $:17
+#
+MONS:    mummy, guardian mummy, mummy priest, greater mummy
+#
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccccccc.............................cccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccc...............cccccc..............ccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccc...............cccccccc..............cccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccc.......4......ccccO4cccc......4......cccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccc............cccc......cccc...........cccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc............cccc........cccc...........ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc............cccc........cccc...........ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc...........cccc..444444..cccc..........ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc.......................................ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc.......................................ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcc.................222222................ccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccc................223322...............cccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccc...3............223322............3..cccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccc...............222222..............ccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccc....2..........................2...ccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccc....2......................2....cccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccc............................cccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccccccccc+ccc..................ccc+ccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccc""""cc................cc""""cccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccc"""""""cc22222222222222cc"""""'$cccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccc""""""""""cc............cc"""""""'$ccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccc'""""""""""cc..........cc""""""""'$ccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccc$''""""""""""cc........cc"""""""""'$$cccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccc$$$'""""""""""cc222222cc""""""""''$$$cccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccc|$$$''"""""""""c......c"""""""''$$$$$cccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccc||$$$$'""""""""c......c""""""'$$$$$$$cccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccc|||||$$'"""""""c......c"""""'$$$$$$$$cccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccc|||||$'"""""""c......c""""'$$$$$$$$ccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccccc||||$$'""""""c......c""""'$$$$$$$cccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccc||||$'""""""c......c""""'$$$$$$ccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccccccc|||$$'"""""c......c"""'$$$$$$cccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccc|||$'""""cc..{...cc""'$$$$$ccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxccccccccc||$'""""cc...(..cc"'$$$$$cccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccccc|$'""cccc..[...cccc$$$$ccccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 42b69877ff..d65893baf5 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -448,6 +448,110 @@ wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
 ENDMAP
 
 ##############################################################################
+#	Ice dragon lair with assorted imp pets
+#
+NAME:   ice_dragon_lair_bobbens
+DEPTH:  Lair:5-10
+TAGS:   no_monster_gen
+MONS:   ice dragon
+MONS:   w:9 white imp/w:1 nothing
+MONS:   white imp
+ITEM:   any good_item
+SUBST:  ! = $:3 d:2
+SUBST:  ' = w:15 x:9 c:3 .:1
+SUBST:  ? = x:3 c:1
+SUBST:  ; = x:2 .:3
+SUBST:  _ = %:1 .:3
+SUBST:  " = G:1 .:3
+MAP
+;;..;..;;;.;;.;;;   
+;;...wwww.;;..ww.;;   
+;..ww'''ww..wwwww;;;; 
+;.ww'???wwwwwwwww;....
+;.ww'?!??''''''w...ww.
+;..ww?!!??????'w..www.
+;;..w?!1?...??'w"www.;
+;;;.w?!!.2?3.?'wwww.; 
+;;;ww??w2.?W.''www.;; 
+;..www'??????'.wwww.;; 
+..wwww''????ww'''ww.;; 
+.wwwwwww...www'_'ww.;  
+..wwwww....www'''w.;;  
+.;www...V..wwwwww.;;  
+;;...........www.;;;  
+;;   ;;;....w..;  
+ENDMAP
+
+##############################################################################
+#	Dragon lair embedded in wall
+#
+NAME:   dragon_lair_wall_bobbens
+DEPTH:  Lair:5-10
+TAGS:   no_monster_gen mini_float
+: if you.absdepth() >= 18 then
+MONS:   dragon
+MONS:   w:5 firedrake/w:1 mottled dragon/w:2 nothing
+: else
+MONS:   mottled dragon/steam dragon
+MONS:   firedrake/w:15 nothing
+: end
+ITEM:   any good_item
+SUBST:  ! = $:3 d:2
+SUBST:  ' = l:15 x:9 c:3
+SUBST:  ? = x:3 c:1
+SUBST:  ; = x:3 c:1 .:4
+SUBST:  / = l:3 .:1
+SUBST:  _ = %:1 .:3
+MAP
+xxxxx?????????xxxxx
+xxx?????..//???xxxx
+xx???'.../?/!????xx
+x???;.2./???!!???xx
+x??;.1../;??!!???xx
+x??;.../''???!???xx
+x??;'.../'???????xx
+x???;/..???????xxxx
+x??????;.?????xxxxx
+xx?????.;?????xxxxx
+xx????./??????xxlxx
+xx????.;_????xxxlxx
+xx?./'.2///???x?xlx
+x?//.././///x??xl/x
+.._....//..//?x//..
+.././...G./..//....
+./........./.......
+ENDMAP
+
+##############################################################################
+#	Hibernating monster in a tunnel, can be pretty dangerous
+#
+NAME:   hibernation_bobbens
+DEPTH:  Lair:5-10
+TAGS:   allow_dup no_monster_gen no_item_gen mini_float
+MONS:   w:5 death drake/ice dragon/dragon/swamp dragon
+MONS:   swamp dragon/hydra/grey snake
+MONS:   swamp drake/w:20 spiny frog/w:20 komodo dragon/w:20 gila monster/w:20 black snake
+: if you.absdepth() >= 18 then
+SUBST:  M = 1:1 2:9 3:20
+: elseif you.absdepth() >= 13 then
+SUBST:  M = 2:1 3:4
+: else
+SUBST:  M = 3
+: end
+SUBST:  ; = x:3 .:1
+MAP
+xxxxxxxxxx
+xxx....xxx
+xx......xx
+xx..xx.Mxx
+xxx..xxxxx
+xxx;.;xxxx
+xxx;..xxxx
+xxxx..;xxx
+xxx....xxx
+ENDMAP
+
+##############################################################################
 # Branch ends: Shoal, Slime Pit, Snake Pit, Swamp
 # Note that the Shoals usually have a randomised end map; predrawn maps 
 # (which need not be encompassing) are sometimes used, though.
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 4b04264603..268e3f4c0c 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -392,7 +392,7 @@ ENDMAP
 # Defended altar
 #
 NAME:    david_defended_altar
-DEPTH:   7-20, !Lair, !Swamp, !Shoal
+DEPTH:   D:7-20, Orc, Elf, Snake
 SHUFFLE: 1ID/2TC
 TAGS:    allow_dup
 MONS:    orc priest, deep elf priest / w:30 nothing
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index 0f6e35abcf..5290c3e117 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -1,6 +1,7 @@
 ###############################################################################
 # vaults.des: Entries to the Vaults branch. Branch endings for the whole
-#             Vaults system, including Vaults:8, Hall of Blades, Tomb:*.
+#             Vaults system, including Vaults:8, Hall of Blades. Crypt and
+#             Tomb maps go to crypt.des.
 #
 # Note the regular (mini)vaults are no longer in vaults.des, they have been
 # moved to mini.des, float.des and large.des. Portal vaults live in portal.des.
@@ -352,303 +353,3 @@ xxxxxxxxccc...ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccxxxxxxxx
 xxxxxxxxcccc.............................cccccccccccccccccccccccccccccccxxxxxxxx
 xxxxxxxxcccccccccccccccccccccccccccccc.@.cccccccccccccccccccccccccccccccxxxxxxxx
 ENDMAP
-
-
-##############################################################################
-# The three Tomb levels: these should generally be of a confusing layout.
-##############################################################################
-
-##############################################################################
-# Tomb:1
-#
-NAME:    tomb_1
-PLACE:   Tomb:1
-ORIENT:  encompass
-#
-SHUFFLE: ([{, AB), ]}, FIJKL/fijkl, _-
-SUBST:   A=|*, B=|*
-SUBST:   f = F, i = G, j = G, k = G, l = F
-SUBST:   I = G:900 6
-SUBST:   J = G:750 6
-SUBST:   K = G:550 6
-SUBST:   L = G:300 6
-SUBST:   - = T
-SUBST:   _ = F 6 ^:30 .:30
-SUBST:   T = ^ .
-SUBST:   t = ~ .:50
-SUBST:   ' = ^ ':200
-SUBST:   ' = 5 .:100  
-SUBST:   2 = 2 1:2 .
-SUBST:   1 = 1 2:3 .
-SUBST:   3 = 3., 4 = 4., 5 = 5.
-#
-MONS:    mummy, guardian mummy, mummy priest, sphinx, greater mummy
-MONS:    silver statue / orange crystal statue / ice statue
-#
-MAP
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxx(.............................[..............................{xxxxxxxxx
-xxxxxxxxx..............................................................xxxxxxxxx
-xxxxxxxxx..............................................................xxxxxxxxx
-xxxxxxxxx..............................................................xxxxxxxxx
-xxxxxxxxx..............................................................xxxxxxxxx
-xxxxxxxxx..........ccccccccccccccccccccccccccccccccccccccccccc.........xxxxxxxxx
-xxxxxxxxx..........ccccccccccccccccccccccccccccccccccccccccccc.........xxxxxxxxx
-xxxxxxxxx..........cc'''''''''''''''''''''''''''''''''''''''cc.........xxxxxxxxx
-xxxxxxxxx..........cc'''''''''''''''''''''''''''''''''''''''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''ccccccccccccccccccccccccccccccccccc''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..ttttttttttc................ctt)c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..ccccccccctc..3..........2..ct-tc''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..cA22c111ctc....3..........5c_ttc''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..c2c222ctttc......2.........+cccc''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..ccccccccccc.5........3...3..5..c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c.................................c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c............3.............3....2.c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''cccccccccccccc.......2...2........c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c............c....................c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c............c.................3..c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..cccccccc..c..........2..2......c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..ctttc1Bc..c....................c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..ctctc11c..c...3.......3........c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..ctct11cc..c..............2.....c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..ctcccccc..c.......2............c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..cttttttt..c.3...............2..c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c..ccccccccccc....2.....3.........c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c.......5.........................c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c.................................c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''ccccccccccccccTTTTTTTcccccccccccccc''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c'''''''''''ccc+++++ccc'''''''''''c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c'''''''''''cc.2...2.cc'''''''''''c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c''ccccccc''cc.L...L.cc''ccccccc''c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c''cc.322c''cc.......cc''c22.'cc''c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c''c]'c22c''cc.2...2.cc''c22c.}c''c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c''cccc''c''cc.K...K.cc''c3'cccc''c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c''''''''c''cc.......cc''c''''''''c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''c''''''''c''cc.2...2.cc''c''''''''c''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''cccccccccc''cc.J...J.cc''cccccccccc''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''''''''''''''cc.......cc''''''''''''''cc.........xxxxxxxxx
-xxxxxxxxx..........cc''''''''''''''cc.......cc''''''''''''''cc.........xxxxxxxxx
-xxxxxxxxx..........cccccccccccccccccc.I...I.cccccccccccccccccc.........xxxxxxxxx
-xxxxxxxxx..........cccccccccccccccccc.......cccccccccccccccccc.........xxxxxxxxx
-xxxxxxxxx.............................4...4............................xxxxxxxxx
-xxxxxxxxx.............................F...F............................xxxxxxxxx
-xxxxxxxxx...........................4.4...4.4..........................xxxxxxxxx
-xxxxxxxxx..............................................................xxxxxxxxx
-xxxxxxxxx..............................................................xxxxxxxxx
-xxxxxxxxx...........................4..V.V..4..........................xxxxxxxxx
-xxxxxxxxx..............................................................xxxxxxxxx
-xxxxxxxxx.............................4...4............................xxxxxxxxx
-xxxxxxxxx..............................................................xxxxxxxxx
-xxxxxxxxx...........................4.......4..........................xxxxxxxxx
-xxxxxxxxx..............................................................xxxxxxxxx
-xxxxxxxxx..............................................................xxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-ENDMAP
-
-###############################################################################
-# Tomb:2
-#
-NAME:    tomb_2
-PLACE:   Tomb:2
-# Can be rotated!
-ORIENT:  encompass
-#
-SHUFFLE: ABCD[, Ww/Yy/Zz, Uu/Vv, Qq/Rr/Ss
-SUBST:   W=', w=c, Y=T, y=+, Z=T, z=+
-SUBST:   U=', u=c, V=T, v=+
-SUBST:   Q=', q=c, R=T, r=+, S=T, s=+
-#
-SHUFFLE: ])}def
-SUBST:   d=", e=", f="
-#
-SUBST:   T = ^ .
-SUBST:   ' = ^ ':100
-SUBST:   ' = 1:5 2:5 3:1 .:89
-SUBST:   " = ^ ":50
-SUBST:   " = 2:3 3:1 .:96
-#
-# Number of ' symbols is 211+3=214, hence statistically in the lower 
-# circumference we'll have 10.7 mummies, another 10.7 guardian mummies
-# and 2.1 mummy priests.
-# Number of " symbols is 205+3=208, hence the upper circumference
-# has in mean 4.0 mummy priests and 8.3 guardian mummies.
-#
-# Perhaps to do: use KFEAT to make mummies possibly appear at T spots.
-#                have clustering of 1, 2 in the lower area as before?
-#
-MONS: mummy, guardian mummy, mummy priest, greater mummy
-#
-MAP
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""""c""""""c"""""{""""c""""""""c"""""""ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""""c"""""TcT""""""""TcT""""""TcT""""""ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""""c"""2"T+T""""""""T+T""2"""T+T""""""ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc"""TcT""""TcT""""""""TcT""""""TcT""""""ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""TT+T"""""c""""""""""c""""""""c"""""""ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccccc+ccccccccccccccccccccccccccccccc""""ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""TTc.............................c"3""ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""""c.............................c""""ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""3"c..ccc4.................4ccc..c"""fccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""""c..ccc...................ccc..c""""ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""""c..ccc.........1.........ccc..c)""}ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""""c..ccc.....2.......2.....ccc..cccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""""c.............................c''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcce"""c.............................cT'''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc""""c........c...........c........+T'''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc]""dc.............................cT'''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccccccc.....3........(........3.....c''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc''''c.............................c'QQQccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc'''Tc........c...........c........cccqcccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc'''T+.............................c'QQQccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc'''Tc.............................c''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc'ZZZc..ccc.....2.......2.....ccc..c''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccczcc..ccc.........1.........ccc..c''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc'ZZZc..ccc...................ccc..c''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccA'''c..ccc4.................4ccc..c''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc'YYYc.............................c''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccccycc.............................cRRR[ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc'YYYc.............................ccrccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc''''ccccc+ccccccccccccccc+cccccccccRRR'ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc''''''c'TTTc''''''''''''cTT''''''c'''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc'''''WcW''UcU''''''''''VcV''''''ScS''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc'''''WwW''UuU''''''''''VvV''''''SsS''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc'''''WcW''UcU''''''''''VcV''''''ScS''''ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccB'''''c''''cC'''''''''''c''''''''c''''Dccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-ENDMAP
-
-
-#############################################################################
-# Tomb:3
-#
-NAME:    tomb_3
-PLACE:   Tomb:3
-ORIENT:  encompass
-FLAGS:   no_rotate
-#
-SUBST:   ' : " $ ':80
-SUBST:   ' = " $
-SUBST:   " = ^:1 .
-SUBST:   $ = *:2 |:1 $:17
-#
-MONS:    mummy, guardian mummy, mummy priest, greater mummy
-#
-MAP
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccccccc.............................cccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccc...............cccccc..............ccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccc...............cccccccc..............cccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccc.......4......ccccO4cccc......4......cccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccc............cccc......cccc...........cccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc............cccc........cccc...........ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc............cccc........cccc...........ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc...........cccc..444444..cccc..........ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc.......................................ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc.......................................ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcc.................222222................ccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccc................223322...............cccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccc...3............223322............3..cccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccc...............222222..............ccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccc....2..........................2...ccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccc....2......................2....cccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccc............................cccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccccccccc+ccc..................ccc+ccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccc""""cc................cc""""cccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccc"""""""cc22222222222222cc"""""'$cccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccc""""""""""cc............cc"""""""'$ccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccc'""""""""""cc..........cc""""""""'$ccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccc$''""""""""""cc........cc"""""""""'$$cccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccc$$$'""""""""""cc222222cc""""""""''$$$cccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccc|$$$''"""""""""c......c"""""""''$$$$$cccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccc||$$$$'""""""""c......c""""""'$$$$$$$cccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccc|||||$$'"""""""c......c"""""'$$$$$$$$cccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccc|||||$'"""""""c......c""""'$$$$$$$$ccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccccc||||$$'""""""c......c""""'$$$$$$$cccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccc||||$'""""""c......c""""'$$$$$$ccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccccccc|||$$'"""""c......c"""'$$$$$$cccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccc|||$'""""cc..{...cc""'$$$$$ccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxccccccccc||$'""""cc...(..cc"'$$$$$cccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccccc|$'""cccc..[...cccc$$$$ccccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxcccccccccccccccccccccccccccccccccccccccccccxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-ENDMAP
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index d1b11a4689..39c74467c9 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3925,11 +3925,18 @@ bool dgn_place_monster(const mons_spec &mspec,
                 grd[vx][vy] = habitat;
         }
 
-        int not_used;
-        return (place_monster( not_used, mid, monster_level,
-                               m_generate_awake? BEH_WANDER : BEH_SLEEP,
-                               MHITNOT, true, vx, vy, false,
-                               PROX_ANYWHERE, mspec.monnum));
+        int mindex = NON_MONSTER;
+        const bool placed =
+            place_monster( mindex, mid, monster_level,
+                           m_generate_awake? BEH_WANDER : BEH_SLEEP,
+                           MHITNOT, true, vx, vy, false,
+                           PROX_ANYWHERE, mspec.monnum);
+        if (placed && mindex != -1 && mindex != NON_MONSTER
+            && mspec.colour != BLACK)
+        {
+            menv[mindex].colour = mspec.colour;
+        }
+        return (placed);
     }
     return (false);    
 }
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index de4faed141..b13457cc49 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -1895,6 +1895,18 @@ mons_list::mons_spec_slot mons_list::parse_mons_spec(std::string spec)
         mspec.fix_mons = strip_tag(s, "fix_mons");
         mspec.generate_awake = strip_tag(s, "generate_awake");
 
+        std::string colour = strip_tag_prefix(s, "col:");
+        if (!colour.empty())
+        {
+            mspec.colour = str_to_colour(colour, BLACK);
+            if (mspec.colour == BLACK)
+            {
+                error = make_stringf("bad monster colour \"%s\" in \"%s\"",
+                                     colour.c_str(), specs[i].c_str());
+                return (slot);
+            }
+        }
+
         trim_string(s);
 
         if (s == "8")
diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h
index e6d32f9a34..3ca2c03ca1 100644
--- a/crawl-ref/source/mapdef.h
+++ b/crawl-ref/source/mapdef.h
@@ -333,12 +333,13 @@ struct mons_spec
     int  genweight, mlevel;
     bool fix_mons;
     bool generate_awake;
+    int colour;
 
     mons_spec(int id = RANDOM_MONSTER, int num = 250,
               int gw = 10, int ml = 0,
               bool _fixmons = false, bool awaken = false)
         : mid(id), monnum(num), genweight(gw), mlevel(ml), fix_mons(_fixmons),
-          generate_awake(awaken)
+        generate_awake(awaken), colour(BLACK)
     {
     }
 };