Tweaks to vaults with harmful clouds.

1 files changed, 59 insertions, 49 deletions

diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index c8982c0fdf..aaee6c95f9 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -188,71 +188,79 @@ NAME:    elemental_entry
 TAGS:    entry no_monster_gen
 ORIENT:  float
 MARKER:  A = lua:fog_machine { \
-             pow_max = 20, delay_min = 50, delay_max = 300, \
-             size = 12, start_clouds = 1, \
+             pow_max = 10, delay_min = 50, delay_max = 300, \
+             size = 8, start_clouds = 1, \
              cloud_type = "noxious fumes" }
-SUBST:   A=a ,  a=aaam
-FTILE:   a=floor_slime
-COLOUR:  a=lightgreen
-SUBST:   a=.
+SUBST:   A = a ,  a = a m:1
+FTILE:   a = floor_slime
+COLOUR:  a = lightgreen
+KPROP:   a = force_exclude
+SUBST:   a = .
 MARKER:  W = lua:fog_machine{\
-             pow_max = 20, delay_min = 50, delay_max = 300, \
-             size = 12, start_clouds = 1, \
+             pow_max = 10, delay_min = 50, delay_max = 300, \
+             size = 8, start_clouds = 1, \
              cloud_type = "freezing vapour"}
-SUBST:   W=w
-MARKER:  F= lua:fog_machine {\
-             pow_max = 20, delay_min = 50, delay_max = 300, \
-             size = 12, start_clouds = 1, \
+SUBST:   W = w
+KPROP:   w = force_exclude
+SUBST:   w : Ww'" , ' = wwW"
+COLOUR:  " = blue
+SUBST:   " = .
+SUBST:   _ = w
+MARKER:  F = lua:fog_machine {\
+             pow_max = 10, delay_min = 50, delay_max = 300, \
+             size = 8, start_clouds = 1, \
              cloud_type = "flame"}
-SUBST:   F=f
-FTILE:   f=floor_rough_red
-COLOUR:  f=red
-SUBST:   f=lll.
-MARKER:  E= lua:fog_machine{\
+SUBST:   F = f
+KPROP:   f = force_exclude
+SUBST:   f : fflF , f = llf , F = f
+FTILE:   f = floor_rough_red
+COLOUR:  f = red
+SUBST:   f = .
+MARKER:  E = lua:fog_machine{\
              pow_max = 20, delay_min = 50, delay_max = 300, \
              size = 12, start_clouds = 1, \
              cloud_type = "black smoke"}
-SUBST:   E=e , e=cxbveeee
-FTILE:   e=floor_orc
-COLOUR:  e= brown
-SUBST:   e=.
+SUBST:   E = e , e = e n:1
+FTILE:   e = floor_orc
+COLOUR:  e = brown
+SUBST:   e =.
 SHUFFLE: XZ
-NSUBST:  Z= ) / ]
-NSUBST:  X= ( / [
-KFEAT:   T = teleport trap
-MAP
-      ccccccccc
-     ccT.aaa.Tcc
-     c.aaaAaaa.c
-     c..aaaaa..c
-     ccT..a..Tcc
- cccccccnnnnnccccccc
-cc..ccccc...ccccc..cc
-cTw.Tccccc+cccccT.fTc
-c.ww.nccX...Zccn.ff.c
-cwww.nwc.....cln.fffc
-cwWwwn.+..{..+.nffFfc
-cwww.nwc.....cln.fffc
-c.ww.nccZ...Xccn.ff.c
-cTw.Tccccc+cccccT.fTc
-cc..cccccG.Gccccc..cc
- cccccccnn+nnccccccc
-     cc...e...cc
-     c..eeeee..c
-     c.eeeEeee.c
-     cc..eee..cc
-      ccc+++ccc
+NSUBST:  Z = ) / ]
+NSUBST:  X = ( / [
+MAP
+          ... 
+       ccc===ccc
+      cc..aaa..cc
+      c.aaaAaaa.c
+      c..aaaaa..c
+      cc...a...cc
+  cccccccnn=nnccccccc
+ cc..ccccc...ccccc..cc
+ c.w..ccccc+ccccc..f.c
+ c.ww.nccX...Zccn.ff.c
+.=www.n_c.....cln.fff=.
+.=wWww=.+..{..+.=ffFf=.
+.=www.n_c.....cln.fff=.
+ c.ww.nccZ...Xccn.ff.c
+ c.w..ccccc+ccccc..f.c
+ cc..cccccG.Gccccc..cc
+  cccccccnn+nnccccccc
+      cc...e...cc
+      c..eeeee..c
+      c.eeeEeee.c
+      cc..eee..cc
+       ccc+++ccc
 ENDMAP
 
 #####################################
 # I am the great and powerful Oz! Pay no attention to the man behind
-# the curtain! ...if you stick close to the wall, you should always be
-# able to avoid the flame clouds.
+# the curtain! ...if you stick close to the wall, you are always able
+# to avoid the flame clouds.
 NAME:   oz_shiori
 TAGS:   entry
 ORIENT: float
 NSUBST: 1 = 1/%
-MONS:   kobold / goblin / hobgoblin
+MONS:   kobold / goblin / hobgoblin / nothing
 MARKER: # = lua:fog_machine { \
             pow_max = 5, delay_min = 100, delay_max = 150, \
             size = 5, start_clouds = 1, \
@@ -265,6 +273,8 @@ SUBST:  ' = .
 MAP
 bbbbbbbbb
 b.(.{.[.b
+b.......b
+b.......b
 b.b...b.b
 b.......b
 b.......b