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

Mon Aug 27 02:01:27 UTC 2018

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: bed35245678cb097dfea0b584d4a3ba2a86ceade
      https://github.com/wesnoth/wesnoth/commit/bed35245678cb097dfea0b584d4a3ba2a86ceade
  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: 4e11d419b55a1be21e467925301cdd1820f983fd
      https://github.com/wesnoth/wesnoth/commit/4e11d419b55a1be21e467925301cdd1820f983fd
  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 obviously shown in the sidebar

[ci skip]

  Commit: 440efd25600245ce5a69561312494ff2cdd8332b
      https://github.com/wesnoth/wesnoth/commit/440efd25600245ce5a69561312494ff2cdd8332b
  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: 844e56b8e0dc5d241f5ab640db4bf44ef2958e66
      https://github.com/wesnoth/wesnoth/commit/844e56b8e0dc5d241f5ab640db4bf44ef2958e66
  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: baec30bb0c606f73826dace5ea771dc4c85ddf27
      https://github.com/wesnoth/wesnoth/commit/baec30bb0c606f73826dace5ea771dc4c85ddf27
  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: 101cb21a95836f9d96a511336c9a759bea850887
      https://github.com/wesnoth/wesnoth/commit/101cb21a95836f9d96a511336c9a759bea850887
  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: bbc31e623b38ec719b0c672deff8a2345f3571d1
      https://github.com/wesnoth/wesnoth/commit/bbc31e623b38ec719b0c672deff8a2345f3571d1
  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: d749005d21d3407a6bd1aff991df4ae3d0372d80
      https://github.com/wesnoth/wesnoth/commit/d749005d21d3407a6bd1aff991df4ae3d0372d80
  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: 0c5467c28a3ca2e6be2bd2cb72e5c9266d91a3d4
      https://github.com/wesnoth/wesnoth/commit/0c5467c28a3ca2e6be2bd2cb72e5c9266d91a3d4
  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: b681ad8cd98d4ee3168257ee6116a2ac513f28ab
      https://github.com/wesnoth/wesnoth/commit/b681ad8cd98d4ee3168257ee6116a2ac513f28ab
  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: 0dd48bf5818e11d7914cbd70a8fcfdf7ba8c51e2
      https://github.com/wesnoth/wesnoth/commit/0dd48bf5818e11d7914cbd70a8fcfdf7ba8c51e2
  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: 00574c0814a5acf4cb9c85115b150b84ce6536db
      https://github.com/wesnoth/wesnoth/commit/00574c0814a5acf4cb9c85115b150b84ce6536db
  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: ee09bc3b6309950c10ed8e0800952ce3c6cd6607
      https://github.com/wesnoth/wesnoth/commit/ee09bc3b6309950c10ed8e0800952ce3c6cd6607
  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: 7c89b101b8606f5e16521e8482b5e48ff3da6ed5
      https://github.com/wesnoth/wesnoth/commit/7c89b101b8606f5e16521e8482b5e48ff3da6ed5
  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: f1a465b3779c0194613971fbbcae4fe43a69dd26
      https://github.com/wesnoth/wesnoth/commit/f1a465b3779c0194613971fbbcae4fe43a69dd26
  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: e43b3507fa18e79b6e2a4893f73b8c75160d7959
      https://github.com/wesnoth/wesnoth/commit/e43b3507fa18e79b6e2a4893f73b8c75160d7959
  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: 4fecc83f1762a3744bdb59e890566c8303b3474f
      https://github.com/wesnoth/wesnoth/commit/4fecc83f1762a3744bdb59e890566c8303b3474f
  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: 29b4196556dbe401766f48d0f46faa6a9245d351
      https://github.com/wesnoth/wesnoth/commit/29b4196556dbe401766f48d0f46faa6a9245d351
  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: 8960da0591bf5b5523800648e726f97d666ee1a7
      https://github.com/wesnoth/wesnoth/commit/8960da0591bf5b5523800648e726f97d666ee1a7
  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: 63333c688e700de41cee571346142b7dd7d00ef6
      https://github.com/wesnoth/wesnoth/commit/63333c688e700de41cee571346142b7dd7d00ef6
  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: a46d3f1eb394af158062690e9f3a98933f90e8d9
      https://github.com/wesnoth/wesnoth/commit/a46d3f1eb394af158062690e9f3a98933f90e8d9
  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: 657bf305f528016c0bc6b5218c3e18587fd792d3
      https://github.com/wesnoth/wesnoth/commit/657bf305f528016c0bc6b5218c3e18587fd792d3
  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: 18db086025a76cc700a542aa582a6d782466a011
      https://github.com/wesnoth/wesnoth/commit/18db086025a76cc700a542aa582a6d782466a011
  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: f04cdd3803d7381fb178b94f0a20a7d75cb16ce0
      https://github.com/wesnoth/wesnoth/commit/f04cdd3803d7381fb178b94f0a20a7d75cb16ce0
  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: c030249043e62d6a878a052a29037889ae0fcde1
      https://github.com/wesnoth/wesnoth/commit/c030249043e62d6a878a052a29037889ae0fcde1
  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: 07c2125afc714f035edbbc877ec37e3c6e590468
      https://github.com/wesnoth/wesnoth/commit/07c2125afc714f035edbbc877ec37e3c6e590468
  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: f84d6808e9fa7a17a1065b2587e3fb8847df66b7
      https://github.com/wesnoth/wesnoth/commit/f84d6808e9fa7a17a1065b2587e3fb8847df66b7
  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: ddc763f3244f5fff731f61a26553566226494679
      https://github.com/wesnoth/wesnoth/commit/ddc763f3244f5fff731f61a26553566226494679
  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: 5f7b1853dd61154183ad4042bd4c41510943f4d9
      https://github.com/wesnoth/wesnoth/commit/5f7b1853dd61154183ad4042bd4c41510943f4d9
  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/20bfb35bdda3...5f7b1853dd61
      **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.