UtBS S05 Enforce encounter with the Cloaked Figure (#6644)

* Enforce encounter with the Cloaked Figure * Revert "Avoid counting encounters with 'Cloaked Figure'." This reverts commit ada454b.
wesnoth · May 9, 2022 · 7e87826 · 7e87826
1 parent 3d5cef2
commit 7e87826
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -5,6 +5,7 @@
    * Sceptre of Fire
      * S9: Allow Grypon Riders to complete the scenario (issue #6332)
    * Under the Burning Suns
+     * S5: Enforce encounter with the Cloaked Figure (issue #6364)
      * S8: Spawned units will now be unable to be blocked into walls (PR #6677)
  ### Editor
    * Added some missing terrain groupings (issue #6643)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
@@ -297,6 +297,7 @@
     # initialize starting variable
     # create elf units
     # create AI=guardian starting units
+    # initiate assassin trigger variable
 
     #fires lighting central cavern
     {ANIMATED_CAMPFIRE 31 32}
@@ -457,6 +458,8 @@
                 [/unit]
             [/then]
         [/if]
+
+        {VARIABLE assassin_triggered no}
     [/event]
 
     # starting events
@@ -2057,6 +2060,7 @@
     [event]
         name=call_assassin
 
+        first_time_only=yes
         [store_locations]
             [filter]
                 id=Kaleh
@@ -2065,6 +2069,8 @@
             variable=dark_assassin_location
         [/store_locations]
 
+        {VARIABLE assassin_triggered yes}
+
         [unit]
             type=Dark Assassin Cloaked
             id=Cloaked Figure
@@ -2343,6 +2349,20 @@
             animate=no
         [/kill]
 
+        [if]
+            [variable]
+                name=assassin_triggered
+                equals=yes
+            [/variable]
+            [else]
+                [fire_event]
+                    name=call_assassin
+                [/fire_event]
+            [/else]
+        [/if]
+
+        {CLEAR_VARIABLE assassin_triggered}
+
         [switch]
             variable=ally_race
 

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -2422,7 +2422,7 @@
         [/message]
     [/event]
 
-    # Event 13: Encounter Cloaked Figure for (potentially) a third time
+    # Event 13: Encounter Cloaked Figure for a third time
 
     [event]
         name=moveto
@@ -2462,7 +2462,7 @@
 
         [message]
             speaker=Kaleh
-            message= _ "In Eloh’s name, not you again. Must I fight you another time?"
+            message= _ "In Eloh’s name, not you again. Must I fight you a third time?"
         [/message]
 
         [message]