[wesnoth-commits] [wesnoth/wesnoth] 2bc6d9: WC: Miscellaneous cleanup

[Celtic Minstrel]

  Branch: refs/heads/wc_difficulty
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 2bc6d9e77e3e545a3123e48149af186ad7c43173
      https://github.com/wesnoth/wesnoth/commit/2bc6d9e77e3e545a3123e48149af186ad7c43173
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-07-13 (Tue, 13 Jul 2021)

  Changed paths:
    M data/campaigns/World_Conquest/config.cfg
    M data/campaigns/World_Conquest/era/era.cfg
    M data/campaigns/World_Conquest/lua/map/main.lua
    M data/campaigns/World_Conquest/resources/resources.cfg
    M data/campaigns/World_Conquest/scenarios/WC_II_scenario.cfg
    M data/schema/core/mapgen/lua.cfg

  Log Message:
  -----------
  WC: Miscellaneous cleanup

- Remove the IS_ADD_ON check
- The indentation of the generator Lua was weird
- Don't transclude macros into the Lua code

Squashed from the following commits:
9a3143215bd 163bb2f52db f64c6c6c464 0cadfb3286b
782c176744f 315cebf0d92 81b147bc514 cf9fbdd5163
24cf433aafd ceacb9ecad1


  Commit: 089989db81f81063ece68affc2f52ade92b9141b
      https://github.com/wesnoth/wesnoth/commit/089989db81f81063ece68affc2f52ade92b9141b
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-07-13 (Tue, 13 Jul 2021)

  Changed paths:
    R data/campaigns/World_Conquest/lua/campaign/difficulty.lua
    M data/campaigns/World_Conquest/lua/campaign/scenario.lua
    M data/campaigns/World_Conquest/lua/campaign_main.lua
    M data/campaigns/World_Conquest/lua/map/main.lua
    M data/campaigns/World_Conquest/resources/strings/mainline.cfg
    M data/campaigns/World_Conquest/scenarios/WC_II_scenario.cfg

  Log Message:
  -----------
  WC: Change it to a campaign so it can use the built-in difficulty selection

Fixes #5113


  Commit: 726b8baabeceab416b5a0826862c847d70490b0c
      https://github.com/wesnoth/wesnoth/commit/726b8baabeceab416b5a0826862c847d70490b0c
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-07-13 (Tue, 13 Jul 2021)

  Changed paths:
    M data/campaigns/World_Conquest/gui/settings_dialog.cfg
    M data/campaigns/World_Conquest/lua/map/settings/settings_dialog.lua
    M data/campaigns/World_Conquest/scenarios/WC_II_scenario.cfg

  Log Message:
  -----------
  WC: Player count is now an option in the settings dialog


  Commit: 360e784a05dc3c47a783bb973aeb0157d80f1afc
      https://github.com/wesnoth/wesnoth/commit/360e784a05dc3c47a783bb973aeb0157d80f1afc
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2021-07-13 (Tue, 13 Jul 2021)

  Changed paths:
    M data/campaigns/World_Conquest/scenarios/WC_II_scenario.cfg

  Log Message:
  -----------
  WC: Add player count to campaign abbreviation

1-player will be WC1, 2-player WC2, 3-player WC3


Compare: https://github.com/wesnoth/wesnoth/compare/177c6055d6f2...360e784a05dc