AToTB S02 Fix bug: Inconsitent objectives

If you find the kidnappers the objective changes to killing them; but if you then kill Nil-Galion, the objective changes back to finding the kidnappers. Clean up the mess.
wesnoth · Aug 19, 2016 · 7a3d2e3 · 7a3d2e3
1 parent fbedc20
commit 7a3d2e3
Showing 1 changed file with 44 additions and 36 deletions.
diff --git a/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg b/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
@@ -178,9 +178,47 @@ Besides... I want my brother back."
         [objectives]
             side=1
             [objective]
+                [show_if]
+                    [have_unit]
+                        id=Nil-Galion
+                    [/have_unit]
+                    [not]
+                        [variable]
+                            name=found_kidnappers
+                            boolean_equals=true
+                        [/variable]
+                    [/not]
+                [/show_if]
                 description= _ "Fight your way through the woods before the kidnappers escape"
                 condition=win
             [/objective]
+            [objective]
+                [show_if]
+                    [not]
+                        [have_unit]
+                            id=Nil-Galion
+                        [/have_unit]
+                    [/not]
+                    [not]
+                        [variable]
+                            name=found_kidnappers
+                            boolean_equals=true
+                        [/variable]
+                    [/not]
+                [/show_if]
+                description= _ "Catch the kidnappers"
+                condition=win
+            [/objective]
+            [objective]
+                [show_if]
+                    [variable]
+                        name=found_kidnappers
+                        boolean_equals=true
+                    [/variable]
+                [/show_if]
+                description= _ "Kill the Dark Adept before his reinforcements arrive"
+                condition=win
+            [/objective]
             [objective]
                 description= _ "Death of Arvith"
                 condition=lose
@@ -342,24 +380,8 @@ Besides... I want my brother back."
             message= _ "Curses! If they had been an hour slower our master’s reinforcements would already be here to meet us."
         [/message]
 
-        [objectives]
-            side=1
-            [objective]
-                description= _ "Kill the Dark Adept before his reinforcements arrive"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Death of Arvith"
-                condition=lose
-            [/objective]
-
-            {TURNS_RUN_OUT}
-
-            [gold_carryover]
-                bonus=yes
-                carryover_percentage=40
-            [/gold_carryover]
-        [/objectives]
+        {VARIABLE found_kidnappers true}
+        [show_objectives][/show_objectives]
     [/event]
 
     [event]
@@ -534,6 +556,9 @@ Besides... I want my brother back."
             [/option]
         [/message]
 #endif
+
+        {CLEAR_VARIABLE found_kidnappers}
+
         [endlevel]
             result=victory
             bonus=yes
@@ -576,24 +601,7 @@ Besides... I want my brother back."
             message= _ "Follow their back trail!"
         [/message]
 
-        [objectives]
-            side=1
-            [objective]
-                description= _ "Catch the kidnappers"
-                condition=win
-            [/objective]
-            [objective]
-                description= _ "Death of Arvith"
-                condition=lose
-            [/objective]
-
-            {TURNS_RUN_OUT}
-
-            [gold_carryover]
-                bonus=yes
-                carryover_percentage=40
-            [/gold_carryover]
-        [/objectives]
+        [show_objectives][/show_objectives]
     [/event]
 
     {ARVITH_LAST_BREATH}