From a03ee49ccf7754bcb9e808165466b41ace87ebc7 Mon Sep 17 00:00:00 2001 From: Thom Diment Date: Sat, 29 Feb 2020 23:35:24 +0000 Subject: [PATCH] Fix instances of multiple [avoid]s in [side]s (#4776) * Avoid using multiple [avoid] tags --- .../Eastern_Invasion/scenarios/17a_The_Duel.cfg | 8 ++------ .../scenarios/07_Crossroads.cfg | 12 ++---------- .../scenarios/11_The_Ford_of_Abez.cfg | 8 ++------ .../scenarios/chapter3/09_Bounty_Hunters.cfg | 16 ++-------------- .../scenarios/14_Back_Home.cfg | 6 ++---- .../scenarios/06a_In_the_Tunnels_of_Trolls.cfg | 7 ++----- .../scenarios/06b_In_the_Domain_of_Dwarves.cfg | 17 +++++------------ 7 files changed, 17 insertions(+), 57 deletions(-) diff --git a/data/campaigns/Eastern_Invasion/scenarios/17a_The_Duel.cfg b/data/campaigns/Eastern_Invasion/scenarios/17a_The_Duel.cfg index 700246387a24..03bfb773cdfa 100644 --- 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 index e6fcc6eeb522..fc7bd21d582f 100644 --- 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 index 211d9bbfa3ab..ae9bdce3dc37 100644 --- 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 index 99acc2468b05..bf67d1578405 100644 --- 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 index 275e51999093..8a8f834af559 100644 --- 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 index d358e6cf606e..9c0950f1c985 100644 --- 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 index 1c2e78c748c0..b459a645c6f0 100644 --- 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