[Commits] [wesnoth/wesnoth] 550650: HttT Remove unused macro

Fri Aug 12 22:20:35 UTC 2016

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg

  Log Message:
  -----------
  HttT Remove unused macro

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg

  Log Message:
  -----------
  HttT Remove macro artifacts

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg

  Log Message:
  -----------
  HttT Remove variable artifacts

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg

  Log Message:
  -----------
  HttT [else][if] s/b [elseif]; [if] requires conditional

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg

  Log Message:
  -----------
  HttT Filters should go first

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg

  Log Message:
  -----------
  HttT S02 Fix bug: Missing objective

There actually is an alternate objective for EASY and NORMAL.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg

  Log Message:
  -----------
  HttT S02 Fix bux: Simyr inconsistent

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg

  Log Message:
  -----------
  HttT S02 Fix typo: Missing comma

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg

  Log Message:
  -----------
  HttT S04 Fix bug: Remove ford artifact on HARD

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg

  Log Message:
  -----------
  HttT S05b Fix bug: No special bonus

The (special bonus) footnote implies you get something simply for killing the leaders: you do not. Moremirmu is not a special bonus for defeating both leaders. He is simply a unit you may, or may not, find along the way.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg

  Log Message:
  -----------
  HttT S06 Fix bug: Advisor may be dead

We may not have a unit assigned to the Advisor role, or it may have died since being assigned. This effects the initial recall, and the speaker for turn 4 when the thieves appear.

Select based upon level and how long we've been able to recruit the type.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg

  Log Message:
  -----------
  HttT S06 Fix bug: Thieves' Ford wipes out a pier

No need, movement costs are the same. So let's keep the pier. It's less jarring on the eye.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg

  Log Message:
  -----------
  HttT S06 Fix bug: Adjust time area

It was missing some unimportant cave area.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg

  Log Message:
  -----------
  HttT S07 Fix bug: Units not hiding

Placing a duplicated unit causes it to drop into an adjacent hex and being missed by the object.

This only happens rarely, and almost always at the overlaped column. But it can happen anywhere. We'll just skip it and so what if we're a unit shy. Call it a very tiny, quite rare Easter Egg.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg

  Log Message:
  -----------
  HttT S07 Fix bug: Overlapped areas

This causes a statistical bump in the overlapped column. Not really a problem because doing it this way is SO 'not-random' but it increases the chance of tickling the bug causing a unit to fail to hide.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg

  Log Message:
  -----------
  HttT S08 Fix bug: Advisor may be dead

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg

  Log Message:
  -----------
  HttT S08 Fix bug: Objective footnote

The note about Li'sar's hit points is a footnote, not the objective.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg

  Log Message:
  -----------
  HttT S10 Fix bug: Does not meet objectives

The objective is to defeat THE enemy leader, Robryn. As a bonus, if Konrad kills the Mother Gryphon, he gets Gryphon eggs; but that is a bonus objective, not a victory objective.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg

  Log Message:
  -----------
  HttT S11 Fix bugs: No reinforcements

moveto: there is no second unit to filter on
x,y ranges: use dash, not comma

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg

  Log Message:
  -----------
  HttT S11 Fix bug: Does not meet objectives

Even if you do kill Li'sar and Gaga-Breuk, you still have to make it to the far shore, as stated. That means you still have to make it past the Sea Monsters. Hope you were in the water when they appeared, or you're not gonna make it!

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg

  Log Message:
  -----------
  HttT S12 Fix bug: Divide by zero

An off-by-one on the turn calculations. Turns left should include current turn; else divides by zero on the last turn. To reproduce you MUST step through every turn! Simply jumping to the last turn or two will not tickle the bug.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg

  Log Message:
  -----------
  HttT S12 Fix bug: No human to complain

Choose lowest-level human, preferring those who have been with us the shortest time. In none can be found, recruit a Thief. This ensures Kalenz has several humans around for his pointed comment.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg

  Log Message:
  -----------
  HttT S13 Fix bug: No rider

If Haldiel was recalled, select him. Otherwise, select the highest-level rider and recall him. If none exist, recruit a Horseman for the role.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg

  Log Message:
  -----------
  HttT S17 Fix bug: Hide sides

Hide the sides which were removed.

Also, doesn't it bother you when a comment is just wrong like that?

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg

  Log Message:
  -----------
  HttT S17 Fix bug: Castles not removed

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg

  Log Message:
  -----------
  HttT S17 Fix bug: Unusable castle hex

Moved the player's chamber up 3 hex to try to avoid having unusable slots for recruit/recall.

Can't ever be sure but, testing, where before I only needed 3 or 4 restarts to get a bad castle, now I still have not seen one after 20.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg

  Log Message:
  -----------
  HttT S19b Fix bug: Objectives wrong

Early completion bonus for all victory, not just if you defeat all four Death Knights before killing the Lich.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg

  Log Message:
  -----------
  HttT S19c Fix bug: Wrong objectives

If you found the waterfall before finding the sergeant it switched back to telling you to find the waterfall. Needs if'ing logic, DUH!

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg

  Log Message:
  -----------
  HttT S19c Fix bug: Merman advisor may be dead

If needed, select an alternate from those on the map; otherwise just skip the line.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg

  Log Message:
  -----------
  HttT S19c Fix bug: Clear fog

Clear the fog around the sergeant. Also improve the detection range, and keep the camera on him for a while.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg

  Log Message:
  -----------
  HttT S20a Fix bug: El'rien might be dead

In fact, all his men might be, too. Add dialog to handle this.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg

  Log Message:
  -----------
  HttT S20b Fix bug: Victory zone

Precisely defined, now, as any land outside the cavern; including the fungus, but not the water. Applies to the area the AI should avoid, as well.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg

  Log Message:
  -----------
  HttT S20b Fix bug: Bona-Melodia may be dead

The ending was too abrupt, especially if Bona-Melodia died.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg

  Log Message:
  -----------
  HttT S20b Fix bug: Unused side

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg

  Log Message:
  -----------
  HttT S22 Fix bug: Malatus dies first

Just switch the roles and do the comic bit anyway.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg

  Log Message:
  -----------
  HttT S24 Fix bug: Missing journey map

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg

  Log Message:
  -----------
  HttT S25 Fix bug: Comment wrong

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
    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
    M data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg

  Log Message:
  -----------
  HttT Fix typo: Sceptre vs scepter

Change all "scepter" to "sceptre" except for Dark Queen's scepter.

The definite article Sceptre of Fire and all variables related to it use sceptre spelling.

General articles, such as the Dark Queen's scepter and attack, use scepter spelling.

Note some file names do not follow this rule and remain unchanged.

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

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg
    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
    M data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg

  Log Message:
  -----------
  Merge pull request #729 from GregoryLundberg/GL_HttT_errors

HttT Errors

Compare: https://github.com/wesnoth/wesnoth/compare/312a77c075e7...12f710704765