Changed vaults (dploog).

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

1 files changed, 37 insertions, 66 deletions

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