[wesnoth-commits] [wesnoth/wesnoth] b40793: Implement validation of the core game config WML

GitHub noreply at github.com
Sat Mar 31 21:32:50 UTC 2018


  Branch: refs/heads/schema
  Home:   https://github.com/wesnoth/wesnoth
  Commit: b40793ede3a2bb65ccbdbcb8318ec5eab29822a1
      https://github.com/wesnoth/wesnoth/commit/b40793ede3a2bb65ccbdbcb8318ec5eab29822a1
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    R data/schema-gui.cfg
    R data/schema.cfg
    A data/schema/core/actionwml.cfg
    A data/schema/core/addons.cfg
    A data/schema/core/ai.cfg
    A data/schema/core/conditionalwml.cfg
    A data/schema/core/config.cfg
    A data/schema/core/help.cfg
    A data/schema/core/themes.cfg
    A data/schema/editor/groups.cfg
    A data/schema/editor/misc.cfg
    A data/schema/editor/times.cfg
    A data/schema/filters/_initial.cfg
    A data/schema/filters/base_value.cfg
    A data/schema/filters/location.cfg
    A data/schema/filters/side.cfg
    A data/schema/filters/unit.cfg
    A data/schema/filters/weapon.cfg
    A data/schema/game_config.cfg
    A data/schema/macros.cfg
    A data/schema/terrain/graphics.cfg
    A data/schema/terrain/types.cfg
    A data/schema/types/basic.cfg
    A data/schema/types/formula.cfg
    A data/schema/types/lists.cfg
    A data/schema/types/progressive.cfg
    A data/schema/units/_main.cfg
    A data/schema/units/abilities.cfg
    A data/schema/units/animations.cfg
    A data/schema/units/modifications.cfg
    A data/schema/units/movetypes.cfg
    A data/schema/units/races.cfg
    A data/schema/units/single.cfg
    A data/schema/units/specials.cfg
    A data/schema/units/types.cfg
    M src/commandline_options.cpp
    M src/commandline_options.hpp
    M src/config_cache.cpp
    M src/config_cache.hpp
    M src/game_config_manager.cpp
    M src/serialization/schema_validator.cpp
    M src/serialization/schema_validator.hpp
    M src/serialization/tag.cpp
    M src/serialization/tag.hpp

  Log Message:
  -----------
  Implement validation of the core game config WML
Currently this is disabled by default
Use --validate command-line argument to enable

The following new features were added in the schema format:
* Union, intersection, and list types
* Keys can specify a union of known types on-the-fly
* Key and tag names can include wildcards (* and ?, glob-style)
* Tags support any_key=yes, which means unrecognized subtags will be ignored
* Tags and keys support deprecated=yes (unimplemented)
* Specify max=infinite instead of max=-1


  Commit: 64c0405eae6db0342afb892dc020990a2ae4bcd5
      https://github.com/wesnoth/wesnoth/commit/64c0405eae6db0342afb892dc020990a2ae4bcd5
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    R data/gui/schema.cfg
    A data/schema/gui.cfg
    M src/gui/gui.cpp

  Log Message:
  -----------
  Move GUI2 schema into the schema directory


  Commit: 6bee3acd5ec150b60f3794a22b0354498d1fddc2
      https://github.com/wesnoth/wesnoth/commit/6bee3acd5ec150b60f3794a22b0354498d1fddc2
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/game_config.cfg
    M data/schema/gui.cfg
    M data/schema/types/basic.cfg
    M data/schema/types/formula.cfg
    M src/serialization/tag.cpp

  Log Message:
  -----------
  Get game config and schema to use some common types

This also fixes an invalid type issue in the GUI2 schema,
and allows types to be a direct alias for other types.


  Commit: 254af056c50e0a21b7935c38db8341c781757f5a
      https://github.com/wesnoth/wesnoth/commit/254af056c50e0a21b7935c38db8341c781757f5a
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/gui.cfg
    M src/serialization/schema_validator.cpp
    M src/serialization/schema_validator.hpp
    M src/serialization/tag.cpp
    M src/serialization/tag.hpp

  Log Message:
  -----------
  Enable nesting of [type] tags
Minor cleanup of GUI2 type definitions
Disallow stuff like border=top,all


  Commit: ca49cfcb01e3080bdc5730b7431ba30176bcd14d
      https://github.com/wesnoth/wesnoth/commit/ca49cfcb01e3080bdc5730b7431ba30176bcd14d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/serialization/tag.hpp

  Log Message:
  -----------
  Super-rudimentary documentation...


  Commit: 6ec388bbd1596bf6a25384586cec8c319cb78035
      https://github.com/wesnoth/wesnoth/commit/6ec388bbd1596bf6a25384586cec8c319cb78035
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/game_config.cfg
    M data/schema/units/animations.cfg
    M data/schema/units/modifications.cfg
    M src/serialization/parser.cpp
    M src/serialization/schema_validator.cpp
    M src/serialization/schema_validator.hpp
    M src/serialization/tag.cpp
    M src/serialization/tag.hpp
    M src/serialization/validator.hpp

  Log Message:
  -----------
  Support [switch] and [if] in [tag]

Use this new feature to validate [effect] tags


  Commit: 5edefc40da3a048bdbaee4274a78ad9f9989ab9a
      https://github.com/wesnoth/wesnoth/commit/5edefc40da3a048bdbaee4274a78ad9f9989ab9a
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/serialization/tag.cpp
    M src/serialization/tag.hpp

  Log Message:
  -----------
  Fix crash if a tag has conditions but no subtags


  Commit: f641c749803c727b31682018713f35915408ff08
      https://github.com/wesnoth/wesnoth/commit/f641c749803c727b31682018713f35915408ff08
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/addons.cfg
    M data/schema/units/modifications.cfg
    M src/serialization/tag.cpp
    M src/serialization/tag.hpp

  Log Message:
  -----------
  Support multiple super tags and even conditional super tags

Use this to conditionally import [unit] keys in [side] based on no_leader


  Commit: 0851e78119b7bc24d4f9968370b72e0791c61e2d
      https://github.com/wesnoth/wesnoth/commit/0851e78119b7bc24d4f9968370b72e0791c61e2d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/units/specials.cfg

  Log Message:
  -----------
  Missed a couple weapon special definitions


  Commit: 3bd83b59d4993326a4652995fac17f9faa956c35
      https://github.com/wesnoth/wesnoth/commit/3bd83b59d4993326a4652995fac17f9faa956c35
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/addons.cfg

  Log Message:
  -----------
  Use a few more conditional tag elements


  Commit: 7b1f8249f8b10485279de9544d98ede469ca9ee3
      https://github.com/wesnoth/wesnoth/commit/7b1f8249f8b10485279de9544d98ede469ca9ee3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/game_config.cfg
    M src/serialization/tag.cpp

  Log Message:
  -----------
  Fix matching of list types with limits


  Commit: 9d54f993a46bb66e8b2ba6383ee507d76f64df8d
      https://github.com/wesnoth/wesnoth/commit/9d54f993a46bb66e8b2ba6383ee507d76f64df8d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/units/modifications.cfg
    M src/serialization/tag.cpp

  Log Message:
  -----------
  Schema: Accept [elseif] in [if] and change [switch][default] to [else]


  Commit: 0444c8aa7590593c0990af568ee5bb1aeb884ca4
      https://github.com/wesnoth/wesnoth/commit/0444c8aa7590593c0990af568ee5bb1aeb884ca4
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    A data/schema/ai/_main.cfg
    A data/schema/ai/aspect_complex.cfg
    A data/schema/ai/aspect_simple.cfg
    A data/schema/ai/engine.cfg
    A data/schema/ai/goal.cfg
    A data/schema/ai/recruitment.cfg
    A data/schema/ai/stage.cfg
    M data/schema/core/addons.cfg
    R data/schema/core/ai.cfg
    M data/schema/game_config.cfg

  Log Message:
  -----------
  WIP Schema for the AI WML

Pretty much all working, except for the [aspect] tag
Also, [modify_ai] is not yet specified (needs new schema features)


  Commit: 79d93c8cbd1d2e2c11804d559216b683810553f5
      https://github.com/wesnoth/wesnoth/commit/79d93c8cbd1d2e2c11804d559216b683810553f5
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/config.cpp

  Log Message:
  -----------
  Fix [filter_wml] implementation so that [or] tags actually work


  Commit: 45b2d015c1ca204bd243c969553f01bdc751d2f3
      https://github.com/wesnoth/wesnoth/commit/45b2d015c1ca204bd243c969553f01bdc751d2f3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/serialization/tag.cpp

  Log Message:
  -----------
  Schema: Fix [switch] implementation


  Commit: 3f7b1594017ddcf76b0d5b285073a913a2560fb8
      https://github.com/wesnoth/wesnoth/commit/3f7b1594017ddcf76b0d5b285073a913a2560fb8
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/units/modifications.cfg

  Log Message:
  -----------
  Schema: Fix definition of [effect] tags for removing/modifying attacks


  Commit: 765538d0ab6a2ab31665fe770163d6ee8a0947f3
      https://github.com/wesnoth/wesnoth/commit/765538d0ab6a2ab31665fe770163d6ee8a0947f3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/ai/_main.cfg
    M data/schema/ai/aspect_complex.cfg
    M data/schema/ai/goal.cfg
    M data/schema/ai/stage.cfg

  Log Message:
  -----------
  A few more missing pieces to the AI schema


  Commit: a26e3a501817cd1d71b8db28acf019c2feee342e
      https://github.com/wesnoth/wesnoth/commit/a26e3a501817cd1d71b8db28acf019c2feee342e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/config.cpp

  Log Message:
  -----------
  Add a way in [filter_wml] to match key values against a glob


  Commit: 84f17afead759712b32393435d6d74afcffc6dbb
      https://github.com/wesnoth/wesnoth/commit/84f17afead759712b32393435d6d74afcffc6dbb
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/ai/aspect_complex.cfg
    M data/schema/ai/engine.cfg

  Log Message:
  -----------
  Schema: Use the new globbing feature to improve [aspect] definition

Also fix [engine] switch


  Commit: c5d34b7961bdb9116df3196b1e61ce5e890e94ac
      https://github.com/wesnoth/wesnoth/commit/c5d34b7961bdb9116df3196b1e61ce5e890e94ac
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/ai/goal.cfg
    M src/serialization/tag.cpp

  Log Message:
  -----------
  Schema: Add feature to [switch] to allow a [case] to match the absence of the key

Use this to support the default [goal] name


  Commit: e277b291b0205c4e289514de46c693a65eef36fd
      https://github.com/wesnoth/wesnoth/commit/e277b291b0205c4e289514de46c693a65eef36fd
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/serialization/tag.cpp

  Log Message:
  -----------
  Schema: Extra sanity check for [elseif] tags

Probably not technically necessary as long as conditions are processed in order
However, I think it's nice to play it safe


  Commit: 59e6f28fd7725c261fdfb4e3335505b70a586b69
      https://github.com/wesnoth/wesnoth/commit/59e6f28fd7725c261fdfb4e3335505b70a586b69
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/serialization/tag.cpp

  Log Message:
  -----------
  Schema: Fix [elseif] requiring an [then] tag

While a lack of [then] here generally isn't desirable, a crash is far worse.


  Commit: bf86c943cc178946f94b8f5863057f8873dc19e5
      https://github.com/wesnoth/wesnoth/commit/bf86c943cc178946f94b8f5863057f8873dc19e5
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/ai/_main.cfg
    M data/schema/ai/aspect_complex.cfg
    A data/schema/ai/modify.cfg
    M data/schema/game_config.cfg

  Log Message:
  -----------
  Schema: Definition of [modify_ai] tag

Also reorder some things in [aspect] for better matching


  Commit: 9b8b3e2dacd90c15914ce7d7435090fe4d4a3c6b
      https://github.com/wesnoth/wesnoth/commit/9b8b3e2dacd90c15914ce7d7435090fe4d4a3c6b
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/lua/wml/set_variable.lua

  Log Message:
  -----------
  Support [set_variable]round=trunc


  Commit: 8a8896cb75c1d49751d2dc23cd8b99bbbaa95131
      https://github.com/wesnoth/wesnoth/commit/8a8896cb75c1d49751d2dc23cd8b99bbbaa95131
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/lua/functional.lua

  Log Message:
  -----------
  Lua API: Small fixup to functional.reduce


  Commit: 0c98b186c848484ef238f7d5cc5269ed5f914b0f
      https://github.com/wesnoth/wesnoth/commit/0c98b186c848484ef238f7d5cc5269ed5f914b0f
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/units/modifications.cfg

  Log Message:
  -----------
  Fix [effect][set_specials] not correctly allowing special ability tags


  Commit: 6ad4c47ed34fd9eff55c17b3be934f73470ae29e
      https://github.com/wesnoth/wesnoth/commit/6ad4c47ed34fd9eff55c17b3be934f73470ae29e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/actionwml.cfg
    M data/schema/core/addons.cfg
    M data/schema/core/conditionalwml.cfg
    M data/schema/game_config.cfg
    A data/schema/types/subst.cfg
    M data/schema/units/abilities.cfg

  Log Message:
  -----------
  Schema: Add all known ActionWML and ConditionalWML tags (based on wiki)

This also finishes up the StoryWML definition, adds validation for
map and shroud data, and a few other small schema fixes


  Commit: 44125af7c58072c50caa307f0067e169b2d6670e
      https://github.com/wesnoth/wesnoth/commit/44125af7c58072c50caa307f0067e169b2d6670e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/lua/wml/message.lua

  Log Message:
  -----------
  Handle speaker=id directly in [message] instead of relying on SUF


  Commit: 79fa259911449575033b1115386ca9be0c628c22
      https://github.com/wesnoth/wesnoth/commit/79fa259911449575033b1115386ca9be0c628c22
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/units/filter.cpp

  Log Message:
  -----------
  Remove speaker=id support from SUF


  Commit: 880d0da8c20b13445d331aada4afba941db817cf
      https://github.com/wesnoth/wesnoth/commit/880d0da8c20b13445d331aada4afba941db817cf
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/lua/wml/message.lua

  Log Message:
  -----------
  Nicer handling of some Pango formatting attributes in [message]


  Commit: b7937d32eb67ea8e956a0b8f393b98fcb1d072df
      https://github.com/wesnoth/wesnoth/commit/b7937d32eb67ea8e956a0b8f393b98fcb1d072df
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/actionwml.cfg
    M data/schema/game_config.cfg

  Log Message:
  -----------
  Schema: Definition of [micro_ai] tag, including all known MicroAIs


  Commit: 6025b5938c6a763734722d1a98b0b9aac86a00a3
      https://github.com/wesnoth/wesnoth/commit/6025b5938c6a763734722d1a98b0b9aac86a00a3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/actionwml.cfg
    M data/schema/game_config.cfg
    A data/schema/types/pango.cfg

  Log Message:
  -----------
  Schema: Pango formatting keys for [message]


  Commit: 9be6e12ae15fc636f43559b54c72578b7a44e3c2
      https://github.com/wesnoth/wesnoth/commit/9be6e12ae15fc636f43559b54c72578b7a44e3c2
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/lua/wml/objectives.lua

  Log Message:
  -----------
  Use wesnoth.format instead of string.format for translateable strings in [objectives]


  Commit: 5bd940644a97de0aae008dc96f8a220fed0fec7c
      https://github.com/wesnoth/wesnoth/commit/5bd940644a97de0aae008dc96f8a220fed0fec7c
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/lua/wml/set_variable.lua

  Log Message:
  -----------
  Support root=cube and root=int in [set_variable]


  Commit: 9c8f5afd7b9c53561ff6bd6e4b3ebf9b19a52df0
      https://github.com/wesnoth/wesnoth/commit/9c8f5afd7b9c53561ff6bd6e4b3ebf9b19a52df0
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/game_events/action_wml.cpp

  Log Message:
  -----------
  Support force_scroll in [move_units_fake] (same as in [move_unit_fake])


  Commit: a49c609bb43c42c577f1a43387f074b7a94a4b8d
      https://github.com/wesnoth/wesnoth/commit/a49c609bb43c42c577f1a43387f074b7a94a4b8d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/lua/wml/role.lua

  Log Message:
  -----------
  Support facing in [role][auto_recall]


  Commit: 076627e3a33a036727efd5259cb677dbf7f4212e
      https://github.com/wesnoth/wesnoth/commit/076627e3a33a036727efd5259cb677dbf7f4212e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/persist_var.cpp

  Log Message:
  -----------
  Fix an incorrect error message in [clear_global_variable]


  Commit: aec9ef1fe73d0dfa09727e116f87d525d989e413
      https://github.com/wesnoth/wesnoth/commit/aec9ef1fe73d0dfa09727e116f87d525d989e413
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/actionwml.cfg
    M data/schema/core/conditionalwml.cfg
    M data/schema/game_config.cfg
    M data/schema/types/basic.cfg
    M data/schema/types/pango.cfg
    M data/schema/types/subst.cfg
    M data/schema/units/abilities.cfg
    M data/schema/units/animations.cfg

  Log Message:
  -----------
  Schema ActionWML: Small bugfixes and add undocumented stuff from perusing source code


  Commit: 3657829ba614ef9b00eb29abaad2684f7d1f7c7a
      https://github.com/wesnoth/wesnoth/commit/3657829ba614ef9b00eb29abaad2684f7d1f7c7a
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/config.cfg

  Log Message:
  -----------
  Schema: Just allow any key in [language]


  Commit: f4f017ad2fff768f83d53664425d79333a224040
      https://github.com/wesnoth/wesnoth/commit/f4f017ad2fff768f83d53664425d79333a224040
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/core/editor/_main.cfg
    M data/core/macros/sound-utils.cfg

  Log Message:
  -----------
  Fix useless [event] in [titlescreen_music]

The default playlist sets the music list twice, once before the
story screen and again in prestart, but the order of tracks is different.

This means that the track order at the titlescreen is now the same
as the track order in a scenario using the default playlist,
which previously was not the case.

Whether that actually matters? I have no idea. I doubt it.

In any case, as of this commit, there are no schema validation errors
at the title screen.


  Commit: 11b11ed78f2b8a2604c4c4aec28750f42287530d
      https://github.com/wesnoth/wesnoth/commit/11b11ed78f2b8a2604c4c4aec28750f42287530d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/actionwml.cfg
    M data/schema/filters/location.cfg
    M data/schema/filters/side.cfg
    M data/schema/filters/unit.cfg
    M data/schema/filters/weapon.cfg
    M data/schema/game_config.cfg
    M data/schema/types/basic.cfg
    M src/serialization/tag.cpp

  Log Message:
  -----------
  First batch of schema fixes

- Allow for variable substitution in filter tags (mostly)
- Fix real not matching numbers like .5
- Support x,y=recall,recall

After this commit, there are no schema errors in the tutorial.


  Commit: 9799dfac0947dce9071c52490c1f69e61436f82d
      https://github.com/wesnoth/wesnoth/commit/9799dfac0947dce9071c52490c1f69e61436f82d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
    M data/ai/micro_ais/scenarios/animals.cfg
    M data/ai/micro_ais/scenarios/bottleneck_defense.cfg
    M data/ai/micro_ais/scenarios/dragon.cfg
    M data/ai/micro_ais/scenarios/fast.cfg
    M data/ai/micro_ais/scenarios/goto.cfg
    M data/ai/micro_ais/scenarios/guardians.cfg
    M data/ai/micro_ais/scenarios/hang_out.cfg
    M data/ai/micro_ais/scenarios/healer_support.cfg
    M data/ai/micro_ais/scenarios/lurkers.cfg
    M data/ai/micro_ais/scenarios/messenger_escort.cfg
    M data/ai/micro_ais/scenarios/patrols.cfg
    M data/ai/micro_ais/scenarios/protect_unit.cfg
    M data/ai/micro_ais/scenarios/recruiting.cfg
    M data/ai/micro_ais/scenarios/scenario_micro_ai.cfg
    M data/ai/micro_ais/scenarios/simple_attack.cfg
    M data/ai/micro_ais/scenarios/swarm.cfg
    M data/ai/micro_ais/scenarios/wolves.cfg
    M data/ai/scenarios/scenario-AI_Arena_small.cfg
    M data/ai/scenarios/scenario-high_xp_attack.cfg
    M data/campaigns/Dead_Water/scenarios/08_Talking_to_Tyegea.cfg
    M data/campaigns/Dead_Water/scenarios/11_Getting_Help.cfg
    M data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
    M data/campaigns/Dead_Water/scenarios/13_Epilogue.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/23_Epilogue.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
    M data/campaigns/Eastern_Invasion/scenarios/08_Training_the_Ogres.cfg
    M data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
    M data/campaigns/Eastern_Invasion/scenarios/17a_The_Duel.cfg
    M data/campaigns/Eastern_Invasion/scenarios/17b_Weldyn_Besieged.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
    M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/09_Training_Session.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/17_Mortality.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/22_Epilogue.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/19_Epilogue.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/13_Epilogue.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_A_New_Land.cfg
    M data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios_old/07a_Dealing_with_Dwarves.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios_old/07b_Talking_with_Trolls.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios_old/13_Epilogue.cfg
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
    M data/scenario-leaders.cfg
    M data/scenario-movethrough.cfg
    M data/scenario-test.cfg

  Log Message:
  -----------
  Embrace turns=unlimited as a way of specifying unlimited turns


  Commit: 1dbd9b3c3bac92cecb0bceb7f28dfc20cc5f98a1
      https://github.com/wesnoth/wesnoth/commit/1dbd9b3c3bac92cecb0bceb7f28dfc20cc5f98a1
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/actionwml.cfg
    M data/schema/core/addons.cfg
    M data/schema/game_config.cfg

  Log Message:
  -----------
  Schema: Support for turns=unlimited


  Commit: 5355a62fee73d7c823e736f427cd34d097319652
      https://github.com/wesnoth/wesnoth/commit/5355a62fee73d7c823e736f427cd34d097319652
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/multiplayer/_main.cfg

  Log Message:
  -----------
  Fix erroneous [event] in [lobby_music]

As of this commit, there are no schema errors when entering the MP Create screen


  Commit: 442f0957e5c7dc084921e947a3fde134520f1bb9
      https://github.com/wesnoth/wesnoth/commit/442f0957e5c7dc084921e947a3fde134520f1bb9
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/multiplayer/scenarios/ANL_utils/ANL_general_macros.cfg
    M data/multiplayer/scenarios/ANL_utils/ANL_special_macros.cfg

  Log Message:
  -----------
  ANL: Remove needless silent= key from [object]s

The silent key is meaningful only when using the [object] as ActionWML.
None of these are used thusly, so it does nothing.


  Commit: ef141b90476208b33c5bfdcefeb45d59bf76a97f
      https://github.com/wesnoth/wesnoth/commit/ef141b90476208b33c5bfdcefeb45d59bf76a97f
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/actionwml.cfg
    M data/schema/units/modifications.cfg

  Log Message:
  -----------
  Schema: Promote [object]duration= key to non-ActionWML objects

It's used by the object auto-expiry mechanism, so it's meaningful
even outside of ActionWML.


  Commit: 009326c411bf9475d6fcbc5a09dd833cb2231404
      https://github.com/wesnoth/wesnoth/commit/009326c411bf9475d6fcbc5a09dd833cb2231404
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/actionwml.cfg
    M data/schema/filters/location.cfg
    M data/schema/filters/side.cfg
    M data/schema/filters/unit.cfg
    M data/schema/game_config.cfg

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


  Commit: eb4184ed8288a72c7297ff558a460bdbed5f077f
      https://github.com/wesnoth/wesnoth/commit/eb4184ed8288a72c7297ff558a460bdbed5f077f
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg

  Log Message:
  -----------
  LoW: Remove redundant AI definitions

These are used by default, so there's no need to specifically include them.


  Commit: 3af8a276b770c2dbad9578df88d872dbc085a114
      https://github.com/wesnoth/wesnoth/commit/3af8a276b770c2dbad9578df88d872dbc085a114
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M src/game_events/action_wml.cpp

  Log Message:
  -----------
  Deprecate [replace_map]map= in favour of [replace_map]map_data=

This gives greater consistency between similar APIs, and allows macros
intended to drop a map into [scenario] to also work in [replace_map].


  Commit: b75bcac38770cf233e50255222bcf238afceedaf
      https://github.com/wesnoth/wesnoth/commit/b75bcac38770cf233e50255222bcf238afceedaf
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg

  Log Message:
  -----------
  LoW7: Fix invalid use of aspects in [unit][ai]

This is somewhat makeshift and doesn't quite produce
what is presumed to be the intended result

It does at least preserve the differing recruitment patterns though.


  Commit: bdecafcf6298781cb77cce9bc476b874700da3ed
      https://github.com/wesnoth/wesnoth/commit/bdecafcf6298781cb77cce9bc476b874700da3ed
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/campaigns/Legend_of_Wesmere/utils/characters.cfg

  Log Message:
  -----------
  LoW: Fix erroneous used of unrenamable and canrecruit keys in [side] when there is no unit


  Commit: c26ba3d02b5a84d14f2555878b6faa9cd0a03bde
      https://github.com/wesnoth/wesnoth/commit/c26ba3d02b5a84d14f2555878b6faa9cd0a03bde
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/core/actionwml.cfg
    M data/schema/core/addons.cfg

  Log Message:
  -----------
  Schema: Some missing [unit] keys and promote some [multiplayer] keys to [scenario]


  Commit: a4ccde73c28fc61e229f842cad3bd164e0873b15
      https://github.com/wesnoth/wesnoth/commit/a4ccde73c28fc61e229f842cad3bd164e0873b15
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg

  Log Message:
  -----------
  fixup! LoW7: Fix invalid use of aspects in [unit][ai]


  Commit: 6fba3f39f6eb5f7e0e6ce2a6f227337d0ae44be6
      https://github.com/wesnoth/wesnoth/commit/6fba3f39f6eb5f7e0e6ce2a6f227337d0ae44be6
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/ai/modify.cfg
    M data/schema/game_config.cfg

  Log Message:
  -----------
  Schema: Support omitting the final index in [modify_ai] paths

Also mark the subtags in [modify_ai] as required


  Commit: bcdcab14389ed8ce97bf4b6901c00e1aced49115
      https://github.com/wesnoth/wesnoth/commit/bcdcab14389ed8ce97bf4b6901c00e1aced49115
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/ai/goal.cfg

  Log Message:
  -----------
  Schema: Fixup [goal] definition


  Commit: 4ed1f0d02bc20851ef19c2ccb41aef47d54bb292
      https://github.com/wesnoth/wesnoth/commit/4ed1f0d02bc20851ef19c2ccb41aef47d54bb292
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/core/macros/ai_controller.cfg

  Log Message:
  -----------
  Fix error in AI control core macros


  Commit: d0ff3a1b4743d46710f3dd2a49f4364263b834c6
      https://github.com/wesnoth/wesnoth/commit/d0ff3a1b4743d46710f3dd2a49f4364263b834c6
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/ai/aspect_complex.cfg

  Log Message:
  -----------
  Schema: Forgot id key in [leader_goal]


  Commit: 159a77302f02e8753efbbe8806c4358c6cf078ac
      https://github.com/wesnoth/wesnoth/commit/159a77302f02e8753efbbe8806c4358c6cf078ac
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/ai/aspect_simple.cfg

  Log Message:
  -----------
  Schema: Simplify the simple non-scalar aspect definitions


  Commit: 3ac1e1d3414e3b52aff60a10d6bb0daf9b473044
      https://github.com/wesnoth/wesnoth/commit/3ac1e1d3414e3b52aff60a10d6bb0daf9b473044
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-30 (Fri, 30 Mar 2018)

  Changed paths:
    M data/schema/ai/aspect_complex.cfg
    M data/schema/ai/aspect_simple.cfg

  Log Message:
  -----------
  Schema: Accept variable substitution in most aspect values


  Commit: 740d1d24c47f6633c3223ac90006f8f12343322e
      https://github.com/wesnoth/wesnoth/commit/740d1d24c47f6633c3223ac90006f8f12343322e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-31 (Sat, 31 Mar 2018)

  Changed paths:
    M data/schema/units/single.cfg

  Log Message:
  -----------
  Schema: Accept variable substitution in [unit]


  Commit: 59532aced2df11296058d583496812cf126b6b97
      https://github.com/wesnoth/wesnoth/commit/59532aced2df11296058d583496812cf126b6b97
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-31 (Sat, 31 Mar 2018)

  Changed paths:
    M data/schema/core/actionwml.cfg

  Log Message:
  -----------
  Schema: Accept x,y=recall,recall in [unstore_unit]


  Commit: f20ee4e8b04ace0f47cb12bfbcd2a99c062407a2
      https://github.com/wesnoth/wesnoth/commit/f20ee4e8b04ace0f47cb12bfbcd2a99c062407a2
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-31 (Sat, 31 Mar 2018)

  Changed paths:
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
    M data/campaigns/Legend_of_Wesmere/utils/characters.cfg

  Log Message:
  -----------
  LoW: Several small fixes (misplaced keys mostly)


  Commit: fbf57b9efa5f51ed1b14e2c72daeae4a956131ba
      https://github.com/wesnoth/wesnoth/commit/fbf57b9efa5f51ed1b14e2c72daeae4a956131ba
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-31 (Sat, 31 Mar 2018)

  Changed paths:
    M data/schema/game_config.cfg

  Log Message:
  -----------
  Schema: Don't accept omitted [] after all in [modify_ai] paths


  Commit: 34b378008652935ae40a00470fa2c5c9ca331b1d
      https://github.com/wesnoth/wesnoth/commit/34b378008652935ae40a00470fa2c5c9ca331b1d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-03-31 (Sat, 31 Mar 2018)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios_old/08_Out_of_the_Frying_Pan.cfg
    M data/core/macros/ai.cfg

  Log Message:
  -----------
  Add omitted final [] to [modify_ai] paths in core macros and UtBS


Compare: https://github.com/wesnoth/wesnoth/compare/2fe239e2236a...34b378008652


More information about the Commits mailing list