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

rename [filter_ability(_active)] to experimental_ability

Browse source 
because it is experimental the tag of filter is changed except for [overwrite][filter_specials]
This commit is contained in:
newfrenchy83 2023-11-15 18:32:16 +01:00 • committed by Steve Cotton
parent 44f7baf48f
commit b54a901ff3
6 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/schema/filters/unit.cfg
View file

@ -47,8 +47,8 @@
{FILTER_TAG "filter_adjacent" adjacent ()}
{FILTER_TAG "filter_location" location ()}
{FILTER_TAG "filter_side" side ()}
{FILTER_TAG "filter_ability" abilities ()}
{FILTER_TAG "filter_ability_active" abilities ()}
{FILTER_TAG "experimental_filter_ability" abilities ()}
{FILTER_TAG "experimental_filter_ability_active" abilities ()}
{FILTER_BOOLEAN_OPS unit}
[/tag]

2
data/schema/units/modifications.cfg
View file

@ -146,7 +146,7 @@
[case]
value=remove_ability
{LINK_TAG "units/unit_type/abilities"}
{FILTER_TAG "filter_ability" abilities ()}
{FILTER_TAG "experimental_filter_ability" abilities ()}
[/case]
[case]
value=new_animation

10
data/test/scenarios/wml_tests/ScenarioWML/EffectWML/test_remove_ability_by_filter.cfg
View file

@ -1,5 +1,5 @@
#####
# API(s) being tested: [effect]apply_to=remove_ability[filter_ability]
# API(s) being tested: [effect]apply_to=remove_ability[experimental_filter_ability]
##
# Actions:
# Two [chance_to_hit] abilities are added, setting the chance to 0 and 100 respectively.
@ -64,10 +64,10 @@
silent=yes
[effect]
apply_to=remove_ability
[filter_ability]
[experimental_filter_ability]
id=test_cth
tag_name=chance_to_hit
[/filter_ability]
[/experimental_filter_ability]
[/effect]
[/object]
[object]
@ -77,10 +77,10 @@
silent=yes
[effect]
apply_to=remove_ability
[filter_ability]
[experimental_filter_ability]
id=test_cth
tag_name=chance_to_hit
[/filter_ability]
[/experimental_filter_ability]
[/effect]
[/object]
[store_unit]

52
data/test/scenarios/wml_tests/ScenarioWML/EventWML/events-test_filter_ability.cfg
View file

@ -83,7 +83,7 @@
#enddef
#####
# API(s) being tested: [event][filter][filter_ability]
# API(s) being tested: [event][filter][experimental_filter_ability]
##
# Actions:
# Use the common setup from FILTER_ABILITY_TEST.
@ -99,10 +99,10 @@
name=attack
first_time_only=no
[filter]
[filter_ability]
[experimental_filter_ability]
tag_name=drains
value=25
[/filter_ability]
[/experimental_filter_ability]
[/filter]
{ASSERT ({VARIABLE_CONDITIONAL side_number equals 1})}
{ASSERT ({VARIABLE_CONDITIONAL triggers equals 0})}
@ -120,10 +120,10 @@
name=attack
first_time_only=no
[filter]
[filter_ability]
[experimental_filter_ability]
tag_name=drains
value=10-30
[/filter_ability]
[/experimental_filter_ability]
[/filter]
{ASSERT ({VARIABLE_CONDITIONAL side_number equals 1})}
{ASSERT ({VARIABLE_CONDITIONAL triggers equals 0})}
@ -135,7 +135,7 @@
[/event]
)}
# API(s) being tested: [event][filter][filter_ability]
# API(s) being tested: [event][filter][experimental_filter_ability]
##
# Actions:
# Use the common setup from FILTER_ABILITY_TEST.
@ -151,10 +151,10 @@
name=attack
first_time_only=no
[filter]
[filter_ability]
[experimental_filter_ability]
tag_name=drains
value=-25--10
[/filter_ability]
[/experimental_filter_ability]
[/filter]
{ASSERT ({VARIABLE_CONDITIONAL side_number equals 1})}
{ASSERT ({VARIABLE_CONDITIONAL triggers equals 0})}
@ -167,7 +167,7 @@
)}
#####
# API(s) being tested: [event][filter][filter_ability]
# API(s) being tested: [event][filter][experimental_filter_ability]
##
# Actions:
# Use the common setup from FILTER_ABILITY_TEST.
@ -183,10 +183,10 @@
name=attack
first_time_only=no
[filter]
[filter_ability]
[experimental_filter_ability]
tag_name=drains
value=45
[/filter_ability]
[/experimental_filter_ability]
[/filter]
{FAIL}
[/event]
@ -197,7 +197,7 @@
)}
#####
# API(s) being tested: [event][filter][filter_ability]
# API(s) being tested: [event][filter][experimental_filter_ability]
##
# Actions:
# Use the common setup from FILTER_ABILITY_TEST.
@ -213,10 +213,10 @@
name=attack
first_time_only=no
[filter]
[filter_ability]
[experimental_filter_ability]
tag_name=drains
value=-45-10
[/filter_ability]
[/experimental_filter_ability]
[/filter]
{FAIL}
[/event]
@ -227,7 +227,7 @@
)}
#####
# API(s) being tested: [event][filter][filter_ability_active]
# API(s) being tested: [event][filter][experimental_filter_ability_active]
##
# Actions:
# Use the common setup from FILTER_ABILITY_TEST.
@ -243,10 +243,10 @@
name=attack
first_time_only=no
[filter]
[filter_ability_active]
[experimental_filter_ability_active]
tag_name=drains
value=25
[/filter_ability_active]
[/experimental_filter_ability_active]
[/filter]
{ASSERT ({VARIABLE_CONDITIONAL side_number equals 1})}
{ASSERT ({VARIABLE_CONDITIONAL triggers equals 0})}
@ -259,7 +259,7 @@
)}
#####
# API(s) being tested: [event][filter][filter_ability_active]
# API(s) being tested: [event][filter][experimental_filter_ability_active]
##
# Actions:
# Use the common setup from FILTER_ABILITY_TEST.
@ -292,10 +292,10 @@
name=attack
first_time_only=no
[filter]
[filter_ability_active]
[experimental_filter_ability_active]
tag_name=drains
value=25
[/filter_ability_active]
[/experimental_filter_ability_active]
[/filter]
{FAIL}
[/event]
@ -383,7 +383,7 @@
#enddef
#####
# API(s) being tested: [event][filter][filter_ability]
# API(s) being tested: [event][filter][experimental_filter_ability]
##
# Actions:
# Use the common setup from FILTER_ABILITY_TEST_WITHOUT_VALUE.
@ -399,10 +399,10 @@
name=attack
first_time_only=no
[filter]
[filter_ability]
[experimental_filter_ability]
tag_name=drains
value=50
[/filter_ability]
[/experimental_filter_ability]
[/filter]
{ASSERT ({VARIABLE_CONDITIONAL side_number equals 1})}
{VARIABLE_OP triggers add 1}
@ -414,7 +414,7 @@
)}
#####
# API(s) being tested: [event][filter][filter_ability]
# API(s) being tested: [event][filter][experimental_filter_ability]
##
# Actions:
# Use the common setup from FILTER_ABILITY_TEST_WITHOUT_VALUE.
@ -430,10 +430,10 @@
name=attack
first_time_only=no
[filter]
[filter_ability]
[experimental_filter_ability]
tag_name=drains
value=35
[/filter_ability]
[/experimental_filter_ability]
[/filter]
{FAIL}
[/event]

4
src/units/filter.cpp
View file

@ -806,7 +806,7 @@ void unit_filter_compound::fill(vconfig cfg)
return side_filter(c, args.fc).match(args.u.side());
});
}
else if (child.first == "filter_ability") {
else if (child.first == "experimental_filter_ability") {
create_child(child.second, [](const vconfig& c, const unit_filter_args& args) {
for(const config::any_child ab : args.u.abilities().all_children_range()) {
if(args.u.ability_matches_filter(ab.cfg, ab.key, c.get_parsed_config())) {
@ -816,7 +816,7 @@ void unit_filter_compound::fill(vconfig cfg)
return false;
});
}
else if (child.first == "filter_ability_active") {
else if (child.first == "experimental_filter_ability_active") {
create_child(child.second, [](const vconfig& c, const unit_filter_args& args) {
if(!display::get_singleton()){
return false;

4
src/units/unit.cpp
View file

@ -2254,12 +2254,12 @@ void unit::apply_builtin_effect(std::string apply_to, const config& effect)
}
} else if(apply_to == "remove_ability") {
if(auto ab_effect = effect.optional_child("abilities")) {
deprecated_message("[effect]apply_to=remove_ability [abilities]", DEP_LEVEL::INDEFINITE, "", "Use [filter_ability] instead in [effect]apply_to=remove_ability");
deprecated_message("[effect]apply_to=remove_ability [abilities]", DEP_LEVEL::INDEFINITE, "", "Use [experimental_filter_ability] instead in [effect]apply_to=remove_ability");
for(const config::any_child ab : ab_effect->all_children_range()) {
remove_ability_by_id(ab.cfg["id"]);
}
}
if(auto fab_effect = effect.optional_child("filter_ability")) {
if(auto fab_effect = effect.optional_child("experimental_filter_ability")) {
remove_ability_by_attribute(*fab_effect);
}
} else if(apply_to == "image_mod") {