[wesnoth-commits] [wesnoth/wesnoth] 649715: DiD S10: use self dacaying object

Mon Aug 27 02:02:13 UTC 2018

  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 649715611c6fb0b0c8736cbb272c0133b9c73e12
      https://github.com/wesnoth/wesnoth/commit/649715611c6fb0b0c8736cbb272c0133b9c73e12
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg

  Log Message:
  -----------
  DiD S10: use self dacaying object

use one event with an object instead of two events

[ci skip]

  Commit: 9e286dbb53d6fbf5f250e4b2dff8667db21b9a53
      https://github.com/wesnoth/wesnoth/commit/9e286dbb53d6fbf5f250e4b2dff8667db21b9a53
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg

  Log Message:
  -----------
  NR S02a: restrict movement by costs instead moves

because it is not obvious shown in the sidebar

[ci skip]

  Commit: 5fb9a65be7938e4391560a7d555c49fc3d270176
      https://github.com/wesnoth/wesnoth/commit/5fb9a65be7938e4391560a7d555c49fc3d270176
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  DiD utils: use 1.13 syntax

It's now possible to have this logic as part of [role]

[ci skip]

  Commit: f1dc61481b7435e4027ff86358e3d66fd6117491
      https://github.com/wesnoth/wesnoth/commit/f1dc61481b7435e4027ff86358e3d66fd6117491
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG: S8b don't show the objectives when the mages arrive again

This is one of the few cases where it is not only a refactoring, but has
an actual advanatge to use [show_if] - the note can be removed from the
objectives witout showing them to the player.

[ci skip]

  Commit: 4ff9da55bd14ede938716ae6499899f16ccd417b
      https://github.com/wesnoth/wesnoth/commit/4ff9da55bd14ede938716ae6499899f16ccd417b
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S3: Don't kill the elves at the end

This is a relict from when they had not their own side, and needed to be killed
to not be added to the recall list.

[ci skip]

  Commit: 3f0677e404da76117db741f64c41c8bc9d1c3a5e
      https://github.com/wesnoth/wesnoth/commit/3f0677e404da76117db741f64c41c8bc9d1c3a5e
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S3: change side switch procedure for Ethiliel

Ethiliel remains on side 3, but a copy of her is added to the player's recall
list for next scenario. The loyal trait is obtained at that point.

[ci skip]

  Commit: fce4088fea0a4f8beeb1993f7f88944be70e3d53
      https://github.com/wesnoth/wesnoth/commit/fce4088fea0a4f8beeb1993f7f88944be70e3d53
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S3: support debug mode :n and :cl

[ci skip]

  Commit: 8488218053c68f5649fc40068c8ec140d870c8e7
      https://github.com/wesnoth/wesnoth/commit/8488218053c68f5649fc40068c8ec140d870c8e7
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S2: avoid the possibility of the AI neutralizing villages...

...which it neither burns or captures.
The AI has two sides which are presented as one to the player. It's not the best
approach, because it is possible that the player realizes it looking at the side
informations, e.g. how many units the enemy side has listed there.

This commit unifies both sides, while still keeping the units from formerly side
3 being unable to burn villages, but, as now being in a side with a leader, they
can capture them.

An advantage of having two sides was, that the units could have different AI
settings, and that the leaderless side was not interrested in villages.
The AI settings will be adressed in a seperate commit.

(bug #3032)

[ci skip]

  Commit: 461c4659a3565c0804a5c0f9251a18e07a7e6b88
      https://github.com/wesnoth/wesnoth/commit/461c4659a3565c0804a5c0f9251a18e07a7e6b88
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S2: fix issues with killing the bandit leader first

- The peasants told Deoran to go for the already defeated bandit leader.
- The pesants were useless at that time - they are now instead spawned when
  defeating the bandit leader or when Deoran arrives, whatever happens first.
  They may still have a fight with remaining bandits – or provoke their attack.
- The dialogue when reaching the citadel after having defeated the bandits got a
  slight change, to better switch to the victory dance event.

(issue #1954)

[ci skip]

  Commit: e55f1926341d56544efd8300cea73e1639de1c1b
      https://github.com/wesnoth/wesnoth/commit/e55f1926341d56544efd8300cea73e1639de1c1b
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
    M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
    M data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
    M data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg

  Log Message:
  -----------
  TSG S7a-S9a: prepare to let Hylas die

(FR #3316)

This includes changing when the overlays and ellipses for the hero units are
changed, and for better testing part of the event is split into a victory event
in S6a.

[ci skip]

  Commit: 59b205a4042e3e1b4038843bea3774536f0f5b93
      https://github.com/wesnoth/wesnoth/commit/59b205a4042e3e1b4038843bea3774536f0f5b93
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
    M data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
    M data/campaigns/Northern_Rebirth/utils/utils.cfg

  Log Message:
  -----------
  NR: use 1.13 syntax for finding suitable units for [role]

[ci skip]

  Commit: 9717743f748bd27d1f669b8eda103e2e94ac1c4e
      https://github.com/wesnoth/wesnoth/commit/9717743f748bd27d1f669b8eda103e2e94ac1c4e
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S7a: duplicate less WML

use monstrous event instead of monstrous macro

[ci skip]

  Commit: 340ac18575e929659a116f10729ba41af4530f04
      https://github.com/wesnoth/wesnoth/commit/340ac18575e929659a116f10729ba41af4530f04
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S2: adjust AI settings

This follows the earlier commit which unified side 2 and 3.

In the first rounds the AI behaves like former side 3, later like side 2.

This is seemlessly possible, because side 3's AI settings were having practical
effect at the beginning of the game, and side 2's conflicing settings don't come
into action before the recruited troops met the ones of the player.

(bug #3032)

[ci skip]

  Commit: 567052851f3f0303e647b780cf388cfb5c06127a
      https://github.com/wesnoth/wesnoth/commit/567052851f3f0303e647b780cf388cfb5c06127a
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S8b: allow while mages to be loyal and have random gender

[ci skip]

  Commit: 3c2cd680b1ed10b77070df8dcca855fc4f96d5b6
      https://github.com/wesnoth/wesnoth/commit/3c2cd680b1ed10b77070df8dcca855fc4f96d5b6
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S5: Duo leader setup for the zombies

This adds on the one hand a second leader with secons keep in the same caslte.
for the same side, on the other hand ich changes the speack when they die.
They adverturers are not assuming they killed the undead masters anymore if they
saw the lich before.

(mentioned in #1954)

[ci skip]

  Commit: f3e0f4f36bbd40fb068730fb1a4c83f2dacc2467
      https://github.com/wesnoth/wesnoth/commit/f3e0f4f36bbd40fb068730fb1a4c83f2dacc2467
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S4: Avoid submerging Rangers

If no suitable forest hex is found, the radius of the locations considered is
extended instead of placing the unit next to Ethiliel.

Also, a change of behaviour:
 * non-free hexes will not be considered
 * the bodyguards won't be placed adjacent to other units, like the ambush
 ability works normally
 * this includes Ethiliel
In general that means that units may be placed farther away than before.

[ci skip]

  Commit: 18222928c53eba957282c81198419b14800d1326
      https://github.com/wesnoth/wesnoth/commit/18222928c53eba957282c81198419b14800d1326
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S4: add female name string

For some reason they never had one.
[ci skip]

  Commit: 2f7bb757dbda952c3c4e7f77386dac006f7c618d
      https://github.com/wesnoth/wesnoth/commit/2f7bb757dbda952c3c4e7f77386dac006f7c618d
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
    M data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.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
    M data/campaigns/The_South_Guard/utils/sg_deaths.cfg

  Log Message:
  -----------
  TSG: change inclusion of death events

That way less events need to be duplicated in scenarios.
It also does not include the full Hylas death event in S7a to S9a.
Previously the Jarek event was not present in one of the final scenarios,
now both include it, but the shorter variant of it.

[ci skip]

  Commit: 9d241c8908de07c3fba9d8bedf1f360224756512
      https://github.com/wesnoth/wesnoth/commit/9d241c8908de07c3fba9d8bedf1f360224756512
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

  Changed paths:
    M data/campaigns/The_South_Guard/maps/07b_Pebbles_in_the_Flood.map
    M data/campaigns/The_South_Guard/maps/08b_The_Tides_of_War.map

  Log Message:
  -----------
  TSG S7b & S8b: use undead encampments instead of ordinary ones

[ci skip]

  Commit: 74e96426b6f16abeccd5c4979937f9d92ec32aa7
      https://github.com/wesnoth/wesnoth/commit/74e96426b6f16abeccd5c4979937f9d92ec32aa7
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S5: Beast of the Lake is now loyal

It shall not hinder the recruiting capabilities of side 3 if the player spawns
the monster.

[ci skip]

  Commit: e218899223038bc91d53f16665448f956162740c
      https://github.com/wesnoth/wesnoth/commit/e218899223038bc91d53f16665448f956162740c
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S4: minor optimizations

Made it impossible that the undead leader can advance to a lich - though you do
sth. badly wrong if he advances at all. Also, some more 1.13 syntactic sugar.

[ci skip]

  Commit: 4b928a6069951898044982e5d2f0be53ce01c061
      https://github.com/wesnoth/wesnoth/commit/4b928a6069951898044982e5d2f0be53ce01c061
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG 5: ensure no additional event is triggered during allying

Ensure that allying with the bandits does not trigger the lich sighted event.
It's unlikely that the bandits advanced that far though.

[ci skip]

  Commit: 6e7cbe5336c074dc49fa1e7ab8fc6b87d03f30c3
      https://github.com/wesnoth/wesnoth/commit/6e7cbe5336c074dc49fa1e7ab8fc6b87d03f30c3
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S6a: may the queen be always female and have a more prominent ellipse

And remove one mention of Mebrin before meeting him in S7b.
[ci skip]

  Commit: 3a64379ffa5df4acc817d1863a5dd7e84d5f7c72
      https://github.com/wesnoth/wesnoth/commit/3a64379ffa5df4acc817d1863a5dd7e84d5f7c72
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S2: add female strings for the units placed at start

On the other hand, all these units could as well use custom names.
[ci skip]

  Commit: 226c6466335fe00a8a837ab9ff5ef53a889add68
      https://github.com/wesnoth/wesnoth/commit/226c6466335fe00a8a837ab9ff5ef53a889add68
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S5: reformat comments, add translation hint

[ci skip]

  Commit: c472b42690c1125800583efa7e25200d280ac34c
      https://github.com/wesnoth/wesnoth/commit/c472b42690c1125800583efa7e25200d280ac34c
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG 9a: gender handling
[ci skip]

  Commit: 8864d87c640a785693e4aca68ba38ce8e1725fb3
      https://github.com/wesnoth/wesnoth/commit/8864d87c640a785693e4aca68ba38ce8e1725fb3
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S6a: Mermen will leave afterwards

The text has already been prepared for this in 1.13

[ci skip]

  Commit: 16d83b9e1ba41f42c39b628b800f3999962cc094
      https://github.com/wesnoth/wesnoth/commit/16d83b9e1ba41f42c39b628b800f3999962cc094
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S7b: use 1.13 code and make it debug safe

The invulnerable status is player-visible and does not insert new events which
are checked at each attack.

[ci skip]

  Commit: c6b883eebbff38692d9cbbe2016a92f23f193909
      https://github.com/wesnoth/wesnoth/commit/c6b883eebbff38692d9cbbe2016a92f23f193909
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2018-08-27 (Mon, 27 Aug 2018)

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

  Log Message:
  -----------
  TSG S8a: add redraw calls

Recalling units may increase the vision area when playing with shroud/fog.

[ci skip]

Compare: https://github.com/wesnoth/wesnoth/compare/45c4c6b6a5f3...c6b883eebbff
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.