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

[filter_specials] -> [experimental_filter_specials]

Browse source 
Since it calls into the same code as [filter_ability] did.
This commit is contained in:
pentarctagon 2023-11-16 20:20:22 -06:00 • committed by Pentarctagon
parent 4753038680
commit e9588d755d
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/schema/units/specials.cfg
View file

@ -57,7 +57,7 @@
{DEFAULT_KEY overwrite_specials ability_overwrite none}
[tag]
name="overwrite"
{FILTER_TAG "filter_specials" abilities ()}
{FILTER_TAG "experimental_filter_specials" abilities ()}
{SIMPLE_KEY priority real}
[/tag]
[/tag]
@ -85,7 +85,7 @@
{DEFAULT_KEY overwrite_specials ability_overwrite none}
[tag]
name="overwrite"
{FILTER_TAG "filter_specials" abilities ()}
{FILTER_TAG "experimental_filter_specials" abilities ()}
{SIMPLE_KEY priority real}
[/tag]
[/tag]
@ -114,7 +114,7 @@
{DEFAULT_KEY overwrite_specials ability_overwrite none}
[tag]
name="overwrite"
{FILTER_TAG "filter_specials" abilities ()}
{FILTER_TAG "experimental_filter_specials" abilities ()}
{SIMPLE_KEY priority real}
[/tag]
[/tag]

8
data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/test_overwrite_specials_filter.cfg
View file

@ -1,9 +1,9 @@
#####
# API(s) being tested: [damage]with overwrite_specials attibute and [overwrite][filter_specials]
# API(s) being tested: [damage]overwrite_specials,[overwrite][experimental_filter_specials]
##
# Actions:
# Three [damage] abilities are added, one with value=5, other with add=11 and the last with multiply=2.
# The one with multiply=2 have overwrite_specials=both_sides and [overwrite][filter_specials] for overwrite [damage] with add=11 but not value=5.
# The one with multiply=2 have overwrite_specials=both_sides and [overwrite][experimental_filter_specials] for overwrite [damage] with add=11 but not value=5.
# Have alice attack bob.
##
# Expected end state:
@ -41,9 +41,9 @@
multiply=2
overwrite_specials=both_sides
[overwrite]
[filter_specials]
[experimental_filter_specials]
add=1-14
[/filter_specials]
[/experimental_filter_specials]
[/overwrite]
[/damage]
[chance_to_hit]

2
src/units/abilities.cpp
View file

@ -1456,7 +1456,7 @@ bool attack_type::overwrite_special_checking(unit_ability_list& overwriters, con
// check whether the current overwriter is disabled due to a filter
bool special_matches = true;
if(overwrite_specials){
auto overwrite_filter = (*overwrite_specials).optional_child("filter_specials");
auto overwrite_filter = (*overwrite_specials).optional_child("experimental_filter_specials");
if(overwrite_filter && is_overwritable && one_side_overwritable){
if(self_){
special_matches = (*self_).ability_matches_filter(cfg, tag_name, *overwrite_filter);