DiD S8,S9: Carry over units created via plague

wesnoth · Dec 17, 2018 · a475956 · a475956
1 parent 557015d
commit a475956
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
@@ -443,18 +443,7 @@
 
     [event]
         name=victory
-
-        {MODIFY_UNIT (
-            side=1
-            {NOT_ON_RECALL_LIST}
-            [not]
-                id=Malin Keshar
-
-                [or]
-                    id=Darken Volk
-                [/or]
-            [/not]
-        ) variables.got_inside_manor yes}
+        {SET_GOT_INSIDE_MANOR}
     [/event]
 
     {HERODEATH_MALIN}

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
@@ -357,6 +357,13 @@
         [/endlevel]
     [/event]
 
+    # The player may have created new units using the plague ability. They
+    # should carry over to the next scenario.
+    [event]
+        name=victory
+        {SET_GOT_INSIDE_MANOR}
+    [/event]
+
     {HERODEATH_MALIN}
     {HERODEATH_VOLK_B}
 

diff --git a/data/campaigns/Descent_Into_Darkness/utils/macros.cfg b/data/campaigns/Descent_Into_Darkness/utils/macros.cfg
@@ -246,3 +246,17 @@
         [/clear_variable]
     [/event]
 #enddef
+
+#define SET_GOT_INSIDE_MANOR
+        {MODIFY_UNIT (
+            side=1
+            {NOT_ON_RECALL_LIST}
+            [not]
+                id=Malin Keshar
+
+                [or]
+                    id=Darken Volk
+                [/or]
+            [/not]
+        ) variables.got_inside_manor yes}
+#enddef