fixup schema validation.

Pentarctagon · Nov 27, 2023 · 9e3797a · 9e3797a
1 parent cea436c
commit 9e3797a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/data/schema/units/abilities.cfg b/data/schema/units/abilities.cfg
@@ -51,6 +51,8 @@
 	{SIMPLE_KEY value f_int}
 	{SIMPLE_KEY add f_int}
 	{SIMPLE_KEY sub f_int}
+	{SIMPLE_KEY multiply f_int}
+	{SIMPLE_KEY divide f_int}
 	{SIMPLE_KEY poison string} # TODO: Enum
 [/tag]
 [tag]

diff --git a/data/test/macros/unit_setup.cfg b/data/test/macros/unit_setup.cfg
@@ -32,7 +32,7 @@ no#endarg
 
     [heals]
         id = {ID}
-        name = "test-heals_{ID}"
+        name = _"test-heals_{ID}"
         affect_self = {SELF}
         affect_allies = {ALLIES}
         affect_enemies = {ENEMIES}

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
@@ -20,7 +20,9 @@
             [effect]
                 apply_to = new_ability
                 [abilities]
+#ifndef SCHEMA_VALIDATION
                     {TEST_HEALS 2.8 ()}
+#endif
                 [/abilities]
             [/effect]
         [/modify_unit]

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
@@ -20,7 +20,9 @@
             [effect]
                 apply_to = new_ability
                 [abilities]
+#ifndef SCHEMA_VALIDATION
                     {TEST_HEALS 2.2 ()}
+#endif
                 [/abilities]
             [/effect]
         [/modify_unit]

diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_no_poison.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_no_poison.cfg
@@ -22,7 +22,7 @@
                 [abilities]
                     [heals]
                         id = "test-heals"
-                        name = "test-heals"
+                        name = _"test-heals"
                         affect_self = no
                         affect_allies = yes
                         affect_enemies = no
@@ -72,7 +72,7 @@
             variable = temp1
         [/store_unit]
         {ASSERT {VARIABLE_CONDITIONAL temp1.hitpoints numerical_equals "$($temp1.max_hitpoints-6)"}}
-        {ASSERT {VARIABLE_CONDITIONAL temp1.status.poisoned numerical_equals yes}}
+        {ASSERT {VARIABLE_CONDITIONAL temp1.status.poisoned boolean_equals yes}}
         {SUCCEED}
     [/event]
 )}
diff --git a/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_no_value.cfg b/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/heal_no_value.cfg
@@ -22,7 +22,7 @@
                 [abilities]
                     [heals]
                         id = "test-heals"
-                        name = "test-heals"
+                        name = _"test-heals"
                         affect_self = no
                         affect_allies = yes
                         affect_enemies = no

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
@@ -62,7 +62,7 @@
             variable = temp1
         [/store_unit]
         {ASSERT {VARIABLE_CONDITIONAL temp1.hitpoints numerical_equals $temp1.max_hitpoints}}
-        {ASSERT {VARIABLE_CONDITIONAL temp1.status.poisoned numerical_equals no}}
+        {ASSERT {VARIABLE_CONDITIONAL temp1.status.poisoned boolean_equals no}}
         {SUCCEED}
     [/event]
 )}
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
@@ -62,7 +62,7 @@
             variable = temp1
         [/store_unit]
         {ASSERT {VARIABLE_CONDITIONAL temp1.hitpoints numerical_equals $temp1.max_hitpoints}}
-        {ASSERT {VARIABLE_CONDITIONAL temp1.status.poisoned numerical_equals yes}}
+        {ASSERT {VARIABLE_CONDITIONAL temp1.status.poisoned boolean_equals yes}}
         {SUCCEED}
     [/event]
 )}