More vaults (Erik) and Snake:5 level (David).

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

2 files changed, 157 insertions, 0 deletions

diff --git a/crawl-ref/source/dat/splev.des b/crawl-ref/source/dat/splev.des
index 1b3df123bc..af9f59e691 100644
--- a/crawl-ref/source/dat/splev.des
+++ b/crawl-ref/source/dat/splev.des
@@ -1137,6 +1137,69 @@ ENDMAP
 MONS: vault guard
 MONS: random, random, random, random, random, random
 
+##########################################################################
+# Snakes' Hunt
+
+NAME:    snake_hunt
+PLACE:   Snake:5
+FLAGS:   no_rotate
+ORIENT:  northwest
+KFEAT:   Z = weight:2 teleport trap / .
+KFEAT:   z = teleport trap
+MONS:    naga / nothing, greater naga / nothing, guardian naga / nothing
+MONS:    naga warrior / nothing, naga mage / nothing
+SHUFFLE: 123
+SHUFFLE: 45
+SUBST:   ' : ' x
+SUBST:   " : " x
+SUBST:   ' = .:250 1 2 3 4:15 5:5
+SUBST:   " = .:250 1 2 3 4:5  5:15
+SUBST:   X = x c + .
+SUBST:   Y = x c +
+SUBST:   T : T  U  V  .:30 b
+SUBST:   _ : ! .
+SUBST:   ! : ! . x
+SUBST:   ! = x .:2
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxx''''''x4O4x""""""xxxxxxxxxxx
+xxxxxxxxxxx''''''xxxx..4z4..xxxx""""""xxxxxx
+xxxxxxxx''''xxxxxxxx.5..5..5.xxxxxxxx""""xxx
+xxxxxxx''xxxx''''xxx..45554..xxx""""xxxx""xx
+xxxxxx''xxx''''''''xxx.....xxx""""""""xxx""x
+xxxxxx'xxx''''''''''xxxcXcxxx""""""""""xxx"x
+xxxxxx''x''''''''''''xx.3.xx""""""""""""x""x
+xxxxxxx'Y'''''''''''''45354"""""""""""""Y"xx
+xxxxxxxxxx''''''''''xx.....xx""""""""""xxxxx
+xxxxxxxxxxx''''''''xxxxx.xxxxx""""""""xxxxxx
+xxxxxxxxxxxxx''''xxxxxxx.xxxxxxx""""xxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxx+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxx!.!xxxxxx.....xxxxxx!.!xxxxxxxx
+xxxxxxxxxx!....._xx...43335...xx_...!!!xxxxx
+xxxxxxxx!......_x.11.4..3..5.22.x_......!xxx
+xxxxxxx!...2...x..11.........22..x...1...!xx
+xxxxxxx!..2..._x......T...T......x_...1..!xx
+xxxxxx!...2...x..2.............1..x...1...!x
+xxxxxx!..2....x.........}.........x....1...!
+xxxxxx!.......x....T...).]...T.............@
+xxxxxx!..2....x.......ZZZZZ.......x....1...!
+xxxxxxx!..2..._x.................x_...1..!xx
+xxxxxxx!...2..._xx....T.<.T....xx_...1...!xx
+xxxxxxx!........._xx.........xx_.........!xx
+xxxxxxxx!.........._xxx...xxx_..........!xxx
+xxxxxxxxx!.............x.x.............!xxxx
+xxxxxxxxxx!!.........................!!xxxxx
+xxxxxxxxxxxx!!!.....3.......3.....!!!xxxxxxx
+xxxxxxxxxxxxxxx!!!!!..3...3..!!!!!xxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxx!!!...!!!xxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxx!@!xxxxxxxxxxxxxxxxxx
+ENDMAP
+
 ############################################################################
 # snake_pit
 
@@ -2911,6 +2974,47 @@ xxxxxxxxxxxxx@
 ENDMAP
 
 ##############################################################################
+# The Guard of Blades
+ 
+NAME: erik_vaults_1
+TAGS: vault_entry
+MONS: dancing weapon
+ORIENT: float
+ 
+MAP
+.............
+.............
+.....v.v.....
+....vvvvv....
+.....1O1.....
+....vvvvv....
+.....v.v.....
+.............
+.............
+ENDMAP
+ 
+ 
+##############################################################################
+# Above As Below
+ 
+NAME: erik_vaults_2
+TAGS: vault_entry
+MONS: vault guard
+ORIENT: float
+
+MAP
+vvvvvv.vvvvvv
+vvvvvv.vvvvvv
+vvvvbb.bbvvvv
+vvvvb111bvvvv
+.....1O1.....
+vvvvb111bvvvv
+vvvvbb.bbvvvv
+vvvvvv.vvvvvv
+vvvvvv.vvvvvv
+ENDMAP
+
+##############################################################################
 # Lair entries
 ##############################################################################
 # Dummy Lair entry
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index 748e9130fd..20ae5051e5 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -4503,6 +4503,59 @@ x
 ENDMAP
 
 ##############################################################################
+# Cavepeople
+
+NAME: erik_1
+ORIENT: float
+TAGS: no_monster_gen
+DEPTH: 5-9
+
+SHUFFLE: ZT/nN
+SUBST: n=., N=@
+SHUFFLE: YS/nN
+SUBST: n=., N=@
+SHUFFLE: XR/nN
+SUBST: n=., N=@
+SHUFFLE: WQ/nN
+SUBST: n=., N=@
+SHUFFLE: VP/nN
+SUBST: n=., N=@
+SHUFFLE: UO/nN
+SUBST: n=., N=@
+SUBST: Z=x,Y=x,X=x,W=x,V=x,U=x,T=x,S=x,R=x,Q=x,P=x,O=x
+
+SUBST: 1 = 1:20 .
+SUBST: 2 = 2.
+SUBST: 3 = 23
+SUBST: 4 = 24
+MONS: jackal/hound, human, Edmund/Jessica/Sigmund, Michael/Ijyb/Psyche
+MONS: sheep/nothing
+ 
+MAP
+xxxxxxxxxx@xxxxxxxxxxxxxxxxxxxOxxxxxxxxx
+xxxxxxxxxxx..xxxxxxxxx1xxxxxxUxxxxxxxxxx
+xxxxxxxxxxxxx..xxxxxx111xxxxxUxxxxxxxxxx
+xxxZZZxxxxxxxxx.xxxxxx1xxxxxxUxxxxxxxxxx
+TZZxZxZxx555xx.xxxxxxx1xxxxxUxxxxxxxxxxx
+xxxxxxxZxx5xxx.xxx..x1xxxxxUxxxxxxxxxxxx
+xxxxxxxZxx5xxxx......xxxxxUUxxxxxxxxxxxx
+xxxxxxxZxxx5xx...2...cccxxxUxxxxxxxxxxxx
+xxxxxxZxxxx....2224..+$cxxUxxxxxxxxxxxxx
+xxxxxxxZ.......2ll22.cccxxxUxxxxxxxxxxxx
+xxxxxxxxx......3222.xxxxxxxUxxxxxxxxxxxx
+xxxxxxxxxYxxxx2.......xx...xVVVVxxxxxxxx
+xxxxxxxxYxxxx.......xx..xxxxxxxxVxxxxxxx
+xxxxxxYYxxxxxXxxxxx.xxWxxxxxxxxxxVVxxxxx
+xxxYxYxxxxxxXxxxxxxx.xxWxxxxxxxxxVxxxxxx
+xYYYYxxxxxxxxXXXXXxxxxxxWxxxxxxxVxxxxxxx
+xYxxxxxxxxxxxxxxxXXxxxxxxWWxxxxxxVVxxxxx
+SxxxxxxxxxxxxxxxxxXxxxxxxxxWxxxxxxxVVVVP
+xxxxxxxxxxxxxxxxXXxxxxxxxxxxWxxxxxxxxxxx
+xxxxxxxxxxxxXXXXxxxxxxxxxxxxWxxxxxxxxxxx
+xxxxxxxxxxxRxxxxxxxxxxxxxxxxQxxxxxxxxxxx
+ENDMAP
+
+##############################################################################
 # Rubicon
 
 NAME: erik_rubicon_a