From 12e78df9f4072cb164923ccdb3c9e436f8318712 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Fri, 30 Mar 2018 19:56:17 -0400 Subject: [PATCH] Schema: Support for turns=unlimited --- data/schema/core/actionwml.cfg | 2 +- data/schema/core/addons.cfg | 2 +- data/schema/game_config.cfg | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/data/schema/core/actionwml.cfg b/data/schema/core/actionwml.cfg index 7eac647ffcb3..fd107450c497 100644 --- a/data/schema/core/actionwml.cfg +++ b/data/schema/core/actionwml.cfg @@ -295,7 +295,7 @@ name="modify_turns" max=infinite {INSERT_TAG} - {SIMPLE_KEY value s_unsigned} + {SIMPLE_KEY value s_unsigned,turns} {SIMPLE_KEY add s_int} {SIMPLE_KEY current s_unsigned} [/tag] diff --git a/data/schema/core/addons.cfg b/data/schema/core/addons.cfg index 638521ce1a41..4e4eba7a45e9 100644 --- a/data/schema/core/addons.cfg +++ b/data/schema/core/addons.cfg @@ -301,7 +301,7 @@ {SIMPLE_KEY next_scenario string} {SIMPLE_KEY name t_string} {SIMPLE_KEY map_data map_data} - {DEFAULT_KEY turns int -1} + {DEFAULT_KEY turns turns unlimited} {DEFAULT_KEY turn_at int 1} {DEFAULT_KEY random_start_time bool,int_list no} # Note: Is it random_start_time or random_starting_time? (There's some uses of the latter) {DEPRECATED_KEY music string} diff --git a/data/schema/game_config.cfg b/data/schema/game_config.cfg index 1e2236088f35..90a2195a02a9 100644 --- a/data/schema/game_config.cfg +++ b/data/schema/game_config.cfg @@ -364,6 +364,17 @@ [/type] [/union] [/type] + [type] + name="turns" + [union] + [type] + link=unsigned + [/type] + [type] + value="-1|unlimited" + [/type] + [/union] + [/type] {SUBST_TYPE coordinates} [tag] name="root"