[Commits] [wesnoth/wesnoth] 819909: AToTB Remove variable artifacts

Fri Aug 19 23:44:15 UTC 2016

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 8199098d74bb1589ee4b898062e6bed68716d043
      https://github.com/wesnoth/wesnoth/commit/8199098d74bb1589ee4b898062e6bed68716d043
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

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

  Log Message:
  -----------
  AToTB Remove variable artifacts

  Commit: 21320f7c1cd27bc0895bbc6f32ac7f36db5c7ce7
      https://github.com/wesnoth/wesnoth/commit/21320f7c1cd27bc0895bbc6f32ac7f36db5c7ce7
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
    M data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg

  Log Message:
  -----------
  AToTB Standardize on EASY

Use consistent #ifdef tests. Standardize on EASY, the other difficulty is simply 'not EASY'.

  Commit: 955b8477d2d554c6b06a701d54cb5c2016d5fde3
      https://github.com/wesnoth/wesnoth/commit/955b8477d2d554c6b06a701d54cb5c2016d5fde3
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
    M data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg
    M data/campaigns/Two_Brothers/utils/characters.cfg

  Log Message:
  -----------
  AToTB Standardize Arvith's last breath

Use a consistent message instead of sometimes 'all' and sometimes 'everything'. Do it with a macro.

  Commit: f351f35703669e919f9f37b20e855015926b529c
      https://github.com/wesnoth/wesnoth/commit/f351f35703669e919f9f37b20e855015926b529c
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
    M data/campaigns/Two_Brothers/utils/characters.cfg

  Log Message:
  -----------
  AToTB Standardize Baran

Use a macro to ensure consistent definition.

  Commit: b9a18aee48a4fdeb575e4de8547268688c59c9f8
      https://github.com/wesnoth/wesnoth/commit/b9a18aee48a4fdeb575e4de8547268688c59c9f8
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
    M data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg
    M data/campaigns/Two_Brothers/utils/characters.cfg

  Log Message:
  -----------
  AToTB Standardize Baran's last breath

Technically, it is impossible for Baran to die in S03, but handle it anyway, just in case, for story purposes.

  Commit: 423f082ebcc696130fdb1602fc85b048ab99a0d2
      https://github.com/wesnoth/wesnoth/commit/423f082ebcc696130fdb1602fc85b048ab99a0d2
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

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

  Log Message:
  -----------
  AToTB S01 Fix bug: Missing advancements

The comments should still apply when the target has advanced.

  Commit: 27bda635e75a10f2fc521a9605026e7e1b61a5f6
      https://github.com/wesnoth/wesnoth/commit/27bda635e75a10f2fc521a9605026e7e1b61a5f6
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

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

  Log Message:
  -----------
  AToTB S01 Fix bug: No unit for role

Include all possible advancements, but exclude Arvith, and recruit a replacement if no unit found.

  Commit: fbedc205b0ac7316f27845198fb866e7e7cfd56d
      https://github.com/wesnoth/wesnoth/commit/fbedc205b0ac7316f27845198fb866e7e7cfd56d
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
    M data/campaigns/Two_Brothers/utils/characters.cfg

  Log Message:
  -----------
  AToTB S01 Fix bug: Mercenary may be dead

The role was assigned too soon, and did not provide for advancements. If none can be found, recruit a Horseman to speak the line.

  Commit: 7a3d2e37f7075c5beb2496a7946ad7220b22123c
      https://github.com/wesnoth/wesnoth/commit/7a3d2e37f7075c5beb2496a7946ad7220b22123c
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

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

  Log Message:
  -----------
  AToTB S02 Fix bug: Inconsitent objectives

If you find the kidnappers the objective changes to killing them; but if you then kill Nil-Galion, the objective changes back to finding the kidnappers.

Clean up the mess.

  Commit: 33c2e1037bad31a91ab12009ff2deb5ee39c6715
      https://github.com/wesnoth/wesnoth/commit/33c2e1037bad31a91ab12009ff2deb5ee39c6715
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

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

  Log Message:
  -----------
  AToTB S02 Fix bug: Speaker may be dead

This is basically the Mercenary from S01, so let's use him, instead. If he's died by the closing scene, recruit a replacement.

  Commit: 75986550adeb0be71ccf8972207977575239813b
      https://github.com/wesnoth/wesnoth/commit/75986550adeb0be71ccf8972207977575239813b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

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

  Log Message:
  -----------
  AToTB S02 Fix bug: Missing units

Recruiting the revenants fails because the location is invalid.

  Commit: 6c33ecbd9415c5149d5ec2a0793503c928700f9e
      https://github.com/wesnoth/wesnoth/commit/6c33ecbd9415c5149d5ec2a0793503c928700f9e
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg

  Log Message:
  -----------
  AToTB S03 Fix bug: Delay guards

Use correct variable name.

  Commit: a82e55660787aafedeec2384294d0c1a7347d292
      https://github.com/wesnoth/wesnoth/commit/a82e55660787aafedeec2384294d0c1a7347d292
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg

  Log Message:
  -----------
  AToTB S03 Fix bug: Capture villages

The guards are distracted by the villages. They should be owned by their side, anyway.

  Commit: 77e714e4edefa670c2755b6c2b9e879090275e80
      https://github.com/wesnoth/wesnoth/commit/77e714e4edefa670c2755b6c2b9e879090275e80
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg

  Log Message:
  -----------
  AToTB S03 Fix bug: Rotharik may be dead

No returning from the dead just to speak a line.

  Commit: d45f17425954eb0c9aa8ec0ddf7296e4069ab869
      https://github.com/wesnoth/wesnoth/commit/d45f17425954eb0c9aa8ec0ddf7296e4069ab869
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg

  Log Message:
  -----------
  AToTB S03 Fix bug: Inconsistent objectives

The objectives and conversation presume the player will first find Baran, then kill Rotharik for the key, and finally release Baran from the cell.

If the player kills Rotharik first, the objectives jump around and the conversation makes no sense.

Let's fix the mess.

While we're at it, instead of always extending 6 turns, let's just ensure there are at least 6 turns left if all Arvith need do is run over to Baran's cage.

  Commit: 80afcee8db9758b9e84fa2ad41be1e8820e0d5e4
      https://github.com/wesnoth/wesnoth/commit/80afcee8db9758b9e84fa2ad41be1e8820e0d5e4
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

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

  Log Message:
  -----------
  AToTB S02 Capture new villages

For EASY, four villages are added to the map. Capture those villages which would have been in range if they were originally on the map.

  Commit: bb21a7ae2ba9a714d2b52f5c03e1ea2d0ae99071
      https://github.com/wesnoth/wesnoth/commit/bb21a7ae2ba9a714d2b52f5c03e1ea2d0ae99071
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

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

  Log Message:
  -----------
  AToTB S02 Wait to kill Brena

Let Brena hang around until he's paid the gold. While we're at it, no need to delete units which are not there!

  Commit: 5a9a394d9570bf9a8397f80197651c2fc44f2707
      https://github.com/wesnoth/wesnoth/commit/5a9a394d9570bf9a8397f80197651c2fc44f2707
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

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

  Log Message:
  -----------
  AToTB S02 Agressive kidnappers

This combines two changes.

First, it uses the sighted event instead of a moveto tripwire to find the kidnappers.

Second, instead of passively waiting for a target to come into range, the kidnappers behave as more normal AI, but ignoring keeps and devalueing villages.

This is done by moving the kidnappers to their own side, which remains hidden until they are discovered.

  Commit: 9696307a09e32b167f983657083831acb0d1bc6b
      https://github.com/wesnoth/wesnoth/commit/9696307a09e32b167f983657083831acb0d1bc6b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg

  Log Message:
  -----------
  AToTB S03 Improve shroud

Precisely define the shroud removed upon correctly giving the first password.

  Commit: 8b984cfa6bcd7b4a965c936ead948a52d9165504
      https://github.com/wesnoth/wesnoth/commit/8b984cfa6bcd7b4a965c936ead948a52d9165504
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg

  Log Message:
  -----------
  AToTB S03 Logical guards

The second wave of guards should react according to the situation. That means, when they arrive, if Arvith is still fighting the first wave, they should join the fight rather than ask for the password.

  Commit: 8fc3e3100f47c0bb0d6fb4f751242979f090985f
      https://github.com/wesnoth/wesnoth/commit/8fc3e3100f47c0bb0d6fb4f751242979f090985f
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
    M data/campaigns/Two_Brothers/utils/characters.cfg

  Log Message:
  -----------
  AToTB Get choose_level working

  Commit: 4dbf5b026341bb7b74fa6dd8eafde6f3d2952aee
      https://github.com/wesnoth/wesnoth/commit/4dbf5b026341bb7b74fa6dd8eafde6f3d2952aee
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
    M data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
    M data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg
    M data/campaigns/Two_Brothers/utils/characters.cfg

  Log Message:
  -----------
  Merge pull request #700 from GregoryLundberg/GL_AToTB_final

A Tale of Two Brothers fixes

Compare: https://github.com/wesnoth/wesnoth/compare/da561512a451...4dbf5b026341