Schema: Fix a few incorrect types

wesnoth · Oct 24, 2018 · 4ba0c2b · 4ba0c2b
1 parent ea9d483
commit 4ba0c2b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/data/schema/filters/location.cfg b/data/schema/filters/location.cfg
@@ -28,6 +28,6 @@
 	name="$filter_adjacent_location"
 	max=0
 	super="$filter_location"
-	{SIMPLE_KEY count s_int}
+	{SIMPLE_KEY count s_range_list}
 	{SIMPLE_KEY adjacent dir_list}
 [/tag]
diff --git a/data/schema/game_config.cfg b/data/schema/game_config.cfg
@@ -358,6 +358,17 @@
         name="micro_ai_action"
         value="add|delete|change"
     [/type]
+    [type]
+        name="coordinate"
+        [union]
+            [type]
+                link=int
+            [/type]
+            [type]
+                value="recall"
+            [/type]
+        [/union]
+    [/type]
     [type]
         name="coordinates"
         [union]
@@ -380,6 +391,7 @@
             [/type]
         [/union]
     [/type]
+    {SUBST_TYPE coordinate}
     {SUBST_TYPE coordinates}
     {SUBST_TYPE range_list}
     {SUBST_TYPE terrain_code}

diff --git a/data/schema/units/modifications.cfg b/data/schema/units/modifications.cfg
@@ -34,11 +34,11 @@
 				{SIMPLE_KEY set_accuracy int}
 				{SIMPLE_KEY set_movement_used int}
 
-				{SIMPLE_KEY increase_damage int}
-				{SIMPLE_KEY increase_attacks int}
-				{SIMPLE_KEY increase_parry int}
-				{SIMPLE_KEY increase_accuracy int}
-				{SIMPLE_KEY increase_movement_used int}
+				{SIMPLE_KEY increase_damage int_percent}
+				{SIMPLE_KEY increase_attacks int_percent}
+				{SIMPLE_KEY increase_parry int_percent}
+				{SIMPLE_KEY increase_accuracy int_percent}
+				{SIMPLE_KEY increase_movement_used int_percent}
 
 				{SIMPLE_KEY attack_weight int}
 				{SIMPLE_KEY defense_weight int}

diff --git a/data/schema/units/single.cfg b/data/schema/units/single.cfg
@@ -83,8 +83,8 @@
 		name="units/unit_type/abilities"
 	[/link]
 
-	{SIMPLE_KEY x s_int}
-	{SIMPLE_KEY y s_int}
+	{SIMPLE_KEY x s_coordinate}
+	{SIMPLE_KEY y s_coordinate}
 	{SIMPLE_KEY location_id string}
 	{SIMPLE_KEY facing dir}
 	{SIMPLE_KEY goto_x s_int}