[wesnoth-commits] [wesnoth/wesnoth] d241ed: WC2: Fix using the same variable for 2 things

[sevu]

  Branch: refs/heads/1.16-wc2
  Home:   https://github.com/wesnoth/wesnoth
  Commit: d241ed2c0826caa9e4accc25336c4a9abaa83ed0
      https://github.com/wesnoth/wesnoth/commit/d241ed2c0826caa9e4accc25336c4a9abaa83ed0
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2021-10-23 (Sat, 23 Oct 2021)

  Changed paths:
    M data/campaigns/World_Conquest/lua/game_mechanics/promote_commander.lua

  Log Message:
  -----------
  WC2: Fix using the same variable for 2 things

Can't use wc2_player_count as condition after it is decreased.


  Commit: ae4364ab5193e93b90b4d41641be81f3de804247
      https://github.com/wesnoth/wesnoth/commit/ae4364ab5193e93b90b4d41641be81f3de804247
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2021-10-23 (Sat, 23 Oct 2021)

  Changed paths:
    M data/campaigns/World_Conquest/lua/game_mechanics/promote_commander.lua

  Log Message:
  -----------
  WC2: Add possibility to allow scenario downgrading later on

In difference to other files, this one cannot be changed later on during 1.16.
Because it is a Lua event, it is loaded on client side.

By defining the variable wc2_highest_player_side behaviour could still be switched during 1.16.

For the code to work, the scenarios must also be loaded.
Currently, only one of the three is loaded, the other scenario ids won't exist.
To load them, the code in WC_II_scenario.cfg would need to be changed on the hosting side to:

#ifdef CAMPAIGN_WC_3P
{WC2_SCENARIO_NEW scenario "WC_II_3p" {WC_II_CAMPAIGN_NAME_3P} 3}
{WC2_SCENARIO_NEW scenario "WC_II_2p" {WC_II_CAMPAIGN_NAME_2P} 2}
{WC2_SCENARIO_NEW scenario "WC_II_1p" {WC_II_CAMPAIGN_NAME_1P} 1}
#endif


  Commit: 62656cdd88bc0190df311eb850936a09f4493579
      https://github.com/wesnoth/wesnoth/commit/62656cdd88bc0190df311eb850936a09f4493579
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2021-10-23 (Sat, 23 Oct 2021)

  Changed paths:
    M data/campaigns/World_Conquest/lua/game_mechanics/color.lua

  Log Message:
  -----------
  WC2: persist color in corner case when using the workaround

This happens if player 4 and another one choose the same color.
(They shouldn't do that to begin with, but they could)

In this case the workaround is also triggered and side 4 gets a new color.
That's fine.
Previously that would have caused side 4's color to change in each scenario,
thus it's now persisted as well.

The workaround is for the case a player chooss choose the same coklor as side 4.


Compare: https://github.com/wesnoth/wesnoth/compare/5a395eaa1325...62656cdd88bc