[Commits] [wesnoth/wesnoth] b0c06d: DM Remove unused macro

Thu Oct 20 17:43:59 UTC 2016

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: b0c06d077d0d38f0b014115c9f810e73075754e6
      https://github.com/wesnoth/wesnoth/commit/b0c06d077d0d38f0b014115c9f810e73075754e6
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/utils/misc.cfg

  Log Message:
  -----------
  DM Remove unused macro

In utils/misc.cfg MEMOIRS_SIDEKICK is not used.

  Commit: d243b7ce2eee87ff24ce76ad99d4332c01aa7b36
      https://github.com/wesnoth/wesnoth/commit/d243b7ce2eee87ff24ce76ad99d4332c01aa7b36
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg

  Log Message:
  -----------
  DM Remove macro artifacts

Keep local macros local to prevent surprises later.

  Commit: 8de87a2f651e68d97316a41f374d043750f3e541
      https://github.com/wesnoth/wesnoth/commit/8de87a2f651e68d97316a41f374d043750f3e541
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/07_Night_in_the_Swamp.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg

  Log Message:
  -----------
  DM [if] must have [then]

  Commit: 26a238e8f7aca1d3f70fff4a01f4c79347b9e236
      https://github.com/wesnoth/wesnoth/commit/26a238e8f7aca1d3f70fff4a01f4c79347b9e236
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
    M data/campaigns/Delfadors_Memoirs/utils/generators.cfg
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg

  Log Message:
  -----------
  DM Remove variable artifacts

Remove variables when no longer needed. Some were never used. Found a few which were cleared but never set.

  Commit: 529ce87160da94402a85b0dee2472c7eacb42f7a
      https://github.com/wesnoth/wesnoth/commit/529ce87160da94402a85b0dee2472c7eacb42f7a
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg

  Log Message:
  -----------
  DM S03 Use new role features

On turn 4, no need to search the recall list. If there is no bowman for the role, the line may be omitted.

On victory, there may be no surviving bowman. The lines cannot be omitted. Recall a bowman from the recall list, or recruit a replacement.

  Commit: ee2d3999b768b53ff3b552c6b74e1ac7726dc8c2
      https://github.com/wesnoth/wesnoth/commit/ee2d3999b768b53ff3b552c6b74e1ac7726dc8c2
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg

  Log Message:
  -----------
  DM S06 Use gold.ogg sound

Implement a TODO. Play gold.ogg after open-chest.wav when taking the chest left by the bandit.

  Commit: 23d1582739d7917d0241839dc9ef82f1f4421127
      https://github.com/wesnoth/wesnoth/commit/23d1582739d7917d0241839dc9ef82f1f4421127
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/_main.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/07_Night_in_the_Swamp.cfg
    R data/campaigns/Delfadors_Memoirs/terrain-graphics/_final.cfg
    R data/campaigns/Delfadors_Memoirs/terrain.cfg
    M data/campaigns/Delfadors_Memoirs/utils/generators.cfg

  Log Message:
  -----------
  DM S07 Fix bug: Always early completion

The skeleton generators turned off on turn 12, always leading to an early-completion on turn 13. Don't turn them off. This allows normal turns-over completion after 14 turns, as designed.

Note than if the generators are taken out, and all skeletons killed, the player must wait for the next turn for victory. This can be rationalized by Delfador's statement indicating he is not sure his solution will work until the next turn, when no skeleton appears.

The use of an invalid tile to record the state of each generator caused errors generating the preview minimap when loading a turn.  Changing the tiles also caused visual artifacts. Eliminated the custom tiles and use event management to handle the generator state.

  Commit: eee87444582447d03a3c8bc42402f744c96ed60b
      https://github.com/wesnoth/wesnoth/commit/eee87444582447d03a3c8bc42402f744c96ed60b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S08 Fix bug: Withdraw units at correct time

Delfador's Wesnoth veterans withdraw from the field too early, and the Wose too late. Have them withdraw just before the narrator says they do, so if the player glances at the map they are gone.

  Commit: 604f2a03d414b6a0473e035252d6eaf8f871206a
      https://github.com/wesnoth/wesnoth/commit/604f2a03d414b6a0473e035252d6eaf8f871206a
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S08 Fix bug: Remove Delfador visual artifact

Send Delfador to his recall list to remove him before the final fade-to-black frame. This removes the glitchy artifact, making the screen fully black.

Since Delfador may be injured, and will have used moves, restore him to full moves and full health since, otherwise, he will begin the next scene incorrectly.

  Commit: e2610748e14a132118991a27c24d082849fcbfe7
      https://github.com/wesnoth/wesnoth/commit/e2610748e14a132118991a27c24d082849fcbfe7
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/maps/10_The_Gate_Between_Worlds.map
    M data/campaigns/Delfadors_Memoirs/scenarios/10_The_Gate_Between_Worlds.cfg
    M data/campaigns/Delfadors_Memoirs/utils/misc.cfg

  Log Message:
  -----------
  DM S10 Animate gate opening

The original intent clearly was to see the gate opening. Added some redraws to make this happen. The result seemed off so added more shaking. It's a bit slower than I'd like but looks good.

  Commit: e208f01770a0fc9eb1696928c71df7795f864610
      https://github.com/wesnoth/wesnoth/commit/e208f01770a0fc9eb1696928c71df7795f864610
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg

  Log Message:
  -----------
  DM S11 Fix bug: Disallow recalls

Delfador has recalls (although not on the list). Disallowing recalls recognizes this with a more appropriate error message.

  Commit: fe8d088fd3891faca937342ec7338a9491e67f5c
      https://github.com/wesnoth/wesnoth/commit/fe8d088fd3891faca937342ec7338a9491e67f5c
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
    M data/campaigns/Delfadors_Memoirs/utils/deaths.cfg

  Log Message:
  -----------
  DM S11 Fix bug: Chantal defeat

It is remotely possible Chantal dies before Delfador meets her. Remove her death as a defeat condition until he does.

The goal is to find her before time runs out. If she dies before being found, time will run out.

  Commit: 80d15ec198b9c6ed744fa5371e21611e94f94f7f
      https://github.com/wesnoth/wesnoth/commit/80d15ec198b9c6ed744fa5371e21611e94f94f7f
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg

  Log Message:
  -----------
  DM S11 Fix bug: No recruits before Chantal

Delfador should not gain the ability to recruit Elves until he actually meets Chantal.

  Commit: b5608d032da1a730891a4ce7087cea33ac60a07d
      https://github.com/wesnoth/wesnoth/commit/b5608d032da1a730891a4ce7087cea33ac60a07d
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg

  Log Message:
  -----------
  DM S11 Fix bug: Inconsistent objectives

  Commit: 997887cddeb47cc5119536f981c4077b2be107f7
      https://github.com/wesnoth/wesnoth/commit/997887cddeb47cc5119536f981c4077b2be107f7
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S12 Fix bugs: Several errors with Mages

Apparently, the Mage keep was moved. The scroll position was not updated, nor were the AI parameters to keep the Mages near their keep.

The fog does not lift to expose the Mages, and the narrator's instructions are incorrect.

  Commit: f2d6a00a8dcbacdda50566e720e1916bcc874a1d
      https://github.com/wesnoth/wesnoth/commit/f2d6a00a8dcbacdda50566e720e1916bcc874a1d
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S12 Fix bug: Delfador knows about undead

He should not ask about the abominations.

  Commit: 0229a24e052d529d4263291f48865710b89c696b
      https://github.com/wesnoth/wesnoth/commit/0229a24e052d529d4263291f48865710b89c696b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S12 Fix bug: Objectives already changed

Capturing the village near Delfador's encampment changes objectives. They also change if orcs or undead are seen, or the Loyalists met; but that change is a duplicate. Remove the duplicated change.

  Commit: c5e60b846025332aebfc4031da751da1c921f6a6
      https://github.com/wesnoth/wesnoth/commit/c5e60b846025332aebfc4031da751da1c921f6a6
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S12 Fix bug: No objectives change

Capturing villages inside the garrison should change objectives if they have not done so already.

  Commit: 3cf1e5a8e93aa9031184b6f623c70d031fc78989
      https://github.com/wesnoth/wesnoth/commit/3cf1e5a8e93aa9031184b6f623c70d031fc78989
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S12 Fix bug: Niktor may be dead

It is possible Niktor was killed before meeting the loyalists. If so, appoint a replacement from the highest-level survivors.

  Commit: 9faeaf561bc2ce6f1608bb9994774bef6e4eaf59
      https://github.com/wesnoth/wesnoth/commit/9faeaf561bc2ce6f1608bb9994774bef6e4eaf59
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S12 Fix bug: Arpus may be dead

It is remotely possible Arpus may be dead prior to moving to wake the Mages. In fact, they may all have died. Appoint a replacement from the highest-level survivors (if any).

  Commit: f86b3c99ddd7344eabbd36ac4769d6f617c1ca8e
      https://github.com/wesnoth/wesnoth/commit/f86b3c99ddd7344eabbd36ac4769d6f617c1ca8e
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S12 Fix bug: Inconsistent objectives

  Commit: 971353580c35bf830e3358d1a99a72000ac7decb
      https://github.com/wesnoth/wesnoth/commit/971353580c35bf830e3358d1a99a72000ac7decb
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg

  Log Message:
  -----------
  DM S13 Fix bug: Disallow recalls

The play has recalls (although not on the list). Disallowing recalls recognizes this with a more appropriate error message.

  Commit: 4079814228038464b94c1f9a8a71b71a5d17d45c
      https://github.com/wesnoth/wesnoth/commit/4079814228038464b94c1f9a8a71b71a5d17d45c
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg

  Log Message:
  -----------
  DM S13 Fix bug: Chantal returns in poor condition

  Commit: a5090357679a7fab725294dc8423d0fa23f5907f
      https://github.com/wesnoth/wesnoth/commit/a5090357679a7fab725294dc8423d0fa23f5907f
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg

  Log Message:
  -----------
  DM S13 Fix bug: Chantal moves properly

 When last seen Chantal was south-west. Have her enter from that direction and run directly to Kalenz. Originally, she appeared in the middle, ran left, ran right, bumped into the edge and stopped; and, usually, Kalenz would be far away from there.

  Commit: f62cec98650d50ac5165856fba04f0747de6ee81
      https://github.com/wesnoth/wesnoth/commit/f62cec98650d50ac5165856fba04f0747de6ee81
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg

  Log Message:
  -----------
  DM S14 Fix bug: Rudimil might be dead

Use one of the other leaders to announce the arrival of reinforcements.

  Commit: 87a0212da41d80a2dd1868b93daf16ac1eb6e0db
      https://github.com/wesnoth/wesnoth/commit/87a0212da41d80a2dd1868b93daf16ac1eb6e0db
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg

  Log Message:
  -----------
  DM S14 Fix bug: Clear fog around Delfador

  Commit: 0e511658086f30c0bf36a5016652f0f2f510e9ef
      https://github.com/wesnoth/wesnoth/commit/0e511658086f30c0bf36a5016652f0f2f510e9ef
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg

  Log Message:
  -----------
  DM S15 Chantal already recalled

  Commit: aaaaa7ee3bcb2f43369be7a7d44baeaa4a28d131
      https://github.com/wesnoth/wesnoth/commit/aaaaa7ee3bcb2f43369be7a7d44baeaa4a28d131
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg

  Log Message:
  -----------
  DM S16 Fix bug: Unexplained gold

  Commit: 17a7664f097eedb6cc0da69a17c41734adcfde53
      https://github.com/wesnoth/wesnoth/commit/17a7664f097eedb6cc0da69a17c41734adcfde53
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg

  Log Message:
  -----------
  DM S18 Highlight Iliah-Malal

Add leader-expendable and ellipse-hero to mark him. I would have preferred the gold leader overlay but could not find it and making him a leader causes the AI to take him to a keep instead of treating him like any other Lich unit.

  Commit: e83101a78515ec5d7ae8f08cafab9fdb5a9c09d1
      https://github.com/wesnoth/wesnoth/commit/e83101a78515ec5d7ae8f08cafab9fdb5a9c09d1
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg

  Log Message:
  -----------
  DM S19 Fix bug: Mismatched shroud

Place and remove the shroud from both sides 1 and 2 consistently.

  Commit: 7215b4403bd96266e7e4e7eb6389d161875bb8e0
      https://github.com/wesnoth/wesnoth/commit/7215b4403bd96266e7e4e7eb6389d161875bb8e0
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg

  Log Message:
  -----------
  DM S19 Fix bug: Defeat on undead death

Defeat should only occur when there are no more undead available to Delfador.

  Commit: afe5fc1ca24d6c23596ac83e39bc0ffc080cb614
      https://github.com/wesnoth/wesnoth/commit/afe5fc1ca24d6c23596ac83e39bc0ffc080cb614
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg

  Log Message:
  -----------
  DM S19 Kalenz is available

The [if] is meaningless. The death of Kalenz is a defeat; he will always be around on victory.

  Commit: e59cb908e0932505e272ce223cb067bbbcff886e
      https://github.com/wesnoth/wesnoth/commit/e59cb908e0932505e272ce223cb067bbbcff886e
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg

  Log Message:
  -----------
  DM S19 Bring out your dead

Recall all Delfador's undead units so he is speaking to all of them when releasing them.

  Commit: 6603003e6292922b8de8953c607148d814540d0d
      https://github.com/wesnoth/wesnoth/commit/6603003e6292922b8de8953c607148d814540d0d
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg

  Log Message:
  -----------
  DM S19 Fix bug: Kalenz returns in poor shape

  Commit: 68483ba98469a0d51a42344c2a4eeacfe7b4d264
      https://github.com/wesnoth/wesnoth/commit/68483ba98469a0d51a42344c2a4eeacfe7b4d264
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg

  Log Message:
  -----------
  DM S20 Since you've been away

It's been 26 years. Kalenz, Chantal and the other elves should be in perfect health, and have advanced a level from when last seen.

  Commit: cb1fd2ce2c3453d5d9912eff072acdea1832e18d
      https://github.com/wesnoth/wesnoth/commit/cb1fd2ce2c3453d5d9912eff072acdea1832e18d
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg

  Log Message:
  -----------
  DM S20 Delfador's been busy, too

Bump Delfador a level when he reappears to drag Eldred back to his father.

  Commit: 8d3894a5655410746793eeebf3ce10f397d5b77c
      https://github.com/wesnoth/wesnoth/commit/8d3894a5655410746793eeebf3ce10f397d5b77c
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg

  Log Message:
  -----------
  DM S21 Fix bug: Incomplete objectives

  Commit: d1c6a4ab0c27bf98ec5bbd4f03e65d331a9cf45d
      https://github.com/wesnoth/wesnoth/commit/d1c6a4ab0c27bf98ec5bbd4f03e65d331a9cf45d
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
    M data/campaigns/Delfadors_Memoirs/utils/characters.cfg

  Log Message:
  -----------
  DM Fix bug: Kalenz takes over

Kalenz should take over a no_leader side, have his unit brought in as a [unit] tag, and his unit should not have side attributes.

This caused a number of errors in stderr, including dumping the full WML for the scene.

  Commit: 430d19569b31b28d1dce0799798cee9e2fde2e3d
      https://github.com/wesnoth/wesnoth/commit/430d19569b31b28d1dce0799798cee9e2fde2e3d
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg

  Log Message:
  -----------
  DM Make heros

Consistently mark all non-leader units for whom death is a defeat condition.

  Commit: f8358bdfb35cd60effec6dbda9f7d3fe5560a2cb
      https://github.com/wesnoth/wesnoth/commit/f8358bdfb35cd60effec6dbda9f7d3fe5560a2cb
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg

  Log Message:
  -----------
  DM Hide unneeded sides

S08 Side 3 is an implemention detail which the player does not need to see.

S08 After Delfador is struck and fading to black, hide all sides to enhance the player's impression Delfador has died. There are no sides left on the map, anyway.

S09 After the undead join Delfador, their side no longer exists.

S11 After Chantal joins Delfador, her side no longer exists.

S12 When the Loyalists and Mages join Delfador, their sides no long exist.

S17 After Ulrek joins Delfador, his side no longer exists.

S19 When Lionel joins Delfador, his side no longer exists.

  Commit: 76b549987c9389cc1b24fab92de7c0f4b6529222
      https://github.com/wesnoth/wesnoth/commit/76b549987c9389cc1b24fab92de7c0f4b6529222
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/07_Night_in_the_Swamp.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/10_The_Gate_Between_Worlds.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
    M data/campaigns/Delfadors_Memoirs/utils/characters.cfg

  Log Message:
  -----------
  DM Align teams and team names

Use 'allies' and 'enemies' consistently, throughout.

Delfador's team names are, in order: Mages, Loyalists, and Rebels. All Undead are a team; as are Bandits. Goblins, Orcs and Trolls are the Pillagers. The NPC Loyalists switch from allies to enemies, but remain Loyalists throughout.

  Commit: f86630273e1b3d0f31dcecaff149e28bf5696f14
      https://github.com/wesnoth/wesnoth/commit/f86630273e1b3d0f31dcecaff149e28bf5696f14
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg

  Log Message:
  -----------
  DM Debug/Next_Level fix

Split off a victory event which ensures needful things happen on debug next_level.

  Commit: 39da9c8f9a9c8ce2c5e05db95f33f139f7591bcc
      https://github.com/wesnoth/wesnoth/commit/39da9c8f9a9c8ce2c5e05db95f33f139f7591bcc
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg

  Log Message:
  -----------
  DM Fix bug: Subsumed sides cannot move

In S13 we subsume the Loyalists and Mages.

In S19 we subsume Lionel and his troops.

These occur in the midst of battle. The units may be damaged, poisoned, etc. We do not want to change that.

However, since their turn follows ours, they cannot move. Reset their moves to maximum so we can use them (or move them out of harm's way) immediately.

  Commit: 09e7006b1d0bc90765d4896953e97b5f40151d13
      https://github.com/wesnoth/wesnoth/commit/09e7006b1d0bc90765d4896953e97b5f40151d13
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S12 Fix bug: second wave

If the undead have not been spotted, Delfador does not know they're there, so cannot know about the second wave.

  Commit: 2d2ac10ba5e0f4a72b702c1f7b1f9f24c4a68c7b
      https://github.com/wesnoth/wesnoth/commit/2d2ac10ba5e0f4a72b702c1f7b1f9f24c4a68c7b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg

  Log Message:
  -----------
  DM S03 Fix bug: Include advancements

  Commit: c38b5da9dcf920f8cc724eb33c18c31e4ab00dcc
      https://github.com/wesnoth/wesnoth/commit/c38b5da9dcf920f8cc724eb33c18c31e4ab00dcc
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg

  Log Message:
  -----------
  DM S04 Fix bug: Best bowman

Recall the best bowman. If we don't have any, recruit them. S03 ensured we had at least one.

  Commit: ab0c6e53353f4ca587e2545761136b645f3ed92a
      https://github.com/wesnoth/wesnoth/commit/ab0c6e53353f4ca587e2545761136b645f3ed92a
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg

  Log Message:
  -----------
  DM S04 Fix bug: No defeat

Defeat when Leollyn dies, even if he advances.

  Commit: dbcd2e948d485cb1c526a8ed24e1fa38d6299cac
      https://github.com/wesnoth/wesnoth/commit/dbcd2e948d485cb1c526a8ed24e1fa38d6299cac
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg

  Log Message:
  -----------
  DM S04 Fix bug: Include advancements

The comments about Orcish Assassins apply to their advancements, as well.

  Commit: bf24d087ce1baf58d74795f5e9ee813ec1f92be5
      https://github.com/wesnoth/wesnoth/commit/bf24d087ce1baf58d74795f5e9ee813ec1f92be5
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg

  Log Message:
  -----------
  DM S04 Fix bug: Delfador was the victim

If Deflador is killed by an assassin, he can't speak the line.

There was a TODO here about not liking the conversation. The only real problem was that Leollyn said "I told you .." when he hadn't and that only one friend had died, not several.

  Commit: 68f7c0ec48d53d85290aa1ff4900d82414d84e8a
      https://github.com/wesnoth/wesnoth/commit/68f7c0ec48d53d85290aa1ff4900d82414d84e8a
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg

  Log Message:
  -----------
  DM S04 Fix bug: No scenario-start saved

This means players must re-play the end of S04 if they wany to review the dialog in S05. Allowing the save made the event dead code; removed it all.

  Commit: f7ac9c62515a04f7b460a6b785df539f29bbc956
      https://github.com/wesnoth/wesnoth/commit/f7ac9c62515a04f7b460a6b785df539f29bbc956
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg

  Log Message:
  -----------
  DM S05 Needlessly delayed

  Commit: 906cb3b3a401a5e4f95dc134f99ceecc49818850
      https://github.com/wesnoth/wesnoth/commit/906cb3b3a401a5e4f95dc134f99ceecc49818850
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg

  Log Message:
  -----------
  DM S06 Improve chest

Leave an open chest behind so the player knows they opened it already.

  Commit: df785a453522ae27e5ec00b390d10a8d67126de0
      https://github.com/wesnoth/wesnoth/commit/df785a453522ae27e5ec00b390d10a8d67126de0
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/07_Night_in_the_Swamp.cfg

  Log Message:
  -----------
  DM S07 Fix bug: Include advancements

The hint about heavy infantry should appear on advancements as well.

  Commit: 2e84f59f76db17748836b8e230584d686fa655cd
      https://github.com/wesnoth/wesnoth/commit/2e84f59f76db17748836b8e230584d686fa655cd
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg

  Log Message:
  -----------
  DM S11 Fix bug: Orc dies first

In the all-but-impossible case the orc leader dies before Delfador finds Chantal, wait until he finds her for victory.

  Commit: e0125ea121d457ad034e4f89eaf7876959497006
      https://github.com/wesnoth/wesnoth/commit/e0125ea121d457ad034e4f89eaf7876959497006
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg

  Log Message:
  -----------
  DM S11 Fix bug: Chantal can move

Use a sighted event so Chantal speaks when first sighted, and since she can move from her citadel. Clear a bit of shroud around her.

  Commit: 984cf52d725e01fb0d22029adba7ab6dc8e85673
      https://github.com/wesnoth/wesnoth/commit/984cf52d725e01fb0d22029adba7ab6dc8e85673
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg

  Log Message:
  -----------
  DM S11 Hide sides

No sense giving away that Chantal and the Orcs are here. Wait until Delfador learns of them to expose their sides.

  Commit: a14d25eba974a754edd7570071e228cb21451c71
      https://github.com/wesnoth/wesnoth/commit/a14d25eba974a754edd7570071e228cb21451c71
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg

  Log Message:
  -----------
  DM Fix bug: Grammar

  Commit: 7337e963f31488cca87f7fc2b898b40bfe886496
      https://github.com/wesnoth/wesnoth/commit/7337e963f31488cca87f7fc2b898b40bfe886496
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg

  Log Message:
  -----------
  DM Fix bug: No save

Don't make the player re-play a scenario simply to read a cut-screne they skipped.

  Commit: 8c2f8b0a76134dbaa9e4cb0d6fc1df5df88d7f0f
      https://github.com/wesnoth/wesnoth/commit/8c2f8b0a76134dbaa9e4cb0d6fc1df5df88d7f0f
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S12 Fix bug: Warning radius

Using radius is not as clear-cut as people think.

  Commit: c21166cd2f69c52bd09731b2fd03fc912a09874a
      https://github.com/wesnoth/wesnoth/commit/c21166cd2f69c52bd09731b2fd03fc912a09874a
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

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

  Log Message:
  -----------
  DM S12 Workaround: Primary unit unstable

[fire_event] should use [primary_unit] and [secondary_unit] from the call site unless specifically overridden. Since it fails to do so we have to re-set them explicitly.

  Commit: 53758e011890badb76af1781b399f3348297d239
      https://github.com/wesnoth/wesnoth/commit/53758e011890badb76af1781b399f3348297d239
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M data/campaigns/Delfadors_Memoirs/_main.cfg
    M data/campaigns/Delfadors_Memoirs/maps/10_The_Gate_Between_Worlds.map
    M data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/07_Night_in_the_Swamp.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/10_The_Gate_Between_Worlds.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
    R data/campaigns/Delfadors_Memoirs/terrain-graphics/_final.cfg
    R data/campaigns/Delfadors_Memoirs/terrain.cfg
    M data/campaigns/Delfadors_Memoirs/utils/characters.cfg
    M data/campaigns/Delfadors_Memoirs/utils/deaths.cfg
    M data/campaigns/Delfadors_Memoirs/utils/generators.cfg
    M data/campaigns/Delfadors_Memoirs/utils/misc.cfg
    M data/campaigns/Delfadors_Memoirs/utils/sides.cfg

  Log Message:
  -----------
  Merge pull request #701 from GregoryLundberg/GL_DM_final

Delfador's Memoirs fixes

Compare: https://github.com/wesnoth/wesnoth/compare/fef404fdb912...53758e011890