Updated vaults (thanks Eino!)

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

3 files changed, 146 insertions, 194 deletions

diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des
index 525eb88cbe..f4ed1ec711 100644
--- a/crawl-ref/source/dat/elf.des
+++ b/crawl-ref/source/dat/elf.des
@@ -44,36 +44,35 @@ MAP
 ENDMAP
 
 ##############################################################################
-# Elf arrival vault: corridor one (with the hidden toll cashbox)
 
-NAME:    eino_elf_arrival_corridor
+NAME:    elf_arrival_001
 PLACE:   Elf:1
-ORIENT:  float
-SHUFFLE: asd/v$=
-SHUFFLE: fgh/v$=
-SUBST:   a = v, s = v, d = v, f = v, g = v, h = v
-MONS:    deep elf soldier, deep elf mage, deep elf conjurer / deep elf priest / deep elf fighter
+ORIENT:  west
+SHUFFLE: asd/x$=
+SHUFFLE: fgh/x$=
+SUBST:   a = x, s = x, d = x, f = x, g = x, h = x
+MONS:    deep elf soldier
+MONS:    deep elf mage, deep elf conjurer / deep elf priest / deep elf fighter
 MONS:    deep elf summoner / deep elf knight w:2
 MAP
-                  aaa
-                  asa
-vvvvvvvvvvvvvvvvvvvvdv
-v...vvvvv..12..3.....@
-v.{........v12..v.4..v
-v...vvvvv..12..3.....@
-vvvvvvvvvvvvvvvvvvvvhv
-                  fgf
-                  fff
+                        aaa
+                        asa
+xxxxxxxxxxxxxxxxxxxxxxxxxdx
+xxxxxx...xxxxx..12..3.....@
+xxxxxx.{........m12..m.4..x
+xxxxxx...xxxxx..12..3.....@
+xxxxxxxxxxxxxxxxxxxxxxxxxhx
+                        fgf
+                        fff
 ENDMAP
 
 ##############################################################################
-# Elf arrival vault: open area
 
-NAME:    eino_elf_arrival_open_area
+NAME:    elf_arrival_002
 PLACE:   Elf:1
-ORIENT:  float
-FLAGS:   no_rotate
-MONS:    deep elf soldier, deep elf mage, deep elf conjurer / deep elf priest / deep elf fighter
+ORIENT:  south
+MONS:    deep elf soldier, deep elf mage
+MONS:    deep elf conjurer / deep elf priest / deep elf fighter
 MONS:    deep elf summoner / deep elf knight w:2
 MAP
 xxxxx@xxx@xxx@xxxxx
@@ -83,11 +82,16 @@ x...1.........1...x
 x.G...2..4..2...G.x
 x.................x
 x.......G.G.......x
-x.................x
+x........[........x
 x.....G.....G.....x
 xx.1.....{.....1.xx
 xxxx...........xxxx
 xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ##############################################################################
@@ -121,7 +125,8 @@ ENDMAP
 NAME:    eino_elf_arrival_shootout
 PLACE:   Elf:1
 ORIENT:  float
-MONS:    deep elf soldier / deep elf mage, deep elf conjurer / deep elf priest / w:2 deep elf summoner
+MONS:    deep elf soldier / deep elf mage
+MONS:    deep elf conjurer / deep elf priest / w:2 deep elf summoner
 MAP
 xxxxxxxx@@@xxxxxxxx
 xxxx...........xxxx
@@ -140,12 +145,12 @@ ENDMAP
 
 ########################################################################
 
-NAME: eino_elf_arrival_pack_of_fighters_taking_a_sip
-PLACE: Elf:1
+NAME:   eino_elf_arrival_pack_of_fighters_taking_a_sip
+PLACE:  Elf:1
 ORIENT: south
-TAGS: no_monster_gen
-KMONS: Z = deep elf fighter / deep elf soldier w:5
-KFEAT: Z = W
+TAGS:   no_monster_gen
+KMONS:  Z = deep elf fighter / deep elf soldier w:5
+KFEAT:  Z = W
 MAP
  .........
 x..WWWWW..x
@@ -167,12 +172,12 @@ ENDMAP
 
 ##############################################################################
 
-NAME: eino_elf_arrival_the_gate
-PLACE: Elf:1
+NAME:   eino_elf_arrival_the_gate
+PLACE:  Elf:1
 ORIENT: south
-MONS: deep elf soldier / deep elf mage
-MONS: deep elf conjurer / deep elf priest / deep elf fighter
-MONS: deep elf summoner / deep elf priest
+MONS:   deep elf soldier / deep elf mage
+MONS:   deep elf conjurer / deep elf priest / deep elf fighter
+MONS:   deep elf summoner / deep elf priest
 MAP
 x.........x
 @.........@
@@ -221,78 +226,6 @@ xxxxxxxxxxxxxxxxxx...xxxxxx.....xxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxx@@@xxxx
 ENDMAP
 
-###########################################################
-
-NAME:   eino_elf_entry_druids_welcome
-TAGS:   entry no_monster_gen
-ORIENT: float
-MONS:   plant
-MAP
-x1......@......1x
-xw1...........1wx
-xww1.........1wwx
-xwww1...[...1wwwx
-xwwww1.....1wwwwx
-xwwwww1.{.1wwwwwx
-xwwww1.....1wwwwx
-xwww1...(...1wwwx
-xww1.........1wwx
-xw1...........1wx
-x1......@......1x
-ENDMAP
-
-###########################################################
-
-NAME:   eino_elf_entry_tree_alley
-TAGS:   entry no_monster_gen
-ORIENT: float
-MONS:   plant
-MAP
-xxxxxxxxxxxxxxxxxxx
-.11111111111111111.
-@.....[.{.(.......@
-.11111111111111111.
-xxxxxxxxxxxxxxxxxxx
-ENDMAP
-
-###########################################################
-
-NAME:   eino_elf_entry_water_cross
-TAGS:   entry no_monster_gen
-ORIENT: float
-MONS:   plant
-MAP
-...................
-..1xWx1..[..1xWx1..
-.1xxWxx1...1xxWxx1.
-..WWWWW..{..WWWWW..
-.1xxWxx1...1xxWxx1.
-..1xWx1..(..1xWx1..
-...................
-ENDMAP
-
-###########################################################
-
-NAME:   eino_elf_entry_water_star
-TAGS:   entry no_monster_gen no_rotate
-ORIENT: float
-MAP
-..xxxxxxx@xxxxxxx..
-....xxxx...xxxx....
-x.....x..W..x.....x
-xG..W....W....W..Gx
-xx...W..WWW..W...xx
-x.....WWWWWWW.....x
-....WWWW...WWWW....
-..WWWWW.({[.WWWWW..
-....WWWW...WWWW....
-x.....WWWWWWW.....x
-xx...W..WWW..W...xx
-xG..W....W....W..Gx
-x.....x..W..x.....x
-....xxxx...xxxx....
-..xxxxxxx@xxxxxxx..
-ENDMAP
 
 
 ############################################################################
diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index b36dd0e60c..13582748a6 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -4305,6 +4305,79 @@ xxxxxxxxxxxxxxG.Gxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
+###########################################################
+
+NAME:   eino_entry_druids_welcome
+TAGS:   entry no_monster_gen
+ORIENT: float
+MONS:   plant
+MAP
+x1......@......1x
+xw1...........1wx
+xww1.........1wwx
+xwww1...[...1wwwx
+xwwww1.....1wwwwx
+xwwwww1.{.1wwwwwx
+xwwww1.....1wwwwx
+xwww1...(...1wwwx
+xww1.........1wwx
+xw1...........1wx
+x1......@......1x
+ENDMAP
+
+###########################################################
+
+NAME:   eino_entry_tree_alley
+TAGS:   entry no_monster_gen
+ORIENT: float
+MONS:   plant
+MAP
+xxxxxxxxxxxxxxxxxxx
+.11111111111111111.
+@.....[.{.(.......@
+.11111111111111111.
+xxxxxxxxxxxxxxxxxxx
+ENDMAP
+
+###########################################################
+
+NAME:   eino_entry_water_cross
+TAGS:   entry no_monster_gen
+ORIENT: float
+MONS:   plant
+MAP
+...................
+..1xWx1..[..1xWx1..
+.1xxWxx1...1xxWxx1.
+..WWWWW..{..WWWWW..
+.1xxWxx1...1xxWxx1.
+..1xWx1..(..1xWx1..
+...................
+ENDMAP
+
+###########################################################
+
+NAME:   eino_entry_water_star
+TAGS:   entry no_monster_gen no_rotate
+ORIENT: float
+MAP
+..xxxxxxx@xxxxxxx..
+....xxxx...xxxx....
+x.....x..W..x.....x
+xG..W....W....W..Gx
+xx...W..WWW..W...xx
+x.....WWWWWWW.....x
+....WWWW...WWWW....
+..WWWWW.({[.WWWWW..
+....WWWW...WWWW....
+x.....WWWWWWW.....x
+xx...W..WWW..W...xx
+xG..W....W....W..Gx
+x.....x..W..x.....x
+....xxxx...xxxx....
+..xxxxxxx@xxxxxxx..
+ENDMAP
+
 ##############################################################
 # Miscellaneous entries
 ##############################################################
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index b213e54798..1b73325b87 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -206,9 +206,9 @@ MAP
 ENDMAP
 
 ########################################################################
-# Small gnoll camp 1 
+# Small gnoll camp 1
 #
-NAME:  eino_small__gnoll_camp_1
+NAME:  eino_small_gnoll_camp_1
 DEPTH: D:3-10
 TAGS:  uniq_gnoll_camp
 MONS:  gnoll
@@ -229,7 +229,6 @@ ENDMAP
 # Small gnoll camp 2
 #
 NAME:  eino_small_gnoll_camp_2
-PLACE: D:2
 DEPTH: D:3-10
 TAGS:  uniq_gnoll_camp
 MONS:  gnoll
@@ -358,6 +357,7 @@ ENDMAP
 
 ###################################
 #don't you wish you knew apportation?
+#
 NAME: baited_tele_trap
 DEPTH: !Temple
 KITEM: x = any good_item, any good_item/nothing, any good_item/nothing
@@ -1179,7 +1179,7 @@ ENDMAP
 #
 # Intentionally moved this deeper because explore will gladly run into the
 # room, and being hit by multiple mimics is un-fun.
-# Slight tweak by having a fraction (unknown to the player) of items be 
+# Slight tweak by having a fraction (unknown to the player) of items be
 # real. (dp)
 #
 NAME:  fake_naga_vault
@@ -1439,89 +1439,35 @@ ENDMAP
 #############################################################################
 # Doghouse (Eino)
 
-NAME:    doghouse_v1
+NAME:    doghouse
 DEPTH:   4-8
 SHUFFLE: 1?T
 SUBST:   T : T V:2
 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.
-.........
-ENDMAP
-
-NAME:    doghouse_v2
-TAGS:    mini_float
-DEPTH:   4-8
-SHUFFLE: ?1T
-SUBST:   T : T V:2
-SUBST:   ? : 1:2 .
-MONS:    hound / w:1 nothing / w:2 jackal
-CHANCE:  3
-MAP
-xx+xx
-xx+xx
-x...x
-x?1Tx
-x...x
-xx+xx
-xx+xx
-ENDMAP
-
-NAME:    doghouse_v3
-TAGS:    mini_float
-DEPTH:   4-8
-SHUFFLE: ?1T
-SUBST:   T : T V:2
-SUBST:   ? : 1:2 .
-MONS:    hound / w:1 nothing / w:2 jackal
-CHANCE:  3
 MAP
-xxx+xx
-xxx+xx
-xx...x
-++..?x
-xx.T1x
-xxxxxx
+.......
+.xx+xx.
+.x...x.
+.x?..x.
+.x1.Tx.
+.xxxxx.
+.......
 ENDMAP
 
-NAME:    doghouse_v4
-TAGS:    mini_float
-DEPTH:   4-8
-SHUFFLE: ?1T
-SUBST:   T : T V:2
-SUBST:   ? : 1:2 .
-MONS:    hound / w:1 nothing / w:2 jackal
-CHANCE:  2
-MAP
-xxx+xxx
-xxx+xxx
-xx...xx
-++.T.++
-xx?1?xx
-xxxxxxx
-ENDMAP
 
 #############################################################################
-# Small room with statues (Eino)
+# Small intersection with statues (Eino)
 
-NAME:    small_statue_room
-DEPTH:   D:2-26
+NAME:    small_statue_intersection
+DEPTH:   D:2-26, Elf, Crypt
 TAGS:    mini_float allow_dup no_hmirror no_vmirror
 MAP
-xxx.xxx
-xG...Gx
-.......
-xG...Gx
-xxx.xxx
+xx.xx
+xG.Gx
+.....
+xG.Gx
+xx.xx
 ENDMAP
 
 #############################################################################
@@ -1532,26 +1478,26 @@ NAME:   small_chamber_a
 TAGS:   mini_float allow_dup
 DEPTH:  D:4-27
 MAP
- xxxxxxx
-xx.....xx
-x...*...x
-x.......x
-xx.....xx
- x.....x
+ xxxxx
+xx...xx
+x..*..x
+x.....x
+xx...xx
+ x...x
 ENDMAP
 
 NAME:   small_chamber_b
-TAGS:   mini_float allow_dup
+TAGS:   mini_float
 DEPTH:  D:8-27, Elf, Vault, Crypt
 MAP
-xxxxxxxxx
-xxG...Gxx
-x...|...x
-x...9...x
-xx.....xx
-xxT...Txx
-xx.....xx
-xxT...Txx
+xxxxxxx
+xxG.Gxx
+x..|..x
+x..9..x
+xx...xx
+xxT.Txx
+xx...xx
+xxT.Txx
 ENDMAP
 
 NAME:   tiny_chamber_a