upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-16 18:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove several deprecated recruitment-related aspects

Browse Source 
- number_of_possible_recruits_to_force_recruit
- recruitment_ignore_bad_combat
- recruitment_ignore_bad_movement
This commit is contained in:
Celtic Minstrel 2016-02-29 22:42:30 -05:00 committed by mattsc
parent ca8cb3bd6a
commit 7c9e24aa29
69 changed files with 0 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
View File

@ -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

3
data/ai/utils/default_config.cfg
View File

@ -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

1
data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
View File

@ -68,7 +68,6 @@
facing=se
[ai]
recruitment_ignore_bad_combat=yes
villages_per_scout=6
aggression=0.5
caution=0.25

3
data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
View File

@ -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

3
data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
View File

@ -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]

1
data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
View File

@ -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]

1
data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg
View File

@ -97,7 +97,6 @@
[ai]
aggression=-0.2
grouping=defensive
recruitment_ignore_bad_combat=yes
recruitment_pattern=fighter,fighter,fighter,archer,scout
[/ai]
[/side]

1
data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
View File

@ -50,7 +50,6 @@
[ai]
passive_leader=yes
grouping=no
recruitment_ignore_bad_combat=yes
aggression=0.4
[aspect]
id=attacks

3
data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
View File

@ -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]

2
data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
View File

@ -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

2
data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
View File

@ -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}

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
View File

@ -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}

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
View File

@ -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]

1
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
View File

@ -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]

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
View File

@ -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]

3
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
View File

@ -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

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
View File

@ -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

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
View File

@ -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

1
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
View File

@ -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]

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
View File

@ -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

3
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
View File

@ -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]

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
View File

@ -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

3
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
View File

@ -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

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
View File

@ -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

1
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
View File

@ -92,7 +92,6 @@
user_team_name= _ "Enemies"
[ai]
{NO_SCOUTS}
recruitment_ignore_bad_movement=yes
#ifdef EASY
recruitment_pattern=fighter, archer, fighter
#else

5
data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
View File

@ -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

2
data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
View File

@ -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

2
data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
View File

@ -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

5
data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
View File

@ -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

2
data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
View File

@ -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

3
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
View File

@ -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

2
data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
View File

@ -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

1
data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
View File

@ -112,7 +112,6 @@
[ai]
passive_leader=yes
recruitment_ignore_bad_movement=yes
#ifdef EASY
recruitment_pattern=scout,fighter,fighter,archer
#else

1
data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg
View File

@ -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}

3
data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg
View File

@ -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]

1
data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg
View File

@ -84,7 +84,6 @@
[ai]
{NO_SCOUTS}
recruitment_ignore_bad_movement=yes
recruitment_pattern=fighter,fighter,mixed fighter
[/ai]
[/side]

5
data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg
View File

@ -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]

3
data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
View File

@ -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}

4
data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
View File

@ -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]

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
View File

@ -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

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
View File

@ -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]

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
View File

@ -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]

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
View File

@ -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]

4
data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
View File

@ -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

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
View File

@ -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]

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
View File

@ -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}

4
data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer_of_Southbay.cfg
View File

@ -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]

4
data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
View File

@ -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]

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
View File

@ -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}

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
View File

@ -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

4
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
View File

@ -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]

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_Lizard_Beach.cfg
View File

@ -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}

4
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
View File

@ -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}

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
View File

@ -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}

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
View File

@ -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

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
View File

@ -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]

5
data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg
View File

@ -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]

2
data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
View File

@ -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

1
data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
View File

@ -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]

2
data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
View File

@ -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

2
data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
View File

@ -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

1
data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
View File

@ -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]

1
data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
View File

@ -109,7 +109,6 @@
village_value=0
recruitment_pattern=scout
recruitment_ignore_bad_combat=yes
#bats can't go down SW tunnel
[avoid]

33
src/ai/contexts.cpp
View File

@ -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_) {

39
src/ai/contexts.hpp
View File

@ -294,9 +294,6 @@ public:
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 @@ public:
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 @@ public:
}
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 @@ public:
}
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 @@ public:
virtual std::vector<goal_ptr>& get_goals();
virtual double get_number_of_possible_recruits_to_force_recruit() const;
virtual double get_leader_aggression() const;
@ -1432,12 +1402,6 @@ public:
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 @@ private:
mutable bool dst_src_enemy_valid_lua_;
mutable bool src_dst_valid_lua_;
mutable bool src_dst_enemy_valid_lua_;
aspect_type<double>::typesafe_ptr number_of_possible_recruits_to_force_recruit_;
aspect_type<bool>::typesafe_ptr passive_leader_;
aspect_type<bool>::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<std::string> >::typesafe_ptr recruitment_more_;
aspect_type< std::vector<std::string> >::typesafe_ptr recruitment_pattern_;

12
src/ai/formula/ai.cpp
View File

@ -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<std::string> &rp = get_recruitment_pattern();

24
src/ai/lua/core.cpp
View File

@ -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<std::string> 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 },

3
src/ai/manager.cpp
View File

@ -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;

36
src/ai/registry.cpp
View File

@ -261,9 +261,6 @@ static register_aspect_factory< composite_aspect<bool> >
static register_aspect_factory< composite_aspect<double> >
leader_value__composite_aspect_factory("leader_value*composite_aspect");
static register_aspect_factory< composite_aspect<double> >
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<bool> >
passive_leader__composite_aspect_factory("passive_leader*composite_aspect");
@ -273,12 +270,6 @@ static register_aspect_factory< composite_aspect<bool> >
static register_aspect_factory< composite_aspect<double> >
recruitment_diversity__composite_aspect_factory("recruitment_diversity*composite_aspect");
static register_aspect_factory< composite_aspect<bool> >
recruitment_ignore_bad_combat__composite_aspect_factory("recruitment_ignore_bad_combat*composite_aspect");
static register_aspect_factory< composite_aspect<bool> >
recruitment_ignore_bad_movement__composite_aspect_factory("recruitment_ignore_bad_movement*composite_aspect");
static register_aspect_factory< composite_aspect<config> >
recruitment_instructions__composite_aspect_factory("recruitment_instructions*composite_aspect");
@ -344,9 +335,6 @@ static register_aspect_factory< standard_aspect<bool> >
static register_aspect_factory< standard_aspect<double> >
leader_value__standard_aspect_factory("leader_value*standard_aspect");
static register_aspect_factory< standard_aspect<double> >
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<bool> >
passive_leader__standard_aspect_factory("passive_leader*standard_aspect");
@ -356,12 +344,6 @@ static register_aspect_factory< standard_aspect<bool> >
static register_aspect_factory< standard_aspect<double> >
recruitment_diversity__standard_aspect_factory("recruitment_diversity*standard_aspect");
static register_aspect_factory< standard_aspect<bool> >
recruitment_ignore_bad_combat__standard_aspect_factory("recruitment_ignore_bad_combat*standard_aspect");
static register_aspect_factory< standard_aspect<bool> >
recruitment_ignore_bad_movement__standard_aspect_factory("recruitment_ignore_bad_movement*standard_aspect");
static register_aspect_factory< standard_aspect<config> >
recruitment_instructions__standard_aspect_factory("recruitment_instructions*standard_aspect");
@ -431,9 +413,6 @@ static register_aspect_factory< standard_aspect<bool> >
static register_aspect_factory< standard_aspect<double> >
leader_value__standard_aspect_factory2("leader_value*");
static register_aspect_factory< standard_aspect<double> >
number_of_possible_recruits_to_force_recruit__standard_aspect_factory2("number_of_possible_recruits_to_force_recruit*");
static register_aspect_factory< standard_aspect<bool> >
passive_leader__standard_aspect_factory2("passive_leader*");
@ -443,12 +422,6 @@ static register_aspect_factory< standard_aspect<bool> >
static register_aspect_factory< standard_aspect<double> >
recruitment_diversity__standard_aspect_factory2("recruitment_diversity*");
static register_aspect_factory< standard_aspect<bool> >
recruitment_ignore_bad_combat__standard_aspect_factory2("recruitment_ignore_bad_combat*");
static register_aspect_factory< standard_aspect<bool> >
recruitment_ignore_bad_movement__standard_aspect_factory2("recruitment_ignore_bad_movement*");
static register_aspect_factory< standard_aspect<config> >
recruitment_instructions__standard_aspect_factory2("recruitment_instructions*");
@ -511,21 +484,12 @@ static register_lua_aspect_factory< lua_aspect<bool> >
static register_lua_aspect_factory< lua_aspect<double> >
leader_value__lua_aspect_factory("leader_value*lua_aspect");
static register_lua_aspect_factory< lua_aspect<double> >
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<bool> >
passive_leader__lua_aspect_factory("passive_leader*lua_aspect");
static register_lua_aspect_factory< lua_aspect<bool> >
passive_leader_shares_keep__lua_aspect_factory("passive_leader_shares_keep*lua_aspect");
static register_lua_aspect_factory< lua_aspect<bool> >
recruitment_ignore_bad_combat__lua_aspect_factory("recruitment_ignore_bad_combat*lua_aspect");
static register_lua_aspect_factory< lua_aspect<bool> >
recruitment_ignore_bad_movement__lua_aspect_factory("recruitment_ignore_bad_movement*lua_aspect");
static register_lua_aspect_factory< lua_aspect<double> >
scout_village_targeting__lua_aspect_factory("scout_village_targeting*lua_aspect");