[wesnoth-commits] [wesnoth/wesnoth] 776f08: squash! LoW7: Fix invalid use of aspects in [unit]...

Thu Apr 5 02:07:40 UTC 2018

  Branch: refs/heads/schema
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 776f08ad76b51919f3ea20dfe401971e849b3d1e
      https://github.com/wesnoth/wesnoth/commit/776f08ad76b51919f3ea20dfe401971e849b3d1e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

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

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

This applies the recommendations from mattsc:

- Drop {AI_NO_SCOUTS} since the recruitment pattern contradicts it
- Drop attack_depth and grouping
- Keep the night-only aggression and caution change, even for the nagas

  Commit: 952762a4f2d76d1e0a96c934b5a4675009303858
      https://github.com/wesnoth/wesnoth/commit/952762a4f2d76d1e0a96c934b5a4675009303858
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M src/terrain/filter.cpp

  Log Message:
  -----------
  Support time_of_day=liminal in location filters.

This is actually equivalent to time_of_day=neutral, but is added so
people don't get confused that it doesn't work.

  Commit: 2860c6ee6c0f9679939e9e964508ba60d593c339
      https://github.com/wesnoth/wesnoth/commit/2860c6ee6c0f9679939e9e964508ba60d593c339
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M data/schema/filters/location.cfg
    M data/schema/filters/unit.cfg
    M data/schema/filters/weapon.cfg

  Log Message:
  -----------
  Schema: Update filters with undocumented or poorly-documented features

  Commit: a4ae7c3b4340b983b83d82cc0fd3c49456ec3010
      https://github.com/wesnoth/wesnoth/commit/a4ae7c3b4340b983b83d82cc0fd3c49456ec3010
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M src/units/attack_type.cpp

  Log Message:
  -----------
  SWF: Support lists for special= and special_active=

  Commit: 5c20bae1b06518fd660d0686d81c0b7a3d28afa0
      https://github.com/wesnoth/wesnoth/commit/5c20bae1b06518fd660d0686d81c0b7a3d28afa0
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M data/schema/filters/weapon.cfg

  Log Message:
  -----------
  Schema: Update weapon filter to note that lists are allowed here

  Commit: 10a048217f5e609e6660ee9035c077e994b339a6
      https://github.com/wesnoth/wesnoth/commit/10a048217f5e609e6660ee9035c077e994b339a6
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

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

  Log Message:
  -----------
  Schema: Add undocumented features for EffectWML

  Commit: 712503b2ddb0fa1c5f781b3763343296370eec11
      https://github.com/wesnoth/wesnoth/commit/712503b2ddb0fa1c5f781b3763343296370eec11
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

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

  Log Message:
  -----------
  Schema: Remove the condition on [endlevel]

  Commit: 466badff763641ca5d18b8adeaa4eba3d3f7db49
      https://github.com/wesnoth/wesnoth/commit/466badff763641ca5d18b8adeaa4eba3d3f7db49
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

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

  Log Message:
  -----------
  Schema: Fix incorrect type

  Commit: 9f4c401e39f23b0cb5dd6fcc35128dffe49fe92a
      https://github.com/wesnoth/wesnoth/commit/9f4c401e39f23b0cb5dd6fcc35128dffe49fe92a
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg

  Log Message:
  -----------
  TB: Fix errors found by schema validator

- Passing () as the side to the unit util macros results in an empty side key
  There's no reason not to just pass 1 instead though.
- [modify_side] does not support [filter]; instead it uses [filter_side]
  However, it also supports inline side which is sufficient here,
  so just use that instead.

This covers both difficulty levels; TB is now clean of schema issues.

  Commit: b6153fd434557a55cea3f788e4ad0592c779a64d
      https://github.com/wesnoth/wesnoth/commit/b6153fd434557a55cea3f788e4ad0592c779a64d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
    M data/campaigns/An_Orcish_Incursion/scenarios/04_Valley_of_Trolls.cfg

  Log Message:
  -----------
  AOI: Fix errors found by schema validator

- grouping=no, not grouping=none
- speaker is a message key not a filter key

With this, AOI is clean of schema issues.

  Commit: f808bee0a99b806f7c8330bdd041d988fff8f021
      https://github.com/wesnoth/wesnoth/commit/f808bee0a99b806f7c8330bdd041d988fff8f021
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M data/core/macros/unit-utils.cfg

  Log Message:
  -----------
  Remove animate=no from {GUARDIAN}

This is the default in [unit] anyway, and if the user specified
animate=yes explicitly then we should not override that.

  Commit: 7e99029f24f4375a5fb00fb57556358c7cd14864
      https://github.com/wesnoth/wesnoth/commit/7e99029f24f4375a5fb00fb57556358c7cd14864
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

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

  Log Message:
  -----------
  Schema: Fix a few more instances of keys not accepting variable substitution

  Commit: ab168ecbebf11e6cdf485deafe45df1e5cbff4b8
      https://github.com/wesnoth/wesnoth/commit/ab168ecbebf11e6cdf485deafe45df1e5cbff4b8
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg

  Log Message:
  -----------
  TSG: Fix errors found by schema validator

With this, TSG is now clean of schema issues

  Commit: 1268def5d14ffa5c111575d06bec212fa820c9c3
      https://github.com/wesnoth/wesnoth/commit/1268def5d14ffa5c111575d06bec212fa820c9c3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-03 (Tue, 03 Apr 2018)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg
    M data/campaigns/Heir_To_The_Throne/units/Commander.cfg
    M data/campaigns/Heir_To_The_Throne/units/Fighter.cfg
    M data/campaigns/Heir_To_The_Throne/units/Lord.cfg
    M data/campaigns/Heir_To_The_Throne/units/Princess.cfg

  Log Message:
  -----------
  HTTT: Unit variations don't need an ID

  Commit: a81c752219d1f1789b78483d49d6defb14b36cb2
      https://github.com/wesnoth/wesnoth/commit/a81c752219d1f1789b78483d49d6defb14b36cb2
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

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

  Log Message:
  -----------
  Schema: Add some undocumented keys and tags in [unit]

  Commit: 03369da261a57fe56bba5a686256f5ffcb251f9d
      https://github.com/wesnoth/wesnoth/commit/03369da261a57fe56bba5a686256f5ffcb251f9d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

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

  Log Message:
  -----------
  [effect]apply_to=new_animation does not support name

It does support id though, which is used as a sort of caching mechanism
in case the same effect is applied many times, so use that instead of name.
For good measure, also use an id on the sceptre of fire animation

  Commit: ce894d99fc76b4def108cdf2d23d3a0246771dbf
      https://github.com/wesnoth/wesnoth/commit/ce894d99fc76b4def108cdf2d23d3a0246771dbf
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

  Changed paths:
    M data/schema/filters/location.cfg
    M data/schema/game_config.cfg
    M data/schema/units/modifications.cfg
    M data/schema/units/single.cfg

  Log Message:
  -----------
  Schema: Fix a few incorrect types

  Commit: de7c74e51b4c5ff090fe9208ad1b9edd6881464d
      https://github.com/wesnoth/wesnoth/commit/de7c74e51b4c5ff090fe9208ad1b9edd6881464d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

  Changed paths:
    M data/schema/core/addons.cfg
    A data/schema/core/mapgen/default.cfg
    A data/schema/core/mapgen/lua.cfg
    M data/schema/game_config.cfg

  Log Message:
  -----------
  Schema: Definition of the [generator] tag

  Commit: fce56b5ffb6de9181cc30486b3682109170fbec8
      https://github.com/wesnoth/wesnoth/commit/fce56b5ffb6de9181cc30486b3682109170fbec8
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

  Changed paths:
    M data/core/macros/terrain-utils.cfg

  Log Message:
  -----------
  Use WFL instead of Lua code for {SCATTER_EMBELLISHMENTS}

  Commit: 459d54715939b314d0314824c53331e2467a808c
      https://github.com/wesnoth/wesnoth/commit/459d54715939b314d0314824c53331e2467a808c
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg

  Log Message:
  -----------
  HTTT: Fix errors found by schema validator

This fixes most of the errors, but there still a few more to squelch.

Compare: https://github.com/wesnoth/wesnoth/compare/34b378008652...459d54715939