upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 03:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Schema: Fix several more cases of keys failing to accept variable substitutions

Browse Source
This commit is contained in:
Celtic Minstrel 2018-03-30 21:52:08 -04:00
parent e01567c434
commit 902a104268
5 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
data/schema/core/actionwml.cfg
View File

@ -233,7 +233,8 @@
{SIMPLE_KEY text t_string} {SIMPLE_KEY text t_string}
{SIMPLE_KEY male_text t_string} {SIMPLE_KEY male_text t_string}
{SIMPLE_KEY female_text t_string} {SIMPLE_KEY female_text t_string}
{COLOR_KEYS s_unsigned} {COLOR_KEYS s_unsigned} # TODO: These are probably deprecated?
{SIMPLE_KEY color s_color}
{DEFAULT_KEY advance s_bool yes} {DEFAULT_KEY advance s_bool yes}
{DEFAULT_KEY fire_event s_bool no} {DEFAULT_KEY fire_event s_bool no}
{DEFAULT_KEY animate s_bool yes} {DEFAULT_KEY animate s_bool yes}
@ -325,8 +326,8 @@
max=infinite max=infinite
super="$filter_unit" super="$filter_unit"
{INSERT_TAG} {INSERT_TAG}
{SIMPLE_KEY to_x range_list} {SIMPLE_KEY to_x s_range_list}
{SIMPLE_KEY to_y range_list} {SIMPLE_KEY to_y s_range_list}
{SIMPLE_KEY to_location string} {SIMPLE_KEY to_location string}
{DEFAULT_KEY fire_event s_bool no} {DEFAULT_KEY fire_event s_bool no}
{DEFAULT_KEY check_passability s_bool yes} {DEFAULT_KEY check_passability s_bool yes}
@ -605,7 +606,7 @@
{SIMPLE_KEY male_message t_string} {SIMPLE_KEY male_message t_string}
{SIMPLE_KEY female_message t_string} {SIMPLE_KEY female_message t_string}
{SIMPLE_KEY wait_description t_string} {SIMPLE_KEY wait_description t_string}
{SIMPLE_KEY side_for range_list} {SIMPLE_KEY side_for s_range_list}
{SIMPLE_KEY image string} {SIMPLE_KEY image string}
{SIMPLE_KEY mirror s_bool} {SIMPLE_KEY mirror s_bool}
{SIMPLE_KEY second_image string} {SIMPLE_KEY second_image string}
@ -720,11 +721,13 @@
[tag] [tag]
name="item" name="item"
max=infinite max=infinite
super="scenario/item,$filter_location" super="$filter_location,scenario/item"
{INSERT_TAG} {INSERT_TAG}
{DEFAULT_KEY redraw s_bool yes} {DEFAULT_KEY redraw s_bool yes}
{SIMPLE_KEY write_name string} {SIMPLE_KEY write_name string}
{SIMPLE_KEY name string} {SIMPLE_KEY name string}
# Override some supertag keys to allow variable substitutions
{DEFAULT_KEY visible_in_fog s_bool yes}
[/tag] [/tag]
[tag] [tag]
name="remove_item" name="remove_item"
@ -745,8 +748,8 @@
name="$fake_unit" name="$fake_unit"
max=0 max=0
{SIMPLE_KEY type string} {SIMPLE_KEY type string}
{SIMPLE_KEY x range_list} {SIMPLE_KEY x s_range_list}
{SIMPLE_KEY y range_list} {SIMPLE_KEY y s_range_list}
{SIMPLE_KEY side s_unsigned} {SIMPLE_KEY side s_unsigned}
{SIMPLE_KEY gender gender} {SIMPLE_KEY gender gender}
{SIMPLE_KEY variation string} {SIMPLE_KEY variation string}
@ -828,8 +831,8 @@
{SIMPLE_KEY chance s_unsigned} {SIMPLE_KEY chance s_unsigned}
{SIMPLE_KEY check_fogged s_bool} {SIMPLE_KEY check_fogged s_bool}
{SIMPLE_KEY check_shrouded s_bool} {SIMPLE_KEY check_shrouded s_bool}
{SIMPLE_KEY x range_list} {SIMPLE_KEY x s_range_list}
{SIMPLE_KEY y range_list} {SIMPLE_KEY y s_range_list}
{DEFAULT_KEY fade_range s_unsigned 3} {DEFAULT_KEY fade_range s_unsigned 3}
{DEFAULT_KEY full_range s_unsigned 14} {DEFAULT_KEY full_range s_unsigned 14}
{SIMPLE_KEY loop s_int} {SIMPLE_KEY loop s_int}
@ -1300,16 +1303,16 @@
[/case] [/case]
[case] [case]
value=bottleneck_defense value=bottleneck_defense
{REQUIRED_KEY x range_list} {REQUIRED_KEY x s_range_list}
{REQUIRED_KEY y range_list} {REQUIRED_KEY y s_range_list}
{REQUIRED_KEY enemy_x range_list} {REQUIRED_KEY enemy_x s_range_list}
{REQUIRED_KEY enemy_y range_list} {REQUIRED_KEY enemy_y s_range_list}
{DEFAULT_KEY active_side_leader s_bool no} {DEFAULT_KEY active_side_leader s_bool no}
{DEFAULT_KEY ca_score s_unsigned 300000} {DEFAULT_KEY ca_score s_unsigned 300000}
{SIMPLE_KEY healer_x range_list} {SIMPLE_KEY healer_x s_range_list}
{SIMPLE_KEY healer_y range_list} {SIMPLE_KEY healer_y s_range_list}
{SIMPLE_KEY leadership_x range_list} {SIMPLE_KEY leadership_x s_range_list}
{SIMPLE_KEY leadership_y range_list} {SIMPLE_KEY leadership_y s_range_list}
[/case] [/case]
[case] [case]
value=fast_ai value=fast_ai
@ -1415,8 +1418,8 @@
value=messenger_escort value=messenger_escort
{FILTER_TAG "filter" unit min=1} {FILTER_TAG "filter" unit min=1}
{DEPRECATED_KEY id string} {DEPRECATED_KEY id string}
{REQUIRED_KEY waypoint_x range_list} {REQUIRED_KEY waypoint_x s_range_list}
{REQUIRED_KEY waypoint_y range_list} {REQUIRED_KEY waypoint_y s_range_list}
{DEFAULT_KEY ca_score s_unsigned 300000} {DEFAULT_KEY ca_score s_unsigned 300000}
{DEFAULT_KEY enemy_death_chance s_real 0.67} {DEFAULT_KEY enemy_death_chance s_real 0.67}
{DEFAULT_KEY messenger_death_chance s_bool 0.0} {DEFAULT_KEY messenger_death_chance s_bool 0.0}
@ -1427,8 +1430,8 @@
value=patrol value=patrol
{FILTER_TAG "filter" unit min=1} {FILTER_TAG "filter" unit min=1}
{DEPRECATED_KEY id string} {DEPRECATED_KEY id string}
{REQUIRED_KEY waypoint_x range_list} {REQUIRED_KEY waypoint_x s_range_list}
{REQUIRED_KEY waypoint_y range_list} {REQUIRED_KEY waypoint_y s_range_list}
{SIMPLE_KEY attack string_list} {SIMPLE_KEY attack string_list}
{DEFAULT_KEY ca_score s_unsigned 300000} {DEFAULT_KEY ca_score s_unsigned 300000}
{DEFAULT_KEY one_time_only s_bool no} {DEFAULT_KEY one_time_only s_bool no}

2
data/schema/filters/location.cfg
View File

@ -9,7 +9,7 @@
{SIMPLE_KEY y s_coordinates} {SIMPLE_KEY y s_coordinates}
{SIMPLE_KEY area string} {SIMPLE_KEY area string}
{SIMPLE_KEY include_borders s_bool} {SIMPLE_KEY include_borders s_bool}
{DEPRECATED_KEY owner_side range_list} {DEPRECATED_KEY owner_side s_range_list}
{SIMPLE_KEY find_in string} {SIMPLE_KEY find_in string}
{SIMPLE_KEY radius s_int} {SIMPLE_KEY radius s_int}
{SIMPLE_KEY formula formula} {SIMPLE_KEY formula formula}

2
data/schema/filters/side.cfg
View File

@ -2,7 +2,7 @@
[tag] [tag]
name="$filter_side" name="$filter_side"
max=0 max=0
{SIMPLE_KEY side range_list} {SIMPLE_KEY side s_range_list}
{SIMPLE_KEY team_name string} {SIMPLE_KEY team_name string}
{SIMPLE_KEY controller string} {SIMPLE_KEY controller string}
{SIMPLE_KEY formula formula} {SIMPLE_KEY formula formula}

4
data/schema/filters/unit.cfg
View File

@ -12,12 +12,12 @@
{SIMPLE_KEY ability string} {SIMPLE_KEY ability string}
{SIMPLE_KEY trait string} {SIMPLE_KEY trait string}
{SIMPLE_KEY status string} {SIMPLE_KEY status string}
{SIMPLE_KEY side range_list} {SIMPLE_KEY side s_range_list}
{DEPRECATED_KEY has_weapon string} {DEPRECATED_KEY has_weapon string}
{SIMPLE_KEY canrecruit s_bool} {SIMPLE_KEY canrecruit s_bool}
{SIMPLE_KEY gender gender} {SIMPLE_KEY gender gender}
{SIMPLE_KEY role string} {SIMPLE_KEY role string}
{SIMPLE_KEY level range_list} {SIMPLE_KEY level s_range_list}
{SIMPLE_KEY defense s_int} {SIMPLE_KEY defense s_int}
{SIMPLE_KEY movement_cost s_int} {SIMPLE_KEY movement_cost s_int}
{SIMPLE_KEY x s_coordinates} {SIMPLE_KEY x s_coordinates}

1
data/schema/game_config.cfg
View File

@ -376,6 +376,7 @@
[/union] [/union]
[/type] [/type]
{SUBST_TYPE coordinates} {SUBST_TYPE coordinates}
{SUBST_TYPE range_list}
[tag] [tag]
name="root" name="root"
min=1 min=1