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

Added a [defense] ability. (Fix for bug #11388.)

Browse source
This commit is contained in:
Guillaume Melquiond 2010-08-28 20:06:04 +00:00
parent 1d92772fff
commit 170f76c31b
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/unit.cpp
View file

@ -2056,7 +2056,14 @@ int unit::movement_cost(const t_translation::t_terrain terrain) const
int unit::defense_modifier(t_translation::t_terrain terrain) const
{
assert(resources::game_map != NULL);
return defense_modifier_internal(defense_mods_, cfg_, NULL, *resources::game_map, terrain);
int def = defense_modifier_internal(defense_mods_, cfg_, NULL, *resources::game_map, terrain);
unit_ability_list defense_abilities = get_abilities("defense");
if (!defense_abilities.empty()) {
unit_abilities::effect defense_effect(defense_abilities, def, false);
def = std::min<int>(defense_effect.get_composite_value(),
defense_abilities.highest("max_value").first);
}
return def;
}
bool unit::resistance_filter_matches(const config& cfg, bool attacker, const std::string& damage_name, int res) const