← Back to team overview

widelands-dev team mailing list archive

[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 +0000
+++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua	2018-08-20 20:27:54 +0000
@@ -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=30000",
             -- 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 +0000
+++ data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua	2018-08-20 20:27:54 +0000
@@ -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 +0000
+++ data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua	2018-08-20 20:27:54 +0000
@@ -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=30000",
             "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 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine/init.lua	2018-08-20 20:27:54 +0000
@@ -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=40000",
             "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 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua	2018-08-20 20:27:54 +0000
@@ -60,9 +60,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=40000",
+            "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 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua	2018-08-20 20:27:54 +0000
@@ -59,9 +59,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=37000",
+            "sleep=5000",
             "return=skipped unless economy needs coal",
             "consume=meal",
+            "sleep=32000",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine/init.lua'
--- data/tribes/buildings/productionsites/barbarians/goldmine/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine/init.lua	2018-08-20 20:27:54 +0000
@@ -60,9 +60,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=45000",
+            "sleep=5000",
             "return=skipped unless economy needs gold_ore",
             "consume=ration",
+            "sleep=40000",
             "animate=working 20000",
             "mine=gold 2 33 5 17",
             "produce=gold_ore"

=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua	2018-08-20 20:27:54 +0000
@@ -60,9 +60,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=40000",
+            "sleep=5000",
             "return=skipped unless economy needs gold_ore",
             "consume=snack",
+            "sleep=35000",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua	2018-08-20 20:27:54 +0000
@@ -59,9 +59,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=38000",
+            "sleep=5000",
             "return=skipped unless economy needs gold_ore",
             "consume=meal",
+            "sleep=33000",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/barbarians/granitemine/init.lua'
--- data/tribes/buildings/productionsites/barbarians/granitemine/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/granitemine/init.lua	2018-08-20 20:27:54 +0000
@@ -58,9 +58,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
          descname = _"mining granite",
          actions = {
-            "sleep=20000",
+            "sleep=5000",
             "return=skipped unless economy needs granite",
             "consume=ration",
+            "sleep=15000",
             "call=mine_produce",
             "call=mine_produce",
             "return=skipped"

=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ironmine/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine/init.lua	2018-08-20 20:27:54 +0000
@@ -60,9 +60,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=45000",
+            "sleep=5000",
             "return=skipped unless economy needs iron_ore",
             "consume=ration",
+            "sleep=40000",
             "animate=working 20000",
             "mine=iron 2 33 5 17",
             "produce=iron_ore"

=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua	2018-08-20 20:27:54 +0000
@@ -60,9 +60,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=40000",
+            "sleep=5000",
             "return=skipped unless economy needs iron_ore",
             "consume=snack",
+            "sleep=35000",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua	2018-08-20 20:27:54 +0000
@@ -59,9 +59,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=38000",
+            "sleep=5000",
             "return=skipped unless economy needs iron_ore",
             "consume=meal",
+            "sleep=33000",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/empire/coalmine/init.lua'
--- data/tribes/buildings/productionsites/empire/coalmine/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/empire/coalmine/init.lua	2018-08-20 20:27:54 +0000
@@ -58,9 +58,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=43000",
+            "sleep=5000",
             "return=skipped unless economy needs coal",
             "consume=beer ration",
+            "sleep=38000",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua	2018-08-20 20:27:54 +0000
@@ -56,9 +56,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=38000",
+            "sleep=5000",
             "return=skipped unless economy needs coal",
             "consume=beer meal",
+            "sleep=33000",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/empire/goldmine/init.lua'
--- data/tribes/buildings/productionsites/empire/goldmine/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/empire/goldmine/init.lua	2018-08-20 20:27:54 +0000
@@ -58,9 +58,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=43000",
+            "sleep=5000",
             "return=skipped unless economy needs gold_ore",
             "consume=ration wine",
+            "sleep=38000",
             "call=mine_produce",
             "call=mine_produce",
             "return=skipped"

=== modified file 'data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua	2018-08-20 20:27:54 +0000
@@ -56,9 +56,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=40000",
+            "sleep=5000",
             "return=skipped unless economy needs gold_ore",
             "consume=meal wine",
+            "sleep=35000",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/empire/ironmine/init.lua'
--- data/tribes/buildings/productionsites/empire/ironmine/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/empire/ironmine/init.lua	2018-08-20 20:27:54 +0000
@@ -58,9 +58,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=43000",
+            "sleep=5000",
             "return=skipped unless economy needs iron_ore",
             "consume=ration beer",
+            "sleep=38000",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua	2018-08-20 20:27:54 +0000
@@ -56,9 +56,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=39000",
+            "sleep=5000",
             "return=skipped unless economy needs iron_ore",
             "consume=meal beer",
+            "sleep=34000",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/coalmine/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine/init.lua	2018-08-20 20:27:54 +0000
@@ -64,9 +64,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=40000",
             "call=mine_produce",
             "call=mine_produce",
             "return=skipped"

=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua	2018-08-20 20:27:54 +0000
@@ -63,9 +63,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=39900",
+            "sleep=5000",
             "return=skipped unless economy needs coal",
             "consume=meal",
+            "sleep=34900",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/goldmine/init.lua	2018-07-19 09:40:06 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine/init.lua	2018-08-20 20:27:54 +0000
@@ -65,9 +65,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=45000",
+            "sleep=5000",
             "return=skipped unless economy needs gold_ore",
             "consume=ration",
+            "sleep=40000",
             "animate=working 20000",
             "mine=gold 3 50 5 20", --name radius % chance_empty gain_exp_on_empty
             "produce=gold_ore"

=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua	2018-08-04 20:08:48 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua	2018-08-20 20:27:54 +0000
@@ -63,9 +63,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=39800",
+            "sleep=5000",
             "return=skipped unless economy needs gold_ore",
             "consume=meal",
+            "sleep=34800",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/ironmine/init.lua	2018-07-19 09:40:06 +0000
+++ data/tribes/buildings/productionsites/frisians/ironmine/init.lua	2018-08-20 20:27:54 +0000
@@ -65,9 +65,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=45000",
+            "sleep=5000",
             "return=skipped unless economy needs iron_ore",
             "consume=ration",
+            "sleep=40000",
             "animate=working 20000",
             "mine=iron 3 50 5 20",
             "produce=iron_ore"

=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua	2018-08-20 20:27:54 +0000
@@ -63,9 +63,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=62100",
+            "sleep=5000",
             "return=skipped unless economy needs iron_ore",
             "consume=meal",
+            "sleep=57100",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",

=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/rockmine/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/frisians/rockmine/init.lua	2018-08-20 20:27:54 +0000
@@ -65,9 +65,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
          descname = _"mining granite",
          actions = {
-            "sleep=43000",
+            "sleep=5000",
             "return=skipped unless economy needs granite",
             "consume=ration",
+            "sleep=38000",
             "call=mine_produce",
             "call=mine_produce",
             "return=skipped"

=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua	2018-08-02 17:35:00 +0000
+++ data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua	2018-08-20 20:27:54 +0000
@@ -63,9 +63,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
          descname = _"mining granite",
          actions = {
-            "sleep=39900",
+            "sleep=5000",
             "return=skipped unless economy needs granite",
             "consume=meal",
+            "sleep=34900",
             "call=mine_produce",
             "call=mine_produce",
             "call=mine_produce",


Follow ups