Changed vaults (dploog).

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

9 files changed, 220 insertions, 640 deletions

diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index 49008bebfc..deb057bff8 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -5,6 +5,11 @@
 ###############################################################################
 # Bazaar entries
 
+# What is still missing:
+# The timer should be more generous for lower levels.
+# Bazaars would also make sense outside of the dungeon (at least in the Vaults,
+# Orc, and Elf).
+
 # Utility functions
 
 lua {{
@@ -109,7 +114,7 @@ ENDMAP
 NAME:    bzr_entry_005
 TAGS:    bzr_entry allow_dup
 ORIENT:  float
-SHUFFLE: wlW
+SHUFFLE: wwlW
 MARKER: O = lua:bazaar_portal()
 MAP
  wwwww
@@ -312,24 +317,25 @@ x...x..........<e>..........x...x
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
+########################################
+# bazaars in a row
+#
 NAME:    bazaar_row
 TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: Aa/Bb/Cc/Dd/Ee/Ff
 SHUFFLE: Aa/Zz, Bb/Yy, Cc/Rr, Dd/Ss
+# two guaranteed shops, expected four shops
 KFEAT:   A = any shop / antique weapon shop
 KFEAT:   B = any shop / antique armour shop
 KFEAT:   C = any shop / wand shop
 KFEAT:   D = any shop / jewellery shop
 KFEAT:   E = any shop / weapon shop / armour shop
 KFEAT:   F = any shop / book shop / scroll shop
-SUBST:   a=T, b=T, c=T, d=T, e=T, f=T
-SUBST:   z=V, y=V, r=V, s=V
+SUBST:   b=a, c=a, d=a, e=a, f=a, a=T
+SUBST:   y=z, r=z, s=z, z=V, Y=Z, R=Z, S=Z
 KFEAT:   Z = stone_arch
-KFEAT:   Y = stone_arch
-KFEAT:   R = stone_arch
-KFEAT:   S = stone_arch
 SHUFFLE: lw
 # special cases for blue/red floor
 : if you.bazaar_floor() == "red" then
@@ -354,6 +360,51 @@ xxxxxxxxxxxxxxxxBxxxxxxxxxxxDxxxxxxxxxxxFxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
+########################################
+# bazaars in a row v2
+#
+NAME:    bazaar_row_2
+TAGS:    bazaar allow_dup
+FLAGS:   no_rotate
+ORIENT:  encompass
+SHUFFLE: Aa/Bb/Cc/Dd/Ee/Ff/Gg/Hh
+SHUFFLE: Aa/Zz, Bb/Yy, Cc/Rr, Dd/Ss, Ee/Jj, Ff/Kk, Gg/Mm
+# one guaranteed shop, expected 4.5 shops
+SUBST:   B=A, C=A, D=A, E=A, F=A, G=A, H=A
+SUBST:   b=a, c=a, d=a, e=a, f=a, g=a, h=a
+SUBST:   Y=Z, R=Z, S=Z, J=Z, K=Z, M=Z
+SUBST:   y=z, r=z, s=z, j=z, k=z, m=z
+KFEAT:   A = any shop
+KFEAT:   Z = stone_arch
+SUBST:   a=T, z=V
+SHUFFLE: lw
+# special cases for blue/red floor
+: if you.bazaar_floor() == "red" then
+SUBST:   l : wWx
+: else
+: if you.bazaar_floor() == "blue" then
+SUBST:   w : Wx
+: end
+: end
+#
+SUBST:   w:wWx, l:lx
+: bazaar_message(_G)
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxAxxxxxxxxxxxCxxxxxxxxxxxExxxxxxxxxxxGxxxxxxxxxxxxxxxx
+xxx.....xxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxx.....xxx
+xx..www..xxxxxx.a.xxxxxxxxx.c.xxxxxxxxx.e.xxxxxxxxx.g.xxxxxx..lll..xx
+x<.wwwww..+...........+...........+...........+...........+..lllll.>x
+xx..www..xxxxxx.b.xxxxxxxxx.d.xxxxxxxxx.f.xxxxxxxxx.h.xxxxxx..lll..xx
+xx......xxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxx.....xxx
+xxxxxxxxxxxxxxxxBxxxxxxxxxxxDxxxxxxxxxxxFxxxxxxxxxxxHxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
+
+#######################################
+# circle bazaar
+#
+
 NAME:    bazaar_circle_1
 CHANCE:  2
 TAGS:    bazaar allow_dup
@@ -557,7 +608,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_circle_6
-CHANCE:  3
+CHANCE:  1
 TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
@@ -913,7 +964,7 @@ xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx
 xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
 xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
 xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
-xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxx=xxxxx
+xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx
 xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx
 x.........xxxxxxxxx.........xxxxxxxxx.........x
 x....A....z.......z....A....z.......z....A....x
@@ -925,7 +976,7 @@ xxxxxxxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
 xxxxxxxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
 xxxxxxxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx
 xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx
-x....B....z.......=....A....z.......z....A....x
+x....B....z.......z....A....z.......z....A....x
 x.........xxxxxxxxx.........xxxxxxxxx.........x
 xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -952,13 +1003,13 @@ xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx
 xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
 xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
 xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
-xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxx=xxxxx
+xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx
 xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx
 x.........xxxxxxxxx.........xxxxxxxxx.........x
 x....A....z.......z....A....z.......z....A....x
 x.........xxxxxxxxx.........xxxxxxxxx.........x
 xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx
-xxxxx=xxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx
+xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx
 xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
 xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
 xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx
@@ -1014,6 +1065,7 @@ ENDMAP
 NAME:    bazaar_triangles
 TAGS:    bazaar allow_dup
 ORIENT:  encompass
+CHANCE:  1
 FLAGS:   no_rotate
 SHUFFLE: ACD
 SUBST:   A = <
@@ -1036,6 +1088,7 @@ ENDMAP
 NAME:    bazaar_hexagon
 TAGS:    bazaar allow_dup
 ORIENT:  encompass
+CHANCE:  4
 FLAGS:   no_rotate
 SHUFFLE: AC, BD
 KFEAT:   A = armour shop / weapon shop / wand shop
@@ -1067,6 +1120,7 @@ NAME:    bazaar_triangle_bulge
 TAGS:    bazaar allow_dup
 ORIENT:  encompass
 FLAGS:   no_rotate
+CHANCE:  5
 SHUFFLE: ABC
 SUBST:   A = <, B = >
 KFEAT:   C = any shop
diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des
index b1d692f674..986ed7381d 100644
--- a/crawl-ref/source/dat/elf.des
+++ b/crawl-ref/source/dat/elf.des
@@ -253,459 +253,6 @@ Yyyyyyyyyy.ccc.zzzzzzzzzZ
 xxxxxxxxxxUucuUxxxxxxxxxx
 ENDMAP
 
-##############################################################################
-# Elf vault, rogue theme (David)
-
-NAME: elf_hall_rogue_1
-PLACE: Elf:7
-CHANCE: 1
-ORIENT: float
-FLAGS: no_rotate
-ITEM: scroll of teleportation, any scroll
-MONS: deep elf high priest, deep elf demonologist
-MONS: deep elf annihilator, deep elf sorcerer
-MONS: deep elf death mage
-MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing
-MONS: curse skull / curse toe
-SUBST: ~ = ~ .:30
-SUBST: !=15, ?=.?, ?:23, 4=4.
-SUBST: % = % *:1
-SUBST: | = | *:2 
-SUBST: * = * |:3
-MAP
-ccccccccccccccccccccccccccccccccccccccccccc
-cxcccc$$ce**|||**eccccccce%*%%%*%ec$$ccccxc
-cxc..c$$=....7....ccccccc....7....c$$c..cxc
-cx.d%c$ccccc...ccccccccc=ccc...ccccc$c*e.xc
-cx.d%cc=.c.cc.cc.|.ccccc.|.cc.cc.c.c==|e.xc
-cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$cc..cxc
-cxccccc$$|*|*c...c...U...c...c***|$$cccccxc
-cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc
-cxcccc$$$c*|*c...|...c...|...c***c$$$ccccxc
-cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc
-cxccccccc...cccccc...?...cccccc...cccccccxc
-cxccccc.....?.ccc...ccc...ccc.?.....cccccxc
-cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc
-cxcccc.........+.4cc*|*=c4.+.........ccccxc
-cxcccc.4..|....c.6cce|ecc6.c....|..4.ccccxc
-cxcccc=..c~c..cc...cc|cc...cc..c~c..cccccxc
-cxc..=cccc+cccccc...ccc...cccccc+ccccc..cxc
-cx.e|ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc
-cx.e*cc.......ccccccccccccccc.......cc%d.xc
-cxc..cc...!...cccc.......cccc...!...cc..cxc
-cxccccc.......ccc~6cc?cc6~ccc.......cccccxc
-cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc
-cxccccccc...ccccccccc.ccccccccc...cccccccxc
-ccccccccccccccccccccc@ccccccccccccccccccccc
-ENDMAP 
-
-#######################################
-
-NAME: elf_hall_rogue_2
-PLACE: Elf:7
-CHANCE: 1
-ORIENT: float
-FLAGS: no_rotate
-ITEM: scroll of teleportation, any scroll
-MONS: deep elf high priest, deep elf demonologist
-MONS: deep elf annihilator, deep elf sorcerer
-MONS: deep elf death mage
-MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing
-MONS: curse skull / curse toe
-SUBST: ~ = ^ .:30
-SUBST: !=15, ?=.?, ?:23, 4=4.
-SUBST: % = % *:1
-SUBST: | = | *:2 
-SUBST: * = * |:3
-MAP
-ccccccccccccccccccccccccccccccccccccccccccc
-cxcccc$$ce%*%%%%%ecccccc=e**|||**ec$$ccccxc
-cxc..c$$c....7....ccccc=c....7....c$$=..cxc
-cx.e*c$ccccc...=cccccc=ccccc...ccccc$c*e.xc
-cx.e%cc=.c.cc.cc...ccc=c...cc.cc.c.c=c|e.xc
-cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$cc..cxc
-cxccc=c$$|*|*c...c...U...c...c***|$$cccccxc
-cxcccc$$$c|**...4c.4.!.4.c4..3*||c$$$ccccxc
-cxcccc$$$c*|*c.......c.......c***c$$$ccccxc
-cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc
-cxccccccc...cccccc...?...cccccc...cccccccxc
-cxccccc.....?.ccc...c=c...ccc.?.....cccccxc
-cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc
-cxcccc.........+.4cc*|*cc4.+.........ccccxc
-cxcccc.4..|....c.6cce|ecc6.c....|..4.ccccxc
-cxccccc..c~c..cc...cc|cc...cc..c~c..cccccxc
-cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc
-cx.e|ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc
-cx.e*c=.......ccccccccccccccc.......cc%d.xc
-cxc..=c...!...cccc.......cccc...!...cc..cxc
-cxccccc.......ccc~6cc?cc6~ccc.......cccccxc
-cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc
-cxccccccc...ccccccccc.ccccccccc...cccccccxc
-ccccccccccccccccccccc@ccccccccccccccccccccc
-ENDMAP
-
-#######################################
-
-NAME: elf_hall_rogue_3
-PLACE: Elf:7
-CHANCE: 1
-ORIENT: float
-FLAGS: no_rotate
-ITEM: scroll of teleportation, any scroll
-MONS: deep elf high priest, deep elf demonologist
-MONS: deep elf annihilator, deep elf sorcerer
-MONS: deep elf death mage
-MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing
-MONS: curse skull / curse toe
-SUBST: ~ = ^ .:30
-SUBST: !=15, ?=.?, ?:23, 4=4.
-SUBST: % = % *:1
-SUBST: | = | *:2 
-SUBST: * = * |:3
-MAP
-ccccccccccccccccccccccccccccccccccccccccccc
-cxcccc$$ce%%%%%*%eccccccce**|||**ec$$=cccxc
-cxc..c$$c....7....ccccccc....7....=$$c..cxc
-cx.e|c$ccccc...ccc=ccccccccc...ccccc$c*e.xc
-cx.e*=c=.c.cc.cc...ccccc...cc.cc.c.c=c%e.xc
-cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$cc..cxc
-cxccccc$$|*|*c...c...U...c...c***|$$cc=ccxc
-cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$c=ccxc
-cxcccc$$$c*|*c.......c.......c***c$$$c=ccxc
-cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$c=ccxc
-cxccccccc...cccccc...?...cccccc...cccc=ccxc
-cxccccc.....?.ccc...ccc...ccc.?.....cc=ccxc
-cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cc=ccxc
-cxcccc.........+.4cc*|*cc4.+.........c=ccxc
-cxcccc.4..|....c.6cce|ecc6.c....|..4.c=ccxc
-cxccccc..c~c..cc...=c|cc...cc..c~c..cc=ccxc
-cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc
-cx.d%ccc.~~~.ccccc.......ccccc.~~~.ccc|e.xc
-cx.d%cc.......ccccccccccccccc.......cc*e.xc
-cxc..cc...!...cccc.......cccc...!...cc..cxc
-cxccccc.......ccc~6cc?cc6~ccc.......cccccxc
-cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc
-cxccccccc...ccccccccc.ccccccccc...cccccccxc
-ccccccccccccccccccccc@ccccccccccccccccccccc
-ENDMAP
-
-#######################################
-
-NAME: elf_hall_rogue_4
-PLACE: Elf:7
-CHANCE: 1
-ORIENT: float
-FLAGS: no_rotate
-ITEM: scroll of teleportation, any scroll
-MONS: deep elf high priest, deep elf demonologist
-MONS: deep elf annihilator, deep elf sorcerer
-MONS: deep elf death mage
-MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing
-MONS: curse skull / curse toe
-SUBST: ~ = ^ .:30
-SUBST: !=15, ?=.?, ?:23, 4=4.
-SUBST: % = % *:1
-SUBST: | = | *:2 
-SUBST: * = * |:3
-MAP
-ccccccccccccccccccccccccccccccccccccccccccc
-cxcccc$$ce%*%%%%%eccccccce**|||**ec$$ccccxc
-cxc..=$$c....7....ccccccc....7....c$$c..cxc
-cx.e%c$ccccc...ccccccccccccc...ccccc$c*e.xc
-cx.e*cc=.c.cc.cc...ccccc...cc.cc.c.c=c|e.xc
-cxc..cc$.c**c=c..c..ccc..c..c=c|*c.$cc..cxc
-cxccccc$$|*|*c...c...U...c...c***|$$c=cccxc
-cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc
-cxcccc$$$c*|*c.......c.......c***c$$$ccccxc
-cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc
-cxccccccc...cccccc...?...cccccc...cccccccxc
-cxccccc.....?.ccc...=cc...ccc.?.....cccccxc
-cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc
-cxcccc.........+.4cc*|*cc4.+.........ccccxc
-cxcccc.4..|....c.6cce|ecc6.c....|..4.ccccxc
-cxccccc..c~c..cc...cc|cc...cc..c~c..cccccxc
-cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc
-cx.d%ccc.~~~.ccccc.......ccccc.~~~.ccc*e.xc
-cx.d%cc.......ccccccccccccccc.......cc|e.xc
-cxc..cc...!...cccc.......cccc...!...c=..cxc
-cxccccc.......ccc~6cc?cc6~ccc.......=ccccxc
-cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc
-cxccccccc...ccccccccc.ccccccccc...cccccccxc
-ccccccccccccccccccccc@ccccccccccccccccccccc
-ENDMAP
-
-#######################################
-
-NAME: elf_hall_rogue_5
-PLACE: Elf:7
-CHANCE: 1
-ORIENT: float
-FLAGS: no_rotate
-ITEM: scroll of teleportation, any scroll
-MONS: deep elf high priest, deep elf demonologist
-MONS: deep elf annihilator, deep elf sorcerer
-MONS: deep elf death mage
-MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing
-MONS: curse skull / curse toe
-SUBST: ~ = ^ .:30
-SUBST: !=15, ?=.?, ?:23, 4=4.
-SUBST: % = % *:1
-SUBST: | = | *:2 
-SUBST: * = * |:3
-MAP
-ccccccccccccccccccccccccccccccccccccccccccc
-cxcccc$$cd%%%%%%%dc==c===e%%%%%%%ec$$ccccxc
-cxc..c$$c....7....ccc=ccc....7....c$$c..cxc
-cx.e|=$ccccc...cccccc=cccccc...ccccc$c*e.xc
-cx.e*ccc.c.cc.cc...cc=cc...cc.cc.c.c=c|e.xc
-cxc..cc$.c**ccc..c..c=c..c..ccc|*c.$c=..cxc
-cxccccc$$|*|*c...c...U...c...c***|$$cccccxc
-cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc
-cxcccc$$$c*|*c.......c.......c***c$$$ccccxc
-cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc
-cxccccccc...cccccc...?...cccccc...cccccccxc
-cxccccc.....?.ccc...ccc...ccc.?.....cccccxc
-cxccccc.2.!.?.cc.6.c=|cc.6.cc.?.!.3.cccccxc
-cxcccc.........+.4cc|||cc4.+.........ccccxc
-cxcccc.4..|....c.6cce|ecc6.c....|..4.=cccxc
-cxccccc..c~c..cc...cc|cc...cc..c~c..cc=ccxc
-cxc..c=ccc+cccccc...ccc...cccccc+ccccc..cxc
-cx.e|=cc.~~~.ccccc.......ccccc.~~~.ccc|e.xc
-cx.e|cc.......ccccccccccccccc.......cc|e.xc
-cxc..cc...!...cccc.......cccc...!...cc..cxc
-cxccccc.......ccc~6cc?cc6~ccc.......cccccxc
-cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc
-cxccccccc...ccccccccc.ccccccccc...cccccccxc
-ccccccccccccccccccccc@ccccccccccccccccccccc
-ENDMAP
-
-#######################################
-
-NAME: elf_hall_rogue_6
-PLACE: Elf:7
-CHANCE: 1
-ORIENT: float
-FLAGS: no_rotate
-ITEM: scroll of teleportation, any scroll
-MONS: deep elf high priest, deep elf demonologist
-MONS: deep elf annihilator, deep elf sorcerer
-MONS: deep elf death mage
-MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing
-MONS: curse skull / curse toe
-SUBST: ~ = ^ .:30
-SUBST: !=15, ?=.?, ?:23, 4=4.
-SUBST: % = % *:1
-SUBST: | = | *:2 
-SUBST: * = * |:3
-MAP
-ccccccccccccccccccccccccccccccccccccccccccc
-cxcccc$$ce%%%%%%%eccccccce**|||**ec$$ccccxc
-cxc..c$$c....7....cccccc=....7....c$$c..cxc
-cx.e|c$cccc=...cccccccc=cccc...ccccc$c*e.xc
-cx.e*cc=.c.cc.cc...ccccc...cc.cc.c.c=c|e.xc
-cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$cc..cxc
-cxcc=cc$$|*|*c...c...U...c...c***|$$c=cccxc
-cxcc=c$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc
-cxcc=c$$$c*|*c.......c.......c***c$$$ccccxc
-cxcc=c$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc
-cxccc=ccc...cccccc...?...cccccc...cccccccxc
-cxccccc.....?.ccc...ccc...ccc.?.....cccccxc
-cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc
-cxcccc.........+.4cc*|*cc4.+.........ccccxc
-cxcccc.4..|....c.6ccd|dcc6.c....|..4.ccccxc
-cxccccc..c~c..cc...cc|cc...cc..c~c..cccccxc
-cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc
-cx.e*ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc
-cx.e|cc.......ccccccccccccccc.......cc%d.xc
-cxc..cc...!...cccc.......cccc...!...cc..cxc
-cxccc=c.......ccc~6cc?cc6~ccc.......cccccxc
-cxcc=ccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc
-cxccc===c...ccccccccc.ccccccccc...cccccccxc
-ccccccccccccccccccccc@ccccccccccccccccccccc
-ENDMAP
-
-#######################################
-
-NAME: elf_hall_rogue_7
-PLACE: Elf:7
-CHANCE: 1
-ORIENT: float
-FLAGS: no_rotate
-ITEM: scroll of teleportation, any scroll
-MONS: deep elf high priest, deep elf demonologist
-MONS: deep elf annihilator, deep elf sorcerer
-MONS: deep elf death mage
-MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing
-MONS: curse skull / curse toe
-SUBST: ~ = ^ .:30
-SUBST: !=15, ?=.?, ?:23, 4=4.
-SUBST: % = % *:1
-SUBST: | = | *:2 
-SUBST: * = * |:3
-MAP
-ccccccccccccccccccccccccccccccccccccccccccc
-cxcccc$$cd|*|||**dcccccccd*||*|**dc$$ccccxc
-cxc..c$$c....7....ccccccc....7....c$$c..cxc
-cx.e|c$ccccc...ccccccccccccc...ccccc$c%e.xc
-cx.e|c=c.c.cc.cc...ccccc...cc.cc.c.c=c%e.xc
-cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$c=..cxc
-cxcc=cc$$|*|*c...c...U...c...c***|$$cccccxc
-cxcc=c$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc
-cxcc=c$$$c*|*c.......c.......c***c$$$ccccxc
-cxcc=c$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc
-cxcc=cccc...cccccc...?...cccccc...cccccccxc
-cxcc=cc.....?.ccc...ccc...ccc.?.....cccccxc
-cxccc=c.2.!.?.cc.6.cc%cc.6.cc.?.!.3.cccccxc
-cxcccc.........+.4cc*|%cc4.+.........ccccxc
-cxcccc.4..|....c.6cce%ecc6.c....|..4.ccccxc
-cxccc=c..c~c..cc...cc|cc...cc..c~c..cccccxc
-cxc..ccccc+cccccc...c=c...cccccc+ccccc..cxc
-cx.e|ccc.~~~.ccccc.......ccccc.~~~.ccc*e.xc
-cx.e|cc.......ccccccccccccccc.......cc*e.xc
-cxc..cc...!...cccc.......cccc...!...cc..cxc
-cxccccc.......ccc~6cc?cc6~ccc.......cccccxc
-cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc
-cxccccccc...ccccccccc.ccccccccc...cccccccxc
-ccccccccccccccccccccc@ccccccccccccccccccccc
-ENDMAP
-
-#######################################
-
-NAME: elf_hall_rogue_8
-PLACE: Elf:7
-CHANCE: 1
-ORIENT: float
-FLAGS: no_rotate
-ITEM: scroll of teleportation, any scroll
-MONS: deep elf high priest, deep elf demonologist
-MONS: deep elf annihilator, deep elf sorcerer
-MONS: deep elf death mage
-MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing
-MONS: curse skull / curse toe
-SUBST: ~ = ^ .:30
-SUBST: !=15, ?=.?, ?:23, 4=4.
-SUBST: % = % *:1
-SUBST: | = | *:2 
-SUBST: * = * |:3
-MAP
-ccccccccccccccccccccccccccccccccccccccccccc
-cxcccc$$ce*|||||*ec==ccc=e*|||||*ec$$ccccxc
-cxc..=$$c....7....=cc=c=c....7....=$$c..cxc
-cx.e%c$ccccc...ccccc=c=ccccc...ccccc$c|e.xc
-cx.e%cc=.c.cc.cc...ccccc...cc.cc.c.cc=|e.xc
-cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$cc..cxc
-cxccccc$$|*|*c...c...U...c...c***|$$cc=ccxc
-cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$c=ccxc
-cxcccc$$$c*|*c.......c.......c***c$$$c=ccxc
-cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$c=ccxc
-cxccccccc...cccccc...?...cccccc...cccc=ccxc
-cxccccc.....?.ccc...ccc...ccc.?.....==cccxc
-cxccccc.2.!.?.cc.6.cc%cc.6.cc.?.!.3.cccccxc
-cxcccc.........+.4cc*%*cc4.+.........ccccxc
-cxcccc.4..|....c.6cce|e=c6.c....|..4.ccccxc
-cxccc=c..c~c..cc...cc*cc...cc..c~c..cccccxc
-cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc
-cx.e%ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc
-cx.e%cc.......ccccccccccccccc.......cc%d.xc
-cxc..cc...!...cccc.......cccc...!...cc..cxc
-cxccccc.......ccc~6cc?cc6~ccc.......=ccccxc
-cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc
-cxccccccc...ccccccccc.ccccccccc...cccccccxc
-ccccccccccccccccccccc@ccccccccccccccccccccc
-ENDMAP
-
-#######################################
-
-NAME: elf_hall_rogue_9
-PLACE: Elf:7
-CHANCE: 1
-ORIENT: float
-FLAGS: no_rotate
-ITEM: scroll of teleportation, any scroll
-MONS: deep elf high priest, deep elf demonologist
-MONS: deep elf annihilator, deep elf sorcerer
-MONS: deep elf death mage
-MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing
-MONS: curse skull / curse toe
-SUBST: ~ = ^ .:30
-SUBST: !=15, ?=.?, ?:23, 4=4.
-SUBST: % = % *:1
-SUBST: | = | *:2 
-SUBST: * = * |:3
-MAP
-ccccccccccccccccccccccccccccccccccccccccccc
-cxcccc$$=e**|||**eccccccce%%|%|%%e=$$ccccxc
-cxc..c$$c....7....==ccccc....7....c$$c..cxc
-cx.d|c$ccccc...cccc=cc=ccccc...ccccc$c%d.xc
-cx.d|ccc.c.cc.cc...cc=cc...cc.c=.c.ccc%d.xc
-cxc..cc$.c|*ccc..c..=cc..c..ccc|*c.$cc..cxc
-cxccccc$$|*|*c...c...U...c...c***|$$cccccxc
-cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc
-cxcccc$$$c*||c.......c.......c***c$$$ccccxc
-cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc
-cxccccccc...cccccc...?...cccccc...cccccccxc
-cxccccc.....?.ccc...ccc...ccc.?.....cccccxc
-cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc
-cxcccc.........+.4cc||*cc4.+.........ccccxc
-cxcccc.4..|....c.6c=e|ecc6.c....|..4.ccccxc
-cxccccc..c~c..cc...cc|cc...cc..c~c..cccccxc
-cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc
-cx.d%ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc
-cx.d%cc.......ccccccccccccccc.......cc%d.xc
-cxc..cc...!...cccc.......cccc...!...cc..cxc
-cxccccc.......ccc~6cc?cc6~ccc.......cccccxc
-cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc
-cxccccccc...ccccccccc.ccccccccc...cccccccxc
-ccccccccccccccccccccc@ccccccccccccccccccccc
-ENDMAP
-
-#######################################
-
-NAME: elf_hall_rogue_10
-PLACE: Elf:7
-CHANCE: 1
-ORIENT: float
-FLAGS: no_rotate
-ITEM: scroll of teleportation, any scroll
-MONS: deep elf high priest, deep elf demonologist
-MONS: deep elf annihilator, deep elf sorcerer
-MONS: deep elf death mage
-MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing
-MONS: curse skull / curse toe
-SUBST: ~ = ^ .:30
-SUBST: !=15, ?=.?, ?:23, 4=4.
-SUBST: % = % *:1
-SUBST: | = | *:2 
-SUBST: * = * |:3
-MAP
-ccccccccccccccccccccccccccccccccccccccccccc
-cxccc====ccccc=======cccc====ccccccccccccxc
-cxcc=cccc=ccc=ccccccc=c==cccc=cccccccccccxc
-cxcc=c$$ce**|||**eccc=ccce|*|*|*|ec$$ccccxc
-cxc..c$$=....7....ccccccc....7....c$$c..cxc
-cx.e%c$ccccc...=cccccccccccc...ccccc$c%d.xc
-cx.e%ccc.c.cc.cc...ccccc...cc.cc.c.ccc%d.xc
-cxc..cc$.c|*ccc..c..ccc..c..ccc|*c.$cc..cxc
-cxccccc$$|*|*c...c...U...c...c***|$$cccccxc
-cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc
-cxcccc$$$c*||c.......c.......c***c$$$ccccxc
-cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc
-cxccccccc...cccccc...?...cccccc...cccccccxc
-cxccccc.....?.ccc...ccc...ccc.?.....cccccxc
-cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc
-cxcccc.........+.4cc||*cc4.+.........ccccxc
-cxcccc.4..|....c.6ccd|dcc6.c....|..4.ccccxc
-cxccccc..c~c..cc...cc|cc...cc..c~c..cccccxc
-cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc
-cx.d%ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc
-cx.d%cc.......ccccccccccccccc.......cc%d.xc
-cxc..cc...!...cccc.......cccc...!...cc..cxc
-cxccccc.......ccc~6cc?cc6~ccc.......cccccxc
-cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc
-cxccccccc...ccccccccc.ccccccccc...cccccccxc
-ccccccccccccccccccccc@ccccccccccccccccccccc
-ENDMAP
-
 
 ############################################################################
 # (Mini)vaults specific to the Elven Halls
diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index 6cdf40b8ec..d14768abc0 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -170,7 +170,7 @@ xxxxx.........xxxxx
 xxxxx....@....xxxxx  
 ENDMAP
 
-NAME: lemuel_oo5_c
+NAME: lemuel_005_c
 TAGS: entry no_monster_gen
 ORIENT: float
 SHUFFLE: {[(, ABC
@@ -3106,6 +3106,10 @@ TAGS: entry
 MONS: w:30 nothing / worm 
 MONS: w:30 nothing / ooze / weight:2 jelly
 MONS: w:30 nothing / jackal / rat
+
+# There is a very slight chance that a jelly or an intelligent monster 
+# (hobgoblin) might spawn inside the cage. This is okay; added an exit.
+
 FLAGS: no_rotate
 ORIENT: float
 SUBST: ?=Gx, ===++
@@ -3120,7 +3124,7 @@ MAP
 .x.............x.
 .=T....xxx....T=.
 .x.....({[.....x.
-.x..T.......T..x.
+.x..T...]...T..x.
 .xxx=xxxxxxx=xxx.
 .................
 ENDMAP
@@ -3368,25 +3372,25 @@ TAGS: entry
 ORIENT: float
 SHUFFLE: cxxx
 MAP
-..............................
-............c..c..............
-...........c..................
-...........c...c..............
-...cc......cccc...............
-..cccc........................
-.cc.cc........................
+           ......             
+          ..c..c.
+          .c.....
+  ....   ..c...c.
+...cc......cccc..
+..cccc...........
+.cc.cc........... 
 ..cc.....cc.ccc...............
 ........c..[..cc.....c....ccc.
 .......cc.{.....c....c....c.c.
 ........c..(..cc.....c....ccc.
 ..cc.....cc.ccc...............
-.cc.cc........................
-..cccc........................
-...cc......cccc...............
-...........c...c..............
-...........c..................
-............c..c..............
-..............................
+.cc.cc........... 
+..cccc........... 
+...cc......cccc.. 
+...........c...c. 
+          .c..... 
+          ..c..c. 
+           ......  
 ENDMAP
 
 
@@ -3880,8 +3884,8 @@ xxxxxxxxxx+xxxxx+xxxxxxxxxx
 ......xxxx.......xxxx......
 ........xx..[.{..xx........
 ........xxx.....xxx........
-........xxxxx.xxxxx........
-.......xxxxxx+xxxxxx.......
+........xxxxx+xxxxx........
+.......xxxxxx.xxxxxx.......
 .......xxxxx...xxxxx.......
 ......xxxx.......xxxx......
 ......xx...........xx......
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 032546e274..e1b174818d 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -218,7 +218,7 @@ ENDMAP
 # possibility to script the trolls guard the bridge would be great here -evk
 #
 NAME:   troll_bridge
-DEPTH:  D:7-15
+DEPTH:  D:9-18
 ORIENT: float
 TAGS:   no_pool_fixup
 MONS:   troll w:50 / rock troll / iron troll w:5
@@ -342,8 +342,12 @@ ENDMAP
 #############################################################################
 # Oklob shooting range
 #
+# Disallowing this vault on branch starts, as brown stairs can't help there.
+# Chance for a plant to turn oklob based on dungeon level.
+#
 NAME:    oklob_3
-DEPTH:   D:21-27, Lair, Elf
+DEPTH:   D:21-27, Lair:2-10, Elf:2-7
+CHANCE:  1
 ORIENT:  float
 SHUFFLE: ab" / AB'
 SUBST:   a=[, b=(, A=., B=., "=., ':>', '=>.
diff --git a/crawl-ref/source/dat/hells.des b/crawl-ref/source/dat/hells.des
index 032d916352..8f09b7547b 100644
--- a/crawl-ref/source/dat/hells.des
+++ b/crawl-ref/source/dat/hells.des
@@ -333,6 +333,8 @@ MONS: Serpent of Hell, random, random
 ############################################################################
 # Antaeus; bottom of Cocytus. David's Improved Demon Lairs, episode I.
 #
+# To do: this level has much shorter distances to travel, hence should
+#        come up with harder resistance.
 
 NAME:    antaeus_david_1
 PLACE:   Coc:7
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des
index 860a3c91fd..314866b554 100644
--- a/crawl-ref/source/dat/lab.des
+++ b/crawl-ref/source/dat/lab.des
@@ -25,7 +25,7 @@ ENDMAP
 # Labyrinth exit minivaults
 #############################################################################
 # These are generated by the TAG: minotaur.
-# You *must* place the minotaur(s) yourself!
+# You *must* place the minotaur yourself! Only one minotaur per map, please.
 # There must be an exit (<), leading back to the dungeon.
 #
 # You can use the "generate_loot" tag to indicate that you're not explicitly
@@ -53,7 +53,7 @@ NAME: labyrinth_watery
 TAGS: minotaur generate_loot no_pool_fixup allow_dup
 MONS: minotaur
 SHUFFLE: def
-SUBST: d=~, e=~, f=.
+SUBST: d=~, e=~, f=., c:vvc
 MAP
 .........
 .ccccccc.
@@ -104,19 +104,16 @@ ENDMAP
 NAME: labyrinth_hidden_loot
 TAGS: minotaur generate_loot allow_dup
 MONS: minotaur
-SHUFFLE: def
-SUBST: d = 1, e = 1
-KFEAT: f = blade trap / needle trap / axe trap / floor w:70
-KMONS: f = minotaur
-KITEM: f = any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item / nothing, any good_item / nothing
-MAP
+NSUBST: d = 1 / %
+SUBST: c : cvv
+MAi
 ............
 .cccccccccc.
 .cxxxxdxxxc.
 .cxxxx=xxxc.
 .cxx..U.xxc.
-.ce=U.1.xxc.
-.cxx...U=fc.
+.cd=U...xxc.
+.cxx...U=dc.
 .cxx.<..xxc.
 .cxxxx+xxxc.
 .cxxxx.xxxc.
@@ -128,12 +125,12 @@ ENDMAP
 # Mini labyrinth exit
 NAME: labyrinth_mini_lab
 TAGS: minotaur generate_loot allow_dup
-MONS: minotaur
 SHUFFLE: def, gh, ij, klm
 SUBST: d = c, e = ., f = c.
 SUBST: g = c, h = .
 SUBST: k = <, l = ., m = ., i = ., j = .
 KMONS: < = minotaur
+SUBST: c : vvc
 
 validate {{ return has_exit_from_glyph('<') }}
 
@@ -156,60 +153,35 @@ MAP
 ENDMAP
 
 #############################################################################
-# Three rows exit
-NAME: labyrinth_rows
-TAGS: minotaur
-SHUFFLE: def
-MONS: minotaur
-KFEAT: d = floor
-KITEM: d = any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item
-KFEAT: e = floor
-KFEAT: f = <
-MAP
-..................
-.cccccccccccccccc.
-.+1............dc.
-.cccccccccccccccc.
-.+1............ec.
-.cccccccccccccccc.
-.+1............fc.
-.cccccccccccccccc.
-..................
-ENDMAP
-
-#############################################################################
 # Trapped exits - this is evil!
-NAME: labyrinth_trapped
-TAGS: minotaur generate_loot allow_dup
-SHUFFLE: dD/eE/fF, ghi
-MONS: minotaur
-SUBST: g = c, h = c, i = .
-KFEAT: d = axe trap / dart trap / needle trap / blade trap
-KFEAT: e = axe trap / dart trap / needle trap / blade trap
-KFEAT: f = axe trap / dart trap / needle trap / blade trap
-KFEAT: D = teleport trap
-KFEAT: E = teleport trap
-KFEAT: F = floor
+NAME:    labyrinth_trapped
+TAGS:    minotaur generate_loot allow_dup
+SHUFFLE: dD/eE/fF
+MONS:    minotaur
+NSUBST:  g = . / c
+NSUBST:  D = . / D
+KFEAT:   d = axe trap / dart trap / needle trap / blade trap
+KFEAT:   D = teleport trap
+SUBST:   c : vvc
 CHANCE: 1
 MAP
-............
-.ccccccccccc.
-.g..ddD+.ccc.
-.c.ccccc.ccc.
-.h..eeE+.1<c.
-.c.ccccc.ccc.
-.i..ffF+.ccc.
-.ccccccccccc.
-............
+..............
+.cccccccccccc.
+.g..ddD+.cccc.
+.c.ccccc.cccc.
+.g..ddD+.+1<c.
+.c.ccccc.cccc.
+.g..ddD+.cccc.
+.cccccccccccc.
+..............
 ENDMAP
 
 #############################################################################
 # Another trapped exit - most evil again! 
 NAME: labyrinth_trapped_2
-TAGS: lab allow_dup
-MONS: minotaur
+TAGS: lab allow_dup generate_loot
 ITEM: potion of porridge
-SHUFFLE: xX / yY / zZ
+SHUFFLE: XYZ
 SHUFFLE: GH, LM, fghijklmn, FHIJKLN
 KFEAT: f = teleport trap
 KFEAT: n = teleport trap
@@ -217,19 +189,20 @@ KFEAT: F = teleport trap
 KFEAT: N = teleport trap
 SUBST: g=., h=., i=., j=., k=., l=., n=.
 SUBST: G=., H=., I=., J=., K=., L=., N=.
-SUBST: x=<, y=., z=.
-KITEM: X = any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item
 SUBST: Y=*, Z=*
+KFEAT: X = exit_portal_vault
+KMONS: X = minotaur
+KFEAT: S = granite_statue
 CHANCE: 2
 MAP
 ............
 .vvvvvvvvvvv.
-.vvxvvyvvzvv
 .vvXvvYvvZvv.
-.vv1vv1vv1vv.
 .vv+vv+vv+vv.
 .vFGHIJKLMNv.
 .vfghijklmnv.
+.v.........v.
+.v.S..S..S.v.
 .v...d.d...v.
 .vvvvv+vvvvv.
 ............
@@ -333,16 +306,14 @@ ENDMAP
 # Baited teleport trap - this is evil!
 NAME: labyrinth_baited_teleportation_trap
 TAGS: lab allow_dup
-SHUFFLE: XY / !! / !! / !!
-SUBST: !=x
-SUBST: X==
 KFEAT: Y = teleport trap
 KITEM: Y = any good_item
+CHANCE: 1
 MAP
 .....
-.xXx.
-.XYX.
-.xXx.
+.x=x.
+.=Y=.
+.x=x.
 .....
 ENDMAP
 
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index d65893baf5..35f36423d4 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -253,13 +253,14 @@ ENDMAP
 # 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)
+ä adapted towards less strawberries (dp). I'm against using these outside Lair.
 #
 NAME: strawberry_fields_big
 ORIENT: float
 DEPTH: Lair
 SUBST: .= d .:150 1:8 2:4
 MONS: plant, butterfly
-ITEM: strawberry / strawberry q:1 / strawberry q:2 / strawberry q:3 / strawberry q:4 / strawberry q:5 / strawberry q:6 / strawberry q:8
+ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
 CHANCE: 2
 COLOUR: . = green:20 / brown:15 / none
 MAP
@@ -286,7 +287,7 @@ ORIENT: float
 DEPTH: Lair
 SUBST: .= d .:140 1:8 2:4
 MONS: plant, butterfly
-ITEM: strawberry / strawberry q:1 / strawberry q:2 / strawberry q:3 / strawberry q:4 / strawberry q:5 / strawberry q:6 / strawberry q:8
+ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
 CHANCE: 2
 COLOUR: . = green:20 / brown:15 / none
 MAP
@@ -314,7 +315,7 @@ TAGS: allow_dup
 DEPTH: Lair
 SUBST: .= d .:50 1:8 2:4
 MONS: plant, butterfly
-ITEM: strawberry / strawberry q:1 / strawberry q:2 / strawberry q:3 / strawberry q:4 / strawberry q:5 / strawberry q:6 / strawberry q:8
+ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
 CHANCE: 3
 PLACE: Lair:3
 COLOUR: . = green:20 / brown:15 / none
@@ -334,7 +335,7 @@ ORIENT: float
 DEPTH: Lair
 SUBST: .= d .:50 1:8 2:4 
 MONS: plant, butterfly
-ITEM: strawberry / strawberry q:1 / strawberry q:2 / strawberry q:3 / strawberry q:4 / strawberry q:5 / strawberry q:6 / strawberry q:8
+ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
 CHANCE: 3
 COLOUR: . = green:20 / brown:15 / none
 MAP
@@ -364,7 +365,7 @@ DEPTH:  Lair, Snake
 MONS:   plant, fungus
 SUBST:  ' = . a 2:1
 SUBST:  . = .:90 a:10 2:1
-KITEM:  a : apple/apricot/pear/orange/banana/strawberry/lemon
+KITEM:  a : apple / apricot / pear / orange / banana / strawberry q:1 w:5 / strawberry q:2 w:5 / lemon
 KFEAT:  a = .
 CHANCE: 8
 MAP
@@ -384,7 +385,7 @@ MONS:   plant, fungus
 SUBST:  ' = . 1
 SUBST:  . = .:90 a:10 2:1
 SUBST:  _ = .:90 a:4 
-KITEM:  a : apple/apricot/pear/orange/banana/strawberry/lemon
+KITEM:  a : apple / apricot / pear / orange / banana / strawberry q:1 w:5 / strawberry q:2 w:5 / lemon
 KFEAT:  a = .
 CHANCE: 2
 MAP
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 268e3f4c0c..98fcd18fad 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -1023,19 +1023,19 @@ MONS: orc wizard, deep elf conjurer
 SHUFFLE: 1*/2d
 SUBST: * = * |:1 %:4
 SUBST: d = * |
+NSUBST: X = + / x
 MAP
-...............
-.bbbbbbbbbbbbb.
-.b.1.........b.
-.b..........1b.
-.bb..........b.
-......*bbbbb.b.
-.b.bbbb*.......
-.b..........bb.
-.b1..........b.
-.b.........1.b.
-.bbbbbbbbbbbbb.
-...............
+.............
+.xxxxxxxxxxx.
+.x*1......bx.
+.x1.......bx.
+.x..bbbbb+bx.
+.x..bxxxb.bx.
+.x..bbbbb.bx.
+.x..+......x.
+.xbbbbbbb..X.
+.xxxxxxxxxXx.
+.............
 ENDMAP
 
 ##############################################################################
@@ -1116,76 +1116,75 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-##############################################################################
-# Wet chambers - two mutually exclusive versions (Onia Ninara)
+###############################################################################
+## Wet chambers - two mutually exclusive versions (Onia Ninara)
+##
+#NAME:    onia_ninara_007_chamber_of_wet_secrets
+#DEPTH:   D:8-13
+#TAGS:    no_monster_gen no_pool_fixup
+#KMONS:   1 = centaur
+#KMONS:   2 = brown snake
+#KMONS:   3 = electrical eel
+#ITEM:    bread ration/meat ration/royal jelly/potion of porridge, good_item cloak/any book
+#SHUFFLE: !;
+#SUBST:   " = .:80 W:30
+#SUBST:   ; = .:80 W:30
+#SUBST:   ! = w:20 W ? c
+#KFEAT:   3 = w
+#KFEAT:   2 = W / .
+#KFEAT:   1 = W / . w:30
+#KFEAT:   d = W / .
+#KFEAT:   e = W / .
+#KFEAT:   ? = spear trap / blade trap
+#MAP
+#.........
+#.ccccccc.
+#.c?;2Wdc.
+#.ccWccec.
+#.c.w"c3c.
+#.c"w"ccc.
+#.c>w!;!c.
+#.c"w!!;c.
+#.c.w!;!c.
+#.c1w?T!c.
+#.c$w;!!c.
+#.cccc=cc.
+#.........
+#ENDMAP
 #
-NAME:    onia_ninara_007_chamber_of_wet_secrets
-DEPTH:   D:8-13
-TAGS:    no_monster_gen no_pool_fixup
-KMONS:   1 = centaur
-KMONS:   2 = brown snake
-KMONS:   3 = electrical eel
-ITEM:    bread ration/meat ration/royal jelly/potion of porridge, good_item cloak/any book
-SHUFFLE: !;
-SUBST:   " = .:80 W:30
-SUBST:   ; = .:80 W:30
-SUBST:   ! = w:20 W ? c
-KFEAT:   3 = w
-KFEAT:   2 = W / .
-KFEAT:   1 = W / . w:30
-KFEAT:   d = W / .
-KFEAT:   e = W / .
-KFEAT:   ? = spear trap / blade trap
-MAP
-.........
-.ccccccc.
-.c?;2Wdc.
-.ccWccec.
-.c.w"c3c.
-.c"w"ccc.
-.c>w!;!c.
-.c"w!!;c.
-.c.w!;!c.
-.c1w?T!c.
-.c$w;!!c.
-.cccc=cc.
-.........
-ENDMAP
-
-NAME:    onia_ninara_008_deeper_chamber_of_wet_secrets
-DEPTH:   D:20-26
-TAGS:    no_monster_gen no_pool_fixup
-KMONS:   1 = yaktaur captain
-KMONS:   2 = grey snake
-KMONS:   3 = storm dragon
-ITEM:    potion of cure mutation/potion of gain dexterity/potion of gain strength
-ITEM:    potion of gain intelligence/potion of experience/w:40 potion of heal wounds
-SHUFFLE: de, !;
-KFEAT:   3 = w / .
-KFEAT:   | = W / .
-KFEAT:   d = W / .
-KFEAT:   e = W / .
-KFEAT:   2 = W 
-SUBST:   ; = .:80 W:30
-SUBST:   " = .:80 W:30
-SUBST:   ! = w:20 W ? c
-KFEAT:   ? = zot trap
-MAP
-.........
-.ccccccc.
-.c?.2Wdc.
-.ccWcc|c.
-.c"w"c3c.
-.c"w"ccc.
-.c"w!;!c.
-.c"w!?;c.
-.c"w!!;c.
-.c1w;U!c.
-.c$w!!;c.
-.cccc=cc.
-.........
-ENDMAP
-
+#NAME:    onia_ninara_008_deeper_chamber_of_wet_secrets
+#DEPTH:   D:20-26
+#TAGS:    no_monster_gen no_pool_fixup
+#KMONS:   1 = yaktaur captain
+#KMONS:   2 = grey snake
+#KMONS:   3 = storm dragon
+#ITEM:    potion of cure mutation/potion of gain dexterity/potion of gain strength
+#ITEM:    potion of gain intelligence/potion of experience/w:40 potion of heal wounds
+#SHUFFLE: de, !;
+#KFEAT:   3 = w / .
+#KFEAT:   | = W / .
+#KFEAT:   d = W / .
+#KFEAT:   e = W / .
+#KFEAT:   2 = W 
+#SUBST:   ; = .:80 W:30
+#SUBST:   " = .:80 W:30
+#SUBST:   ! = w:20 W ? c
+#KFEAT:   ? = zot trap
+#MAP
+#.........
+#.ccccccc.
+#.c?.2Wdc.
+#.ccWcc|c.
+#.c"w"c3c.
+#.c"w"ccc.
+#.c"w!;!c.
+#.c"w!?;c.
+#.c"w!!;c.
+#.c1w;U!c.
+#.c$w!!;c.
+#.cccc=cc.
+#.........
+#ENDMAP
 
 
 ##############################################################################
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index fa098b1e23..a6326054a8 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -148,7 +148,7 @@ ENDMAP
 NAME:    david_orc_5
 TAGS:    orc_entry
 ORIENT:  float
-KFEAT:   C = altar_beogh w:70 / altar_yredelemnul / altar_makhleb / altar_trog
+KFEAT:   C = altar_beogh
 SHUFFLE: EFGH
 SUBST:   E=3
 SUBST:   F=1, G=1, H=1
@@ -167,8 +167,6 @@ MONS:    orc w:32 / w:7 orc warrior / w:1 orc knight
 MONS:    orc w:32 / w:7 orc warrior
 : end
 SUBST:   x : cxv
-SHUFFLE: () / XY
-SUBST:   X=., Y=. 
 MAP
 xxxxxxxxxxxxxxx
 x......O......x