AOI: General AI rewrite

Removes all the default values and improves the syntax where possible
wesnoth · Sep 2, 2018 · 9086e17 · 9086e17
1 parent 240d235
commit 9086e17
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 59 deletions.
diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
@@ -94,11 +94,6 @@
         canrecruit=yes
 
         facing=se
-
-        [ai]
-            grouping=offensive
-            attack_depth=5
-        [/ai]
     [/side]
 
     {STARTING_VILLAGES 1 6}

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
@@ -69,21 +69,15 @@
         [ai]
             villages_per_scout=6
             aggression=0.5
-            caution=0.25
-            leader_value=3
-            village_value=1
-            scout_village_targeting=3
             [goal]
                 name=protect_unit
                 [criteria]
                     side=2
                     canrecruit=yes
                 [/criteria]
-                protect_radius=20
-                value=1
+                protect_radius=10
+                value=100
             [/goal]
-            grouping=offensive
-            attack_depth=5
         [/ai]
     [/side]
 

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg
@@ -72,11 +72,6 @@
         canrecruit=yes
 
         facing=se
-
-        [ai]
-            grouping=offensive
-            attack_depth=5
-        [/ai]
     [/side]
 
     [event]

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg
@@ -78,17 +78,11 @@
         facing=ne
 
         [ai]
-            aggression=0.8
-            turns="4,5,6,10,11,12,16,17,18,22,23,24"
-            grouping=offensive
-            {ATTACK_DEPTH 1 3 5}
-        [/ai]
-        [ai]
-            aggression=-0.1
-            simple_targeting=yes
-            turns="1,2,3,7,8,9,13,14,15,19,20,21"
-            grouping=none
             {ATTACK_DEPTH 1 3 5}
+            {AI_SIMPLE_DAY_ASPECT aggression -0.1}
+            {AI_SIMPLE_DAY_ASPECT simple_targeting yes}
+            {AI_SIMPLE_DAY_ASPECT grouping no}
+            {AI_SIMPLE_NIGHT_ASPECT aggression 0.8}
         [/ai]
     [/side]
 
@@ -118,17 +112,10 @@
         facing=sw
 
         [ai]
-            aggression=0.8
-            turns="4,5,6,10,11,12,16,17,18,22,23,24"
-            grouping=offensive
-            attack_depth=5
-        [/ai]
-        [ai]
-            aggression=-0.1
-            turns="1,2,3,7,8,9,13,14,15,19,20,21"
-            grouping=none
-            attack_depth=5
-            simple_targeting=yes
+            {AI_SIMPLE_DAY_ASPECT aggression -0.1}
+            {AI_SIMPLE_DAY_ASPECT simple_targeting yes}
+            {AI_SIMPLE_DAY_ASPECT grouping no}
+            {AI_SIMPLE_NIGHT_ASPECT aggression 0.8}
         [/ai]
     [/side]
 

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg
@@ -72,11 +72,7 @@
         facing=se
 
         [ai]
-            grouping=offensive
             {ATTACK_DEPTH 4 5 6}
-            villages_per_scout=4
-            leader_value=3
-            village_value=1
         [/ai]
     [/side]
 

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg
@@ -51,14 +51,6 @@
         canrecruit=yes
 
         facing=nw
-
-        [ai]
-            villages_per_scout=4
-            leader_value=3
-            village_value=1
-            grouping=offensive
-            attack_depth=5
-        [/ai]
     [/side]
 
     [event]

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
@@ -64,14 +64,6 @@
         canrecruit=yes
 
         facing=se
-
-        [ai]
-            villages_per_scout=4
-            leader_value=3
-            village_value=1
-            grouping=offensive
-            attack_depth=5
-        [/ai]
     [/side]
 
     {STARTING_VILLAGES 1 4}