From 66a33b2b3d2929ee3aeb2f28e26b5b639f592cd3 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Tue, 3 Apr 2018 19:46:18 -0400
Subject: [PATCH] Schema: Update filters with undocumented or poorly-documented
 features

---
 data/schema/filters/location.cfg |  2 +-
 data/schema/filters/unit.cfg     | 30 ++++++++++++++++++------------
 data/schema/filters/weapon.cfg   | 16 ++++++++--------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/data/schema/filters/location.cfg b/data/schema/filters/location.cfg
index 5723c1e5d5b3..2b4056ae6f25 100644
--- a/data/schema/filters/location.cfg
+++ b/data/schema/filters/location.cfg
@@ -2,7 +2,7 @@
 [tag]
 	name="$filter_location"
 	max=0
-	{SIMPLE_KEY  time_of_day string}
+	{SIMPLE_KEY time_of_day string}
 	{SIMPLE_KEY time_of_day_id string}
 	{SIMPLE_KEY terrain terrain_list}
 	{SIMPLE_KEY x s_coordinates}
diff --git a/data/schema/filters/unit.cfg b/data/schema/filters/unit.cfg
index 9c122bb26723..5c4208d5b7d4 100644
--- a/data/schema/filters/unit.cfg
+++ b/data/schema/filters/unit.cfg
@@ -2,29 +2,35 @@
 [tag]
 	name="$filter_unit"
 	max=0
-	{SIMPLE_KEY id string}
-	{SIMPLE_KEY speaker string}
-	{SIMPLE_KEY type string}
-	{SIMPLE_KEY type_adv_tree string}
-	{SIMPLE_KEY race string}
-	{SIMPLE_KEY ability_type string}
-	{SIMPLE_KEY ability_type_active string}
-	{SIMPLE_KEY ability string}
-	{SIMPLE_KEY trait string}
-	{SIMPLE_KEY status string}
+	{SIMPLE_KEY name t_string}
+	{SIMPLE_KEY id string_list}
+	{SIMPLE_KEY type string_list}
+	{SIMPLE_KEY type_adv_tree string_list}
+	{SIMPLE_KEY variation string_list}
+	{SIMPLE_KEY has_variation string_list}
+	{SIMPLE_KEY race string_list}
+	{SIMPLE_KEY ability_type string_list}
+	{SIMPLE_KEY ability_type_active string_list}
+	{SIMPLE_KEY ability string_list}
+	{SIMPLE_KEY trait string_list}
+	{SIMPLE_KEY status string_list}
 	{SIMPLE_KEY side s_range_list}
 	{DEPRECATED_KEY has_weapon string}
 	{SIMPLE_KEY canrecruit s_bool}
 	{SIMPLE_KEY gender gender}
 	{SIMPLE_KEY role string}
 	{SIMPLE_KEY level s_range_list}
-	{SIMPLE_KEY defense s_int}
-	{SIMPLE_KEY movement_cost s_int}
+	{SIMPLE_KEY defense s_range_list}
+	{SIMPLE_KEY movement_cost s_range_list}
+	{SIMPLE_KEY vision_cost s_range_list}
+	{SIMPLE_KEY jamming_cost s_range_list}
 	{SIMPLE_KEY x s_coordinates}
 	{SIMPLE_KEY y s_coordinates}
 	{SIMPLE_KEY find_in string}
 	{SIMPLE_KEY formula formula}
 	{SIMPLE_KEY lua_function string}
+	{SIMPLE_KEY ai_special string}
+	{SIMPLE_KEY recall_cost s_range_list}
 	
 	[tag]
 		name="filter_wml"
diff --git a/data/schema/filters/weapon.cfg b/data/schema/filters/weapon.cfg
index 6708c54b7e87..6f3cbdcc004d 100644
--- a/data/schema/filters/weapon.cfg
+++ b/data/schema/filters/weapon.cfg
@@ -2,16 +2,16 @@
 [tag]
 	name="$filter_weapon"
 	max=0
-	{SIMPLE_KEY range string}
-	{SIMPLE_KEY name string}
-	{SIMPLE_KEY type string}
+	{SIMPLE_KEY range string_list}
+	{SIMPLE_KEY name string_list}
+	{SIMPLE_KEY type string_list}
 	{SIMPLE_KEY special string}
 	{SIMPLE_KEY special_active string}
 	{SIMPLE_KEY formula formula}
-	{SIMPLE_KEY damage s_int}
-	{SIMPLE_KEY number s_int}
-	{SIMPLE_KEY parry s_int}
-	{SIMPLE_KEY accuracy s_int}
-	{SIMPLE_KEY movement_used s_int}
+	{SIMPLE_KEY damage s_range_list}
+	{SIMPLE_KEY number s_range_list}
+	{SIMPLE_KEY parry s_range_list}
+	{SIMPLE_KEY accuracy s_range_list}
+	{SIMPLE_KEY movement_used s_range_list}
 	{FILTER_BOOLEAN_OPS weapon}
 [/tag]