Commit to 0.5 the new fog generator vaults (by Lemuel) that don't rely on statues/markers stopping autoexplore.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10219 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 205 insertions, 11 deletions

diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des
index fa7c920c31..9506397407 100644
--- a/crawl-ref/source/dat/elf.des
+++ b/crawl-ref/source/dat/elf.des
@@ -206,6 +206,55 @@ xxxxxxxxxxxxx...xxxxxx.....xxx
 xxxxxxxxxxxxxxxxxxxxxxx@@@xxxx
 ENDMAP
 
+###########################################################################
+# Two arrival vaults by Lemuel, using fog generators.
+
+NAME:   elf_arrival_freeze
+PLACE:  Elf:1
+ORIENT: float
+ITEM:   nothing
+MARKER: d = lua:fog_machine { cloud_type = "freezing vapour", \
+             pow_min = 10, pow_max = 10, delay = 10, \
+             size = 1, walk_dist = 0, spread_rate= 0 }
+MAP
+cc@@@cc
+cc...cc
+cc...cc
+cc.d.cc
+cc...cc
+cc...cc
+cc...cc
+cc...cc
+cc...cc
+cc...cc
+cc...cc
+cc.{.cc
+ccccccc
+ENDMAP
+
+NAME:   elf_arrival_flame
+PLACE:  Elf:1
+ORIENT: float
+ITEM:   nothing
+MARKER: d = lua:fog_machine { cloud_type = "flame", \
+             pow_min = 10, pow_max = 10, delay = 10, \
+             size = 1, walk_dist = 0, spread_rate= 0 }
+MAP
+cc@@@cc
+cc...cc
+cc...cc
+cc.d.cc
+cc...cc
+cc...cc
+cc...cc
+cc...cc
+cc...cc
+cc...cc
+cc...cc
+cc.{.cc
+ccccccc
+ENDMAP
+
 ##############################################################################
 # Elf:7 branch endings
 ##############################################################################
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 031c4c83b8..4ffd9acd79 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -612,6 +612,17 @@ ENDMAP
 # Swamp specific non-ending vaults
 ##############################################################################
 
+# The only Swamp entry... mist leaking from the stairs.
+NAME:   swamp_mist
+TAGS:   swamp_entry
+MARKER: O = lua:fog_machine { \
+             pow_min = 8, pow_max = 12, delay = 25, \
+             size = 1, walk_dist = 1, spread_rate= 33 }
+MAP
+O
+ENDMAP
+
+
 ##############################################################################
 # Snake Pit specific non-ending vaults
 ##############################################################################
@@ -620,7 +631,6 @@ ENDMAP
 # Shoals specific non-ending vaults
 ##############################################################################
 
- 
 ###########################
 # Shoal Ruins - nothing special, just some flavor (Enne)
 # Appear rarely.
@@ -654,7 +664,7 @@ SUBST:  ' = ' 1:5
 SUBST:  . = . 2:1
 SUBST:  ' = .
 MAP
- ''''''''' 
+ '''''''''
 '''xx+xx'''
 ''xx...xx''
 'xx.....xx'
@@ -664,7 +674,7 @@ MAP
 'xx.....xx'
 ''xx...xx''
 '''xxxxx'''
- ''''''''' 
+ '''''''''
 ENDMAP
 
 NAME:   overgrown_statue
@@ -708,7 +718,6 @@ MAP
   ...  
 ENDMAP
 
-
 ##############################################################################
 # Slime Pit specific non-ending vaults
 ##############################################################################
@@ -968,7 +977,6 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-
 ################################################################################
 # Snake Pit: the hunt
 #
@@ -1087,7 +1095,6 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-
 ################################################################################
 # Swamp:5 standard
 #
@@ -1153,3 +1160,59 @@ MAP
     ""cccccccc""
       """"""""
 ENDMAP
+
+##################################################################
+# Alternative swamp end, by Lemuel
+#
+NAME:    swamp_pestilence
+PLACE:   Swamp:5
+TAGS:    no_pool_fixup
+ORIENT:  southeast
+MONS:    spectral swamp dragon / spectral hydra
+MONS:    hydra zombie / swamp dragon zombie
+MONS:    spectral swamp drake / swamp drake zombie
+MONS:    death drake / plant / w:5 oklob plant
+MONS:    insubstantial wisp
+MONS:    phantom
+SHUFFLE: OX
+MARKER:  Y = lua:fog_machine { cloud_type = "foul pestilence", \
+             pow_min = 8, pow_max = 12, delay_min = 20, delay_max = 30, \
+             size = 1, walk_dist = 1, spread_rate= 33 }
+MARKER:  O = lua:fog_machine { cloud_type = "foul pestilence", \
+             pow_min = 8, pow_max = 12, delay_min = 20, delay_max = 30, \
+             size = 1, walk_dist = 1, spread_rate= 33 }
+KMONS:   O = skeletal dragon
+KFEAT:   O = O
+SUBST:   ? = ? ! w
+KMONS:   ? = big fish zombie
+KMONS:   ! = swamp worm zombie
+KFEAT:   ? = deep_water
+KFEAT:   ! = deep_water
+SUBST:   X=. , Y:w , 6=66. , 1=13 , .=W... , "=xc , '=.wW
+MAP
+    ?w......w?w"xx     xx
+    w?ww..ww?wwc"xx   xxx
+    "wWWwww?w?cc"xxx xxxx
+   '""cWw?w?ccc"xxxxxxxxx
+   'x"c..wwcccc"""xxxxxxx
+   xxxc...ccccccccccc"xxx
+  xxx"cc....cccc6666c"xxx
+  xxx"cc....cccO6666cc"xx
+ xxxxcccc...cc6666665c"xx
+  x'"cccc...ccc666666ccxx
+   'cc1Xcc...cc6666666cxx
+   xc211ccc..cccc5.666c"x
+   ccc2.1cc.Y.cccc..6cc"x
+   '"c.1.ccc...ccc...cc"x
+   'xcc.1.ccc...cc....cxx
+   'x"c2.21ccc..ccc5.ccxx
+   xxxcc...ccc..c....c"xx
+   xxx"cc.1.2c...5.cccxxx
+   xxxx"c2......?wcc""xxx
+  xxxxxxccc2.wwwwcc""xxxx
+  xxxxxxx"cc?w?wcc""xxxxx
+  xxxxxxxx"cc4wcc"xxxxxxx
+ xxxxxxxxxx"cccc"xxxxxxxx
+xxxxxxxxxxxxx""xxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index a948f25c08..47dd232297 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -1448,7 +1448,7 @@ ENDMAP
 #KFEAT:   | = W / .
 #KFEAT:   d = W / .
 #KFEAT:   e = W / .
-#KFEAT:   2 = W 
+#KFEAT:   2 = W
 #SUBST:   ; = .:80 W:30
 #SUBST:   " = .:80 W:30
 #SUBST:   ! = w:20 W ? c
@@ -1844,6 +1844,89 @@ xxxxxxx.....@
 xxxxxxxxxxxxx
 ENDMAP
 
+#######################################
+# Statue in the mist (Lemuel)
+#
+NAME:    statue_in_the_mist
+TAGS:    extra luniq_mini
+MONS:    orange crystal statue / silver statue / ice statue
+DEPTH:   9-
+MARKER:  G = lua:fog_machine { cloud_type= "grey smoke", \
+             pow_min = 10, pow_max = 20, delay_min = 15, delay_max = 35, \
+             size = 3, walk_dist = 2, spread_rate= 25 }
+SHUFFLE: G111
+MAP
+G
+ENDMAP
+
+##############################################
+# Old faithful (Lemuel)
+#
+# Little wisps of steam around the lava, and then occasionally a big
+# eruption. No autoexplore-stopper needed here - the steam does very little
+# damage.
+NAME:   old_faithful
+DEPTH:  D, Lair, Geh
+TAGS:   uniq_geyser no_monster_gen
+MONS:   nothing,nothing
+MARKER: 1 = lua:fog_machine { cloud_type="steam", \
+            pow_min = 2, pow_max = 5, delay = 25, \
+            size = 1, walk_dist = 3, spread_rate= 10 }
+MARKER: 2 = lua:fog_machine { cloud_type="steam", \
+            pow_min = 10, pow_max = 20, delay = 750, \
+            size = 10, walk_dist = 1, spread_rate= 75 }
+SUBST:  1 = l, 2 = l
+SUBST:  l = l w:20
+SUBST:  ? : w. , ! : w. , & : w.
+MAP
+.......?.......
+......&?.......
+.......??......
+..&&&&???......
+&&&&?wwwww.....
+&&?wwwwwwwww&&.
+.wwwwwlwwwwwww&
+..&wwl1lwwwww&&
+...wwwl2lwww&&.
+....wwwlww&&...
+..!!wwwww......
+..!!!www.......
+.!!!!w!.....!..
+..!!!w.....!!!.
+...!!.......!!.
+ENDMAP
+
+##############################################
+# Another geyser (Lemuel)
+#
+NAME:   another_geyser
+DEPTH:  D, Lair
+TAGS:   uniq_geyser no_monster_gen layout_rooms
+MONS:   nothing,nothing
+MARKER: 1 = lua:fog_machine { cloud_type="steam", \
+            pow_min = 2, pow_max = 5, delay = 25, \
+            size = 3, walk_dist = 3, spread_rate= 20 }
+MARKER: 2 = lua:fog_machine { cloud_type="steam", \
+            pow_min = 15, pow_max = 30, delay = 750, \
+            size = 12, walk_dist = 1, spread_rate= 99 }
+SUBST:  1 = l, 2 = l
+SUBST:  l = lw
+SUBST:  ? : wlx
+MAP
+  .......
+....www....
+...wwwww...
+xxxxxwxxxxx
+xxxxxwwxxxx
+xxxxxxxwxxx
+xxxxxxxwxxx
+xx??xxwxxxx
+xx??lw1wxxx
+xxxxxlwwwxx
+xxxxxl2xxxx
+xxxxxxxxxxx
+ENDMAP
+
 #################################################################
 # Spider temple (Joshua)
 #
diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des
index e220f4c1e4..6aaf364197 100644
--- a/crawl-ref/source/dat/temple.des
+++ b/crawl-ref/source/dat/temple.des
@@ -271,12 +271,11 @@ xx._......'''''!!!!!!!!!!!!!!!!!'''''.........
 xxxxm......'''''''!!!!!!!!!!!'''''''..........  
 xxxxxm......''''''''!!!!!!!''''''''..........   
 xxxx1m_........'''''''!!!'''''''.............   
-xxxxxxm_..........'''''''''''...............    
-xxxxxxxxxx...........'''''................      
-xxxxxxxxxxxx...........................         
+xxxxxxm_..........'''''''''''...............
+xxxxxxxxxx...........'''''................
+xxxxxxxxxxxx...........................
 ENDMAP
 
-
 ##############################################################################
 # Temple maps
 ##############################################################################