Update 07_The_bridge_is_broken.cfg

add checks to ensure second_unit is on your side before letting it speak addresses checkbox 4 of issue #25
cooljeanius · Jun 7, 2022 · 2dd3009 · 2dd3009
1 parent 35c8177
commit 2dd3009
Showing 1 changed file with 36 additions and 10 deletions.
diff --git a/scenarios/07_The_bridge_is_broken.cfg b/scenarios/07_The_bridge_is_broken.cfg
@@ -1085,11 +1085,24 @@
                 {VARIABLE b_SideNineAwoken yes}
                 # wmllint: recognize RoFenthor
                 {WAKEUP_SIDE_NINE}
-                # TODO: add a check to ensure second_unit belongs to the player, to avoid debug-mode kills triggering this:
-                [message]
-                    speaker=second_unit
-                    message=_"I think I heard something echo from the depths... I fear these goblins may have been only the start of the enemies in this cave... We should investigate our surroundings to secure our perimeter."
-                [/message]
+                [if]
+                    [have_unit]
+                        id=$second_unit.id
+                        side=1
+                    [/have_unit]
+                    [then]
+                        [message]
+                            speaker=second_unit
+                            message=_"I think I heard something echo from the depths... I fear these goblins may have been only the start of the enemies in this cave... We should investigate our surroundings to secure our perimeter."
+                        [/message]
+                    [/then]
+                    [else]
+                        [message]
+                            side=1
+                            message=_"I think I heard something echo from the depths... I fear these goblins may have been only the start of the enemies in this cave... We should investigate our surroundings to secure our perimeter."
+                        [/message]
+                    [/else]
+                [/if]
                 [message]
                     speaker=Hamel
                     #po: this should work as a follow-up to the previous message regardless of whether Hamel is second_unit himself or not:
@@ -1374,11 +1387,24 @@
             # po: "failed" as in "failed at guarding the trap door" that is:
             message=_"Oh master, I have failed..."
         [/message]
-        # TODO: add a check to ensure second_unit belongs to the player, to avoid debug-mode kills triggering this:
-        [message]
-            speaker=second_unit
-            message=_"Now, to that trap door!"
-        [/message]
+        [if]
+            [have_unit]
+                id=$second_unit.id
+                side=1
+            [/have_unit]
+            [then]
+                [message]
+                    speaker=second_unit
+                    message=_"Now, to that trap door!"
+                [/message]
+            [/then]
+            [else]
+                [message]
+                    side=1
+                    message=_"Now, to that trap door!"
+                [/message]
+            [/else]
+        [/if]
         [if]
             [variable]
                 name=b_Lava