[wesnoth-commits] [wesnoth/wesnoth] 6739f1: Avoid counting encounters with 'Cloaked Figure'.

[Wedge009]

  Branch: refs/heads/1.16
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 6739f1b39ca64d332b585f5234ff66846d8cbd3b
      https://github.com/wesnoth/wesnoth/commit/6739f1b39ca64d332b585f5234ff66846d8cbd3b
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2021-12-07 (Tue, 07 Dec 2021)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg

  Log Message:
  -----------
  Avoid counting encounters with 'Cloaked Figure'.

Resolves #6355.

The 'Cloaked Figure' that hounds Kaleh and friends can be encountered up to three times:
* S4 - guaranteed as his appearance is triggered by Kaleh entering the cave which is a scenario requirement.
* S5 - appearance is at a random turn during the battle between the dwarves and the trolls.
* S8 - final appearance is triggered when moving through the narrow passage.

It is possible to miss the encounter in S5 due to the randomised turn mechanic. Thus, it can be confusing when Kaleh says 'third time'.
This is just a quick work-around - another option may be to make the appearance in S5 more deterministic.

[ci skip]

(cherry picked from commit ada454b20a652136a2f6f29003a8d1137eead9c9)


  Commit: 423da97087dedc6704b7b77d84f828182da2a8c4
      https://github.com/wesnoth/wesnoth/commit/423da97087dedc6704b7b77d84f828182da2a8c4
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2021-12-07 (Tue, 07 Dec 2021)

  Changed paths:
    M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg

  Log Message:
  -----------
  UtBS S9: Avoid 'punishing' the player for saving the rebels (#6362)

* Avoid 'punishing' the player for avoiding bloodshed by giving rebels zero upkeep costs for the scenario upon reuniting with Kaleh's side.

Resolves #6229.

Co-authored-by: Descacharrado <Luis_koopa at hotmail.com>
(cherry picked from commit 594f0cd29308334ebb0441f9df4ce78048a510d1)


Compare: https://github.com/wesnoth/wesnoth/compare/f6beed7bd6e0...423da97087de