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

Change behavior of recruitment_save_gold.

Browse Source 
It will now use the minimum of a team-ratio and a own-ratio
to prevent cases where side1 recruits until the begin-threshold
is reached and side2 will never recruit anything (assuming
side1 and side2 are allied AIs)
This commit is contained in:
flix 2013-10-07 00:34:27 +02:00
parent e0125c50bb
commit 4b13787d9b
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ai/recruitment/recruitment.cpp
View File

@ -1458,6 +1458,7 @@ double recruitment::get_estimated_village_gain() const {
double recruitment::get_unit_ratio() const { double recruitment::get_unit_ratio() const {
const unit_map& units = *resources::units; const unit_map& units = *resources::units;
double own_total_value = 0.; double own_total_value = 0.;
double team_total_value = 0.;
double enemy_total_value = 0.; double enemy_total_value = 0.;
BOOST_FOREACH(const unit& unit, units) { BOOST_FOREACH(const unit& unit, units) {
if (unit.incapacitated() || unit.total_movement() <= 0 || unit.can_recruit()) { if (unit.incapacitated() || unit.total_movement() <= 0 || unit.can_recruit()) {
@ -1467,17 +1468,33 @@ double recruitment::get_unit_ratio() const {
if (current_team().is_enemy(unit.side())) { if (current_team().is_enemy(unit.side())) {
enemy_total_value += value; enemy_total_value += value;
} else { } else {
team_total_value += value;
if (unit.side() == current_team().side()) {
own_total_value += value; own_total_value += value;
} }
} }
}
int allies_count = 0;
BOOST_FOREACH(const team& team, *resources::teams) {
if (!current_team().is_enemy(team.side())) {
++allies_count;
}
}
// If only the leader is left, the values could be 0. // If only the leader is left, the values could be 0.
// Catch those cases and return something reasonable. // Catch those cases and return something reasonable.
if (own_total_value == 0. && enemy_total_value == 0.) { if ((own_total_value == 0. || team_total_value == 0) && enemy_total_value == 0.) {
return 0.; return 0.; // do recruit
} else if (enemy_total_value == 0.) { } else if (enemy_total_value == 0.) {
return 2.; return 999.; // save money
} }
return own_total_value / enemy_total_value;
// We calculate two ratios: One for the team and one for just our self.
// Then we return the minimum.
// This prevents cases where side1 will recruit until the save_gold begin threshold
// is reached, and side2 won't recruit anything. (assuming side1 and side2 are allied)
double own_ratio = (own_total_value / enemy_total_value) * allies_count;
double team_ratio = team_total_value / enemy_total_value;
return std::min<double>(own_ratio, team_ratio);
} }
/** /**