← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands

 

GunChleoc has proposed merging lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands.

Commit message:
Diverse balancing tweaks for productionsites
- Honey Bread Bakery now only ignores economy requirements when producing
  Honeybread and the workers need experience. Same goes for Mead Brewery.
- All Smelting Works, Furnaces, Smokeries, Recycling Center, Altantean and
  Frisian Toolsmithies, Taverns, Inns and Drinking Halls no longer waste time
  if a ware is missing and they ave to skip a program.
- Tweaked programs for Weapon/Armor producing buildings
- Imperial Armor Smithy produces 1 more Helm per run to balance the amount of
  armor types for training.
- Changed the order of programs in the Atlantean Toolsmithy
- Improved efficiency for Frisian Deep Mines to align with the efficiency of
  the corresponding Barbarian mines
- Gave the Barbarian Deep Gold Mine the same stats as the Deep Iron Mine

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua	2018-07-24 09:41:57 +0000
@@ -151,11 +151,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a steel shield because ...
          descname = _"forging a steel shield",
          actions = {
-            -- time total: 90
+            -- time total: 67+3,6
             "return=skipped unless economy needs shield_steel",
-            "sleep=45000",  -- +13 enlarge
+            "sleep=32000", 
             "consume=iron:2 coal:2",
-            "animate=working 45000",  -- +10 enlarge
+            "animate=working 35000", 
             "produce=shield_steel"
          }
       },
@@ -163,11 +163,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging an advanced shield because ...
          descname = _"forging an advanced shield",
          actions = {
-            -- time total: 110
+            -- time total: 77+3,6
             "return=skipped unless economy needs shield_advanced",
             "consume=iron:2 coal:2 gold",
-            "sleep=50000",  -- +18 enlarge
-            "animate=working 60000",  -- +15 enlarge
+            "sleep=32000",  
+            "animate=working 45000", 
             "produce=shield_advanced"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua	2018-07-24 09:41:57 +0000
@@ -57,17 +57,23 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=45000",
+            "sleep=40000",
             "return=skipped unless economy needs coal",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
-            "mine=coal 4 100 5 2",
-            "produce=coal:2",
-            "animate=working 20000",
-            "mine=coal 4 100 5 2",
-            "produce=coal:2",
-            "animate=working 20000",
-            "mine=coal 4 100 5 2",
+            "animate=working 20000",    
+            "animate=working 20000",
+            "mine=coal 4 100 35 2",
+            "produce=coal",
+            "sleep=2500",
+            "mine=coal 4 100 1 2",
+            "mine=coal 4 100 1 2",
+            "mine=coal 4 100 1 2",
+            "produce=coal:3",
+            "sleep=2500",    
+            "mine=coal 4 100 1 2",
+            "mine=coal 4 100 1 2",
+            "mine=coal 4 100 1 2",
             "produce=coal:3"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua	2018-03-04 14:11:19 +0000
+++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua	2018-07-24 09:41:57 +0000
@@ -71,20 +71,23 @@
          descname = _"mining granite",
          actions = {
             "return=skipped unless economy needs granite",
-            "sleep=45000",
+            "sleep=40000",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
-            "mine=stones 4 100 5 2",
-            "produce=granite:2",
-            "animate=working 20000",
-            "mine=stones 4 100 5 2",
-            "produce=granite:2",
-            "animate=working 20000",
-            "mine=stones 4 100 5 2",
+            "animate=working 20000",
+            "animate=working 20000",
+            "animate=working 20000",
+            "mine=stones 4 100 25 2",
             "produce=granite",
-            "animate=working 20000",
-            "mine=stones 4 100 5 2",
-            "produce=quartz"
+            "sleep=2500",
+            "mine=stones 4 100 1 2",
+            "mine=stones 4 100 1 2",
+            "mine=stones 4 100 1 2",
+            "produce=granite:2 quartz",
+            "sleep=2500",
+            "mine=stones 4 100 1 2",
+            "mine=stones 4 100 1 2",
+            "produce=granite:2"
          }
       },
       mine_quartz = {
@@ -92,16 +95,22 @@
          descname = _"mining quartz",
          actions = {
             "return=skipped unless economy needs quartz",
-            "sleep=45000",
+            "sleep=40000",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
-            "mine=stones 4 100 5 2",
-            "produce=granite quartz",
-            "animate=working 20000",
-            "mine=stones 4 100 5 2",
-            "produce=granite:2",
-            "animate=working 20000",
-            "mine=stones 4 100 5 2",
+            "animate=working 20000",
+            "animate=working 20000",
+            "mine=stones 4 100 15 2",
+            "produce=quartz",
+
+            "sleep=2500",
+            "mine=stones 4 100 1 2",
+            "mine=stones 4 100 1 2",
+            "mine=stones 4 100 1 2",
+            "produce=granite:3",
+            "sleep=2500",
+            "mine=stones 4 100 1 2",
+            "mine=stones 4 100 1 2",
             "produce=quartz:2"
          }
       },
@@ -110,17 +119,17 @@
          descname = _"mining diamonds",
          actions = {
             "return=skipped unless economy needs diamond",
-            "sleep=45000",
+            "sleep=43000",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
-            "mine=stones 4 100 5 2",
-            "produce=diamond",
-            "animate=working 20000",
-            "mine=stones 4 100 5 2",
-            "produce=diamond",
-            "animate=working 20000",
-            "mine=stones 4 100 5 2",
-            "produce=granite"
+            "animate=working 20000",
+            "animate=working 20000",
+            "mine=stones 4 100 10 2",
+            "produce=diamond",
+            "sleep=2000",
+            "mine=stones 4 100 1 2",
+            "mine=stones 4 100 1 2",
+            "produce=diamond granite"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua	2018-07-24 09:41:57 +0000
@@ -57,18 +57,18 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=45000",
+            "sleep=43000",
             "return=skipped unless economy needs gold_ore",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
-            "mine=gold 4 100 5 2",
-            "produce=gold_ore",
-            "animate=working 20000",
-            "mine=gold 4 100 5 2",
-            "produce=gold_ore",
-            "animate=working 20000",
-            "mine=gold 4 100 5 2",
-            "produce=gold_ore"
+            "animate=working 20000",
+            "animate=working 20000",
+            "mine=gold 4 100 15 2",
+            "produce=gold_ore",
+            "sleep=2000",
+            "mine=gold 4 100 1 2",
+            "mine=gold 4 100 1 2",
+            "produce=gold_ore:2"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua	2018-03-04 14:11:19 +0000
+++ data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua	2018-07-24 09:41:57 +0000
@@ -57,18 +57,22 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=45000",
+            "sleep=40000",
             "return=skipped unless economy needs iron_ore",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
-            "mine=iron 4 100 5 2",
-            "produce=iron_ore:2",
-            "animate=working 20000",
-            "mine=iron 4 100 5 2",
+            "animate=working 20000",
+            "animate=working 20000",
+            "mine=iron 4 100 25 2",
             "produce=iron_ore",
-            "animate=working 20000",
-            "mine=iron 4 100 5 2",
-            "produce=iron_ore:2"
+            "sleep=2500",
+            "mine=iron 4 100 1 2",
+            "mine=iron 4 100 1 2",
+            "mine=iron 4 100 1 2",
+            "produce=iron_ore:3",
+            "sleep=2500",
+            "mine=iron 4 100 1 2",
+            "produce=iron_ore"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua	2018-07-24 09:41:57 +0000
@@ -66,9 +66,8 @@
          descname = _"smelting iron",
          actions = {
             "return=skipped unless economy needs iron",
-            "sleep=5000",  -- penalty for unavailable iron_ore (2x)
             "consume=iron_ore coal",
-            "sleep=20000",
+            "sleep=25000",
             "playsound=sound/metal fizzle 150",
             "animate=working 35000",
             "playsound=sound/metal ironping 80",
@@ -80,9 +79,8 @@
          descname = _"smelting gold",
          actions = {
             "return=skipped unless economy needs gold",
-            "sleep=10000",  -- penalty for unavailable gold_ore
             "consume=gold_ore coal",
-            "sleep=15000",
+            "sleep=25000",
             "playsound=sound/metal fizzle 150",
             "animate=working 35000",
             "playsound=sound/metal goldping 80",

=== modified file 'data/tribes/buildings/productionsites/atlanteans/smokery/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/smokery/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/atlanteans/smokery/init.lua	2018-07-24 09:41:57 +0000
@@ -68,12 +68,10 @@
          descname = _"smoking meat",
          actions = {
             -- time total: 60
-            "return=skipped when site has fish and economy needs smoked_fish and not economy needs smoked_meat",
             "return=skipped unless economy needs smoked_meat",
-            "sleep=10000",
             "consume=meat:2 log",
             "animate=working 30000",
-            "sleep=20000",
+            "sleep=30000",
             "produce=smoked_meat:2"
          }
       },
@@ -82,12 +80,10 @@
          descname = _"smoking fish",
          actions = {
             -- time total: 60
-            "return=skipped when site has meat and economy needs smoked_meat and not economy needs smoked_fish",
             "return=skipped unless economy needs smoked_fish",
-            "sleep=10000",
             "consume=fish:2 log",
             "animate=working 30000",
-            "sleep=20000",
+            "sleep=30000",
             "produce=smoked_fish:2"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua	2018-07-24 09:41:57 +0000
@@ -64,18 +64,18 @@
          -- TRANSLATORS: Completed/Skipped/Did not start working because ...
          descname = _"working",
          actions = {
-            "call=produce_bread_paddle",
-            "call=produce_buckets",
             "call=produce_fire_tongs",
-            "call=produce_fishing_net",
-            "call=produce_hammer",
-            "call=produce_hook_pole",
             "call=produce_hunting_bow",
-            "call=produce_milking_tongs",
             "call=produce_pick",
+            "call=produce_hammer",
             "call=produce_saw",
+            "call=produce_shovel",
             "call=produce_scythe",
-            "call=produce_shovel",
+            "call=produce_bread_paddle",
+            "call=produce_hook_pole",
+            "call=produce_buckets",
+            "call=produce_milking_tongs",
+            "call=produce_fishing_net",
             "return=skipped"
          }
       },
@@ -84,9 +84,8 @@
          descname = _"making a bread paddle",
          actions = {
             "return=skipped unless economy needs bread_paddle",
-            "sleep=5000",
             "consume=iron log",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=bread_paddle"
@@ -97,9 +96,8 @@
          descname = _"making a pair of buckets",
          actions = {
             "return=skipped unless economy needs buckets",
-            "sleep=5000",
             "consume=iron log",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=buckets"
@@ -110,9 +108,8 @@
          descname = _"making fire tongs",
          actions = {
             "return=skipped unless economy needs fire_tongs",
-            "sleep=5000",
             "consume=iron log",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=fire_tongs"
@@ -123,9 +120,8 @@
          descname = _"making a fishing net",
          actions = {
             "return=skipped unless economy needs fishing_net",
-            "sleep=5000",
             "consume=spidercloth:2",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=fishing_net"
@@ -136,9 +132,8 @@
          descname = _"making a hammer",
          actions = {
             "return=skipped unless economy needs hammer",
-            "sleep=5000",
             "consume=iron log",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=hammer"
@@ -149,9 +144,8 @@
          descname = _"making a hook pole",
          actions = {
             "return=skipped unless economy needs hook_pole",
-            "sleep=5000",
             "consume=iron log",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=hook_pole"
@@ -162,9 +156,8 @@
          descname = _"making a hunting bow",
          actions = {
             "return=skipped unless economy needs hunting_bow",
-            "sleep=5000",
             "consume=log spidercloth",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=hunting_bow"
@@ -175,9 +168,8 @@
          descname = _"making milking tongs",
          actions = {
             "return=skipped unless economy needs milking_tongs",
-            "sleep=5000",
             "consume=iron log",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=milking_tongs"
@@ -188,9 +180,8 @@
          descname = _"making a pick",
          actions = {
             "return=skipped unless economy needs pick",
-            "sleep=5000",
             "consume=iron log",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=pick"
@@ -201,9 +192,8 @@
          descname = _"making a saw",
          actions = {
             "return=skipped unless economy needs saw",
-            "sleep=5000",
             "consume=iron log",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=saw"
@@ -214,9 +204,8 @@
          descname = _"making a scythe",
          actions = {
             "return=skipped unless economy needs scythe",
-            "sleep=5000",
             "consume=iron log",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=scythe"
@@ -227,9 +216,8 @@
          descname = _"making a shovel",
          actions = {
             "return=skipped unless economy needs shovel",
-            "sleep=5000",
             "consume=iron log",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=shovel"

=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua	2018-07-24 09:41:57 +0000
@@ -72,12 +72,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a light trident because ...
          descname = _"forging a light trident",
          actions = {
-            -- time total: 64
+            -- time total: 50+3,6
             "return=skipped unless economy needs trident_light",
-            "sleep=27000",    -- +7 enlarge
+            "sleep=20000",   
             "consume=iron planks",
             "playsound=sound/smiths smith 192",
-            "animate=working 28000",  -- +7 enlarge
+            "animate=working 21000",  
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=trident_light"
@@ -87,12 +87,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a long trident because ...
          descname = _"forging a long trident",
          actions = {
-            -- time total: 102
+            -- time total: 77+3,6
             "return=skipped unless economy needs trident_long",
             "consume=iron coal planks",
-            "sleep=47000",  -- +15 enlarge
+            "sleep=32000",  
             "playsound=sound/smiths smith 192",
-            "animate=working 46000",  -- +10 enlarge
+            "animate=working 36000",  
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=trident_long"
@@ -102,12 +102,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a steel trident because ...
          descname = _"forging a steel trident",
          actions = {
-            -- time total: 110
+            -- time total: 77+3,6
             "return=skipped unless economy needs trident_steel",
             "consume=iron:2 coal planks",
-            "sleep=50000",  -- +18 enlarge
+            "sleep=32000",  
             "playsound=sound/smiths smith 192",
-            "animate=working 51000",  -- +15 enlarge
+            "animate=working 36000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=trident_steel"
@@ -117,12 +117,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a double trident because ...
          descname = _"forging a double trident",
          actions = {
-            -- time total: 115
+            -- time total: 77+3,6
             "return=skipped unless economy needs trident_double",
             "consume=iron coal:2 planks gold",
-            "sleep=55000",  -- +23 enlarge
+            "sleep=32000",  
             "playsound=sound/smiths smith 192",
-            "animate=working 51000",  -- +15 enlarge
+            "animate=working 36000",  
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=trident_double"
@@ -132,12 +132,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a heavy double trident because ...
          descname = _"forging a heavy double trident",
          actions = {
-             -- time total: 120
+             -- time total: 77+3,6
            "return=skipped unless economy needs trident_heavy_double",
             "consume=iron:2 coal:2 planks gold",
-            "sleep=55000",  -- +23 enlarge
+            "sleep=32000",  
             "playsound=sound/smiths smith 192",
-            "animate=working 56000",  -- +20 enlarge
+            "animate=working 36000",  
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=trident_heavy_double"

=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua	2018-07-24 09:41:57 +0000
@@ -67,13 +67,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start weaving spidercloth because ...
          descname = _"weaving spidercloth",
          actions = {
-            -- total time 47 sec
+            -- total time 40 + 3,6 sec
             "return=skipped unless economy needs spidercloth",
-            "sleep=10000",
             "consume=spider_silk",
             "playsound=sound/mill weaving 120",
             "animate=working 20000",
-            "sleep=17000",
+            "sleep=20000",
             "produce=spidercloth"
          }
       },
@@ -81,13 +80,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start tailoring a tabard because ...
          descname = _"tailoring a tabard",
          actions = {
-            -- total time 55 sec
+            -- total time 40 + 3,6 sec
             "return=skipped unless economy needs tabard",
-            "sleep=10000",
             "consume=spider_silk",
             "playsound=sound/mill weaving 120",
-            "animate=working 26000",
-            "sleep=19000",
+            "animate=working 20000",
+            "sleep=20000",
             "produce=tabard"
          }
       },
@@ -95,13 +93,13 @@
          -- TRANSLATORS: Completed/Skipped/Did not start tailoring a golden tabard because ...
          descname = _"tailoring a golden tabard",
          actions = {
-             -- total time 60 sec
+            -- total time 40 + 3,6 sec
             "return=skipped unless economy needs tabard_golden",
             "consume=spider_silk gold_thread",
-            "sleep=15000",
+            "sleep=10000",
             "playsound=sound/mill weaving 120",
-            "animate=working 30000",
-            "sleep=15000",
+            "animate=working 20000",
+            "sleep=10000",
             "produce=tabard_golden"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua	2018-07-24 09:41:57 +0000
@@ -76,12 +76,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging an ax because ...
          descname = _"forging an ax",
          actions = {
-            -- time total: 73
+            -- time total: 57+3,6
             "return=skipped unless economy needs ax",
-            "sleep=36000", -- +10 enlarge
+            "sleep=26000", 
             "consume=coal iron",
             "playsound=sound/smiths smith 192",
-            "animate=working 28000",  -- +6 enlarge
+            "animate=working 22000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=ax"
@@ -91,12 +91,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a sharp ax because ...
          descname = _"forging a sharp ax",
          actions = {
-            -- time total: 76
+            -- time total: 57+3,6
             "return=skipped unless economy needs ax_sharp",
             "consume=coal iron:2",
-            "sleep=37000", -- +11 enlarge
+            "sleep=26000", 
             "playsound=sound/smiths smith 192",
-            "animate=working 30000", -- +8 enlarge
+            "animate=working 22000",
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=ax_sharp"
@@ -106,12 +106,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a broad ax because ...
          descname = _"forging a broad ax",
          actions = {
-            -- time total: 79
+            -- time total: 57+3,6
             "return=skipped unless economy needs ax_broad",
             "consume=coal:2 iron:2",
-            "sleep=38000", -- +12 enlarge
+            "sleep=26000", 
             "playsound=sound/smiths smith 192",
-            "animate=working 32000", -- +10 enlarge
+            "animate=working 22000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=ax_broad"

=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua	2018-07-24 09:41:57 +0000
@@ -84,10 +84,9 @@
          actions = {
             -- time total: 37
             "return=skipped unless economy needs snack",
-            "sleep=5000",
             "consume=barbarians_bread fish,meat beer",
             "playsound=sound/barbarians/taverns biginn 100",
-            "sleep=32000",
+            "sleep=37000",
             "produce=snack"
          }
       },
@@ -97,10 +96,9 @@
          actions = {
             -- time total: 40
             "return=skipped unless economy needs meal",
-            "sleep=5000",
             "consume=barbarians_bread fish,meat beer_strong",
             "playsound=sound/barbarians/taverns biginn 100",
-            "sleep=35000",
+            "sleep=40000",
             "produce=meal"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine/init.lua	2018-07-24 09:41:57 +0000
@@ -65,6 +65,7 @@
             "consume=ration",
             "animate=working 20000",
             "mine=coal 2 33 5 17",
+            "mine=coal 2 33 100 17",
             "produce=coal:2"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -60,15 +60,18 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=42000",
+            "sleep=40000",
             "return=skipped unless economy needs coal",
             "consume=snack",
             "animate=working 18000",
-            "mine=coal 2 66 5 17",
-            "produce=coal:2",
             "animate=working 18000",
-            "mine=coal 2 66 5 17",
-            "produce=coal:2"
+            "mine=coal 2 66 20 17",
+            "produce=coal",
+            "sleep=2000",
+            "mine=coal 2 66 1 17",
+            "mine=coal 2 66 1 17",
+            "mine=coal 2 66 1 17",
+            "produce=coal:3"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua	2018-07-24 09:41:57 +0000
@@ -59,14 +59,18 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=40000",
+            "sleep=38000",
             "return=skipped unless economy needs coal",
             "consume=meal",
             "animate=working 16000",
-            "mine=coal 2 100 10 2",
+            "animate=working 16000",
+            "mine=coal 2 100 25 2",
+            "mine=coal 2 100 100 2",
             "produce=coal:2",
-            "animate=working 16000",
-            "mine=coal 2 100 10 2",
+            "sleep=2000",
+            "mine=coal 2 100 1 2",
+            "mine=coal 2 100 1 2",
+            "mine=coal 2 100 1 2",
             "produce=coal:3"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -60,15 +60,18 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=42000",
+            "sleep=40000",
             "return=skipped unless economy needs gold_ore",
             "consume=snack",
             "animate=working 18000",
-            "mine=gold 2 66 5 17",
-            "produce=gold_ore:2",
             "animate=working 18000",
-            "mine=gold 2 66 5 17",
-            "produce=gold_ore:2"
+            "mine=gold 2 66 20 17",
+            "produce=gold_ore",
+            "sleep=2000",
+            "mine=gold 2 66 1 17",
+            "mine=gold 2 66 1 17",
+            "mine=gold 2 66 1 17",
+            "produce=gold_ore:3"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua	2018-07-24 09:41:57 +0000
@@ -59,15 +59,18 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=40000",
+            "sleep=38000",
             "return=skipped unless economy needs gold_ore",
             "consume=meal",
             "animate=working 16000",
-            "mine=gold 2 100 10 2",
-            "produce=gold_ore:2",
             "animate=working 18000",
-            "mine=gold 2 100 10 2",
-            "produce=gold_ore:2"
+            "mine=gold 2 100 40 2",
+            "produce=gold_ore",
+            "sleep=2000",
+            "mine=gold 2 100 1 2",
+            "mine=gold 2 100 1 2",
+            "mine=gold 2 100 1 2",
+            "produce=gold_ore:3"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/barbarians/granitemine/init.lua'
--- data/tribes/buildings/productionsites/barbarians/granitemine/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/barbarians/granitemine/init.lua	2018-07-24 09:41:57 +0000
@@ -63,6 +63,7 @@
             "consume=ration",
             "animate=working 20000",
             "mine=stones 2 100 5 17",
+            "mine=stones 2 100 100 17",
             "produce=granite:2"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua'
--- data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua	2018-07-24 09:41:57 +0000
@@ -77,11 +77,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a helmet because ...
          descname = _"forging a helmet",
          actions = {
-            -- time total: 80
+            -- time total: 67+3,6
             "return=skipped unless economy needs helmet",
-            "sleep=40000", -- +8 enlarge
+            "sleep=32000", 
             "consume=coal iron",
-            "animate=working 40000", -- +5 enlarge
+            "animate=working 35000", 
             "produce=helmet"
          }
       },
@@ -89,11 +89,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a mask because ...
          descname = _"forging a mask",
          actions = {
-            -- time total: 90
+            -- time total: 77+3,6
             "return=skipped unless economy needs helmet_mask",
             "consume=coal iron:2",
-            "sleep=40000", -- +8 enlarge
-            "animate=working 50000", -- +5 enlarge
+            "sleep=32000", 
+            "animate=working 45000",
             "produce=helmet_mask"
          }
       },
@@ -101,11 +101,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a warhelm because ...
          descname = _"forging a warhelm",
          actions = {
-            -- time total: 100
+            -- time total: 87+3,6
             "return=skipped unless economy needs helmet_warhelm",
             "consume=coal gold iron:2",
-            "sleep=40000", -- +8 enlarge
-            "animate=working 60000", -- +5 enlarge
+            "sleep=32000", 
+            "animate=working 55000", 
             "produce=helmet_warhelm"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/inn/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua	2018-07-24 09:41:57 +0000
@@ -82,11 +82,10 @@
          actions = {
             -- time total: 37
             "return=skipped unless economy needs snack",
-            "sleep=5000",
             "consume=barbarians_bread fish,meat beer",
             "playsound=sound/barbarians/taverns inn 100",
             "animate=working 22000",
-            "sleep=10000",
+            "sleep=15000",
             "produce=snack"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -60,15 +60,18 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=43000",
+            "sleep=40000",
             "return=skipped unless economy needs iron_ore",
             "consume=snack",
             "animate=working 18000",
-            "mine=iron 2 66 5 17",
+            "animate=working 18000",
+            "mine=iron 2 66 20 17",
             "produce=iron_ore",
-            "animate=working 18000",
-            "mine=iron 2 66 5 17",
-            "produce=iron_ore:1"
+            "sleep=2000",
+            "mine=iron 2 66 1 17",
+            "mine=iron 2 66 1 17",
+            "mine=iron 2 66 1 17",
+            "produce=iron_ore:3"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua	2018-07-24 09:41:57 +0000
@@ -59,17 +59,21 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=40000",
+            "sleep=36000",
             "return=skipped unless economy needs iron_ore",
             "consume=meal",
             "animate=working 16000",
-            "mine=iron 2 100 10 2",
+            "animate=working 16000",
+            "animate=working 16000",
+            "mine=iron 2 100 50 2",
             "produce=iron_ore",
-            "animate=working 16000",
-            "mine=iron 2 100 10 2",
+            "sleep=2000",
+            "mine=iron 2 100 1 2",
+            "mine=iron 2 100 1 2",
             "produce=iron_ore:2",
-            "animate=working 16000",
-            "mine=iron 2 100 10 2",
+            "sleep=2000",
+            "mine=iron 2 100 1 2",
+            "mine=iron 2 100 1 2",
             "produce=iron_ore:2"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua	2018-07-24 09:41:57 +0000
@@ -70,9 +70,8 @@
          descname = _"smelting iron",
          actions = {
             "return=skipped unless economy needs iron",
-            "sleep=5000",  -- penalty for unavailable iron_ore (2x)
             "consume=coal iron_ore",
-            "sleep=27000",
+            "sleep=32000",
             "playsound=sound/metal furnace 192",
             "animate=working 35000",
             "playsound=sound/metal ironping 80",
@@ -84,9 +83,8 @@
          descname = _"smelting gold",
          actions = {
             "return=skipped unless economy needs gold",
-            "sleep=10000",  -- penalty for unavailable gold_ore
             "consume=coal gold_ore",
-            "sleep=22000",
+            "sleep=32000",
             "playsound=sound/metal furnace 192",
             "animate=working 35000",
             "playsound=sound/metal goldping 80",

=== modified file 'data/tribes/buildings/productionsites/barbarians/warmill/init.lua'
--- data/tribes/buildings/productionsites/barbarians/warmill/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/warmill/init.lua	2018-07-24 09:41:57 +0000
@@ -83,12 +83,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging an ax because ...
          descname = _"forging an ax",
          actions = {
-            -- time total: 73
+            -- time total: 57+3,6
             "return=skipped unless economy needs ax",
-            "sleep=36000", -- +10 enlarge
+            "sleep=26000", 
             "consume=coal iron",
             "playsound=sound/smiths smith 192",
-            "animate=working 28000",  -- +6 enlarge
+            "animate=working 22000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=ax"
@@ -98,12 +98,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a sharp ax because ...
          descname = _"forging a sharp ax",
          actions = {
-            -- time total: 76
+            -- time total: 57+3,6
             "return=skipped unless economy needs ax_sharp",
             "consume=coal iron:2",
-            "sleep=37000", -- +11 enlarge
+            "sleep=26000",
             "playsound=sound/smiths smith 192",
-            "animate=working 30000", -- +8 enlarge
+            "animate=working 22000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=ax_sharp"
@@ -113,12 +113,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a broad ax because ...
          descname = _"forging a broad ax",
          actions = {
-            -- time total: 79
+            -- time total: 57+3,6
             "return=skipped unless economy needs ax_broad",
             "consume=coal:2 iron:2",
-            "sleep=38000", -- +12 enlarge
+            "sleep=26000", 
             "playsound=sound/smiths smith 192",
-            "animate=working 32000", -- +10 enlarge
+            "animate=working 22000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=ax_broad"
@@ -128,12 +128,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a bronze ax because ...
          descname = _"forging a bronze ax",
          actions = {
-            -- time total: 82
+            -- time total: 57+3,6
             "return=skipped unless economy needs ax_bronze",
             "consume=coal:2 iron:2",
-            "sleep=39000", -- +13 enlarge
+            "sleep=26000",
             "playsound=sound/smiths smith 192",
-            "animate=working 34000", -- +12 enlarge
+            "animate=working 22000",
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=ax_bronze"
@@ -143,12 +143,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a battle ax because ...
          descname = _"forging a battle ax",
          actions = {
-            -- time total: 87
+            -- time total: 57+3,6
             "return=skipped unless economy needs ax_battle",
             "consume=coal gold iron:2",
-            "sleep=41000", -- +15 enlarge
+            "sleep=26000", 
             "playsound=sound/smiths smith 192",
-            "animate=working 37000", -- +15 enlarge
+            "animate=working 22000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=ax_battle"
@@ -158,12 +158,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a warrior’s ax because ...
          descname = _"forging a warrior’s ax",
          actions = {
-            -- time total: 92
+            -- time total: 57+3,6
             "return=skipped unless economy needs ax_warriors",
             "consume=coal:2 gold:2 iron:2",
-            "sleep=43000", -- +17 enlarge
+            "sleep=26000",
             "playsound=sound/smiths smith 192",
-            "animate=working 40000", -- +18 enlarge
+            "animate=working 22000",
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=ax_warriors"

=== modified file 'data/tribes/buildings/productionsites/empire/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/empire/armorsmithy/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/empire/armorsmithy/init.lua	2018-07-24 09:41:57 +0000
@@ -71,6 +71,7 @@
             "call=produce_armor",
             "call=produce_armor_chain",
             "call=produce_armor_gilded",
+            "call=produce_armor_helmet",
             "return=skipped"
          }
       },
@@ -78,11 +79,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a helmet because ...
          descname = _"forging a helmet",
          actions = {
-            -- time total: 80
+            -- time total: 67+3,6
             "return=skipped unless economy needs armor_helmet",
-            "sleep=40000",  -- +8 enlarge
+            "sleep=47000",  
             "consume=iron coal",
-            "animate=working 40000",  -- +5 enlarge
+            "animate=working 20000", 
             "produce=armor_helmet"
          }
       },
@@ -90,11 +91,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a suit of armor because ...
          descname = _"forging a suit of armor",
          actions = {
-            -- time total: 90
+            -- time total: 77+3,6
             "return=skipped unless economy needs armor",
             "consume=iron coal cloth",
-            "sleep=40000",  -- +8 enlarge
-            "animate=working 50000",  -- +5 enlarge
+            "sleep=32000",  
+            "animate=working 45000",  
             "produce=armor"
          }
       },
@@ -102,11 +103,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a suit of chain armor because ...
          descname = _"forging a suit of chain armor",
          actions = {
-            -- time total: 108
+            -- time total: 77+3,6
             "return=skipped unless economy needs armor_chain",
             "consume=iron:2 coal cloth",
-            "sleep=47000",  -- +15 enlarge
-            "animate=working 61000",  -- +16 enlarge
+            "sleep=32000", 
+            "animate=working 45000", 
             "produce=armor_chain"
          }
       },
@@ -114,11 +115,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a suit of gilded armor because ...
          descname = _"forging a suit of gilded armor",
          actions = {
-            -- time total: 115
+            -- time total: 77+3,6
             "return=skipped unless economy needs armor_gilded",
             "consume=iron:2 coal:2 cloth gold",
-            "sleep=51000",  -- +19 enlarge
-            "animate=working 64000",  -- +19 enlarge
+            "sleep=32000",  
+            "animate=working 45000", 
             "produce=armor_gilded"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/empire/coalmine/init.lua'
--- data/tribes/buildings/productionsites/empire/coalmine/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/empire/coalmine/init.lua	2018-07-24 09:41:57 +0000
@@ -58,15 +58,18 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=45000",
+            "sleep=43000",
             "return=skipped unless economy needs coal",
             "consume=beer ration",
             "animate=working 20000",
-            "mine=coal 2 50 5 17",
-            "produce=coal:2",
+
             "animate=working 20000",
-            "mine=coal 2 50 5 17",
-            "produce=coal"
+            "mine=coal 2 50 15 17",
+            "produce=coal",
+            "sleep=2000",
+            "mine=coal 2 50 1 17",
+            "mine=coal 2 50 1 17",
+            "produce=coal:2"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -56,15 +56,21 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=42000",
+            "sleep=36000",
             "return=skipped unless economy needs coal",
             "consume=beer meal",
             "animate=working 18000",
-            "mine=coal 2 100 5 2",
+            "animate=working 18000",
+            "mine=coal 2 100 25 2",
+            "produce=coal",
+            "sleep=3000",
+            "mine=coal 2 100 1 2",
+            "mine=coal 2 100 1 2",
             "produce=coal:2",
-            "animate=working 18000",
-            "mine=coal 2 100 5 2",
-            "produce=coal:3"
+            "sleep=3000",
+            "mine=coal 2 100 1 2",
+            "mine=coal 2 100 1 2",
+            "produce=coal:2"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/empire/goldmine/init.lua'
--- data/tribes/buildings/productionsites/empire/goldmine/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/empire/goldmine/init.lua	2018-07-24 09:41:57 +0000
@@ -58,14 +58,16 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=45000",
+            "sleep=43000",
             "return=skipped unless economy needs gold_ore",
             "consume=ration wine",
             "animate=working 20000",
-            "mine=gold 2 50 5 17",
+
+            "animate=working 20000",
+            "mine=gold 2 50 10 17",
             "produce=gold_ore",
-            "animate=working 20000",
-            "mine=gold 2 50 5 17",
+            "sleep=2000",
+            "mine=gold 2 50 1 17",
             "produce=gold_ore"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -56,14 +56,16 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=43000",
+            "sleep=40000",
             "return=skipped unless economy needs gold_ore",
             "consume=meal wine",
             "animate=working 18000",
-            "mine=gold 2 100 5 2",
+            "animate=working 18000",
+            "mine=gold 2 100 15 2",
             "produce=gold_ore",
-            "animate=working 18000",
-            "mine=gold 2 100 5 2",
+            "sleep=3000",
+            "mine=gold 2 100 1 2",
+            "mine=gold 2 100 1 2",
             "produce=gold_ore:2"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/empire/inn/init.lua'
--- data/tribes/buildings/productionsites/empire/inn/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/empire/inn/init.lua	2018-07-24 09:41:57 +0000
@@ -64,11 +64,10 @@
          actions = {
             -- time total: 33
             "return=skipped unless economy needs ration",
-            "sleep=10000",
+            "sleep=23000",
             "consume=empire_bread,fish,meat",
             "playsound=sound/empire/taverns ration 100",
-            "animate=working 19000",
-            "sleep=4000",
+            "animate=working 10000",
             "produce=ration"
          }
       },
@@ -78,11 +77,10 @@
          actions = {
             -- time total: 40
             "return=skipped unless economy needs meal",
-            "sleep=10000",
             "consume=empire_bread fish,meat",
             "playsound=sound/empire/taverns meal 100",
             "animate=working 25000",
-            "sleep=5000",
+            "sleep=15000",
             "produce=meal"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/empire/ironmine/init.lua'
--- data/tribes/buildings/productionsites/empire/ironmine/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/empire/ironmine/init.lua	2018-07-24 09:41:57 +0000
@@ -58,14 +58,16 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=45000",
+            "sleep=43000",
             "return=skipped unless economy needs iron_ore",
             "consume=ration beer",
             "animate=working 20000",
-            "mine=iron 2 50 5 17",
+            "animate=working 20000",
+            "mine=iron 2 50 15 17",
             "produce=iron_ore",
-            "animate=working 20000",
-            "mine=iron 2 50 5 17",
+            "sleep=2000",
+            "mine=iron 2 50 1 17",
+            "mine=iron 2 50 1 17",
             "produce=iron_ore:2"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -56,15 +56,18 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=43000",
+            "sleep=40000",
             "return=skipped unless economy needs iron_ore",
             "consume=meal beer",
             "animate=working 18000",
-            "mine=iron 2 100 5 2",
-            "produce=iron_ore:2",
             "animate=working 18000",
-            "mine=iron 2 100 5 2",
-            "produce=iron_ore:2"
+            "mine=iron 2 100 20 2",
+            "produce=iron_ore",
+            "sleep=3000",
+            "mine=iron 2 100 1 2",
+            "mine=iron 2 100 1 2",
+            "mine=iron 2 100 1 2",
+            "produce=iron_ore:3"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/empire/marblemine/init.lua'
--- data/tribes/buildings/productionsites/empire/marblemine/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/empire/marblemine/init.lua	2018-07-24 09:41:57 +0000
@@ -60,39 +60,47 @@
          -- TRANSLATORS: Completed/Skipped/Did not start working because ...
          descname = _"working",
          actions = {
+            "call=mine_granite",
             "call=mine_marble",
-            "call=mine_granite",
             "return=skipped"
          }
       },
+      mine_granite = {
+         -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
+         descname = _"mining granite",
+         actions = {
+            "sleep=18000",
+            "return=skipped unless economy needs marble or economy needs granite",
+            "consume=ration wine",
+            "animate=working 20000",
+
+            "animate=working 20000",
+            "mine=stones 2 50 20 17",
+            "produce=granite",
+            "sleep=2000",
+            "mine=stones 2 50 1 17",
+            "mine=stones 2 50 1 17",
+            "mine=stones 2 50 1 17",
+            "produce=granite:2 marble"
+         }
+      },
       mine_marble = {
          -- TRANSLATORS: Completed/Skipped/Did not start mining marble because ...
          descname = _"mining marble",
          actions = {
-            "sleep=20000",
+            "sleep=18000",
             "return=skipped unless economy needs marble or economy needs granite",
             "consume=wine ration",
             "animate=working 20000",
-            "mine=stones 2 50 5 17",
-            "produce=marble:2",
-            "animate=working 20000",
-            "mine=stones 2 50 5 17",
-            "produce=marble granite"
-         }
-      },
-      mine_granite = {
-         -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
-         descname = _"mining granite",
-         actions = {
-            "sleep=20000",
-            "return=skipped unless economy needs marble or economy needs granite",
-            "consume=ration wine",
-            "animate=working 20000",
-            "mine=stones 2 50 5 17",
-            "produce=granite marble",
-            "animate=working 20000",
-            "mine=stones 2 50 5 17",
-            "produce=granite:2"
+            "animate=working 20000",
+
+            "mine=stones 2 50 20 17",
+            "produce=marble",
+            "sleep=2000",
+            "mine=stones 2 50 1 17",
+            "mine=stones 2 50 1 17",
+            "mine=stones 2 50 1 17",
+            "produce=marble:2 granite"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -57,15 +57,19 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining marble because ...
          descname = _"mining marble",
          actions = {
-            "sleep=43000",
+            "sleep=40000",
             "return=skipped unless economy needs marble or economy needs granite",
             "consume=meal wine",
             "animate=working 18000",
-            "mine=stones 2 100 5 2",
-            "produce=marble:2",
             "animate=working 18000",
-            "mine=stones 2 100 5 2",
-            "produce=marble granite:2"
+            "mine=stones 2 100 15 2",
+            "mine=stones 2 100 100 2",
+            "produce=marble granite",
+            "sleep=3000",
+            "mine=stones 2 100 1 2",
+            "mine=stones 2 100 1 2",
+            "mine=stones 2 100 1 2",
+            "produce=marble:2 granite"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/empire/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/empire/smelting_works/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/empire/smelting_works/init.lua	2018-07-24 09:41:57 +0000
@@ -71,9 +71,8 @@
          descname = _"smelting iron",
          actions = {
             "return=skipped unless economy needs iron",
-            "sleep=5000",  -- penalty for unavailable iron_ore (2x)
             "consume=iron_ore coal",
-            "sleep=20000",
+            "sleep=25000",
             "playsound=sound/metal fizzle 150",
             "animate=working 35000",
             "playsound=sound/metal ironping 80",
@@ -85,9 +84,8 @@
          descname = _"smelting gold",
          actions = {
             "return=skipped unless economy needs gold",
-            "sleep=10000",  -- penalty for unavailable gold_ore
             "consume=gold_ore coal",
-            "sleep=15000",
+            "sleep=25000",
             "playsound=sound/metal fizzle 150",
             "animate=working 35000",
             "playsound=sound/metal goldping 80",

=== modified file 'data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua	2018-07-24 09:41:57 +0000
@@ -77,12 +77,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a wooden spear because ...
          descname = _"forging a wooden spear",
          actions = {
-            -- time total: 64
+            -- time total: 50+3,6
             "return=skipped unless economy needs spear_wooden",
-            "sleep=27000",  -- +7 enlarge
+            "sleep=20000", 
             "consume=planks",
             "playsound=sound/smiths smith 192",
-            "animate=working 28000",  -- +7 enlarge
+            "animate=working 21000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=spear_wooden"
@@ -92,12 +92,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a spear because ...
          descname = _"forging a spear",
          actions = {
-            -- time total: 102
+            -- time total: 77+3,6
             "return=skipped unless economy needs spear",
             "consume=coal iron planks",
-            "sleep=47000",  -- +15 enlarge
+            "sleep=32000",  
             "playsound=sound/smiths smith 192",
-            "animate=working 46000",  -- +10 enlarge
+            "animate=working 36000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=spear"
@@ -107,12 +107,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging an advanced spear because ...
          descname = _"forging an advanced spear",
          actions = {
-            -- time total: 110
+            -- time total: 77+3,6
             "return=skipped unless economy needs spear_advanced",
             "consume=coal iron:2 planks",
-            "sleep=50000",  -- +18 enlarge
+            "sleep=32000",  
             "playsound=sound/smiths smith 192",
-            "animate=working 51000",  -- +15 enlarge
+            "animate=working 36000",  
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=spear_advanced"
@@ -122,12 +122,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a heavy spear because ...
          descname = _"forging a heavy spear",
          actions = {
-            -- time total: 115
+            -- time total: 77+3,6
             "return=skipped unless economy needs spear_heavy",
             "consume=coal:2 gold iron planks",
-            "sleep=55000",  -- +23 enlarge
+            "sleep=32000", 
             "playsound=sound/smiths smith 192",
-            "animate=working 51000",  -- +15 enlarge
+            "animate=working 36000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=spear_heavy"
@@ -137,12 +137,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a war spear because ...
          descname = _"forging a war spear",
          actions = {
-            -- time total: 120
+            -- time total: 77+3,6
             "return=skipped unless economy needs spear_war",
             "consume=coal:2 gold iron:2 planks",
-            "sleep=55000",  -- +23 enlarge
+            "sleep=32000",  
             "playsound=sound/smiths smith 192",
-            "animate=working 56000",  -- +20 enlarge
+            "animate=working 36000", 
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=spear_war"

=== modified file 'data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua'
--- data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua	2018-07-08 12:38:44 +0000
+++ data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua	2018-07-24 09:41:57 +0000
@@ -94,9 +94,9 @@
          descname = _"forging a felling ax",
          actions = {
             "return=skipped unless economy needs felling_ax",
-            "sleep=32000",
             "consume=log iron",
             "animate=working 35000",
+            "sleep=32000",
             "produce=felling_ax"
          },
       },
@@ -105,9 +105,9 @@
          descname = _"forging a pick",
          actions = {
             "return=skipped unless economy needs pick",
-            "sleep=32000",
             "consume=log iron",
             "animate=working 35000",
+            "sleep=32000",
             "produce=pick"
          },
       },
@@ -116,9 +116,9 @@
          descname = _"making a scythe",
          actions = {
             "return=skipped unless economy needs scythe",
-            "sleep=32000",
             "consume=log iron",
             "animate=working 35000",
+            "sleep=32000",
             "produce=scythe"
          },
       },
@@ -127,9 +127,9 @@
          descname = _"making a shovel",
          actions = {
             "return=skipped unless economy needs shovel",
-            "sleep=32000",
             "consume=log iron",
             "animate=working 35000",
+            "sleep=32000",
             "produce=shovel"
          },
       },
@@ -138,9 +138,9 @@
          descname = _"making a basket",
          actions = {
             "return=skipped unless economy needs basket",
-            "sleep=32000",
             "consume=thatch_reed log",
             "animate=working 35000",
+            "sleep=32000",
             "produce=basket"
          },
       },
@@ -149,9 +149,9 @@
          descname = _"making a hunting spear",
          actions = {
             "return=skipped unless economy needs hunting_spear",
-            "sleep=32000",
             "consume=log iron",
             "animate=working 35000",
+            "sleep=32000",
             "produce=hunting_spear"
          },
       },
@@ -160,9 +160,9 @@
          descname = _"making a fishing net",
          actions = {
             "return=skipped unless economy needs fishing_net",
-            "sleep=32000",
             "consume=thatch_reed:2",
             "animate=working 35000",
+            "sleep=32000",
             "produce=fishing_net"
          },
       },
@@ -171,9 +171,9 @@
          descname = _"making a bread paddle",
          actions = {
             "return=skipped unless economy needs bread_paddle",
-            "sleep=32000",
             "consume=log iron",
             "animate=working 35000",
+            "sleep=32000",
             "produce=bread_paddle"
          },
       },
@@ -182,9 +182,9 @@
          descname = _"making kitchen tools",
          actions = {
             "return=skipped unless economy needs kitchen_tools",
-            "sleep=32000",
             "consume=log iron",
             "animate=working 35000",
+            "sleep=32000",
             "produce=kitchen_tools"
          },
       },
@@ -193,9 +193,9 @@
          descname = _"making a hammer",
          actions = {
             "return=skipped unless economy needs hammer",
-            "sleep=32000",
             "consume=log iron",
             "animate=working 35000",
+            "sleep=32000",
             "produce=hammer"
          },
       },
@@ -204,9 +204,9 @@
          descname = _"making fire tongs",
          actions = {
             "return=skipped unless economy needs fire_tongs",
-            "sleep=32000",
             "consume=iron",
             "animate=working 35000",
+            "sleep=32000",
             "produce=fire_tongs"
          },
       },
@@ -215,9 +215,9 @@
          descname = _"making needles",
          actions = {
             "return=skipped unless economy needs needles",
-            "sleep=32000",
             "consume=iron",
             "animate=working 35000",
+            "sleep=32000",
             "produce=needles:2"
          },
       },

=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/coalmine/init.lua	2018-07-19 09:40:06 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine/init.lua	2018-07-24 09:41:57 +0000
@@ -69,6 +69,7 @@
             "consume=ration",
             "animate=working 40000",
             "mine=coal 3 50 5 20",
+            "mine=coal 3 50 100 20",
             "produce=coal:2"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua	2018-07-19 09:40:06 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -63,21 +63,24 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=40000",
+            "sleep=39800",
             "return=skipped unless economy needs coal",
             "consume=meal",
-            "animate=working 9000",
-            "mine=coal 3 100 10 5",
-            "produce=coal",
-            "animate=working 9000",
-            "mine=coal 3 100 10 5",
-            "produce=coal",
-            "animate=working 9000",
-            "mine=coal 3 100 10 5",
-            "produce=coal",
-            "animate=working 9000",
-            "mine=coal 3 100 10 5",
-            "produce=coal"
+            "animate=working 19000",
+            "animate=working 19000",
+            "animate=working 19000",
+            "mine=coal 3 100 70 5",
+            "produce=coal",
+            "sleep=2000",
+            "mine=coal 3 100 1 5",
+            "mine=coal 3 100 1 5",
+            "mine=coal 3 100 1 5",
+            "produce=coal:3",
+            "sleep=2000",
+            "mine=coal 3 100 1 5",
+            "mine=coal 3 100 1 5",
+            "mine=coal 3 100 1 5",
+            "produce=coal:3"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua'
--- data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua	2018-07-09 10:44:31 +0000
+++ data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua	2018-07-24 09:41:57 +0000
@@ -73,9 +73,9 @@
          descname = _"preparing a ration",
          actions = {
             "return=skipped unless economy needs ration",
-            "sleep=14000",
             "consume=fruit,smoked_fish,smoked_meat",
             "animate=working 19000",
+            "sleep=14000",
             "produce=ration"
          }
       },
@@ -84,9 +84,9 @@
          descname = _"preparing a meal",
          actions = {
             "return=skipped unless economy needs meal",
-            "sleep=10000",
             "consume=beer honey_bread smoked_fish,smoked_meat",
             "animate=working 30000",
+            "sleep=10000",
             "produce=meal"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/frisians/furnace/init.lua'
--- data/tribes/buildings/productionsites/frisians/furnace/init.lua	2018-07-08 17:54:33 +0000
+++ data/tribes/buildings/productionsites/frisians/furnace/init.lua	2018-07-24 09:41:57 +0000
@@ -80,9 +80,8 @@
          descname = _"smelting iron",
          actions = {
             "return=skipped unless economy needs iron",
-            "sleep=5000",
             "consume=coal iron_ore",
-            "sleep=22000",
+            "sleep=27000",
             "animate=working_iron 35000",
             "produce=iron"
          },
@@ -92,9 +91,8 @@
          descname = _"smelting gold",
          actions = {
             "return=skipped unless economy needs gold",
-            "sleep=10000",
             "consume=coal gold_ore",
-            "sleep=17000",
+            "sleep=27000",
             "animate=working_gold 35000",
             "produce=gold"
          },

=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua	2018-07-19 09:40:06 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -63,15 +63,22 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=40000",
-            "return=skipped unless economy needs gold_ore",
+            "sleep=39800",
+            "return=skipped unless economy needs coal",
             "consume=meal",
-            "animate=working 18000",
-            "mine=gold 3 100 10 5",
-            "produce=gold_ore:2",
-            "animate=working 18000",
-            "mine=gold 3 100 10 5",
-            "produce=gold_ore:2"
+            "animate=working 19000",
+            "animate=working 19000",
+            "animate=working 19000",
+            "mine=gold 3 100 50 5",
+            "produce=gold",
+            "sleep=2000",
+            "mine=gold 3 100 1 5",
+            "mine=gold 3 100 1 5",
+            "produce=gold:2",
+            "sleep=2000",
+            "mine=gold 3 100 1 5",
+            "mine=gold 3 100 1 5",
+            "produce=gold:2"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua'
--- data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua	2018-07-09 11:34:23 +0000
+++ data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua	2018-07-24 09:41:57 +0000
@@ -82,7 +82,7 @@
          -- TRANSLATORS: Completed/Skipped/Did not start baking bread because ...
          descname = _"baking bread",
          actions = {
-            "return=skipped unless economy needs bread_frisians or workers need experience",
+            "return=skipped unless economy needs bread_frisians",
             "sleep=20000",
             "consume=barley water",
             "animate=working 20000",

=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua	2018-07-19 09:40:06 +0000
+++ data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -63,15 +63,24 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=40000",
-            "return=skipped unless economy needs iron_ore",
+                      "sleep=62000",
+            "return=skipped unless economy needs iron",
             "consume=meal",
-            "animate=working 18000",
-            "mine=iron 3 100 10 5",
-            "produce=iron_ore:2",
-            "animate=working 18000",
-            "mine=iron 3 100 10 5",
-            "produce=iron_ore:2"
+            "animate=working 19000",
+            "animate=working 19000",
+            "animate=working 19000",
+            "mine=iron 3 100 70 5",
+            "produce=iron",
+            "sleep=2000",
+            "mine=iron 3 100 1 5",
+            "mine=iron 3 100 1 5",
+            "mine=iron 3 100 1 5",
+            "produce=iron:3",
+            "sleep=2000",
+            "mine=iron 3 100 1 5",
+            "mine=iron 3 100 1 5",
+            "mine=iron 3 100 1 5",
+            "produce=iron:3"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua'
--- data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua	2018-07-09 11:34:23 +0000
+++ data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua	2018-07-24 09:41:57 +0000
@@ -80,7 +80,7 @@
          -- TRANSLATORS: Completed/Skipped/Did not start brewing beer because ...
          descname = _"brewing beer",
          actions = {
-            "return=skipped unless economy needs beer or workers need experience",
+            "return=skipped unless economy needs beer",
             "sleep=30000",
             "consume=barley water",
             "animate=working 30000",

=== modified file 'data/tribes/buildings/productionsites/frisians/recycling_center/init.lua'
--- data/tribes/buildings/productionsites/frisians/recycling_center/init.lua	2018-07-09 09:25:35 +0000
+++ data/tribes/buildings/productionsites/frisians/recycling_center/init.lua	2018-07-24 09:41:57 +0000
@@ -96,9 +96,9 @@
          descname = pgettext("frisians_building", "recycling iron"),
          actions = {
             "return=skipped unless economy needs iron",
-            "sleep=40000",
             "consume=scrap_iron:2 coal",
             "animate=working_metal 40000",
+            "sleep=40000",
             "produce=iron:2"
          }
       },
@@ -107,9 +107,9 @@
          descname = pgettext("frisians_building", "recycling iron and gold"),
          actions = {
             "return=skipped unless economy needs iron or economy needs gold",
-            "sleep=40000",
             "consume=scrap_metal_mixed:2 coal",
             "animate=working_metal 40000",
+            "sleep=40000",
             "produce=iron gold"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/rockmine/init.lua	2018-07-19 09:40:06 +0000
+++ data/tribes/buildings/productionsites/frisians/rockmine/init.lua	2018-07-24 09:41:57 +0000
@@ -65,14 +65,15 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
          descname = _"mining granite",
          actions = {
-            "sleep=45000",
+            "sleep=43000",
             "return=skipped unless economy needs granite",
             "consume=ration",
             "animate=working 20000",
-            "mine=stones 3 50 5 20",
+            "animate=working 20000",
+            "mine=stones 3 50 10 20",
             "produce=granite",
-            "animate=working 20000",
-            "mine=stones 3 50 5 20",
+            "sleep=2000",
+            "mine=stones 3 50 1 20",
             "produce=granite"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua	2018-07-19 09:40:06 +0000
+++ data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua	2018-07-24 09:41:57 +0000
@@ -63,18 +63,24 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
          descname = _"mining granite",
          actions = {
-            "sleep=40000",
+            "sleep=39800",
             "return=skipped unless economy needs granite",
             "consume=meal",
-            "animate=working 12000",
-            "mine=stones 3 100 10 5",
-            "produce=granite",
-            "animate=working 12000",
-            "mine=stones 3 100 10 5",
-            "produce=granite",
-            "animate=working 12000",
-            "mine=stones 3 100 10 5",
-            "produce=granite"
+            "animate=working 19000",
+            "animate=working 19000",
+            "animate=working 19000",
+            "mine=granite 3 100 70 5",
+            "produce=granite",
+            "sleep=2000",
+            "mine=granite 3 100 1 5",
+            "mine=granite 3 100 1 5",
+            "mine=granite 3 100 1 5",
+            "produce=granite:3",
+            "sleep=2000",
+            "mine=granite 3 100 1 5",
+            "mine=granite 3 100 1 5",
+            "mine=granite 3 100 1 5",
+            "produce=granite:3"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/frisians/smokery/init.lua'
--- data/tribes/buildings/productionsites/frisians/smokery/init.lua	2018-07-08 17:54:33 +0000
+++ data/tribes/buildings/productionsites/frisians/smokery/init.lua	2018-07-24 09:41:57 +0000
@@ -73,9 +73,9 @@
          descname = _"smoking fish",
          actions = {
             "return=skipped unless economy needs smoked_fish",
-            "sleep=16000",
             "consume=fish:2 log",
             "animate=working 30000",
+            "sleep=16000",
             "produce=smoked_fish:2"
          },
       },

=== modified file 'data/txts/developers.json'
--- data/txts/developers.json	2018-05-26 15:33:37 +0000
+++ data/txts/developers.json	2018-07-24 09:41:57 +0000
@@ -386,6 +386,7 @@
 					"members":[
 						"Matt Howe (mdhowe)",
 						"Samuel Tilly (eldamar)",
+						"WorldSavior",
 						"and many, many more (thank you for everything you've done)"
 					]
 				}


Follow ups