Fix some reference errors in WML schemas

wesnoth · Oct 24, 2020 · 23859c6 · 23859c6
1 parent eb1988a
commit 23859c6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/data/schema/core/addons.cfg b/data/schema/core/addons.cfg
@@ -531,8 +531,8 @@
 	[/tag]
 	{LINK_TAG "titlescreen_music/music"}
 	{LINK_TAG "terrain_graphics"}
-	{LINK_TAG "game_config/color_palette"}
-	{LINK_TAG "game_config/color_range"}
+	{LINK_TAG "color_palette"}
+	{LINK_TAG "color_range"}
 	# TODO: Document [menu_item] and [undo_stack]
 	[if]
 		map_generation=default

diff --git a/data/schema/schema.cfg b/data/schema/schema.cfg
@@ -65,7 +65,7 @@
 			[tag]
 				name="type"
 				max=infinite
-				super="type"
+				super="wml_schema/type"
 				{REQUIRED_KEY name id}
 				[if]
 					[union]

diff --git a/data/schema/units/specials.cfg b/data/schema/units/specials.cfg
@@ -19,6 +19,27 @@
 	{FILTER_TAG "filter_defender" unit {FILTER_TAG "filter_weapon" weapon ()}}
 	{WML_MERGE_KEYS}
 [/tag]
+# A few specials inheriting from ~generic~ are included here so that unit abilities can then inherit from them.
+[tag]
+	name="firststrike"
+	max=infinite
+	super="units/unit_type/attack/specials/~generic~"
+[/tag]
+[tag]
+	name="poison"
+	max=infinite
+	super="units/unit_type/attack/specials/~generic~"
+[/tag]
+[tag]
+	name="slow"
+	max=infinite
+	super="units/unit_type/attack/specials/~generic~"
+[/tag]
+[tag]
+	name="petrifies"
+	max=infinite
+	super="units/unit_type/attack/specials/~generic~"
+[/tag]
 [tag]
 	# Using invalid characters to ensure it doesn't match a real tag.
 	name="~value~"