Skip to content

Commit

Permalink
Schema: Use the new globbing feature to improve [aspect] definition
Browse files Browse the repository at this point in the history
Also fix [engine] switch
  • Loading branch information
CelticMinstrel committed Mar 31, 2018
1 parent a26e3a5 commit 84f17af
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 10 deletions.
28 changes: 19 additions & 9 deletions data/schema/ai/aspect_complex.cfg
@@ -1,9 +1,15 @@

#define AI_FILTER_KEY_MISSING KEY
[not]
glob_on_{KEY}=*
[/not]
#enddef

#define AI_ASPECT_FILTER_STANDARD
engine=cpp
name=standard_aspect
[or]
engine=
{AI_FILTER_KEY_MISSING engine}
name=standard_aspect
[/or]
#enddef
Expand All @@ -12,15 +18,19 @@
engine=cpp
name=composite_aspect
[or]
engine=
{AI_FILTER_KEY_MISSING engine}
name=composite_aspect
[/or]
#enddef

#define AI_ASPECT_FILTER_DEFAULT
[or]
engine=cpp
name=
{AI_FILTER_KEY_MISSING name}
[/or]
[or]
{AI_FILTER_KEY_MISSING engine}
{AI_FILTER_KEY_MISSING name}
[/or]
#enddef

Expand All @@ -29,18 +39,18 @@
name=ai_default_rca::aspect_attacks
id=attacks
[or]
engine=
{AI_FILTER_KEY_MISSING engine}
name=ai_default_rca::aspect_attacks
id=attacks
[/or]
[or]
engine=cpp
name=
{AI_FILTER_KEY_MISSING name}
id=attacks
[/or]
[or]
engine=
name=
{AI_FILTER_KEY_MISSING engine}
{AI_FILTER_KEY_MISSING name}
id=attacks
[/or]
#enddef
Expand All @@ -50,10 +60,10 @@
name=lua_aspect
[or]
engine=lua
name=
{AI_FILTER_KEY_MISSING name}
[/or]
[or]
engine=
{AI_FILTER_KEY_MISSING engine}
name=lua_aspect
[/or]
#enddef
Expand Down
2 changes: 1 addition & 1 deletion data/schema/ai/engine.cfg
Expand Up @@ -3,7 +3,7 @@
name="engine"
super="$ai/$component"
[switch]
key=engine
key=name
[case]
value=fai
# TODO: FIll this in (which is difficult since it's not documented)
Expand Down

0 comments on commit 84f17af

Please sign in to comment.