Split [avoid] locations with [or]

wesnoth · Mar 1, 2020 · 91d778e · 91d778e
1 parent a03ee49
commit 91d778e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
@@ -201,8 +201,24 @@ Chapter Three"
             caution=-100.0
             grouping=no
             [avoid]
-                x=1-37,1-17,21-37, 1-5,23-37,1-3,28-37,34-37, 1-37,1-4,13-17,26-37,9-10, 8-13,10-13,9-12,21-24,22-23,22-24
-                y= 1-4,   5,    5,   6,    6,  7,    7,    8,14-34, 13,   13,   13,   7,    8,    9,  10,   10,   11,    9
+                x=1-37,1-17,21-37, 1-5,23-37,1-3,28-37,34-37
+                y= 1-4,   5,    5,   6,    6,  7,    7,    8
+                [or]
+                    x=1-37
+                    y=14-34
+                [/or]
+                [or]
+                    x=1-37
+                    y=14-34
+                [/or]
+                [or]
+                    x=1-4,13-17,26-37
+                    y= 13,   13,   13
+                [/or]
+                [or]
+                    x=9-10, 8-13,10-13,9-12,21-24,22-23,22-24
+                    y=   7,    8,    9,  10,   10,   11,    9
+                [/or]
             [/avoid]
             village_value=0
         [/ai]

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
@@ -99,8 +99,10 @@
 #define AVOID_ALLIES
     [ai]
         [avoid]
-            x=27,27,27,26,26,28,28,5,5,5,4,4,6,6
-            y= 5, 6, 7, 5, 6, 5, 6,3,4,5,3,4,3,4
+            {CASTLE_OF_FLARTAR}
+            [or]
+                {CASTLE_OF_GRUU}
+            [/or]
         [/avoid]
     [/ai]
 #enddef