address comments

Pentarctagon · Dec 12, 2023 · 34fd813 · 34fd813
1 parent 910c93a
commit 34fd813
Show file tree

Hide file tree

Showing 101 changed files with 294 additions and 127 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,5 @@
+# wmllint: no translatables
+
 #####
 # API(s) being tested: [heals]value=
 ##

diff --git a/...est/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_mixed_same_id.cfg b/...est/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/...t/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_mixed_unique_id.cfg b/...t/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
@@ -1,3 +1,5 @@
+# wmllint: no translatables
+
 #####
 # API(s) being tested: [heals]cumulative=
 ##

diff --git a/...test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_no_unique_id.cfg b/...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/.../test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_yes_same_id.cfg b/.../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/...est/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_two_cumulative_yes_unique_id.cfg b/...est/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,5 @@
+# wmllint: no translatables
+
 #####
 # API(s) being tested: [regenerate]affect_enemies=
 ##

diff --git a/...test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_affect_everybody.cfg b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,5 @@
+# wmllint: no translatables
+
 #####
 # API(s) being tested: [regenerate]value=
 ##

diff --git a/.../test/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply_divide.cfg b/.../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/...est/scenarios/wml_tests/UnitsWML/AbilitiesWML/regenerate/regenerate_multiply_fraction.cfg b/...est/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
@@ -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
@@ -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
@@ -1,3 +1,5 @@
+#textdomain wesnoth-test
+
 #####
 # API(s) being tested: [regenerate]value=
 ##