[Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/elk_moose into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
Error merging this proposal: Output: stdout: stderr: Unable to obtain lock held by sir...@bazaar.launchpad.net on taotie (process #21580), acquired 37 hours, 41 minutes ago. See "bzr help break-lock" for more. bzr: ERROR: Could not acquire lock "(remote lock)": bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/trunk/ -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
Travis: 1 x curl: (6) Could not resolve host: deb.debian.org Error: An exception occurred within a child process: DownloadError: Failed to download resource "isl" 3 x Loading savegame: inputqueues ... No output has been received in the last 10m0s -> Adressed elsewhere All other Builds are fine @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 5218. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/549145830. -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
Continuous integration builds have changed state: Travis build 5218. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/549145830. Appveyor build 4997. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_elk_moose-4997. -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
Thanks for the review & testing! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
Review: Approve testing
Ahh, the json file is created in thee same dir as the wmf file, e.g.
{
"name": "CrossriverA",
"author": "Hasi50",
"description": "A nice River flows through this land and water can be found
there. Metal in the hills nearby, but you are not alone",
"hint": "",
"width": 64,
"height": 64,
"nr_players": 2,
"needs_widelands_version_after": 18,
"world_name": "",
"minimap": "/Users/klaus/.widelands/maps/My_Maps/CrossriverA1.wmf.png"
}
A map saved with the new version
{
"name": "27 zu 3 Inseln",
"author": "Björn alias the-x",
"description": "Starting with 27 Islands falling together when you find Ways
to pass through the rocks to 3 huge Island. Are you unstoppable to manage all
3 Islands under your control? Tipps: Start to find your dream Island real fast
and you wont find Iron on your main Island.",
"hint": "",
"width": 144,
"height": 144,
"nr_players": 4,
"needs_widelands_version_after": 20,
"world_name": "",
"minimap": "/Users/klaus/.widelands/maps/My_Maps/27 zu 3 Inselnx.wmf.png"
}
Trunk gives me:
Exception: map objects: [../src/logic/map_objects/world/critter.cc:323] loading
critter:
UnhandledVersionError: This game was saved using an older version of Widelands
and cannot be loaded anymore, or it's a new version that can't be handled yet.
Packet Name: Critter
Saved Version: 2
Current Version: 1.
Fine
--
https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/elk_moose.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
I have added comments.
If you run ./wl_map_info without parameters, it will give you command line
help. It results in a JSON file for the website.
Diff comments:
>
> === modified file 'src/logic/map.cc'
> --- src/logic/map.cc 2019-05-16 09:15:03 +
> +++ src/logic/map.cc 2019-06-22 11:22:28 +
> @@ -714,6 +714,22 @@
> pathfieldmgr_->set_size(field_size);
> }
>
> +int Map::needs_widelands_version_after() const {
> + return map_version_.needs_widelands_version_after;
> +}
> +
> +void Map::calculate_needs_widelands_version_after(bool is_post_one_world) {
Done
> + if (map_version_.needs_widelands_version_after == 0) {
> + if (nrplayers_ > 8) {
> + // We introduced support for 16 players after Build 19
> + map_version_.needs_widelands_version_after = 19;
> + } else if (is_post_one_world) {
> + // We merged the worlds in the engine after Build 18
> + map_version_.needs_widelands_version_after = 18;
> + }
> + }
> +}
> +
> /*
> * The scenario get/set functions
> */
>
> === modified file 'src/map_io/map_version_packet.cc'
> --- src/map_io/map_version_packet.cc 2019-02-23 11:00:49 +
> +++ src/map_io/map_version_packet.cc 2019-06-22 11:22:28 +
> @@ -30,11 +30,17 @@
> namespace Widelands {
>
> constexpr uint16_t kCurrentPacketVersion = 1;
> +// Map compatibility information for the website
> +constexpr int kCurrentNeedsWidelandsVersionAfter = 20;
Whenever we do a change that means that older versions of Widelands cannot load
newer maps any more, whatever that might be.
Since ferries and waterways can't be added in the editor, they won't affect
this.
>
> void MapVersionPacket::read(FileSystem& fs,
> EditorGameBase& egbase,
> -bool const skip,
> -MapObjectLoader&) {
> +bool const skip, bool is_post_one_world) {
> +
> + pre_read(fs, egbase.mutable_map(), skip, is_post_one_world);
> +}
> +
> +void MapVersionPacket::pre_read(FileSystem& fs, Map* map, bool skip, bool
> is_post_one_world) {
> if (skip)
> return;
>
>
> === modified file 'src/map_io/widelands_map_loader.cc'
> --- src/map_io/widelands_map_loader.cc2019-05-26 03:14:41 +
> +++ src/map_io/widelands_map_loader.cc2019-06-22 11:22:28 +
> @@ -198,7 +202,7 @@
> log("Reading Map Version Data ... ");
> {
> MapVersionPacket p;
> - p.read(*fs_, egbase, is_game, *mol_);
> + p.read(*fs_, egbase, is_game, old_world_name_.empty());
This is already documented in map_io/map_elemental_packet.h
> }
> log("took %ums\n ", timer.ms_since_last_query());
>
--
https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/elk_moose.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
Review: Approve review, compile, short test OTOH the code is OK for me, anything more I can / must do? -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/elk_moose. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
I openend some buitin and a new Map, how can I see this new value in a map? I am missing some info about wl_map_info / wl_map_object_info -- https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/elk_moose into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
I expect some followup change on the website then.
Widelands will always read older Maps.
Did another review with a look into the complete code.
(We need some Widelands historian for all this legacy :-)
A bit more documentation would help.
Diff comments:
>
> === modified file 'src/map_io/widelands_map_loader.cc'
> --- src/map_io/widelands_map_loader.cc2019-05-26 03:14:41 +
> +++ src/map_io/widelands_map_loader.cc2019-06-22 11:22:28 +
> @@ -198,7 +202,7 @@
> log("Reading Map Version Data ... ");
> {
> MapVersionPacket p;
> - p.read(*fs_, egbase, is_game, *mol_);
> + p.read(*fs_, egbase, is_game, old_world_name_.empty());
Please add a command what this old_world_name_ is (rep. was)
> }
> log("took %ums\n ", timer.ms_since_last_query());
>
--
https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/elk_moose into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
Some questions inline Code otherwise LGTM.
Will commpile this and the read that code again.
Diff comments:
>
> === modified file 'src/logic/map.cc'
> --- src/logic/map.cc 2019-05-16 09:15:03 +
> +++ src/logic/map.cc 2019-06-22 11:22:28 +
> @@ -714,6 +714,22 @@
> pathfieldmgr_->set_size(field_size);
> }
>
> +int Map::needs_widelands_version_after() const {
> + return map_version_.needs_widelands_version_after;
> +}
> +
> +void Map::calculate_needs_widelands_version_after(bool is_post_one_world) {
* Please add a acommnt what this "is_post_one_world" means
> + if (map_version_.needs_widelands_version_after == 0) {
> + if (nrplayers_ > 8) {
> + // We introduced support for 16 players after Build 19
> + map_version_.needs_widelands_version_after = 19;
> + } else if (is_post_one_world) {
> + // We merged the worlds in the engine after Build 18
> + map_version_.needs_widelands_version_after = 18;
> + }
> + }
> +}
> +
> /*
> * The scenario get/set functions
> */
>
> === modified file 'src/map_io/map_version_packet.cc'
> --- src/map_io/map_version_packet.cc 2019-02-23 11:00:49 +
> +++ src/map_io/map_version_packet.cc 2019-06-22 11:22:28 +
> @@ -30,11 +30,17 @@
> namespace Widelands {
>
> constexpr uint16_t kCurrentPacketVersion = 1;
> +// Map compatibility information for the website
> +constexpr int kCurrentNeedsWidelandsVersionAfter = 20;
Mhh, when do we have to increase that number? When we get the ferries?
>
> void MapVersionPacket::read(FileSystem& fs,
> EditorGameBase& egbase,
> -bool const skip,
> -MapObjectLoader&) {
> +bool const skip, bool is_post_one_world) {
> +
> + pre_read(fs, egbase.mutable_map(), skip, is_post_one_world);
> +}
> +
> +void MapVersionPacket::pre_read(FileSystem& fs, Map* map, bool skip, bool
> is_post_one_world) {
> if (skip)
> return;
>
--
https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/elk_moose into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/elk_moose into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/elk_moose into
lp:widelands.
Commit message:
Rename "elk" to "moose" and add map compatibility code
- Add support for critter renamings depending on packet version to
WorldLegacyLookupTable
- New map version property "needs_widelands_version_after" for the website
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1833662 in widelands: "Better handling of 'This map requires widelands
Version >x'"
https://bugs.launchpad.net/widelands/+bug/1833662
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/elk_moose/+merge/369201
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/elk_moose into lp:widelands.
=== renamed directory 'data/world/critters/elk' => 'data/world/critters/moose'
=== modified file 'data/world/critters/moose/init.lua'
--- data/world/critters/elk/init.lua 2019-04-21 14:57:55 +
+++ data/world/critters/moose/init.lua 2019-06-22 11:17:12 +
@@ -15,8 +15,8 @@
add_directional_animation(animations, "walk", dirname, "walk", {21, 34}, 20)
world:new_critter_type{
- name = "elk",
- descname = _ "Elk",
+ name = "moose",
+ descname = _ "Moose",
editor_category = "critters_herbivores",
attributes = { "eatable" },
programs = {
=== modified file 'data/world/init.lua'
--- data/world/init.lua 2017-09-03 10:56:44 +
+++ data/world/init.lua 2019-06-22 11:17:12 +
@@ -288,7 +288,7 @@
include "world/critters/deer/init.lua"
include "world/critters/reindeer/init.lua"
include "world/critters/stag/init.lua"
- include "world/critters/elk/init.lua"
+ include "world/critters/moose/init.lua"
-- Carnivores
world:new_editor_critter_category {
=== modified file 'data/world/map_generation.lua'
--- data/world/map_generation.lua 2017-02-12 09:10:57 +
+++ data/world/map_generation.lua 2019-06-22 11:17:12 +
@@ -77,17 +77,17 @@
"alder_summer_old", "birch_summer_old", "beech_summer_old",
"larch_summer_old", "rowan_summer_old"
},
- critters = { "brownbear", "chamois", "elk", "lynx", "reindeer", "stag", "wildboar", "wolf" },
+ critters = { "brownbear", "chamois", "moose", "lynx", "reindeer", "stag", "wildboar", "wolf" },
},
{
name = "bushes",
immovables = { "bush1", "bush2", "bush3", "bush4", "bush5" },
- critters = { "bunny", "elk", "fox", "lynx", "marten", "sheep", "sheep", "wildboar", "wisent", "wolf", "wolf" },
+ critters = { "bunny", "moose", "fox", "lynx", "marten", "sheep", "sheep", "wildboar", "wisent", "wolf", "wolf" },
},
{
name = "grasses",
immovables = { "grass1", "grass2", "grass3" },
- critters = { "bunny", "elk", "fox", "lynx", "marten", "sheep", "sheep", "wolf" },
+ critters = { "bunny", "moose", "fox", "lynx", "marten", "sheep", "sheep", "wolf" },
},
{
name = "standing_stones",
@@ -614,13 +614,13 @@
"birch_summer_old", "beech_summer_old",
"larch_summer_old", "rowan_summer_old",
},
- critters = { "deer", "elk", "lynx", "reindeer", "wolf" },
+ critters = { "deer", "moose", "lynx", "reindeer", "wolf" },
},
{
name = "bushes",
immovables = { "bush1", "bush2", "bush3", "bush4", "bush5" },
critters = {
-"wisent", "wolf", "bunny", "elk", "fox", "lynx",
+"wisent", "wolf", "bunny", "moose", "fox", "lynx",
"wolf", "marten", "sheep"
},
},
@@ -628,7 +628,7 @@
name = "grasses",
immovables = { "grass1&qu
