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

Fixed few nasty candidate moves bugs... :E

Browse source
This commit is contained in:
Bartek Waresiak 2009-02-14 15:14:18 +00:00
parent 9d050e7df7
commit 38b475b09b
2 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/formula_ai.cpp
View file

@ -1355,12 +1355,12 @@ formula_ai::formula_ai(info& i) :
}
void formula_ai::handle_exception(game_logic::formula_error& e)
void formula_ai::handle_exception(game_logic::formula_error& e) const
{
handle_exception(e, "Error while parsing formula");
}
void formula_ai::handle_exception(game_logic::formula_error& e, const std::string& failed_operation)
void formula_ai::handle_exception(game_logic::formula_error& e, const std::string& failed_operation) const
{
LOG_AI << failed_operation << ": " << e.formula << std::endl;
display_message(failed_operation + ": " + e.formula);
@ -1374,7 +1374,7 @@ void formula_ai::handle_exception(game_logic::formula_error& e, const std::strin
}
}
void formula_ai::display_message(const std::string& msg)
void formula_ai::display_message(const std::string& msg) const
{
get_info().disp.add_chat_message(time(NULL), "fai", get_info(). team_num, msg,
game_display::MESSAGE_PUBLIC, false);
@ -1437,7 +1437,7 @@ void formula_ai::play_turn()
}
void formula_ai::make_candidate_moves() {
move_maps_valid_ = false;
build_move_list();
candidate_move_set::iterator best_move = candidate_moves_.begin();
@ -2081,9 +2081,11 @@ variant formula_ai::get_keeps() const
bool formula_ai::can_attack(const map_location unit_loc,
const map_location enemy_loc) const {
prepare_move();
move_map::iterator i;
std::pair<move_map::iterator,
move_map::iterator> unit_moves;
unit_moves = srcdst_.equal_range(unit_loc);
for(i = unit_moves.first; i != unit_moves.second; ++i) {
map_location diff(((*i).second).vector_difference(enemy_loc));
@ -2106,16 +2108,26 @@ void candidate_move::evaluate_move(const formula_ai* ai, unit_map& units,
for(unit_map::unit_iterator target = units.begin() ; target != units.end() ; ++target) {
if( (target->second.side() != team_num) &&
(ai->can_attack(me->first, target->first)) ) {
int res = -1000;
game_logic::map_formula_callable callable((formula_callable*) ai);
callable.add_ref();
callable.add("me", variant(new unit_callable(*me)));
callable.add("target", variant(new unit_callable(*target)));
int res = (formula::evaluate(eval_, callable)).as_int();
try {
res = (formula::evaluate(eval_, callable)).as_int();
} catch(formula_error& e) {
ai->handle_exception(e);
} catch(type_error& e) {
LOG_AI << "formula type error while evaluating candidate move: " << e.message << "\n";
}
if(res > score_) {
score_ = res;
action_unit_ = me;
enemy_unit_ = target;
}
ai->invalidate_move_maps();
}
}
}
@ -2125,14 +2137,22 @@ void candidate_move::evaluate_move(const formula_ai* ai, unit_map& units,
{
if( (i->second.side() == team_num) &&
(i->second.has_moved() == false) ) {
int res = -1000;
game_logic::map_formula_callable callable((formula_callable*) ai);
callable.add_ref();
callable.add("me", variant(new unit_callable(*i)));
int res = (formula::evaluate(eval_, callable)).as_int();
try {
res = (formula::evaluate(eval_, callable)).as_int();
} catch(formula_error& e) {
ai->handle_exception(e);
} catch(type_error& e) {
LOG_AI << "formula type error while evaluating candidate move: " << e.message << "\n";
}
if(res > score_) {
score_ = res;
action_unit_ = i;
}
ai->invalidate_move_maps();
}
}
}

9
src/formula_ai.hpp
View file

@ -149,10 +149,13 @@ public:
const std::map<location,paths>& get_possible_moves() const { prepare_move(); return possible_moves_; }
void handle_exception(game_logic::formula_error& e) const;
void handle_exception(game_logic::formula_error& e, const std::string& failed_operation) const;
void invalidate_move_maps() const { move_maps_valid_ = false; }
private:
void handle_exception(game_logic::formula_error& e);
void handle_exception(game_logic::formula_error& e, const std::string& failed_operation);
void display_message(const std::string& msg);
void display_message(const std::string& msg) const;
bool do_recruitment();
bool make_move(game_logic::const_formula_ptr formula_, const game_logic::formula_callable& variables);
bool execute_variant(const variant& var, bool commandline=false);