DiD: fix bugged recalls inside manor

wesnoth · Oct 25, 2019 · 88a223b · 88a223b
1 parent cd7ed4c
commit 88a223b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
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
@@ -370,18 +370,15 @@
                 [/filter_wml]
             [/filter]
 
-            kill=yes
             variable=units_inside_manor
         [/store_unit]
 
         [foreach]
             array=units_inside_manor
             [do]
-                # TODO: whats the point of killing it and then unstoring it here without changes?
-                [unstore_unit]
-                    variable=this_item
-                    find_vacant=no
-                [/unstore_unit]
+                [recall]
+                    id=$this_item.id
+                [/recall]
 
                 [modify_unit]
                     [filter]
@@ -395,10 +392,6 @@
                         [/effect]
                     [/object]
                 [/modify_unit]
-
-                [recall]
-                    id=$this_item.id
-                [/recall]
             [/do]
         [/foreach]
 

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
@@ -319,8 +319,8 @@
                     y=1-7
                 [/not]
                 [not]
-                    x=20-35
-                    y=16-20
+                    x=20-35,24
+                    y=16-20,15
                 [/not]
                 [not]
                     x=25-29
@@ -349,8 +349,8 @@
                     y=1-7
                 [/not]
                 [not]
-                    x=20-35
-                    y=16-20
+                    x=20-35,24
+                    y=16-20,15
                 [/not]
                 [not]
                     x=25-29
@@ -400,17 +400,15 @@
                 [/filter_wml]
             [/filter]
 
-            kill=yes
             variable=units_inside_manor
         [/store_unit]
 
         [foreach]
             array=units_inside_manor
             [do]
-                [unstore_unit]
-                    variable=this_item
-                    find_vacant=no
-                [/unstore_unit]
+                [recall]
+                    id=$this_item.id
+                [/recall]
 
                 [modify_unit]
                     [filter]
@@ -424,10 +422,6 @@
                         [/effect]
                     [/object]
                 [/modify_unit]
-
-                [recall]
-                    id=$this_item.id
-                [/recall]
             [/do]
         [/foreach]