[wesnoth-commits] [wesnoth/wesnoth] 8ee8a0: WC: Miscellaneous cleanup

[Celtic Minstrel]

  Branch: refs/heads/1.16
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 8ee8a0647e1b6568689259d94c9dacd3a4421afb
      https://github.com/wesnoth/wesnoth/commit/8ee8a0647e1b6568689259d94c9dacd3a4421afb
  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: 30376fd77dec35ca5456f8f8981512a50044dd4a
      https://github.com/wesnoth/wesnoth/commit/30376fd77dec35ca5456f8f8981512a50044dd4a
  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: 89596b7c04047a9b4bc2364517f4501918400155
      https://github.com/wesnoth/wesnoth/commit/89596b7c04047a9b4bc2364517f4501918400155
  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: 16fef70909212614bb013b2e82e03cad54c8a021
      https://github.com/wesnoth/wesnoth/commit/16fef70909212614bb013b2e82e03cad54c8a021
  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/ecccc6002779...16fef7090921