[wesnoth-commits] [wesnoth/wesnoth] f7aa96: NR S04: Use LOYAL_UNIT macro so placed units don't...

Thu Mar 8 00:51:58 UTC 2018

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f7aa961f009cfc34753ba2912795b9ec5b9d2c45
      https://github.com/wesnoth/wesnoth/commit/f7aa961f009cfc34753ba2912795b9ec5b9d2c45
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg

  Log Message:
  -----------
  NR S04: Use LOYAL_UNIT macro so placed units don't affect starting gold

[ci skip]

  Commit: 2866f58414bfd37a58989e60a6a9360a9521a119
      https://github.com/wesnoth/wesnoth/commit/2866f58414bfd37a58989e60a6a9360a9521a119
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg

  Log Message:
  -----------
  NR S05a_01: Make enemy gold add events work properly

Use LOYAL_UNIT macro & adding a side for monsters so the enemy sides
don't go to negative gold before the events are triggered.

[ci skip]

  Commit: 056b930d4a3c8dedb970a146fa55fd2ff9c245a6
      https://github.com/wesnoth/wesnoth/commit/056b930d4a3c8dedb970a146fa55fd2ff9c245a6
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg

  Log Message:
  -----------
  NR S06a: Fix & improve gold carryover

Have objectives match endlevel.
Bump carryover so a more impressive amount is stored next scenario.

On my easy level playthrough I only had 680 carryover. This
change makes it be around 1700 instead.

[ci skip]

  Commit: f3348dc4859d166690359e837043e888df722856
      https://github.com/wesnoth/wesnoth/commit/f3348dc4859d166690359e837043e888df722856
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg

  Log Message:
  -----------
  NR S06a: Set cave area to UNDERGROUND time

[ci skip]

  Commit: 7686e53fdcbda2f887831efa6a9e513f9503ae7a
      https://github.com/wesnoth/wesnoth/commit/7686e53fdcbda2f887831efa6a9e513f9503ae7a
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg

  Log Message:
  -----------
  NR S06a: Cleanup type change for Tallin

Simplify & if he has the rod, he will start with the correct move count.

[ci skip]

  Commit: e982bf7ef5d0102835a0324220826c65fc9998a7
      https://github.com/wesnoth/wesnoth/commit/e982bf7ef5d0102835a0324220826c65fc9998a7
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg

  Log Message:
  -----------
  NR S07a: Fixes for closing dialog

Leave Ro'Arthian on the board and have the cage removed & Ro'Sothian
positioned properly.

[ci skip]

  Commit: 0ee72d9bf9f94f8a69a8e0b3c13624864ce15368
      https://github.com/wesnoth/wesnoth/commit/0ee72d9bf9f94f8a69a8e0b3c13624864ce15368
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg

  Log Message:
  -----------
  NR S12a: Use valid side number so units end up on the recall list

With the bug out of the way the rest of the code for the scenario
runs properly, so this fixes parts 3 & 4 of issue #2569

[ci skip]

  Commit: 7bf48ccf23b69f23ecca09f2bc05ab74074a0898
      https://github.com/wesnoth/wesnoth/commit/7bf48ccf23b69f23ecca09f2bc05ab74074a0898
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg

  Log Message:
  -----------
  NR 07a: Properly store the gold for later and give intended starting gold

Otherwise, gold is not stored to be recovered for S13a and player is given
100 gold for starting S07a no matter the difficulty.

[ci skip]

  Commit: a1f7232ca7e411fa21228d027df5c593dcc4cd4e
      https://github.com/wesnoth/wesnoth/commit/a1f7232ca7e411fa21228d027df5c593dcc4cd4e
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg

  Log Message:
  -----------
  NR S09a: Have Supporter speak to ensure that it's not Tallin

Otherwise it looks odd when Tallin says this and the follow-up line.

[ci skip]

  Commit: b0ae6aa1b1bc785de806622b6391f9e2940321ba
      https://github.com/wesnoth/wesnoth/commit/b0ae6aa1b1bc785de806622b6391f9e2940321ba
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/maps/11a_The_Eastern_Flank.map
    M data/campaigns/Northern_Rebirth/maps/13a_Showdown.map

  Log Message:
  -----------
  NR S11a & 13a: Make the orcish fortresses look like orcish fortresses

[ci skip]

  Commit: fe667e84166a0360b75c93fa90df29540406bcef
      https://github.com/wesnoth/wesnoth/commit/fe667e84166a0360b75c93fa90df29540406bcef
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg

  Log Message:
  -----------
  NR S10a & 11a: Fix carryover & bump gold to compensate

So all carryover options are the same.
Also reposition gold macro to match one added.

[ci skip]

  Commit: 018b033266ef85e3008b1043c3bccf38d5589ab3
      https://github.com/wesnoth/wesnoth/commit/018b033266ef85e3008b1043c3bccf38d5589ab3
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg

  Log Message:
  -----------
  NR S04: Make objectives more accurate

[ci skip]

  Commit: 884af3b016aca43cfe549a99b518bfdccfdb75bb
      https://github.com/wesnoth/wesnoth/commit/884af3b016aca43cfe549a99b518bfdccfdb75bb
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg

  Log Message:
  -----------
  NR S09a: Move troll out of likely vision of the player's ghost at start

There is dialog for when the player first sees a troll.

[ci skip]

  Commit: 99ba7af23145ec4bddf5986a3fa5b3a6c16e6e39
      https://github.com/wesnoth/wesnoth/commit/99ba7af23145ec4bddf5986a3fa5b3a6c16e6e39
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
    M data/campaigns/Northern_Rebirth/utils/characters.cfg

  Log Message:
  -----------
  NR: Fix and use character macro for Rakshas appearances

Unifies handling of character and ensures correct portrait is used.
Fixes part of issue #2569

[ci skip]

  Commit: 86fc31d2ef85ba96bfff30a58a43f188b73269ca
      https://github.com/wesnoth/wesnoth/commit/86fc31d2ef85ba96bfff30a58a43f188b73269ca
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg

  Log Message:
  -----------
  NR S13a: Add income & loyal so Rakshas's side is more intimidating

Bump his income since he doesn't start with any villages.
Make guards loyal so they don't drain starting gold too quickly.

[ci skip]

  Commit: 35d32a0a80f425c88ed8218e8d40e66bfd685915
      https://github.com/wesnoth/wesnoth/commit/35d32a0a80f425c88ed8218e8d40e66bfd685915
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg

  Log Message:
  -----------
  NR: Ensure secondary player sides have names in statistics and carryover

[ci skip]

  Commit: 673e33bb20a77afc99b405faabb21b6b10d151e2
      https://github.com/wesnoth/wesnoth/commit/673e33bb20a77afc99b405faabb21b6b10d151e2
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
    M data/campaigns/Northern_Rebirth/utils/utils.cfg

  Log Message:
  -----------
  NR: Fix Krash resurrection bug

After changes in 618659c083b6, the leader keys in Krash's side caused him
to be reborn if he was killed in the previous scenario for S11a-S13a.

[ci skip]

  Commit: a53ce26d3f47ef9b28b9d2f38d74d1cd506fb39a
      https://github.com/wesnoth/wesnoth/commit/a53ce26d3f47ef9b28b9d2f38d74d1cd506fb39a
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg

  Log Message:
  -----------
  NR S13a: Clean up side 9 handling to match previous commit

[ci skip]

  Commit: 77f85655536c561bb4abe67424847c931cac8738
      https://github.com/wesnoth/wesnoth/commit/77f85655536c561bb4abe67424847c931cac8738
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg

  Log Message:
  -----------
  NR S13a: Ensure correct unit type and facing for opening animations

Only needed type fix for Krash, Eryssa, & Tallin, but did them all.

[ci skip]

Add facing for entrance - merge with other commit

  Commit: c243ca5c7bc699fe2fb98b52984c4b90117f8703
      https://github.com/wesnoth/wesnoth/commit/c243ca5c7bc699fe2fb98b52984c4b90117f8703
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg

  Log Message:
  -----------
  NR: Clean up handling of flags for secondary player sides

Drakes get long, elves get wood-elvish, and liches get undead.

[ci skip]

  Commit: 9f5a61601ac9a66e3174e03d39e7e294ba8c60be
      https://github.com/wesnoth/wesnoth/commit/9f5a61601ac9a66e3174e03d39e7e294ba8c60be
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg

  Log Message:
  -----------
  NR S12a & 13a: Improve handling of Sisal & the Liches

Make Sisal loyal at end of S12a.
Have Sisal & the Liches appear in S13a at a time that makes more sense.

[ci skip]

  Commit: e3c572611485a47cfbb714f1dff8083d0671683f
      https://github.com/wesnoth/wesnoth/commit/e3c572611485a47cfbb714f1dff8083d0671683f
  Author: sigurdfdragon <jjwcoat at gmail.com>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M changelog
    M players_changelog

  Log Message:
  -----------
  Update changelogs

[ci skip]

Compare: https://github.com/wesnoth/wesnoth/compare/494b2f35ca58...e3c572611485