[Commits] [wesnoth/wesnoth] 397880: THoT Remove variable artifacts

Tue Oct 11 19:40:44 UTC 2016

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg

  Log Message:
  -----------
  THoT Remove variable artifacts

  Commit: 5674af58be1145ca39799dbd9041741c57a64820
      https://github.com/wesnoth/wesnoth/commit/5674af58be1145ca39799dbd9041741c57a64820
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg

  Log Message:
  -----------
  THoT S02 Angarthing joins Aiglondur

Move the change to side 1 a bit earlier so we can see he's changed sides. Have him walk over to join Aiglondur to draw the player's eye to the change.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg

  Log Message:
  -----------
  THoT S03 Marth-Tak cannot be dead

His death is a defeat condition. No need to check he's alive.

  Commit: 31da3d2aff93148c9766818dfdc5a395d4e17ac3
      https://github.com/wesnoth/wesnoth/commit/31da3d2aff93148c9766818dfdc5a395d4e17ac3
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg

  Log Message:
  -----------
  THoT S04 No pile of gold

So tempting. ME WANT! But it's at the end of the scenario so no way to get it.

  Commit: 58cf481945afddade4ebb5c90195d546e38e7675
      https://github.com/wesnoth/wesnoth/commit/58cf481945afddade4ebb5c90195d546e38e7675
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/lua/spawns.lua

  Log Message:
  -----------
  THoT S05 Fix bug: Deprecated Lua function

Correct campaign Lua script for:

    warning scripting/lua: wesnoth.put_unit(x, y, unit) is deprecated. Use wesnoth.put_unit(unit, x, y) instead

  Commit: 90b2c79861e26ae644c883c68027284c2c4e84c5
      https://github.com/wesnoth/wesnoth/commit/90b2c79861e26ae644c883c68027284c2c4e84c5
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg

  Log Message:
  -----------
  THoT S05 Fix bug: Variable artifacts

Separate commit because this is a logic change. Use the previous owner (owner_side) to determine if the village should spawn indigenous units. This removes a large number of variable artifacts.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg

  Log Message:
  -----------
  THoT S05 Fix bug: No unit for role

The conversation works best if there is a unit for the scout role. Also, added advancements, just in case.

  Commit: 3300dd3a7ac49aa4e3b1828b7210af21f0418236
      https://github.com/wesnoth/wesnoth/commit/3300dd3a7ac49aa4e3b1828b7210af21f0418236
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/lua/spawns.lua

  Log Message:
  -----------
  THoT S05 Fix bug: Lua error

If there is no place to put the spawn, skip spawning any more units rather than throw a Lua error.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/lua/spawns.lua
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg

  Log Message:
  -----------
  THoT S05 Fix bug: Too chatty

No need to comment on every spawn. Only comment on the first time side captures a village which spawns.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg

  Log Message:
  -----------
  THoT S06 Fix bug: Missing objective

Ratheln's death is a defeat condition. Add it to the objectives and display them so the player knows.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg

  Log Message:
  -----------
  THoT S06 Fix bug: No Ratheln

It was possible to bypass Ratheln. Use enter_hex to stop the triggering unit, and extend the tripwire to the full height of the map. No need to check Ratheln is not there since this is a one-shot which creates him.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg

  Log Message:
  -----------
  THoT S06 Clean up target shroud

Use Poor Man's Radius to show just the target.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg

  Log Message:
  -----------
  THoT S07 Fix bug: Units do not appear

They're given but we don't see them because they went to the recall list. They should appear on the map.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg

  Log Message:
  -----------
  THoT S07 Fix bug: Units too late

They should appear when given, not a little while later.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg

  Log Message:
  -----------
  THoT S07 Mages are loyal

They're given freely, not recruited. They should be loyal.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg

  Log Message:
  -----------
  THoT S07 Fix bug: Ratheln is a defeat condition

Ratheln must remain a Hero thoughout this scenario since, if he dies, the end sequence suffers terribly. On EASY, for later scenario, he is no longer a Hero; simply Loyal.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg

  Log Message:
  -----------
  THoT S07 Ratheln leaves earlier

Have him leave immediately, rather than after more comments.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
    M data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg

  Log Message:
  -----------
  THoT Fix bug: Disallow Mage immediately

When you lose the last Mage from Master Perrin’s academy, you lose the ability to recruit Mages immediately instead of at the start of the next scenario.

Also, the check was omitted from S11.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg

  Log Message:
  -----------
  THoT S08 Fix bug: Villages don't just appear

Place the burned villages before the player has a chance to see them magically appear!

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg

  Log Message:
  -----------
  THoT S08 Fix bug: No Ollin

The scene makes no sense at all if you don't capture a village. So, if you sight the Masked Dwarves before you find Ollin, have him appear and run the conversation!

  Commit: 65405a6e00ddcb36cb8baa12d3a0ed9e0a2cddbf
      https://github.com/wesnoth/wesnoth/commit/65405a6e00ddcb36cb8baa12d3a0ed9e0a2cddbf
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg

  Log Message:
  -----------
  THoT S09 Fix bug: There can be only one

Only the last [avoid] for [ai] has any effect. Roll them all together.

YUCK!

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg

  Log Message:
  -----------
  THoT S09 Find the staff

Make a comment about the staff so it does not simply appear.

  Commit: 743943c993ad171bdabdeb21a270b191ed3fd6eb
      https://github.com/wesnoth/wesnoth/commit/743943c993ad171bdabdeb21a270b191ed3fd6eb
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg

  Log Message:
  -----------
  THoT S09 Use type_tree

No longer any need to list all the advancements.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg

  Log Message:
  -----------
  THoT S10 Be more specific

OK, so who is the West Gate commander? Ah. Dulcatulos, I see ...

  Commit: 5379783c7b4b93146c8855e26562a46460a5c424
      https://github.com/wesnoth/wesnoth/commit/5379783c7b4b93146c8855e26562a46460a5c424
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg

  Log Message:
  -----------
  THoT S10 Where is the West Gate

The East Gate had a label. Let's do one here, as well.

  Commit: 29934ea2af5f8a881538929e158f558e45638321
      https://github.com/wesnoth/wesnoth/commit/29934ea2af5f8a881538929e158f558e45638321
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg

  Log Message:
  -----------
  THoT S11 Fix bug: Karrag does not change

The standing animation prevented the new unit type from appearing on the map. Once it showed, scrolling made it less noticable; so pre-scroll to Karrag and hold there for a while. Also, switching back failed to show immediately due to a missing redraw.

  Commit: 28adedf49902f67bbb290aaa9f3991f046c7fd5d
      https://github.com/wesnoth/wesnoth/commit/28adedf49902f67bbb290aaa9f3991f046c7fd5d
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/13_Epilogue.cfg

  Log Message:
  -----------
  THoT S13 Fix bug: Visual artifacts

Remove items which do not fade to black properly.

  Commit: 31bd5fcb1ff5d6d5d1a61aa78094f035731c4251
      https://github.com/wesnoth/wesnoth/commit/31bd5fcb1ff5d6d5d1a61aa78094f035731c4251
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg

  Log Message:
  -----------
  THoT S12 Note no turn limit

As always, I miss it if it's not in the objectives.

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
    M data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg

  Log Message:
  -----------
  THoT S12 Fix bug: Masked Dwarf names

All masked dwarves should be named "Masked Dwarf"

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

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg

  Log Message:
  -----------
  THoT S07 Name the journeymen

Make it more clear who you must have with you to be able to recruit mages.

  Commit: b1fb517614a2e96578a4c757e64696d7b9aea1c2
      https://github.com/wesnoth/wesnoth/commit/b1fb517614a2e96578a4c757e64696d7b9aea1c2
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M data/campaigns/The_Hammer_of_Thursagan/lua/spawns.lua
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/13_Epilogue.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg
    M data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg

  Log Message:
  -----------
  Merge pull request #799 from GregoryLundberg/GL_THoT

The Hammer of Thursagan (THoT) Corrections

Compare: https://github.com/wesnoth/wesnoth/compare/7834b25b5779...b1fb517614a2