[Commits] [wesnoth/wesnoth] efe181: TSG Remove macro artifacts

GitHub noreply at github.com
Fri Sep 2 18:55:33 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: efe1812a73c2023920c617f45696de1bf549da10
      https://github.com/wesnoth/wesnoth/commit/efe1812a73c2023920c617f45696de1bf549da10
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg

  Log Message:
  -----------
  TSG Remove macro artifacts


  Commit: 691de88d0c2fc4ff3acd751836dca398811fd6f9
      https://github.com/wesnoth/wesnoth/commit/691de88d0c2fc4ff3acd751836dca398811fd6f9
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg

  Log Message:
  -----------
  TSG [else][if] should be [elseif]


  Commit: a0af7e035e95e469c1955efc776b3ef76ae0b6cc
      https://github.com/wesnoth/wesnoth/commit/a0af7e035e95e469c1955efc776b3ef76ae0b6cc
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg

  Log Message:
  -----------
  TSG [then] cannot be empty

Cute attempt to get around [if] must have [then]


  Commit: 84e462e1efa4c414a10fa71518e6e10571f6c9f4
      https://github.com/wesnoth/wesnoth/commit/84e462e1efa4c414a10fa71518e6e10571f6c9f4
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
    M data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg
    M data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg

  Log Message:
  -----------
  TSG Remove variable artifacts


  Commit: c1f77f34d7807057e4c53f43094595c23ffd6b1c
      https://github.com/wesnoth/wesnoth/commit/c1f77f34d7807057e4c53f43094595c23ffd6b1c
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg

  Log Message:
  -----------
  TSG S01 Fix bug: Anyone to fort

Any unit can move to the River Fort and trigger the apperance of Sir Gerrick. Change Moreth's comment to indicate this.


  Commit: a9041151dc68fb4f16f6a68653177857539e1b50
      https://github.com/wesnoth/wesnoth/commit/a9041151dc68fb4f16f6a68653177857539e1b50
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg

  Log Message:
  -----------
  TSG S01 Fix bug: Show target first

Scroll to the camp and show the target before referring to it.


  Commit: 439ec667e709b1d16a57ab3723b4b14d907306d8
      https://github.com/wesnoth/wesnoth/commit/439ec667e709b1d16a57ab3723b4b14d907306d8
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg

  Log Message:
  -----------
  TSG S01 Fix bug: Only Deoran can recruit

The EASY hints on recruiting should only appear once Deoran moves to the camp; not when any unit does.


  Commit: be440df638a9953e58847f4f35a429a218d1ebf1
      https://github.com/wesnoth/wesnoth/commit/be440df638a9953e58847f4f35a429a218d1ebf1
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg

  Log Message:
  -----------
  TSG S01 Fix bug: Remove target before talking

When Deoran moves to the camp, the EASY hints about recruitment should clean up the target before talking. It just looks better.


  Commit: 222d9ec0d1c33323ec479ff5e99e069ee647a549
      https://github.com/wesnoth/wesnoth/commit/222d9ec0d1c33323ec479ff5e99e069ee647a549
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg

  Log Message:
  -----------
  TSG S01 Fix bug: We came from Weldyn

Sir Gerrick knows King Haldric sent us (from Weldyn) so why is he asking if we came from Westin? Let's be more generic.


  Commit: c3c622447e247331bde69e1981816b562e1b818e
      https://github.com/wesnoth/wesnoth/commit/c3c622447e247331bde69e1981816b562e1b818e
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg

  Log Message:
  -----------
  TSG S01 Fix bug: Urza Mathin may die first

In the unlikely event the player manages to kill Urza Mathin before visiting the river fort, Sir Gerrick will not appear. This is bad for the victory conversation and worse for the rest of the campaign.

I thought long and hard about how to fix this and decided to take my cue from the initial objectives which show two items. So, I made it so you have to do BOTH to win the scenario. If you kill Urza Mathin first, you still need to go find Sir Gerrick. I only needed to adjust one line to make it make sense, and it works better than simply having Sir Gerrick pop up out of nowhere.


  Commit: 623fe1e5bb056f938b7333e6b7868e837867fc63
      https://github.com/wesnoth/wesnoth/commit/623fe1e5bb056f938b7333e6b7868e837867fc63
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg

  Log Message:
  -----------
  TSG S01 Fix bug: Deoran is encamped

For EASY, when Sir Gerrick appears, a hint appears telling Deoran to return to camp and recruit. But, it's possible Deoran is already at the camp. So, rather than make the player step off and back on, simply do the recruitment hinting right away. It just flows better.


  Commit: 64843c07f2c54f78c1cbad8b8e19d351bd86b811
      https://github.com/wesnoth/wesnoth/commit/64843c07f2c54f78c1cbad8b8e19d351bd86b811
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg

  Log Message:
  -----------
  TSG S01 Capture village

On EASY a new village appears. If it had been there all along, the bandits would own it. Capture it for consistency.


  Commit: b84ae1a620295ecbb5ed24fc11e749af62aa53a6
      https://github.com/wesnoth/wesnoth/commit/b84ae1a620295ecbb5ed24fc11e749af62aa53a6
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

  Log Message:
  -----------
  TSG S02 Fix bug: Warning is a turn late

Turns over is at turn 9, so need to warn on turn 8 for 'next turn'.


  Commit: e3430d21efe424401a14456341e58580b771a55d
      https://github.com/wesnoth/wesnoth/commit/e3430d21efe424401a14456341e58580b771a55d
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

  Log Message:
  -----------
  TSG S02 Fix bug: Anyone will do

Any unit will do to secure the citadel, not just Deoran.


  Commit: 97a3aca98b315ce7633bfb04bd52d7d602ea2c28
      https://github.com/wesnoth/wesnoth/commit/97a3aca98b315ce7633bfb04bd52d7d602ea2c28
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

  Log Message:
  -----------
  TSG S02 Fix bug: Where is 'here'?

Show the player where 'here' is.


  Commit: 0356f95b9a700ca9244ec2d59e8e72fa7f83257f
      https://github.com/wesnoth/wesnoth/commit/0356f95b9a700ca9244ec2d59e8e72fa7f83257f
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

  Log Message:
  -----------
  TSG S02 Fix bug: No victory if no Minister Hylas

The objective is, first, to find Minister Hylas and, then, later, to kill Urza Nalmath. Handle the (unlikely) case where the player kills Urza Nalmath BEFORE going to the citadel to find Minister Hy
las.


  Commit: 38eae999c134922b1f5142598de706da140ed6ce
      https://github.com/wesnoth/wesnoth/commit/38eae999c134922b1f5142598de706da140ed6ce
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

  Log Message:
  -----------
  TSG S02 Fix bug: Consistent name

Everywhere else it's the 'Citadel of Westin'


  Commit: 6536fb89e05f7a433b83e72530a7cce2ea1c17e8
      https://github.com/wesnoth/wesnoth/commit/6536fb89e05f7a433b83e72530a7cce2ea1c17e8
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

  Log Message:
  -----------
  TSG S02 Why wait?

If we're losing, no need to wait for the AI to move.


  Commit: 065f6847fa067327430744501bfafaa010193cdb
      https://github.com/wesnoth/wesnoth/commit/065f6847fa067327430744501bfafaa010193cdb
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

  Log Message:
  -----------
  TSG S02 Impove instruction

'Occupy' is a better word than 'take'


  Commit: 9c18c815f7d48856767b6827a7f8fb6ffdddf251
      https://github.com/wesnoth/wesnoth/commit/9c18c815f7d48856767b6827a7f8fb6ffdddf251
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

  Log Message:
  -----------
  TSG S02 Adjust turns to reality

If the user only has 9 turns let's show that everywhere.


  Commit: b0f7e65073463634481dca7e000715a3f44663cb
      https://github.com/wesnoth/wesnoth/commit/b0f7e65073463634481dca7e000715a3f44663cb
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

  Log Message:
  -----------
  TSG S02 Hide implementation details

Make the bandits on side 3 appear to be on the same side as Urza Nalmath. They are on side 3 as an implementation detail so the AI will handle them separetely from his other units.


  Commit: 9814931a02dc411563fa489272c9332ca4e697c9
      https://github.com/wesnoth/wesnoth/commit/9814931a02dc411563fa489272c9332ca4e697c9
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

  Log Message:
  -----------
  TSG S02 Capture village

EASY adds a village. This detracts one of Urza Nalmeth's units. Capture it so they stay on task. If it had been there all along, he's already have it.


  Commit: 8fa8fdf4cd87ac94a0eb07954b230c7f54daaf9c
      https://github.com/wesnoth/wesnoth/commit/8fa8fdf4cd87ac94a0eb07954b230c7f54daaf9c
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg

  Log Message:
  -----------
  TSG S03 Fix bug: Use id=

Be consistent. Besides, I know the wiki says it's an alias, but speaker= has special semantics and is not really an alias.


  Commit: 29d58a2614d405169f148cc9568e3908a3c0fb0b
      https://github.com/wesnoth/wesnoth/commit/29d58a2614d405169f148cc9568e3908a3c0fb0b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg

  Log Message:
  -----------
  TSG S03 Fix bug: Use best speaker

Include all advancements, prefer the lower level units, and only search on the map.


  Commit: 2ffaaac50be29de6c61cfa3225b80a01760cf3c2
      https://github.com/wesnoth/wesnoth/commit/2ffaaac50be29de6c61cfa3225b80a01760cf3c2
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg

  Log Message:
  -----------
  TSG S04 Fix bug: Jera Ilras is team Bandits


  Commit: 1f3ee030cdebeea4b9c9d03fad9ca28676b8ba05
      https://github.com/wesnoth/wesnoth/commit/1f3ee030cdebeea4b9c9d03fad9ca28676b8ba05
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg

  Log Message:
  -----------
  TSG S04 Fix bug: Separate undead comments

Deoran and Ethiliel's comments should apply when there are undead remaining. This is separate to a general command about arrows (pierce attacks) not working on skeletons.


  Commit: 403f70d9549081b5e668ff9f070d939bf0c8a89d
      https://github.com/wesnoth/wesnoth/commit/403f70d9549081b5e668ff9f070d939bf0c8a89d
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg

  Log Message:
  -----------
  TSG S04 Fix bug: No bodyguards for hero deaths

We're about to lose anyway. No need for the bodyguards to appear.


  Commit: dae4df3befc8273332bba058242d0f1e5ace527b
      https://github.com/wesnoth/wesnoth/commit/dae4df3befc8273332bba058242d0f1e5ace527b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg

  Log Message:
  -----------
  TSG S04 Fix bug: No bodyguards AT ALL!!!

Bad loop logic. Tested with Ethiliel in the middle of the lake and .. oopsie!


  Commit: 316c0dbb4b458481576fdcb2b855a8d67845f9e1
      https://github.com/wesnoth/wesnoth/commit/316c0dbb4b458481576fdcb2b855a8d67845f9e1
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg

  Log Message:
  -----------
  TSG S04 Adjust objectives

Show the current (remaining) objectives when the player asks for them.


  Commit: 757e25b978e3eae953e0aebe0934c481f6bf5016
      https://github.com/wesnoth/wesnoth/commit/757e25b978e3eae953e0aebe0934c481f6bf5016
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg

  Log Message:
  -----------
  TSG S05 Fix bug: Don't give away the bandits

Sighting the lich should not imply sighting the bandits.


  Commit: 4c88b78af40ab0421345abb520263d5dfa7ed042
      https://github.com/wesnoth/wesnoth/commit/4c88b78af40ab0421345abb520263d5dfa7ed042
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg

  Log Message:
  -----------
  TGS S05 Fix bug: Linger on the lich

A 1/2 second flicker to the lich really doesn't show anything. Instead, scroll to it and stay there for the comment so the player can actually see the lich and study the area.


  Commit: 2322a3e3a05bfb0acc614c6bcc35dbb7fa24c820
      https://github.com/wesnoth/wesnoth/commit/2322a3e3a05bfb0acc614c6bcc35dbb7fa24c820
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg

  Log Message:
  -----------
  TSG S05 Separate finding the camp

Finding the camp does not mean you've found Urza Afalas; but it *is* a good hint to look nearby!


  Commit: 24e60e91e21ba11746540d1cfac5aa926e30a1ed
      https://github.com/wesnoth/wesnoth/commit/24e60e91e21ba11746540d1cfac5aa926e30a1ed
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg

  Log Message:
  -----------
  TSG S05 Let Urza Afala roam free!

There is no reason to stop his moving about. Separating his sighted event and finding the bandit encampment eliminated any problems with his movement. This was a todo comment for when this was fixed. Actually, I think the real problem was the inapproriate sighting of the bandits when we found the lich.


  Commit: d6d01004a7202502bd0caa58d68c310c76ae14e7
      https://github.com/wesnoth/wesnoth/commit/d6d01004a7202502bd0caa58d68c310c76ae14e7
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg

  Log Message:
  -----------
  TSG S05 Fix bug: Subsumed units can move

When Urza Afalas and his band join Deoran they should be able to move. But, since they're changing sides their movement won't have been reset, yet, so we have to do it by hand.


  Commit: 0588ee1e3b99baaccd1718b4ed73dcdab9b0d65f
      https://github.com/wesnoth/wesnoth/commit/0588ee1e3b99baaccd1718b4ed73dcdab9b0d65f
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg

  Log Message:
  -----------
  TSG S05 Hide bandit side after subsumed


  Commit: 790a6508fcf7e6a5a8430a56331bff7c4b913a40
      https://github.com/wesnoth/wesnoth/commit/790a6508fcf7e6a5a8430a56331bff7c4b913a40
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg

  Log Message:
  -----------
  TSG S05 Mer follow Sir Gerrick

This is the last point at which Deoran can recruit Mermen. Let's explain that they go with Sir Gerrick intead of into the caves with Deoran.


  Commit: 66a540c744af1da477386121498993a03cc5f750
      https://github.com/wesnoth/wesnoth/commit/66a540c744af1da477386121498993a03cc5f750
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg

  Log Message:
  -----------
  TSG S06a Fix bug: Deoran appears on the map

Simply put Deoran on the recall list to prepare for the next scenario, where he takes over as leader, again.


  Commit: 233bc3f3df67ba55ddde6f763330c06a2be38c4b
      https://github.com/wesnoth/wesnoth/commit/233bc3f3df67ba55ddde6f763330c06a2be38c4b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg

  Log Message:
  -----------
  TSG S06a Fix bug: No elf for line

Skipping the line makes the conversation suffer. Having whoever found the orge say the line actually makes it a bit funnier if they're NOT an elf.


  Commit: 7fc2ac17a4406ced0bc19450e6153731c6a1d689
      https://github.com/wesnoth/wesnoth/commit/7fc2ac17a4406ced0bc19450e6153731c6a1d689
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg

  Log Message:
  -----------
  TSG S06a Fix bug: Target zone

Clean up the shroud.


  Commit: 0247b6244f71976cfe6514b56d1b49baadcc6644
      https://github.com/wesnoth/wesnoth/commit/0247b6244f71976cfe6514b56d1b49baadcc6644
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg

  Log Message:
  -----------
  TSG S06a Fix bug: Made-up words

Use real words to make the meaning more clear.


  Commit: b46ff72fd4857428666290346b4940b51ba80064
      https://github.com/wesnoth/wesnoth/commit/b46ff72fd4857428666290346b4940b51ba80064
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg

  Log Message:
  -----------
  TSG S06a Fix bug: Sir Gerrick is a leader

He needs the correct overlays.


  Commit: f9b1ecefa5650e48bb9a46cf5862ccf27704e45b
      https://github.com/wesnoth/wesnoth/commit/f9b1ecefa5650e48bb9a46cf5862ccf27704e45b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg

  Log Message:
  -----------
  TSG S06a Fix bug: Units in poor shape

When we next see Sir Gerrick and the units he has on the map will be in S09a. While Sir Gerrick will be fine, the units will appear to be in poor shape in the recall list. Let's heal everyone, first, so we're sure everyone is in fighting shape when they return.


  Commit: fc6c5fa3ad236ed5a66cc8ba333ced9f92cff466
      https://github.com/wesnoth/wesnoth/commit/fc6c5fa3ad236ed5a66cc8ba333ced9f92cff466
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg

  Log Message:
  -----------
  TSG S06a Clean up objectives


  Commit: 3817814aae7a2b3a418cbaf35e9aa82e88723b17
      https://github.com/wesnoth/wesnoth/commit/3817814aae7a2b3a418cbaf35e9aa82e88723b17
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg

  Log Message:
  -----------
  TSG S06a Hide side

No need to give away the fact there are enemies lurking. Not that it said much .. just "enemies" but still ..


  Commit: c38378fdf98fcbb6a188ab5cc7b208d6086f80e3
      https://github.com/wesnoth/wesnoth/commit/c38378fdf98fcbb6a188ab5cc7b208d6086f80e3
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg

  Log Message:
  -----------
  TSG S06a Can recruit mermen

I never understood the purpose of mermen. All they do is change what the Naga Queen has to say. Let's let Sir Gerrick recruit them here. It's really just about the only place in the entire campaign where they actually can do some good! Why limit him to just those Deoran had?


  Commit: 101c26810e17bed89be78da212e3022fd12b6268
      https://github.com/wesnoth/wesnoth/commit/101c26810e17bed89be78da212e3022fd12b6268
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg

  Log Message:
  -----------
  TSG S07a Fix bug: No deserters

All along we've been able to recruit Peasants. Admitedly, at this late date, they're not much good, but there is no reason for them to desert us.


  Commit: c248ce97e03cfb8e170ab548f309a1323e1fbd39
      https://github.com/wesnoth/wesnoth/commit/c248ce97e03cfb8e170ab548f309a1323e1fbd39
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg

  Log Message:
  -----------
  TSG S07a Fix bug: Where is 'here'?

Show the target before speaking of it, and don't pan away.


  Commit: 64e152f29c06eedd0cd8313bdd8615601161df0b
      https://github.com/wesnoth/wesnoth/commit/64e152f29c06eedd0cd8313bdd8615601161df0b
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg

  Log Message:
  -----------
  TSG S07a Hide unused Troll side on status panel


  Commit: c4d2ee85d63a5ffc546c3c8f93ad6f3201edf315
      https://github.com/wesnoth/wesnoth/commit/c4d2ee85d63a5ffc546c3c8f93ad6f3201edf315
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg

  Log Message:
  -----------
  TSG S07b Note no turn limit

As always, I miss it if it's not noted.


  Commit: 051e27f8187c988e6804c07238a5137c95a5a4ef
      https://github.com/wesnoth/wesnoth/commit/051e27f8187c988e6804c07238a5137c95a5a4ef
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg

  Log Message:
  -----------
  TSG S07b Fix bug: Wrong overlays

Sir Gerrick is not the leader, and Urza Afalas is just a loyal follower, neither are heros any longer. Update their overlays and ellipses to reflect their new status.


  Commit: 81da109a854afd626a6d856233a7c2a192f71467
      https://github.com/wesnoth/wesnoth/commit/81da109a854afd626a6d856233a7c2a192f71467
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg

  Log Message:
  -----------
  TSG S08a Fix bug: Plynry may be dead

In fact, the entire garrison may be dead. The bandits need to get real lucky, but it could happen.

Appoint a new commander from the survivors. Skip the conversation if it was a masacre.


  Commit: 023526d24be322d7ac352516f4aae7da83216605
      https://github.com/wesnoth/wesnoth/commit/023526d24be322d7ac352516f4aae7da83216605
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg

  Log Message:
  -----------
  TSG S08b Fix bug: Hylas is no longer a hero

Change his overlay and ellipse so he's just a loyal unit.


  Commit: 20f3799b5caba3db8a84082815a25399a450152c
      https://github.com/wesnoth/wesnoth/commit/20f3799b5caba3db8a84082815a25399a450152c
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg

  Log Message:
  -----------
  TSG S08b Ministers are loyal

Let's have all the Ministers be loyal.


  Commit: 1c739341697e295bd45ceb96b9084a3e1f7d0044
      https://github.com/wesnoth/wesnoth/commit/1c739341697e295bd45ceb96b9084a3e1f7d0044
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg

  Log Message:
  -----------
  TSG S09a Fix bug: Sir Gerrick and Minister Hylas are loyal

They are no longer heroes, so need a normal ellipse and the loyal icon.


  Commit: 1368a287ef97eec18acfc4de4460fbd500242b17
      https://github.com/wesnoth/wesnoth/commit/1368a287ef97eec18acfc4de4460fbd500242b17
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg

  Log Message:
  -----------
  TSG S09a Fix bug: Warn about killing

Added a warning to the player not to kill the elves.


  Commit: 41246b155e5d91cb26e013d5bc32bef0a457b30e
      https://github.com/wesnoth/wesnoth/commit/41246b155e5d91cb26e013d5bc32bef0a457b30e
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg

  Log Message:
  -----------
  TSG S09a Note no turn limit

I never spot it unless it's noted.


  Commit: c2270e5e3162f361018429ba24f76d49940456ed
      https://github.com/wesnoth/wesnoth/commit/c2270e5e3162f361018429ba24f76d49940456ed
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg

  Log Message:
  -----------
  TSG S04 Always give bodyguard

If we get to victory without anyone dieing (very unlikely) have Ethiliel call upon her bodyguard so we always have them.


  Commit: f7d06f67c514cf2a5ebb347490b4ad4324f3fe68
      https://github.com/wesnoth/wesnoth/commit/f7d06f67c514cf2a5ebb347490b4ad4324f3fe68
  Author: Lari Nieminen <lari.nieminen at iki.fi>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
    M data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
    M data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
    M data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
    M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
    M data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg
    M data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg

  Log Message:
  -----------
  Merge pull request #703 from GregoryLundberg/GL_TSG_fixes

TSG Bug fixes


Compare: https://github.com/wesnoth/wesnoth/compare/fa89aed9e75a...f7d06f67c514


More information about the Commits mailing list