[wesnoth-commits] [wesnoth/wesnoth] 41fe47: LoW7: Fix invalid use of aspects in [unit][ai]

Thu Apr 12 02:30:54 UTC 2018

  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 41fe47372dcccab2f3d1505cd23a24072d7b0d2b
      https://github.com/wesnoth/wesnoth/commit/41fe47372dcccab2f3d1505cd23a24072d7b0d2b
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-11 (Wed, 11 Apr 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 doesn't quite produce what is presumed to be the intended result.
It does at least preserve the differing recruitment patterns though.

Includes the following 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: 7d42fe0f49db8bbab4ecf91e35a48fb83a619bf3
      https://github.com/wesnoth/wesnoth/commit/7d42fe0f49db8bbab4ecf91e35a48fb83a619bf3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

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

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

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

  Changed paths:
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg

  Log Message:
  -----------
  LoW: Fix misplaced {NO_SCOUTS}

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

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

  Log Message:
  -----------
  TB: Fix invalid filter in [modify_side]

[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.

  Commit: c90dc449d421e683d1ca7581f9914344adf13a45
      https://github.com/wesnoth/wesnoth/commit/c90dc449d421e683d1ca7581f9914344adf13a45
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-11 (Wed, 11 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: 62bb0253c28ad35b8a28064c3b6a819bd32bc2f5
      https://github.com/wesnoth/wesnoth/commit/62bb0253c28ad35b8a28064c3b6a819bd32bc2f5
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-11 (Wed, 11 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: bfde96b5c47525a67c7974833bce2875672cccc2
      https://github.com/wesnoth/wesnoth/commit/bfde96b5c47525a67c7974833bce2875672cccc2
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

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

  Log Message:
  -----------
  TSG: [heal_unit] takes restore_statuses, plural

  Commit: 73acf9b566f8c26534459c1a5f861f9af72996bf
      https://github.com/wesnoth/wesnoth/commit/73acf9b566f8c26534459c1a5f861f9af72996bf
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-11 (Wed, 11 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: 07df9c07047f570445a04cef76a6e2201462f223
      https://github.com/wesnoth/wesnoth/commit/07df9c07047f570445a04cef76a6e2201462f223
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-04-11 (Wed, 11 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/17_Scepter_of_Fire.cfg

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

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

  Changed paths:
    M data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
    M data/campaigns/Eastern_Invasion/scenarios/17a_The_Duel.cfg

  Log Message:
  -----------
  EI: Fix a few issues found by the schema validator

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

  Changed paths:
    M data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg

  Log Message:
  -----------
  DiD: Fix a few issues found by the schema validator

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

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg

  Log Message:
  -----------
  DM: Fix some issues found by the schema validator

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

  Changed paths:
    M data/campaigns/Secrets_of_the_Ancients/scenarios/07_Meeting_of_the_Minds.cfg

  Log Message:
  -----------
  SotA: Fix incorrect key in [redraw]

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

  Changed paths:
    M data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg

  Log Message:
  -----------
  SoF: Fix incorrect aspect value

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

  Changed paths:
    M data/campaigns/Northern_Rebirth/utils/herodeaths.cfg

  Log Message:
  -----------
  NR: usage= and alignment= not supported in SUF

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

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
    M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09b_Judgment.cfg
    M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg

  Log Message:
  -----------
  NR: Fix a few more issues found by the schema validator

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

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg

  Log Message:
  -----------
  UtBS: Fix a few issues found by the schema validator

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

  Changed paths:
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_The_Kalian.cfg

  Log Message:
  -----------
  TRoW: [unit]image= is not supported

We should really use a custom unit type to get the desired effect;
however, that could cause out-of-sync errors, so for the 1.14 branch
we instead replace the image via an [object]

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

  Changed paths:
    M data/scenario-test.cfg

  Log Message:
  -----------
  Test scenario: Fix invalid [message] key

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

  Changed paths:
    M data/scenario-test.cfg

  Log Message:
  -----------
  Fix an error in the test scenario

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

  Changed paths:
    M data/test/maps/pathfind_1.cfg
    M data/test/scenarios/test_menu_items.cfg

  Log Message:
  -----------
  WML Unit Tests: Fix issues found by the schema validator

With this, the WML unit tests are as clean of schema errors as they can get
The two remaining errors are unit tests for dealing with invalid input,
so they are intentionally violating the schema.

Compare: https://github.com/wesnoth/wesnoth/compare/56cd53520bf7...ad7b0ef14059