SotBE S2: end scenario if Kapou'e is already at signpost

… when the messenger reappears. Previously, one would have had to move Kapou’e off the post and back onto it.
wesnoth · Apr 17, 2014 · a30b6cb · a30b6cb
1 parent 4e98ab3
commit a30b6cb
Showing 1 changed file with 41 additions and 19 deletions.
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
@@ -292,6 +292,20 @@
             [/gold_carryover]
         [/objectives]
 
+        [if]
+            [have_unit]
+                x=28
+                y=1
+                id="Kapou'e"
+            [/have_unit]
+
+            [then]
+                [fire_event]
+                    name=Kapoue_leaves
+                [/fire_event]
+            [/then]
+        [/if]
+
         [event]
             name=moveto
 
@@ -301,28 +315,36 @@
                 id="Kapou'e"
             [/filter]
 
-            [message]
-                speaker="Kapou'e"
-                message= _ "We’ll be back, you foul mud-sucking humans!"
-            [/message]
+            [fire_event]
+                name=Kapoue_leaves
+            [/fire_event]
+        [/event]
+    [/event]
 
-            [message]
-                speaker="Lanbec'h"
-                message= _ "That’s right, flee, you cowardly orcs! This land is mine!"
-            [/message]
+    [event]
+        name=Kapoue_leaves
 
-            [message]
-                speaker="Kapou'e"
-                message= _ "In your dreams, worm. When the time comes you will pay for all this with your life!"
-                image=portraits/kapoue-angry.png
-            [/message]
+        [message]
+            speaker="Kapou'e"
+            message= _ "We’ll be back, you foul mud-sucking humans!"
+        [/message]
 
-            [endlevel]
-                result=victory
-                bonus=no
-                {NEW_GOLD_CARRYOVER 40}
-            [/endlevel]
-        [/event]
+        [message]
+            speaker="Lanbec'h"
+            message= _ "That’s right, flee, you cowardly orcs! This land is mine!"
+        [/message]
+
+        [message]
+            speaker="Kapou'e"
+            message= _ "In your dreams, worm. When the time comes you will pay for all this with your life!"
+            image=portraits/kapoue-angry.png
+        [/message]
+
+        [endlevel]
+            result=victory
+            bonus=no
+            {NEW_GOLD_CARRYOVER 40}
+        [/endlevel]
     [/event]
 
     {KAPOUE_DEATH}