From 3c57546e8932d576182570ba01c0e9e8c3f466f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Severin=20Gl=C3=B6ckner?=
 <severin.gloeckner@stud.htwk-leipzig.de>
Date: Sat, 14 Jul 2018 16:15:51 +0200
Subject: [PATCH] THoT S6: improve mage appearance event

- is now less odd if the event is triggered from the map borders
- works with debug mode

[ci skip]
---
 .../scenarios/06_High_Pass.cfg                | 48 +++++++++++++++----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
index c64b89f857a9..b4a6589b585a 100644
--- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
+++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
@@ -152,7 +152,9 @@
         [/message]
 
         [remove_shroud]
-            side=1
+            [filter_side]
+                side=1
+            [/filter_side]
             x=29-31,30
             y=11-12,10
         [/remove_shroud]
@@ -160,7 +162,9 @@
         {HIGHLIGHT_IMAGE 30 11 scenery/signpost.png ()}
 
         [place_shroud]
-            side=1
+            [filter_side]
+                side=1
+            [/filter_side]
             x=29-31,30
             y=11-12,10
         [/place_shroud]
@@ -222,7 +226,7 @@
 #endif
     [/event]
 
-    # If user hasn't found Ratheln by a reasonable time, nudge a little.
+    # If the user hasn't found Ratheln by a reasonable time, nudge a little.
     [event]
         name=turn 8
         [filter_condition]
@@ -247,9 +251,6 @@
             side=1
             [filter_location]
                 # Should be triggered regardless of how the Dwarves move through.
-                # It will look a little odd if they've all decided to slog through
-                # the mountains to the extreme north or south, but that is quite
-                # unlikely.
                 x=18-21
                 y=0-21
             [/filter_location]
@@ -258,6 +259,21 @@
         [cancel_action]
         [/cancel_action]
 
+        [fire_event]
+            name=meeting a mage
+        [/fire_event]
+
+        [redraw]
+            clear_shroud=yes
+            side=1
+        [/redraw]
+
+        [show_objectives][/show_objectives]
+    [/event]
+
+    [event]
+        name=meeting a mage
+
         [unit]
             side=1
             x,y=19,11
@@ -266,6 +282,15 @@
             {CHARACTER_STATS_RATHELN}
         [/unit]
 
+        # In case the area was not yet visible
+        [remove_shroud]
+            [filter_side]
+                side=1
+            [/filter_side]
+            x,y=19,11
+            radius=1
+        [/remove_shroud]
+
         [message]
             speaker=Ratheln
             message= _ "Hail, I am Ratheln. If you’re traveling down the pass, please take me with you. I am near freezing and starving to death up here."
@@ -300,8 +325,6 @@
             speaker=Aiglondur
             message= _ "Aye. And I’d not leave anyone who had done my kin no harm stranded to starve."
         [/message]
-
-        [show_objectives][/show_objectives]
     [/event]
 
     # In this scenario only, losing Ratheln is fatal.
@@ -375,6 +398,15 @@
         [/endlevel]
     [/event]
 
+    [event]
+        name=victory
+
+        # It is only in debug mode possible that this event did not occur
+        [fire_event]
+            name=meeting a mage
+        [/fire_event]
+    [/event]
+
     # No need for Ratheln's death event here since he has a custom one this scenario
     {HERODEATH_AIGLONDUR}
     {HERODEATH_ANGARTHING}