A few more missing pieces to the AI schema

wesnoth · Apr 12, 2018 · 0645b77 · 0645b77
1 parent 52ae611
commit 0645b77
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/data/schema/ai/_main.cfg b/data/schema/ai/_main.cfg
@@ -48,6 +48,7 @@
 	{./engine.cfg}
 	{./aspect_complex.cfg}
 	{./aspect_simple.cfg}
+	{./recruitment.cfg}
 	{./goal.cfg}
 	{./stage.cfg}
 [/tag]
diff --git a/data/schema/ai/aspect_complex.cfg b/data/schema/ai/aspect_complex.cfg
@@ -97,12 +97,17 @@
 			value=recruitment_save_gold
 			super="{BASE}~recruitment_save_gold"
 		[/case]
+		[case]
+			value=attacks
+			super="{BASE}~attacks"
+		[/case]
 	[/switch]
 #enddef
 
 [tag]
 	name="aspect"
 	super="$ai/$component"
+	max=infinite
 	{AI_ASPECT_INVALIDATE}
 	[if]
 		{AI_ASPECT_FILTER_STANDARD}

diff --git a/data/schema/ai/goal.cfg b/data/schema/ai/goal.cfg
@@ -8,6 +8,7 @@
 		[else]
 			[switch]
 				key=name
+				# TODO: The default is target_unit
 				[case]
 					value=target,target_unit
 					{FILTER_TAG criteria unit ()}

diff --git a/data/schema/ai/stage.cfg b/data/schema/ai/stage.cfg
@@ -43,19 +43,18 @@
 [tag]
 	name="$candidate_action"
 	super="$ai/$component"
+	{SIMPLE_KEY max_score int}
 	[switch]
 		key=engine
 		[case]
 			value=lua
-			{SIMPLE_KEY max_score int}
 			{SIMPLE_KEY location string}
 			{SIMPLE_KEY evaluation string}
 			{SIMPLE_KEY execution string}
 		[/case]
 		[case]
 			value=cpp
 			{SIMPLE_KEY score int}
-			{SIMPLE_KEY max_score int}
 		[/case]
 		[case]
 			value=fai
@@ -67,7 +66,7 @@
 				{SIMPLE_KEY me formula}
 				{SIMPLE_KEY target formula}
 			[/tag]
-			# TODO: Filters, variables
+			# TODO: variables?
 		[/case]
 	[/switch]
 [/tag]