Schema: Accept variable substitution in most aspect values

This commit is contained in:
Celtic Minstrel 2018-03-30 23:55:58 -04:00
parent 9b9fdf2c52
commit 67c6de0a4e
2 changed files with 33 additions and 33 deletions

View file

@ -85,11 +85,11 @@
[/case]
[case]
value=grouping
super="{BASE}~ai_grouping"
super="{BASE}~grouping"
[/case]
[case]
value=advancements,recruitment_more,recruitment_pattern
super="{BASE}~string_list"
super="{BASE}~string"
[/case]
[case]
value=avoid
@ -217,8 +217,8 @@
[/tag]
#enddef
#define AI_FACET_SCALAR TYPE
{AI_FACET {TYPE} {SIMPLE_KEY value {TYPE}}}
#define AI_FACET_SCALAR TYPE INTERNAL_TYPE
{AI_FACET {TYPE} {SIMPLE_KEY value {INTERNAL_TYPE}}}
#enddef
#define AI_FACET_TAG TAG CONTENTS
@ -230,27 +230,27 @@
)}
#enddef
{AI_FACET_SCALAR real}
{AI_FACET_SCALAR int}
{AI_FACET_SCALAR bool}
{AI_FACET_SCALAR string_list}
{AI_FACET_SCALAR ai_grouping}
{AI_FACET_SCALAR real s_real}
{AI_FACET_SCALAR int s_int}
{AI_FACET_SCALAR bool s_bool}
{AI_FACET_SCALAR string string_list}
{AI_FACET_SCALAR grouping ai_grouping}
{AI_FACET avoid {FILTER_TAG value location ()}}
{AI_FACET_TAG leader_goal (
{SIMPLE_KEY id string}
{SIMPLE_KEY x int}
{SIMPLE_KEY y int}
{SIMPLE_KEY max_risk real}
{SIMPLE_KEY auto_remove bool}
{SIMPLE_KEY x s_int}
{SIMPLE_KEY y s_int}
{SIMPLE_KEY max_risk s_real}
{SIMPLE_KEY auto_remove s_bool}
)}
{AI_FACET_TAG recruitment_save_gold (
{SIMPLE_KEY active int}
{SIMPLE_KEY begin real}
{SIMPLE_KEY end real}
{SIMPLE_KEY spend_all_gold int}
{SIMPLE_KEY save_on_negative_income bool}
{SIMPLE_KEY active s_int}
{SIMPLE_KEY begin s_real}
{SIMPLE_KEY end s_real}
{SIMPLE_KEY spend_all_gold s_int}
{SIMPLE_KEY save_on_negative_income sbool}
)}
{AI_FACET_TAG recruitment_instructions (

View file

@ -38,22 +38,22 @@
{AI_ASPECT_FILTERS}
{SIMPLE_KEY engine string}
# Simple scalar aspects
{AI_ASPECT_KEY aggression real}
{AI_ASPECT_KEY caution real}
{AI_ASPECT_KEY aggression s_real}
{AI_ASPECT_KEY caution s_real}
{AI_ASPECT_KEY grouping ai_grouping}
{AI_ASPECT_KEY leader_aggression real}
{AI_ASPECT_KEY leader_ignores_keep bool}
{AI_ASPECT_KEY leader_value real}
{AI_ASPECT_KEY passive_leader bool}
{AI_ASPECT_KEY passive_leader_shares_keep bool}
{AI_ASPECT_KEY recruitment_diversity real}
{AI_ASPECT_KEY recruitment_randomness int}
{AI_ASPECT_KEY scout_village_targeting real}
{AI_ASPECT_KEY simple_targeting bool}
{AI_ASPECT_KEY support_villages bool}
{AI_ASPECT_KEY village_value real}
{AI_ASPECT_KEY villages_per_scout int}
{AI_ASPECT_KEY attack_depth int}
{AI_ASPECT_KEY leader_aggression s_real}
{AI_ASPECT_KEY leader_ignores_keep s_bool}
{AI_ASPECT_KEY leader_value s_real}
{AI_ASPECT_KEY passive_leader s_bool}
{AI_ASPECT_KEY passive_leader_shares_keep s_bool}
{AI_ASPECT_KEY recruitment_diversity s_real}
{AI_ASPECT_KEY recruitment_randomness s_int}
{AI_ASPECT_KEY scout_village_targeting s_real}
{AI_ASPECT_KEY simple_targeting s_bool}
{AI_ASPECT_KEY support_villages s_bool}
{AI_ASPECT_KEY village_value s_real}
{AI_ASPECT_KEY villages_per_scout s_int}
{AI_ASPECT_KEY attack_depth s_int}
{AI_ASPECT_KEY advancements string_list}
{AI_ASPECT_KEY recruitment_more string_list}
{AI_ASPECT_KEY recruitment_pattern string_list}