From 7c9e24aa2968a1b59e05bd87998114ac2956678f Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Mon, 29 Feb 2016 22:42:30 -0500 Subject: [PATCH] Remove several deprecated recruitment-related aspects - number_of_possible_recruits_to_force_recruit - recruitment_ignore_bad_combat - recruitment_ignore_bad_movement --- .../scenarios/The_Elves_Besieged.cfg | 2 - data/ai/utils/default_config.cfg | 3 -- .../scenarios/02_Assassins.cfg | 1 - .../scenarios/10_The_Flaming_Sword.cfg | 3 -- .../scenarios/13_The_Return_of_Trouble.cfg | 3 -- .../scenarios/10_Alone_at_Last.cfg | 1 - .../scenarios/04c_Mal-Ravanals_Capital.cfg | 1 - .../scenarios/11_Captured.cfg | 1 - .../scenarios/12_Evacuation.cfg | 3 -- .../scenarios/01_The_Elves_Besieged.cfg | 2 - .../scenarios/09_The_Valley_of_Death.cfg | 2 - .../scenarios/chapter1/01_The_Uprooting.cfg | 4 -- .../chapter2/04_The_Elvish_Treasury.cfg | 2 - .../chapter2/05_The_Saurian_Treasury.cfg | 1 - .../chapter2/06_Acquaintance_in_Need.cfg | 4 -- .../chapter2/07_Elves_Last_Stand.cfg | 3 -- .../scenarios/chapter3/09_Bounty_Hunters.cfg | 4 -- .../chapter3/10_Cliffs_of_Thoria.cfg | 2 - .../scenarios/chapter4/14_Human_Alliance.cfg | 1 - .../chapter4/16_The_Chief_Must_Die.cfg | 4 -- .../chapter4/17_Breaking_the_Siege.cfg | 3 -- .../scenarios/chapter5/19_Costly_Revenge.cfg | 2 - .../chapter5/21_Elvish_Assassins.cfg | 3 -- .../scenarios/chapter5/22_Northern_Battle.cfg | 2 - .../scenarios/chapter5/23_End_of_War.cfg | 1 - .../scenarios/07a_Settling_Disputes.cfg | 5 --- .../scenarios/08b_Ray_of_Hope.cfg | 2 - .../scenarios/10a_Stolen_Gold.cfg | 2 - .../scenarios/11a_The_Eastern_Flank.cfg | 5 --- .../scenarios/13a_Showdown.cfg | 2 - .../5_Hills_of_the_Shorbear_Clan.cfg | 3 -- .../scenarios/8_The_Dragon.cfg | 2 - .../scenarios/03_Strange_Allies.cfg | 1 - .../scenarios/04_Troll_Bridge.cfg | 1 - .../scenarios/05_Invaders.cfg | 3 -- .../scenarios/08_Fear.cfg | 1 - .../scenarios/09_Forbidden_Forest.cfg | 5 --- .../scenarios/10_The_Siege_of_Kal_Kartha.cfg | 3 -- .../scenarios/12_The_Underlevels.cfg | 4 -- .../scenarios/02_The_Fall.cfg | 1 - .../scenarios/03_A_Harrowing_Escape.cfg | 2 - .../scenarios/04a_The_Swamp_of_Esten.cfg | 3 -- .../scenarios/04b_The_Midlands.cfg | 3 -- .../scenarios/05_The_Oldwood.cfg | 4 -- .../scenarios/08_Clearwater_Port.cfg | 3 -- .../scenarios/09_Fallen_Lich_Point.cfg | 1 - .../scenarios/10_Sewer_of_Southbay.cfg | 4 -- .../scenarios/12_A_Final_Spring.cfg | 4 -- .../scenarios/13_Peoples_in_Decline.cfg | 3 -- .../scenarios/14_Rough_Landing.cfg | 3 -- .../scenarios/17a_The_Dragon.cfg | 4 -- .../scenarios/17b_Lizard_Beach.cfg | 2 - .../scenarios/17c_Troll_Hole.cfg | 4 -- .../scenarios/17d_Cursed_Isle.cfg | 2 - .../scenarios/19_The_Vanguard.cfg | 3 -- .../scenarios/20_Return_of_the_Fleet.cfg | 3 -- .../scenarios/22_The_Rise_of_Wesnoth.cfg | 5 --- .../scenarios/07a_Into_the_Depths.cfg | 2 - .../scenarios/01_Rooting_Out_a_Mage.cfg | 1 - .../scenarios/01_The_Morning_After.cfg | 2 - .../scenarios/03_Stirring_in_the_Night.cfg | 2 - .../scenarios/05_A_Subterranean_Struggle.cfg | 1 - .../06b_In_the_Domain_of_Dwarves.cfg | 1 - src/ai/contexts.cpp | 33 ---------------- src/ai/contexts.hpp | 39 ------------------- src/ai/formula/ai.cpp | 12 ------ src/ai/lua/core.cpp | 24 ------------ src/ai/manager.cpp | 3 -- src/ai/registry.cpp | 36 ----------------- 69 files changed, 307 deletions(-) diff --git a/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg b/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg index e22383569c7a..4d8e8d34bedf 100644 --- 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 index 27c5f97cebd0..28e50aeafa98 100644 --- 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 index 9b989bce41d1..8dfd9e175f8d 100644 --- 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 index 7ce657c15698..382203f6c391 100644 --- 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 index e7024110a113..5a1d49884171 100644 --- 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 index 637e5327ea3c..dfaa999e8c85 100644 --- 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 index aedfe032f6cd..4817a409e490 100644 --- 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 index bfcae25cee72..908d2c30ed6e 100644 --- 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 index 5adc83354821..3928a0a63088 100644 --- 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 index f6cbdbf16100..a1ce9342151f 100644 --- 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 index 8a2c3fccfa73..0913d106d9a5 100644 --- 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 index 97346a382a11..e189074b6f42 100644 --- 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 index f22482cd0703..c640131784af 100644 --- 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 index 827d63ddf0d4..ab8c47672697 100644 --- 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 index baacf365f71b..dcecd2b1ec5e 100644 --- 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 index 25c54d69548c..45743ea0065b 100644 --- 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 index c4864d6d7c85..02f70f79e3f6 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 @@ -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 index 3de16fe79ddb..0faa7db9742a 100644 --- 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 index 85e6fa5f6e69..49e73711132b 100644 --- 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 index b5fd7edab8d2..b9ec02942989 100644 --- 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 index 7ce0daf8de97..10e5538e78b5 100644 --- 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 index 70485ff71bfc..d0a278b2e742 100644 --- 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 index 9b767e32acb1..9e6719633a70 100644 --- 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 index 0f2f6253f207..3321419daff7 100644 --- 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 index b094b13f54b3..896557f13cf6 100644 --- 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 diff --git a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg index 590a62d43162..9b3c56c716cb 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg @@ -221,11 +221,6 @@ facing=nw - [ai] - recruitment_ignore_bad_movement=yes - recruitment_ignore_bad_combat=yes - [/ai] - {NOTRAIT_UNIT () Troll 30 9} [+unit] hitpoints=36 diff --git a/data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg b/data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg index 1b4dd775e17e..89a20342505e 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg @@ -173,8 +173,6 @@ recruit=Vampire Bat,Blood Bat [ai] simple_targeting=yes - recruitment_ignore_bad_combat=yes - recruitment_ignore_bad_movement=yes aggression=1.0 caution=-5.0 attack_depth=5 diff --git a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg index e7d667c5239b..a23d8b84920f 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg @@ -171,8 +171,6 @@ #define SG_STUPID_TROLL_AI [ai] simple_targeting=yes - recruitment_ignore_bad_combat=yes - recruitment_ignore_bad_movement=yes aggression=1.0 caution=-5.0 attack_depth=5 diff --git a/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg b/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg index 726d23502c4d..7eb3ea86042b 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg @@ -54,11 +54,6 @@ id=Gore canrecruit=yes - [ai] - recruitment_ignore_bad_movement=yes - recruitment_ignore_bad_combat=yes - [/ai] - [unit] type=Orcish Sovereign id=Rakshas diff --git a/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg b/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg index 0c7e1d5a513a..17d0520c89d4 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg @@ -316,8 +316,6 @@ persistent=yes [ai] simple_targeting=yes - recruitment_ignore_bad_combat=yes - recruitment_ignore_bad_movement=yes aggression=1.0 caution=-5.0 attack_depth=5 diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg index 9b2c9e67894a..f750529491ef 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg @@ -44,8 +44,6 @@ caution=0.5 village_value=0.1 leader_value=0 - recruitment_ignore_bad_movement=yes - recruitment_ignore_bad_combat=yes villages_per_scout=0 grouping=defensive [goal] @@ -77,7 +75,6 @@ caution=0.1 village_value=2 leader_value=1 - recruitment_ignore_bad_combat=yes grouping=no [goal] name=protect_unit diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg index e68bf4ff3cb0..e34e0a699bf0 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg @@ -49,8 +49,6 @@ leader_value=0 village_value=0 recruitment_pattern=scout,fighter,fighter,mixed fighter - recruitment_ignore_bad_movement=yes - recruitment_ignore_bad_combat=yes grouping=none passive_leader=yes diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg index cbaf527c48e3..65b1592e74b1 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg @@ -112,7 +112,6 @@ [ai] passive_leader=yes - recruitment_ignore_bad_movement=yes #ifdef EASY recruitment_pattern=scout,fighter,fighter,archer #else diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg index 699032af3f63..8da0acd7260e 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg @@ -75,7 +75,6 @@ #else recruitment_pattern=fighter,fighter,mixed fighter #endif - recruitment_ignore_bad_movement=yes grouping=defensive {QUANTITY aggression 0.3 0.4 0.5} {ATTACK_DEPTH 3 4 5} diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg index 99b2dc2f6144..1d999c78eadf 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg @@ -63,7 +63,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer {ATTACK_DEPTH 4 5 5} [/ai] @@ -102,7 +101,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes #ifdef EASY recruitment_pattern=scout,fighter,fighter,archer #endif @@ -140,7 +138,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer {ATTACK_DEPTH 4 5 5} [/ai] diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg index a781d8bfa1e5..1dc4bd96e993 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg @@ -84,7 +84,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,mixed fighter [/ai] [/side] diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg index 5794e62003e6..09938bc9c833 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg @@ -130,8 +130,6 @@ [ai] grouping=offensive passive_leader=yes - recruitment_ignore_bad_movement=yes - recruitment_ignore_bad_combat=yes recruitment_pattern=scout,fighter,mixed fighter,archer {AVOID_TEMPLE} {AVOID_LEAVING_FOREST} @@ -157,7 +155,6 @@ [ai] grouping=offensive passive_leader=yes - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,archer,mixed fighter,mixed fighter {AVOID_TEMPLE} {AVOID_LEAVING_FOREST} @@ -185,8 +182,6 @@ grouping=offensive passive_leader=yes recruitment_pattern=fighter - recruitment_ignore_bad_movement=yes - recruitment_ignore_bad_combat=yes {AVOID_TEMPLE} [/ai] [/side] diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg index 87efc6794c7d..f0cb96eebd15 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg @@ -92,7 +92,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes #ifndef HARD recruitment_pattern=scout,fighter,fighter,archer #else @@ -139,7 +138,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer {ATTACK_DEPTH 4 5 5} @@ -182,7 +180,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer {ATTACK_DEPTH 4 5 5} diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg index 109f1c1cfa56..d99f23e5ed2f 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg @@ -156,7 +156,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,mixed fighter [/ai] [/side] @@ -193,7 +192,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,mixed fighter [/ai] [/side] @@ -231,7 +229,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,mixed fighter [/ai] [/side] @@ -307,7 +304,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,mixed fighter [/ai] [/side] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg index e33cf131188e..a12b6c3cd61c 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg @@ -78,7 +78,6 @@ recruitment_pattern=scout,scout,fighter,fighter,mixed fighter,archer {NO_SCOUTS} passive_leader=yes - recruitment_ignore_bad_movement=yes [/ai] [ai] time_of_day=first_watch,second_watch diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg index 05029aa464e4..f42f7b138a50 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg @@ -43,7 +43,6 @@ [ai] #{NO_SCOUTS} recruitment_pattern=scout,scout,fighter,fighter,mixed fighter,archer - recruitment_ignore_bad_movement=yes passive_leader=yes {ATTACK_DEPTH 3 4 5} [/ai] @@ -69,7 +68,6 @@ [ai] #{NO_SCOUTS} recruitment_pattern=scout,scout,fighter,fighter,mixed fighter,archer - recruitment_ignore_bad_movement=yes passive_leader=yes {ATTACK_DEPTH 3 4 5} [/ai] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg index 0b8bb93d58f3..f30fd19a51f3 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg @@ -56,7 +56,6 @@ [ai] {NO_SCOUTS} recruitment_pattern=scout,fighter,fighter,fighter,archer - recruitment_ignore_bad_movement=yes {ATTACK_DEPTH 3 4 5} [/ai] {GOLD 80 120 160} @@ -75,7 +74,6 @@ {GOLD 130 170 210} [ai] {NO_SCOUTS} - recruitment_ignore_bad_combat=yes recruitment_pattern=scout,fighter,fighter,fighter,archer {ATTACK_DEPTH 3 4 5} [/ai] @@ -103,7 +101,6 @@ {GOLD 130 170 210} [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,fighter,archer {ATTACK_DEPTH 3 4 5} [/ai] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg index 08b653d99e16..105a141da528 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg @@ -53,7 +53,6 @@ recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Goblin Spearman [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 3 4 5} [/ai] @@ -72,7 +71,6 @@ {GOLD 110 150 190} [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 3 4 5} [/ai] @@ -107,7 +105,6 @@ {GOLD 110 150 190} [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 3 4 5} [/ai] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg index 1354f0464d9a..1fae5bfb5d70 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg @@ -41,8 +41,6 @@ {GOLD 160 220 280} [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes - recruitment_ignore_bad_combat=yes #ifdef EASY recruitment_pattern=scout,fighter,fighter,mixed fighter,archer #else @@ -79,8 +77,6 @@ #else recruitment_pattern=scout,mixed fighter,archer #endif - recruitment_ignore_bad_movement=yes - recruitment_ignore_bad_combat=yes {ATTACK_DEPTH 4 5 5} [/ai] #ifdef EASY diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg index 219407803d73..0524c4bf7537 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg @@ -87,7 +87,6 @@ user_team_name=_"Orcs" [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 4 5 5} [/ai] @@ -123,7 +122,6 @@ user_team_name=_"Orcs" [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 4 5 5} [/ai] @@ -161,7 +159,6 @@ user_team_name=_"Orcs" [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 4 5 5} [/ai] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg index 98807d21d0ab..05ccbad13bb6 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg @@ -122,7 +122,6 @@ scroll_to_leader=no [ai] aggression=1.0 - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer {ATTACK_DEPTH 4 5 5} {NO_SCOUTS} diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer_of_Southbay.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer_of_Southbay.cfg index 37220bd7a6e9..08b4b44fe4dd 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer_of_Southbay.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer_of_Southbay.cfg @@ -49,8 +49,6 @@ {NO_SCOUTS} recruitment_pattern=mixed fighter,fighter,scout,fighter aggression=0.75 - recruitment_ignore_bad_movement=yes - recruitment_ignore_bad_combat=yes {ATTACK_DEPTH 4 5 5} [/ai] [/side] @@ -71,8 +69,6 @@ {NO_SCOUTS} recruitment_pattern=mixed fighter,fighter,scout,fighter aggression=0.75 - recruitment_ignore_bad_movement=yes - recruitment_ignore_bad_combat=yes {ATTACK_DEPTH 4 5 5} [/ai] [/side] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg index 2b11f40aa457..b3df3574e2c0 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg @@ -47,7 +47,6 @@ recruit=Bowman, Horseman, Mage, Spearman, Knight, Swordsman, Peasant [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes grouping=defensive passive_leader=yes recruitment_pattern=fighter,fighter,archer,mixed fighter @@ -81,7 +80,6 @@ user_team_name=_"Orcs" [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 4 5 5} [/ai] @@ -116,7 +114,6 @@ user_team_name=_"Orcs" [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 4 5 5} [/ai] @@ -141,7 +138,6 @@ user_team_name=_"Orcs" [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,scout {ATTACK_DEPTH 4 5 5} [/ai] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg index 158985d5839f..aa46433b4ebe 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg @@ -59,7 +59,6 @@ #endif [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer,fighter aggression=0.75 {ATTACK_DEPTH 4 5 5} @@ -85,7 +84,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes #ifdef EASY recruitment_pattern=scout,fighter,fighter,archer,fighter #else @@ -115,7 +113,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer,fighter aggression=0.75 {ATTACK_DEPTH 4 5 5} diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg index 6d09407766c8..d609bddb3ae3 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg @@ -52,7 +52,6 @@ #endif [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes aggression=0.60 #ifdef EASY recruitment_pattern=fighter @@ -80,7 +79,6 @@ #endif [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes aggression=0.60 #ifdef EASY recruitment_pattern=fighter @@ -108,7 +106,6 @@ #endif [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes aggression=0.60 #ifdef EASY recruitment_pattern=fighter diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg index a7c37b8ebfcb..42c0f89e0347 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg @@ -50,7 +50,6 @@ #endif [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,archer,scout,scout,healer {ATTACK_DEPTH 4 5 5} [/ai] @@ -85,7 +84,6 @@ #endif [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,archer,scout,scout,healer {ATTACK_DEPTH 4 5 5} [/ai] @@ -121,7 +119,6 @@ [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,archer,scout,scout,healer {ATTACK_DEPTH 4 5 5} [/ai] @@ -157,7 +154,6 @@ #endif [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,archer,scout,scout,healer {ATTACK_DEPTH 4 5 5} [goal] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_Lizard_Beach.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_Lizard_Beach.cfg index 0fe34099ceb8..960995ff7e35 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_Lizard_Beach.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_Lizard_Beach.cfg @@ -48,7 +48,6 @@ #endif [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,archer,fighter,archer,fighter,scout,healer passive_leader=yes {ATTACK_DEPTH 4 5 5} @@ -74,7 +73,6 @@ #endif [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,archer,fighter,archer,fighter,scout,healer passive_leader=yes {ATTACK_DEPTH 4 5 5} diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg index eadf94075588..ef92b4a97231 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg @@ -45,7 +45,6 @@ recruit=Troll Whelp,Troll,Troll Rocklobber [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,mixed fighter aggression=0.75 {ATTACK_DEPTH 3 5 5} @@ -67,7 +66,6 @@ recruit=Troll Whelp,Troll,Troll Rocklobber [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,mixed fighter aggression=0.75 {ATTACK_DEPTH 3 5 5} @@ -89,7 +87,6 @@ recruit=Troll Whelp,Troll,Troll Rocklobber [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,mixed fighter aggression=0.75 {ATTACK_DEPTH 3 5 5} @@ -111,7 +108,6 @@ recruit=Troll Whelp,Troll,Troll Rocklobber [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,mixed fighter aggression=0.75 {ATTACK_DEPTH 3 5 5} diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg index 4bb0388c0f9e..fb9fd4974d8f 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg @@ -50,7 +50,6 @@ #endif [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes aggression=0.40 recruitment_pattern=scout,scout,fighter {ATTACK_DEPTH 4 5 5} @@ -91,7 +90,6 @@ #endif [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes aggression=0.40 recruitment_pattern=scout,scout,fighter {ATTACK_DEPTH 4 5 5} diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg index 68e850de22c6..d6c757befccc 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg @@ -56,7 +56,6 @@ user_team_name=_"Orcs" [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 5 5 6} [/ai] @@ -94,7 +93,6 @@ user_team_name=_"Orcs" [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 5 5 6} [/ai] @@ -132,7 +130,6 @@ user_team_name=_"Orcs" [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes #ifdef EASY recruitment_pattern=fighter #else diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg index f24b549439e7..6335acc7c039 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg @@ -58,7 +58,6 @@ [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes passive_leader=yes recruitment_pattern=scout,fighter,archer aggression=0.4 @@ -95,7 +94,6 @@ user_team_name=_"Orcs" [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 5 5 6} [/ai] @@ -133,7 +131,6 @@ user_team_name=_"Orcs" [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,mixed fighter,archer {ATTACK_DEPTH 5 5 6} [/ai] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg index 3fe1ec9f27db..f4a3b2e01823 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg @@ -52,7 +52,6 @@ team_name=orcs [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer,scout,fighter,fighter,archer passive_leader=yes {ATTACK_DEPTH 5 6 6} @@ -89,7 +88,6 @@ user_team_name=_"Evil" [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=fighter,fighter,scout {ATTACK_DEPTH 5 5 6} [/ai] @@ -127,7 +125,6 @@ user_team_name=_"Evil" [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer,scout,fighter,fighter,archer,mixed fighter grouping=defensive {ATTACK_DEPTH 5 5 6} @@ -165,7 +162,6 @@ user_team_name=_"Evil" [ai] #{NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer,scout,fighter,fighter,archer,mixed fighter grouping=defensive {ATTACK_DEPTH 5 5 6} @@ -204,7 +200,6 @@ user_team_name=_"Evil" [ai] {NO_SCOUTS} - recruitment_ignore_bad_movement=yes recruitment_pattern=scout,fighter,fighter,archer,scout,fighter,fighter,archer,mixed fighter {ATTACK_DEPTH 5 5 6} [/ai] diff --git a/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg b/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg index f6930297829a..0596da74e4aa 100644 --- a/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg +++ b/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg @@ -69,7 +69,6 @@ #ifdef HARD recruitment_pattern=fighter,scout,archer,fighter #endif - recruitment_ignore_bad_movement=yes aggression=0.8 village_value=0.1 @@ -112,7 +111,6 @@ canrecruit=yes [ai] recruitment_pattern=fighter - recruitment_ignore_bad_movement=yes aggression=0.6 village_value=0.3 diff --git a/data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg b/data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg index 89d46562f180..dd8c3918e425 100644 --- a/data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg +++ b/data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg @@ -152,7 +152,6 @@ Will he heed the call? I do not know if he has kept the amulet; we have not spok facing=se [ai] - recruitment_ignore_bad_movement=yes grouping=no passive_leader=yes [/ai] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg index 7e7a76e3c373..48572bfcd7d0 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg @@ -75,9 +75,7 @@ {FLAG_VARIANT undead} no_leader=yes - # TODO: do research on recruitment_ignore* and the new AI config style... thing [ai] - {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_combat yes} {AI_SIMPLE_ALWAYS_ASPECT aggression 0.80} {AI_SIMPLE_ALWAYS_ASPECT caution 0.10} #ifdef HARD diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg index a9cca1cd4937..1f514a71baaa 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg @@ -62,7 +62,6 @@ {AI_SIMPLE_ALWAYS_ASPECT caution 0.0} {AI_SIMPLE_ALWAYS_ASPECT passive_leader yes} - {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_combat yes} {AI_SIMPLE_ALWAYS_ASPECT village_value 0} {AI_SIMPLE_ALWAYS_ASPECT scout_village_targeting 0} {AI_NO_SCOUTS} @@ -124,7 +123,6 @@ {AI_SIMPLE_ALWAYS_ASPECT village_value 0} {AI_SIMPLE_ALWAYS_ASPECT scout_village_targeting 0} {AI_NO_SCOUTS} - {AI_SIMPLE_ALWAYS_ASPECT recruitment_ignore_bad_combat yes} [goal] value=10 diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg index 046e85018641..878fcdf3867e 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg @@ -234,7 +234,6 @@ village_value=0 recruitment_pattern=fighter,fighter,fighter,fighter - recruitment_ignore_bad_combat=yes #causes ants to target cave spider [goal] 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 9a4987e5d4e5..27564fab91c9 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 @@ -109,7 +109,6 @@ village_value=0 recruitment_pattern=scout - recruitment_ignore_bad_combat=yes #bats can't go down SW tunnel [avoid] diff --git a/src/ai/contexts.cpp b/src/ai/contexts.cpp index 63f06daaf8f0..032157d4d85c 100644 --- a/src/ai/contexts.cpp +++ b/src/ai/contexts.cpp @@ -214,13 +214,10 @@ readonly_context_impl::readonly_context_impl(side_context &context, const config dst_src_enemy_valid_lua_(false), src_dst_valid_lua_(false), src_dst_enemy_valid_lua_(false), - number_of_possible_recruits_to_force_recruit_(), passive_leader_(), passive_leader_shares_keep_(), possible_moves_(), recruitment_diversity_(), - recruitment_ignore_bad_combat_(), - recruitment_ignore_bad_movement_(), recruitment_instructions_(), recruitment_more_(), recruitment_pattern_(), @@ -249,12 +246,9 @@ readonly_context_impl::readonly_context_impl(side_context &context, const config add_known_aspect("leader_goal",leader_goal_); add_known_aspect("leader_ignores_keep",leader_ignores_keep_); add_known_aspect("leader_value",leader_value_); - add_known_aspect("number_of_possible_recruits_to_force_recruit",number_of_possible_recruits_to_force_recruit_); add_known_aspect("passive_leader",passive_leader_); add_known_aspect("passive_leader_shares_keep",passive_leader_shares_keep_); add_known_aspect("recruitment_diversity",recruitment_diversity_); - add_known_aspect("recruitment_ignore_bad_combat",recruitment_ignore_bad_combat_); - add_known_aspect("recruitment_ignore_bad_movement",recruitment_ignore_bad_movement_); add_known_aspect("recruitment_instructions",recruitment_instructions_); add_known_aspect("recruitment_more",recruitment_more_); add_known_aspect("recruitment_pattern",recruitment_pattern_); @@ -762,15 +756,6 @@ double readonly_context_impl::get_leader_value() const } -double readonly_context_impl::get_number_of_possible_recruits_to_force_recruit() const -{ - if (number_of_possible_recruits_to_force_recruit_) { - return number_of_possible_recruits_to_force_recruit_->get(); - } - return 0; -} - - bool readonly_context_impl::get_passive_leader() const { if (passive_leader_) { @@ -814,24 +799,6 @@ double readonly_context_impl::get_recruitment_diversity() const } -bool readonly_context_impl::get_recruitment_ignore_bad_combat() const -{ - if (recruitment_ignore_bad_combat_) { - return recruitment_ignore_bad_combat_->get(); - } - return false; -} - - -bool readonly_context_impl::get_recruitment_ignore_bad_movement() const -{ - if (recruitment_ignore_bad_movement_) { - return recruitment_ignore_bad_movement_->get(); - } - return false; -} - - const config readonly_context_impl::get_recruitment_instructions() const { if (recruitment_instructions_) { diff --git a/src/ai/contexts.hpp b/src/ai/contexts.hpp index 6b059c9db7e3..b614052b6a40 100644 --- a/src/ai/contexts.hpp +++ b/src/ai/contexts.hpp @@ -294,9 +294,6 @@ class readonly_context : public virtual side_context { virtual double get_leader_value() const = 0; - virtual double get_number_of_possible_recruits_to_force_recruit() const = 0; - - virtual bool get_passive_leader() const = 0; @@ -312,12 +309,6 @@ class readonly_context : public virtual side_context { virtual double get_recruitment_diversity() const = 0; - virtual bool get_recruitment_ignore_bad_combat() const = 0; - - - virtual bool get_recruitment_ignore_bad_movement() const = 0; - - virtual const config get_recruitment_instructions() const = 0; @@ -794,12 +785,6 @@ class readonly_context_proxy : public virtual readonly_context, public virtual s } - virtual double get_number_of_possible_recruits_to_force_recruit() const - { - return target_->get_number_of_possible_recruits_to_force_recruit(); - } - - virtual bool get_passive_leader() const { return target_->get_passive_leader(); @@ -836,18 +821,6 @@ class readonly_context_proxy : public virtual readonly_context, public virtual s } - virtual bool get_recruitment_ignore_bad_combat() const - { - return target_->get_recruitment_ignore_bad_combat(); - } - - - virtual bool get_recruitment_ignore_bad_movement() const - { - return target_->get_recruitment_ignore_bad_movement(); - } - - virtual const config get_recruitment_instructions() const { return target_->get_recruitment_instructions(); @@ -1402,9 +1375,6 @@ class readonly_context_impl : public virtual side_context_proxy, public readonly virtual std::vector& get_goals(); - virtual double get_number_of_possible_recruits_to_force_recruit() const; - - virtual double get_leader_aggression() const; @@ -1432,12 +1402,6 @@ class readonly_context_impl : public virtual side_context_proxy, public readonly virtual double get_recruitment_diversity() const; - virtual bool get_recruitment_ignore_bad_combat() const; - - - virtual bool get_recruitment_ignore_bad_movement() const; - - virtual const config get_recruitment_instructions() const; @@ -1570,13 +1534,10 @@ class readonly_context_impl : public virtual side_context_proxy, public readonly mutable bool dst_src_enemy_valid_lua_; mutable bool src_dst_valid_lua_; mutable bool src_dst_enemy_valid_lua_; - aspect_type::typesafe_ptr number_of_possible_recruits_to_force_recruit_; aspect_type::typesafe_ptr passive_leader_; aspect_type::typesafe_ptr passive_leader_shares_keep_; mutable moves_map possible_moves_; aspect_type< double >::typesafe_ptr recruitment_diversity_; - aspect_type< bool >::typesafe_ptr recruitment_ignore_bad_combat_; - aspect_type< bool >::typesafe_ptr recruitment_ignore_bad_movement_; aspect_type< config >::typesafe_ptr recruitment_instructions_; aspect_type< std::vector >::typesafe_ptr recruitment_more_; aspect_type< std::vector >::typesafe_ptr recruitment_pattern_; diff --git a/src/ai/formula/ai.cpp b/src/ai/formula/ai.cpp index 39f86e585e5e..b3a7f1bff4a1 100644 --- a/src/ai/formula/ai.cpp +++ b/src/ai/formula/ai.cpp @@ -617,10 +617,6 @@ variant formula_ai::get_value(const std::string& key) const { return variant(get_leader_value()*1000,variant::DECIMAL_VARIANT); - } else if(key == "number_of_possible_recruits_to_force_recruit") - { - return variant(get_number_of_possible_recruits_to_force_recruit()*1000,variant::DECIMAL_VARIANT); - } else if(key == "passive_leader") { return variant(get_passive_leader()); @@ -629,14 +625,6 @@ variant formula_ai::get_value(const std::string& key) const { return variant(get_passive_leader_shares_keep()); - } else if(key == "recruitment_ignore_bad_movement") - { - return variant(get_recruitment_ignore_bad_movement()); - - } else if(key == "recruitment_ignore_bad_combat") - { - return variant(get_recruitment_ignore_bad_combat()); - } else if(key == "recruitment_pattern") { const std::vector &rp = get_recruitment_pattern(); diff --git a/src/ai/lua/core.cpp b/src/ai/lua/core.cpp index 34c2519f5748..380fbc3038da 100644 --- a/src/ai/lua/core.cpp +++ b/src/ai/lua/core.cpp @@ -528,27 +528,6 @@ static int cfun_ai_get_passive_leader_shares_keep(lua_State *L) return 1; } -static int cfun_ai_get_number_of_possible_recruits_to_force_recruit(lua_State *L) -{ - double noprtfr = get_readonly_context(L).get_number_of_possible_recruits_to_force_recruit(); // @note: abbreviation - lua_pushnumber(L, noprtfr); - return 1; -} - -static int cfun_ai_get_recruitment_ignore_bad_combat(lua_State *L) -{ - bool recruitment_ignore_bad_combat = get_readonly_context(L).get_recruitment_ignore_bad_combat(); - lua_pushboolean(L, recruitment_ignore_bad_combat); - return 1; -} - -static int cfun_ai_get_recruitment_ignore_bad_movement(lua_State *L) -{ - bool recruitment_ignore_bad_movement = get_readonly_context(L).get_recruitment_ignore_bad_movement(); - lua_pushboolean(L, recruitment_ignore_bad_movement); - return 1; -} - static int cfun_ai_get_recruitment_pattern(lua_State *L) { std::vector recruiting = get_readonly_context(L).get_recruitment_pattern(); @@ -945,11 +924,8 @@ static int impl_ai_get(lua_State* L) { "get_leader_goal", &cfun_ai_get_leader_goal }, { "get_leader_ignores_keep", &cfun_ai_get_leader_ignores_keep }, { "get_leader_value", &cfun_ai_get_leader_value }, - { "get_number_of_possible_recruits_to_force_recruit", &cfun_ai_get_number_of_possible_recruits_to_force_recruit }, { "get_passive_leader", &cfun_ai_get_passive_leader }, { "get_passive_leader_shares_keep", &cfun_ai_get_passive_leader_shares_keep }, - { "get_recruitment_ignore_bad_combat", &cfun_ai_get_recruitment_ignore_bad_combat }, - { "get_recruitment_ignore_bad_movement", &cfun_ai_get_recruitment_ignore_bad_movement }, { "get_recruitment_pattern", &cfun_ai_get_recruitment_pattern }, { "get_scout_village_targeting", &cfun_ai_get_scout_village_targeting }, { "get_simple_targeting", &cfun_ai_get_simple_targeting }, diff --git a/src/ai/manager.cpp b/src/ai/manager.cpp index 09bd362ec8cd..71f85a516df8 100644 --- a/src/ai/manager.cpp +++ b/src/ai/manager.cpp @@ -266,12 +266,9 @@ const std::string holder::get_ai_overview() s << "leader_aggression: " << this->ai_->get_leader_aggression() << std::endl; s << "leader_ignores_keep: " << this->ai_->get_leader_ignores_keep() << std::endl; s << "leader_value: " << this->ai_->get_leader_value() << std::endl; - s << "number_of_possible_recruits_to_force_recruit: " << this->ai_->get_number_of_possible_recruits_to_force_recruit() << std::endl; s << "passive_leader: " << this->ai_->get_passive_leader() << std::endl; s << "passive_leader_shares_keep: " << this->ai_->get_passive_leader_shares_keep() << std::endl; s << "recruitment_diversity: " << this->ai_->get_recruitment_diversity() << std::endl; - s << "recruitment_ignore_bad_combat: " << this->ai_->get_recruitment_ignore_bad_combat() << std::endl; - s << "recruitment_ignore_bad_movement: " << this->ai_->get_recruitment_ignore_bad_movement() << std::endl; s << "recruitment_instructions: " << std::endl << "----config begin----" << std::endl; s << this->ai_->get_recruitment_instructions() << "-----config end-----" << std::endl; s << "recruitment_more: " << utils::join(this->ai_->get_recruitment_more()) << std::endl; diff --git a/src/ai/registry.cpp b/src/ai/registry.cpp index 466c1a7b5950..41a53b1c8f31 100644 --- a/src/ai/registry.cpp +++ b/src/ai/registry.cpp @@ -261,9 +261,6 @@ static register_aspect_factory< composite_aspect > static register_aspect_factory< composite_aspect > leader_value__composite_aspect_factory("leader_value*composite_aspect"); -static register_aspect_factory< composite_aspect > - number_of_possible_recruits_to_force_recruit__composite_aspect_factory("number_of_possible_recruits_to_force_recruit*composite_aspect"); - static register_aspect_factory< composite_aspect > passive_leader__composite_aspect_factory("passive_leader*composite_aspect"); @@ -273,12 +270,6 @@ static register_aspect_factory< composite_aspect > static register_aspect_factory< composite_aspect > recruitment_diversity__composite_aspect_factory("recruitment_diversity*composite_aspect"); -static register_aspect_factory< composite_aspect > - recruitment_ignore_bad_combat__composite_aspect_factory("recruitment_ignore_bad_combat*composite_aspect"); - -static register_aspect_factory< composite_aspect > - recruitment_ignore_bad_movement__composite_aspect_factory("recruitment_ignore_bad_movement*composite_aspect"); - static register_aspect_factory< composite_aspect > recruitment_instructions__composite_aspect_factory("recruitment_instructions*composite_aspect"); @@ -344,9 +335,6 @@ static register_aspect_factory< standard_aspect > static register_aspect_factory< standard_aspect > leader_value__standard_aspect_factory("leader_value*standard_aspect"); -static register_aspect_factory< standard_aspect > - number_of_possible_recruits_to_force_recruit__standard_aspect_factory("number_of_possible_recruits_to_force_recruit*standard_aspect"); - static register_aspect_factory< standard_aspect > passive_leader__standard_aspect_factory("passive_leader*standard_aspect"); @@ -356,12 +344,6 @@ static register_aspect_factory< standard_aspect > static register_aspect_factory< standard_aspect > recruitment_diversity__standard_aspect_factory("recruitment_diversity*standard_aspect"); -static register_aspect_factory< standard_aspect > - recruitment_ignore_bad_combat__standard_aspect_factory("recruitment_ignore_bad_combat*standard_aspect"); - -static register_aspect_factory< standard_aspect > - recruitment_ignore_bad_movement__standard_aspect_factory("recruitment_ignore_bad_movement*standard_aspect"); - static register_aspect_factory< standard_aspect > recruitment_instructions__standard_aspect_factory("recruitment_instructions*standard_aspect"); @@ -431,9 +413,6 @@ static register_aspect_factory< standard_aspect > static register_aspect_factory< standard_aspect > leader_value__standard_aspect_factory2("leader_value*"); -static register_aspect_factory< standard_aspect > - number_of_possible_recruits_to_force_recruit__standard_aspect_factory2("number_of_possible_recruits_to_force_recruit*"); - static register_aspect_factory< standard_aspect > passive_leader__standard_aspect_factory2("passive_leader*"); @@ -443,12 +422,6 @@ static register_aspect_factory< standard_aspect > static register_aspect_factory< standard_aspect > recruitment_diversity__standard_aspect_factory2("recruitment_diversity*"); -static register_aspect_factory< standard_aspect > - recruitment_ignore_bad_combat__standard_aspect_factory2("recruitment_ignore_bad_combat*"); - -static register_aspect_factory< standard_aspect > - recruitment_ignore_bad_movement__standard_aspect_factory2("recruitment_ignore_bad_movement*"); - static register_aspect_factory< standard_aspect > recruitment_instructions__standard_aspect_factory2("recruitment_instructions*"); @@ -511,21 +484,12 @@ static register_lua_aspect_factory< lua_aspect > static register_lua_aspect_factory< lua_aspect > leader_value__lua_aspect_factory("leader_value*lua_aspect"); -static register_lua_aspect_factory< lua_aspect > - number_of_possible_recruits_to_force_recruit__lua_aspect_factory("number_of_possible_recruits_to_force_recruit*lua_aspect"); - static register_lua_aspect_factory< lua_aspect > passive_leader__lua_aspect_factory("passive_leader*lua_aspect"); static register_lua_aspect_factory< lua_aspect > passive_leader_shares_keep__lua_aspect_factory("passive_leader_shares_keep*lua_aspect"); -static register_lua_aspect_factory< lua_aspect > - recruitment_ignore_bad_combat__lua_aspect_factory("recruitment_ignore_bad_combat*lua_aspect"); - -static register_lua_aspect_factory< lua_aspect > - recruitment_ignore_bad_movement__lua_aspect_factory("recruitment_ignore_bad_movement*lua_aspect"); - static register_lua_aspect_factory< lua_aspect > scout_village_targeting__lua_aspect_factory("scout_village_targeting*lua_aspect");