From 0931059e13ba235f67b7e918bb76f3b7e9d825c1 Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Mon, 10 Sep 2018 13:19:09 +0200
Subject: [PATCH] SoF S9: Fix some events and add TODOs

---
 .../scenarios/9_Caverns_of_Flame.cfg          | 63 ++++++++++---------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
index 6743cf1fc7ef..f20858532ab1 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
@@ -412,38 +412,36 @@
         [/gold]
     [/event]
 
-    ######NOTICE: I don't know why, but sighted events that trigger upon a human move no longer work (if they ever did). So consider this event broken.
+    #TODO: Uncomment when we'll have translations for this
     #seeing the trapped orcs
-    #   [event]
-    #   name=sighted
-    #       [filter]
-    #       side=1
-    #       [/filter]
-    #       [filter_second]
-    #       side=3,4
-    #       [/filter_second]
-    #       {DEBUG_MSG blah}
-    #       [if]
-    #           [variable]
-    #           name=overlayturn
-    #           equals=0
-    #           [/variable]
-    #           [then]
-    #               [message]
-    #               id=Rugnur
-    #               message= _ "Look, those orcs can’t get to us! There’s cave wall in the way!"
-    #               [/message]
-    #               [message]
-    #               id=Thursagan
-    #               message= _ "True; but, perhaps later they will find a way out."
-    #               [/message]
-    #           [/then]
-    #       [/if]
-    #   [/event]
+    #[event]
+    #    name=sighted
+    #    [filter]
+    #        side=3,4
+    #    [/filter]
+    #    [filter_second]
+    #        side=1
+    #    [/filter_second]
+    #    [filter_condition]
+    #        [variable]
+    #            name=overlayturn
+    #            equals=not_yet
+    #        [/variable]
+    #    [/filter_condition]
+
+    #    [message]
+    #        id=Rugnur
+    #        message= _ "Look, those orcs can’t get to us! There’s cave wall in the way!"
+    #    [/message]
+    #    [message]
+    #        id=Thursagan
+    #        message= _ "True; but, perhaps later they will find a way out."
+    #    [/message]
+    #[/event]
 
     #seeing the guards of the glyph
     [event]
-        name=sighted,moveto
+        name=sighted
         [filter]
             role=Guardian
             side=5,6
@@ -553,6 +551,7 @@
         [/message]
         {QUAKE "rumble.ogg"}
         {QUAKE "rumble.ogg"}
+#ifdef __UNUSED__
         [message]
             speaker=Rugnur
             message= _ "We cannot let any of the elves or their mercenaries escape; they would tell where the Sceptre of Fire is. Make sure they all die!"
@@ -565,6 +564,7 @@
         [/message]
         {QUAKE "rumble.ogg"}
         {QUAKE "rumble.ogg"}
+#endif
 
         #a turn counter that starts when you set off the volcano
         [set_variable]
@@ -576,6 +576,8 @@
         [objectives]
             side=1
             [objective]
+                #TODO: Provide a different objective, since the player doesn't have
+                # to kill the elves anymore
                 description= _ "Kill all of the elves before one of them escapes from the caves"
                 condition=win
             [/objective]
@@ -627,6 +629,9 @@
                 {QUAKE "rumble.ogg"}
                 [message]
                     role=smartelf
+                    #NOTE: Since the elves won't try to escape anymore, what about
+                    #making them act cowardly (maybe with some micro ai) and change
+                    #this message consequently?
                     message= _ "Wait, what’s going on? The volcano is going to erupt! Everyone, try to get out of these caves!"
                 [/message]
                 # once they try to escape, if they move to the top 2 rows you lose
@@ -664,7 +669,6 @@
         {CHANGE_MAP 4}
         {CHANGE_MAP 5}
         {CHANGE_MAP 6}
-        {CHANGE_MAP 7}
         [store_locations]
             [filter]
                 [not]
@@ -709,6 +713,7 @@
                     role=dumbelf
                     message= _ "Aghh!! The volcano is erupting, and now our exit has been blocked off!!"
                 [/message]
+
                 [fire_event]
                     name=lava kills all
                 [/fire_event]