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

Some improvements for formula system:

Browse source 
* made 'my_leader' return unit instead of location only

* made 'defense_on' return unit's defense on a given location instead
  of the chance of being hit

* added new function 'chance_to_hit' which works like previous 'defense_on'
This commit is contained in:
Bartek Waresiak 2008-03-24 01:25:14 +00:00
parent 7f75708f8b
commit 1e097f2280
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/formula_ai.cpp
View file

@ -428,6 +428,31 @@ private:
return variant();
}
return variant(100 - un.defense_modifier(ai_.get_info().map[loc]));
}
const formula_ai& ai_;
};
class chance_to_hit_function : public function_expression {
public:
chance_to_hit_function(const args_list& args, const formula_ai& ai_object)
: function_expression("chance_to_hit", args, 2, 2), ai_(ai_object)
{}
private:
variant execute(const formula_callable& variables) const {
variant u = args()[0]->evaluate(variables);
variant loc_var = args()[1]->evaluate(variables);
if(u.is_null() || loc_var.is_null()) {
return variant();
}
const unit& un = convert_variant<unit_callable>(u)->get_unit();
const gamemap::location& loc = convert_variant<location_callable>(loc_var)->loc();
if(!ai_.get_info().map.on_board(loc)) {
return variant();
}
return variant(un.defense_modifier(ai_.get_info().map[loc]));
}
@ -494,6 +519,8 @@ class ai_function_symbol_table : public function_symbol_table {
return expression_ptr(new units_can_reach_function(args, ai_));
} else if(fn == "defense_on") {
return expression_ptr(new defense_on_function(args, ai_));
} else if(fn == "chance_to_hit") {
return expression_ptr(new chance_to_hit_function(args, ai_));
} else if(fn == "max_possible_damage") {
return expression_ptr(new max_possible_damage_function(args, ai_));
} else if(fn == "distance_to_nearest_unowned_village") {
@ -788,7 +815,7 @@ variant formula_ai::get_value(const std::string& key) const
return variant();
}
return variant(new location_callable(i->first));
return variant(new unit_callable(*i, current_team(), get_info().team_num));
} else if(key == "vars") {
return variant(&vars_);
} else if(key == "keeps") {