[Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
The proposal to merge lp:~widelands-dev/widelands/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 -- 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
I would appreciate this. However I don't know what are the implications with travis that GunChleoc mentioned. So I am not sure if we have to wait for travis to do so. -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
I if you want I can merge this into world-saviors branch myself. -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
Ah good to know. I was suspecting it but didn't know. So for the future I would prefer not to have any merge requests into this branch. @Toni Förster: As I really appreciate your work probably it would be easier for the future to pull the branch do the agreed changes right in there and push a new revision afterwards. We have done this with other branches as well. And we did so with this one (it was originally uploaded by GunChleoc). Only thing is to check whether there are no parallel activities on the branch while changing it, which could be solved with a comment in the merge reviews or a PM over Launchpad as well. @Gun: could you please be so kind to merge this once travis is green? Perhaps it would be a good idea to direct Worldsavior for a final review of the branch after this one has been merged. Afterwards I would vote for merging the mines-worldsavior branch as it already got very big. In the future we should try to keep smaller changes. -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
Bunnybot can only handle mergers to trunk, so we need to wait for Travis and then merge manually. -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
Review: Approve thanks for doing this. Code LGTM ;-) -- https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450 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/mines_sleep_time into lp:~widelands-dev/widelands/mines-worldsavior
Toni Förster has proposed merging lp:~widelands-dev/widelands/mines_sleep_time
into lp:~widelands-dev/widelands/mines-worldsavior.
Commit message:
streamlined sleep times for mines
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/mines_sleep_time/+merge/353450
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/mines_sleep_time into
lp:~widelands-dev/widelands/mines-worldsavior.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2018-08-02 17:35:00 +
+++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2018-08-20 20:27:54 +
@@ -58,9 +58,10 @@
descname = _"mining coal",
actions = {
-- time total: 105 + 7 x 3.6
-"sleep=35000",
+"sleep=5000",
"return=skipped unless economy needs coal",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
+"sleep=3",
-- after having the food the miners are working 7 times
-- each cycle lasts 10 seconds for mining and producing coal
-- and 3.6 seconds to deliver the coal to the flag
=== modified file 'data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua 2018-08-02 17:35:00 +
+++ data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua 2018-08-20 20:27:54 +
@@ -57,9 +57,10 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
descname = _"mining gold",
actions = {
-"sleep=39000",
+"sleep=5000",
"return=skipped unless economy needs gold_ore",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
+"sleep=34000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua 2018-08-02 17:35:00 +
+++ data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua 2018-08-20 20:27:54 +
@@ -58,9 +58,10 @@
descname = _"mining iron",
actions = {
-- time total: 105 + 5 x 3.6
-"sleep=35000",
+"sleep=5000",
"return=skipped unless economy needs iron_ore",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
+"sleep=3",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine/init.lua 2018-08-02 17:35:00 +
+++ data/tribes/buildings/productionsites/barbarians/coalmine/init.lua 2018-08-20 20:27:54 +
@@ -60,9 +60,10 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
-"sleep=45000",
+"sleep=5000",
"return=skipped unless economy needs coal",
"consume=ration",
+"sleep=4",
"call=mine_produce",
"call=mine_produce",
"return=skipped"
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua 2018-08-02 17:35:00 +
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua 2018-08-20 20:27:54 +
@@ -60,9 +60,10 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
-"sleep=4",
+"sleep=5000",
"return=skipped unless economy needs coal",
"consume=snack",
+"sleep=35000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua 2018-08-02 17:35:00 +
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua 2018-08-20 20:27:54 +
@@ -59,9
