TSG: allow skipping S6a with debug mode

by moving important things into a separate victory event. [ci skip]
wesnoth · Sep 13, 2017 · a307d37 · a307d37
1 parent f734cb6
commit a307d37
Showing 1 changed file with 77 additions and 73 deletions.
diff --git a/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg b/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
@@ -459,79 +459,6 @@
                     image=wesnoth-icon.png
                 [/message]
 
-                # The next scenario is again led by Deoran, so store away Gerrick and
-                # his troops, except those remaining on the recall list.
-
-                [heal_unit]
-                    [filter]
-                        side=1
-                    [/filter]
-                    amount=full
-                    animate=no
-                    moves=full
-                    restore_attacks=yes
-                    restore_status=yes
-                [/heal_unit]
-
-                [store_unit]
-                    [filter]
-                        id=Sir Gerrick
-                    [/filter]
-
-                    kill=yes
-                    variable=stored_Sir_Gerrick
-                [/store_unit]
-
-                {VARIABLE stored_Sir_Gerrick.canrecruit no}
-                {VARIABLE stored_Sir_Gerrick.ellipse misc/ellipse-hero}
-                {VARIABLE stored_Sir_Gerrick.overlays misc/hero-icon.png}
-
-                [store_unit]
-                    variable=stored_Sir_Gerrick_army
-                    [filter]
-                        side=1
-                        {NOT_ON_RECALL_LIST}
-                    [/filter]
-                    kill=yes
-                [/store_unit]
-
-                # Reinstate Deoran as the leader and unstore Hylas, Ethiliel and
-                # troops so they're all again recallable in the next scenario.
-
-                [unstore_unit]
-                    variable=stored_Deoran
-                    x,y=recall,recall
-                [/unstore_unit]
-
-                [unstore_unit]
-                    variable=stored_Ethiliel
-                [/unstore_unit]
-
-                [unstore_unit]
-                    variable=stored_Hylas
-                [/unstore_unit]
-
-                [foreach]
-                    array=stored_elvish_bodyguards
-                    [do]
-                        [unstore_unit]
-                            variable=this_item
-                        [/unstore_unit]
-                    [/do]
-                [/foreach]
-
-                [modify_side]
-                    side=1
-                    gold=$stored_Deoran_side.gold
-                [/modify_side]
-
-                {CLEAR_VARIABLE stored_Deoran_side}
-                {CLEAR_VARIABLE stored_Deoran}
-                {CLEAR_VARIABLE stored_Ethiliel}
-                {CLEAR_VARIABLE stored_Hylas}
-                {CLEAR_VARIABLE stored_elvish_bodyguards}
-                {CLEAR_VARIABLE has_mermen,naga_queen_sighted}
-
                 [endlevel]
                     result=victory
                     bonus=no
@@ -541,4 +468,81 @@
             [/else]
         [/if]
     [/event]
+
+    [event]
+        name=victory
+
+        # The next scenario is again led by Deoran, so store away Gerrick and
+        # his troops, except those remaining on the recall list.
+
+        [heal_unit]
+            [filter]
+                side=1
+            [/filter]
+            amount=full
+            animate=no
+            moves=full
+            restore_attacks=yes
+            restore_status=yes
+        [/heal_unit]
+
+        [store_unit]
+            [filter]
+                id=Sir Gerrick
+            [/filter]
+
+            kill=yes
+            variable=stored_Sir_Gerrick
+        [/store_unit]
+
+        {VARIABLE stored_Sir_Gerrick.canrecruit no}
+        {VARIABLE stored_Sir_Gerrick.ellipse misc/ellipse-hero}
+        {VARIABLE stored_Sir_Gerrick.overlays misc/hero-icon.png}
+
+        [store_unit]
+            variable=stored_Sir_Gerrick_army
+            [filter]
+                side=1
+                {NOT_ON_RECALL_LIST}
+            [/filter]
+            kill=yes
+        [/store_unit]
+
+        # Reinstate Deoran as the leader and unstore Hylas, Ethiliel and
+        # troops so they're all again recallable in the next scenario.
+
+        [unstore_unit]
+            variable=stored_Deoran
+            x,y=recall,recall
+        [/unstore_unit]
+
+        [unstore_unit]
+            variable=stored_Ethiliel
+        [/unstore_unit]
+
+        [unstore_unit]
+            variable=stored_Hylas
+        [/unstore_unit]
+
+        [foreach]
+            array=stored_elvish_bodyguards
+            [do]
+                [unstore_unit]
+                    variable=this_item
+                [/unstore_unit]
+            [/do]
+        [/foreach]
+
+        [modify_side]
+            side=1
+            gold=$stored_Deoran_side.gold
+        [/modify_side]
+
+        {CLEAR_VARIABLE stored_Deoran_side}
+        {CLEAR_VARIABLE stored_Deoran}
+        {CLEAR_VARIABLE stored_Ethiliel}
+        {CLEAR_VARIABLE stored_Hylas}
+        {CLEAR_VARIABLE stored_elvish_bodyguards}
+        {CLEAR_VARIABLE has_mermen,naga_queen_sighted}
+    [/event]
 [/scenario]