General vault improvement (Eino):

* remove obsolete mention of padding ORIENT:east etc vaults in level_design.txt
* remove some of such paddings from vaults
* some other general cleanup of vault files
* slight changes to some vaults
* two new vaults (gargoyle_guard in float.des, rats_and_rats_again in mini.des)


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

1 files changed, 168 insertions, 187 deletions

diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des
index ee2b093303..fa7c920c31 100644
--- a/crawl-ref/source/dat/elf.des
+++ b/crawl-ref/source/dat/elf.des
@@ -1,6 +1,6 @@
 ##############################################################################
-# elf.des: Special maps for Elf:7, and (mini)vaults particular to the 
-#          Elven Halls.
+# elf.des: Special maps for Elf:7, arrival vaults for Elf:1, and (mini)vaults
+#          particular to the Elven Halls.
 ##############################################################################
 
 ##############################################################################
@@ -17,13 +17,13 @@
 # after the Mines until I realized the Halls are significantly harder. A
 # welcoming party on the other side will hopefully warn the player about this.
 #
-# Honor this intention. Lots of space between the monsters and the stairs, so
-# the players have many turns to realize their mistake. Note that designing
-# can be a challenge with the eight space LOS. What might make the player
-# realize it's better to flee: facing a nasty summon, taking a few hits from
-# conjurations.. they might engage melee opponents, at which point it's quite
-# difficult to flee. Please keep that in mind. Note also, that a corridor is
-# usually easier for the player than an open space.
+# Honor this intention. For instance, put lots of space between the monsters
+# and the stairs, so the players have many turns to realize their mistake.
+# Note that designing can be a challenge with the eight space LOS. What might
+# make the player realize it's better to flee: facing a nasty summon, taking
+# a few hits from conjurations.. they might engage melee opponents, at which
+# point it's quite difficult to flee. Please keep that in mind. Note also, 
+# that a corridor is usually easier for the player than an open space.
 #
 # This is an instance where an entry (arrival) vault really does benefit from
 # having monsters, even a nasty bunch. However, don't go overboard trying to
@@ -55,15 +55,15 @@ 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
-xxxxxxxxxxxxxxxxxxxxxxxxxdx
-xxxxxx...xxxxx..12..3.....@
-xxxxxx.{........m12..m.4..x
-xxxxxx...xxxxx..12..3.....@
-xxxxxxxxxxxxxxxxxxxxxxxxxhx
-                        fgf
-                        fff
+xxxxxxxxxxxxxxxxxxxaaa
+xxxxxxxxxxxxxxxxxxxasa
+xxxxxxxxxxxxxxxxxxxxdx
+x...xxxxx..12..3.....@
+x.{........m12..m.4..x
+x...xxxxx..12..3.....@
+xxxxxxxxxxxxxxxxxxxxhx
+xxxxxxxxxxxxxxxxxxxfgf
+xxxxxxxxxxxxxxxxxxxfff
 ENDMAP
 
 ##############################################################################
@@ -87,11 +87,6 @@ x.....G.....G.....x
 xx.1.....{.....1.xx
 xxxx...........xxxx
 xxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ##############################################################################
@@ -102,22 +97,17 @@ PLACE:   Elf:1
 MONS:    deep elf soldier / deep elf mage / deep elf conjurer w:2
 MONS:    deep elf summoner
 MAP
-xxxxxxxxxxxxxx
-xxxxxx.+.....x
-xxxxxx.x..x..x
-xxxxxx.m.xxx.x
-xxxxxx.x..x..x
-xxxxxx.m1..1.x
-xxxxxx.x.2x..x
-xxxxxx.m1xxx1x
-xxxxxx.x.1x1.x
-xxxxxx{m.1.2.+
-xxxxxxxxxxxxxx
-xxxxxxxxxxxxxx
-xxxxxxxxxxxxxx
-xxxxxxxxxxxxxx
-xxxxxxxxxxxxxx
-xxxxxxxxxxxxxx
+xxxxxxxxx
+x.+.....x
+x.x..x..x
+x.m.xxx.x
+x.x..x..x
+x.m1..1.x
+x.x.2x..x
+x.m1xxx1x
+x.x.1x1.x
+x{m.1.2.+
+xxxxxxxxx
 ENDMAP
 
 ##############################################################################
@@ -143,7 +133,7 @@ xxxx...........xxxx
 xxxxxxxx@@@xxxxxxxx
 ENDMAP
 
-########################################################################
+##############################################################################
 
 NAME:   eino_elf_arrival_pack_of_fighters_taking_a_sip
 PLACE:  Elf:1
@@ -163,11 +153,6 @@ x....[....x
 xx...{...xx
 xxx.....xxx
 xxxxxxxxxxx
-xxxxxxxxxxx
-xxxxxxxxxxx
-xxxxxxxxxxx
-xxxxxxxxxxx
-xxxxxxxxxxx
 ENDMAP
 
 ##############################################################################
@@ -192,16 +177,11 @@ xxx.....xxx
 xxx..{..xxx
 xxxx...xxxx
 xxxxxxxxxxx
-xxxxxxxxxxx
-xxxxxxxxxxx
-xxxxxxxxxxx
-xxxxxxxxxxx
-xxxxxxxxxxx
 ENDMAP
 
-###########################################################
+##############################################################################
 # A nice scenic altar
-#
+
 NAME:    eino_elf_arrival_altar
 ORIENT:  west
 PLACE:   Elf:1
@@ -211,98 +191,26 @@ MONS:    deep elf soldier, deep elf mage
 MONS:    deep elf priest
 MONS:    deep elf conjurer, deep elf summoner
 MAP
-xxxxxxxxxxxxxxxxxxxxxxxxxxxx@@@xxxx
-xxxxxxxxxxxxxxxxxx...xxxxxx.....xxx
-xxxxxxxxxxxxxxxx.22x...xx.........x
-xxxxxxxxxxxxxx...xxxxx.x..1.5.....x
-xxxxxx...xxxxx.xxxxxxx.m...3......x
-xxxxxx.[.......xxxxxx....1..GmG...@
-xxxxxx....xxxxxxxxxxx..m..C.mbm...@
-xxxxxx.{.......xxxxxx....23.GmG...@
-xxxxxx...xxxxx.xxxxxxx.m...4......x
-xxxxxxxxxxxxxx...xxxxx.x.2........x
-xxxxxxxxxxxxxxxx.11x...xx.........x
-xxxxxxxxxxxxxxxxxx...xxxxxx.....xxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxx@@@xxxx
-ENDMAP
-
-
-##############################################
-# Some orcs on a diplomatic mission (Shiori)
-# They have brought some gold from their mines as a gift
-NAME:    orc_legates
-DEPTH:   Elf:1-2
-SHUFFLE: AB , 34 , 12
-SUBST:   6=4
-SUBST:   0= 0 .:9 9:1
-SUBST:   5= 5 .:9 4:1
-NSUBST:  1= 2:1 / *:.
-NSUBST:  2= 2:2 / *:.
-KITEM:   A= any good_item race:elven
-KITEM:   B= any good_item race:elven
-KMONS:   A= patrolling deep elf knight
-KMONS:   B= patrolling deep elf high priest / patrolling deep elf demonologist
-MONS:    ice dragon, dragon
-MONS:    orc knight / orc sorcerer / orc high priest
-MONS:    orc warrior / orc wizard / orc priest
-MONS:    orc
-ITEM:    q:120 gold / q:60 gold / q:30 gold
-# being able to blink and become invisible, the deep elves do not need a
-# hidden exit in back of their audience chamber.
-MAP
-cccccxxccccc
-c111cGGc222c
-cnnncABcnnnc
-xG00B..A00Gx
-xG00A..B00Gx
-xx00x..x00xx
-xG00.dd.00Gx
-xG...34...Gx
-xx.5x66x5.xx
-xG.555555.Gx
-xG.555555.Gx
-xx++x++x++xx
-ENDMAP
-
-####################################################################
-# A high-level negotiation between orc and deep elf leaders (Shiori)
-NAME:     elf_orc_summit_meeting
-DEPTH:    Elf:6-7
-SHUFFLE: 12 , 45
-NSUBST:  7= 1=7 / *= 7:1 .
-NSUBST:  6= 1=6 D:1 / *= 6 .:1
-SUBST:   3 = 3 .:1
-# the deep elf delegation:
-MONS:    deep elf blademaster / deep elf master archer
-MONS:    deep elf annihilator / deep elf sorcerer / deep elf death mage
-MONS:    deep elf knight / w:1 deep elf high priest / w:1 deep elf demonologist
-# the orcish delegation:
-MONS:    orc warlord / iron troll / w:1 fire giant / w:1 frost giant / w:1 stone giant
-MONS:    orc sorcerer / orc high priest / w:5 ogre-mage
-MONS:    orc knight / rock troll / ettin / w:1 orc sorcerer / w:1 orc high priest
-# the arbiter(s):
-MONS:    great orb of eyes / sphinx
-# The orcs might have a unique with them. He or she will likely be outclassed
-# by the others in attendance, but perhaps has some special testimony to
-# present. None of the uniques really fits in with the deep elves...
-KMONS:   D = Ijyb / Blork the Orc / Urug / Erolcha / Snorg
-MAP
-     xxxx
-    xxGGxx
- xxxx3776xxxx
-.GxT33..66TxG.
-.xxx3x..x6xxx.
-@+3+331466+6+@
-@+3+332566+6+@
-.xxx3x..x.xxx.
-.GxT33..66TxG.
- xxxx3776xxxx
-    xxGGxx
-     xxxx
+xxxxxxxxxxxxxxxxxxxxxxx@@@xxxx
+xxxxxxxxxxxxx...xxxxxx.....xxx
+xxxxxxxxxxx.22x...xx.........x
+xxxxxxxxx...xxxxx.x..1.5.....x
+x...xxxxx.xxxxxxx.m...3......x
+x.[.......xxxxxx....1..GmG...@
+x....xxxxxxxxxxx..m..C.mbm...@
+x.{.......xxxxxx....23.GmG...@
+x...xxxxx.xxxxxxx.m...4......x
+xxxxxxxxx...xxxxx.x.2........x
+xxxxxxxxxxx.11x...xx.........x
+xxxxxxxxxxxxx...xxxxxx.....xxx
+xxxxxxxxxxxxxxxxxxxxxxx@@@xxxx
 ENDMAP
 
+##############################################################################
+# Elf:7 branch endings
+##############################################################################
 
-############################################################################
+##############################################################################
 # elf_hall
 #
 NAME:    elf_hall
@@ -315,7 +223,7 @@ MONS:    deep elf sorcerer, deep elf death mage
 MONS:    deep elf blademaster, deep elf master archer
 SUBST:   1=1., 2=2., 3=3., 4=4., 5=5.
 SHUFFLE: 23, 45
-KMONS:   $ = weight:450 nothing / deep elf sorcerer / deep elf annihilator 
+KMONS:   $ = weight:450 nothing / deep elf sorcerer / deep elf annihilator
 KMONS:   * = weight:300 nothing / deep elf annihilator / deep elf death mage
 KMONS:   | = weight:600 nothing / deep elf demonologist / deep elf death mage
 KFEAT:   $ = $
@@ -323,7 +231,7 @@ KFEAT:   * = *
 KFEAT:   | = |
 SUBST:   v = v .:2
 SUBST:   v : xvb
-SUBST:   | = | *:2 
+SUBST:   | = | *:2
 SUBST:   $ = $:20 *:4 |:1
 SUBST:   * = * |:3
 MARKER:  U = lua:feat_change_change_flags { \
@@ -331,46 +239,41 @@ MARKER:  U = lua:feat_change_change_flags { \
             group="fountain" \
          }
 MAP
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxcccccccccccccccccxxxxx
-xxxxxxxxxxxxxxxxxcc*|*|*|**|||||c$ccxxxx
-xxxxxxxxxxxxxxxxcc*$*|*|*|*|||||c$$ccxxx
-xxxxxxxxxxxxxxxcc*$|*$***$$|||||c|$$ccxx
-xxxxxxxxxxxxxxcc*$*|**ccccccccccc$$$$ccx
-xxxxxxxxxxxxxxc*|*$*$ccc..2..2..c+$|$$cx
-xxxxxxxxxxxxxxc$*$*ccc7........7.c$$$$cx
-xxxxxxxxxxxxxxc||**cc...5.5...4.4cc$|$cx
-xxxxxxxxxxxxxxc*$$cc..3.....3..ccccccccx
-xxxxxxxxxxxxxxc$+ccc.....2....cc.....5cx
-xxxxxxxxxxxxxxc$c....5.....5.cc....5..cx
-xxxxxxxxxxxxxxccc......5....cc..2....ccx
-xxxxxxxxxxxxxxxxc....5...2.cc.......ccxx
-xxxxxxxxxxxxxxxcc..1..U.....3.4..4..ccxx
-xxxxxxxxxxxxxxcc.....................ccx
-xxxxxxxxxxxxxxc..2........3........5..cx
-xxxxxxxxxxxxxxc.......2..2....3.......cx
-xxxxxxxxxxxxxxc..2................2..5cx
-xxxxxxxxxxxxxxc......v.........v..2...cx
-xxxxxxxxxxxxxxc..2..vv..1...1..vv.....cx
-xxxxxxxxxxxxxxc2..6vvv....1....vvv64.4cx
-xxxxxxxxxxxxxxc..vvvv...........vvvv..cx
-xxxxxxxxxxxxxxc.vvv.....cc.cc.....vvv.cx
-xxxxxxxxxxxxxxc.v.3...cccc.cccc.3...v.cx
-xxxxxxxxxxxxxxc.3...cccxxc.cxxccc.3.3.cx
-xxxxxxxxxxxxxxc...cccxxxxc.cxxxxccc...cx
-xxxxxxxxxxxxxxc.cccxxxxxxc.cxxxxxxccc.cx
-xxxxxxxxxxxxxxcccxxxxxxxxc.cxxxxxxxxcccx
-xxxxxxxxxxxxxxxxxxxxxxxxxx@xxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxcccccccccccccccccxxxxx
+xxxxxxxxxxxxcc*|*|*|**|||||c$ccxxxx
+xxxxxxxxxxxcc*$*|*|*|*|||||c$$ccxxx
+xxxxxxxxxxcc*$|*$***$$|||||c|$$ccxx
+xxxxxxxxxcc*$*|**ccccccccccc$$$$ccx
+xxxxxxxxxc*|*$*$ccc..2..2..c+$|$$cx
+xxxxxxxxxc$*$*ccc7........7.c$$$$cx
+xxxxxxxxxc||**cc...5.5...4.4cc$|$cx
+xxxxxxxxxc*$$cc..3.....3..ccccccccx
+xxxxxxxxxc$+ccc.....2....cc.....5cx
+xxxxxxxxxc$c....5.....5.cc....5..cx
+xxxxxxxxxccc......5....cc..2....ccx
+xxxxxxxxxxxc....5...2.cc.......ccxx
+xxxxxxxxxxcc..1..U.....3.4..4..ccxx
+xxxxxxxxxcc.....................ccx
+xxxxxxxxxc..2........3........5..cx
+xxxxxxxxxc.......2..2....3.......cx
+xxxxxxxxxc..2................2..5cx
+xxxxxxxxxc......v.........v..2...cx
+xxxxxxxxxc..2..vv..1...1..vv.....cx
+xxxxxxxxxc2..6vvv....1....vvv64.4cx
+xxxxxxxxxc..vvvv...........vvvv..cx
+xxxxxxxxxc.vvv.....cc.cc.....vvv.cx
+xxxxxxxxxc.v.3...cccc.cccc.3...v.cx
+xxxxxxxxxc.3...cccxxc.cxxccc.3.3.cx
+xxxxxxxxxc...cccxxxxc.cxxxxccc...cx
+xxxxxxxxxc.cccxxxxxxc.cxxxxxxccc.cx
+xxxxxxxxxcccxxxxxxxxc.cxxxxxxxxcccx
+xxxxxxxxxxxxxxxxxxxxx@xxxxxxxxxxxxx
 ENDMAP
 
 
-############################################################################
+##############################################################################
 ## alternative elf halls: gauntlets (David)
 
 NAME:    elf_hall_gauntlet_wide
@@ -384,13 +287,13 @@ MONS:    deep elf annihilator, deep elf sorcerer
 MONS:    deep elf death mage, deep elf blademaster
 SHUFFLE: 345
 SUBST:   4=4., 2=2., 5=5., 3=3.
-KMONS:   $ = weight:115 nothing / deep elf annihilator 
+KMONS:   $ = weight:115 nothing / deep elf annihilator
 KMONS:   * = weight:105 nothing / deep elf death mage
 KMONS:   | = weight:290 nothing / deep elf sorcerer
 KFEAT:   $ = $
 KFEAT:   * = *
 KFEAT:   | = |
-SUBST:   | = | *:2 
+SUBST:   | = | *:2
 SUBST:   * = * |:3
 KMONS:   A = deep elf master archer
 KFEAT:   A = |
@@ -426,7 +329,7 @@ ccccccccccccWWcccccccccccc
 xxxxxxxxxxxx@@xxxxxxxxxxxx
 ENDMAP
 
-#######################################
+##############################################################################
 
 NAME:    elf_hall_gauntlet_narrow
 PLACE:   Elf:7
@@ -439,13 +342,13 @@ MONS:    deep elf death mage, deep elf master archer
 MONS:    deep elf blademaster
 SHUFFLE: 345
 SUBST:   4=4., 2=2., 5=5., 3=3.
-SUBST:   l : lww 
+SUBST:   l : lww
 SHUFFLE: lww
 SHUFFLE: nN / yY / zZ
 SUBST:   N=@, n=., Y=c, y=c
 SHUFFLE: zZ / nN
 SUBST:   N=@, n=., Z=c, z=c
-KMONS:   $ = weight:115 nothing / deep elf annihilator 
+KMONS:   $ = weight:115 nothing / deep elf annihilator
 KMONS:   * = weight:105 nothing / deep elf death mage
 KMONS:   | = weight:290 nothing / deep elf sorcerer
 KFEAT:   $ = $
@@ -490,8 +393,86 @@ xxxxxxxxxxNncnNxxxxxxxxxx
 ENDMAP
 
 
-############################################################################
+##############################################################################
 # (Mini)vaults specific to the Elven Halls
-############################################################################
+##############################################################################
 
 default-depth: Elf:*
+
+##############################################################################
+# Some orcs on a diplomatic mission (Shiori)
+# They have brought some gold from their mines as a gift
+NAME:    orc_legates
+DEPTH:   Elf:1-2
+SHUFFLE: AB , 34 , 12
+SUBST:   6=4
+SUBST:   0= 0 .:9 9:1
+SUBST:   5= 5 .:9 4:1
+NSUBST:  1= 2:1 / *:.
+NSUBST:  2= 2:2 / *:.
+KITEM:   A= any good_item race:elven
+KITEM:   B= any good_item race:elven
+KMONS:   A= patrolling deep elf knight
+KMONS:   B= patrolling deep elf high priest / patrolling deep elf demonologist
+MONS:    ice dragon, dragon
+MONS:    orc knight / orc sorcerer / orc high priest
+MONS:    orc warrior / orc wizard / orc priest
+MONS:    orc
+ITEM:    q:120 gold / q:60 gold / q:30 gold
+# being able to blink and become invisible, the deep elves do not need a
+# hidden exit in back of their audience chamber.
+MAP
+cccccxxccccc
+c111cGGc222c
+cnnncABcnnnc
+xG00B..A00Gx
+xG00A..B00Gx
+xx00x..x00xx
+xG00.dd.00Gx
+xG...34...Gx
+xx.5x66x5.xx
+xG.555555.Gx
+xG.555555.Gx
+xx++x++x++xx
+ENDMAP
+
+##############################################################################
+# A high-level negotiation between orc and deep elf leaders (Shiori)
+NAME:     elf_orc_summit_meeting
+DEPTH:    Elf:6-7
+SHUFFLE: 12 , 45
+NSUBST:  7= 1=7 / *= 7:1 .
+NSUBST:  6= 1=6 D:1 / *= 6 .:1
+SUBST:   3 = 3 .:1
+# the deep elf delegation:
+MONS:    deep elf blademaster / deep elf master archer
+MONS:    deep elf annihilator / deep elf sorcerer / deep elf death mage
+MONS:    deep elf knight / w:1 deep elf high priest / \
+         w:1 deep elf demonologist
+# the orcish delegation:
+MONS:    orc warlord / iron troll / w:1 fire giant / w:1 frost giant / \
+         w:1 stone giant
+MONS:    orc sorcerer / orc high priest / w:5 ogre-mage
+MONS:    orc knight / rock troll / ettin / w:1 orc sorcerer / \
+         w:1 orc high priest
+# the arbiter(s):
+MONS:    great orb of eyes / sphinx
+# The orcs might have a unique with them. He or she will likely be outclassed
+# by the others in attendance, but perhaps has some special testimony to
+# present. None of the uniques really fits in with the deep elves...
+KMONS:   D = Ijyb / Blork the Orc / Urug / Erolcha / Snorg
+MAP
+     xxxx
+    xxGGxx
+ xxxx3776xxxx
+.GxT33..66TxG.
+.xxx3x..x6xxx.
+@+3+331466+6+@
+@+3+332566+6+@
+.xxx3x..x.xxx.
+.GxT33..66TxG.
+ xxxx3776xxxx
+    xxGGxx
+     xxxx
+ENDMAP
+