extent can_bool to resistance and leadership and using 'type_changed_…

…by_special' in replacement to type for check type changed by damage

The addition of 'type_changed_by_special' is a temporary solution to allow wml authors to be able to check types modified by damage ([filter_opponent)) in specials without systematically risking infinite recursion. The introduction in wesnoth 1.19 of [filter_specials] in [filter_attack/weapon] should make it obsolete.

data/schema/filters/weapon.cfg

@@ -21,3 +21,11 @@
 	{FILTER_BOOLEAN_OPS weapon}
 [/tag]
 
+[tag]
+	name="$filter_weapon_by_special"
+	max=0
+	super="$filter_weapon"
+	{SIMPLE_KEY modified_type string_list}
+	{FILTER_BOOLEAN_OPS weapon}
+[/tag]
+

data/schema/units/abilities.cfg

@@ -83,8 +83,8 @@
 	name="resistance"
 	max=infinite
 	super="units/unit_type/abilities/~value~"
-	{FILTER_TAG "filter_weapon" weapon ()}
-	{FILTER_TAG "filter_second_weapon" weapon ()}
+	{FILTER_TAG "filter_weapon" weapon_by_special ()}
+	{FILTER_TAG "filter_second_weapon" weapon_by_special ()}
 [/tag]
 [tag]
 	name="leadership"
@@ -95,8 +95,8 @@
 	{SIMPLE_KEY sub f_int}
 	{SIMPLE_KEY multiply f_int}
 	{SIMPLE_KEY divide f_int}
-	{FILTER_TAG "filter_weapon" weapon ()}
-	{FILTER_TAG "filter_second_weapon" weapon ()}
+	{FILTER_TAG "filter_weapon" weapon_by_special ()}
+	{FILTER_TAG "filter_second_weapon" weapon_by_special ()}
 [/tag]
 [tag]
 	name="illuminates"

data/schema/units/specials.cfg

@@ -14,10 +14,10 @@
 
 	{FILTER_TAG "filter_adjacent" adjacent ()}
 	{FILTER_TAG "filter_adjacent_location" adjacent_location ()}
-	{FILTER_TAG "filter_self" unit {FILTER_TAG "filter_weapon" weapon ()}}
-	{FILTER_TAG "filter_opponent" unit {FILTER_TAG "filter_weapon" weapon ()}}
-	{FILTER_TAG "filter_attacker" unit {FILTER_TAG "filter_weapon" weapon ()}}
-	{FILTER_TAG "filter_defender" unit {FILTER_TAG "filter_weapon" weapon ()}}
+	{FILTER_TAG "filter_self" unit {FILTER_TAG "filter_weapon" weapon_by_special ()}}
+	{FILTER_TAG "filter_opponent" unit {FILTER_TAG "filter_weapon" weapon_by_special ()}}
+	{FILTER_TAG "filter_attacker" unit {FILTER_TAG "filter_weapon" weapon_by_special ()}}
+	{FILTER_TAG "filter_defender" unit {FILTER_TAG "filter_weapon" weapon_by_special ()}}
 	{WML_MERGE_KEYS}
 [/tag]
 # A few specials inheriting from ~generic~ are included here so that unit abilities can then inherit from them.

src/units/abilities.cpp

@@ -468,7 +468,7 @@ bool unit::ability_affects_weapon(const config& cfg, const_attack_ptr weapon, bo
 	if(!weapon) {
 		return false;
 	}
-	return weapon->matches_filter(filter);
+	return weapon->matches_filter(filter, true);
 }
 
 bool unit::has_ability_type(const std::string& ability) const

src/units/attack_type.cpp

@@ -101,7 +101,7 @@ std::string attack_type::accuracy_parry_description() const
  * Returns whether or not *this matches the given @a filter, ignoring the
  * complexities introduced by [and], [or], and [not].
  */
-static bool matches_simple_filter(const attack_type & attack, const config & filter, bool can_loop)
+static bool matches_simple_filter(const attack_type & attack, const config & filter, bool no_check)
 {
 	const std::vector<std::string>& filter_range = utils::split(filter["range"]);
 	const std::string& filter_damage = filter["damage"];
@@ -144,8 +144,8 @@ static bool matches_simple_filter(const attack_type & attack, const config & fil
 	if ( !filter_name.empty() && std::find(filter_name.begin(), filter_name.end(), attack.id()) == filter_name.end() )
 		return false;
 
-	if ( !filter_type.empty()){
-		if(can_loop){
+	if (!filter_type.empty()){
+		if(no_check){
 			if (std::find(filter_type.begin(), filter_type.end(), attack.type()) == filter_type.end() ){
 				return false;
 			}
@@ -255,25 +255,25 @@ static bool matches_simple_filter(const attack_type & attack, const config & fil
 /**
  * Returns whether or not *this matches the given @a filter.
  */
-bool attack_type::matches_filter(const config& filter, bool can_loop) const
+bool attack_type::matches_filter(const config& filter, bool no_check) const
 {
 	// Handle the basic filter.
-	bool matches = matches_simple_filter(*this, filter, can_loop);
+	bool matches = matches_simple_filter(*this, filter, no_check);
 
 	// Handle [and], [or], and [not] with in-order precedence
 	for (const config::any_child condition : filter.all_children_range() )
 	{
 		// Handle [and]
 		if ( condition.key == "and" )
-			matches = matches && matches_filter(condition.cfg, can_loop);
+			matches = matches && matches_filter(condition.cfg, no_check);
 
 		// Handle [or]
 		else if ( condition.key == "or" )
-			matches = matches || matches_filter(condition.cfg, can_loop);
+			matches = matches || matches_filter(condition.cfg, no_check);
 
 		// Handle [not]
 		else if ( condition.key == "not" )
-			matches = matches && !matches_filter(condition.cfg, can_loop);
+			matches = matches && !matches_filter(condition.cfg, no_check);
 	}
 
 	return matches;

src/units/attack_type.hpp

@@ -124,7 +124,7 @@ class attack_type : public std::enable_shared_from_this<attack_type>
 
 	// In unit_types.cpp:
 
-	bool matches_filter(const config& filter, bool can_loop = false) const;
+	bool matches_filter(const config& filter, bool no_check = false) const;
 	bool apply_modification(const config& cfg);
 	bool describe_modification(const config& cfg,std::string* description);