Made the scenario able to cope with lack of potential escapees

wesnoth · Apr 19, 2016 · 9d95682 · 9d95682
1 parent 9b931a5
commit 9d95682
Showing 1 changed file with 50 additions and 23 deletions.
diff --git a/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg b/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
@@ -120,56 +120,83 @@
 
         [role]
             side=1
-            type=Royal Guard,Halberdier,Great Mage,Master Bowman,Arch Mage,Silver Mage,Mage of Light,Javelineer,Swordsman,Pikeman,Longbowman,Red Mage,White Mage,Mage,Spearman,Cavalryman,Horseman,Iron Mauler,Shock Trooper,Heavy Infantryman
+            type=Royal Guard,Halberdier,Great Mage,Master Bowman,Arch Mage,Silver Mage,Mage of Light,Javelineer,Swordsman,Pikeman,Longbowman,Red Mage,White Mage,Mage,Spearman,Bowman,Iron Mauler,Shock Trooper,Heavy Infantryman,Cavalryman,Horseman
             role=escapee leader
             [not]
                 id=Dacyn
             [/not]
         [/role]
+        [if]
+            [have_unit]
+                role=escapee leader
+                search_recall_list=yes
+            [/have_unit]
+            [else]
+                {GENERIC_UNIT 1 "Mage" "recall" "recall"}
+                [+unit]
+                    role=escapee leader
+                [/unit]
+            [/else]
+        [/if]
+        [recall]
+            role=escapee leader
+            x,y=25,3
+        [/recall]
 
         [role]
             side=1
-            type=White Mage,Red Mage,Longbowman,Pikeman,Swordsman,Javelineer,Mage,Spearman,Cavalryman,Horseman,Mage of Light,Arch Mage,Silver Mage,Master Bowman,Halberdier,Royal Guard,Great Mage,Iron Mauler,Shock Trooper,Heavy Infantryman
+            type=White Mage,Red Mage,Longbowman,Pikeman,Swordsman,Javelineer,Mage,Spearman,Bowman,Mage of Light,Arch Mage,Silver Mage,Master Bowman,Halberdier,Royal Guard,Great Mage,Iron Mauler,Shock Trooper,Heavy Infantryman,Cavalryman,Horseman
             role=escapee sidekick 1
             [not]
                 id=Dacyn
             [/not]
             [not]
-                [and]
-                    role=escapee leader
-                [/and]
+                role=escapee leader
             [/not]
         [/role]
+        [if]
+            [have_unit]
+                role=escapee sidekick 1
+                search_recall_list=yes
+            [/have_unit]
+            [else]
+                {GENERIC_UNIT 1 "Spearman" "recall" "recall"}
+                [+unit]
+                    role=escapee sidekick 1
+                [/unit]
+            [/else]
+        [/if]
+        [recall]
+            role=escapee sidekick 1
+            x,y=24,3
+        [/recall]
 
         [role]
             side=1
-            type=Spearman,Mage,Bowman,Mage,Red Mage,Longbowman,Pikeman,Swordsman,Javelineer,Cavalryman,Horseman,Mage of Light,Arch Mage,Silver Mage,Master Bowman,Halberdier,Royal Guard,Great Mage,Iron Mauler,Shock Trooper,Heavy Infantryman
+            type=Spearman,Mage,Bowman,Mage,Red Mage,Longbowman,Pikeman,Swordsman,Javelineer,Mage of Light,Arch Mage,Silver Mage,Master Bowman,Halberdier,Royal Guard,Great Mage,Iron Mauler,Shock Trooper,Heavy Infantryman,Cavalryman,Horseman
             role=escapee sidekick 2
             [not]
                 id=Dacyn
             [/not]
             [not]
-                [and]
-                    role=escapee leader
-                [/and]
+                role=escapee leader
             [/not]
             [not]
-                [and]
-                    role=escapee sidekick 1
-                [/and]
+                role=escapee sidekick 1
             [/not]
         [/role]
-
-        [recall]
-            role=escapee leader
-            x,y=25,3
-        [/recall]
-
-        [recall]
-            role=escapee sidekick 1
-            x,y=24,3
-        [/recall]
-
+        [if]
+            [have_unit]
+                role=escapee sidekick 2
+                search_recall_list=yes
+            [/have_unit]
+            [else]
+                {GENERIC_UNIT 1 "Bowman" "recall" "recall"}
+                [+unit]
+                    role=escapee sidekick 2
+                [/unit]
+            [/else]
+        [/if]
         [recall]
             role=escapee sidekick 2
             x,y=25,4