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

fixed AI bug where units couldn't move if they started their turn...

Browse source 
...next to enemy units (CVS internal)
This commit is contained in:
uid68803 2004-02-25 17:51:18 +00:00
parent aff86a41d8
commit d84929c619
3 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/scenarios/Blackwater_Port.cfg
View file

@ -90,7 +90,8 @@ Defeat:
canrecruit=1
team_name=orcs
recruit=Orcish Grunt,Wolf Rider,Orcish Archer,Troll Whelp
{GOLD 140 320 400}
{GOLD 70 160 200}
{INCOME 7 15 20}
[/side]
[event]

42
src/ai.cpp
View file

@ -147,27 +147,29 @@ gamemap::location ai_interface::move_unit(location from, location to, std::map<l
if(rt != p.routes.end()) {
std::vector<location> steps = rt->second.steps;
//check if there are any invisible units that we uncover
for(std::vector<location>::iterator i = steps.begin(); i != steps.end(); ++i) {
location adj[6];
get_adjacent_tiles(*i,adj);
size_t n;
for(n = 0; n != 6; ++n) {
if(steps.empty() == false) {
//check if there are any invisible units that we uncover
for(std::vector<location>::iterator i = steps.begin()+1; i != steps.end(); ++i) {
location adj[6];
get_adjacent_tiles(*i,adj);
size_t n;
for(n = 0; n != 6; ++n) {
//see if there is an enemy unit next to this tile. Note that we don't
//actually have to check if it's invisible, since it being invisible is
//the only possibility
const unit_map::const_iterator invisible_unit = info_.units.find(adj[n]);
if(invisible_unit != info_.units.end() && current_team().is_enemy(invisible_unit->second.side())) {
to = *i;
steps.erase(i,steps.end());
//see if there is an enemy unit next to this tile. Note that we don't
//actually have to check if it's invisible, since it being invisible is
//the only possibility
const unit_map::const_iterator invisible_unit = info_.units.find(adj[n]);
if(invisible_unit != info_.units.end() && current_team().is_enemy(invisible_unit->second.side())) {
to = *i;
steps.erase(i,steps.end());
break;
}
}
if(n != 6) {
break;
}
}
if(n != 6) {
break;
}
}
steps.push_back(to); //add the destination to the steps
@ -364,6 +366,8 @@ bool ai::do_combat(std::map<gamemap::location,paths>& possible_moves, const move
const location arrived_at = move_unit(from,to,possible_moves);
if(arrived_at != to) {
std::cerr << "unit moving to attack has ended up unexpectedly at " << (arrived_at.x+1) << "," << (arrived_at.y+1) << " when moving to "
<< (to.x+1) << "," << (to.y+1) << " moved from " << (from.x+1) << "," << (from.y+1) << "\n";
return true;
}
@ -480,9 +484,11 @@ bool ai::get_healing(std::map<gamemap::location,paths>& possible_moves, const mo
units_.find(dst) == units_.end()) {
const double vuln = power_projection(it.first->first,
enemy_srcdst,enemy_dstsrc);
if(vuln < best_vulnerability) {
std::cerr << "found village with vulnerability: " << vuln << "\n";
if(vuln < best_vulnerability || best_loc == it.second) {
best_vulnerability = vuln;
best_loc = it.first;
std::cerr << "chose village " << (dst.x+1) << "," << (dst.y+1) << "\n";
}
}

2
src/team.cpp
View file

@ -69,7 +69,7 @@ team::team_info::team_info(const config& cfg)
const std::string& caution_val = cfg["caution"];
if(caution_val.empty())
caution = 0.0;
caution = 0.25;
else
caution = atof(caution_val.c_str());