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

simplify checking for overwrite_specials when 'one_side' used

Browse source 
Because complexity of special_active function, i was afraid to use directly special_affects_self/opponent, but like in this state, only apply to self/opponent/etc. is pertinent, i have finally try that.
This commit is contained in:
newfrenchy83 2023-06-30 10:18:57 +02:00 • committed by Steve Cotton
parent ae76ddff68
commit 3afc6663f1
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/units/abilities.cpp
View file

@ -1259,11 +1259,11 @@ unit_ability_list attack_type::get_specials_and_abilities(const std::string& spe
{
unit_ability_list abil_list = get_weapon_ability(special);
if(!abil_list.empty()){
abil_list = overwrite_special_checking(special, abil_list, abil_list, "filter_student", false);
abil_list = overwrite_special_checking(abil_list, abil_list, false);
}
unit_ability_list spe_list = get_specials(special);
if(!spe_list.empty()){
spe_list = overwrite_special_checking(special, spe_list, abil_list, "filter_self", true);
spe_list = overwrite_special_checking(spe_list, abil_list, true);
if(special == "plague" && !spe_list.empty()){
return spe_list;
}
@ -1283,7 +1283,7 @@ static bool overwrite_special_affects(const config& special)
return (apply_to == "one_side" || apply_to == "both_sides");
}
unit_ability_list attack_type::overwrite_special_checking(const std::string& ability, unit_ability_list input, unit_ability_list overwriters, const std::string& filter_self, bool is_special) const
unit_ability_list attack_type::overwrite_special_checking(unit_ability_list input, unit_ability_list overwriters, bool is_special) const
{
for(unit_ability_list::iterator i = overwriters.begin(); i != overwriters.end();) {
if(!overwrite_special_affects(*i->ability_cfg)) {
@ -1302,11 +1302,11 @@ unit_ability_list attack_type::overwrite_special_checking(const std::string& abi
bool is_overwritable = (is_special || !overwrite_special_affects(*j.ability_cfg));
bool one_side_overwritable = true;
if(affect_side && is_overwritable){
if(special_active_impl(shared_from_this(), other_attack_, *i.ability_cfg, AFFECT_SELF, ability, "filter_student")){
one_side_overwritable = special_active_impl(shared_from_this(), other_attack_, *j.ability_cfg, AFFECT_SELF, ability, filter_self);
if(special_affects_self(*i.ability_cfg, is_attacker_)){
one_side_overwritable = special_affects_self(*j.ability_cfg, is_attacker_);
}
else if(special_active_impl(other_attack_, shared_from_this(), *i.ability_cfg, AFFECT_OTHER, ability, "filter_student")){
one_side_overwritable = special_active_impl(other_attack_, shared_from_this(), *j.ability_cfg, AFFECT_OTHER, ability, filter_self);
else if(special_affects_opponent(*i.ability_cfg, !is_attacker_)){
one_side_overwritable = special_affects_opponent(*j.ability_cfg, !is_attacker_);
}
}
return (is_overwritable && one_side_overwritable);

4
src/units/attack_type.hpp
View file

@ -139,13 +139,11 @@ private:
* Filter a list of abilities or weapon specials, removing any entries that are overridden by
* the overwrite_specials attributes of a second list.
*
* @param ability The special ability type who is being checked.
* @param input list to check, a filtered copy of this list is returned by the function.
* @param overwriters list that may have overwrite_specials attributes.
* @param filter_self name of [filter_"self/student"] if is abilities or specials who are checked.
* @param is_special if true, input contains weapon specials; if false, it contains abilities.
*/
unit_ability_list overwrite_special_checking(const std::string& ability, unit_ability_list input, unit_ability_list overwriters, const std::string& filter_self, bool is_special) const;
unit_ability_list overwrite_special_checking(unit_ability_list input, unit_ability_list overwriters, bool is_special) const;
/** check_self_abilities : return an boolean value for checking of activities of abilities used like weapon
* @return True if the special @a special is active.
* @param cfg the config to one special ability checked.