Map updates (David).

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

11 files changed, 933 insertions, 775 deletions

diff --git a/crawl-ref/source/dat/asciiart.des b/crawl-ref/source/dat/asciiart.des
index 543d45b86c..efccd0d603 100644
--- a/crawl-ref/source/dat/asciiart.des
+++ b/crawl-ref/source/dat/asciiart.des
@@ -461,8 +461,6 @@ TAGS: entry
 ORIENT: float
 FLAGS: no_rotate
 SHUFFLE: {[(
-# I am worried about getting ported into the 2x2 closet   
-# IF we replace G with c, we could place a secret door
 MAP
 xxxxxxxxxxxvvvvvvvvvvvvxxxxxxxxxx
 xxxxxxvvvvv...........vvvxxxxxxxx
@@ -524,3 +522,153 @@ b...(bxxx........................
 b...{bxxx...............xxxx.....
 bb.bbbxxxxxxxxxxxxxx.xxxxxxx.....
 ENDMAP
+
+##############################################################################
+# 27 #1
+
+NAME: erik_entry_006
+TAGS: entry
+ORIENT: float
+ITEM: stone
+SHUFFLE: ab
+MAP
+bbbbbbbbbbbbbbbbbbbb
+b{[................b
+b(.................b
+b..a...............b
+b..................b
+b....aa............b
+b....a.............b
+b......aaa.........b
+b......aaa.........b
+b......aaa.........b
+b..................b
+b..........aaa.aaa.b
+b..........aaa.aaa.b
+b..........aaa.aaa.b
+b..................b
+b..........aaa.....b
+b..........aaa.....b
+b..........aaa...d.b
+b...................
+bbbbbbbbbbbbbbbbbb.@
+ENDMAP
+
+##############################################################################
+# 27 #2
+
+NAME: erik_entry_007
+TAGS: entry
+ORIENT: float
+ITEM: stone
+SHUFFLE: bx
+MAP
+bbbbbbbbbbbbbbbbbbbbbbbbbbb
+b.........................b
+b.........................b
+b.........................b
+b...>...[{(...ccccccccc...b
+b.........................b
+b.........................b
+b.........................b
+bbbbbbbbbbbbbbbbb...bbbbbbb
+b...................b
+b...................b
+b...................b
+b...c.ccc.ccc.ccc...b
+b...c.c.c.c.c.c.c...b
+b...ccc.ccc.ccc.c...b
+b...................b
+b....d..............b
+b...................b
+bbbb.@.bbbbbbbbbbbbbb
+ENDMAP
+
+##############################################################################
+# 27 #3
+
+NAME: erik_entry_008
+TAGS: entry no_monster_gen
+# no pillars for dancing, so no_monster_gen
+ORIENT: float
+ITEM: stone
+MAP
+      cccccccccccccccccccccc
+      cbbbbb.c...c.........c
+      cb[{(+.+...+.........c
+      cbbbbb.c...c.........c
+cccccccccccccccccccccc+ccccc
+c..........................c
+c.d........................c
+c..........................c
+c.@.cccccccccccccccccccccccc
+ENDMAP
+
+##############################################################################
+# Ramanujan
+
+NAME: erik_entry_009
+TAGS: entry
+ORIENT: float
+SUBST: c : cxxx
+MAP
+ccccccccccccccccccccccccccccccccc
+c([x............................c
+c{.x............................c
+cxx+............................c
+c......x.xxxxxxx.xx.xxxxxxxxx...c
+c...............................c
+c...............................c
+c...x.xxxxxxxxxxxx..............c
+c...............................c
+c...............................c
+c...xxxxxxxxx.xxxxxxxxxx........c
+c...............................c
+c...............................c
+c................................
+ccccccccccccccccccccccccccccccc.@
+ENDMAP
+
+##############################################################################
+# Kangaroo Pocket Calculator
+
+NAME: erik_entry_010
+TAGS: entry no_monster_gen
+ORIENT: float
+SHUFFLE: bc
+MAP
+bbbccccccccccccccccccccccccccccccccccccccccccccc
+b[b........................................+..+.
+b{+........................................+..+@
+b(b........................................+..+.
+bbbccccccccccccccccccccccccccccccccccccccccccccc
+ENDMAP
+
+##############################################################################
+# Kaf Zayin
+
+# with my luck, this will be something horribly offensive
+NAME: erik_entry_011
+TAGS: entry no_monster_gen
+ORIENT: float
+FLAGS: no_rotate no_hmirror no_vmirror
+SHUFFLE: cx
+MAP
+cccccccccccccccc@@cccccccccccccccccc
+c..................................c
+c...x...............xx.............c
+c..xxxxxx..........xxxxxxxx........c
+c.xxxxxxxx.........xxxxxxxxxxx.....c
+c..xxxxxxxx.........xxxxxxxxxxxx...c
+c.....xxxx..............xxxxxxxxx..c
+@......xx........[<..........xxxxx.@
+@......xxx.......({............xxx.@
+c.......xxx.....................xx.c
+c.......xxx.....................xx.c
+c........xxx...........xxxxxxxxxxx.c
+c........xxx..........xxxxxxxxxxx..c
+c.........xx.........xxxxxxxxxxx...c
+c..................................c
+cccccccccccccccc@@cccccccccccccccccc
+ENDMAP
+
diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index 94eb6a33ad..fe9c957c8a 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -44,16 +44,54 @@ w.w.w
 ENDMAP
 
 ###############################################################################
+# Some coins to shop with.
+NAME: bzr_entry_002
+TAGS: bzr_entry 
+ORIENT: float
+SUBST: $=$.
+: check_expire_marker(_G)
+MAP
+xx.xx
+x$$$x
+.$O$.
+x$$$x
+xx.xx
+ENDMAP
+
+###############################################################################
+# Many customers
+NAME:    bzr_entry_003
+TAGS:    bzr_entry 
+ORIENT:  float
+MONS:    human, orc, goblin, kobold
+SUBST:   . = .:210 1
+SHUFFLE: 1234
+: check_expire_marker(_G)
+MAP
+ .....
+.......
+...O...
+.......
+ .....
+ENDMAP
+
+###############################################################################
 # Bazaar layouts.
 #
 # "encompass" levels are recommended, and can be as small or large as you like.
 # No monsters are pre-placed in bazaars, and monsters do not spawn in bazaars,
 # but you can place monsters in your maps if you know what you're doing.
+#
+# Every encompass bazaar level must have at least one downstair, which will be
+# replaced with an exit from the bazaar. It's a good idea to also provide an
+# upstair, which will be converted into a stone arch (and on which the player
+# will be placed when entering the bazaar).
 
-NAME: bazaar_001
-TAGS: bazaar
+NAME:   bazaar_general_marketplace
+TAGS:   bazaar
 ORIENT: encompass
-KFEAT: A = any shop
+KFEAT:  A = any shop
+CHANCE: 30
 MAP
 xxxxxxxxx
 xxxx>xxxx
@@ -65,3 +103,61 @@ xxx...xxx
 xxxx>xxxx
 xxxxxxxxx
 ENDMAP
+
+NAME:    bazaar_outfitter
+TAGS:    bazaar
+ORIENT:  encompass
+KFEAT:   A = any shop
+SHUFFLE: ABC, de, xcv
+KFEAT:   A = weapon shop / armour shop
+KFEAT:   B = antique weapon shop / weapon shop
+KFEAT:   C = antique armour shop / armour shop
+ITEM:    any weapon / w:2 good_item any weapon
+ITEM:    any armour / w:2 good_item any armour
+MAP
+xxxxxxxxx
+xxxx>xxxx
+xx.....xx
+x.......x
+x.AdBeC.x
+x.......x
+xx.....xx
+xxxx<xxxx     
+xxxxxxxxx
+ENDMAP
+
+NAME:    bazaar_mystics
+TAGS:    bazaar 
+ORIENT:  encompass
+SHUFFLE: AB, def, xw/vl
+KFEAT:   A = scroll shop / book shop / book shop
+KFEAT:   B = jewellery shop
+ITEM:    any jewelry / good_item any jewelry
+ITEM:    any book / good_item any book, any staff 
+SUBST:   w:w.l, x:b, c:., v=bl, d=.d, e=.e, f=.f
+MAP
+xxxxxxxxxxxxx
+xxxxxxxwwwxxx
+xxxwwx....Axx
+x<...+.def.>x
+xxxwwx....Bxx
+xxxxxxxwwwxxx
+xxxxxxxxxxxxx
+ENDMAP
+
+NAME:    bazaar_wands
+TAGS:    bazaar 
+ORIENT:  encompass
+KFEAT:   A = wand shop
+ITEM:    any wand
+MAP
+xxxxxxxxxxx
+xx...>...xx
+x..A...A..x
+x.........x
+xllll.llllx
+x....>....x
+x..d...d..x
+xx...<...xx
+xxxxxxxxxxx
+ENDMAP
diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index e8524822f5..3abb9ddbfa 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -123,7 +123,7 @@ NAME: lemuel_entry_005_a
 TAGS: entry no_monster_gen
 ORIENT: float
 SHUFFLE: {[(
-CHANCE: 3
+CHANCE: 2
 MAP
 xxxxxxxxxxxxxxxxxxx
 xxxxx{...(...[xxxxx
@@ -172,6 +172,33 @@ xxxxx.........xxxxx
 xxxxx....@....xxxxx  
 ENDMAP
 
+NAME: lemuel_oo5_c
+TAGS: entry no_monster_gen
+ORIENT: float
+SHUFFLE: {[(, ABC
+SUBST: A:=, B:x, C:x
+CHANCE: 1
+MAP  
+xxxxxxxxxxxxxxxxxxx  
+xxxWA{...(...[xxxxx  
+xxwWx.........xxxxx  
+xwwWB.........xxxxx  
+xwwWx.........xxxxx  
+xwwWC.........xxxxx  
+xxWwx.........xxxxx  
+xxWwww........xxxxx
+xWxwwwwwwww...xxxxx  
+xWxxwwwwwwwwwwxxxxx  
+xxWxxwwwwwwwwwwwxxx  
+xxWxx...wwwwwwwwwxx  
+xxwWx........wwwwxx  
+xwxw+.........xwwwx  
+xwxxx.........xxwwx  
+xxxxx.........xxxwx  
+xxxxx.........xxxxx  
+xxxxx.........xxxxx  
+ENDMAP
+
 ##############################################################################
 # lemuel_entrance_tunnels
 
@@ -207,7 +234,7 @@ ENDMAP
 NAME: lemuel_entry_007_funnel
 TAGS: entry no_monster_gen
 ORIENT: float
-SUBST: c : x.c
+SUBST: c : x.cw
 MAP
 xxxxxxxxxxxxxxx
 x{.....(.....[x
@@ -268,7 +295,7 @@ NAME: lemuel_entry_009_a
 TAGS: entry
 ORIENT: float
 SHUFFLE: {[(
-SUBST: ? : xcvG.
+SUBST: ? : xxcvG.
 CHANCE: 4
 MAP
 xxxxxxxxxxx
@@ -291,7 +318,7 @@ ENDMAP
 NAME: lemuel_entry_009_b
 TAGS: entry
 ORIENT: float
-SUBST: ? : xcvG.
+SUBST: ? : xxcvG.
 ITEM: meat ration / bread ration / beef jerky / spear / potion of water / apple / club / hammer / knife
 SHUFFLE: {[(
 CHANCE: 3
@@ -316,7 +343,7 @@ ENDMAP
 NAME: lemuel_entry_009_c
 TAGS: entry
 ORIENT: float
-SUBST: ? : xcvG.
+SUBST: ? : xxcvG.
 ITEM: meat ration / bread ration / beef jerky / spear / potion of water / apple / club / hammer / knife
 SHUFFLE: {[(
 CHANCE: 3
@@ -346,7 +373,7 @@ TAGS: entry
 CHANCE: 5
 ORIENT: float
 SHUFFLE: {(
-SUBST: b : bcv
+SUBST: b : bcvxxx
 MAP
 xxxxxxxxxxx
 x{...(...[x
@@ -366,7 +393,7 @@ TAGS: entry
 CHANCE: 5
 ORIENT: float
 SHUFFLE: {(
-SUBST: b : bcv
+SUBST: b : bcvxxx
 MAP
 xxxxxxxxxxx
 x{...(...[x
@@ -504,7 +531,7 @@ FLAGS: no_rotate
 ORIENT: float
 SHUFFLE: {[(<, @X, Aa/Bb/Dd/Ee
 SUBST: A==, a=., B=c, b=c, D=c, d=c, E=c, e=c
-SUBST: v:vx, c:vxc
+SUBST: v:vxxx, c:vxxxxc
 SUBST: X=x
 MAP
         xxxxxxx@xxxxxxx
@@ -532,7 +559,7 @@ NAME: david_entry_004_temple
 TAGS: entry no_monster_gen
 FLAGS: no_rotate
 ORIENT: float
-SHUFFLE: {[(
+SHUFFLE: {[(, cxxx
 MAP
         ccccccc@ccccccc
     ccccc.............ccccc
@@ -556,7 +583,7 @@ NAME: david_entry_005_temple
 TAGS: entry no_monster_gen
 FLAGS: no_rotate
 ORIENT: float
-SHUFFLE: {[(
+SHUFFLE: {[(, cxxx
 MAP
      ccccccccccc
   cccc....[....cccc
@@ -582,7 +609,7 @@ NAME: david_entry_006_temple
 TAGS: entry no_monster_gen
 FLAGS: no_rotate
 ORIENT: float
-SHUFFLE: {[(
+SHUFFLE: {[(, cxxx
 MAP
          ccccc
         cc...cc
@@ -607,10 +634,10 @@ NAME: david_entry_007_temple
 TAGS: entry
 FLAGS: no_rotate
 ORIENT: float
-SHUFFLE: {[(
+SHUFFLE: {[(, cxxx
 MAP
-xxxccccccccccc@ccccccccccccxxx
-xccc......................cccx
+cccccccccccccc@ccccccccccccccc
+cccc......................cccc
 cc....c.cccc.cccc.cccc.cc...cc
 c..ccc...cc...cc...cc...ccc..c
 c.cccc.T.cc.T.cc.T.cc.T.cccc.c
@@ -626,8 +653,8 @@ c.cccc...cc...cc...cc...cccc.c
 c.cccc.T.cc.T.cc.T.cc.T.cccc.c
 c..ccc...cc...cc...cc...ccc..c
 cc...cc.cccc.cccc.cccc.cc...cc
-xccc......................cccx
-xxxccccccccccccccccccccccccxxx
+cccc......................cccc
+cccccccccccccccccccccccccccccc
 ENDMAP
 
 ##############################################################################
@@ -637,20 +664,20 @@ NAME: david_entry_008_temple
 TAGS: entry no_monster_gen
 ORIENT: float
 FLAGS: no_rotate
-SHUFFLE: {[
+SHUFFLE: {[, cxxx
 MAP
-   cccxxxxxxxxxxxccc
-  cc.cccxxxxxxxccc.cc
- cc....cccxxxccc....cc
+   ccccccccccccccccc
+  cc.ccccccccccccc.cc
+ cc....ccccccccc....cc
 cc..T....ccccc....T..cc
 c.....T....c....T.....c
 c..T....T.....T....T..c
 c.........{.(.........c
 ccccccc.........ccccccc
- xxxxxcccc.[.ccccxxxxx
-  xxxxxxcc...ccxxxxxx
-   xxxxcc..T..ccxxxx
-    xxcc.......ccxx
+ ccccccccc.[.ccccccccc
+  cccccccc...cccccccc
+   cccccc..T..cccccc
+    cccc.......cccc
      cc..T...T..cc
      c.....T.....c
      ccc.......ccc
@@ -658,35 +685,23 @@ ccccccc.........ccccccc
 ENDMAP
 
 ##############################################################################
-# Moving archways
+# By the pond
 
 NAME: david_entry_009
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_pool_fixup
 ORIENT: float
-MONS: plant / fungus / nothing
-MONS: fungus
-SHUFFLE: ABCD, _wl'
-SUBST: A=+, B=+, C==, D==
-SUBST: l:wxl, _:xw~_
-SUBST: ' = . 2:3 ~:1
-SUBST: ~ = ~:2 .
-SUBST: _ = 1 . %:1
-SUBST: w = w W:3
-MAP
-xxx.......@.......xxx
-xxxx+xxx+xxx+xxx+xxxx
-xxx___xwwwxlllx'''xxx
-xxx___xwwwxlllx'''xxx
-xxx___xwwwxlllx'''xxx
-xxx___xwwwxlllx'''xxx
-xxx___xwwwxlllx'''xxx
-xxx___xwwwxlllx'''xxx
-xxxxAxxxBxxxCxxxDxxxx
-xxx...............xxx
-xxxx.............xxxx
-   xxxx.......xxxx
-     xxxx[{(xxxx
-      xxxxxxxxx
+SUBST: 0 = 0 .
+MAP
+..0.0....0..
+xxwwwwwwwxxx
+xwwwwwwwwwwx
+xwwww'wwwwwx
+xwww....'wwx
+xww......'wx
+x'.......'wx
+x....{..'wwx
+.........wwx
+@........xxx
 ENDMAP
 
 ##############################################################################
@@ -699,6 +714,7 @@ SHUFFLE: {[(, XYZ, TVG
 SUBST: X = = c:2
 SUBST: Y=c, Z=c
 SUBST: ?=c., !=ccc.
+SHUFFLE: cxxx
 MAP
 cccccccccccccccccccccccccccccccccccccccc
 c[!.!c...cc.??...c?....................c
@@ -876,7 +892,7 @@ TAGS: entry no_monster_gen
 ORIENT: float
 FLAGS: no_rotate
 MONS: fungus
-SHUFFLE: {[(, b:bcv, UVW, XYZ
+SHUFFLE: {[(, b:xxxbcv, UVW, XYZ
 SUBST: '=.x, U==, V=x, W=x, X==, Y=x, Z=x
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -1391,7 +1407,7 @@ ENDMAP
 NAME: david_021_tetris
 TAGS: entry
 ORIENT: float
-SHUFFLE: bcv
+SHUFFLE: ba
 MAP
           x.@.x
          xx...xx
@@ -1544,7 +1560,7 @@ ITEM: nothing / ring of hunger / protection from fire / protection from cold
 ITEM: nothing / choko / pear / apple / sausage / banana / any scroll
 SHUFFLE: dD1AB/yyyyy, eE2FG/yyyyy, AB, FG
 SUBST: y=x, A==, B=x, D=., F==, G=x, E=.
-SUBST: ' : cxv, " : cxv
+SUBST: ' : cxxxv, " : cxxxv
 MAP
 .........................
 .......xxxxx+xxxxx.......
@@ -1578,6 +1594,7 @@ MONS: generate_awake jelly
 ITEM: dart
 ORIENT: float
 SHUFFLE: {[(
+SUBST: v:vxx
 MAP
 xxxxxxxxxxxxxxxxxxxxx....@.....
 xxxxx......xxxxxxxxxx.........@
@@ -1811,7 +1828,7 @@ ENDMAP
 NAME: david_entry_035
 TAGS: entry
 ORIENT: float
-SHUFFLE: cv
+SHUFFLE: cvxxxx
 MAP
 @...........@
 .............
@@ -2056,7 +2073,7 @@ ENDMAP
 NAME: david_entry_039
 TAGS: entry
 ORIENT: float
-SUBST: '=cx., "=+.=
+SUBST: '=cx., "=+.=, c:xxc
 MAP
 xxxxxxxxxxxxxxxxxxxx
 xccccccx.......x..c.
@@ -2070,23 +2087,23 @@ xxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ##############################################################################
-# Squares
+# Orchard
 
 NAME: david_entry_040
 TAGS: entry
 ORIENT: float
 SHUFFLE: {[(
+MONS: plant
+SUBST: . = .:140 a
+KITEM: a : apple/apricot/pear/apricot/orange/banana/strawberry/lemon
 MAP
-x@xxxxxxxxxx@x
-@..[xx....cc.@
-x.ccxx.......x
-x.cc..cc.....x
-x....x{cxx...x
-x....xx.xx...x
-xcc.........cx
-xcc..cx.xx..cx
-@....xc(xx...@
-x@xxxxxxxxxx@x
+  .....
+ .......
+ .1...1.
+....{....
+ .1...1.
+ .......
+  .....
 ENDMAP
 
 ##############################################################################
@@ -2095,9 +2112,8 @@ ENDMAP
 NAME: david_entry_041
 TAGS: entry
 ORIENT: float
-SHUFFLE: {[(, vcx
-SUBST: ? = x=
-SUBST: ' = x.
+SHUFFLE: {[(
+SUBST: ? = x= , ' = x. , v : cvxxxx
 MAP
 xxxxxxxxxxxxxxxx.@
 @...xxxxxx.'xx.?..
@@ -2147,7 +2163,7 @@ NAME: david_entry_043
 TAGS: entry
 ORIENT: float
 SHUFFLE: {[(
-SUBST: ' : . x ':40, '=x., " : . c ":40, "=.c
+SUBST: ' : . x ':40, '=x., " : . c ":40, "=.c , c:cxx
 MAP
     xxxxxxx
   xxx.....xxxx
@@ -2403,7 +2419,7 @@ xxxxxxxxxx+xXxx
 ENDMAP
 
 ##############################################################################
-# Brainrot
+# Brainrot (Dead Infection)
 
 NAME: david_entry_053
 TAGS: entry no_monster_gen
@@ -2435,7 +2451,7 @@ ENDMAP
 NAME: david_entry_054
 TAGS: entry
 ORIENT: float
-SUBST: c:xc, %:%.T, T:TGv.
+SUBST: c:xxxc, %:%.T, T:TGv.
 MAP
 .....................
 .....................
@@ -2513,10 +2529,10 @@ ENDMAP
 NAME: david_entry_056_a
 TAGS: entry
 ORIENT: float
-CHANCE: 5
+CHANCE: 3
 FLAGS: no_rotate
 ITEM: nothing, nothing, nothing
-SHUFFLE: cbvx, def}
+SHUFFLE: cccbvxxx, def}
 MAP
 ..............................
 ...............cc.............
@@ -2542,9 +2558,9 @@ ENDMAP
 NAME: david_entry_056_b
 TAGS: entry
 ORIENT: float
-CHANCE: 5
+CHANCE: 7
 FLAGS: no_rotate
-SHUFFLE: cbvx
+SHUFFLE: cccbvxxx
 MAP
 ..........................
 ............cc............
@@ -2687,6 +2703,7 @@ TAGS: entry
 ORIENT: float
 ITEM: nothing, nothing
 SHUFFLE: =+, TVG, {[
+SUBST: c:cxx
 MAP
 xx@...@xxxxxxxx
 xx+xxx+xxxxxxxx
@@ -2733,7 +2750,6 @@ ORIENT: northwest
 SHUFFLE: Cc, {Y
 SUBST: ?=l. , Y=.
 CHANCE: 6
-KFEAT: X = teleport trap
 MAP
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
@@ -2741,7 +2757,7 @@ xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
-xxxxxxXlllllllllll....
+xxxxxx>lllllllllll....
 xxxxxxlClllllllll?...@
 xxxxxxlllllllll??.....
 xxxxxxllllllllll......
@@ -2759,7 +2775,6 @@ NAME: david_entry_061_b_altar
 TAGS: entry no_monster_gen
 ORIENT: northwest
 CHANCE: 4
-KFEAT: X = teleport trap
 SHUFFLE: Cc, {Y
 SUBST: Y=.
 MAP
@@ -2769,7 +2784,7 @@ xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
-xxxxxxXwwwwwwwwwwwwww.
+xxxxxx>wwwwwwwwwwwwww.
 xxxxxxwCwwwwwwwwwww..@
 xxxxxxwwwwwwwwwwww....
 xxxxxxwwwwwwwwwwww....
@@ -2923,7 +2938,7 @@ NAME: david_entry_066_b_tiny
 TAGS: entry
 CHANCE: 3
 ORIENT: float
-SHUFFLE: vcb
+SUBST: v : vcbxxx
 MAP
 xxxxx
 xvvvx
@@ -2951,10 +2966,10 @@ ITEM: any, nothing, nothing
 ORIENT: float
 FLAGS: no_rotate
 SHUFFLE: ]def
+SUBST: c : cx
 
 # A test run with 50 tries had precisely one level without shallow water
 # access to surroundings. This is intended and I like the low chance for this.
-# Using SUBST: w=wW this chance could be decreased even more.
 
 MAP
 .............................
@@ -2982,6 +2997,173 @@ MAP
 ENDMAP
 
 ##############################################################################
+# Prison with walls (not Napalm Death)
+
+NAME:    david_entry_068
+TAGS:    entry no_monster_gen
+ORIENT:  float
+SHUFFLE: ABCDEFGH
+SUBST:   A={, B=', C=', D=', E=', F=', G=', H='
+SUBST:   ' = .:70 1 w:2
+SUBST:   . = .:60 2:1 3:1
+MONS:    fungus, rat, giant cockroach
+MAP
+xxxxxxxxxxxxxxxxx
+x'A'x'B'x'C'x'D'x
+x'.'x'.'x'.'x'.'x
+xx+xxx+xxx+xxx+xx
+x'..............x
+x'..............+
+x'..............x
+xx+xxx+xxx+xxx+xx
+x'.'x'.'x'.'x'.'x
+x'E'x'F'x'G'x'H'x
+xxxxxxxxxxxxxxxxx
+ENDMAP
+
+##############################################################################
+# The pits are prepared
+
+NAME: david_entry_069_a
+TAGS: entry no_monster_gen
+ORIENT: float
+CHANCE: 3
+SHUFFLE: bxxxx
+MAP
+ .........@........ 
+..wwww........llll..
+.w.wwww......llllll.
+.ww{}ww......llllll.
+.wwwwww......llllll.
+..wwww..bbbb..llll..
+.......bbbbbb.......
+      .bbbbbb.      
+      .bbbbbb.      
+      ..bbbb..      
+       ......       
+ENDMAP
+
+NAME: david_entry_069_b
+TAGS: entry no_monster_gen
+ORIENT: float
+CHANCE: 3
+SHUFFLE: bxxxx
+MAP
+ .......@.......... 
+..wwww........llll..
+.wwwwww......llllll.
+.wwwwww......ll}{ll.
+.wwwwww......llll.l.
+..wwww..bbbb..llll..
+ ......bbbbbb...... 
+      .bbbbbb.      
+      .bbbbbb.      
+      ..bbbb..      
+       ......       
+ENDMAP
+
+NAME: david_entry_069_c
+TAGS: entry no_monster_gen
+ORIENT: float
+CHANCE: 3
+SHUFFLE: bxxxx
+MAP
+ ........@......... 
+..wwww........llll..
+.wwwwww......llllll.
+.wwwwww......llllll.
+.wwwwww......llllll.
+..wwww..b=bb..llll..
+ ......bb.bbb...... 
+      .bb{}bb.      
+      .bb.b=b.      
+      ..b=bb..      
+       ......       
+ENDMAP
+
+NAME: david_entry_069_d
+TAGS: entry no_monster_gen
+ORIENT: float
+CHANCE: 1
+SHUFFLE: bxxxx
+MAP
+ ........@......... 
+..wwww........llll..
+.wwwwww..{}..llllll.
+.wwwwww......llllll.
+.wwwwww......llllll.
+..wwww..bbbb..llll..
+ ......bbbbbb...... 
+      .bbbbbb.      
+      .bbbbbb.      
+      ..bbbb..      
+       ......       
+ENDMAP
+
+##############################################################################
+# Caged fury
+
+NAME: david_entry_070
+TAGS: entry
+MONS: w:30 nothing / worm 
+MONS: w:30 nothing / ooze / weight:2 jelly
+MONS: w:30 nothing / jackal / rat
+FLAGS: no_rotate
+ORIENT: float
+SUBST: ?=Gx, ===++
+SHUFFLE: xc, 123
+MAP
+.................
+.xxxxxxxxxxxxxxx.
+.x1231321332212x.
+.x2312132211323x.
+.x3123213123132x.
+.x?????G+G?????x.
+.x.............x.
+.=T....xxx....T=.
+.x.....({[.....x.
+.x..T.......T..x.
+.xxx=xxxxxxx=xxx.
+.................
+ENDMAP
+
+##############################################################################
+# Morbid curiosity
+
+NAME:    david_entry_071
+TAGS:    entry 
+ORIENT:  float
+MONS:    goblin, kobold, orc priest
+ITEM:    needle, dart, stone
+SHUFFLE: ABCD
+SUBST:   A=@, B=@xx, C=@xxxx, D=x
+MAP
+     xxxxxxxxxBxxxxxxxxx     
+    xxxxx...........xxxxx    
+   xxx...xxxxx+xxxxx...xxx   
+  xx..xxxxxlllllllxxxxx..xx  
+ xx.xxxxxlll..3..lllxxxxx.xx 
+xx.xxxxxx...........xxxxxx.xx
+xx.xxxxxxxxxxx=xxxxxxxxxxx.xx
+xx.xxxxxxxxx.....xxxxxxxxx.xx
+x.xx...xxx..G.G.G..xxx..lxx.x
+x.x....xx...........xx1fllx.x
+x.x....x.............x...lx.x
+A.+...........{....G.=..1l+.C
+x.x....x.............x...lx.x
+x.x....xx...........xx..llx.x
+x.xx...xxx...G.G...xxx..lxx.x
+xx.xxxxxxxxx.....xxxxxxxxxx.x
+xx.xxxxxxxxxxx=xxxxxxxxxxx.xx
+xx.xxxxxx2d....2..e2xxxxxx.xx
+xxx.xxxxxlll2....lllxxxxx.xx 
+ xxx..xxxxxlllllllxxxxx..xx  
+   xxx...xxxxx+xxxxx...xxx   
+    xxxxx...........xxxxx    
+     xxxxxxxxxDxxxxxxxxx     
+ENDMAP
+
+##############################################################################
 # Erik's entry vaults
 ##############################################################################
 
@@ -2994,6 +3176,7 @@ ORIENT: float
 CHANCE: 1
 SHUFFLE: {[(
 SUBST: X : x:20 G:4 l:1
+SUBST: c : cxxx
 MAP
 cccccccccccccccccccccccccccccccccccccccc
 c[c..c...cc......c.....................c
@@ -3020,6 +3203,7 @@ ORIENT: float
 MONS: gnoll
 CHANCE: 3
 SHUFFLE: {[(
+SUBST: c : cxxx
 MAP
 cccccccccccccccccccccccccccccccccccccccc
 c[c..c...cc......c.....................c
@@ -3046,6 +3230,7 @@ ORIENT: float
 MONS: centaur, orc
 CHANCE: 3
 SHUFFLE: {[(
+SUBST: c : cxxx
 MAP
 cccccccccccccccccccccccccccccccccccccccc
 c[c..c...cc......c.....................c
@@ -3072,6 +3257,7 @@ ORIENT: float
 MONS: orc
 CHANCE: 3
 SHUFFLE: {[(
+SUBST: c : cxxx
 MAP
 cccccccccccccccccccccccccccccccccccccccc
 c[c..c...cc......c.....................c
@@ -3182,7 +3368,7 @@ ENDMAP
 NAME: erik_entry_005
 TAGS: entry
 ORIENT: float
-SHUFFLE: cx
+SHUFFLE: cxxx
 MAP
 ..............................
 ............c..c..............
@@ -3206,153 +3392,58 @@ MAP
 ENDMAP
 
 ##############################################################################
-# 27 #1
+# Being Mean Is Cool
 
-NAME: erik_entry_006
+NAME: erik_entry_006_a
 TAGS: entry
 ORIENT: float
-ITEM: stone
-SHUFFLE: ab
-MAP
-bbbbbbbbbbbbbbbbbbbb
-b{[................b
-b(.................b
-b..a...............b
-b..................b
-b....aa............b
-b....a.............b
-b......aaa.........b
-b......aaa.........b
-b......aaa.........b
-b..................b
-b..........aaa.aaa.b
-b..........aaa.aaa.b
-b..........aaa.aaa.b
-b..................b
-b..........aaa.....b
-b..........aaa.....b
-b..........aaa...d.b
-b...................
-bbbbbbbbbbbbbbbbbb.@
+CHANCE: 5
+ITEM: scroll of curse armour
+ITEM: scroll of teleportation
+MAP
+xxxxx
+xxexx
+xd{ex
+xxdxx
+xxxxx
 ENDMAP
 
-##############################################################################
-# 27 #2
-
-NAME: erik_entry_007
+NAME: erik_entry_006_b
 TAGS: entry
 ORIENT: float
-ITEM: stone
-SHUFFLE: bx
-MAP
-bbbbbbbbbbbbbbbbbbbbbbbbbbb
-b.........................b
-b.........................b
-b.........................b
-b...>...[{(...ccccccccc...b
-b.........................b
-b.........................b
-b.........................b
-bbbbbbbbbbbbbbbbb...bbbbbbb
-b...................b
-b...................b
-b...................b
-b...c.ccc.ccc.ccc...b
-b...c.c.c.c.c.c.c...b
-b...ccc.ccc.ccc.c...b
-b...................b
-b....d..............b
-b...................b
-bbbb.@.bbbbbbbbbbbbbb
-ENDMAP
-
-##############################################################################
-# 27 #3
-
-NAME: erik_entry_008
-TAGS: entry no_monster_gen
-# no pillars for dancing, so no_monster_gen
-ORIENT: float
-ITEM: stone
+CHANCE: 4
+ITEM: scroll of curse armour, scroll of random uselessness, scroll of identify
+ITEM: scroll of curse armour, scroll of fear, scroll of teleportation
+SHUFFLE: def, ghi
 MAP
-      cccccccccccccccccccccc
-      cbbbbb.c...c.........c
-      cb[{(+.+...+.........c
-      cbbbbb.c...c.........c
-cccccccccccccccccccccc+ccccc
-c..........................c
-c.d........................c
-c..........................c
-c.@.cccccccccccccccccccccccc
+@.....@
+.xx=xx.
+.xxgxx.
+.=d{g=.
+.xxdxx.
+.xx=xx.
+@.....@
 ENDMAP
 
-##############################################################################
-# Ramanujan
-
-NAME: erik_entry_009
+NAME: erik_entry_006_c
 TAGS: entry
 ORIENT: float
-SHUFFLE: cx
-MAP
-ccccccccccccccccccccccccccccccccc
-c([x............................c
-c{.x............................c
-cxx+............................c
-c......x.xxxxxxx.xx.xxxxxxxxx...c
-c...............................c
-c...............................c
-c...x.xxxxxxxxxxxx..............c
-c...............................c
-c...............................c
-c...xxxxxxxxx.xxxxxxxxxx........c
-c...............................c
-c...............................c
-c................................
-ccccccccccccccccccccccccccccccc.@
-ENDMAP
-
-##############################################################################
-# Kangaroo Pocket Calculator
-
-NAME: erik_entry_010
-TAGS: entry no_monster_gen
-ORIENT: float
-SHUFFLE: bc
+CHANCE: 1
+SHUFFLE: uU / vV / wW / zZ
+SUBST: u==, v==, V=~, w=x, W=x, z==, Z=~.
+ITEM: scroll of curse armour, scroll of random uselessness, scroll of identify
+ITEM: scroll of curse armour, scroll of fear, scroll of teleportation
+KFEAT: U = teleport trap
 MAP
-bbbccccccccccccccccccccccccccccccccccccccccccccc
-b[b........................................+..+.
-b{+........................................+..+@
-b(b........................................+..+.
-bbbccccccccccccccccccccccccccccccccccccccccccccc
+xxxxxxx
+xZxxxWx
+xxzgwxx
+xxd{gxx
+xxudvxx
+xUxxxVx
+xxxxxxx
 ENDMAP
 
-##############################################################################
-# Kaf Zayin
-
-# with my luck, this will be something horribly offensive
-NAME: erik_entry_011
-TAGS: entry no_monster_gen
-ORIENT: float
-FLAGS: no_rotate no_hmirror no_vmirror
-SHUFFLE: cx
-MAP
-cccccccccccccccc@@cccccccccccccccccc
-c..................................c
-c...x...............xx.............c
-c..xxxxxx..........xxxxxxxx........c
-c.xxxxxxxx.........xxxxxxxxxxx.....c
-c..xxxxxxxx.........xxxxxxxxxxxx...c
-c.....xxxx..............xxxxxxxxx..c
-@......xx........[<..........xxxxx.@
-@......xxx.......({............xxx.@
-c.......xxx.....................xx.c
-c.......xxx.....................xx.c
-c........xxx...........xxxxxxxxxxx.c
-c........xxx..........xxxxxxxxxxx..c
-c.........xx.........xxxxxxxxxxx...c
-c..................................c
-cccccccccccccccc@@cccccccccccccccccc
-ENDMAP
 
 ##############################################################################
 # Matt's vaults
@@ -3600,6 +3691,7 @@ ORIENT: northwest
 FLAGS: no_rotate
 SHUFFLE: [{
 SUBST: ' : . x ':40, '=x.
+SUBST: c : cxxx, [ = [ T
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3638,19 +3730,19 @@ xxxxxxxxxxxxxxxx.xxxxxxxxxxx.xx
 xxxxxxxxxxxxxxx...xxxxxxxxx...xx
 xxxxxxxxxxxxxx.....xxxxxxx.....xx
 xxxxxxxxxxxxx.......xxxxx.......xx
-xxxxxxxxxx.+....{....xxx....2....x
+xxxxxxxxxx.+....{....xxx....2....xx
 xxxxxxxxxx+xx.......xxxxx.......xxxx
 xxxxxxxxxx.xxx.....xxx.xxx.....xxx.xx
 xxxxxxxxx...xxx...xxx...xxx...xxx...xx
 xxxxxxxx.....xxx.xxx.....xxxexxx.....xx
-xxxxxxx.......xx+xx..1.1..xx+xx.......xxx
+xxxxxxx.......xx+xx..1.1..xx+xx.......xx 
 xxxxxx....[....+.+...1d....+.+~...3....+@
-xxxxxxx.......xx+xx...1...xx+xx.......xxx
+xxxxxxx.......xx+xx...1...xx+xx.......xx 
 xxxxxxxx.....xxx.xxx.....xxxfxxx.....xx
 xxxxxxxxx...xxx...xxx...xxx...xxx...xx
 xxxxxxxxxx.xxx.....xxx.xxx.....xxx.xx
 xxxxxxxxxx+xx.......xxxxx.......xxxx
-xxxxxxxxxx.+....(....xxx....4....x
+xxxxxxxxxx.+....(....xxx....4....xx
 xxxxxxxxxxxxx.......xxxxx.......xx
 xxxxxxxxxxxxxx.....xxxxxxx.....xx
 xxxxxxxxxxxxxxx...xxxxxxxxx...xx
@@ -3668,6 +3760,7 @@ ITEM: any armour / any weapon / nothing
 ORIENT: float
 FLAGS: no_rotate
 SHUFFLE: {[(
+SUBST: c : cx
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xcccccccxxxxxxxxxxxxxxxxxxxcccccccx
@@ -3725,6 +3818,7 @@ ORIENT: float
 MONS: rat / nothing, hobgoblin / goblin / nothing
 SHUFFLE: '"XY/ABVW, !?/CD
 SUBST: ':., ":=, A:x, B:x, !:., ?:=, C:x, D:x, V=x, W=x, Y=@x
+SUBST: c : cxx
 KFEAT: X = teleport trap / floor
 MAP
          x@x
@@ -3750,6 +3844,7 @@ MONS: rat / nothing, hobgoblin / goblin / nothing
 SHUFFLE: '"/AB, !?XY/CDVW
 SUBST: ':., ":=, A:x, B:x, !:., ?:=, C:x, D:x, Y=@x, V=x, W=x
 KFEAT: X = teleport trap / floor
+SUBST: c : cxxx
 MAP
          x@x
          x.x
@@ -3775,18 +3870,18 @@ TAGS: entry
 ORIENT: float
 SHUFFLE: {[(, XY/AB
 KFEAT: X = teleport trap
-SUBST: Y=x, A=., B==
-MAP
-xxxxxxx@xxxxxxx.@.xxxxxxx
-xxxxxxx.xxxxxx...xxxxxxxx
-xxxxxxx.xxxxx...xxxxxxxxx
-xxxxx....xxx...xxxxxxxxxx
-xxxxx{....x...xxxxxxxxxxx
-xxxxx........xxxxxxxxxxxx
-x].XY........xxxxxxxxxxxx
-xxxxx.[.................@
-xxxxx.......(.xxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxx
+SUBST: Y=x, A=., B==, (=(., [=[.
+MAP
+   xxxx@xxxxxxx.@.x   
+   xxxx.xxxxxx...xx   
+   xxxx.xxxxx...xxx   
+   xx....xxx...xxxx   
+   xx{....x...xxxxx   
+xxxxx........xxxxxx   
+x].XY........xxxxxxxxx
+xxxxx.[..............@
+xxxxx.......(.xxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ##############################################################
@@ -3813,60 +3908,6 @@ xxxxxxxxxx.xxxxxxxxxxxxxxx
 xxxxxxxxxx.xxxxxxxxxxxxxxx
 ENDMAP
 
-##############################################################
-# Now I'm radioactive! That can't be good.
-
-NAME: entry_elethiomel_008
-TAGS: entry no_monster_gen
-ORIENT: float
-FLAGS: no_rotate
-SHUFFLE: {[(
-MAP
-xxxxxxxxxxxxxxx@xxxxxxxxx
-xxxxxbbbbxxxxxx.xxxxxxxxx
-xxbbbb..bxxxxxx.xxxxxxxxx
-xbb.....bbxxxxx.xxxbbbxxx
-xb...{...bbxxxx.xbbb.bbxx
-xbbb......bbbbb.bb....bbx
-xxxbbbb.......bb.......bx
-@......bb..........[...bx
-xxxxxxxbb.....bb.......bx
-xxxxbbbb......bbbbbbbb.bx
-xxbbb......bbb.xxxxxxbbbx
-xxb....(..bbxx.xxxxxxxxxx
-xxbbb.....bxxx.xxxxxxxxxx
-xxxxbbb...bxxx.xxxxxxxxxx
-xxxxxxbbbbbxxx.xxxxxxxxxx
-xxxxxxxxxxxxxx@xxxxxxxxxx
-ENDMAP
-
-##############################################################
-# Octagram
-NAME: entry_elethiomel_009
-TAGS: entry
-ORIENT: float
-SHUFFLE: {([<
-MAP
-xxxxxxxxxxxxxxxxxx
-xxxxx.xxxxxx.xxxxx
-xxxxx.xxxxxx.xxxxx
-xxxxx..xxxx..xxxxx
-xxxxx..xxxx..xxxxx
-x................@
-xxx...x.xx.x...xxx
-xxxxx..x..x..xxxxx
-xxxxx.x.<{.x.xxxxx
-xxxxx.x.[(.x.xxxxx
-xxxxx.xx..x..xxxxx
-xxx...x.xx.x...xxx
-x................@
-xxxxx..xxxx..xxxxx
-xxxxx..xxxx..xxxxx
-xxxxx.xxxxxx.xxxxx
-xxxxx.xxxxxx.xxxxx
-xxxxx@xxxxxx@xxxxx
-ENDMAP
-
 
 ##############################################################################
 # Onia Ninara's entry vaults
@@ -3878,7 +3919,7 @@ NAME:    onia_ninara_001_pentagram
 TAGS:    entry no_monster_gen no_pool_fixup
 FLAGS:   no_rotate
 ORIENT:  float
-SHUFFLE: ({[, x+/cC/vV/lL/wW
+SHUFFLE: ({[, x+/x+/x+/x+/cC/vV/lL/wW
 SUBST:   C=+, V=+, L=.
 MAP
 ...........................
@@ -3908,7 +3949,7 @@ NAME: onia_ninara_002_pyramid
 TAGS: entry
 FLAGS: no_rotate
 ORIENT: float
-SHUFFLE: ({[, vcx
+SHUFFLE: ({[
 MAP
 .........................
 ............x............
@@ -3931,11 +3972,11 @@ ENDMAP
 NAME: onia_ninara_003_mini_spirals
 TAGS: entry
 ORIENT: float
-SHUFFLE: ({[<, ~T, vxc
+SHUFFLE: ({[<, ~T, vcxxxx
 MAP
-xvvvvvvvvvx
-xv...v...vx
-xv[v.v.v(vx
+vvvvvvvvvvv
+vv...v...vv
+vv[v.v.v(vv
 vvvv.v.vvvv
 v.........v
 v.vv.~.vv.v
@@ -4190,10 +4231,10 @@ xxxxxx.....xxxxxxxx
 xxxxx.....''xxxxxxx
 xxx.......''xxxxxxx
 xx.........'xxxxxxx
-.......(I...'xxxxxx
-@.....vbc..''xxxxxx
-x....cbv...''xxxxxx
-x....I[....''xxxxxx
+.......(....'xxxxxx
+@.....ccI..''xxxxxx
+x....Icc...''xxxxxx
+x.....[....''xxxxxx
 ...........'xxxxxxx
 @.........''xxxxxxx
 x........''xxxxxxxx
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 590dc7b84d..be7832281d 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -37,7 +37,7 @@ ENDMAP
 #
 NAME: erik_1
 ORIENT: float
-TAGS: no_monster_gen
+TAGS: no_monster_gen uniq
 DEPTH: D:7-11, Lair
 #
 SHUFFLE: rR/sS/uU/vV/wW/yY/zZ, uU/nN
@@ -78,13 +78,14 @@ ENDMAP
 # Sometimes You Just Gotta Run
 # Moved deeper and minor changes.
 #
-NAME: erik_ogre
-DEPTH: D:6-10
-ORIENT: float
+NAME:    erik_ogre
+DEPTH:   D:6-10
+TAGS:    uniq
+ORIENT:  float
 SHUFFLE: 1X / 1X / 2l / 3Y
-SUBST: X=x, Y:x.
-MONS: ogre, iron devil, nothing
-ITEM: potion of heal wounds / speed / berserk rage / scroll of blinking
+SUBST:   X=x, Y:x.
+MONS:    ogre, iron devil, nothing
+ITEM:    potion of heal wounds / speed / berserk rage / scroll of blinking
 MAP
         xx@xx
         x...x
@@ -116,10 +117,10 @@ ENDMAP
 # The slime creature or amoeba may seem too tough for the level where this appears,
 # but since they are normal speed with no range attacks, they can be escaped
 #
-NAME: slime_lemuel
-DEPTH: D:6-16, Lair
+NAME:   slime_lemuel
+DEPTH:  D:6-16, Lair
 ORIENT: float
-MONS: w:20 ooze/jelly/fungus, slime creature/giant amoeba/oklob plant
+MONS:   w:20 ooze/jelly/fungus, slime creature/giant amoeba/oklob plant
 MAP
 xxxxxxxxxx
 xxxx111xxx
@@ -136,15 +137,17 @@ ENDMAP
 #
 NAME: shooting_gallery_Lemuel
 ORIENT: float
-TAGS: no_pool_fixup no_monster_gen
+TAGS: no_pool_fixup no_monster_gen uniq
 ITEM: potion of levitation q:2
 : if you.absdepth() <= 16 then
-MONS: orc wizard / centaur / jackal / killer bee larva / giant lizard / kobold / giant mite / grey rat / green rat / orange rat
-MONS: deep elf priest / orc high priest / cyclops / orc priest / jelly / ogre / troll / yak / orc warrior / sheep / hog
+MONS: orc wizard/centaur/jackal/killer bee larva/giant lizard/kobold/giant mite/grey rat/green rat/orange rat
+MONS: deep elf priest/orc high priest/cyclops/orc priest/jelly/ogre/troll/yak/orc warrior/sheep/hog
 : elseif you.absdepth() >= 17 then
-MONS: deep elf priest / orc high priest / cyclops / yaktaur / slime creature / yak / wyvern / big kobold / toenail golem
-MONS: yaktaur captain / manticore / deep elf high priest / orc sorcerer / ogre-mage / ugly thing / unseen horror / wandering mushroom
+MONS: deep elf priest/orc high priest/cyclops/yaktaur/slime creature/yak/wyvern/big kobold/toenail golem
+MONS: yaktaur captain/manticore/deep elf high priest/orc sorcerer/ogre-mage/ugly thing/unseen horror
 : end
+KFEAT: $ = >
+KFEAT: * = <
 MAP
 ccccccccccccccccccccccccccccccccccccccccccccc
 ccxc$cxc*cxc$cxc*cxc$cxc*cxc$cxc*cxc$cxc*cxcc
@@ -155,19 +158,20 @@ ccww1www1www1www1www1www1www1www1www1www1wwcc
 cxwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwxc
 cc.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.cc
 cx.........................................xc
-cc....................d....................cc
-cx.........................................xc
+cc.........................................cc
+cx.........d..........d..........d.........xc
 cc.........................................cc
 ENDMAP
 
 ##############################################################################
 # Beware the mummy's curse (Lemuel)
 #
-NAME: MiniTomb
-ORIENT: float
-DEPTH: D:15-26
-MONS: large zombie / nothing, mummy, guardian mummy, greater mummy, large zombie
-MONS: mummy / nothing
+NAME:    MiniTomb
+ORIENT:  float
+DEPTH:   D:15-26
+TAGS:    uniq
+MONS:    large zombie/nothing, mummy, guardian mummy, greater mummy, large zombie
+MONS:    mummy / nothing
 SHUFFLE: 2F, cbv
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -191,7 +195,7 @@ ENDMAP
 NAME:   insect_pit
 FLAGS:  no_rotate
 ORIENT: float
-DEPTH:  D:5-12, Elf
+DEPTH:  D:5-12, Elf, Vault
 SUBST:  1 = 1:70 2:60 3:25
 MONS:   giant beetle w:20 / giant cockroach w:30 / butterfly w:20
 MONS:   bumblebee / giant centipede / giant mite w:30 / giant mosquito
@@ -215,11 +219,11 @@ ENDMAP
 #
 # possibility to script the trolls guard the bridge would be great here -evk
 #
-NAME: troll_bridge
-DEPTH: D:7-15
+NAME:   troll_bridge
+DEPTH:  D:7-15
 ORIENT: float
-TAGS: no_pool_fixup
-MONS: troll w:50 / rock troll / iron troll w:5
+TAGS:   no_pool_fixup uniq
+MONS:   troll w:50 / rock troll / iron troll w:5
 MAP
 xxxxx...........................xxxxxx
 xwwwx...........................xxxxxx
@@ -248,27 +252,72 @@ ORIENT:  float
 SUBST:   * : *$
 SUBST:   * = |:5 * .
 SUBST:   T = TU
-SHUFFLE: xb/cc
+SHUFFLE: xb/cc, ABC
+: if crawl.coinflip() then
+KFEAT:   X = rock staircase leading up / rock staircase leading down
+KITEM:   X = any good_item
+: else
+SUBST:   X=*, B=., C=.
+KFEAT:   A = teleport trap
+: end
 MAP
-xxxxxxxxx
-xbbbbbbbx
-xb*****bx
-xb*****bx
-xb.....bx
-xb.....bx
-xb.....bx
-xb.....bx
-xbwwwwwbx
-xbww1wwbx
-xbwwwwwbx
-xb.....bx
-xb.....bx
-xb.....bx
-xb.....bx
-xb.....bx
-xbT.@.Tbx
+xxxxxxxxxxxxxxxxx
+xbbbbbbbbbbbbbbbb
+xb**....www.....T
+xb**..A.www......
+xbX*..B.w1w.....@
+xb**..C.www......
+xb**....www.....T
+xbbbbbbbbbbbbbbbb
+xxxxxxxxxxxxxxxxx
 ENDMAP
 
+##################################
+# Vampire Tower by Lemuel Pitkin
+#
+NAME:    vampire
+ORIENT:  float
+TAGS:    uniq
+DEPTH:   D:12-27, Vault, Crypt
+MONS:    rat/grey rat/w:6 green rat/w:3 orange rat/w:20 giant bat
+MONS:    flying skull, human zombie
+MONS:    vampire, vampire mage, vampire knight
+KITEM:   > = any good_item
+KFEAT:   ; = altar of Yredelemnul/altar of Kikubaaqudgha
+SHUFFLE: defg
+SHUFFLE: *s/!?
+SUBST:   d = =, e = x, f = x, g = x
+SUBST:   s = =, ! = x, ? = x
+SUBST:   1 = 1 .:20
+SUBST:   1 : 1:30 2
+SUBST:   + = +=
+SUBST:   w:w.
+MAP
+F..wwwwwwwwwwwwwwwww..F
+..wwwwwwwwwwwwwwwwwww..
+.www111xxxx+xxxx111www.
+www111xxx22322xxx111www
+ww111xx.+23432+.xx111ww
+ww11dx..ccccccc..xe11ww
+ww1xx..ccc|>|ccc..xx1ww
+wwxx..ccccc6ccccc..xxww
+wwx..ccc33+4+33ccc..xww
+wwx.ccccccc+ccccccc.xww
+wwx.c***x.....x???c4xww
+wwx.c***s..5..!???c.xww
+wwx4cc**x4.;.4x??cc.xww
+wwx..ccxx.....xxcc..xww
+wwxx..ccx..4..xcc..xxww
+ww1xx..cc.....cc..xx1ww
+ww11fx..ccc.ccc..xg11ww
+ww111xx..cc+cc..xx111ww
+www111xx..333..xx111www
+.www111xxxxxxxxx111www.
+..wwwwwwwwwwwwwwwwwww..
+F..wwwwwwwwwwwwwwwww..F
+ENDMAP
+
+
 #############################################################################
 # Oklob gauntlet
 #
@@ -328,7 +377,7 @@ ENDMAP
 # island version for shoal in lair.des -evk
 #
 NAME: onia_ninara_012_swampy_vault
-TAGS: no_pool_fixup no_monster_gen
+TAGS: no_pool_fixup no_monster_gen uniq_swamp_vault
 ORIENT: float
 SHUFFLE: AB@
 SUBST: A : x, B : x
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des
index 552846a74f..a5a4e68cec 100644
--- a/crawl-ref/source/dat/lab.des
+++ b/crawl-ref/source/dat/lab.des
@@ -4,18 +4,20 @@
 #                                flavour vaults (tagged by 'lab').
 ###############################################################################
 
+
 #############################################################################
 # Labyrinth entry vaults
 
-NAME: lab_entry_generic
-TAGS: lab_entry transparent
-DEPTH: 12-26
+NAME:   lab_entry_generic
+TAGS:   lab_entry transparent
+DEPTH:  12-26
 ORIENT: float
 MARKER: O = timer:400-600
 MAP
 O
 ENDMAP
 
+
 #############################################################################
 # Labyrinth exit minivaults
 #############################################################################
@@ -228,7 +230,6 @@ MAP
 ENDMAP
 # The heart stopper
 
- 
 #############################################################################
 # Labyrinth flavour minivaults
 #############################################################################
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 3f3d472c6c..c4e4b5d648 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -206,13 +206,54 @@ ENDMAP
 # Lair-specific non-entry/ending vaults
 ##############################################################################
 
+##############################################################################
+# Rats! (Lemuel), special Lair version
+# There another, easier version for the shallow dungeon
+#
+NAME:    RatsNest_Lair
+ORIENT:  northeast
+TAGS:    uniq_rats_nest
+DEPTH:   Lair
+SHUFFLE: 23, 34
+MONS:    rat / green rat / nothing, grey rat / orange rat / nothing
+MONS:    green rat / orange rat / nothing, orange rat / rat
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxx...xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxx343.xx.xxxxxxxx.334433xxxxxxxxx23...xxxxxx
+xx.222...xxxxxxxx..224422xxxxxx1111...xxxxxxx
+x..111..xxxxxxxxx..111111.xxx.111...xxxxxxxxx
+xx.111..xxxxxxxxxx.11111..x......xxxxxxxxxxxx
+xxxx..xx.x.xxxxxx.xx..........xxxxxxxxxxxxxxx
+xxxxx.xxx.x..x.xx.x.xx....x.xxxxxxxxxxxxxxxxx
+xxxxx...x.xxx.x33xx.xxxx.xxxxxxxxxxxxxxxxxxxx
+xxxxxxx.x.xxxx221x.xxx...xxxxxxxxxxxxxxxxxxxx
+xxxxxxxx.xxxxx111.xxxx.xxxxxxxxxxxxxxxxxxxxxx
+       xx..xxx.x.x.xxx.xxxxxxxxxxxxxxxxxxxxxx
+       xxx..x.xx.x.xx.xxxxxxxxxxxxxxxxxxxxxxx
+       xxxxx..xx.xx.x.xxxxxxxxxxxxxxxxxxxxxxx
+       xxxxxxxx.xxxx.xxxxxxxxxxxxxxxxxxxxxxxx
+             xx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+             xxx.xxxxxxxxxxxxxxxxxxxxxxxxxxxx
+             xxx.xxx                   xxxxxx
+             xxxx.xx                   xxxxxx
+             xxx.xxx                   xxxxxx
+             xxxx.xx                   xxxxxx
+             xxxx@xx                   xxxxxx
+ENDMAP
+
 ##########################################
 # a pointless little "vault" by Lemuel
 #
 # edited and varied by Eino. Placing into Lair only because of the floor colour.
 # would be nice to have in the main dungeon, if it once becomes possible to change
 # the floor colour (to green/brown)
-
+#
 NAME: strawberry_fields_big
 ORIENT: float
 DEPTH: Lair
@@ -307,28 +348,72 @@ MAP
      ..
 ENDMAP
 
+
+#############################################################################
+# plantages
+#
+NAME:   fruit_tree_single
+ORIENT: float
+DEPTH:  Lair, Snake
+MONS:   plant, fungus
+SUBST:  ' = . a 2:1
+SUBST:  . = .:90 a:10 2:1
+KITEM:  a : apple/apricot/pear/apricot/orange/banana/strawberry/lemon
+CHANCE: 8
+MAP
+ ..... 
+.......
+..'''..
+..'1'..
+..'''..
+.......
+ ..... 
+ENDMAP
+
+NAME:   fruit_tree_lots
+ORIENT: float
+DEPTH:  Lair, Snake
+MONS:   plant, fungus
+SUBST:  ' = . 1
+SUBST:  . = .:90 a:10 2:1
+SUBST:  _ = .:90 a:4 
+KITEM:  a : apple/apricot/pear/apricot/orange/banana/strawberry/lemon
+CHANCE: 8
+MAP
+   ________   
+  _........_  
+ _.....'...._ 
+_..'........._
+_......'..'.._
+_...'........_
+_......'....._
+ _..'....'.._ 
+  _........_  
+   ________   
+ENDMAP
+
 #############################################################################
 # Swampy vault, island version
 #
 # common version in float.des -evk
 # doesn't work yet?
 
-NAME: onia_ninara_012_swampy_vault_shoal
-TAGS: no_pool_fixup no_monster_gen
-ORIENT: float
+NAME:    onia_ninara_012_swampy_vault_shoal
+TAGS:    no_pool_fixup no_monster_gen uniq_swamp_vault
+DEPTH:   Shoal
+ORIENT:  float
 SHUFFLE: AB@
-SUBST: A : x, B : x
-SUBST: D = .:30 W
-KFEAT: E = w:20 . / x / w:50 W / w:30 w / ~
-KFEAT: F = w:150 w / w:70 W / ~ / . / x
-KFEAT: G = x / . / w / W
-KFEAT: H = . / W
-KMONS: D = Plant / w:200 nothing
-KMONS: E = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:1 electrical eel / w:1000 nothing
-KMONS: F = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:2 electrical eel / w:1000 nothing
-KMONS: H = swamp drake / swamp dragon / hydra / w:20 nothing
-KITEM: H = any good_item / any potion / w:20 nothing / gold
-DEPTH: Shoal
+SUBST:   A : x, B : x
+SUBST:   D = .:30 W
+KFEAT:   E = w:20 . / x / w:50 W / w:30 w / ~
+KFEAT:   F = w:150 w / w:70 W / ~ / . / x
+KFEAT:   G = x / . / w / W
+KFEAT:   H = . / W
+KMONS:   D = Plant / w:200 nothing
+KMONS:   E = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:1 electrical eel / w:1000 nothing
+KMONS:   F = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:2 electrical eel / w:1000 nothing
+KMONS:   H = swamp drake / swamp dragon / hydra / w:20 nothing
+KITEM:   H = any good_item / any potion / w:20 nothing / gold
 MAP
  wwwwwwwwwwwwwwwwwww.wwwwwwwwwwwwwwwww
 wwwwwwwwwwwwwwwwwww...wwwwwwwwwwwwwwwww
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index d46c71d750..e84d2b8295 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -11,13 +11,15 @@ default-depth: D:12-26
 
 ##############################################################################
 # Rats! (Lemuel), slightly easier now
+# There another, harder version for the Lair.
 #
-NAME: RatsNest
-ORIENT: northeast
-DEPTH: D:5-9, Lair
+NAME:    RatsNest_Dungeon
+ORIENT:  northeast
+TAGS:    uniq_rats_nest
+DEPTH:   D:5-9
 SHUFFLE: 23, 34
-MONS: rat / nothing, grey rat / nothing
-MONS: green rat / nothing, orange rat / w:40 rat
+MONS:    rat / nothing, grey rat / nothing
+MONS:    green rat / nothing, orange rat / w:40 rat
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -50,12 +52,15 @@ ENDMAP
 
 ####################################
 #hidden cave vault, possibly with statue
-NAME: statuecave_lemuel
-ORIENT: northeast
-DEPTH: D:7-27, Lair, Crypt
-MONS: ice statue/orange crystal statue
+#
+NAME:    statuecave_lemuel
+ORIENT:  northeast
+DEPTH:   D:7-27, Lair, Crypt
+TAGS:    uniq
+MONS:    ice statue/orange crystal statue
 SHUFFLE: 1|/!*
-SUBST: *:*$, ?:x., !:., ?=w.
+SUBST:   *:*$, ?:x., !:., '=w.
+ITEM:    ring of teleportation / ring of levitation 
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -68,32 +73,33 @@ xxxxxxxxxxxxxxxxxwwwwwwwxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxwwwwwwwwwwwxxxxxxxxxxx
 xxxxxxxxxxxxxwwwwwwxxxwwwwwxxxxxxxxxx
 xxxxxxxxxxxxwwwwwwxxxxxxwww.1xxxxxxxx
-xxxxxxxxxxxwwwwxxxxxxxxxxwww??xxxxxxx
-xxxxxxxxxwwwwwxxxxxxxxxxxwwww??xxxxxx
+xxxxxxxxxxxwwwwxxxxxxxxxxwwW??xxxxxxx
+xxxxxxxxxwwwwwxxxxxxxxxxxwwwW??xxxxxx
 xxxxxxxxwwwwxxxxxxxxxxxxxxww|||xxxxxx
-xxxxxxxxwwwxxxxxxxxxxxxxxxxw|||xxxxxx
+xxxxxxxxwwwxxxxxxxxxxxxxxxxw||dxxxxxx
 xxxxxxxwwwxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxwwwwwxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxwwwwwwwwwxxxxxxxxxxxxxxxxxxxxxxxxx
-wwwwwwwwwww??..................xxxxxx
-.?wwwwwww??....................xxxxxx
-..??wwww?......................xxxxxx
-.....?w........................xxxxxx
+wwwwwwwwwww''..................xxxxxx
+.'wwwwwww''....................xxxxxx
+..''wwww'......................xxxxxx
+.....'w........................xxxxxx
 ENDMAP
 
 #####################################
 # Dragon's cave
 #
-NAME: dragon1_lemuel
-ORIENT: northeast
-DEPTH: D:9-20, Lair
-MONS: dragon, ice dragon
-SUBST: ! : ?x
+NAME:    dragon1_lemuel
+ORIENT:  northeast
+DEPTH:   D:9-20, Lair
+TAGS:    uniq
+MONS:    dragon, ice dragon
+ITEM:    potion of levitation / scroll of teleportation
+SUBST:   ! : ?x
 SHUFFLE: 1?/2W
-SUBST: 2=2:20 1
-SUBST: ? : wl
-SUBST: * : $*|
-SUBST: W : w
+SUBST:   2=2:20 1
+SUBST:   ? : wl
+SUBST:   * : $*|
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -102,8 +108,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxx!!!xxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxx..????.....xxxxxxxxx
-xxxxxxxxxxxxxxx....???...1.**xxxxxxxx
+xxxxxxxxxxxxxxxxx..????....dxxxxxxxxx
+xxxxxxxxxxxxxxx....???...1d**xxxxxxxx
 xxxxxxxxxxxxxx......???..$$**xxxxxxxx
 xxxxxxxxxxxx.........????$$!!xxxxxxxx
 xxxxxxxx.............??????!!!xxxxxxx
@@ -132,6 +138,7 @@ ENDMAP
 NAME:    Giant_Chief
 DEPTH:   D:11-22, Orc:2-4
 ORIENT:  north
+TAGS:    uniq
 MONS:    stone giant, frost giant, fire giant
 MONS:    hill giant, cyclops
 MONS:    w:50 ogre / w:5 ogre-mage / two-headed ogre
@@ -192,7 +199,8 @@ ENDMAP
 #
 NAME:    River_Lethe
 ORIENT:  encompass
-DEPTH:   D:16-27
+DEPTH:   D:16-26
+TAGS:    uniq
 SUBST:   + = +=
 SUBST:   . = .:100 !:1 6:4
 SUBST:   ; = .:200 !:1 1:3
@@ -208,6 +216,7 @@ MONS:    human simulacrum w:60/elf simulacrum/ogre simulacrum/centaur simulacrum
 MONS:    eye of draining/brain worm/death drake w:5/shadow/shadow dragon w:1
 KITEM:   A = potion of experience / any good_item
 KMONS:   A = Maud
+KFEAT:   A = rock staircase leading down
 KFEAT:   B = |
 KMONS:   B = neqoxec
 KFEAT:   C = b
@@ -295,6 +304,8 @@ ENDMAP
 
 NAME:    vault_1
 ORIENT:  north
+DEPTH:   D:16-26
+TAGS:    uniq
 MONS:    shapeshifter, shapeshifter, glowing shapeshifter
 MONS:    silver statue, nothing
 SUBST:   E=E.
@@ -350,12 +361,14 @@ ENDMAP
 ##############################################################################
 # A cell vault
 #
-NAME: cell_vault
-ORIENT: northwest
+NAME:    cell_vault
+ORIENT:  northwest
+DEPTH:   D:16-26
+TAGS:    uniq
 SHUFFLE: 890
-KITEM: 8 = | / nothing w:50
-KITEM: 9 = * / nothing w:50
-KITEM: 0 = % / nothing w:50
+KITEM:   8 = | / nothing w:50
+KITEM:   9 = * / nothing w:50
+KITEM:   0 = % / nothing w:50
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -398,7 +411,9 @@ ENDMAP
 ##############################################################################
 # A little maze vault
 #
-NAME: little_maze_vault
+NAME:   little_maze_vault
+TAGS:   uniq
+DEPTH:  D:16-26
 ORIENT: northeast
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -442,9 +457,11 @@ ENDMAP
 ##############################################################################
 # thingy vault.
 #
-NAME: thingy_vault
+NAME:   thingy_vault
+TAGS:   uniq
+DEPTH:  D:12-26
 ORIENT: southwest
-FLAGS: no_rotate
+FLAGS:  no_rotate
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxx@xxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxx^xxxxxxxxxxxxxx
@@ -485,9 +502,11 @@ ENDMAP
 ##############################################################################
 # hourglass vault.
 #
-NAME: hourglass_vault
+NAME:   hourglass_vault
 ORIENT: southeast
-FLAGS: no_rotate
+DEPTH:  D:12-26
+TAGS:   uniq
+FLAGS:  no_rotate
 MAP
 xxxxxxxxxxxxxx@xxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx.................xxxxxxxxxxxxxxxxx
@@ -528,8 +547,10 @@ ENDMAP
 ##########################################################################
 # A more Angbandy vault
 #
-NAME: Angbandy_vault
+NAME:   Angbandy_vault
 ORIENT: northeast
+DEPTH:  D:16-26
+TAGS:   uniq
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -572,7 +593,9 @@ ENDMAP
 ############################################################################
 # four-leaf vault
 #
-NAME: four-leaf_vault
+NAME:   four-leaf_vault
+TAGS:   uniq
+DEPTH:  D:12-26
 ORIENT: northwest
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -616,7 +639,9 @@ ENDMAP
 ############################################################################
 # Cross-vault
 #
-NAME: cross_vault
+NAME:   cross_vault
+TAGS:   uniq
+DEPTH:  D:12-26
 ORIENT: northwest
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -661,6 +686,8 @@ ENDMAP
 # Another thingy vault
 #
 NAME:   thingy_vault_2
+TAGS:   uniq
+DEPTH:  D:14-26
 ORIENT: southeast
 SUBST:  ' = ^ .:50
 MONS:   orange crystal statue
@@ -704,7 +731,9 @@ ENDMAP
 ############################################################################
 # Impenetrable vault
 #
-NAME: impenetrable_vault
+NAME:   impenetrable_vault
+DEPTH:  D:16-26
+TAGS:   uniq
 ORIENT: southeast
 MAP
 ..............@................xxxxxxxxx
@@ -746,12 +775,13 @@ ENDMAP
 #########################################################################
 # Orc temple
 #
-NAME: orc_temple
+NAME:   orc_temple
 ORIENT: southwest
-FLAGS: no_rotate
-MONS: orc warlord, orc priest, orc high priest, orc warrior, orc wizard
-MONS: orc knight, orc sorcerer
-KFEAT: C = altar of Beogh
+FLAGS:  no_rotate
+DEPTH:  D:14-26, Orc
+MONS:   orc warlord, orc priest, orc high priest, orc warrior, orc wizard
+MONS:   orc knight, orc sorcerer
+KFEAT:  C = altar of Beogh
 MAP
 xxxxxxxxxxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx
@@ -793,12 +823,12 @@ ENDMAP
 #############################################################################
 # Matthew Ludivico
 #
-NAME: mludivico_vault
+NAME:   mludivico_vault
 ORIENT: southwest
-# The hell hounds can be deadly at lower levels.
-DEPTH: D:18-27
-MONS: hell hound, necromancer, wizard, orange demon, rotting devil
-MONS: hell knight, great orb of eyes
+DEPTH:  D:18-27
+TAGS:   uniq
+MONS:   hell hound, necromancer, wizard, orange demon, rotting devil
+MONS:   hell knight, great orb of eyes
 MAP
 xxxxxxx.@.xxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxx...xxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -835,95 +865,15 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 
-###########################################################################
-# Farm and country (Matthew Ludivico)
-#
-NAME: farm_and_country
-ORIENT: encompass
-DEPTH: D:16-27
-MONS: death yak, plant, griffon, killer bee, ogre, oklob plant
-MONS: wandering mushroom
-MAP
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxx..........................................xxxxxxxx}.xxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxx............xxxxxx....xxx.......xx...........xxxx..]xxxxxxxxx
-xxxxxxxxxxxxxxx***x...........xxx..xxx............xxxx...........xx..xxxxxxxxxxx
-xxxxxxxxxxxxxxx|*$=...xx.xxxxxxx....xxxxxxxxxx......xx................xxxxxxxxxx
-xxxxxxxxxxxxxxxxxxx....xxxxxxxx......3..xxx.................x..........xxxxxxxxx
-xxxxxxxxxxxxxxxxxx......x........x......xx.........w...................xxxxxxxxx
-xxxxxxxxxxx)......xx...xxx.....xxx......x........www3....3.............xxxxxxxxx
-xxxxxxxxxxxx=xxxxxxxxxxx...xxxxxxxxx..xxx.....wwwww....%%%.............xxxxxxxxx
-xxxxxxxxxx......xxx.......xx.xxxx.x...xxxxxxxwwwwwww..5%%%..........xx.xxxxxxxxx
-xxxxxxxxx.........x..xxxxxxxx.....x........3wwwwwwwww..%%%........xxx..xxxxxxxxx
-xxxxxxxxx....5...xx..x.xxxxx.....xxx........wwwwwwwww..%%%..........xx.xxxxxxxxx
-xxxxxxxxxxx.....xxx..xx..xx........xxxxxxxxxwwwwwwwww..............xxx.xxxxxxxxx
-xxxxxxxxxx........x..x...............xx..xxxxwwwwwwwwwwwwww............xxxxxxxxx
-xxxxxxxxx.............................x.....xxwwwwww3wwwwww............xxxxxxxxx
-xxxxxxxxxxx...x...........5.....7...............ww.......ww.....44....xxxxxxxxxx
-xxxxxxxxxwxx..xx.....622...2.26...6.2...22.6...62..2..226ww.....44xx...xxxxxxxxx
-xxxxxxxxxwwxxxx......2....2.22....2..2...2.2.......22...2ww....xxxx..xxxxxxxxxxx
-xxxxxxxxxwwwwxxx......2...2.2.2...2.22..2.22...22.2.2..22ww.....xxx....xxxxxxxxx
-xxxxxxxxxwwwwwx....4..2...2...........22...277..2..2.2.22ww...........xxxxxxxxxx
-xxxxxxxxxwwwwwxx....42..2....22.4..2..2...2.4..2.22..22.2ww............xxxxxxxxx
-xxxxxxxxxwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww.wwwwwwwwwwwww..2.........xxxxxxxxx
-xxxxxxxxxwwwwwxx.....62....2.26...62.2.2..26...6...22..26..............xxxxxxxxx
-xxxxxxxxxwwwww.........................................................xxxxxxxxx
-xxxxxxxxxwwwwwxx....222.2.22..2.7.......7..............................xxxxxxxxx
-xxxxxxxxxwwwww...........ccccccc+ccccccc...ccc......cc+ccc...xxxxx.....xxxxxxxxx
-xxxxxxxxxwwwwwxx.........c$$*.c$$5$+.5.c...+5c......c%%%%c......xxx3...xxxxxxxxx
-xxxxxxxxxwwwwwx....2.....c$.c+cccccc.%.c...ccc......c%%%%c....xxxxx....xxxxxxxxx
-xxxxxxxxxwwwwwx..........c..c..........c............cccccc......xxx....xxxxxxxxx
-xxxxxxxxxwwxxxxxxx.......ccccc+ccccccccc.........................xx....xxxxxxxxx
-xxxxxxxxxwxx.....xxxx........c...c.................2...................xxxxxxxxx
-xxxxxxxxxxx.........xxxx...........2....xxxx...........................xxxxxxxxx
-xxxxxxxxx..............xxxx..........xxxx..x...........................xxxxxxxxx
-xxxxxxxxx.................xxxxx++xxxxx.....xx............xx...x........xxxxxxxxx
-xxxxxxxxx.....................c..c..........xxxxx..........xxxxx.......xxxxxxxxx
-xxxxxxxxx.......cccc..........c..c...cccc......xxx...........x.........xxxxxxxxx
-xxxxxxxxx.......c..c..........c++c...c..c........xxx.........x.........xxxxxxxxx
-xxxxxxxxx.......c..c..........c..c...c..c..........xxx.................xxxxxxxxx
-xxxxxxxxx....cccc++cccccccccccc++ccccc..ccccccc......xxx...............xxxxxxxxx
-xxxxxxxxx....c..........1.....................c........xxx.............xxxxxxxxx
-xxxxxxxxx.cccc.....w....w....%1.....w.....%...c..........xxx...........xxxxxxxxx
-xxxxxxxxx.c1.+....www..www..%%%....www...%%%1.c...........xxxxxxxxx....xxxxxxxxx
-xxxxxxxxx.cccc.....w....w....%......w.....%...c..................xxx...xxxxxxxxx
-xxxxxxxxx....c.......5........................c....................xxxxxxxxxxxxx
-xxxxxxxxx....ccc....%%%%%....cccccccccccccccccc........................xxxxxxxxx
-xxxxxxxxx......cc...........cc.........................................xxxxxxxxx
-xxxxxxxxx.......cccccc+cccccc..........................................xxxxxxxxx
-xxxxxxxxx........cc.......cc...........................................xxxxxxxxx
-xxxxxxxxx.........cc.....cc.....................cccccccccccccccccccccccxxxxxxxxx
-xxxxxxxxx..........ccc+ccc......................c......vvv.............xxxxxxxxx
-xxxxxxxxx..........ccc.c........................c......v5+...vvvvv.....xxxxxxxxx
-xxxxxxxxx..........ccc.c........................c......vvv...v.5.v.....xxxxxxxxx
-xxxxxxxxxccccccccccccc.ccc......................c............v..5v.....xxxxxxxxx
-xxxxxxxxx..........c.....cccccccccccccccccccccccccccc..........vv+vv...xxxxxxxxx
-xxxxxxxxx..........c............................+................5111..xxxxxxxxx
-xxxxxxxxx..........c.{([.c......................+................5.....xxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-ENDMAP
-
-
 #############################################################################
 # Fort Yaktaur (Matthew Ludivico)
 #
-NAME: fort_yaktaur
+NAME:   fort_yaktaur
 ORIENT: southeast
-MONS: yaktaur, death yak, minotaur, random
-MONS: yak, gnoll, random
+DEPTH:  D:14-26
+TAGS:   uniq
+MONS:   yaktaur, death yak, minotaur, random
+MONS:   yak, gnoll, random
 MAP
 .........@....wwwwwwwwwwwwwwwwwxxxxxxxxx
 .ccccc.......ww....wwww....wwwwxxxxxxxxx
@@ -968,7 +918,7 @@ ENDMAP
 NAME:    box_level_dp
 DEPTH:   D:20-26
 ORIENT:  encompass
-TAGS:    no_pool_fixup
+TAGS:    no_pool_fixup uniq
 SHUFFLE: ABCD, EFGH, IJKL, MNOP, RS, zZ
 SUBST:   A==, B=b, C=b, D=b, E==, F=b, G=b, H=b
 SUBST:   I==, J=b, K=b, L=b, M==, N=b, O=b, P=b
@@ -1076,7 +1026,7 @@ ENDMAP
 NAME:    cascading_oklobs
 ORIENT:  east
 FLAGS:   no_rotate
-TAGS:    no_monster_gen
+TAGS:    no_monster_gen uniq
 DEPTH:   D:16-27
 MONS:    oklob plant
 MONS:    plant / oklob plant w:1
@@ -1186,7 +1136,7 @@ NAME:    erik_rubicon_a
 DEPTH:   D:10-16
 ORIENT:  south
 FLAGS:   no_rotate
-TAGS:    no_pool_fixup
+TAGS:    no_pool_fixup uniq
 CHANCE:  6
 ITEM:    ring of levitation / potion of levitation / nothing, potion of levitation
 ITEM:    nothing, nothing, nothing
@@ -1221,6 +1171,7 @@ ENDMAP
 NAME:    erik_rubicon_b
 DEPTH:   D:10-16
 ORIENT:  south
+TAGS:    uniq
 FLAGS:   no_rotate
 CHANCE:  4
 ITEM:    ring of levitation / potion of levitation / nothing, potion of levitation
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 8e6f7d9899..4ace0aeb67 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -76,6 +76,7 @@ ENDMAP
 # No loot but the elves' gear, but at the depth this appears that may be good
 #
 NAME:    elves_outpost_lemuel
+TAGS:    uniq
 DEPTH:   D:8-20, Orc:*
 MONS:    deep elf soldier/w:4 deep elf fighter
 MONS:    w:20 deep elf mage/deep elf conjurer/deep elf summoner
@@ -87,7 +88,7 @@ MAP
 ?;;::;;;;;;.
 ?;;bbbbbb:;.
 .:;b1111b:;.
-.:;.1221.;:.
+.:;.1221>;:.
 .;:b1111b;:.
 .;:bbbbbb;;?
 .;;;;;;::;;?
@@ -99,7 +100,7 @@ ENDMAP
 # Centaur isle (Lemuel)
 #
 NAME: centaur_isle
-TAGS: no_monster_gen no_pool_fixup
+TAGS: no_monster_gen no_pool_fixup uniq
 SUBST: ? = *$
 DEPTH: D:6-12
 MONS: centaur
@@ -127,19 +128,22 @@ ENDMAP
 #
 NAME:  ice2_lemuel
 DEPTH: D:12-27, Lair, Swamp, Coc
-TAGS:  no_pool_fixup no_monster_gen
+TAGS:  no_pool_fixup no_monster_gen uniq
 SUBST: T = TU
 SUBST: W = w:20 W .:5
 MONS:  ice statue
 MONS:  ice devil w:5/blue devil w:5/ice dragon/freezing wraith/nothing w:30
 MONS:  white imp/ice beast w:30/polar bear/nothing w:50
+MONS:  white imp/ice beast w:30/polar bear/nothing w:50
+KFEAT: 2 = rock staircase leading down
+KFEAT: 4 = rock staircase leading down
 MAP
 T..................T
 ..WWW..........WWW..
 .WWWWW........WWWWW.
 WWWWWWwww..wwwWWWWWW
 WWW3WwwwwwwwwwwW3WWW
-WW333wwwwwwwwww333WW
+WW343wwwwwwwwww343WW
 .WW3WwwwwwwwwwwW3WW.
 .WWWWwwwwwwwwwwWWWW.
 ..WWWwww||||wwwWWW..
@@ -147,7 +151,7 @@ WW333wwwwwwwwww333WW
 ..WWWwww||||wwwWWW..
 .WWWWwwwwwwwwwwWWWW.
 .WW3WwwwwwwwwwwW3WW.
-WW333wwwwwwwwww333WW
+WW343wwwwwwwwww343WW
 WWW3WwwwwwwwwwwW3WWW
 WWWWWWwww..wwwWWWWWW
 .WWWWW........WWWWW.
@@ -210,9 +214,10 @@ ENDMAP
 # Closed beehive
 #
 # Should work without explicit floor margin (dp)
-NAME: hive_lemuel
+NAME:  hive_lemuel
 DEPTH: D:9-27,Hive:*,Lair:*,Swamp:*
-MONS: killer bee, yellow wasp, red wasp, spiny worm, killer bee zombie
+TAGS:  uniq
+MONS:  killer bee, yellow wasp, red wasp, spiny worm, killer bee zombie
 SUBST: ? : .w
 SUBST: 1 = 1 a:2
 SUBST: 1 : 1:15 2 3:2 4:1 5:2
@@ -247,7 +252,7 @@ MAP
 ..;wwwwwwww;..
 .;wwww..wwww;.
 .;www.1.1www;.
-.www.1.1.1www.
+.www.1>1.1www.
 .;www.1.1www;.
 .;wwww..wwww;.
 ..;wwwwwwww;..
@@ -259,6 +264,7 @@ ENDMAP
 # My mission is to annoy. -LP
 #
 NAME: jelly_drop
+TAGS: uniq
 MONS: jelly
 KFEAT: a = teleport trap
 DEPTH: D:8-27, Vault:*, Slime:*, Lair:*
@@ -283,7 +289,8 @@ ENDMAP
 # those boots of levitation?
 #
 NAME: water_maze_lemuel
-TAGS: no_pool_fixup
+TAGS: no_pool_fixup uniq_water_maze_lemuel
+ITEM: ring of levitation / ring of teleportation
 DEPTH: 5-27
 MAP
    wwwwwwwww
@@ -293,7 +300,7 @@ wwccwwcccwwccww
 wccwwccwccwwccw
 wcwwccwwwccwwcw
 wcwcc*wcwwccwcw
-wcwc***ccwwcwcw
+wcwc*d*ccwwcwcw
 wcwcc*ccwwccwcw
 wcwwcccwwccwwcw
 wccwwccwccwwccw
@@ -304,9 +311,10 @@ wwccwwcwcwwccww
 ENDMAP
 
 NAME: water_boxes_lemuel
-TAGS: no_pool_fixup
+TAGS: no_pool_fixup uniq_water_maze_lemuel
 DEPTH: 5-27
 SHUFFLE: abcd, efgh, ijkl, mnop
+KMONS: * = fungus
 SUBST: a = =, b = x, c = x, d = x
 SUBST: e = =, f = x, g = x, h = x
 SUBST: i = =, j = x, k = x, l = x
@@ -332,7 +340,7 @@ ENDMAP
 NAME: aerie
 DEPTH: 12-26
 MONS: insubstantial wisp, ball lightning, vapour, air elemental
-TAGS: no_monster_gen
+TAGS: no_monster_gen uniq
 SUBST: .:..w
 SUBST: 1 = 1 w:3, 2= 2 w:3, 3 = 3 w:3, 4 = 4 |:3
 MAP
@@ -420,18 +428,19 @@ ENDMAP
 ###################################
 
 NAME: minivault_2
+SHUFFLE: cvxx
 MAP
-............
-..xxxx.xxxx.
-..xx.....xx.
-..x.......x.
-..x.......x.
-......C.....
-..x.......x.
-..x.......x.
-..xx.....xx.
-..xxxx.xxxx.
-............
+...........
+.xxxx.xxxx.
+.xx.....xx.
+.x.......x.
+.x.......x.
+.....C.....
+.x.......x.
+.x.......x.
+.xx.....xx.
+.xxxx.xxxx.
+...........
 ENDMAP
 
 ###################################
@@ -552,7 +561,7 @@ ENDMAP
 # Evil zoo
 #
 NAME: minivault_9
-DEPTH: 15-27, !Orc, !Lair, !Swamp, !Shoal
+DEPTH: 15-27
 MAP
 ............
 .==========.
@@ -609,9 +618,6 @@ ENDMAP
 ###################################
 # Closed-box minivault
 #
-# Due to the new behaviour of brown stairs, this one is broken
-# (or at least working differently from how it was intended!)
-#
 NAME: minivault_12
 MAP
 ............
@@ -680,18 +686,17 @@ ENDMAP
 #
 NAME: minivault_15
 MONS: silver statue / ice statue
+KFEAT: 1 = <
 MAP
-...........
-...........
-....lll....
-...vvlvv...
-..lv|*|vl..
-..ll*1*ll..
-..lv|*|vl..
-...vvlvv...
-....lll....
-...........
-...........
+.........
+...lll...
+..vvlvv..
+.lv|*|vl.
+.ll*1*ll.
+.lv|*|vl.
+..vvlvv..
+...lll...
+.........
 ENDMAP
 
 ###################################
@@ -1162,12 +1167,11 @@ ENDMAP
 #
 NAME:    onia_ninara_009_dug_in_and_dangerous
 DEPTH:   8-26, !Swamp
-SHUFFLE: vcb, AB?/CD!
+SHUFFLE: vcb, AB?/CD!, d<>
 SUBST:   A=9, B=8, C=1, D=9
 SUBST:   ? = %:10 *:50 |:60
 SUBST:   ! = %:90 *:30 |:10
 ITEM:    wand of digging/wand of disintegration/ring of teleportation/stone of earth elementals
-# if brown stairs work again, d could be replaced by brown <> occasionally
 MAP
 ...........
 .vvGvvvGvv.
@@ -1274,7 +1278,7 @@ xcccccxxx
 ENDMAP
 
 NAME:    small_statue_alley_c
-DEPTH:   D:6-12
+DEPTH:   D:6-12, Orc
 CHANCE:  1
 MAP
 xxxcccccx
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index af9d2575c4..b541934960 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -225,13 +225,13 @@ MAP
 .............................
 .Iwwwwwwwwwwwwwwwwwwwwwwwwww.
 .wIwwwwwwwwwwwwwwwwwwwwwwwww.
-.ww2ccccccccccccccccccccccww.
+.ww2=cccccccccccccccccccccww.
 .ww.c.......3.3.3......w2cww.
 .wwxx........3.3.......cccww.
 .122........3.I.3.....G4Ocww.
 .wwxx........3.3.......cccww.
 .ww.c.......3.3.3......w2cww.
-.ww2ccccccccccccccccccccccww.
+.ww2=cccccccccccccccccccccww.
 .wIwwwwwwwwwwwwwwwwwwwwwwwww.
 .Iwwwwwwwwwwwwwwwwwwwwwwwwww.
 .............................
@@ -278,11 +278,11 @@ TAGS: orc_entry
 MONS: human/goblin/hobgoblin/weight:2 orc, orc priest, orc
 MONS: orc priest/orc wizard/weight:2 goblin/nothing, orc warrior/warg
 ORIENT: float
-SUBST: ? : c:20 .
-SUBST: Z : c:20 .
-SUBST: X : c:20 .
-SUBST: v : c:20 .
-SUBST: b : c:20 .
+SUBST: ? : c:60 .
+SUBST: Z : c:60 .
+SUBST: X : c:60 .
+SUBST: v : c:60 .
+SUBST: b : c:60 .
 KITEM: 2 = knife
 #
 MAP
@@ -515,7 +515,7 @@ SUBST: ? = x.
 MAP
 ..........
 ..?x=x?...
-.?xx-xx?..
+.?xx.xx?..
 ?xx$$$xx?.
 ?xx$$$xx?.
 .?xxxxx?..
diff --git a/crawl-ref/source/dat/tricky.des b/crawl-ref/source/dat/tricky.des
index 9eabf1eb51..cca6415330 100644
--- a/crawl-ref/source/dat/tricky.des
+++ b/crawl-ref/source/dat/tricky.des
@@ -207,35 +207,6 @@ xxx.xxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxx@xxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-##############################################################################
-# Tricky river
-
-NAME: lemuel_trickyentry_river
-TAGS: entry no_monster_gen
-ORIENT: float
-SHUFFLE: {[(, ABC
-SUBST: A:=, B:x, C:x
-CHANCE: 1
-MAP  
-xxxxxxxxxxxxxxxxxxx  
-xxxWA{...(...[xxxxx  
-xxwWx.........xxxxx  
-xwwWB.........xxxxx  
-xwwWx.........xxxxx  
-xwwWC.........xxxxx  
-xxWwx.........xxxxx  
-xxWwww........xxxxx
-xWxwwwwwwww...xxxxx  
-xWxxwwwwwwwwwwxxxxx  
-xxWxxwwwwwwwwwwwxxx  
-xxWxx...wwwwwwwwwxx  
-xxwWx........wwwwxx  
-xwxw+.........xwwwx  
-xwxxx.........xxwwx  
-xxxxx.........xxxwx  
-xxxxx.........xxxxx  
-xxxxx.........xxxxx  
-ENDMAP
 
 ##############################################################################
 # the eight (infinity)
@@ -432,141 +403,7 @@ MAP
 <...............(
 ENDMAP
 
-##############################################################################
-# The pits are prepared
-
-NAME: david_trickyentry_005_a
-TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 3
-MAP
-@..................@
-..wwww........llll..
-.w.wwww......llllll.
-.ww{}ww......llllll.
-.wwwwww......llllll.
-..wwww..bbbb..llll..
-.......bbbbbb.......
-.......bbbbbb.......
-.......bbbbbb.......
-........bbbb........
-@..................@
-ENDMAP
-
-NAME: david_trickyentry_005_b
-TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 3
-MAP
-@..................@
-..wwww........llll..
-.wwwwww......llllll.
-.wwwwww......ll}{ll.
-.wwwwww......llll.l.
-..wwww..bbbb..llll..
-.......bbbbbb.......
-.......bbbbbb.......
-.......bbbbbb.......
-........bbbb........
-@..................@
-ENDMAP
-
-NAME: david_trickyentry_005_c
-TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 3
-MAP
-@..................@
-..wwww........llll..
-.wwwwww......llllll.
-.wwwwww......llllll.
-.wwwwww......llllll.
-..wwww..b=bb..llll..
-.......bb.bbb.......
-.......bb{}bb.......
-.......bb.b=b.......
-........b=bb........
-@..................@
-ENDMAP
 
-NAME: david_trickyentry_005_d
-TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 1
-MAP
-@..................@
-..wwww........llll..
-.wwwwww..{}..llllll.
-.wwwwww......llllll.
-.wwwwww......llllll.
-..wwww..bbbb..llll..
-.......bbbbbb.......
-.......bbbbbb.......
-.......bbbbbb.......
-........bbbb........
-@..................@
-ENDMAP
-
-##############################################################################
-# Caged fury
-
-NAME: david_trickyentry_006
-TAGS: entry
-MONS: w:30 nothing / worm 
-MONS: w:30 nothing / ooze / weight:2 jelly
-MONS: w:30 nothing / jackal / rat
-FLAGS: no_rotate
-ORIENT: float
-SUBST: ?=Gx
-SHUFFLE: xc, 123
-MAP
-.................
-.xxxxxxxxxxxxxxx.
-.x1231321332212x.
-.x2312132211323x.
-.x3123213123132x.
-.x?????G+G?????x.
-.x.............x.
-.=T....xxx....T=.
-.x.....({[.....x.
-.x..T.......T..x.
-.xxx=xxxxxxx=xxx.
-.................
-ENDMAP
-
-##############################################################################
-# Morbid curiosity
-
-NAME: david_trickyentry_007
-TAGS: entry 
-MONS: goblin, kobold, orc priest
-ITEM: needle, dart, stone
-ORIENT: float
-MAP
-xxxxxxxxxxxxxx.xxxxxxxxxxxxxx
-xxxxxxxxx...........xxxxxxxxx
-xxxxxx...xxxxx+xxxxx...xxxxxx
-xxxx..xxxxxlllllllxxxxx..xxxx
-xxx.xxxxxlll..3..lllxxxxx.xxx
-xx.xxxxxx...........xxxxxx.xx
-xx.xxxxxxxxxxx=xxxxxxxxxxx.xx
-xx.xxxxxxxxx.....xxxxxxxxx.xx
-x.xx...xxx..G.G.G..xxx..lxx.x
-x.x....xx...........xx1fllx.x
-x.x....x.............x...lx.x
-..+...........{....G.=..1l+..
-x.x....x.............x...lx.x
-x.x....xx...........xx..llx.x
-x.xx...xxx...G.G...xxx..lxx.x
-xx.xxxxxxxxx.....xxxxxxxxxx.x
-xx.xxxxxxxxxxx=xxxxxxxxxxx.xx
-xx.xxxxxx2d....2..e2xxxxxx.xx
-xxx.xxxxxlll2....lllxxxxx.xxx
-xxxx..xxxxxlllllllxxxxx..xxxx
-xxxxxx...xxxxx+xxxxx...xxxxxx
-xxxxxxxxx...........xxxxxxxxx
-xxxxxxxxxxxxxx.xxxxxxxxxxxxxx
-ENDMAP
 
 ##############################################################################
 # Stupid exit shuffling
@@ -754,57 +591,3 @@ bh..d....<[<....j...b
 b0........{........0b
 bbbbbbbbbbbbbbbbbbbbb
 ENDMAP 
-
-##############################################################################
-# Being Mean Is Cool
-# (Has anyone a good guess on proper CHANCEs?)
-
-NAME: erik_trickyentry_004_a
-TAGS: entry
-ORIENT: float
-CHANCE: 10
-ITEM: scroll of curse armour
-ITEM: scroll of teleportation
-MAP
-xxxxx
-xxexx
-xd{ex
-xxdxx
-xxxxx
-ENDMAP
-
-NAME: erik_trickyentry_004_b
-TAGS: entry
-ORIENT: float
-CHANCE: 10
-ITEM: scroll of curse armour, scroll of random uselessness, scroll of identify
-ITEM: scroll of curse armour, scroll of fear, scroll of teleportation
-SHUFFLE: def, ghi
-MAP
-@.....@
-.xx=xx.
-.xxgxx.
-.=d{g=.
-.xxdxx.
-.xx=xx.
-@.....@
-ENDMAP
-
-NAME: erik_trickyentry_004_c
-TAGS: entry
-ORIENT: float
-CHANCE: 10
-SHUFFLE: uU / vV / wW / zZ
-SUBST: u==, v==, V=~, w=x, W=x, z==, Z=~.
-ITEM: scroll of curse armour, scroll of random uselessness, scroll of identify
-ITEM: scroll of curse armour, scroll of fear, scroll of teleportation
-KFEAT: U = teleport trap
-MAP
-xxxxxxx
-xZxxxWx
-xxzgwxx
-xxd{gxx
-xxudvxx
-xUxxxVx
-xxxxxxx
-ENDMAP
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index c4f705d7cf..75f863dca1 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -143,7 +143,7 @@ NAME: erik_vaults_1
 TAGS: vault_entry
 MONS: dancing weapon
 ORIENT: float
-SHUFFLE: vc 
+SHUFFLE: vcxxx 
 MAP
 .............
 .............
@@ -163,7 +163,7 @@ NAME: erik_vaults_2
 TAGS: vault_entry
 MONS: vault guard
 ORIENT: float
-SHUFFLE: vx
+SHUFFLE: vxxx, bcc
 MAP
 vvvvvv.vvvvvv
 vvvvvv.vvvvvv