From 822f98b754fda5e6f8dba5a1641c8dc6be4bec77 Mon Sep 17 00:00:00 2001
From: Jeffrey 'Sigurd' Westcoat <jjwcoat@gmail.com>
Date: Wed, 29 Nov 2017 17:25:22 -0500
Subject: [PATCH] HttT S17: Fix lava issues (#2249)

1. Undo now works again in the scenario.
2. Lava now works again.
3. Triggering on a moveto event was not good, as several shorter moves
   would make rate of lava grow much faster than fewer longer moves.
---
 .../scenarios/17_Scepter_of_Fire.cfg          | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
index faaa1aaa63e8..20dac88da572 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
@@ -682,37 +682,23 @@
     # Some volcanic ambiance
     #
     [event]
-        name=moveto
+        name=turn end
         first_time_only=no
-        [allow_undo]
-        [/allow_undo]
-        [filter]
-            side=1,4,5
-        [/filter]
-        {VARIABLE_OP rumble_test rand "1..35"}
+
+        {QUAKE "rumble.ogg"}
+        {VARIABLE_OP lava_count add 1}
+        {EXPAND_LAVA}
+
+        # Reset the counter if it gets too large (it slows things down)
         [if]
             [variable]
-                name=rumble_test
-                numerical_equals=1
+                name=lava_count
+                numerical_equals=3
             [/variable]
             [then]
-                {QUAKE "rumble.ogg"}
-                {VARIABLE_OP lava_count add 1}
-                {EXPAND_LAVA}
-
-                # Reset the counter if it gets too large (it slows things down)
-                [if]
-                    [variable]
-                        name=lava_count
-                        numerical_equals=3
-                    [/variable]
-                    [then]
-                        {NEXT_LAVA}
-                    [/then]
-                [/if]
+                {NEXT_LAVA}
             [/then]
         [/if]
-        {CLEAR_VARIABLE rumble_test}
     [/event]
 
     {campaigns/Heir_To_The_Throne/utils/deaths.cfg}