Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands
I have some proposals to fix the issues discovered.
see my latest post in
https://wl.widelands.org/forum/topic/4232/?page=8#post-25429
in short the mine programs should look like
programs = {
work = {
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
"sleep=4",
"return=skipped unless economy needs coal",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"animate=working 6",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
}
},
mine_produce = {
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining and producing",
actions = {
"sleep=1000",
"mine=coal 4 100 5 2",
"produce=coal",
},
},
Additionally the penalty for totally depleted fields should be removed in
https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/logic/map_objects/tribes/production_program.cc#L1214
last but not least statistics have to be fixed and the production return_string
should be defined at the end of the complete "work programm" at least for the
mines.
--
https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/mines-worldsavior.
___
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/congestion2 into lp:widelands
Continuous integration builds have changed state: Travis build 3737. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/409791669. Appveyor build 3537. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_congestion2-3537. -- https://code.launchpad.net/~widelands-dev/widelands/congestion2/+merge/348525 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/congestion2. ___ 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/lenient_allowed_buildings into lp:widelands
Continuous integration builds have changed state: Travis build 3736. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/409767340. Appveyor build 3536. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_lenient_allowed_buildings-3536. -- https://code.launchpad.net/~widelands-dev/widelands/lenient_allowed_buildings/+merge/351749 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/lenient_allowed_buildings 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/fri-01-portspace into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fri-01-portspace into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fri-01-portspace/+merge/350729 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fri-01-portspace. ___ 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/fri-01-portspace into lp:widelands
Tested. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fri-01-portspace/+merge/350729 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fri-01-portspace. ___ 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/lenient_allowed_buildings into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/lenient_allowed_buildings into lp:widelands.
Commit message:
When loading a game, simply skip buildings in the allowed list if they no
longer exist
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/lenient_allowed_buildings/+merge/351749
Removing the market made savegames incompatible, even if they didn't have any
market buildings in it. This will fix it - a warning is enough. The change
should also make tribe prototyping a bit easier.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/lenient_allowed_buildings into lp:widelands.
=== modified file 'src/map_io/map_allowed_building_types_packet.cc'
--- src/map_io/map_allowed_building_types_packet.cc 2018-07-08 15:16:16 +
+++ src/map_io/map_allowed_building_types_packet.cc 2018-07-30 08:27:27 +
@@ -78,7 +78,7 @@
if (tribe.has_building(index)) {
player->allow_building_type(index, allowed);
} else {
- throw GameDataError("tribe %s does not define building type \"%s\"",
+ log("WARNING: MapAllowedBuildingTypesPacket - tribe %s does not define building type \"%s\"\n",
tribe.name().c_str(), name);
}
}
___
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-1784113-desktop-file-utils into lp:widelands
Oops, wrong merge request for my comment -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784113-desktop-file-utils/+merge/351614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784113-desktop-file-utils 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/bug-1784113-desktop-file-utils into lp:widelands
Why did you change if (!is_warping_) to if (showing_workarea_)? The !is_warping_ check is there for a reason. Maybe you need if (!is_warping_ && showing_workarea_)? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784113-desktop-file-utils/+merge/351614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784113-desktop-file-utils 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/bug-1619402-port-work-area-on-expedition into lp:widelands
Why did you change if (!is_warping_) to if (showing_workarea_)? The !is_warping_ check is there for a reason. Maybe you need if (!is_warping_ && showing_workarea_)? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition/+merge/349594 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition. ___ 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
