[wesnoth-commits] [wesnoth/wesnoth] d12cf7: WC2: fix typo

Wed Oct 27 06:05:17 UTC 2021

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: d12cf7d68cd47f353752bd2bdfd93f0a6b4fb882
      https://github.com/wesnoth/wesnoth/commit/d12cf7d68cd47f353752bd2bdfd93f0a6b4fb882
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2021-10-27 (Wed, 27 Oct 2021)

  Changed paths:
    M data/campaigns/World_Conquest/lua/map/scenario_utils/side_definitions.lua

  Log Message:
  -----------
  WC2: fix typo

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

  Changed paths:
    M data/campaigns/World_Conquest/lua/era/era.lua
    M data/campaigns/World_Conquest/lua/era_main.lua

  Log Message:
  -----------
  WC2: make era usable for PvP

still disabled though

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

  Changed paths:
    M data/campaigns/World_Conquest/lua/campaign/enemy.lua

  Log Message:
  -----------
  WC2: Add placed units to the help

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

  Changed paths:
    M data/campaigns/World_Conquest/lua/map/scenario_utils/bonus_points.lua

  Log Message:
  -----------
  WC2: bonus points

In 1.14 it was 1 bonus point per player.
In the function 3 bonus points are hardcoded.
Reason is that wc2_player_count is not known in the first scenario.
Change to give 1 bonus per player in later scenarios, and assume 3 players for the first one.

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

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

  Log Message:
  -----------
  WC2 recall costs

It's fine to give this object also to remaining enemies.
(It's only unneccessary, as they are deleted afterwards.)
Though when side 4 is a human side it is useful.

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

  Changed paths:
    M data/campaigns/World_Conquest/lua/map/scenario_utils/plot.lua

  Log Message:
  -----------
  WC2 Plot: make it independent of player sides

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

  Changed paths:
    M data/campaigns/World_Conquest/lua/campaign/scenario.lua

  Log Message:
  -----------
  WC2: make carryover compatible with > 3 sides

wml.variables.wc2_player_count is set in a prestart event
this function is used in a recruit event
Thus we can rely on it being set

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

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

  Log Message:
  -----------
  Make "wc2_fix_colors" work with 4 player sides

This is the only place, where it mattered, that there is no reserved empty side for side 4.
For the dual role of side 4 being either an AI or a player side, it uses a workaround.

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

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

  Log Message:
  -----------
  Allow one leader to die with > 3 players

~ Part 1 ~

That by itself is not yet useful, as the unit will be dead,
and have no recruits in the next level.

As of string freeze. add only an image and no message.

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

  Changed paths:
    M data/campaigns/World_Conquest/era/era.cfg

  Log Message:
  -----------
  Unlock WC2 era for future scenario

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

  Changed paths:
    M data/campaigns/World_Conquest/TODO.txt
    M data/campaigns/World_Conquest/changelog.txt
    M data/campaigns/World_Conquest/lua/campaign/objectives.lua
    M data/campaigns/World_Conquest/lua/map/main.lua

  Log Message:
  -----------
  Update changelog, version number etc. for WC2

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

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

  Log Message:
  -----------
  WC2: Downgrade scenario from 4p to 3p

~ Part 2 ~

The player who lost his leader probably does not want to play anymore.
When the level is won, transition to the 3p version.
This could actually be done for all scenarios,
until reaching the 1p.

  Commit: 0f67ab905bb714076027334a0f792088d09cb061
      https://github.com/wesnoth/wesnoth/commit/0f67ab905bb714076027334a0f792088d09cb061
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2021-10-27 (Wed, 27 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: 429be66b2e129805bf14b8999487942c9e0cdc60
      https://github.com/wesnoth/wesnoth/commit/429be66b2e129805bf14b8999487942c9e0cdc60
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2021-10-27 (Wed, 27 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: ee42883f14e2b98d390f29650d66aa5d506c1b17
      https://github.com/wesnoth/wesnoth/commit/ee42883f14e2b98d390f29650d66aa5d506c1b17
  Author: Severin Glöckner <severin.gloeckner at stud.htwk-leipzig.de>
  Date:   2021-10-27 (Wed, 27 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/e02e933f4187...ee42883f14e2