Update volcano_lake and volcano_pools.

Updating the volcanoes in volcano_lake to use a better system, which
will hopefully mean that the warnings work properly for them now. Also
slightly tweak the monsters in volcano_pools.

1 files changed, 43 insertions, 38 deletions

diff --git a/crawl-ref/source/dat/volcano.des b/crawl-ref/source/dat/volcano.des
index 408c0ec820..a7c55c57ab 100644
--- a/crawl-ref/source/dat/volcano.des
+++ b/crawl-ref/source/dat/volcano.des
@@ -144,10 +144,8 @@ end
 -- "Volcano" functions. While the sizes may appear extreme, they are carefully
 -- weighted and balanced and have been tested extensively.
 
-local function in_radius (x, y)
-  local p1 = dgn.point(x, y)
-  local p2 = dgn.point(you.pos())
-  return dgn.point_in_radius(p1, p2, 12)
+local function in_radius_12 (x, y)
+  return dgn.point_in_radius(dgn.point(x, y), dgn.point(you.pos()), 12)
 end
 
 local large_warning = tw_machine(3, "The air gets thick with the scent of sulphur.",
@@ -156,7 +154,7 @@ local large_warning = tw_machine(3, "The air gets thick with the scent of sulphu
 
 local small_warning = tw_machine(3, nil, nil, nil, "The volcano roars to life, " ..
                                  "belching forth lava!", "The air gets thick with " ..
-                                 "the scent of sulphur.", in_radius)
+                                 "the scent of sulphur.", in_radius_12)
 
 function place_large_volcano(e)
     e.kfeat("V = l")
@@ -165,13 +163,6 @@ function place_large_volcano(e)
                                    listener = large_warning})
 end
 
-function place_medium_volcano(e)
-    e.kfeat("V = l")
-    e.lua_marker('V', fog_machine { cloud_type = "flame", walk_dist=0, pow_max=6,
-                                   delay = 300, size = 3000, spread_rate = 30,
-                                   listener = small_warning})
-end
-
 function place_chained_volcano(e)
     e.kfeat("V = l")
     e.lua_marker('V', chained_fog_machine { cloud_type = "flame", walk_dist=15, pow_max=6,
@@ -187,6 +178,20 @@ function place_small_volcano(e)
                                    listener = small_warning})
 end
 
+function place_lake_volcanoes (e, glyphs)
+    for _, glyph in ipairs(glyphs) do
+        place_lake_volcano(e, glyph)
+    end
+end
+
+function place_lake_volcano (e, glyph)
+    e.kfeat(glyph .. " = l")
+    e.lua_marker(glyph, chained_fog_machine { cloud_type = "flame", walk_dist=0,
+                            pow_max=6, delay_min = 300, delay_max = 800, 
+                            size = 300, spread_rate = 5,
+                            listener = small_warning})
+end
+
 function place_tiny_volcano(e)
     e.kfeat("V = l")
     e.lua_marker('V', fog_machine { cloud_type = "flame", walk_dist=10, pow_max=6,
@@ -586,7 +591,7 @@ SUBST:      u = l, z = l, i = l, r = l, n = l
 MONS:       clay golem w:50 / molten gargoyle w:2
 #           Loot: 10 items, 6 gold.
 :           volcano_setup(_G)
-:           place_medium_volcano(_G)
+:           place_lake_volcanoes(_G, {"M", "E", "V", "Q", "T", "S"})
 MAP
                       xxxx     xxxxx xxxxx xxxxxx
                     xxxyyxxx  xxyyxxxxyyyxxxyyyyxx
@@ -597,30 +602,30 @@ MAP
        xxxyyy...........................................yxxx
     xxxxy...............LLLllLLllLLLllllLLllLLlllL........yxxxx
     xy..............LllllllllllllllllllllllllllllllLL........yxxx
-   xxxy............LlllllllllllllllVlllllllliiilllllliL........yxxx
-  xxy............LLllllllllVlllllllllllllliillliilliilllLLL......<x
+   xxxy............LlllllllllllllllllllllllMiiilllllliL........yxxx
+  xxy............LLllllllllllllllllllllllliiMlliilliilllLLL......<x
   xy............Lmmllllllllllllllllllllliillllllliilllllll.......yxx
-  xxxy........LllllmmllllllllllllllllliillllllVlllllllllllL.......yx
+  xxxy........LllllmmlEllllllllllllllliillllllllllllllllllL.......yx
  xxy...........Llllllmmllllllllllllllilllllllllllllllllllll.....yxxx
-  xxy.........LllllllllmmllLlLLllLLlillLLLllLllllllllllllLL......yx
-   xxy.....LllllllVllllllmL..................LlllllllllllllL.....yxxxx
-   xy......Lllllllllllllll.ccccccccccccccccc.llllllVllllllllL.......yx
+  xxy.........LlllllEllmmllLlLLllLLlillLLLllLllllllllllllLL......yx
+   xxy.....LlllllllllllllmL..................LlllllllllllllL.....yxxxx
+   xy......Lllllllllllllll.ccccccccccccccccc.lllllllllllllllL.......yx
    xy.......LllllllllllllL.c....+.111.+....c.LllllllllllllllL......yxx
    xxy.....Lrrllllllllllll.c.<1.c.G_G.c.1<.c.llllllllllllllLL.......yx
-   xy......LllrrlllllllllL.c....c..2..c....c.Lllllllllllluuu.......yxx
+   xy......LllrrVllllllllL.c....c..2..c....c.Lllllllllllluuu.......yxx
    xxy.....Lllllrrllllllll.ccc==ccc+ccc==ccc.LllllllllluullL......yxx
-   xy.....LlllVlllrllllllL.c......c.c......c.lllllllluullllL.....yxx
-   xxy.....Llllllllrllllll.cccccc.c.c.cccccc.LllllluulllllllL.....yxx
-   xy......LllllllllrrlllL.c.$f$c.c.c.cgd$.c.lllluulllllllllL......yxx
+   xy.....LlllllllrllllllL.c......c.c......c.lllllllQuullllL.....yxx
+   xxy.....LllllllVrllllll.cccccc.c.c.cccccc.LllllluulllllllL.....yxx
+   xy......LllllllllrrlllL.c.$f$c.c.c.cgd$.c.lllluulQlllllllL......yxx
    xxy......Lllllllllrllll.c.$gec.c.c.c$e$.c.LluulllllllllllL......yxx
-   xxy.......LllllllllrllL.c.3dgc.c.c.cfg3.c.uullllllVlllllL.....yxxx
-   xy........LlllVlllllrlL.c......c.c......c.LllllllllllllL......yxx
+   xxy.......LllllllllrllL.c.3dgc.c.c.cfg3.c.uullllllllllllL.....yxxx
+   xy........LlllllllllrlL.c......c.c......c.LllllllllllllL......yxx
    xxy.....Lllllllllllllrr.cccccccc+cccccccc.llllllllllllllL......yxx
-    xy.....LlllllllnnnllnnL.................LLllllllllllllL.....yxxx
-    xxxy....LllllnnlllnnlllLllLlLllllLllLlLlzlllllllllllllL.......yxx
-     xA.......nnnllllllllllLlllllllllllllllllzzlllllVllllllL.......yxx
-     xxxxy.....LllllllVllllllVlllllllllllllllllzzlllllllllllL.....yxx
-       xy........LLlllllllllllllllllllllllllVllllzzllllllllL.....yxx
+    xy.....LllllllSnnnllnnL.................LLllllllllllllL.....yxxx
+    xxxy....LllllnnSllnnlllLllLlLllllLllLlLlzlllllllllllllL.......yxx
+     xA.......nnnllllllllllLlllllllllllllllllzzllllllllllllL.......yxx
+     xxxxy.....LllllllllllllllllllllllllllllllTzzTllllllllllL.....yxx
+       xy........LLllllllllllllllllllllllllllllllzzllllllllL.....yxx
        xxxy..........LllllllllllllllllllLllllllllllzlllllLL......yxx
          xxxy.........LLlllllllllllllLL...LLllllllllzzzL......yxxxx
            xxxy.........LLlLLlLllllLL.......LLllLlLlLL.......yxxx
@@ -641,15 +646,15 @@ ENDMAP
 NAME:       volcano_pools
 WEIGHT:     60
 ORIENT:     encompass
-TAGS:       volcano no_item_gen no_monster_gen
+TAGS:       volcano no_item_gen no_monster_gen no_rotate
 #           Sets up the temple guardians.
 :           fiery_guardians(_G)
 MONS:       clay golem w:50 / molten gargoyle w:2
 #           Loot: 10 items, 6 gold; done in volano_setup.
 SHUFFLE:    T/Q/B/Y/R
 #           Do the loot first, 10 objects: two monsters (1, 2)
-NSUBST:     T = 1:1 / 1:2 / 1:d / 1:e / 2:$ / 2:f / 2:g
-NSUBST:     Q = 1:1 / 1:1 / 2:d / 2:e / 2:$ / 1:f / 1:g
+NSUBST:     T = 2:1 / 1:2 / 1:d / 1:e / 2:$ / 2:f / 2:g
+NSUBST:     Q = 2:1 / 1:1 / 2:d / 2:e / 2:$ / 1:f / 1:g
 #           Now the entrance:
 NSUBST:     B = 1:A / *:.
 #           Loot + 10 trashy items.
@@ -668,10 +673,10 @@ MAP
        xxTTTTyxxxxxxxx
       xxlLTTTy.xx...yxx                                xxx
      xxlllTT<.y..yxx.xxx                              xxyxx
-     xxllllL.Lxxxxxy.x.xx                    xxxxxxxxxxyQyxx
+     xxllllLTLxxxxxy.x.xx                    xxxxxxxxxxyQyxx
       xxJlllllxx  xxy..yxx                  xxy...xyQyQQ.LLxx
        xxxxllxx    xxxy..xx              xxxy..yxx.QQQQ.LllLxx
-          xxxx       xxyy.x            xxxy..yxxxxlL.Q<Llllllxx
+          xxxx       xxyy.x            xxxy..yxxxxlLQQ<Llllllxx
                       xyy.x          xxxy..yxxxxxlllLlLllllllJxx
                      xx..xxxxx      xxy..yxxxx xxlllllllllllxxx
                      x.yxxxxyxxxxxxxxy.yxxxxx   xxlllllllxxxx
@@ -685,10 +690,10 @@ MAP
                xxx....LlllllllllL....yxxxx    xxlLRRLlx
             xxxxy.xy....LllLlLlL.......xyxx  xxy<RRRRyx
            xxy...yxxyy..............yxx..yxxxxy.RRRRyxx
-         xxxy.xxxxxxxxyyxxxyyxy.yyyxxxxxx..xy..yy..yxx
+         xxxy.xxxxxxxxyyxxxyyxy.yyyxxxxxx..xy..yy.Ryxx
       xxxxx..yx      xxxx xxxxxx.xxxxxx xxy..yxxxxxxx
-     xxyxy.Lyxxxxx            xx.y<y.yx  xxyxxx
-     xy.yy.LllllJx           xxyyYYYyyx   xxx
+     xxyxy.Lyxxxxx            xx.y<yYyx  xxyxxx
+     xyByy.LllllJx           xxyyYYYyyx   xxx
     xy<BBB.Lllllx           xxyYYYYYyxx
     xLBBBBLlllllx           xxllLYYlLLx
     xxLBBBLllllxx            xxllLlllxx