Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands

2016-07-06 Thread SirVer
> The map get loaded without errors but the scripting does not work.

That is what i meant earlier. This is true for old scenarios as well: the one 
world lookup table will only fix names for savegames/maps packets that we 
control. The lua scripting serialized blob inside the loaded scenarios/games 
however is opaque to us and will have referenced these names as well 
potentially. this is beyond our control to fix and those games will break.

I think that is an acceptable risk since very few scenarios are out in the wild 
and as I said, I think we changed the API for b19 already in a non-backwards 
compatible manner. 
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names.

___
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/bug-1570086_unify_terrain_names into lp:widelands

2016-07-06 Thread bunnybot
Continuous integration builds have changed state:

Travis build 1175. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/142866451.
Appveyor build 1013. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1570086_unify_terrain_names-1013.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names.

___
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/bug-1570086_unify_terrain_names into lp:widelands

2016-07-06 Thread kaputtnik
Review: Resubmit

I should read the errors better:

> Reading Terrain Data ... WidelandsMapLoader::load_map_complete() for '00Test' 
> took 2ms
> Scenario not started: Game data error: terrain: Terrain 'steppe' exists in 
> map, not in world!

The map get loaded without errors but the scripting does not work.

Now the branch is changed to use the old 'name's. After some adjustments to the 
tests to fit with the new names of the images and the subfolders, all tests run 
without errors.

If it is wanted the 'name's could be changed later on.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names.

___
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/bug-1570086_unify_terrain_names into lp:widelands

2016-07-06 Thread kaputtnik
The changes in PostOneWorldLegacyLookupTable() should take care of 
incompatibilities. It just changes "old_terrain_name" with "new_terrain_name" 
if an older map or a savgame get loaded. This is tested and works.

Scenarios (campaigns) do also work. But i have not tested the altantean 
campaign, the only one i believe where terrain changes comes into game.

I guess the tests fail because they are using old 'name'-terms of terrains 
whereas the name-change with PostOneWorldLegacyLookupTable() is already done.

I look into this.

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names.

___
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/bug-1570086_unify_terrain_names into lp:widelands

2016-07-06 Thread SirVer
Renaming the 'name' fields of the terrains is a backwards incompatible change - 
i.e. it make break scenarios. I think we did some API changes in the Lua code 
that were backwards incompatible and deemed it okay for b19 (where we break 
basically everything anyways), but I am not sure.

Gun, do you remember?
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names.

___
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/bug-1570086_unify_terrain_names into lp:widelands

2016-07-06 Thread kaputtnik
Review: Needs Fixing

Hm, the tests do not run through.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names.

___
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/bug-1592692-production_sounds into lp:widelands

2016-07-06 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1592692-production_sounds 
into lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1592692-production_sounds/+merge/299186
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1592692-production_sounds.

___
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/bug-1592692-production_sounds into lp:widelands

2016-07-06 Thread SirVer
Review: Approve

lgtm.

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1592692-production_sounds/+merge/299186
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1592692-production_sounds.

___
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