diff --git a/data/test/macros/wml_unit_test_macros.cfg b/data/test/macros/wml_unit_test_macros.cfg index 86a5cc70162e3..6d4694d259d23 100644 --- a/data/test/macros/wml_unit_test_macros.cfg +++ b/data/test/macros/wml_unit_test_macros.cfg @@ -76,7 +76,13 @@ [/if] #enddef -#define ATTACK_AND_VALIDATE STARTX STARTY X1 Y1 X2 Y2 DAMAGE1 +#define ATTACK_AND_VALIDATE DAMAGE1 + +#arg ID1 +alice#endarg + +#arg ID2 +bob#endarg #arg DAMAGE2 {DAMAGE1}#endarg @@ -103,62 +109,27 @@ max_hitpoints = 1000 [/modify_unit] - {VARIABLE a {STARTX}} - {VARIABLE b {STARTY}} - - # avoid a warning if start and end are the same coordinates - [if] - [variable] - name=a - not_equals={X1} - [/variable] - [or] - [variable] - name=b - not_equals={Y1} - [/variable] - [/or] - [then] - [do_command] - [move] - x={STARTX},{X1} - y={STARTY},{Y1} - [/move] - [/do_command] - [/then] - [/if] - - [do_command] - [attack] - weapon=0 - defender_weapon=0 - [source] - x,y={X1},{Y1} - [/source] - [destination] - x,y={X2},{Y2} - [/destination] - [/attack] - [/do_command] + [test_do_attack_by_id] + attacker={ID1} + defender={ID2} + [/test_do_attack_by_id] [store_unit] [filter] - x,y={X1},{Y1} + id={ID1} [/filter] - variable=temp1 + variable={ID1} [/store_unit] [store_unit] [filter] - x,y={X2},{Y2} + id={ID2} [/filter] - variable=temp2 + variable={ID2} [/store_unit] - {ASSERT {VARIABLE_CONDITIONAL temp1.hitpoints numerical_equals "$($temp1.max_hitpoints-{DAMAGE1})"}} - {ASSERT {VARIABLE_CONDITIONAL temp2.hitpoints numerical_equals "$($temp2.max_hitpoints-{DAMAGE2})"}} + {ASSERT {VARIABLE_CONDITIONAL {ID1}.hitpoints numerical_equals "$(${ID1}.max_hitpoints-{DAMAGE1})"}} + {ASSERT {VARIABLE_CONDITIONAL {ID2}.hitpoints numerical_equals "$(${ID2}.max_hitpoints-{DAMAGE2})"}} - {CLEAR_VARIABLE temp1} - {CLEAR_VARIABLE temp2} - {CLEAR_VARIABLE a} - {CLEAR_VARIABLE b} + {CLEAR_VARIABLE {ID1}} + {CLEAR_VARIABLE {ID2}} #enddef diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal.cfg index c73c1c1da5fdc..11aa6a83a5232 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + #define EXPECT_HITPOINTS leader1 healer1 leader2 healer2 [store_unit] [filter] diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add.cfg index 07ace25abdbc0..fc1f0a962543e 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_divide.cfg index c12d9e9026c08..6fce75b914271 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_multiply.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_multiply.cfg index c6c213ca760e9..d1103e3b657fe 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_multiply.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_multiply.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_sub.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_sub.cfg index 86fd6fce671c7..c611ec3dfa87c 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_sub.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_add_sub.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_allies.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_allies.cfg index bde664f1e6b26..4d4ef50e18742 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_allies.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_allies.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]affect_allies= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_enemies.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_enemies.cfg index e3dfcdc9da633..f5da561da5f9f 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_enemies.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_enemies.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]affect_enemies= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_everybody.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_everybody.cfg index 46b7f095b6423..0d7a64f52a71c 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_everybody.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_everybody.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]affect_allies= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_self.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_self.cfg index 09999fd04f4d7..822f6c87c725c 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_self.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_affect_self.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]affect_self= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_divide.cfg index 1d950efdf7f1b..2142618569089 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_high_fraction.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_high_fraction.cfg index aac4113937bab..db1c944abfc8e 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_high_fraction.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_high_fraction.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_low_fraction.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_low_fraction.cfg index 766c1a8927ee6..26fc665b2bd61 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_low_fraction.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_low_fraction.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply.cfg index a12a73617c4eb..c85f009f2ebb1 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply_divide.cfg index ba6c3aa6926e0..a661570b0b6a0 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply_fraction.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply_fraction.cfg index e284e3c7b4e6e..2369d1febb47a 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply_fraction.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_multiply_fraction.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_negative_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_negative_value.cfg index e95bed0ddd593..24e8e61c283b8 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_negative_value.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_negative_value.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_poison_cured.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_poison_cured.cfg index 36850249e4035..bae77e7c2e3f6 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_poison_cured.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_poison_cured.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]poison= ## @@ -20,8 +22,7 @@ [effect] apply_to = new_ability [abilities] - {TEST_ABILITY heals 4 ([affect_adjacent][/affect_adjacent] - poison="cured") ALLIES=yes} + {TEST_ABILITY heals 4 ([affect_adjacent][/affect_adjacent]poison="cured") ALLIES=yes} [/abilities] [/effect] [effect] diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_poison_slowed.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_poison_slowed.cfg index 5e2caf6b2d3b3..40a34df0e8dc0 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_poison_slowed.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_poison_slowed.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]poison= ## @@ -20,8 +22,7 @@ [effect] apply_to = new_ability [abilities] - {TEST_ABILITY heals 4 ([affect_adjacent][/affect_adjacent] - poison="slowed") ALLIES=yes} + {TEST_ABILITY heals 4 ([affect_adjacent][/affect_adjacent]poison="slowed") ALLIES=yes} [/abilities] [/effect] [effect] diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_positive_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_positive_value.cfg index 99984f565c835..d1d9dd9bb3f80 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_positive_value.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_positive_value.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub.cfg index 27c96d8922c12..9c943d93ebea6 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub_divide.cfg index 8e41299e46420..79787853a7d5a 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub_multiply.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub_multiply.cfg index 16f850b3e4bbf..1ffcbe8c4708d 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub_multiply.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_sub_multiply.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_mixed_same_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_mixed_same_id.cfg index 4e77504f3e085..39ed118552b4f 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_mixed_same_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_mixed_same_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_mixed_unique_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_mixed_unique_id.cfg index 32b766e8d7c32..c967bf41e8c90 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_mixed_unique_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_mixed_unique_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_no_same_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_no_same_id.cfg index 3ce1b54d58082..f7f9a380dd696 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_no_same_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_no_same_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_no_unique_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_no_unique_id.cfg index 9de526441dc2c..c57bb25e44e36 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_no_unique_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_no_unique_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_yes_same_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_yes_same_id.cfg index fa2d94667b0c0..61edf894bafb1 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_yes_same_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_yes_same_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_yes_unique_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_yes_unique_id.cfg index 23ff4cbae34fb..b8f1380da321c 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_yes_unique_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_yes_unique_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_wfl_other.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_wfl_other.cfg index 548ba583dbe87..9acd7833cfd11 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_wfl_other.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_wfl_other.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_wfl_self.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_wfl_self.cfg index 4973a1de50212..d371930be8e31 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_wfl_self.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_wfl_self.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_zero.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_zero.cfg index f8be5f4c058c9..52e945721fb36 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_zero.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_zero.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [heals]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add.cfg index ef71ea47fe527..d295cfe645945 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_divide.cfg index 32973e3816947..5ca0de3f93ee3 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_multiply.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_multiply.cfg index 65bf4cd937a2c..768fa4f653511 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_multiply.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_multiply.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_sub.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_sub.cfg index ed5268837eed4..50bef9b68ff72 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_sub.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_add_sub.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_allies.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_allies.cfg index 3ed3afdba2f87..de3c42bdc0889 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_allies.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_allies.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]affect_allies= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_enemies.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_enemies.cfg index f5f947469a511..36022e286679a 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_enemies.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_enemies.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]affect_enemies= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_everybody.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_everybody.cfg index 97d0cd0def2a7..b4524b383acd2 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_everybody.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_everybody.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]affect_allies= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_self_no.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_self_no.cfg index d2db5442f1e32..6c563bb16e691 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_self_no.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_self_no.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]affect_self= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_divide.cfg index 5215d0072bdd6..4518187924863 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_high_fraction.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_high_fraction.cfg index 48b5ca1879378..a8c6f36829e2d 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_high_fraction.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_high_fraction.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_low_fraction.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_low_fraction.cfg index 6b5d348dff60c..11e45bbd6631d 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_low_fraction.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_low_fraction.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply.cfg index ca77b6760c59b..59ae0efae7e43 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply_divide.cfg index 53b6522be0f70..17c2e0c272ee7 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply_fraction.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply_fraction.cfg index a4d6cb9038b98..f14b9acfaad23 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply_fraction.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply_fraction.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_negative_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_negative_value.cfg index dd5364384a9e9..294863488484f 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_negative_value.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_negative_value.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_no_poison.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_no_poison.cfg index 134f5280b9965..c07f3cb3ccf93 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_no_poison.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_no_poison.cfg @@ -1,3 +1,5 @@ +#textdomain wesnoth-test + ##### # API(s) being tested: [regenerate]poison= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_no_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_no_value.cfg index b65d73decd2d6..5fd419cf6e8ac 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_no_value.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_no_value.cfg @@ -1,3 +1,5 @@ +#textdomain wesnoth-test + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_poison_cured.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_poison_cured.cfg index bb5075bd574eb..568b9140b46f3 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_poison_cured.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_poison_cured.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]poison= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_poison_slowed.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_poison_slowed.cfg index fa0ebc8a548c0..ddeb796818214 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_poison_slowed.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_poison_slowed.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]poison= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_positive_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_positive_value.cfg index cd236ed29682e..8dc8cda1780cc 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_positive_value.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_positive_value.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub.cfg index 4257e2e2d4da7..077205d7b8b3c 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub_divide.cfg index 8dc9b551d022a..a365f46171ef5 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub_multiply.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub_multiply.cfg index 672aa30f806ce..8276076baf307 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub_multiply.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_sub_multiply.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_mixed_same_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_mixed_same_id.cfg index c0f1c747d4231..6ff793d901edc 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_mixed_same_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_mixed_same_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_mixed_unique_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_mixed_unique_id.cfg index d7206095a01bc..9c6ebf000aa87 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_mixed_unique_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_mixed_unique_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_no_same_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_no_same_id.cfg index 73fb9197cb66f..176f474209b9a 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_no_same_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_no_same_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_no_unique_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_no_unique_id.cfg index 236389bb44ad1..470f6210bda19 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_no_unique_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_no_unique_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_yes_same_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_yes_same_id.cfg index 1939d3dc638b7..970755d138262 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_yes_same_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_yes_same_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_yes_unique_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_yes_unique_id.cfg index 01e372e99b476..37c1fa5d06279 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_yes_unique_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_two_cumulative_yes_unique_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]cumulative= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_wfl_other.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_wfl_other.cfg index 9c2647307cd0f..8eb6868df4cab 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_wfl_other.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_wfl_other.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_wfl_self.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_wfl_self.cfg index 1a645142251c0..de0c90621025b 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_wfl_self.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_wfl_self.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_zero.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_zero.cfg index dbe5638f89eca..0893454baa428 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_zero.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_zero.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [regenerate]value= ## diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_both.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_both.cfg index 932db52b9a91e..71e4752e26ff0 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_both.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_both.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]active_on= ## @@ -9,7 +11,7 @@ # The damage from the attack is reduced by 50% for the attacker # The damage from the attack is not for the defenser ##### -{GENERIC_UNIT_TEST "resistance_active_on_both" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_active_on_both" ( [event] name = start @@ -24,7 +26,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 50 DAMAGE2=50} + {ATTACK_AND_VALIDATE 50 DAMAGE2=50} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_defense.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_defense.cfg index d67ae04bcf2f1..120dce3be3529 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_defense.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_defense.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]active_on= ## @@ -9,7 +11,7 @@ # The damage from the attack is reduced by 50% for the attacker # The damage from the attack is not for the defenser ##### -{GENERIC_UNIT_TEST "resistance_active_on_defense" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_active_on_defense" ( [event] name = start @@ -25,7 +27,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 100 DAMAGE2=50} + {ATTACK_AND_VALIDATE 100 DAMAGE2=50} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_offense.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_offense.cfg index 8814119965533..e85babfcb18c5 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_offense.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_active_on_offense.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]active_on= ## @@ -9,7 +11,7 @@ # The damage from the attack is reduced by 50% for the attacker # The damage from the attack is not for the defenser ##### -{GENERIC_UNIT_TEST "resistance_active_on_offense" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_active_on_offense" ( [event] name = start @@ -25,7 +27,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 50 DAMAGE2=100} + {ATTACK_AND_VALIDATE 50 DAMAGE2=100} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add.cfg index 8e635bae4ca3f..31fd707dba79b 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 70% ##### -{GENERIC_UNIT_TEST "resistance_add" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_add" ( [event] name = start @@ -24,7 +26,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 30} + {ATTACK_AND_VALIDATE 30} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_divide.cfg index ecef146afdb0d..86ee61341f3d2 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 30% ##### -{GENERIC_UNIT_TEST "resistance_add_divide" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_add_divide" ( [event] name = start @@ -25,7 +27,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 70} + {ATTACK_AND_VALIDATE 70} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_multiply.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_multiply.cfg index 46d07e13cd7e9..52751959aa308 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_multiply.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_multiply.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 60% ##### -{GENERIC_UNIT_TEST "resistance_add_multiply" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_add_multiply" ( [event] name = start @@ -25,7 +27,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 40} + {ATTACK_AND_VALIDATE 40} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_sub.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_sub.cfg index 6608a37f4b432..a371dc183201f 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_sub.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_add_sub.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 40% ##### -{GENERIC_UNIT_TEST "resistance_add_sub" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_add_sub" ( [event] name = start @@ -25,7 +27,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 60} + {ATTACK_AND_VALIDATE 60} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_allies.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_allies.cfg index ea2a25d143e2f..f171b9601c2c6 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_allies.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_allies.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]affect_allies= ## @@ -33,8 +35,8 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 4 4 4 4 5 4 50} - {ATTACK_AND_VALIDATE 3 4 3 4 4 3 100} + {ATTACK_AND_VALIDATE 50 ID1=bob ID2=dave DAMAGE2=100} + {ATTACK_AND_VALIDATE 100 ID1=charlie ID2=alice} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_enemies.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_enemies.cfg index a047b797bb309..578745fa6ad99 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_enemies.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_enemies.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]affect_enemies= ## @@ -9,7 +11,7 @@ # The damage from the attack is reduced by 50% the enemy # The damage from the attack is not reduced for itself ##### -{GENERIC_UNIT_TEST "resistance_affect_enemies" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_affect_enemies" ( [event] name = start @@ -26,8 +28,8 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 100 DAMAGE2=50} - {ATTACK_AND_VALIDATE 13 3 13 3 12 3 50 DAMAGE2=100} + {ATTACK_AND_VALIDATE 100 DAMAGE2=50} + {ATTACK_AND_VALIDATE 50 ID1=bob ID2=alice DAMAGE2=100} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_everybody.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_everybody.cfg index 9953a00f16f23..42406be74621f 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_everybody.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_everybody.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]affect_allies= ## @@ -32,8 +34,8 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 4 3 4 3 5 4 50} - {ATTACK_AND_VALIDATE 3 4 3 4 4 4 50} + {ATTACK_AND_VALIDATE 50 ID2=dave} + {ATTACK_AND_VALIDATE 50 ID1=bob ID2=charlie} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_self_no.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_self_no.cfg index 6e4ef179a2b4d..573fe0804124f 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_self_no.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_affect_self_no.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]affect_self= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 0% since it doesn't actually affect anyone ##### -{GENERIC_UNIT_TEST "resistance_affect_self_no" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_affect_self_no" ( [event] name = start @@ -23,7 +25,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 100} + {ATTACK_AND_VALIDATE 100} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_blade.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_blade.cfg index 56805fd9a8f18..91f302b28fc7f 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_blade.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_blade.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]apply_to= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 50% ##### -{GENERIC_UNIT_TEST "resistance_apply_to_blade" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_apply_to_blade" ( [event] name = start @@ -24,7 +26,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 50} + {ATTACK_AND_VALIDATE 50} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_invalid.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_invalid.cfg index 2a25fd9f83051..4996d7a2a2390 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_invalid.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_invalid.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]apply_to= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 50% ##### -{GENERIC_UNIT_TEST "resistance_apply_to_invalid" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_apply_to_invalid" ( [event] name = start @@ -24,7 +26,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 100} + {ATTACK_AND_VALIDATE 100} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_non_blade.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_non_blade.cfg index 77b651271d21e..85881e1f18b6a 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_non_blade.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_non_blade.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]apply_to= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 50% ##### -{GENERIC_UNIT_TEST "resistance_apply_to_non_blade" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_apply_to_non_blade" ( [event] name = start @@ -24,7 +26,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 100} + {ATTACK_AND_VALIDATE 100} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_divide.cfg index 539c049a65da2..980277baf379b 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 20% ##### -{GENERIC_UNIT_TEST "resistance_divide" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_divide" ( [event] name = start @@ -24,7 +26,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 80} + {ATTACK_AND_VALIDATE 80} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_high_fraction.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_high_fraction.cfg index e98652a52aef3..53876f66db03c 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_high_fraction.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_high_fraction.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -9,7 +11,7 @@ # The damage from the attack is reduced by 45% - the .8 is truncated ##### #ifndef SCHEMA_VALIDATION -{GENERIC_UNIT_TEST "resistance_high_fraction" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_high_fraction" ( [event] name = start @@ -24,7 +26,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 55} + {ATTACK_AND_VALIDATE 55} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_low_fraction.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_low_fraction.cfg index 0998096b9be91..54c984af6820b 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_low_fraction.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_low_fraction.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -9,7 +11,7 @@ # The damage from the attack is reduced by 45% - the .2 is truncated ##### #ifndef SCHEMA_VALIDATION -{GENERIC_UNIT_TEST "resistance_low_fraction" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_low_fraction" ( [event] name = start @@ -24,7 +26,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 55} + {ATTACK_AND_VALIDATE 55} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_max_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_max_value.cfg index 61a08456d917a..da7461b0559cc 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_max_value.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_max_value.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]max_value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 10% ##### -{GENERIC_UNIT_TEST "resistance_max_value" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_max_value" ( [event] name = start @@ -23,7 +25,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 90} + {ATTACK_AND_VALIDATE 90} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply.cfg index 72d2b14818f5d..6b87f8e9797f5 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 50% ##### -{GENERIC_UNIT_TEST "resistance_multiply" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_multiply" ( [event] name = start @@ -24,7 +26,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 50} + {ATTACK_AND_VALIDATE 50} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply_divide.cfg index 13433c778c878..e1b12bb225bcf 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 40% ##### -{GENERIC_UNIT_TEST "resistance_multiply_divide" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_multiply_divide" ( [event] name = start @@ -25,7 +27,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 60} + {ATTACK_AND_VALIDATE 60} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply_fraction.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply_fraction.cfg index 51da564bdb95a..70419e62bc30a 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply_fraction.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_multiply_fraction.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -9,7 +11,7 @@ # The damage from the attack is reduced by 44% - the .9 is truncated before multiplication is done ##### #ifndef SCHEMA_VALIDATION -{GENERIC_UNIT_TEST "resistance_multiply_fraction" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_multiply_fraction" ( [event] name = start @@ -25,7 +27,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 56} + {ATTACK_AND_VALIDATE 56} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_negative_max_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_negative_max_value.cfg index f21c166f03526..bc75a30c60fbd 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_negative_max_value.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_negative_max_value.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]max_value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is increased by 10% ##### -{GENERIC_UNIT_TEST "resistance_negative_max_value" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_negative_max_value" ( [event] name = start @@ -23,7 +25,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 110} + {ATTACK_AND_VALIDATE 110} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_negative_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_negative_value.cfg index bed4bd78b0313..c0b5e627adb47 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_negative_value.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_negative_value.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is increased by 50% ##### -{GENERIC_UNIT_TEST "resistance_negative_value" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_negative_value" ( [event] name = start @@ -23,7 +25,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 150} + {ATTACK_AND_VALIDATE 150} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_no_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_no_value.cfg index bfd3a5349bf34..1a0e4f98b1c27 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_no_value.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_no_value.cfg @@ -10,7 +10,7 @@ # Expected end state: # The damage from the attack is not reduced ##### -{GENERIC_UNIT_TEST "resistance_no_value" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_no_value" ( [event] name = start @@ -32,7 +32,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 100} + {ATTACK_AND_VALIDATE 100} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_positive_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_positive_value.cfg index 74142fffe8d72..6783c07b5e360 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_positive_value.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_positive_value.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 50% ##### -{GENERIC_UNIT_TEST "resistance_positive_value" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_positive_value" ( [event] name = start @@ -23,7 +25,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 50} + {ATTACK_AND_VALIDATE 50} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub.cfg index e950b69457128..9c9d3051dc22a 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 30% ##### -{GENERIC_UNIT_TEST "resistance_sub" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_sub" ( [event] name = start @@ -24,7 +26,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 70} + {ATTACK_AND_VALIDATE 70} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub_divide.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub_divide.cfg index 59c836f580e61..614fefb05a1ed 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub_divide.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub_divide.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 25% ##### -{GENERIC_UNIT_TEST "resistance_sub_divide" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_sub_divide" ( [event] name = start @@ -25,7 +27,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 75} + {ATTACK_AND_VALIDATE 75} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub_multiply.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub_multiply.cfg index c60e2d960dfa9..062dbf08f0663 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub_multiply.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub_multiply.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 60% ##### -{GENERIC_UNIT_TEST "resistance_sub_multiply" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_sub_multiply" ( [event] name = start @@ -25,7 +27,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 40} + {ATTACK_AND_VALIDATE 40} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_same_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_same_id.cfg index e8531ab3e54d9..841bfba2c42e0 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_same_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_same_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]cumulative= ## @@ -10,7 +12,7 @@ # Expected end state: # The damage from the attack is reduced by 30% ##### -{GENERIC_UNIT_TEST "resistance_two_cumulative_mixed_same_id" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_two_cumulative_mixed_same_id" ( [event] name = start @@ -26,7 +28,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 70} + {ATTACK_AND_VALIDATE 70} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_unique_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_unique_id.cfg index 2debe96ba4558..81e33e973142f 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_unique_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_unique_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]cumulative= ## @@ -10,7 +12,7 @@ # Expected end state: # The damage from the attack is reduced by 30% ##### -{GENERIC_UNIT_TEST "resistance_two_cumulative_mixed_unique_id" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_two_cumulative_mixed_unique_id" ( [event] name = start @@ -26,7 +28,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 70} + {ATTACK_AND_VALIDATE 70} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_same_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_same_id.cfg index 2d7e289121e4b..027c25f319ee6 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_same_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_same_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]cumulative= ## @@ -10,7 +12,7 @@ # Expected end state: # The damage from the attack is reduced by 30% ##### -{GENERIC_UNIT_TEST "resistance_two_cumulative_no_same_id" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_two_cumulative_no_same_id" ( [event] name = start @@ -26,7 +28,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 70} + {ATTACK_AND_VALIDATE 70} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_unique_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_unique_id.cfg index aee33b56a0d17..8309da0f74f26 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_unique_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_unique_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]cumulative= ## @@ -10,7 +12,7 @@ # Expected end state: # The damage from the attack is reduced by 30% ##### -{GENERIC_UNIT_TEST "resistance_two_cumulative_no_unique_id" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_two_cumulative_no_unique_id" ( [event] name = start @@ -26,7 +28,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 70} + {ATTACK_AND_VALIDATE 70} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_same_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_same_id.cfg index 0eaa004dfc0ae..d508912239612 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_same_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_same_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]cumulative= ## @@ -10,7 +12,7 @@ # Expected end state: # The damage from the attack is reduced by 30% ##### -{GENERIC_UNIT_TEST "resistance_two_cumulative_yes_same_id" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_two_cumulative_yes_same_id" ( [event] name = start @@ -26,7 +28,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 70} + {ATTACK_AND_VALIDATE 70} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_unique_id.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_unique_id.cfg index 8b1c7456c3ed3..a20ea90f7dd25 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_unique_id.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_unique_id.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]cumulative= ## @@ -10,7 +12,7 @@ # Expected end state: # The damage from the attack is reduced by 30% ##### -{GENERIC_UNIT_TEST "resistance_two_cumulative_yes_unique_id" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_two_cumulative_yes_unique_id" ( [event] name = start @@ -26,7 +28,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 70} + {ATTACK_AND_VALIDATE 70} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_wfl_other.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_wfl_other.cfg index bf090307349a1..5a4d2a6d02cfe 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_wfl_other.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_wfl_other.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 10% ##### -{GENERIC_UNIT_TEST "resistance_wfl_other" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_wfl_other" ( [event] name = start @@ -23,7 +25,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 90} + {ATTACK_AND_VALIDATE 90} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_wfl_self.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_wfl_self.cfg index 8ee46850d695f..174dd18cd9332 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_wfl_self.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_wfl_self.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 10% ##### -{GENERIC_UNIT_TEST "resistance_wfl_self" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_wfl_self" ( [event] name = start @@ -23,7 +25,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 90} + {ATTACK_AND_VALIDATE 90} {SUCCEED} [/event] )} diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_zero.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_zero.cfg index 61c5350baefbb..cbf03262f61dd 100644 --- a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_zero.cfg +++ b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_zero.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + ##### # API(s) being tested: [resistance]value= ## @@ -8,7 +10,7 @@ # Expected end state: # The damage from the attack is reduced by 0% ##### -{GENERIC_UNIT_TEST "resistance_zero" ( +{COMMON_KEEP_A_B_UNIT_TEST "resistance_zero" ( [event] name = start @@ -23,7 +25,7 @@ [/effect] [/modify_unit] - {ATTACK_AND_VALIDATE 7 3 12 3 13 3 100} + {ATTACK_AND_VALIDATE 100} {SUCCEED} [/event] )}