0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed bug #12304

Browse source 
this changes AI behaviour to not try intial scout recruitment when
there are no scouts in the recruitment_pattern. (we could still be
able to recruit scouts if the pattern is empty.)
This commit is contained in:
Gunter Labes 2008-09-12 18:38:48 +00:00
parent b4c01744fa
commit 8e12c686c1
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/ai.cpp
View file

@ -1787,14 +1787,8 @@ void ai::do_recruitment()
analyze_potential_recruit_movements();
analyze_potential_recruit_combat();
// FIXME: This entire block of code should be conditionalized
// on a test for whether the recruitment list of the team contains
// any units with scout usage. Otherwise, the AI will emit a spurious
// message beginning "Deprecated WML found: Trying to recruit a: scout
// but no unit of that type (usage=) is available." on teams with no
// recruitment list and no scout-type units. This happens, for example,
// when team Gore first recruits in NR:The Eastern Flank.
{
std::vector<std::string> options = current_team().recruitment_pattern();
if (std::count(options.begin(), options.end(), "scout") > 0) {
size_t neutral_villages = 0;
// We recruit the initial allocation of scouts
@ -1853,17 +1847,18 @@ void ai::do_recruitment()
}
}
std::vector<std::string> options;
do {
// If there is no recruitment_pattern use "" which makes us consider
// any unit available.
if (options.empty()) {
options.push_back("");
}
// Buy units as long as we have room and can afford it.
while (recruit_usage(options[rand()%options.size()])) {
options = current_team().recruitment_pattern();
// If there is no recruitment_pattern use "" which makes us consider
// any unit available.
if (options.empty()) {
options.push_back("");
}
// Buy units as long as we have room and can afford it.
}while(recruit_usage(options[rand()%options.size()]));
}
}
void ai::move_leader_to_goals( const move_map& enemy_dstsrc)