0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Schema: Fix declaring guard_x/y/loc as required keys in stationed_guard MicroAI (they are optional)

Browse source
This commit is contained in:
Celtic Minstrel 2024-01-06 21:35:40 -05:00
parent 932dca3982
commit b9ff0c51fe
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/schema/ai/micro.cfg
View file

@ -148,7 +148,7 @@
{DEPRECATED_KEY id string}
{REQUIRED_KEY distance s_unsigned}
{REQUIRED_KEYS_LOC_OR_XY station string s_unsigned}
{REQUIRED_KEYS_LOC_OR_XY guard string s_unsigned}
{OPTIONAL_KEYS_LOC_OR_XY guard string s_unsigned}
{DEFAULT_KEY ca_score s_unsigned 300000}
[/case]
[case]

16
data/schema/core/actionwml.cfg
View file

@ -55,6 +55,22 @@
[/if]
#enddef
#define OPTIONAL_KEYS_LOC_OR_XY KEY_BASE TYPE_LOC TYPE_XY
[if]
glob_on_{KEY_BASE}_x=*
[or]
glob_on_{KEY_BASE}_y=*
[/or]
[then]
{REQUIRED_KEY {KEY_BASE}_x {TYPE_XY}}
{REQUIRED_KEY {KEY_BASE}_y {TYPE_XY}}
[/then]
[else]
{SIMPLE_KEY {KEY_BASE}_loc {TYPE_LOC}}
[/else]
[/if]
#enddef
[tag]
name="$action_wml"
max=0