Added vaults (Eino).

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

4 files changed, 129 insertions, 2 deletions

diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index aafec48724..932f09a06e 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -3540,6 +3540,23 @@ x.xxxxxx.xxxxxx.x
 'xxxxxxx'xxxxxxx'
 ENDMAP
 
+##############################################################################
+# Fog
+NAME:    david_entry_073
+TAGS:    entry no_monster_gen
+ORIENT:  float
+SHUFFLE: <>/>< , {}/}{
+MARKER:  # = lua:fog_machine { \
+             pow_max = 5, delay_min = 10, delay_max = 150, \
+             size = 5, start_clouds = 1}
+MAP
+xxxxxx
+x.{}.x
+x....x
+x.<>.x
+x....x
+x@##.x
+ENDMAP
 
 ##############################################################################
 # Erik's entry vaults
@@ -4152,7 +4169,7 @@ ORIENT:  float
 MONS:    rat / nothing, hobgoblin / goblin / nothing
 SHUFFLE: '"/AB, !?XY/CDVW
 SUBST:   ':., ":=, A:x, B:x, !:., ?:=, C:x, D:x, Y=@x, V=x, W=x
-KFEAT:   X = teleport trap / floor
+KFEAT:   X = teleport trap
 SUBST:   c : cxxx
 MAP
          x@x
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 8d28805a02..866f55fa65 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -254,6 +254,42 @@ xxxxxxxx.xxxxx111.xxxx.xxxxxxxxxxxxxxxxxxxxxx
              xxxx@xx                   xxxxxx
 ENDMAP
 
+############################################################################
+# A comfortable, reclusive cottage for the summer holidays (Eino)
+#
+NAME:    pond_and_an_island_with_a_cottage
+ORIENT:  float
+DEPTH:   Lair:3-9
+# A swamp version would be nice, but the dungeon generator destroys
+# the walls and the floors
+SUBST:   % = %%%%%$$$**|
+MONS:    patrolling necromancer / necromancer
+SHUFFLE: 23
+MONS:    giant slug zombie / giant snail zombie / \
+         elephant slug zombie w:2 / nothing
+MONS:    giant lizard zombie / gila monster zombie / \
+         komodo dragon zombie w:4 / nothing
+MAP
+             wwwwwwwww
+        wwwwwwwwwwwwwwwww
+     wwwwwwwwwwwwwwwwwwwwww
+    wwwww..........wwwwwwwww
+  wwwwww.xxxxxxxxxx.wwwwwwwww
+ wwwwwww.x.3.2+.1.x..wwwwwwww
+ wwwwwww.x+xxxx2.3x..wwwwwwwww
+wwwwwwww.x.%%%x.32x..wwwwwwwww
+wwwwwwww.xxxxxxx+xx..wwwwwwwww
+wwwwwwwww...........wwwwwwwwww
+ wwwwwwwww....WW....wwwwwwwww
+  wwwwwwwwww..WWW..wwwwwwwww
+  wwwwwwwwwww..W..wwwwwwww
+   wwwwwwwwwww...wwwwwww
+    wwwwwwwwwww..wwwww
+     wwwwwwwww...www
+       wwwwww.@.www
+         www
+ENDMAP
+
 ##########################################
 # a pointless little "vaults" by Lemuel
 #
@@ -359,7 +395,6 @@ MAP
      ..
 ENDMAP
 
-
 #############################################################################
 # plantages
 #
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index 6f547b7edd..36a4f05f9b 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -86,6 +86,60 @@ wwwwwwwwwww''..................xxxxxx
 .....'w........................xxxxxx
 ENDMAP
 
+############################################################################
+# Black bear nests (Eino)
+# Bears are wimpy when you meet them, so here's an early challenge.
+#
+NAME:   black_bear_nest_1
+ORIENT: northwest
+TAGS:   uniq_black_bear_nest
+DEPTH:  D:4-8
+NSUBST: ' = 1:1 / 2:R / *:.
+MONS:   patrolling black bear
+MAP
+xxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxx
+xxxxxxx''.xxxxxxxxxx
+xxxxxx''.......xxxxx
+xxxxxx''...xx....xxx
+xxxxxxx''xxxxxxx..xx
+xxxxxxxxxxxxxxxxxx.x
+xxxxxxxxxxxxxxxxxxx@
+ENDMAP
+
+NAME:   black_bear_nest_2
+ORIENT: southeast
+TAGS:   uniq_black_bear_nest
+DEPTH:  D:4-8
+NSUBST: ' = 1:1 / 2:R / *:.
+MONS:   patrolling black bear
+MAP
+xxxxxxxx@xxxxxx
+xxxxxxxx.xxxxxx
+xxxxxxxx.xxxxxx
+xxxxxxx..xxxxxx
+xxxxxx...xxxxxx
+xxxxx...xxxxxxx
+xxxx...xxxxxxxx
+xxx...xx'xxxxxx
+xxx..xx'.xxxxxx
+xxx..x''.xxxxxx
+@....xx'.xxxxxx
+xxx...xx.xxxxxx
+xxxx.....xxxxxx
+xxxxx....xxxxxx
+xxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxx
+ENDMAP
+
 #####################################
 # Dragon's cave
 #
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 09d95c4291..f66d83818e 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -165,6 +165,27 @@ xx+xx
  ...
 ENDMAP
 
+##############################################################################
+# Eino's jars
+#
+NAME:    jars
+DEPTH:   D:4-14
+TAGS:    mini_float
+SHUFFLE: 11%
+: if you.absdepth() >7 then
+MONS:    killer bee / nothing w:5
+SUBST:   % = %*
+: else
+MONS:    giant mosquito / nothing
+: end
+MAP
+xxxxxx
+x1111x
+x1111x
+x++++x
+@....@
+ENDMAP
+
 ###################################
 # pond with fungi
 #