UtBS: Fix a few more issues found by the schema validator

With this, UtBS is as clean of schema errors as it'll get (There are still two spurious errors remaining)
wesnoth · Apr 6, 2018 · 908f8e9 · 908f8e9
1 parent 0c914db
commit 908f8e9
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 21 deletions.
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
@@ -432,7 +432,7 @@
             array=tents
             [do]
                 {RANDOM 0..100}
-                {VARIABLE_OP random sub this_item.y}
+                {VARIABLE_OP random sub $this_item.y}
                 [if]
                     [variable]
                         name=random

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
@@ -270,17 +270,19 @@
         [ai]
             aggression=0.90
             caution=0.10
-        [/ai]
 
-        #causes assassin to attack Kaleh more than other units
+#ifdef WIP
+            #causes assassin to attack Kaleh more than other units
 
-        [goal]
-            name=target
-            [criteria]
-                id=Kaleh
-            [/criteria]
-            value=20
-        [/goal]
+            [goal]
+                name=target
+                [criteria]
+                    id=Kaleh
+                [/criteria]
+                value=20
+            [/goal]
+#endif
+        [/ai]
     [/side]
 
     # Prestart functions:

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
@@ -139,14 +139,16 @@
         [ai]
             aggression=0.90
             caution=0.10
+#ifdef WIP
+            [goal]
+                name=target
+                [criteria]
+                    id=Kaleh
+                [/criteria]
+                value=20
+            [/goal]
+#endif
         [/ai]
-        [goal]
-            name=target
-            [criteria]
-                id=Kaleh
-            [/criteria]
-            value=20
-        [/goal]
     [/side]
 
     #Side=6 dwarf 2 (main base guards)

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
@@ -376,7 +376,7 @@
         [if]
             [variable]
                 name=ally_name
-                value=Rogrimir
+                equals=Rogrimir
             [/variable]
 
             [then]
@@ -424,7 +424,7 @@
         [if]
             [variable]
                 name=ally_name
-                value=Rogrimir
+                equals=Rogrimir
             [/variable]
 
             [then]

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -3867,7 +3867,9 @@
                     ai_type=messenger_escort
                     action=add
 
-                    id=messenger
+                    [filter]
+                        id=messenger
+                    [/filter]
                     waypoint_x,waypoint_y=42,1
                 [/micro_ai]
             [/then]

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
@@ -2763,7 +2763,7 @@
 
         # Removes the ^Wyc overlay from any location which has it
         [terrain]
-            terrain="^ "
+            terrain=^
             layer=overlay
             [and]
                 terrain=*^Wyc