[1.17] Fix FORCE_CHANCE_TO_HIT macro

FORCE_CHANCE_TO_HIT macro use overwrite_specials for overwrite chance_to_hit specials or abilities, but if abilities used like special own this attribute, it can't be overwrited. The use of filter_abilities in [effect]remove_ability authorize to remove all chance_to_hit ability using this attribute in fighter and potential leader.
newfrenchy83 · Sep 24, 2023 · 90b3827 · 90b3827
1 parent af74b8f
commit 90b3827
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/data/core/macros/utils.cfg b/data/core/macros/utils.cfg
@@ -552,6 +552,9 @@
                         cumulative=no
                         affect_self=yes
                         overwrite_specials=both_sides
+                        [overwrite]
+                            priority=1000
+                        [/overwrite]
                         [filter_opponent]
                             {SECOND_FILTER}
                         [/filter_opponent]
@@ -605,6 +608,9 @@
                         cumulative=no
                         affect_self=yes
                         overwrite_specials=both_sides
+                        [overwrite]
+                            priority=1000
+                        [/overwrite]
                         [filter_opponent]
                             {SECOND_FILTER}
                         [/filter_opponent]

diff --git a/data/test/scenarios/macro_tests/test_force_chance_to_hit_macro.cfg b/data/test/scenarios/macro_tests/test_force_chance_to_hit_macro.cfg
@@ -42,6 +42,15 @@
                     [/chance_to_hit]
                 [/set_specials]
             [/effect]
+            [effect]#test if macro work when ability with overwrite_special is used
+                apply_to=new_ability
+                [abilities]
+                    [chance_to_hit]
+                        value=100
+                        overwrite_specials=one_side
+                    [/chance_to_hit]
+                [/abilities]
+            [/effect]
             [filter]
                 id=bob
             [/filter]
@@ -64,6 +73,15 @@
                     [/chance_to_hit]
                 [/set_specials]
             [/effect]
+            [effect]#test if macro work when ability with overwrite_special is used
+                apply_to=new_ability
+                [abilities]
+                    [chance_to_hit]
+                        value=100
+                        overwrite_specials=one_side
+                    [/chance_to_hit]
+                [/abilities]
+            [/effect]
             [filter]
                 id=alice
             [/filter]