A couple level.des changes. (David)

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

7 files changed, 76 insertions, 183 deletions

diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index 75b381c1fc..7ccbf2c6e8 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -3867,7 +3867,8 @@ TAGS:    entry no_monster_gen no_pool_fixup
 FLAGS:   no_rotate
 ORIENT:  float
 SHUFFLE: ({[, x+/x+/x+/x+/cC/vV/lL/wW
-SUBST:   C=+, V=+, L=.
+SUBST:   C=+, V=+ 
+NSUBST:  L = 1:. / *:l
 MAP
 ...........................
 .............x.............
diff --git a/crawl-ref/source/dat/hells.des b/crawl-ref/source/dat/hells.des
index a98f785006..032d916352 100644
--- a/crawl-ref/source/dat/hells.des
+++ b/crawl-ref/source/dat/hells.des
@@ -16,6 +16,7 @@ FLAGS:  no_rotate
 MONS:   imp / quasit / shadow imp, hellion / rotting devil / iron devil / hairy devil / hell hound
 ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / wand of draining 
 ITEM:   wand of fire / ring of fire / Necronomicon / book of demonology / scroll of torment
+KFEAT:  A = enter_hell
 ORIENT: float
 SUBST:  d=de, ?:?.l, ?=l.
 
@@ -51,6 +52,7 @@ MONS:   hellion / rotting devil / iron devil / hairy devil / hell hound
 ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / wand of draining 
 ITEM:   wand of fire / ring of fire / Necronomicon / book of demonology / scroll of torment
 ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / w:30 nothing
+KFEAT:  A = enter_hell
 ORIENT: float
 SUBST:  d=de, ?:?.l, ?=l.
 SUBST:  b : b:30 c v .
@@ -83,6 +85,7 @@ NAME:   hellmouth_3
 MONS:   weight:50 imp / quasit / shadow imp / manes / lemure, hell hound
 ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / nothing
 ORIENT: float
+KFEAT:  A = enter_hell
 SUBST:  ? : . l ?:40, ?=l.
 MAP
 ................??............
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index bb79a563f4..11bb0086fc 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -257,7 +257,7 @@ ENDMAP
 NAME: strawberry_fields_big
 ORIENT: float
 DEPTH: Lair
-SUBST: .= d .:150 1:8 2:4 W:2
+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
 CHANCE: 2
@@ -283,7 +283,7 @@ ENDMAP
 NAME: strawberry_fields_big_rounded
 ORIENT: float
 DEPTH: Lair
-SUBST: .= d .:140 1:8 2:4 W:2
+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
 CHANCE: 2
@@ -309,7 +309,7 @@ ENDMAP
 NAME: strawberry_fields_round
 ORIENT: float
 DEPTH: Lair
-SUBST: .= d .:50 1:8 2:4 W:2
+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
 CHANCE: 3
@@ -328,7 +328,7 @@ ENDMAP
 NAME: strawberry_fields_patches_spacepadded
 ORIENT: float
 DEPTH: Lair
-SUBST: .= d .:50 1:8 2:4 W:2
+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
 CHANCE: 3
@@ -358,7 +358,7 @@ 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
+KITEM:  a : apple/apricot/pear/orange/banana/strawberry/lemon
 KFEAT:  a = .
 CHANCE: 8
 MAP
@@ -378,9 +378,9 @@ 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
+KITEM:  a : apple/apricot/pear/orange/banana/strawberry/lemon
 KFEAT:  a = .
-CHANCE: 8
+CHANCE: 2
 MAP
    ________   
   _........_  
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index b89c7d9307..9e624433f6 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -919,15 +919,18 @@ NAME:    box_level_dp
 DEPTH:   D:20-26
 ORIENT:  encompass
 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
+SHUFFLE: zZ
+NSUBST:  A = 1:= / *:b
+NSUBST:  B = 1:= / *:b
+NSUBST:  C = 1:= / *:b
+NSUBST:  D = 1:= / *:b
+NSUBST:  E = 1:= / *:b
+KFEAT:   ^ = teleport trap / Zot trap
 SUBST:   ':''l. , '=l.
 SUBST:   ":""W. , "=Ww..
 ITEM:    ring of teleportation
 ITEM:    royal jelly / honeycomb w:20 / nothing w:30
 ITEM:    scroll of teleportation
-SUBST:   R==, S=b
 KFEAT:   T = teleport trap
 KMONS:   w = electrical eel / jellyfish / nothing w:120
 KMONS:   l = fire vortex / lava snake / lava fish / fire elemental w:1 / nothing w:50
@@ -960,11 +963,11 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx.......xccccccxxxxxxx.........................................w"..xxxxxxxx
 xxxxxx.{...{.xc....cbbbbbxx................xxx...................."w......xxxxxx
 xxxxxx.......++.U..++.].++.....'''....'l'....xxx................."ww".....xxxxxx
-xxxxxx...[...xc....cbbbbbxx...'''..''lllll'....xx...bbbbbbb......"ww"....xxxxxxx
+xxxxxx...[...xc....cbbbbbxx...'''..''lllll'....xx...bbEbbEb......"ww"....xxxxxxx
 xxxxxx.......xcccccccxxxxxx.......'llllllll.....x...bd...9b...."www".....xxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxx.......'lllllll'.....x...b.....b.."ww.w".....xxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxx.......'lllllll'.....x...E.....E.."ww.w".....xxxxxxxx
 xxxxxx.............................'lllll'.....xx...b9...Vb.www..w".....xxxxxxxx
-xxxxxx....""w.............".xxx......'ll'......x....bbbRbSbwww.www.....xxxxxxxxx
+xxxxxx....""w.............".xxx......'ll'......x....bbEEEEbwww.www.....xxxxxxxxx
 xxxxxx.."wwwww"..........w....xxxx............xx....."wwwwwwww.ww"....xxxxxxxxxx
 xxxxxx.wwwwwwww"........w........xxxxxxx....xxx........"www"...ww"...xxxxxxxxxxx
 xxxxxx..wwwwwww"......"ww......""......xxxxxx....."...........ww"....xxxxxxxxxxx
@@ -977,31 +980,31 @@ xxxxxxwwwwwwww".."wwwxww.."w........................................>xx...xxxxxx
 xxxxxxxwwww""....."xwxw"...ww........................................xx...xxxxxx
 xxxxxxxww".........xxxw..............................................xx..xxxxxxx
 xxxxxxww............xx"w...ccccccccccccccccccccccccccccccccccccc.....xx..xxxxxxx
-xxxxxxw"...xxx.......x..w..c...*...*...*...*...*...*...*...*...c.....x...xxxxxxx
+xxxxxxw"...xxx.......x..w..c^..*...*...*...*...*...*...*...*...c.....x...xxxxxxx
 xxxxxxw....x!x..xxx..x..w..c...................................c.....x...xxxxxxx
 xxxxxxxx...x+x..x!x..x.....c*..;...;...;...;...;...;...;...;..*c.....xx..xxxxxxx
 xxxxxxxx....1..1+!x..x.....c...................................c.....xx...xxxxxx
 xxxxxx..........xxx.xx.....c.......bbbbbbbbbbbbbbbbbbbbb.......c.....xx..xxxxxxx
 xxxxxx..xxxx........xx.....c.......bTTTTTTTTTbTTTTTTTTTb.......c.....x...xxxxxxx
-xxxxxx..x!!+1..xxxx..x.....c*..;...bTbbbBbbbTbTbbbFbbbTb...;..*c.....x..xxxxxxxx
+xxxxxx..x!!+1..xxxx..x.....c*..;...bTbbbAbbbTbTbbbBbbbTb...;..*c.....x..xxxxxxxx
 xxxxxx..xxxx..1+!!x..x.....c.......bTb8...|bTbTb|...8bTb.......c.....xx.xxxxxxxx
-xxxxxx.........xxxx..x.....c.......bTA|...|CTbTE|...|GTb.......c.....xx.xxxxxxxx
+xxxxxx.........xxxx..x.....c.......bTA|...|ATbTB|...|BTb.......c.....xx.xxxxxxxx
 xxxxxx.......1.......x.....c.......bTb|...8bTbTb8...|bTb.......c.....x...xxxxxxx
-xxxxxxxx....121....xxx.....c*..;...bTbbbDbbbTbTbbbHbbbTb...;..*c.....x...xxxxxxx
+xxxxxxxx....121....xxx.....c*..;...bTbbbAbbbTbTbbbBbbbTb...;..*c.....x...xxxxxxx
 xxxxxx!x...cc+cc...xxx.....c.......bTTTTTTTTTbTTTTTTTTTb.......c.....xx..xxxxxxx
 xxxxxx&+1..c!2!c...xxx.....c.......bbbbbbbbbbbbbbbbbbbbb.......c.....x..xxxxxxxx
 xxxxxx!x...c&&&c...xxx.....c.......bTTTTTTTTTbTTTTTTTTTb.......c.....x..xxxxxxxx
-xxxxxxxx...ccccc...xxx.....c*..;...bTbbbPbbbTbTbbbIbbbTb...;..*c.....x.xxxxxxxxx
+xxxxxxxx...ccccc...xxx.....c*..;...bTbbbDbbbTbTbbbCbbbTb...;..*c.....x.xxxxxxxxx
 xxxxxx...............x.....c.......bTb|...8bTbTb|...8bTb.......c.....x.xxxxxxxxx
-xxxxxxx...1...xxxx...x.....c.......bTO|...|MTbTL|...|JTb.......c.....x..x.xxxxxx
+xxxxxxx...1...xxxx...x.....c.......bTD|...|DTbTC|...|CTb.......c.....x..x.xxxxxx
 xxxxxxx..x+x.1+!!x...x.....c.......bTb8...|bTbTb8...|bTb.......c.....xx...xxxxxx
-xxxxxx...x!x..xxxx...x.....c*..;...bTbbbNbbbTbTbbbKbbbTb...;..*c.....xxx.xxxxxxx
+xxxxxx...x!x..xxxx...x.....c*..;...bTbbbDbbbTbTbbbCbbbTb...;..*c.....xxx.xxxxxxx
 xxxxxx...xxx.........x.....c.......bTTTTTTTTTbTTTTTTTTTb.......c.....xxx.xxxxxxx
 xxxxxx.........xxxxxxx.....c.......bbbbbbbbbbbbbbbbbbbbb.......c.....xxx..xxxxxx
 xxxxxxxxx......x***99+.....c...................................c.....xxxx.xxxxxx
 xxxxxxxxx..xx..xxxxxxx.....c*..;...;...;...;...;...;...;...;..*c.....x....xxxxxx
 xxxxxx.....xx........x.....c...................................c.....x.xx.xxxxxx
-xxxxxx.xx.....xxx....x.....c...*...*...*...*...*...*...*...*...c.....x.xx=xxxxxx
+xxxxxx.xx.....xxx....x.....c...*...*...*...*...*...*...*...*..^c.....x.xx=xxxxxx
 xxxxxx.xx....1+!x..xxx.....ccccccccccccccccccccccccccccccccccccc.....xxx..xxxxxx
 xxxxxx....xx..xxx..xxx...............................................xx..xxxxxxx
 xxxxxx....xx.......xxx.........................................z..z..x....xxxxxx
@@ -1020,114 +1023,6 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-###########################################################################
-# Meet the feebles - Oklobs on the run! (dp)
-#
-NAME:    cascading_oklobs
-ORIENT:  east
-FLAGS:   no_rotate
-TAGS:    no_monster_gen uniq
-DEPTH:   D:16-27
-MONS:    oklob plant
-MONS:    plant / oklob plant w:1
-MONS:    eye of draining / eye of devastation w:1 / giant eyeball w:4
-MONS:    plant
-MONS:    fungus / wandering mushroom w:1
-SUBST:   ; = .:40 w:10 W:20 4:9  1:1
-SUBST:   ' = .:20 w:20 W:20 4:5  1:5
-SUBST:   " = .:10 w:30 W:10 4:11 1:9
-SUBST:   P = 4 2:1 5:1 .:5
-SUBST:   p = 4 2:1 5:1 .:100
-SUBST:   _ = 4 2:1 5:1 .:200
-SHUFFLE: def, ghi, defD/ghiI
-SUBST:   d=dD , e=eD , f=fD , g=gH , h=hH , i=iI
-KITEM:   d = good_item cloak
-KITEM:   e = good_item gloves
-KITEM:   f = good_item helm / good_item cap
-#KITEM:   d = any good cloak of preservation
-#KITEM:   e = any good gloves of dexterity / any good gloves of strength
-#KITEM:   f = any good helm of intelligence / any good helm of see invisible
-KITEM:   D = any good_item armour / any armour
-KITEM:   I = any good_item jewellery / any jewellery
-KFEAT:   I = floor
-KITEM:   g = good_item amulet
-KITEM:   h = good_item ring
-KITEM:   i = good_item ring
-#KITEM:   g = any good amulet of resist corrosion / any good amulet of conservation
-#KITEM:   h = any good ring of evasion / any good ring of armour
-#KITEM:   i = any good ring of strength / any good ring of dexterity / any good ring of intelligence
-MAP
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-....xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-........pxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-........_pppPPPPPPPPPPPPPPPPPxxxxxxxxxx
-@.....______ppppppPPPPPPPPPPPPPPxxxxxxx
-.....__________pppppppppppPPPPPPPxxxxxx
-.....____________ppppppppppppPPPPxxxxxx
-....._____________pppppppppppppPPxxxxxx
-......_____________pppPPPppppppPPxxxxxx
-......______________ppPPPpppppppPxxxxxx
-.....______________pppPPPppppppppxxxxxx
-..._______________pppppppppppppppxxxxxx
-..___pppppppppppppppppppppppppPPPxxxxxx
-..__ppPPPPPPPPPPPPcPPPPcPPPPPPPPPxxxxxx
-..__ppPcbbbbbbbbbbc++++cbbbbbbbbbxxxxxx
-.__pppPcb.........c....c......wwwxxxxxx
-.___ppPcbww..................wwwwxxxxxx
-.___ppPcbwww22222222222222222wwwwxxxxxx
-.___ppPcbwww...................wwxxxxxx
-.___ppPcbwwwwwww..c....c........wxxxxxx
-.__ppPPcbbbbbbbbbbc++++cbbbbbbbbbxxxxxx
-.__ppPPcb"""''';;;c....c;;;'''"""xxxxxx
-.__ppPPcb"""''';;;......;;;'''"""xxxxxx
-.__ppPPcb"""''';;;;;;;;;;;;'''"""xxxxxx
-.__ppPPcb"""'''';;;;;;;;;;''''"""xxxxxx
-.__ppPPcb"""''''';;;;;;;;'''''"""xxxxxx
-.__ppPPcb""""''''''''''''''''""""xxxxxx
-__ppPPPcb"""""''''''''''''''"""""xxxxxx
-__ppPPPcb""""""''''''''''''""""""xxxxxx
-__ppPPPcb""""""''';;;;;;'''""""""xxxxxx
-_ppPPPPcb""""""'';;;;;;;;''""""""xxxxxx
-_pPPPPPcb""""""'c.c;;;;c.c'""""""xxxxxx
-PPPPPPPcbbbbbbbbc+cccccc+cbbbbbbbxxxxxx
-ccccccccccccccccc.cccccc.ccccccccxxxxxx
-c1..*...*...*...+.cccccc.ccccccccxxxxxx
-c...............cccccccc+ccccccccxxxxxx
-c...............cwwwwwwwwwwwwwwwcxxxxxx
-c*.............*cwwwwwwwwwwwwwwwcxxxxxx
-c.......1.......cwww.........wwwcxxxxxx
-c...............cw....22222....wcxxxxxx
-c...............c...222222222...cxxxxxx
-c*.............*c..223.....322..cxxxxxx
-c...............c.222...|...222.cxxxxxx
-c...............c.223..|||..322.cxxxxxx
-c.......1.......c.222...|...222.cxxxxxx
-c*.............*c..223.....322..cxxxxxx
-c...............c...222222222...cxxxxxx
-c...............cc....22222....ccxxxxxx
-c1..*.......*..1cccc.........ccccxxxxxx
-cccccccc+ccccccccccccccc+ccccccccxxxxxx
-c..............lll..............cxxxxxx
-c........lllllllllllllll........cxxxxxx
-c...lllllllllllllllllllllllll...cxxxxxx
-c2222222222222222222222222222222cxxxxxx
-c2222222222222222222222222222222cxxxxxx
-c...lllllllllllllllllllllllll...cxxxxxx
-c........lllllllllllllll........cxxxxxx
-cD.d.D.e.D.f.D.D.I.I.g.I.h.I.i.Icxxxxxx
-cccccccccccccccccccccccccccccccccxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-ENDMAP
 
 ##############################################################################
 # Rubicon
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 35c05129c4..7b61b7d847 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -1,7 +1,7 @@
 ###############################################################################
 # mini.des: This is the place where minivaults should go. These are defined
 #           without any ORIENT line. Vaults with ORIENT lines are stored in
-#           either small.des or large.des.
+#           either float.des or large.des.
 #
 #           All maps dealing with the Vault branch system, including Vaults:8
 #           reside in vaults.des.
@@ -24,15 +24,12 @@
 # Minivaults must NOT have an ORIENT: attribute. Including an ORIENT: attribute
 # makes the map a normal vault, and mayhem can result.
 #
-# Minivaults should be surrounded by (enough) floor or shallow water. Otherwise
-# they can impede navigation on the level.
-#
 ###############################################################################
 
 
 
 # Default depth for minivaults. If your minivault is suitable for one of the
-# branches below, add it via DEPTH: Lair or similar.
+# branches, add it via DEPTH: Lair or similar.
 default-depth: D:8-27
 
 ##############################################################################
@@ -1094,7 +1091,9 @@ ENDMAP
 NAME:    onia_ninara_007_chamber_of_wet_secrets
 DEPTH:   D:8-13
 TAGS:    no_monster_gen no_pool_fixup
-MONS:    centaur, brown snake, electrical eel
+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
@@ -1113,7 +1112,7 @@ MAP
 .ccWccec.
 .c.w"c3c.
 .c"w"ccc.
-.c.w!;!c.
+.c>w!;!c.
 .c"w!!;c.
 .c.w!;!c.
 .c1w?T!c.
@@ -1125,7 +1124,9 @@ ENDMAP
 NAME:    onia_ninara_008_deeper_chamber_of_wet_secrets
 DEPTH:   D:20-26
 TAGS:    no_monster_gen no_pool_fixup
-MONS:    yaktaur captain, grey snake, storm dragon
+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 wound
 SHUFFLE: de, !;
diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des
index a64b684bde..6a97ba5b85 100644
--- a/crawl-ref/source/dat/temple.des
+++ b/crawl-ref/source/dat/temple.des
@@ -133,7 +133,7 @@ ENDMAP
 #
 NAME:    temple_pool_a
 TAGS:    temple_entry no_monster_gen no_pool_fixup
-CHANCE:  5
+CHANCE:  3
 FLAGS:   no_rotate
 ORIENT:  float
 SHUFFLE: XY
@@ -154,6 +154,7 @@ ENDMAP
 
 NAME:    temple_pool_b
 TAGS:    temple_entry no_monster_gen
+CHANCE:  7
 FLAGS:   no_rotate
 ORIENT:  float
 SHUFFLE: ABCDEFGHIJKL
@@ -216,7 +217,7 @@ ENDMAP
 ##############################################################################
 
 ##########################################################################
-# Circular temple (David Ploog).
+# Circular temple (David Ploog). 12 = 1 x 12
 
 NAME: circular_temple
 PLACE: Temple
@@ -264,7 +265,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ##############################################################################
-# Three leaves temple (David Ploog)
+# Three leaves temple (David Ploog). 12 = 3 x 4
 
 NAME: three_leaves__temple
 PLACE: Temple
@@ -308,7 +309,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ##############################################################################
-# Twelve chambers temple (David Ploog). 
+# Twelve chambers temple (David Ploog). 12 = 12 x 1
 
 NAME: twelve_chambers_temple
 PLACE: Temple
@@ -356,7 +357,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ##########################################################################
-# Another temple (David Ploog)
+# Another temple (David Ploog). 12 + 3 = 1 + 2 + 3 + 4 + 5
 
 NAME: triangle_temple
 PLACE: Temple
@@ -449,7 +450,7 @@ ENDMAP
 
 
 ##########################################################################
-# Five rooms temple (David Ploog).
+# Five rooms temple (David Ploog). 12 + 3 = 5 x 3
 
 NAME:    five_temple
 PLACE:   Temple
@@ -504,3 +505,4 @@ xxxxxxxxxxxxxxx........x........xxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxx.......xxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
+
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index 75f863dca1..96dec29926 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -3,7 +3,7 @@
 #             Vaults system, including Vaults:8, Hall of Blades, Tomb:*.
 #
 # Note the regular (mini)vaults are no longer in vaults.des, they have been
-# moved to small.des and large.des. Portal vaults live in portal.des.
+# moved to mini.des, float.des and large.des. Portal vaults live in portal.des.
 ###############################################################################
  
 ##############################################################################
@@ -186,35 +186,26 @@ PLACE:   Vault:8
 ORIENT:  encompass
 #
 # the rune's spot, occassionally put nasty on the rune
-SHUFFLE: Rr, OPQR
-SUBST:   r = |
 KMONS:   O = 8 / 9 / w:80 nothing
-KMONS:   P = 8 / 9 / w:80 nothing
-KMONS:   Q = 8 / 9 / w:80 nothing
-KMONS:   R = 8 / 9 / w:80 nothing
-KITEM:   P = any good_item
-KITEM:   Q = any good_item
-KITEM:   R = any good_item
-KFEAT:   P = w:150 . / any shop / jewellery shop / wand shop
-KFEAT:   Q = w:150 . / any shop / scroll shop / book shop 
-KFEAT:   R = w:150 . / any shop / armour shop / weapon shop
+NSUBST:  O = O / o
+KITEM:   o = any good_item
+KFEAT:   o = w:120 . / any shop
+KFEAT:   O = .
 #
 # NW
 SHUFFLE: AC/BD, EG/FH, IKN/NJL, '"
-SUBST:   A=., B=X, C=+, D=x, E=+, F=X, G=., H=x, I=., M=X, J=x, K=+, N=+, L=x
-SUBST:   X = x =:5
+SUBST:   A=., B=xx=, C=+, D=x, E=+, F=xx=, G=., H=x
+SUBST:   I=., M=xx=, J=x, K=+, N=+, L=xx=
 SUBST:   ':$, ":*, ^=^., a:x.
 #
 # SW
-SHUFFLE: !_
+SHUFFLE: !_	
 SUBST:   ! = | * .:20
 SUBST:   _ = 8 9 .:20
-SUBST:   b : x .
 #
 # NE
-SHUFFLE: UVW
-SUBST:   U=., V=X, W=X
-SUBST:   X = x =:2
+NSUBST:  U = 1:. / *:xxxx=
+NSUBST:  V = 1:. / *:xxxx=
 SUBST:   - = 8 9 .:20
 #
 # SE (double use of Y=Y. and Z=Z. for decreasing variance)
@@ -223,19 +214,19 @@ SUBST:   Y = Y ., Z = Z .
 SUBST:   Y = Y ., Z = Z .
 SUBST:   Y = 9:30 8:10 .:40
 SUBST:   Z = 9:10 8:30 .:40
-SUBST:   c = x .:20
 #
 # general loot and additional features
 SUBST:   / : / .:3
 SUBST:   / = 8 9 ^ * | .:50
 SUBST:   | = | *:2
 SUBST:   * = * |:2
-SHUFFLE: klmnopqs
+SHUFFLE: klmnpqst
 SUBST:   k : ^ x =:3 .:40
 SUBST:   l : ^ x =:3 .:40
 SUBST:   m : ^ x =:3 .:80
 SUBST:   n : ^ x =:3 .:80
 SUBST:   o=., p=., q=., s=.
+KFEAT:   T = teleport trap / Zot trap
 #
 MONS: vault guard
 #
@@ -248,7 +239,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxx??/.............m.............................l............/??xxxxxxxxx
+xxxxxxxxxT?/.............m.............................l............/?Txxxxxxxxx
 xxxxxxxxx??/.............m.............................l............/??xxxxxxxxx
 xxxxxxxxx//xxxxxxxxxxxxxxxxxxxxxxxxxxx....xxxxxxxxxxxxxxxxxxxxxxxxxxx//xxxxxxxxx
 xxxxxxxxx..x.........................x....xxxxxxxxxxxxxxxxxxxxxxxxxxx..xxxxxxxxx
@@ -256,38 +247,38 @@ xxxxxxxxx..x.xxxxxxxxxxx..xxxxxxxxJxIx....xxxxx.................xxxxx..xxxxxxxxx
 xxxxxxxxx..x.x'.'.'.'.'x..x........x.x....xxx...........-.........xxx..xxxxxxxxx
 xxxxxxxxx..x.x.'.'.'.'.x..x..^^^^..x.x....xxx...-.................xxx..xxxxxxxxx
 xxxxxxxxx..x.x'.'.'.'.'x..x..^||^..x.x....xx.........-.......-.....xx..xxxxxxxxx
-xxxxxxxxx..x.x.'.'.'.'.x..x..^Rr^..x.x....xx.......................xx..xxxxxxxxx
+xxxxxxxxx..x.x.'.'.'.'.x..x..^O|^..x.x....xx.......................xx..xxxxxxxxx
 xxxxxxxxx..x.x'.'.'.'.'x..x..^||^..x.x....xx.-....xxxxxxxxxxx....-.xx..xxxxxxxxx
 xxxxxxxxx..x.x.'.'.'.'.x..x..^^^^..x.x....xx......x.........x......xx..xxxxxxxxx
-xxxxxxxxx..x.x'.'.'.'.'L..K........x.x....xx....xxU.........Vxx....xx..xxxxxxxxx
+xxxxxxxxx..x.x'.'.'.'.'L..K........x.x....xx....xxU.........Uxx....xx..xxxxxxxxx
 xxxxxxxxx..x.N.'.'.'.'.xxxxxxxxxxxxx.x....xx..-.x....xxxxx....x....xx..xxxxxxxxx
-xxxxxxxxx..xMxxxxxxxxxxx99988......A.x....xx....x.-.Wx$$$xx...x.-..xx..xxxxxxxxx
+xxxxxxxxx..xMxxxxxxxxxxx99988......A.x....xx....x.-.Vx$$$xx...x.-..xx..xxxxxxxxx
 xxxxxxxxx..x...........G99xxxxxxxxDx.x....xx....x..xx$***$xx..x....xx..xxxxxxxxx
-xxxxxxxxx..x.xxxxxxxxxHx99x........x.x....xx.-..x..x$$*Q*$$x-.x....xx..xxxxxxxxx
+xxxxxxxxx..x.xxxxxxxxxFx99x........x.x....xx.-..x..x$$*O*$$x-.x....xx..xxxxxxxxx
 xxxxxxxxxnnx.x?????????x88x."""""".x.x....xx....x..xx$***$xx..x....xxkkxxxxxxxxx
-xxxxxxxxx..x.x?????????x..x."""""".x.x....xx....x...Vx$$$xU...x..-.xx..xxxxxxxxx
-xxxxxxxxx..x.x?????????x..x."""""".x.x....xx..-.xxx-.xxxxx..Wxx....xx..xxxxxxxxx
+xxxxxxxxx..x.x?????????x..x."""""".x.x....xx....x...Vx$$$xV...x..-.xx..xxxxxxxxx
+xxxxxxxxx..x.x?????????x..x."""""".x.x....xx..-.xxx-.xxxxx..Uxx....xx..xxxxxxxxx
 xxxxxxxxx..x.x?????????x..x."""""".x.x....xx......x.........x......xx..xxxxxxxxx
 xxxxxxxxx..x.x?????????x..x."""""".x.x....xx......xxxxxxxxxxx.-....xx..xxxxxxxxx
 xxxxxxxxx..x.x?????????x..x."""""".x.x....xxx...-.................xxx..xxxxxxxxx
 xxxxxxxxx..x.x?????????x..C........x.x....xxx........-....-.......xxx..xxxxxxxxx
 xxxxxxxxx..x.xxxxxxxxxEx..xxxxxxxxxx.a..11....xx................xxxxx..xxxxxxxxx
-xxxxxxxxx..x...........F..B............1111...xxxxxxxxxxxxxxxxxxxxxxx..xxxxxxxxx
+xxxxxxxxx..x...........H..B............1111...xxxxxxxxxxxxxxxxxxxxxxx..xxxxxxxxx
 xxxxxxxxx..xxxxxxxxxxxxxxxxxxxxxxxxa..1....1..xxxxxxxxxxxxxxxxxxxxxxx..xxxxxxxxx
 xxxxxxxxx............................1..(}..1..........................xxxxxxxxx
 xxxxxxxxx...........................11.[..{.11.........................xxxxxxxxx
 xxxxxxxxx............................1..])..1..........................xxxxxxxxx
 xxxxxxxxx.............................1....1...........................xxxxxxxxx
-xxxxxxxxx..xxxxxxxxxxxxxxxxxxxxxxx.b...1111.cxcxxxcxxxxxxxxxxxxxxxxxx..xxxxxxxxx
-xxxxxxxxx..xx!x.x.x!x.x.x.x.x.x.x.x.b...11........................??x..xxxxxxxxx
-xxxxxxxxx..x.x.x.x.x.x.x.x!x.x.x_x.x.b....c................Y..Z...??x..xxxxxxxxx
+xxxxxxxxx..xxxxxxxxxxxxxxxxxxxxxxx.a...1111.axaxxaaxaxxxxxxxxxxxxxxxx..xxxxxxxxx
+xxxxxxxxx..xx!x.x.x!x.x.x.x.x.x.x.x.a...11........................??x..xxxxxxxxx
+xxxxxxxxx..x.x.x.x.x.x.x.x!x.x.x_x.x.a....a................Y..Z...??x..xxxxxxxxx
 xxxxxxxxx..xx.x!x.x.x.x.x.x.x.x!x.x.x.....x..Y..Y..Y..Y..Y..Z..Y..Y.x..xxxxxxxxx
-xxxxxxxxx..x.x.x.x.x_x.x.x_x.x.x.x.x.x....c...Y..Y..Y..Z..Y..Y..Z...x..xxxxxxxxx
+xxxxxxxxx..x.x.x.x.x_x.x.x_x.x.x.x.x.x....a...Y..Y..Y..Z..Y..Y..Z...x..xxxxxxxxx
 xxxxxxxxx..xx.x.x.x.x.x.x.x.x.x.x.x_xx....x.Y..Y..Y..Y..Z..Y..Z..Y..x..xxxxxxxxx
 xxxxxxxxx..x.x.x!x.x.x.x.x.x.x!x.x.x.x....x..Y..Y..Z..Z..Y..Y..Y..Z.x..xxxxxxxxx
-xxxxxxxxx..xx.x_x.x.x!x.x.x.x.x.x.x.xx....x...Y..Z..Y..Y..Z..Y..Y...x..xxxxxxxxx
-xxxxxxxxx..x.x.x.x.x_x.x.x.x.x.x.x.x.x....c.Y..Y..Z..Z..Y..Y..Y..Z..x..xxxxxxxxx
-xxxxxxxxxooxx.x.x.x.x.x.x.x.x.x.x.x!xx....x..Z..Y..Y..Y..Z..Y..Y..Y.xssxxxxxxxxx
+xxxxxxxxx..xx.x_x.x.x!x.x.x.x.x.x.x.xx....a...Y..Z..Y..Y..Z..Y..Y...x..xxxxxxxxx
+xxxxxxxxx..x.x.x.x.x_x.x.x.x.x.x.x.x.x....a.Y..Y..Z..Z..Y..Y..Y..Z..x..xxxxxxxxx
+xxxxxxxxxttxx.x.x.x.x.x.x.x.x.x.x.x!xx....x..Z..Y..Y..Y..Z..Y..Y..Y.xssxxxxxxxxx
 xxxxxxxxx..x_x.x!x.x.x.x.x.x!x.x_x.x.x....x...Y..Y..Z..Y..Z..Z..Y...x..xxxxxxxxx
 xxxxxxxxx..xx.x.x.x.x.x.x.x.x.x.x.x.xx....x.Z..Z..Y..Y..Z..Y..Z..Z..x..xxxxxxxxx
 xxxxxxxxx..x.x.x_x.x.x.x.x.x.x.x.x_x.x....x..Y..Z..Y..Z..Z..Y..Z..Z.x..xxxxxxxxx
@@ -299,10 +290,10 @@ xxxxxxxxx..xx.x_x.x.x.x.x.x.x.x.x.x_xx....x....Z..Y..Z..Y..Z........x..xxxxxxxxx
 xxxxxxxxx..x.x!x.x.x.x.x.x.x!x.x.x.x.x....x..Z..Z..Y..Z....Z..??????x..xxxxxxxxx
 xxxxxxxxx..xx.x.x.x.x.x.x_x.x.x.x.x.xx....x...Z..Y..Z..Z...Z..??????x..xxxxxxxxx
 xxxxxxxxx..x.x.x.x.x.x_x.x.x.x.x.x.x.x....x??..Y..Z..Z..Z..Z..??????x..xxxxxxxxx
-xxxxxxxxx..xO.x.x_x.x.x!x.x.x.x.x!x_xx....x??.................?????Px..xxxxxxxxx
+xxxxxxxxx..xO.x.x_x.x.x!x.x.x.x.x!x_xx....x??.................?????Ox..xxxxxxxxx
 xxxxxxxxx//xxxxxxxxxxxxxxxxxxxxxxxxxxx....xxxxxxxxxxxxxxxxxxxxxxxxxxx//xxxxxxxxx
 xxxxxxxxx??/.............p.............................q............/??xxxxxxxxx
-xxxxxxxxx??/.............p.............................q............/??xxxxxxxxx
+xxxxxxxxxT?/.............p.............................q............/?Txxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx