Micro AI tests: do not change controller to null for active side

wesnoth · Mar 28, 2016 · 1e3d80d · 1e3d80d
1 parent 9ed1b39
commit 1e3d80d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 20 deletions.
diff --git a/data/ai/micro_ais/scenarios/animals.cfg b/data/ai/micro_ais/scenarios/animals.cfg
@@ -360,14 +360,19 @@ Also note: The Animal AIs are coded as Micro AIs. A Micro AI can be added and ad
             [option]
                 label= _ "<span font='16'>I'll just watch the animals.</span>"
                 [command]
-                    [modify_side]
-                        side=1
-                        controller=null
-                        hidden=yes
-                    [/modify_side]
-                    [kill]
-                        side=1
-                    [/kill]
+                    [end_turn]
+                    [/end_turn]
+                    [event]
+                        name=side 2 turn
+                        [modify_side]
+                            side=1
+                            controller=null
+                            hidden=yes
+                        [/modify_side]
+                        [kill]
+                            side=1
+                        [/kill]
+                    [/event]
                 [/command]
             [/option]
             [option]

diff --git a/data/ai/micro_ais/scenarios/goto.cfg b/data/ai/micro_ais/scenarios/goto.cfg
@@ -365,12 +365,15 @@
                 {VARIABLE_CONDITIONAL scenario_name equals goto}
             [/show_if]
             [command]
-                [modify_side]
-                    side=1
-                    controller=null
-                [/modify_side]
                 [end_turn]
                 [/end_turn]
+                [event]
+                    name=side turn
+                    [modify_side]
+                        side=1
+                        controller=null
+                    [/modify_side]
+                [/event]
             [/command]
         [/set_menu_item]
         [set_menu_item]

diff --git a/data/ai/micro_ais/scenarios/wolves.cfg b/data/ai/micro_ais/scenarios/wolves.cfg
@@ -205,14 +205,19 @@ Also note that the wolves AI is coded as a Micro AI. A Micro AI can be added and
             [option]
                 label= _ "<span font='16'>I'll just watch the two wolf sides.</span>"
                 [command]
-                    [modify_side]
-                        side=1
-                        controller=null
-                        hidden=yes
-                    [/modify_side]
-                    [kill]
-                        side=1
-                    [/kill]
+                    [end_turn]
+                    [/end_turn]
+                    [event]
+                        name=side 2 turn
+                        [modify_side]
+                            side=1
+                            controller=null
+                            hidden=yes
+                        [/modify_side]
+                        [kill]
+                            side=1
+                        [/kill]
+                    [/event]
                 [/command]
             [/option]
             [option]