Fix instances of multiple [avoid]s in [side]s (#4776)

* Avoid using multiple [avoid] tags
wesnoth · Feb 29, 2020 · a03ee49 · a03ee49
1 parent d13ad0c
commit a03ee49
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 57 deletions.
diff --git a/data/campaigns/Eastern_Invasion/scenarios/17a_The_Duel.cfg b/data/campaigns/Eastern_Invasion/scenarios/17a_The_Duel.cfg
@@ -45,14 +45,10 @@
             leader_value=20
 
             [avoid]
-                x=20
-                y=4
+                x=20,28
+                y= 4, 8
             [/avoid]
 
-            [avoid]
-                x=28
-                y=8
-            [/avoid]
         [/ai]
         {FLAG_VARIANT undead}
     [/side]

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
@@ -149,16 +149,8 @@
             [/goal]
 
             [avoid]
-                x="9-23"
-                y="1-9"
-            [/avoid]
-            [avoid]
-                x="14-19"
-                y="10-14"
-            [/avoid]
-            [avoid]
-                x="20-40"
-                y="16-24"
+                x=9-23,14-19,20-40
+                y= 1-9,10-14,16-24
             [/avoid]
         [/ai]
 

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
@@ -140,12 +140,8 @@
             caution=-4.0
             grouping=no
             [avoid]
-                x=1-100
-                y=21-100
-            [/avoid]
-            [avoid]
-                x=1-100
-                y=1-12
+                x= 1-100,1-100
+                y=21-100, 1-12
             [/avoid]
             #target Konrad especially heavily
             [goal]

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,20 +201,8 @@ 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
-                y= 1-4,   5,    5,   6,    6,  7,    7,    8
-            [/avoid]
-            [avoid]
-                x=1-37
-                y=14-34
-            [/avoid]
-            [avoid]
-                x=1-4,13-17,26-37
-                y= 13,   13,   13
-            [/avoid]
-            [avoid]
-                x=9-10, 8-13,10-13,9-12,21-24,22-23,22-24
-                y=   7,    8,    9,  10,   10,   11,    9
+                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
             [/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,10 +99,8 @@
 #define AVOID_ALLIES
     [ai]
         [avoid]
-            {CASTLE_OF_FLARTAR}
-        [/avoid]
-        [avoid]
-            {CASTLE_OF_GRUU}
+            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
         [/avoid]
     [/ai]
 #enddef

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
@@ -159,11 +159,8 @@ _ "These undead trolls fight again in death as they did in life, except this tim
 
             #fire guardians can't leave lava cavern
             [avoid]
-                x,y=39-46,77-81
-            [/avoid]
-
-            [avoid]
-                x,y=30-34,92-100
+                x=39-46, 30-34
+                y=77-81,92-100
             [/avoid]
         [/ai]
     [/side]

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
@@ -53,11 +53,8 @@
 
             #defend advance outpost, don't retreat
             [avoid]
-                x,y=19-26,30-32
-            [/avoid]
-
-            [avoid]
-                x,y=16-18,33-35
+                x=19-26,16-18
+                y=30-32,33-35
             [/avoid]
         [/ai]
         {FLAG_VARIANT knalgan}
@@ -109,14 +106,10 @@
 
             recruitment_pattern=scout
 
-            #bats can't go down SW tunnel
-            [avoid]
-                x,y=24-42, 23-50
-            [/avoid]
-
-            #bats can't go west and attack dwarves
+            #bats can't go down SW tunnel or go west and attack dwarves
             [avoid]
-                x,y=33-35,13-15
+                x=24-42,33-35
+                y=23-50,13-15
             [/avoid]
 
             passive_leader=yes