Added many vaults, mainly by Eino and Lemuel.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3535 c06c8d41-db1a-0410-9941-cceddc491573

8 files changed, 677 insertions, 20 deletions

diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des
index 62055d070d..525eb88cbe 100644
--- a/crawl-ref/source/dat/elf.des
+++ b/crawl-ref/source/dat/elf.des
@@ -46,7 +46,7 @@ ENDMAP
 ##############################################################################
 # Elf arrival vault: corridor one (with the hidden toll cashbox)
 
-NAME:    elf_arrival_001
+NAME:    eino_elf_arrival_corridor
 PLACE:   Elf:1
 ORIENT:  float
 SHUFFLE: asd/v$=
@@ -69,7 +69,7 @@ ENDMAP
 ##############################################################################
 # Elf arrival vault: open area
 
-NAME:    elf_arrival_002
+NAME:    eino_elf_arrival_open_area
 PLACE:   Elf:1
 ORIENT:  float
 FLAGS:   no_rotate
@@ -90,6 +90,211 @@ xxxx...........xxxx
 xxxxxxxxxxxxxxxxxxx
 ENDMAP
 
+##############################################################################
+
+NAME:    eino_elf_arrival_customs
+ORIENT:  southwest
+PLACE:   Elf:1
+MONS:    deep elf soldier / deep elf mage / deep elf conjurer w:2
+MONS:    deep elf summoner
+MAP
+xxxxxxxxxxxxxx
+xxxxxx.+.....x
+xxxxxx.x..x..x
+xxxxxx.m.xxx.x
+xxxxxx.x..x..x
+xxxxxx.m1..1.x
+xxxxxx.x.2x..x
+xxxxxx.m1xxx1x
+xxxxxx.x.1x1.x
+xxxxxx{m.1.2.+
+xxxxxxxxxxxxxx
+xxxxxxxxxxxxxx
+xxxxxxxxxxxxxx
+xxxxxxxxxxxxxx
+xxxxxxxxxxxxxx
+xxxxxxxxxxxxxx
+ENDMAP
+
+##############################################################################
+
+NAME:    eino_elf_arrival_shootout
+PLACE:   Elf:1
+ORIENT:  float
+MONS:    deep elf soldier / deep elf mage, deep elf conjurer / deep elf priest / w:2 deep elf summoner
+MAP
+xxxxxxxx@@@xxxxxxxx
+xxxx...........xxxx
+xx......2.1......xx
+x.....1.....1.....x
+xxxx.....G.....xxxx
+xxxxxxxx...xxxxxxxx
+xxx[.....{.....(xxx
+xxxxxxxx...xxxxxxxx
+xxxx.....G.....xxxx
+x.....1.....1.....x
+xx......1.2......xx
+xxxx...........xxxx
+xxxxxxxx@@@xxxxxxxx
+ENDMAP
+
+########################################################################
+
+NAME: eino_elf_arrival_pack_of_fighters_taking_a_sip
+PLACE: Elf:1
+ORIENT: south
+TAGS: no_monster_gen
+KMONS: Z = deep elf fighter / deep elf soldier w:5
+KFEAT: Z = W
+MAP
+ .........
+x..WWWWW..x
+xWWWZWZWWWx
+xWWZWZWZWWx
+xWWWWWWWWWx
+x..WWWWW..x
+x.........x
+x....[....x
+xx...{...xx
+xxx.....xxx
+xxxxxxxxxxx
+xxxxxxxxxxx
+xxxxxxxxxxx
+xxxxxxxxxxx
+xxxxxxxxxxx
+xxxxxxxxxxx
+ENDMAP
+
+##############################################################################
+
+NAME: eino_elf_arrival_the_gate
+PLACE: Elf:1
+ORIENT: south
+MONS: deep elf soldier / deep elf mage
+MONS: deep elf conjurer / deep elf priest / deep elf fighter
+MONS: deep elf summoner / deep elf priest
+MAP
+x.........x
+@.........@
+x...3..2..x
+x..2.1.1..x
+x.G.1.1.G.x
+x.........x
+xxx+++++xxx
+xxx.....xxx
+xxx..[..xxx
+xxx.....xxx
+xxx..{..xxx
+xxxx...xxxx
+xxxxxxxxxxx
+xxxxxxxxxxx
+xxxxxxxxxxx
+xxxxxxxxxxx
+xxxxxxxxxxx
+xxxxxxxxxxx
+ENDMAP
+
+###########################################################
+# A nice scenic altar
+#
+NAME:    eino_elf_arrival_altar
+ORIENT:  west
+PLACE:   Elf:1
+SHUFFLE: 1/2, 4/5
+KFEAT:   C = altar_vehumet
+MONS:    deep elf soldier, deep elf mage
+MONS:    deep elf priest
+MONS:    deep elf conjurer, deep elf summoner
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxx@@@xxxx
+xxxxxxxxxxxxxxxxxx...xxxxxx.....xxx
+xxxxxxxxxxxxxxxx.22x...xx.........x
+xxxxxxxxxxxxxx...xxxxx.x..1.5.....x
+xxxxxx...xxxxx.xxxxxxx.m...3......x
+xxxxxx.[.......xxxxxx....1..GmG...@
+xxxxxx....xxxxxxxxxxx..m..C.mbm...@
+xxxxxx.{.......xxxxxx....23.GmG...@
+xxxxxx...xxxxx.xxxxxxx.m...4......x
+xxxxxxxxxxxxxx...xxxxx.x.2........x
+xxxxxxxxxxxxxxxx.11x...xx.........x
+xxxxxxxxxxxxxxxxxx...xxxxxx.....xxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxx@@@xxxx
+ENDMAP
+
+###########################################################
+
+NAME:   eino_elf_entry_druids_welcome
+TAGS:   entry no_monster_gen
+ORIENT: float
+MONS:   plant
+MAP
+x1......@......1x
+xw1...........1wx
+xww1.........1wwx
+xwww1...[...1wwwx
+xwwww1.....1wwwwx
+xwwwww1.{.1wwwwwx
+xwwww1.....1wwwwx
+xwww1...(...1wwwx
+xww1.........1wwx
+xw1...........1wx
+x1......@......1x
+ENDMAP
+
+###########################################################
+
+NAME:   eino_elf_entry_tree_alley
+TAGS:   entry no_monster_gen
+ORIENT: float
+MONS:   plant
+MAP
+xxxxxxxxxxxxxxxxxxx
+.11111111111111111.
+@.....[.{.(.......@
+.11111111111111111.
+xxxxxxxxxxxxxxxxxxx
+ENDMAP
+
+###########################################################
+
+NAME:   eino_elf_entry_water_cross
+TAGS:   entry no_monster_gen
+ORIENT: float
+MONS:   plant
+MAP
+...................
+..1xWx1..[..1xWx1..
+.1xxWxx1...1xxWxx1.
+..WWWWW..{..WWWWW..
+.1xxWxx1...1xxWxx1.
+..1xWx1..(..1xWx1..
+...................
+ENDMAP
+
+###########################################################
+
+NAME:   eino_elf_entry_water_star
+TAGS:   entry no_monster_gen no_rotate
+ORIENT: float
+MAP
+..xxxxxxx@xxxxxxx..
+....xxxx...xxxx....
+x.....x..W..x.....x
+xG..W....W....W..Gx
+xx...W..WWW..W...xx
+x.....WWWWWWW.....x
+....WWWW...WWWW....
+..WWWWW.({[.WWWWW..
+....WWWW...WWWW....
+x.....WWWWWWW.....x
+xx...W..WWW..W...xx
+xG..W....W....W..Gx
+x.....x..W..x.....x
+....xxxx...xxxx....
+..xxxxxxx@xxxxxxx..
+ENDMAP
+
+
 ############################################################################
 # elf_hall
 
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 5a53f4d49b..8c65996f27 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -295,6 +295,31 @@ xbbbbbbbbbbbbbbbb
 xxxxxxxxxxxxxxxxx
 ENDMAP
 
+#####################################################
+# Lions and Tigers and Bears, oh my! (or at least bears)
+#
+NAME:   lemuel_bear_cage
+DEPTH:  D:7-21
+MONS:   bear / black bear / grizzly bear / polar bear
+MONS:   hippogriff / griffon
+MONS:   yak / sheep / weight:3 death yak
+MONS:   hound / wolf / hog
+SUBST:  1 = 1:30 2 3 4 .:20
+MAP
+cccccccccc
+c1.1.1.1.c
+c.1.1.1.1c
+c1.1.1.1.c
+c.1.1.1.1c
+c1.1.1.1.c
+c.1.1.1.1c
+cnn++++nnc
+..........
+@........@
+..........
+xxxxxxxxxx
+ENDMAP
+
 ##################################
 # Vampire Tower by Lemuel Pitkin
 #
diff --git a/crawl-ref/source/dat/hells.des b/crawl-ref/source/dat/hells.des
index 7535f6820a..fb7704ad43 100644
--- a/crawl-ref/source/dat/hells.des
+++ b/crawl-ref/source/dat/hells.des
@@ -169,9 +169,34 @@ xxFxxxx1.x1x.1xxx2..=1x
 xxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
+##################################################################
+# The Dragons of Dis
+# There is an 8/27 chance all three downstairs will be here.
+#
+NAME:    Lemuel_Dis_Dragons
+DEPTH:   Dis:2-6
+ORIENT:  float
+FLAGS:   no_rotate
+MONS:    iron dragon, iron dragon
+SHUFFLE: ]})
+SUBST:   1=1. , }=}}> , )=))> , ]=]]>
+MAP
+vvvvvvv+++vvvvvvv
+v1.}.1v...v1.].1v
+v.1.1.v...v.1.1.v
+v..1..v.2.v..1..v
+v.....v...v.....v
+v.....v+++v.....v
+v...............v
+v.......1.......v
+v...............v
+v.......).......v
+vvvvvvvvvvvvvvvvv
+ENDMAP
+
 ##############################################################################
 # lemuel_nasty_pond
-
+#
 NAME:   lemuel_nasty_pond
 DEPTH:  Tar:*
 TAGS:   no_pool_fixup no_rotate
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index e9191f4de7..47919d6009 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -213,6 +213,129 @@ xxxxxxxaaaaaaaa[....@..........bbbbb..@..gggggggg........@.......d.....@..xxxxxx
 ENDMAP
 
 
+########################################################################
+# Medium gnoll camp 
+#
+NAME:   eino_medium_gnoll_camp
+ORIENT: north
+TAGS:   uniq_gnoll_camp
+# this chooses between closed+populated and open+deserted variations -
+# the populated version is more fun, the deserted version is easier
+: if crawl.random2(4) == 0 then
+SUBST:  T=., A=., a=., M=., m=., H=., h=., F=., f=., S=., s=., B=.
+SUBST:  b=., W=., w=., Z=., z=., G=., D=., d=.
+DEPTH:  D:3-6
+: else
+DEPTH:  D:7-14
+: end
+# walling
+SUBST:  A=x , a=+
+SUBST:  g = 1 2:3 3:1 4:3
+SUBST:  G = 1 2:3 3:1 4:3
+MONS:   gnoll
+MONS:   gnoll ; potion of healing . halberd | glaive | whip ego:reaching w:2 | spear | spear ego:reaching w:2 . ring mail | scale mail
+MONS:   gnoll ; potion of healing | potion of heal wounds . whip ego:reaching w:2 | whip good_item no_uniq w:1 | spear ego:reaching w:2 | glaive . scale mail | chain mail
+MONS:   gnoll ; javelin q:3 | throwing net q:2 . spear | halberd . leather armour | ring mail
+# juggle positions of the rest of the population and remove placeholders
+SHUFFLE: M/m, H/h, F/f, S/s, B/b, W/w, Z/z, D/d
+SUBST:  m=. , h=. , f=. , s=. , b=. , w=. , z=., d=.
+KMONS:  M = gnoll ; whip | whip ego:reaching w:2 | spear ego:reaching w:2 . leather armour | ring mail
+KMONS:  H = jackal / hound
+KMONS:  B = gnoll ; potion of healing | potion of heal wounds . whip ego:reaching w:2 | whip good_item no_uniq w:1 | spear ego:reaching w:2 |glaive . scale mail | chain mail / w:4 gnoll ; potion of heal wounds . spear good_item | halberd good_item | glaive ego:reaching w:5 .chain mail | banded mail
+KITEM:  F = meat ration / beef jerky / sausage / potion of water
+KITEM:  S = javelin q:4 w:5 / javelin q:3 w:5 / cloak / sausage / potion of water / leather armour / pair of gloves / hand axe
+KITEM:  W = spear good_item no_uniq w:2 / halberd / glaive / javelin q:4 w:5 / javelin q:3 w:5 / throwing net
+KFEAT:  Z = $
+KITEM:  D = potion of confusion / potion of speed / potion of berserk rage / potion of might
+MAP
+xxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxx
+xxxfFFxsSSxBWdxzZZxxxxx
+xxx.f.x.s.xbDDxBZZxxxxx
+xxxF.fAS.sAdBwAbzzxxxxx
+xxxxxaAAaAAAaAAaxxxxxxx
+xhMTx...........xHwWxxx
+xHhHa.g.AAaAA.g.ahzZxxx
+xhHmA.g.AGbGA g.AHZhxxx
+AAAAA.  A.GGA  .AAAAA.@
+@.....  Aw.WA  ........
+        AAAAA
+ENDMAP
+
+
+#######################################################
+# The Castle
+# With depth-appropriate inhabitants and loot
+#
+NAME:   lemuel_castle
+DEPTH:  D:2-27
+ORIENT: northwest
+TAGS:   no_monster_gen no_rotate
+: if you.absdepth() < 7 then
+MONS: gnoll, gnoll, ogre, jackal
+SUBST: *=*. , *=$ , |=* , *=*.
+: else
+MONS: orc, w:5 orc knight / orc warrior
+MONS: orc sorcerer / orc warlord / orc knight, warg
+SUBST: *:*$ , |:*$
+: end
+: if you.absdepth() > 15 then
+MONS: deep elf soldier / deep elf fighter
+MONS: deep elf knight / deep elf mage / deep elf summoner / deep elf priest
+MONS: deep elf annihilator / deep elf sorcerer / deep elf demonologist / deep elf blademaster/deep elf master archer
+MONS: nothing
+SUBST: *:*$, |=|.
+: end
+: if you.absdepth() > 24 then
+MONS: red draconian/green draconian/yellow draconian/pale draconian/black draconian/grey draconian/purple draconian
+MONS: grey draconian monk/pale draconian knight/green draconian annihilator/purple draconian knight
+MONS: red draconian scorcher/white draconian zealot/yellow draconian caller/black draconian shifter
+MONS: lindwurm/death drake/swamp drake, plant/weight:1 oklob plant
+SUBST: w:wl
+SUBST: *:*$
+: end
+COLOUR: ? = brown
+SUBST:  ? = .
+SUBST:  X = c =:1
+SUBST:  ~ = ~:2 .
+SUBST:  8 = 89
+MONS:   plant
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxx......5.................4.4......5............
+xxxxxx.......................4.4.4...5.............5
+xxxxxx....wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
+xxxxxx....wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
+xxxxxx....wwccnccwwwwwwwwwwwwwwwwwwwwwwwwwwwwccnccww
+xxxxxx....wwc1.1c......4.............4.......c1.1cww
+xxxxxx....wwc.1.cXccccccccccccXXccccccccccccXc.1.cww
+xxxxxx....wwccc+c....+~~~~~~~+..+~~~~~~~+.***c+cccww
+xxxxxx....www.X.c||..ccccccccc++ccccccccc.***c.X.www
+xxxxxx....www.c1c||2.c1...1..1321..1...1c.***c1c.www
+xxxxxx....www.c.cccccc..1...211112...1..cccccc.c.www
+xxxxxx....www.c.+....+....1...22...1....+....+.c.www
+xxxxxx.5..www.c.+....+..1...1....1...1..+....+.c.www
+xxxxxx....www.c.cccccccccccccc++cccccccccccXcc.c.www
+xxxxxx....www.c1c1.1..ccccccc....ccccccc..m..c1c.www
+xxxxxx....www.X.c.2...+.....=....=.....+..m.8c.X.www
+xxxxxx....wwccc+c1.1..ccccccc....ccccccc..m..c+cccww
+xxxxxx...5wwc.1.cXccccccccccc++++cccccccccccXc.1.cww
+xxxxxx....wwc1.1c4..4..4..4..4..4..4..4..4..4c1.1cww
+xxxxxx....wwccnccwwwwwwwwwwww????wwwwwwwwwwwwccnccww
+xxxxxx....wwwwwwwwwwwwwwwwwww????wwwwwwwwwwwwwwwwwww
+xxxxxx5...wwwwwwwwwwwwwwwwwww????wwwwwwwwwwwwwwwwwww
+xxxxxx..................414..@.....414............5.
+ENDMAP
+
+
 ##############################################################
 # The River Lethe
 #
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index e5fa534cd5..b213e54798 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -118,18 +118,19 @@ MAP
 .....
 ENDMAP
 
-#####################################################################
-# An average monster in a cage of glass; can get out if it has the
-# ability to dig or blink like a blink-frog.  Also, the player can
-# dig it out.
-NAME:  caged_monster_a
-DEPTH: D, Elf, Snake, Vault
+###################################
+# elevator
+#
+NAME:    lemuel_elevator
+DEPTH:   D, Vault, Elf, Crypt, Zot, Tar, Dis, Geh, Coc
+ORIENT:  float
+TAGS:    allow_dup
+SUBST:   m:mn
+SHUFFLE: {}, ]}) , [{(
 MAP
-.....
-.mmm.
-.m0m.
-.mmm.
-.....
+mmmm
+m{}m
+mmmm
 ENDMAP
 
 ###################################
@@ -183,6 +184,73 @@ MAP
 ..???.....?.
 ENDMAP
 
+##################################################################
+# Necromancer has a house with a fridge (and a nice garden) (Eino)
+#
+NAME:  eino_house_with_fridge
+DEPTH: D:8-20, Lair:2-10, Vault:1-4
+TAGS:  no_monster_gen no_item_gen mini_float
+MONS:  necromancer, plant
+MONS:  rat simulacrum / hound simulacrum / sheep simulacrum / bear simulacrum
+MAP
+............
+.xxxxxxxxxx.
+.x333x..%%x.
+.x333+..xxx.
+.x333x....x.
+.xxxxx.3..x.
+.....x..13x.
+.2T2.+....x.
+.....xxxxxx.
+............
+ENDMAP
+
+########################################################################
+# Small gnoll camp 1 
+#
+NAME:  eino_small__gnoll_camp_1
+DEPTH: D:3-10
+TAGS:  uniq_gnoll_camp
+MONS:  gnoll
+# "gnoll seargeant" with guaranteed good gear
+MONS:  gnoll ; potion of healing | potion of heal wounds . whip ego:reaching |whip good_item no_uniq | spear ego:reaching | glaive . scale mail | chain mail
+MONS: jackal / hound
+MAP
+xxxxxxxxxx
+x..3..xTxx
+x..313..xx
++....2..>x
+x..1..x%xx
+x...31x%xx
+xxxxxxxxxx
+ENDMAP
+
+########################################################################
+# Small gnoll camp 2
+#
+NAME:  eino_small_gnoll_camp_2
+PLACE: D:2
+DEPTH: D:3-10
+TAGS:  uniq_gnoll_camp
+MONS:  gnoll
+# "gnoll seargeant" with guaranteed good gear
+MONS:  gnoll ; potion of healing | potion of heal wounds . whip ego:reaching |whip good_item no_uniq | spear ego:reaching | glaive . scale mail | chain mail
+MONS:  jackal / hound
+MAP
+xxxxxxxxxx
+xxxx33+%%x
+xxx...x*$x
+xxx...xxxx
+xxxx.3.xxx
+x21+...1.x
+x11x..1..x
+xxxx....xx
+xxxx..xxxx
+xxxx..xxxx
+xx......xx
+xx......xx
+ENDMAP
+
 #############################################################################
 # Centaur isle (Lemuel)
 #
diff --git a/crawl-ref/source/dat/pan.des b/crawl-ref/source/dat/pan.des
index da9bbeab1c..3395552b0e 100644
--- a/crawl-ref/source/dat/pan.des
+++ b/crawl-ref/source/dat/pan.des
@@ -391,3 +391,95 @@ MAP
 .xxxxxxxx=x.
 ............
 ENDMAP
+
+###################################
+
+NAME: lemuel_draining_boxes
+TAGS: pan
+MONS: pandemonium demon, eye of draining, any demon
+SHUFFLE: aA/bB/cC/dD/eE/fF, eE/gG, fF/hH
+SUBST: a=m, b=m, c=m, d=m, e=m, f=m, g=., h=.
+SUBST: A=2, B=2, C=2, D=2, E=2, F=2, G=., H=.
+# the two center boxes are granted; 
+# of the six outer boxes, one or two may be missing
+SUBST: n=n =:1
+SUBST: m:mn
+KMONS: O = eye of draining
+KFEAT: O = O
+MAP
+                  ....bbb..  
+.......           ....bBb..  
+.aaa...           ....bbb..  
+.aAa...           .........  
+.aaa.......................  
+...........................  
+.............mmm.............
+    .........m2m..........ccc
+    .........mmm3.........cCc
+...............333........ccc
+..............33133nnn.......
+.fff...........333.nOn.......
+.fFf............3..nnn...    
+.fff.....................    
+.........................    
+.............................
+  .........        ...ddd....
+  ...eee...        ...dDd....
+  ...eEe...        ...ddd....
+  ...eee...        ..........
+ENDMAP
+
+###################################
+
+NAME: lemuel_hellion_island
+TAGS: pan
+MONS: pandemonium demon, hellion
+SUBST: L=l.
+MAP
+    ..LlllL..    
+  ..LlllllllL..  
+ .LlllllllllllL. 
+.LlllllL2LlllllL.
+.LllllL2.2LllllL.
+LllllL2|2|2LllllL
+llllL2.212.2Lllll
+llllL.2|2|2.Lllll
+LllllL.2.2.LllllL
+.LllllL.2.LllllL.
+.LlllllLLLlllllL.
+ .LlllllllllllL. 
+  ..LlllllllL..  
+    ..LlllL..    
+ENDMAP
+
+###################################
+
+NAME: lemuel_hall_of_pain
+TAGS: pan
+MONS: pandemonium demon, any demon
+MONS: smoke demon / weight:1 fiend
+SHUFFLE: mx/nc
+SHUFFLE: O1/AB
+SUBST: A=|, B=|
+# has a rune!
+MAP
+.......@.......
+xxxxxx+++xxxxxx
+xOx.xl...lx.xAx
+x1x3xl.2.lx3xBx
+x.x.ml...lm.x.x
+x2x.xl...lx.x2x
+x.x3xl...lx3x.x
+x2x.ml...lm.x2x
+x.x3xl...lx3x.x
+x2x.xl.2.lx.x2x
+x.x.ml...lm.x.x
+x.x3xl...lx3x.x
+x2x.xl...lx.x2x
+x.x.ml...lm.x.x
+x.x3xl.2.lx3x.x
+x2xxxl2.2lxxx2x
+x....2.2.2....x
+xxxxxxxxxxxxxxx
+ENDMAP
+
diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des
index f67fe5e8f5..e02b2b08b3 100644
--- a/crawl-ref/source/dat/temple.des
+++ b/crawl-ref/source/dat/temple.des
@@ -104,10 +104,78 @@ ENDMAP
 ##############################################################################
 # where's the temple?
 #
-NAME: temple_secret_doors
-TAGS: temple_entry no_rotate
+NAME:   temple_secret_doors_a
+CHANCE: 1
+TAGS:   temple_entry
+ORIENT: float
+SUBST:  ? : ?:40 T:30 U, ? = T:30 U
+MAP
+cccccccccc
+ccccnnnnnc
+ccccn?.?nc
+@...=.O.nc
+ccccn?.?nc
+ccccnnnnnc
+cccccccccc
+ENDMAP
+
+NAME:   temple_secret_doors_b
+CHANCE: 1
+TAGS:   temple_entry
+ORIENT: float
+SUBST:  ? : ?:40 T:30 U, ? = T:30 U
+NSUBST: X = 1:= / *=nnn=
+MAP
+ccccccccccc
+cccnnnnnccc
+cccn?.?nccc
+@..X.O.X..@
+cccn?.?nccc
+cccnnnnnccc
+ccccccccccc
+ENDMAP
+
+NAME:   temple_secret_doors_c
+CHANCE: 1
+TAGS:   temple_entry
+ORIENT: float
+SUBST:  ? : ?:40 T:30 U, ? = T:30 U
+NSUBST: X = 1:= / *=nnn=
+MAP
+ccccccccc
+cccnnnnnc
+cccn?.?nc
+@..X.O.nc
+cccn?.?nc
+cccnnXnnc
+ccccc.ccc
+ccccc.ccc
+ccccc@ccc
+ENDMAP
+
+NAME:   temple_secret_doors_d
+CHANCE: 1
+TAGS:   temple_entry 
+ORIENT: float
+SUBST:  ? : ?:40 T:30 U, ? = T:30 U
+NSUBST: X = 1:= / *=nnn=
+MAP
+ccccccccccc
+cccnnnnnccc
+cccn?.?nccc
+@..X.O.X..@
+cccn?.?nccc
+cccnnXnnccc
+ccccc.ccccc
+ccccc.ccccc
+ccccc@ccccc
+ENDMAP
+
+NAME:   temple_secret_doors_e
+CHANCE: 6
+TAGS:   temple_entry no_rotate
 ORIENT: float
-SUBST: ? : ?:40 T:30 U, ? = T:30 U
+SUBST:  ? : ?:40 T:30 U, ? = T:30 U
 NSUBST: X = 1:= / *=nnn=
 MAP
 cccccc@cccccc
diff --git a/crawl-ref/source/dat/zot.des b/crawl-ref/source/dat/zot.des
index ba64f85ea4..51e55cc633 100644
--- a/crawl-ref/source/dat/zot.des
+++ b/crawl-ref/source/dat/zot.des
@@ -140,24 +140,75 @@ MAP
 ENDMAP
 
 ###########################
-#
 # Globe of electric golems
 #
 NAME:  lemuel_golem_globe
 DEPTH: Zot:*
 TAGS:  no_rotate
+KFEAT: T = teleport trap
 SUBST: 1 = 1.
 MONS:  electric golem
 MAP
   mmmm
  mm..mm
 mm.11.mm
-m.1..1.m
+m.1TT1.m
 mm.11.mm
  mm..mm
   mmmm
 ENDMAP
 
+###################################################################
+# Draconian Sentry Boxes
+# There is an 8/27 chance all three downstairs will be here.
+#
+NAME:   lemuel_draconian_sentries
+DEPTH:  Zot:1-4
+ORIENT: float
+TAGS:   uniq_sentry no_rotate
+MONS:   red draconian scorcher/green draconian zealot/yellow draconian caller
+SUBST:  }=}}> , )=))> , ]=]]> , 1=123, w:w. , m:mn
+MAP
+............................
+..mmm..................mmm..
+..m1m..................m1m..
+..mmm...mmmwwwwwwmmm...mmm..
+........m1mwwwwwwm1m........
+........mmmwwwwwwmmm........
+mmm.....www...}..www.....mmm
+m1m.....www..)...www.....m1m
+mmm.....www...]..www.....mmm
+........mmmwwwwwwmmm........
+........m1mwwwwwwm1m........
+..mmm...mmmwwwwwwmmm...mmm..
+..m1m..................m1m..
+..mmm..................mmm..
+............................
+ENDMAP
+
+NAME:   lemuel_draconian_sentries_small
+DEPTH:  Zot:1-4
+ORIENT: float
+TAGS:   uniq_sentry no_rotate
+MONS:   red draconian scorcher/green draconian zealot/yellow draconian caller
+SUBST: }=}}> , )=))> , ]=]]>, 1=123 , w:w. , m:mn
+MAP
+................
+................
+..mmmwwwwwwmmm..
+..m1mwwwwwwm1m..
+..mmmwwwwwwmmm..
+..www...}..www..
+..www..)...www..
+..www...]..www..
+..mmmwwwwwwmmm..
+..m1mwwwwwwm1m..
+..mmmwwwwwwmmm..
+................
+................
+ENDMAP
+
+
 ###########################
 # Acid trip
 #
@@ -350,4 +401,4 @@ FLOORCOL: lightblue
 ROCKCOL:  magenta
 MAP
 .
-ENDMAP
\ No newline at end of file
+ENDMAP