Remove several deprecated recruitment-related aspects

- number_of_possible_recruits_to_force_recruit - recruitment_ignore_bad_combat - recruitment_ignore_bad_movement
wesnoth · Mar 22, 2016 · 7c9e24a · 7c9e24a
1 parent ca8cb3b
commit 7c9e24a
Show file tree

Hide file tree

Showing 69 changed files with 0 additions and 307 deletions.
diff --git a/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg b/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
@@ -76,8 +76,6 @@
     #against elves, and just do it
 #define EBESIEGED_RECRUITMENT
     [ai]
-        recruitment_ignore_bad_movement=yes
-        recruitment_ignore_bad_combat=yes
         simple_targeting=yes
     [/ai]
 #enddef

diff --git a/data/ai/utils/default_config.cfg b/data/ai/utils/default_config.cfg
@@ -61,12 +61,9 @@
 {DEFAULT_ASPECT_EMPTY leader_goal}
 {DEFAULT_ASPECT_VALUE leader_ignores_keep no}
 {DEFAULT_ASPECT_VALUE leader_value 3.0}
-{DEFAULT_ASPECT_VALUE number_of_possible_recruits_to_force_recruit 3.1}
 {DEFAULT_ASPECT_VALUE passive_leader no}
 {DEFAULT_ASPECT_VALUE passive_leader_shares_keep no}
 {DEFAULT_ASPECT_VALUE recruitment_diversity 2.0}
-{DEFAULT_ASPECT_VALUE recruitment_ignore_bad_combat no}
-{DEFAULT_ASPECT_VALUE recruitment_ignore_bad_movement no}
 [aspect]
     id=recruitment_instructions
     engine=cpp

diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
@@ -68,7 +68,6 @@
         facing=se
 
         [ai]
-            recruitment_ignore_bad_combat=yes
             villages_per_scout=6
             aggression=0.5
             caution=0.25

diff --git a/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg b/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
@@ -127,9 +127,6 @@
             side=2
             [ai]
                 recruitment_pattern=fighter,fighter,archer,scout,scout,scout # The scouts are to get more ghost variants.
-                # Ignoring these two makes for a more interesting variety of enemies:
-                recruitment_ignore_bad_combat=yes
-                recruitment_ignore_bad_movement=yes
                 scout_village_targeting=5
                 [goal]
                     name=protect_location

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
@@ -80,7 +80,6 @@
         team_name=orcs
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
         [/ai]
         [ai]
@@ -115,7 +114,6 @@
         team_name=orcs
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
         [/ai]
         [ai]
@@ -150,7 +148,6 @@
         team_name=orcs
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
         [/ai]
         [ai]

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
@@ -60,7 +60,6 @@
         [ai]
             village_value=0.2
             villages_per_scout=10
-            number_of_possible_recruits_to_force_recruit=1
             [goal]
                 name=target
                 [criteria]

diff --git a/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg b/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
@@ -97,7 +97,6 @@
         [ai]
             aggression=-0.2
             grouping=defensive
-            recruitment_ignore_bad_combat=yes
             recruitment_pattern=fighter,fighter,fighter,archer,scout
         [/ai]
     [/side]

diff --git a/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg b/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
@@ -50,7 +50,6 @@
         [ai]
             passive_leader=yes
             grouping=no
-            recruitment_ignore_bad_combat=yes
             aggression=0.4
             [aspect]
                 id=attacks

diff --git a/data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg b/data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
@@ -49,7 +49,6 @@
         user_team_name=_"Evil"
         [ai]
             recruitment_pattern=fighter,scout,fighter,scout
-            recruitment_ignore_bad_combat=yes
         [/ai]
         {FLAG_VARIANT6 ragged}
     [/side]
@@ -72,7 +71,6 @@
         user_team_name=_"Evil"
         [ai]
             recruitment_pattern=fighter,scout
-            recruitment_ignore_bad_combat=yes
         [/ai]
     [/side]
 
@@ -95,7 +93,6 @@
         user_team_name=_"Evil"
         [ai]
             recruitment_pattern=fighter,archer,fighter,mixed fighter
-            recruitment_ignore_bad_combat=yes
         [/ai]
         {FLAG_VARIANT6 ragged}
     [/side]

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
@@ -168,8 +168,6 @@
     #against elves, and just do it
 #define EBESIEGED_RECRUITMENT
     [ai]
-        recruitment_ignore_bad_movement=yes
-        recruitment_ignore_bad_combat=yes
         simple_targeting=yes
     [/ai]
 #enddef

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
@@ -63,8 +63,6 @@
     [ai]
         grouping=no
         simple_targeting=yes
-        recruitment_ignore_bad_combat=yes
-        recruitment_ignore_bad_movement=yes
         aggression=1.0
         caution=-5.0
         {ATTACK_DEPTH 1 3 5}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
@@ -226,7 +226,6 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
         [ai]
             {AI_NO_SCOUTS}
             {AI_SCALE_ATTACK_DEPTH_BY_DIFFICULTY}
-            {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
             {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter,fighter,archer,fighter,fighter,mixed fighter,scout"}
             {AI_SIMPLE_ALWAYS_ASPECT aggression 0.75}
             {AI_SIMPLE_ALWAYS_ASPECT caution 0}
@@ -255,7 +254,6 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
         {ai/aliases/stable_singleplayer.cfg}
         [ai]
             {AI_NO_SCOUTS}
-            {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
             {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter,mixed fighter,archer,mixed fighter"}
             {AI_SIMPLE_ALWAYS_ASPECT grouping no}
             {AI_SCALE_ATTACK_DEPTH_BY_DIFFICULTY}
@@ -303,7 +301,6 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
         [ai]
             {AI_NO_SCOUTS}
             {AI_SCALE_ATTACK_DEPTH_BY_DIFFICULTY}
-            {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
             {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout"}
             {AI_SIMPLE_ALWAYS_ASPECT aggression 0.75}
             {AI_SIMPLE_ALWAYS_ASPECT village_value 0}
@@ -341,7 +338,6 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
         [ai]
             {AI_NO_SCOUTS}
             {AI_SCALE_ATTACK_DEPTH_BY_DIFFICULTY}
-            {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
             {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter,scout,fighter,fighter,archer,scout,mixed fighter"}
             {AI_SIMPLE_ALWAYS_ASPECT aggression 0.75}
             {AI_SIMPLE_ALWAYS_ASPECT caution 0}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
@@ -122,7 +122,6 @@ Chapter Two"
 #endif
         {ai/aliases/stable_singleplayer.cfg}
         [ai]
-            {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
             {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout, scout, healer"}
             {AI_SIMPLE_ALWAYS_ASPECT aggression 0.75}
         [/ai]
@@ -149,7 +148,6 @@ Chapter Two"
 #endif
         {ai/aliases/stable_singleplayer.cfg}
         [ai]
-            {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
             {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout, scout, healer"}
         [/ai]
     [/side]

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
@@ -122,7 +122,6 @@
     {ai/aliases/stable_singleplayer.cfg}
     [ai]
         {AI_NO_SCOUTS}
-        {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
         {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout, scout, healer"}
         {AI_SIMPLE_ALWAYS_ASPECT aggression 0.75}
         [goal]

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
@@ -130,7 +130,6 @@
 
         {ai/aliases/stable_singleplayer.cfg}
         [ai]
-            {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
             {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter,fighter,mixed fighter"}
         [/ai]
     [/side]
@@ -162,7 +161,6 @@
         {ai/aliases/stable_singleplayer.cfg}
         [ai]
             {AI_NO_SCOUTS}
-            {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
             {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter, archer, scout, fighter, fighter, archer, mixed fighter"}
             {AI_SIMPLE_ALWAYS_ASPECT grouping offensive}
             {AI_SIMPLE_ALWAYS_ASPECT aggression 0.75}
@@ -194,7 +192,6 @@
         {ai/aliases/stable_singleplayer.cfg}
         [ai]
             {AI_NO_SCOUTS}
-            {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
             {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout,fighter,fighter,archer,mixed fighter"}
         [/ai]
     [/side]
@@ -224,7 +221,6 @@
         {ai/aliases/stable_singleplayer.cfg}
         [ai]
             {AI_NO_SCOUTS}
-            {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
             {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter"}
         [/ai]
     [/side]

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
@@ -266,7 +266,6 @@
             {ai/aliases/stable_singleplayer.cfg}
             [ai]
                 {AI_NO_SCOUTS}
-                {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
                 {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "scout,fighter,fighter,archer,mixed fighter"}
                 {AI_SIMPLE_NIGHT_ASPECT aggression 0.75}
                 {AI_SIMPLE_NIGHT_ASPECT caution 0.0}
@@ -295,8 +294,6 @@
             {ai/aliases/stable_singleplayer.cfg}
             [ai]
                 {AI_NO_SCOUTS}
-                {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_movement yes}
-                {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_combat yes}
 #ifdef EASY
                 {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern "fighter"}
 #else

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
@@ -143,8 +143,6 @@ Chapter Three"
 #endif
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
-            recruitment_ignore_bad_combat=yes
 #ifdef EASY
             recruitment_pattern=scout, scout, healer, scout
 #else
@@ -176,8 +174,6 @@ Chapter Three"
 #endif
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
-            recruitment_ignore_bad_combat=yes
 #ifdef EASY
             recruitment_pattern=scout, scout, healer, scout
 #else

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
@@ -129,7 +129,6 @@
 #endif
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
 #ifdef EASY
             recruitment_pattern=fighter
 #else
@@ -155,7 +154,6 @@
         user_team_name= _ "Creatures"
         recruit=Gryphon
         [ai]
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout
             grouping=offensive
             aggression=0.75

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
@@ -145,7 +145,6 @@ Chapter Four"
 
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
             {ATTACK_DEPTH 4 5 6}
         [/ai]

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
@@ -114,7 +114,6 @@
 #endif
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
             [goal]
                 name=protect_unit
@@ -152,7 +151,6 @@
 #endif
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
             [goal]
                 name=protect_unit
@@ -188,7 +186,6 @@
 #endif
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
             [goal]
                 name=protect_unit
@@ -226,7 +223,6 @@
 #endif
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
             [goal]
                 name=protect_unit

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
@@ -124,7 +124,6 @@
 
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
         [/ai]
         [ai]
@@ -162,7 +161,6 @@
 #endif
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=fighter,fighter,mixed fighter,archer,scout,fighter
             aggression=0.75
         [/ai]
@@ -197,7 +195,6 @@
 #endif
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
         [/ai]
         [ai]

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
@@ -137,7 +137,6 @@ Chapter Five"
 #endif
 
         [ai]
-            recruitment_ignore_bad_movement=yes
 #ifdef EASY
             recruitment_pattern=scout,scout,healer,scout
 #else
@@ -169,7 +168,6 @@ Chapter Five"
 #endif
 
         [ai]
-            recruitment_ignore_bad_movement=yes
 #ifdef EASY
             recruitment_pattern=scout, healer, scout
 #else

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
@@ -257,7 +257,6 @@
         {GOLD 200 320 350}
         [ai]
             # {HIGH_PRIORITY_TARGETS}
-            recruitment_ignore_bad_movement=yes
 #ifndef HARD
             recruitment_pattern=archer,fighter
 #else
@@ -296,7 +295,6 @@
         {GOLD 300 400 500}
         [ai]
             {HIGH_PRIORITY_TARGETS}
-            recruitment_ignore_bad_movement=yes
 #ifndef HARD
             recruitment_pattern=archer, fighter
 #else
@@ -331,7 +329,6 @@
         {GOLD 200 250 300}
         [ai]
             {HIGH_PRIORITY_TARGETS}
-            recruitment_ignore_bad_movement=yes
 #ifndef HARD
             recruitment_pattern=archer, fighter
 #else

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
@@ -204,7 +204,6 @@
         [ai]
             passive_leader=yes
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
 #ifndef HARD
             recruitment_pattern=archer, fighter
 #else
@@ -245,7 +244,6 @@
         {GOLD 180 220 260}
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
 #ifndef HARD
             recruitment_pattern=archer, fighter
 #else

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
@@ -92,7 +92,6 @@
         user_team_name= _ "Enemies"
         [ai]
             {NO_SCOUTS}
-            recruitment_ignore_bad_movement=yes
 #ifdef EASY
             recruitment_pattern=fighter, archer, fighter
 #else