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

Update the schema for [terrain_mask]

Browse source
This commit is contained in:
Steve Cotton 2021-02-28 15:47:00 +01:00
parent 9e1677612b
commit 37bf7f9333
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -201,6 +201,7 @@
{SIMPLE_KEY mask_file string}
{SIMPLE_KEY alignment mask_alignment}
{DEFAULT_KEY border s_bool no}
{DEFAULT_KEY ignore_special_locations s_bool no}
[tag]
name="rule"
max=infinite

3
data/schema/game_config.cfg
View file

@ -90,8 +90,7 @@
[/type]
[type]
name=mask_alignment
value="even|odd"
# TODO: Document the third option once we finalize its name
value="even|odd|raw"
[/type]
[type]
name=ai_usage

14
data/test/scenarios/test_terrain_mask.cfg
View file

@ -1,14 +1,4 @@
full_mask="_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
_s, _s, _s, _s, _s, _s, _s, Kha, _s, _s, _s, _s, _s, Kha, _s, _s, _s, _s
_s, _s, _s, _s, _s, _s, _s, Cha, _s, _s, _s, _s, _s, Cha, _s, _s, _s, _s
_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
_s, _s, _s, foo Chs, _s, Chs, _s, Ch, _s, Ch, _s, Chs, _s, Ch, _s, bar Ch, _s, _s
_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s
_s, _s, _s, Chs, _s, Chs, _s, Ch, _s, Ch, _s, Chs, _s, Ch, _s, Ch, _s, _s
_s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s, _s"
# wmllint: no translatables
#define TERRAIN_MASK_TEST SUFFIX MASK
#arg POS
@ -123,6 +113,7 @@ Hh, Hh"#enddef
{TERRAIN_MASK_TEST align_raw_on_even {HILLS_SQUARE} (POS=10,1) (ALIGNMENT=raw) (POST_MASK={ASSERT_LOCATION_TERRAIN_SQUARE_2X2 10 1 10 2 11 1 11 2 Hh})}
# The deprecated alignment modes work
#ifndef SCHEMA_SHOULD_SKIP_THIS
{TERRAIN_MASK_TEST deprecated_border_no {HILLS_SQUARE} (POS=1,1) (POST_MASK=
[+terrain_mask]
border=no
@ -137,6 +128,7 @@ Hh, Hh"#enddef
[/terrain_mask]
{ASSERT_LOCATION_TERRAIN_SQUARE_2X2 0 0 0 1 1 0 1 1 Hh}
)}
#endif
# Terrain rules work
{TERRAIN_MASK_TEST rule_basic {HILLS_SQUARE} (POS=7,3) (RULES={TERRAIN_RULE_SIMPLE Kha^Kov Hh Ko}{TERRAIN_RULE_SIMPLE Cha^Kov Hh Co}) (POST_MASK=