Adjusted depths for various vaults.

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

3 files changed, 121 insertions, 136 deletions

diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 1ab7a8fd9c..a005f98e84 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -12,7 +12,7 @@
 
 # Set the default depth for vaults. Be sure to adapt the DEPTH of particulary
 # easy or tough vaults. Also, exlucde unthemely branches with !Lair etc.
-default-depth: 12-26
+default-depth: D:12-26
 
 ##############################################################################
 # Dummy probability balancer vault for depths 1-11.
@@ -22,7 +22,7 @@ default-depth: 12-26
 # we use this dummy vault.
 #
 NAME: dummy_balancer
-DEPTH: 1-11
+DEPTH: D:1-11
 # Vaults tagged "dummy" are no-ops when the dungeon builder is looking for maps
 # by depth.
 TAGS: dummy
@@ -38,7 +38,7 @@ ENDMAP
 NAME: erik_1
 ORIENT: float
 TAGS: no_monster_gen
-DEPTH: 7-11
+DEPTH: D:7-11, Lair
 #
 SHUFFLE: rR/sS/uU/vV/wW/yY/zZ, uU/nN
 SUBST: r=n, R=N, s=n, S=N
@@ -79,7 +79,7 @@ ENDMAP
 # Moved deeper and minor changes.
 #
 NAME: erik_ogre
-DEPTH: 6-10
+DEPTH: D:6-10
 ORIENT: float
 SHUFFLE: 1X / 1X / 2l / 3Y
 SUBST: X=x, Y:x.
@@ -117,7 +117,7 @@ ENDMAP
 # but since they are normal speed with no range attacks, they can be escaped
 #
 NAME: slime_lemuel
-DEPTH: 6-16, Lair
+DEPTH: D:6-16, Lair
 ORIENT: float
 MONS: w:20 ooze/jelly/fungus, slime creature/giant amoeba/oklob plant
 MAP
@@ -165,7 +165,7 @@ ENDMAP
 #
 NAME: MiniTomb
 ORIENT: float
-DEPTH: 20-26
+DEPTH: D:15-26
 MONS: large zombie / nothing, mummy, guardian mummy, greater mummy, large zombie
 MONS: mummy / nothing
 SHUFFLE: 2F, cbv
@@ -191,7 +191,7 @@ ENDMAP
 NAME:   insect_pit
 FLAGS:  no_rotate
 ORIENT: float
-DEPTH:  5-12
+DEPTH:  D:5-12, Elf
 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
@@ -216,7 +216,7 @@ ENDMAP
 # possibility to script the trolls guard the bridge would be great here -evk
 #
 NAME: troll_bridge
-DEPTH: 7-15
+DEPTH: D:7-15
 ORIENT: float
 TAGS: no_pool_fixup
 MONS: troll w:50 / rock troll / iron troll w:5
@@ -273,7 +273,7 @@ ENDMAP
 # Oklob gauntlet
 #
 NAME:    oklob_2
-DEPTH:   18-27
+DEPTH:   D:18-27, Lair, Elf
 MONS:    plant, oklob plant
 ORIENT:  float
 SHUFFLE: ]})yY / defzZ
@@ -297,7 +297,7 @@ ENDMAP
 # Oklob shooting range
 #
 NAME:    oklob_3
-DEPTH:   21-27
+DEPTH:   D:21-27, Lair, Elf
 ORIENT:  float
 SHUFFLE: ab" / AB'
 SUBST:   a=[, b=(, A=., B=., "=., ':>', '=>.
@@ -342,7 +342,7 @@ KMONS: E = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito
 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: 16-20, Lair: 3-10, Swamp, Snake, Slime
+DEPTH: D:16-20, Lair:3-10, Swamp, Snake, Slime
 MAP
 xxxxxxxxxxxxxxxxx@xxxxxxxxxxxxxxx
 xxxxxxGGGxxxxxxGEDEExxxxGGxxxxxxx
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index 7117b9d70c..c72d2f79b9 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -14,7 +14,7 @@ default-depth: D:12-26
 #
 NAME: RatsNest
 ORIENT: northeast
-DEPTH: 5-9
+DEPTH: D:5-9, Lair
 SHUFFLE: 23, 34
 MONS: rat / nothing, grey rat / nothing
 MONS: green rat / nothing, orange rat / w:40 rat
@@ -52,7 +52,7 @@ ENDMAP
 #hidden cave vault, possibly with statue
 NAME: statuecave_lemuel
 ORIENT: northeast
-DEPTH: 7-27, Lair, Crypt
+DEPTH: D:7-27, Lair, Crypt
 MONS: ice statue/orange crystal statue
 SHUFFLE: 1|/!*
 SUBST: *:*$, ?:x., !:., ?=w.
@@ -86,7 +86,7 @@ ENDMAP
 #
 NAME: dragon1_lemuel
 ORIENT: northeast
-DEPTH: 9-20, Lair
+DEPTH: D:9-20, Lair
 MONS: dragon, ice dragon
 SUBST: ! : ?x
 SHUFFLE: 1?/2W
@@ -192,7 +192,7 @@ ENDMAP
 #
 NAME:    River_Lethe
 ORIENT:  encompass
-DEPTH:   16-27
+DEPTH:   D:16-27
 SUBST:   + = +=
 SUBST:   . = .:100 !:1 6:4
 SUBST:   ; = .:200 !:1 1:3
@@ -796,7 +796,7 @@ ENDMAP
 NAME: mludivico_vault
 ORIENT: southwest
 # The hell hounds can be deadly at lower levels.
-DEPTH: 18-27
+DEPTH: D:18-27
 MONS: hell hound, necromancer, wizard, orange demon, rotting devil
 MONS: hell knight, great orb of eyes
 MAP
@@ -840,7 +840,7 @@ ENDMAP
 #
 NAME: farm_and_country
 ORIENT: encompass
-DEPTH: 16-27
+DEPTH: D:16-27
 MONS: death yak, plant, griffon, killer bee, ogre, oklob plant
 MONS: wandering mushroom
 MAP
@@ -1044,7 +1044,7 @@ ENDMAP
 # Rubicon
 #
 NAME:    erik_rubicon_a
-DEPTH:   10-16
+DEPTH:   D:10-16
 ORIENT:  south
 FLAGS:   no_rotate
 TAGS:    no_pool_fixup
@@ -1080,7 +1080,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    erik_rubicon_b
-DEPTH:   10-16
+DEPTH:   D:10-16
 ORIENT:  south
 FLAGS:   no_rotate
 CHANCE:  4
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index dafc3a63ad..82d2b20fbc 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -38,7 +38,7 @@ default-depth: D:8-27
 ##############################################################################
 # Minivault balancer
 NAME: mini_dummy
-DEPTH: 1-7
+DEPTH: D:1-7
 TAGS: dummy
 CHANCE: 100
 MAP
@@ -49,7 +49,7 @@ ENDMAP
 # pond with fungi
 #
 NAME: fungi_pond__lemuel
-DEPTH:  8-20, Lair, Orc
+DEPTH:  D:8-20, Lair, Orc
 MONS: fungus, wandering mushroom
 SUBST: 1 = . 1 2:4
 SUBST: ? : w..
@@ -101,7 +101,7 @@ ENDMAP
 NAME: centaur_isle
 TAGS: no_monster_gen no_pool_fixup
 SUBST: ? = *$
-DEPTH: 6-12
+DEPTH: D:6-12
 MONS: centaur
 MAP
 ..........wwww.........
@@ -159,7 +159,7 @@ ENDMAP
 # Oklob assault
 #
 NAME:    oklob_1
-DEPTH:   16-27
+DEPTH:   D:16-27, Lair:4-
 MONS:    plant, oklob plant
 SUBST:   ? = 1 2:5 '
 SHUFFLE: '"
@@ -182,9 +182,10 @@ ENDMAP
 # Treasure trove with Zot trap
 #
 NAME: zot_lemuel
-DEPTH: 1-27, Lair, Snake, Crypt
+DEPTH: 10-27
 KFEAT: ? = zot trap
 SUBST: *: *$
+CHANCE: 3
 MAP
 ............
 .xxxxxxxxxx.
@@ -285,23 +286,21 @@ NAME: water_maze_lemuel
 TAGS: no_pool_fixup
 DEPTH: 5-27
 MAP
-.................
-....wwwwwwwww....
-...wwcccccccww...
-..wwccwwwwwccww..
-.wwccwwcccwwccww.
-.wccwwccwccwwccw.
-.wcwwccwwwccwwcw.
-.wcwcc*wcwwccwcw.
-.wcwc***ccwwcwcw.
-.wcwcc*ccwwccwcw.
-.wcwwcccwwccwwcw.
-.wccwwccwccwwccw.
-.wwccwwcwcwwccww.
-..wwccwwwcwccww..
-...wwcccccwcww...
-....wwwwwwwww....
-.................
+   wwwwwwwww
+  wwcccccccww
+ wwccwwwwwccww
+wwccwwcccwwccww
+wccwwccwccwwccw
+wcwwccwwwccwwcw
+wcwcc*wcwwccwcw
+wcwc***ccwwcwcw
+wcwcc*ccwwccwcw
+wcwwcccwwccwwcw
+wccwwccwccwwccw
+wwccwwcwcwwccww
+ wwccwwwcwccww
+  wwcccccwcww
+   wwwwwwwww
 ENDMAP
 
 NAME: water_boxes_lemuel
@@ -313,20 +312,18 @@ SUBST: e = =, f = x, g = x, h = x
 SUBST: i = =, j = x, k = x, l = x
 SUBST: m = =, n = x, o = x, p = x
 MAP
-..............
-.wwwwwwwwwwww.
-.wwwwwwwwwwww.
-.wwxaxwwxexww.
-.wwb*cwwf*gww.
-.wwxdxwwxhxww.
-.wwwwwwwwwwww.
-.wwwwwwwwwwww.
-.wwxixwwxmxww.
-.wwj*kwwn*oww.
-.wwxlxwwxpxww.
-.wwwwwwwwwwww.
-.wwwwwwwwwwww.
-..............
+  wwwwwwww
+ wwwwwwwwww
+wwxaxwwxexww
+wwb*cwwf*gww
+wwxdxwwxhxww
+wwwwwwwwwwww
+wwwwwwwwwwww
+wwxixwwxmxww
+wwj*kwwn*oww
+wwxlxwwxpxww
+ wwwwwwwwww
+  wwwwwwww
 ENDMAP
 
 ###############################################
@@ -339,30 +336,28 @@ TAGS: no_monster_gen
 SUBST: .:..w
 SUBST: 1 = 1 w:3, 2= 2 w:3, 3 = 3 w:3, 4 = 4 |:3
 MAP
-....................
-.....bbbbbbbbbb.....
-...bbb11211211bbb...
-..bb.12bbbbbb21.bb..
-.bb..bbb2323bbb..bb.
-.b..bb...bb...bb.1b.
-.b.bb..bbbbbb..bb.b.
-.b.b..bb2323bb..b1b.
-.b.b.bb23bb23bb.b.b.
-.b.b.b..bbbb..b.b1b.
-.b.b.b.bb44bb.b.b.b.
-.b2b2b3b4444b3b2b2b.
-.b.b.b.b4444b.b.b.b.
-.b.b.b.bb44bb.b.b1b.
-.b.b.b2323bb..b.b.b.
-.b.b.bbbbbb..bb.b1b.
-.b.b..bbb...bb..b.b.
-.b.bb..bb.bbb..bb1b.
-.b..bb....b...bb..b.
-.bb..bbbbbb.bbb..bb.
-..bb.12bbbb2b111bb..
-...bbb123321b.bbb...
-.....bbbbbbbb.b.....
-....................
+    bbbbbbbbbb
+  bbb11211211bbb
+ bb.12bbbbbb21.bb
+bb..bbb2323bbb..bb
+b..bb...bb...bb.1b
+b.bb..bbbbbb..bb.b
+b.b..bb2323bb..b1b
+b.b.bb23bb23bb.b.b
+b.b.b..bbbb..b.b1b
+b.b.b.bb44bb.b.b.b
+b2b2b3b4444b3b2b2b
+b.b.b.b4444b.b.b.b
+b.b.b.bb44bb.b.b1b
+b.b.b2323bb..b.b.b
+b.b.bbbbbb..bb.b1b
+b.b..bbb...bb..b.b
+b.bb..bb.bbb..bb1b
+b..bb....b...bb..b
+bb..bbbbbb.bbb..bb
+ bb.12bbbb2b111bb
+  bbb123321b.bbb
+    bbbbbbbb@b
 ENDMAP
 
 ##############################################################################
@@ -374,20 +369,18 @@ ITEM: nothing / any good_item
 MONS: silver statue / orange crystal statue / ice statue
 SHUFFLE: d|
 MAP
-...........
-.xxxxxxxxx.
-.xbbbbbbbx.
-.xb1...1bx.
-.xb.....bx.
-.xb.....bx.
-.xbb.|.bbx.
-.xxb.d.bxx.
-.xxb...bxx.
-.xxb...bxx.
-.xxb.*.bxx.
-.xxb...bxx.
-.xxx@I@xxx.
-...........
+xxxxxxxxx
+xbbbbbbbx
+xb1...1bx
+xb.....bx
+xb.....bx
+xbb.|.bbx
+xxb.d.bxx
+xxb...bxx
+xxb...bxx
+xxb.*.bxx
+xxb...bxx
+xxx@I@xxx
 ENDMAP
 
 ##############################################################################
@@ -399,13 +392,11 @@ SHUFFLE: 1ID/2TC
 MONS:    orc priest, deep elf priest / w:30 nothing
 KFEAT:   D = altar of Beogh / w:2 altar of Okawaru / w:2 altar of Makhleb
 MAP
-.........
-.ccccc...
-.c1..c...
-.c1D.+.I.
-.c1..c...
-.ccccc...
-.........
+ccccc...
+c1..c...
+c1D.+.I@
+c1..c...
+ccccc...
 ENDMAP
 
 ##############################################################################
@@ -449,18 +440,16 @@ NAME: minitemple
 # More common than the others.
 CHANCE: 20
 MAP
-............
-.cccccccccc.
-.cccccccccc.
-.cBcBcBcBcc.
-.G.c.c.c.Bc.
-.........Bc.
-.........Bc.
-.G.c.c.c.Bc.
-.cBcBcBcBcc.
-.cccccccccc.
-.cccccccccc.
-............
+cccccccccc
+cccccccccc
+cBcBcBcBcc
+G.c.c.c.Bc
+@.......Bc
+@.......Bc
+G.c.c.c.Bc
+cBcBcBcBcc
+cccccccccc
+cccccccccc
 ENDMAP
 
 ###################################
@@ -1091,22 +1080,20 @@ ENDMAP
 #
 NAME: columns_hall
 MAP
-.............................
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-.............................
+@...........................@
 ..x..x..x..x..x..x..x..x..x..
-.............................
+@...........................@
 ..x..x..x..x..x..x..x..x..x..
-.............................
+@...........................@
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-.............................
 ENDMAP
 
 ##############################################################################
 # Wet chambers - two mutually exclusive versions (Onia Ninara)
 #
 NAME:    onia_ninara_007_chamber_of_wet_secrets
-DEPTH:   8-13
+DEPTH:   D:8-13
 TAGS:    no_monster_gen no_pool_fixup
 MONS:    centaur, brown snake, electrical eel
 ITEM:    bread ration/meat ration/royal jelly/potion of porridge, good_item cloak/any book
@@ -1137,7 +1124,7 @@ MAP
 ENDMAP
 
 NAME:    onia_ninara_008_deeper_chamber_of_wet_secrets
-DEPTH:   20-26
+DEPTH:   D:20-26
 TAGS:    no_monster_gen no_pool_fixup
 MONS:    yaktaur captain, grey snake, storm dragon
 ITEM:    potion of cure mutation/potion of gain dexterity/potion of gain strength
@@ -1250,14 +1237,13 @@ ENDMAP
 #
 NAME: library
 DEPTH: 1-27
+TAGS: mini_float
 ITEM: any book w:20/any scroll/nothing
 MAP
-......
-.x=xx.
-.xddx.
-.xddx.
-.xxxx.
-......
+x=xx
+xddx
+xddx
+xxxx
 ENDMAP
 
 #############################################################################
@@ -1265,6 +1251,7 @@ ENDMAP
 # put the rest of the doghouses in float.des, combined CHANCE of all of them is 10
 
 NAME:    doghouse_v1
+TAGS:    mini_float
 DEPTH:   4-8
 SHUFFLE: 1?T
 SUBST:   T : T V:2
@@ -1272,15 +1259,13 @@ SUBST:   ? : 1:2 .
 MONS:    hound / w:1 nothing / w:2 jackal
 CHANCE:  2
 MAP
-.........
-.xxx+xxx.
-.xxx+xxx.
-.xx...xx.
-.xx?..xx.
-.xx1.Txx.
-.xxxxxxx.
-.xxxxxxx.
-.........
+xxx+xxx
+xxx+xxx
+xx...xx
+xx?..xx
+xx1.Txx
+xxxxxxx
+xxxxxxx
 ENDMAP
 
 #############################################################################
@@ -1352,7 +1337,7 @@ ENDMAP
 # Small room with statues (Eino)
 
 NAME:    small_statue_room
-DEPTH:   2-26
+DEPTH:   D:2-26
 FLAGS:   no_hmirror no_vmirror
 MAP
 xxx.xxx
@@ -1360,4 +1345,4 @@ xG...Gx
 .......
 xG...Gx
 xxx.xxx
-ENDMAP
\ No newline at end of file
+ENDMAP