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, 104 insertions, 124 deletions

diff --git a/crawl-ref/source/dat/pan.des b/crawl-ref/source/dat/pan.des
index e4fcd162af..e1554d3f9b 100644
--- a/crawl-ref/source/dat/pan.des
+++ b/crawl-ref/source/dat/pan.des
@@ -12,7 +12,7 @@
 # You can define alternate levels for a Pandemonium lord by using the same
 # TAGS: and a different NAME:
 ##############################################################################
- 
+
 ###########################################################################
 # mnoleg.
 #
@@ -23,42 +23,37 @@ FLOORCOL: yellow
 ROCKCOL:  red
 MONS:     patrolling Mnoleg, neqoxec
 MAP
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-x.................2............xxxxxxxxx
-x.....2........................xxxxxxxxx
-x..cccccccc...ccccccc..ccccccc.xxxxxxxxx
-x..ccccccccc.2.ccccccc..cccccc.xxxxxxxxx
-x..cccccccccc...ccccccc..ccccc.xxxxxxxxx
-x..ccccccccccc.1.ccccccc..cccc.xxxxxxxxx
-x2.cccccccccc.2..Occccccc2.ccc.xxxxxxxxx
-x..ccccccccc.....ccccccccc..cc.xxxxxxxxx
-x..cccccccc...c...ccccccccc..c.xxxxxxxxx
-x..ccccccc...ccc...ccccccccc...xxxxxxxxx
-x..cccccc...ccccc...ccccccccc..xxxxxxxxx
-x..ccccc...ccccccc...ccccccccc.xxxxxxxxx
-x..cccc...ccccccccc...ccccccc..xxxxxxxxx
-x..ccc.2.ccccccccccc.2.ccccc...xxxxxxxxx
-x..cc.....ccccccccccc...ccc....xxxxxxxxx
-x..c...c...ccccccccccc...c.2...xxxxxxxxx
-x.....ccc.2.ccccccccccc......c.xxxxxxxxx
-x....ccccc...ccccccccccc....cc.xxxxxxxxx
-x.2.ccccccc...ccccccccccc..ccc.xxxxxxxxx
-x.................2.......cccc.xxxxxxxxx
-x...c..ccccccc.ccccccc...ccccc.xxxxxxxxx
-x..ccc......2c.c2cccc...cccccc.xxxxxxxxx
-x.ccccc..ccc.c.c2ccc.2.ccccccc.xxxxxxxxx
-x.cccccc..cc.c.c.cc...cccccccc.xxxxxxxxx
-x.ccccccc..c.c.c.c...ccccccccc.xxxxxxxxx
-x.cccccccc...c.c....cccccccccc.xxxxxxxxx
-x.ccccccccc..c.c...ccccccccccc.xxxxxxxxx
-x..............................xxxxxxxxx
-xxxxxxxxxxxxxx@xxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+x.................2............xxxx
+x.....2........................xxxx
+x..cccccccc...ccccccc..ccccccc.xxxx
+x..ccccccccc.2.ccccccc..cccccc.xxxx
+x..cccccccccc...ccccccc..ccccc.xxxx
+x..ccccccccccc.1.ccccccc..cccc.xxxx
+x2.cccccccccc.2..Occccccc2.ccc.xxxx
+x..ccccccccc.....ccccccccc..cc.xxxx
+x..cccccccc...c...ccccccccc..c.xxxx
+x..ccccccc...ccc...ccccccccc...xxxx
+x..cccccc...ccccc...ccccccccc..xxxx
+x..ccccc...ccccccc...ccccccccc.xxxx
+x..cccc...ccccccccc...ccccccc..xxxx
+x..ccc.2.ccccccccccc.2.ccccc...xxxx
+x..cc.....ccccccccccc...ccc....xxxx
+x..c...c...ccccccccccc...c.2...xxxx
+x.....ccc.2.ccccccccccc......c.xxxx
+x....ccccc...ccccccccccc....cc.xxxx
+x.2.ccccccc...ccccccccccc..ccc.xxxx
+x.................2.......cccc.xxxx
+x...c..ccccccc.ccccccc...ccccc.xxxx
+x..ccc......2c.c2cccc...cccccc.xxxx
+x.ccccc..ccc.c.c2ccc.2.ccccccc.xxxx
+x.cccccc..cc.c.c.cc...cccccccc.xxxx
+x.ccccccc..c.c.c.c...ccccccccc.xxxx
+x.cccccccc...c.c....cccccccccc.xxxx
+x.ccccccccc..c.c...ccccccccccc.xxxx
+x..............................xxxx
+xxxxxxxxxxxxxx@xxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 #######################################################################
@@ -73,11 +68,6 @@ MONS:     patrolling Lom Lobon, giant orange brain, rakshasa, wizard
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxwwwwwwwwwwww.......wwwwwwwxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxwwwwwwwwwwwwbbbwwwwwww.......wwwwwwwxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxwwwwwwwwwwwwbbbbbbbbbbbwwwwww.........wwwwwwxxxxxxxxxxxxxxxxxx
@@ -119,46 +109,41 @@ FLOORCOL: red
 ROCKCOL:  red
 MONS:     patrolling Cerebov, Balrug, Pit Fiend
 #
-# you might not want to teleport too much on this level - unless you can 
+# you might not want to teleport too much on this level - unless you can
 # reliably teleport away again.
 #
 MAP
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-...............................xxxxxxxxx
-.............vvvvv.............xxxxxxxxx
-.............v$$$v.............xxxxxxxxx
-.............v|||v.............xxxxxxxxx
-.............v$$$v.............xxxxxxxxx
-.vvvvv...vvvvvvvvvvvvv...vvvvv.xxxxxxxxx
-.v|$|vvvvv...........vvvvv$|$v.xxxxxxxxx
-.v$|$v.....vvvvvvvvv.....v|$|v.xxxxxxxxx
-.v|$|v.vvvvvvvvOvvvvvvvv.v$|$v.xxxxxxxxx
-.vvvvv.vvvvvv..3..vvvvvv.vvvvv.xxxxxxxxx
-...v...vv.....vvv.....vv...v...xxxxxxxxx
-...v.vvvv....vv1vv....vvvv.v...xxxxxxxxx
-...v.vv......v...v......vv.v...xxxxxxxxx
-...v.vvvv.............vvvv.v...xxxxxxxxx
-...v...vv..2.......2..vv...v...xxxxxxxxx
-.vvvvv.vv..2.......2..vv.vvvvv.xxxxxxxxx
-.v|$|v.vv.............vv.v$|$v.xxxxxxxxx
-.v|$|v.vv...vv...vv...vv.v$|$v.xxxxxxxxx
-.v|$|v.vv...vv+++vv...vv.v$|$v.xxxxxxxxx
-.vvvvv.vvvvvvv...vvvvvvv.vvvvv.xxxxxxxxx
-....v..vvvvvvv...vvvvvvv..v....xxxxxxxxx
-....vv...................vv....xxxxxxxxx
-.....vv.vvvvv..2..vvvvv.vv.....xxxxxxxxx
-......vvv|||v.....v$$$vvv......xxxxxxxxx
-........v|$|vv...vv$|$v........xxxxxxxxx
-........v|||v.....v$$$v........xxxxxxxxx
-........vvvvv.....vvvvv........xxxxxxxxx
-...............................xxxxxxxxx
-...............@...............xxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+...............................xxxx
+.............vvvvv.............xxxx
+.............v$$$v.............xxxx
+.............v|||v.............xxxx
+.............v$$$v.............xxxx
+.vvvvv...vvvvvvvvvvvvv...vvvvv.xxxx
+.v|$|vvvvv...........vvvvv$|$v.xxxx
+.v$|$v.....vvvvvvvvv.....v|$|v.xxxx
+.v|$|v.vvvvvvvvOvvvvvvvv.v$|$v.xxxx
+.vvvvv.vvvvvv..3..vvvvvv.vvvvv.xxxx
+...v...vv.....vvv.....vv...v...xxxx
+...v.vvvv....vv1vv....vvvv.v...xxxx
+...v.vv......v...v......vv.v...xxxx
+...v.vvvv.............vvvv.v...xxxx
+...v...vv..2.......2..vv...v...xxxx
+.vvvvv.vv..2.......2..vv.vvvvv.xxxx
+.v|$|v.vv.............vv.v$|$v.xxxx
+.v|$|v.vv...vv...vv...vv.v$|$v.xxxx
+.v|$|v.vv...vv+++vv...vv.v$|$v.xxxx
+.vvvvv.vvvvvvv...vvvvvvv.vvvvv.xxxx
+....v..vvvvvvv...vvvvvvv..v....xxxx
+....vv...................vv....xxxx
+.....vv.vvvvv..2..vvvvv.vv.....xxxx
+......vvv|||v.....v$$$vvv......xxxx
+........v|$|vv...vv$|$v........xxxx
+........v|||v.....v$$$v........xxxx
+........vvvvv.....vvvvv........xxxx
+...............................xxxx
+...............@...............xxxx
 ENDMAP
 
 ##############################################################################
@@ -171,40 +156,35 @@ FLOORCOL: darkgrey
 ROCKCOL:  darkgrey
 MONS:     patrolling Gloorx Vloq, Executioner, demonic crawler, shadow demon
 MAP
-xxxxxxxxxxxxxxxxxxxxxxx@.xxxxxxxxxxxxxxx
-xxxxxxxxx..............................x
-xxxxxxxxx..............................x
-xxxxxxxxx..............................x
-xxxxxxxxx.x.x.x.x.x.x.x..x.x.x.x.x.x.x.x
-xxxxxxxxx..............................x
-xxxxxxxxx.x.xxxx=xxxxxxxxxxxx=xxxxxx.x.x
-xxxxxxxxx...xx....................xx...x
-xxxxxxxxx.x.x..ccccc..4..4..ccccc..x.x.x
-xxxxxxxxx...x.cc.3............3.cc.x...x
-xxxxxxxxx.x.x.c..ccccc.cc.ccccc..c.x.x.x
-xxxxxxxxx...x.c.cc.....cc.....cc.c.x...x
-xxxxxxxxx.x.x.c.c.2...cccc...2.c.c.x.x.x
-xxxxxxxxx...x...c...ccc..ccc...c...=...x
-xxxxxxxxx.x.x.3.....2..1O..2.....3.x.x.x
-xxxxxxxxx...=...c...ccc..ccc...c...x...x
-xxxxxxxxx.x.x.c.c.2...cccc...2.c.c.x.x.x
-xxxxxxxxx...x.c.cc.....cc.....cc.c.x...x
-xxxxxxxxx.x.x.c..ccccc.cc.ccccc..c.x.x.x
-xxxxxxxxx...x.cc.3............3.cc.x...x
-xxxxxxxxx.x.x..ccccc..4..4..ccccc..=.x.x
-xxxxxxxxx...xx....................xx...x
-xxxxxxxxx.x.xxxx=xxxx=xxxxxxxx=xxxxx.x.x
-xxxxxxxxx..............................x
-xxxxxxxxx.x.x.x.x.x.x.x..x.x.x.x.x.x.x.x
-xxxxxxxxx..............................x
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxx@.xxxxxxxxxxxxxxx
+xxxx..............................x
+xxxx..............................x
+xxxx..............................x
+xxxx.x.x.x.x.x.x.x..x.x.x.x.x.x.x.x
+xxxx..............................x
+xxxx.x.xxxx=xxxxxxxxxxxx=xxxxxx.x.x
+xxxx...xx....................xx...x
+xxxx.x.x..ccccc..4..4..ccccc..x.x.x
+xxxx...x.cc.3............3.cc.x...x
+xxxx.x.x.c..ccccc.cc.ccccc..c.x.x.x
+xxxx...x.c.cc.....cc.....cc.c.x...x
+xxxx.x.x.c.c.2...cccc...2.c.c.x.x.x
+xxxx...x...c...ccc..ccc...c...=...x
+xxxx.x.x.3.....2..1O..2.....3.x.x.x
+xxxx...=...c...ccc..ccc...c...x...x
+xxxx.x.x.c.c.2...cccc...2.c.c.x.x.x
+xxxx...x.c.cc.....cc.....cc.c.x...x
+xxxx.x.x.c..ccccc.cc.ccccc..c.x.x.x
+xxxx...x.cc.3............3.cc.x...x
+xxxx.x.x..ccccc..4..4..ccccc..=.x.x
+xxxx...xx....................xx...x
+xxxx.x.xxxx=xxxx=xxxxxxxx=xxxxx.x.x
+xxxx..............................x
+xxxx.x.x.x.x.x.x.x..x.x.x.x.x.x.x.x
+xxxx..............................x
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 
@@ -214,7 +194,7 @@ ENDMAP
 # Pandemonium demon vaults are selected by tag. They must have the tag "pan",
 # or they won't even be considered. Tags are case-sensitive.
 #
-# Tagging these levels also ensures they won't be generated in the main 
+# Tagging these levels also ensures they won't be generated in the main
 # dungeon.
 
 NAME: rand_demon_1
@@ -404,28 +384,28 @@ MONS:    pandemonium demon, eye of draining, any demon
 SHUFFLE: aA/bB/cC/dD/eE/fF, eE/gG, fF/hH
 SUBST:   a=m, b=m, c=m, d=m, e=m, f=m, g=., h=.
 SUBST:   A=2, B=2, C=2, D=2, E=2, F=2, G=., H=.
-# the two center boxes are granted; 
+# the two center boxes are granted;
 # of the six outer boxes, one or two may be missing
 SUBST:   n=n =:1
 SUBST:   m:mn
 KMONS:   O = eye of draining
 KFEAT:   O = O
 MAP
-                  ....bbb..  
-.......           ....bBb..  
-.aaa...           ....bbb..  
-.aAa...           .........  
-.aaa.......................  
-...........................  
+                  ....bbb..
+.......           ....bBb..
+.aaa...           ....bbb..
+.aAa...           .........
+.aaa.......................
+...........................
 .............mmm.............
     .........m2m..........ccc
     .........mmm3.........cCc
 ...............333........ccc
 ..............33133nnn.......
 .fff...........333.nOn.......
-.fFf............3..nnn...    
-.fff.....................    
-.........................    
+.fFf............3..nnn...
+.fff.....................
+.........................
 .............................
   .........        ...ddd....
   ...eee...        ...dDd....