[Commits] [wesnoth/wesnoth] b8467c: Improve handling of map generator errors

GitHub noreply at github.com
Thu Oct 27 19:48:59 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: b8467cc0c2cd3f6a59c1176ef2119f4db8365413
      https://github.com/wesnoth/wesnoth/commit/b8467cc0c2cd3f6a59c1176ef2119f4db8365413
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M src/game_launcher.cpp
    M src/gui/dialogs/loadscreen.cpp

  Log Message:
  -----------
  Improve handling of map generator errors


  Commit: 46e31cb4622f1dce0233ccace0520e7d2fc2b0d8
      https://github.com/wesnoth/wesnoth/commit/46e31cb4622f1dce0233ccace0520e7d2fc2b0d8
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M RELEASE_NOTES
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
    M data/lua/cave_map_generator.lua
    M data/lua/location_set.lua
    A data/lua/mapgen_helper.lua

  Log Message:
  -----------
  Refactor Lua cave map generator

This accomplishes two main things:
- Creates a mapgen_helper.lua module containing functions useful for Lua map generators
- Paves the way for allowing the cave generator to produce scenarios and accept user configuration


  Commit: 7c715130d4d194473bbc9b84bb3dfb7173c601e1
      https://github.com/wesnoth/wesnoth/commit/7c715130d4d194473bbc9b84bb3dfb7173c601e1
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M data/lua/cave_map_generator.lua

  Log Message:
  -----------
  Lua Cave Mapgen: Support [chamber]chance=

The older cave generator supported it, so the new one should too.


  Commit: 510dfd65df55f5f0cef10699995db104377e7ae1
      https://github.com/wesnoth/wesnoth/commit/510dfd65df55f5f0cef10699995db104377e7ae1
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
    M data/lua/cave_map_generator.lua
    M data/lua/mapgen_helper.lua

  Log Message:
  -----------
  Lua Cave Mapgen: Support random chance of flipping the map

This has a similar effect to the flipx_chance and flipy_chance in the old
cave generator, except only one flip will be applied.


  Commit: 495a5c681ff48a2148632a41d1dc993a7525ac95
      https://github.com/wesnoth/wesnoth/commit/495a5c681ff48a2148632a41d1dc993a7525ac95
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M data/lua/cave_map_generator.lua

  Log Message:
  -----------
  Lua Cave Mapgen: Support scenario generation

The syntax is mostly the same as the old cave generator - a [scenario]
tag for general scenario data, and an [items] subtag of [chamber] for
chamber-specific data. However, the generator assumes that map locations
(from [item_location]) will be used and thus does not support
same_location_as_previous=yes in moveto events within [items].


  Commit: 0166235d99b602262ea89e49f6ae5e7a19e8a79c
      https://github.com/wesnoth/wesnoth/commit/0166235d99b602262ea89e49f6ae5e7a19e8a79c
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M data/lua/cave_map_generator.lua
    M data/lua/mapgen_helper.lua

  Log Message:
  -----------
  Lua Cave Mapgen: Support flip_xy transform


  Commit: 2dee1e5f962c4cae0e79fe6184146de2adf8c7b2
      https://github.com/wesnoth/wesnoth/commit/2dee1e5f962c4cae0e79fe6184146de2adf8c7b2
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M data/lua/cave_map_generator.lua
    M data/lua/location_set.lua

  Log Message:
  -----------
  Lua Cave Mapgen: Use stable iteration of location sets


  Commit: 9d9d7450982aaa70e2d3da85444e568a2b032b31
      https://github.com/wesnoth/wesnoth/commit/9d9d7450982aaa70e2d3da85444e568a2b032b31
  Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M RELEASE_NOTES
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
    M data/lua/cave_map_generator.lua
    M data/lua/location_set.lua
    A data/lua/mapgen_helper.lua
    M src/game_launcher.cpp
    M src/gui/dialogs/loadscreen.cpp

  Log Message:
  -----------
  Merge pull request #845 from wesnoth/lua_mapgen_stuff

Improvements to the Lua cave map generator


Compare: https://github.com/wesnoth/wesnoth/compare/0bc568ede559...9d9d7450982a


More information about the Commits mailing list