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

[GunChleoc]

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

[Benedikt Straub (nordfriese)]

Reviewed the code, added a lot of small comments for code style. Feel free to ignore.
Also found a typo in the frisian deep gold mine and a possible bug in the design of all mines, please fix.

Is it really intended that the frisian deep gold and iron mines produce gold and iron directly now, rather than ores???

review: Needs Fixing (review)

[hessenfarmer (stephan-lutz)]

Agree to most of Nordfrieses Comments

stats are looking much better now in the Excel. will upload them to the bug ASAP

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3718. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/407539420.
Appveyor build 3518. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3518.

[Benedikt Straub (nordfriese)]

Found another issue: For the buildings where the penalty for missing wares has been removed, the program order is now:
  "return=skipped unless economy needs <ware>",
  "consume=<wares>",
  "animate=working <time>",
  "sleep=<time>",
  "produce=<wares>"
The last two lines should be switched here for all those buildings. It´ll look strange if the building works, then nothing happens, much later after some sleeptime a ware is produced.

[hessenfarmer (stephan-lutz)]

I agree to Nordfrieses last comment.
Just ignore my commet about worker experience didn't see that it is the upgraded building.

We should document the new philosophy of the mines preferably in the RST section:
- now one ressource on the map delivers exactly one ware
- the probability is now calculated over the complete work cycle and implemented in the first mine command
- all working animations are put at the beginning of the command cycle.

I will try to playtest These values with the AI as this Change might have an Impact on AI due to different stats if depleted.

Thanks to WorldSavior for the changes

[hessenfarmer (stephan-lutz)]

found an error which prevented playtesting
will fix the errors and upload within an hour so please do not upload anything until then.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3721. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/407778348.
Appveyor build 3521. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3521.

[hessenfarmer (stephan-lutz)]

Ok yesterday I fixed all diff comments from Nordfriese and me. (Hope I caught all of them)
Did a testrun of 4 Ai (one of each tribe) on Full moon map. No anomalies showed up in the first 3 hours. Although no mine got depleted so I couldn't get the stats of a depleted mine. Ai was working ok.
Did some updates to my excel calculations about the needed Buildings to supply the soldier production. I uploaded the excel file to the frisians balancing bug. The calculations showed that we needed to adjust frisian weapon production times a lot. I entered values of comparable weapons of the other tribes. And added them to lua.

Furthermore I discovered that we should set the trainingsite percentage of at least one trainingsite for each tribe due to their different full cycle time (e.g. for barbarians the trainingcamp does need 240 seconds for a whole cycle while the arena does need only 60 which means the arena could supply 4 camps with fully trained soldiers) so I fixed this on the fly.
From my side the branch could be ready now pending further review of my late changes.

review: Needs Resubmitting

[Benedikt Straub (nordfriese)]

Found no more errors, changes look sensible. Didn´t test.

review: Approve (review)

[hessenfarmer (stephan-lutz)]

After discussing this in the Forum the marble mine probability settings need to be changed back to 20%.
found another issue in the code of the mine program
in lines following
https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/logic/map_objects/tribes/production_program.cc#L1164

a penalty for depleting fields is defined. this leads to a failed production program without taking into account the chance when depleted. see line
https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/logic/map_objects/tribes/production_program.cc#L1214

so the situation where 2 mined resources could be thrown away (3rd mining step failing seem to be much more frequent than I thought. This effect will be worse the bigger the radius is (worst for Atlanteans) So we need to consider this in the programs probably or we need to change the mining code

review: Needs Fixing

[GunChleoc (gunchleoc)]

> We should document the new philosophy of the mines preferably in the RST section:
> - now one ressource on the map delivers exactly one ware
> - the probability is now calculated over the complete work cycle and implemented in the first mine command
> - all working animations are put at the beginning of the command cycle.

Good idea - make sure that it gets phrased as a string recommendation rather than a guarantee, since there is no implementation enforcing it. also a little howto on how to calculate the probability?

[hessenfarmer (stephan-lutz)]

I have some proposals to fix the issues discovered.
see my latest post in
https://wl.widelands.org/forum/topic/4232/?page=8#post-25429

in short the mine programs should look like

   programs = {
      work = {
         -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
         descname = _"mining coal",
         actions = {
            "sleep=40000",
            "return=skipped unless economy needs coal",
            "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
            "animate=working 60000",
            "call=mine_produce",
            "call=mine_produce",
            "call=mine_produce",
            "call=mine_produce",
            "call=mine_produce",
            "call=mine_produce",
            "call=mine_produce",

         }
      },
      mine_produce = {
         -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
         descname = _"mining and producing",
         actions = {
            "sleep=1000",
            "mine=coal 4 100 5 2",
            "produce=coal",
      },
   },

Additionally the penalty for totally depleted fields should be removed in
https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/logic/map_objects/tribes/production_program.cc#L1214
last but not least statistics have to be fixed and the production return_string should be defined at the end of the complete "work programm" at least for the mines.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3746. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/411028029.
Appveyor build 3546. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3546.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3757. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/412175411.
Appveyor build 3557. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3557.

[hessenfarmer (stephan-lutz)]

Ok did some playtesting. Programs work fine. mine statistics seem to be much better now (e.g. around 5% when depleted). Atlanteans mines deplete faster now while still having some problems finding the last bit.
Should be ok now.

review: Needs Resubmitting

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3764. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/414390985.
Appveyor build 3563. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3563.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3808. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/416273240.
Appveyor build 3607. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3607.

[GunChleoc (gunchleoc)]

Is this ready for merging?

[hessenfarmer (stephan-lutz)]

In principle Yes. Needs some reviews however and I can't do this for my own stuff.

[Toni Förster (stonerl)]

The atlantian's crystalmine has the sleep between the conditional "return=skipped" and "consume" while all other mines(for all tribes) have it before the return=skipped. Which one is correct? Also I remember that this penalty was removed e.g. for the taverns. Why is it still in place for all the mines except this one?

[hessenfarmer (stephan-lutz)]

I agree that is somewhat not very streamlined. The difference for the crystalline is that it produces different outputs while normal mindshare producing only one. So the current design doesn't do that much harm but we should keep this consistent.
I from my perspective a beginning sleep of 5 seconds for all mines except crystal and marble mine would be ok. Rest of the sleep time should be moved before the call commands.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3828. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/418892074.
Appveyor build 3627. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3627.

[Toni Förster (stonerl)]

One question regarding the shipyards. It takes 16 steps to complete a ship. But 20 to reach 100% productivity. That somehow doesn't feel right; having built an entire ship but only 80% productivity.

What about moving the animation to the work program and remove the return from there to have statistics calculated. Instead move the sleep to the ship program.

It's like in the real world: preparing parts in the workshop, packinge them move to the dock, assemble them.

One step in building a ship would then gain 10% in productivity.

[hessenfarmer (stephan-lutz)]

I think we should discuss this in the forum. I see the point but I believe your proposed solution would result in unreliable stats in the case that not enough construction material is delivered to the shipyard.
Furthermore I think we should not have this in this branch cause it got already much bigger than its title suggests. I really would like if somebody could review the changes and approve this one. Still hope for Worldsaviors opinion over the forum (he has no Launchpad account).

[GunChleoc (gunchleoc)]

Agreed. This branch should only get tweaks to changes that are already in it. @Toni, would you like to review hessenfarmer's work?

[Toni Förster (stonerl)]

I already had a look at some of the changes made here. From my side it looks okay so far. Any particular I have to look at?

[Toni Förster (stonerl)]

LGTM

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3897. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/424658912.
Appveyor build 3695. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3695.

[GunChleoc (gunchleoc)]

The wares cannot be fixed without a bug overhaul of the production program code, and it's too late in the release cycle to do that now. The only alternative would be some really really ugly hacks, which I don't want to do.

The problem is that the consumed wares are not in the same programs as the produced wares.

I propose that we split off all the changes that don't create this problem into a new branch and merge that one.

review: Needs Fixing

[hessenfarmer (stephan-lutz)]

The changes creating the problem are the heart of this change, cause they fix a lot of weird behaviour in the mines as well as adjusting timings for better balance.

Therefore I would vote for having the branch as it is and just adding a note to the encyclopedia window and to the release notes that the values for all mined products aren't correct. Perhaps we can make the homepage show the correct values otherwise we need to find another way to inform the players about this.

For me it seems better to have consistent mines with a lot less issues and have an issue with the encyclopedia instead.

[GunChleoc (gunchleoc)]

I'll see about programming a filter into the help's Lua script.

[GunChleoc (gunchleoc)]

It will now show "Calculation needed" if the building is a mine, and the produced and consumed wares as usual for all other buildings.

review: Needs Resubmitting

[hessenfarmer (stephan-lutz)]

Should be ok for the moment being.
I was thinking of a solution to count the call's for a production program to have the correct amount. and display the consume information of the calling program.
But at the moment I am still struggling how to asses the production programs tables in lua.

Any hints would be welcome but this can easily be done in a follow on branch.

[GunChleoc (gunchleoc)]

If it could be done easily, I would have already done it. I actually started coding for it and then reverted my changes, because it became pretty hacky and complicated very fast.

We need a proper tree structure for production programs - it's a good idea to have one anyway, since that will also get rid of the problem that you had with the program names regarding in which order they are loaded by the engine. Replacing the "call" program with nested tables is the way to go.

@bunnybot merge

[hessenfarmer (stephan-lutz)]

I found a solution to have the correct values in the encyclopedia. Maybe it is not very elegant but it is at least working until we have the redesign. See if you want to have it.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3918. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426311064.
Appveyor build 3716. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3716.

[bunnybot (widelandsofficial)]

Error merging this proposal:

Output:
stdout:

stderr:
 M data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua
 M data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
 M data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua
 M data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua
 M data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua
 M data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua
 M data/tribes/buildings/productionsites/atlanteans/smokery/init.lua
 M data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua
 M data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua
 M data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua
 M data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua
 M data/tribes/buildings/productionsites/barbarians/big_inn/init.lua
 M data/tribes/buildings/productionsites/barbarians/coalmine/init.lua
 M data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua
 M data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua
 M data/tribes/buildings/productionsites/barbarians/goldmine/init.lua
 M data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua
 M data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua
 M data/tribes/buildings/productionsites/barbarians/granitemine/init.lua
 M data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua
 M data/tribes/buildings/productionsites/barbarians/inn/init.lua
 M data/tribes/buildings/productionsites/barbarians/ironmine/init.lua
 M data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua
 M data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua
 M data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua
 M data/tribes/buildings/productionsites/barbarians/tavern/init.lua
 M data/tribes/buildings/productionsites/barbarians/warmill/init.lua
 M data/tribes/buildings/productionsites/empire/armorsmithy/init.lua
 M data/tribes/buildings/productionsites/empire/coalmine/init.lua
 M data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua
 M data/tribes/buildings/productionsites/empire/goldmine/init.lua
 M data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua
 M data/tribes/buildings/productionsites/empire/inn/init.lua
 M data/tribes/buildings/productionsites/empire/ironmine/init.lua
 M data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua
 M data/tribes/buildings/productionsites/empire/marblemine/init.lua
 M data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua
 M data/tribes/buildings/productionsites/empire/smelting_works/init.lua
 M data/tribes/buildings/productionsites/empire/tavern/init.lua
 M data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua
 M data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua
 M data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua
 M data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua
 M data/tribes/buildings/productio...

[Toni Förster (stonerl)]

I do have one question regarding the empire.

The armorsmithy produces 2 armor_helmet with the changes made in this branch, instead of one. The question I have is: why does the trainingcamp need helmets? The soldiers are already equipped with one.

The barbarians for example don't have a helmet when they start as a soldier they just need an ax and when they level up the receive new improved gear.

Why not go the same route with the empire?

Option 1:

Normal soldiers receive only a wooden spear but no helmet.
When they level up they receive their helmets.

Option 2:

Normal soldiers receive a wooden spear and helmet, but the trainingcamp doesn't need one.

I just noticed this while merging trunk and fixing merge conflicts.

[hessenfarmer (stephan-lutz)]

I don't know why this is the case. and yes this is really illogical, ut I know that changing this would affect balancing directly as the empire would need one item less to build fully trained soldiers.
The idea behind the balance of tribes is to some extent based on equal costs.
Nevertheless I will search the forum for a reason / thread. I am open to change this in build 21 while keeping the balance. But this needs proper evaluation.
So feel free to start / continue a forum discussion and open a bug to not forget the issue.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3929. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/426668190.
Appveyor build 3727. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3727.

[GunChleoc (gunchleoc)]

Code with the dummy program LGTM. Can you please add a TODO comment to the wares help in order to document that it's a hack and waiting for an engine redesign on the production programs?

Not tested yet.

[GunChleoc (gunchleoc)]

Tested now and TODO comment added

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3939. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/427302588.
Appveyor build 3737. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3737.

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/farm2.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/farm2.lua	2018-08-22 06:48:57 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/farm2.lua	2018-09-11 16:57:31 +0000
@@ -46,7 +46,7 @@
          actions = {
             "call=plant",
             "call=harvest",
-            "return=skipped"
+            "return=no_stats"
          }
       },
       plant = {

=== modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua	2018-09-11 16:57:31 +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
             "consume=iron:2 coal:2",
-            "animate=working 45000",  -- +10 enlarge
+            "sleep=32000",
+            "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-09-11 16:57:31 +0000
@@ -57,21 +57,45 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=45000",
+            -- time total: 105 + 7 x 3.6
+            "sleep=5000",
             "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",
-            "produce=coal:3"
+            "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
+            -- calling the subroutine "mine_produce" has the effect
+            -- that even when depleted the mine has 7 working cycles 
+            -- as no call cycle is skipped due to a failed mine command
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         },
+      },
+      mine_produce = {
+         descname = _"mining coal",
+         actions = {
+            "animate=working 10000",
+            "mine=coal 4 100 5 2",
+            "produce=coal",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
+            "produce=coal:7",
          }
       },
    },
+
    out_of_resource_notification = {
       -- Translators: Short for "Out of ..." for a resource
       title = _"No Coal",

=== modified file 'data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua	2018-09-11 16:57:31 +0000
@@ -71,20 +71,15 @@
          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",
-            "produce=granite",
-            "animate=working 20000",
-            "mine=stones 4 100 5 2",
-            "produce=quartz"
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_quartz",
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_granite",
+            "return=no_stats"
          }
       },
       mine_quartz = {
@@ -92,17 +87,15 @@
          descname = _"mining quartz",
          actions = {
             "return=skipped unless economy needs quartz",
-            "sleep=45000",
+            "sleep=30000",
             "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",
-            "produce=quartz:2"
+            "call=a_mine_produce_quartz",
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_quartz",
+            "call=a_mine_produce_quartz",
+            "return=no_stats"
          }
       },
       mine_diamond = {
@@ -110,17 +103,60 @@
          descname = _"mining diamonds",
          actions = {
             "return=skipped unless economy needs diamond",
-            "sleep=45000",
-            "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"
+            "sleep=40000",
+            "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
+            "call=a_mine_produce_diamond",
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_diamond",
+            "return=no_stats"
+         }
+      },
+      a_mine_produce_granite = {
+         descname = _"mining granite",
+         actions = {
+            "animate=working 15000",
+            "mine=stones 4 100 5 2",
+            "produce=granite",
+         }
+      },
+      a_mine_produce_quartz = {
+         descname = _"mining quartz",
+         actions = {
+            "animate=working 10000",
+            "mine=stones 4 100 5 2",
+            "produce=quartz",
+         }
+      },
+      a_mine_produce_diamond = {
+         descname = _"mining diamonds",
+         actions = {
+            "animate=working 25000",
+            "mine=stones 4 100 5 2",
+            "produce=diamond",
+         }
+      },
+      encyclopedia_granite = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
+            "produce=granite:5 quartz",
+         }
+      },
+      encyclopedia_quartz = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
+            "produce=quartz:3 granite:3",
+         }
+      },
+      encyclopedia_diamond = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
+            "produce=diamond:2 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-09-11 16:57:31 +0000
@@ -57,18 +57,30 @@
          -- 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=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"
+            "sleep=34000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining gold",
+         actions = {
+            "animate=working 22000",
+            "mine=gold 4 100 5 2",
+            "produce=gold_ore",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
+            "produce=gold_ore:3",
          }
       },
    },

=== 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-09-11 16:57:31 +0000
@@ -57,21 +57,37 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
          descname = _"mining iron",
          actions = {
-            "sleep=45000",
+            -- time total: 105 + 5 x 3.6
+            "sleep=5000",
             "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",
+            "sleep=30000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         },
+      },
+      mine_produce = {
+         descname = _"mining iron",
+         actions = {
+            "animate=working 14000",
             "mine=iron 4 100 5 2",
             "produce=iron_ore",
-            "animate=working 20000",
-            "mine=iron 4 100 5 2",
-            "produce=iron_ore:2"
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
+            "produce=iron_ore:5",
          }
       },
    },
+
    out_of_resource_notification = {
       -- Translators: Short for "Out of ..." for a resource
       title = _"No Iron",

=== modified file 'data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua	2018-09-11 16:57:31 +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	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/atlanteans/smokery/init.lua	2018-09-11 16:57:31 +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	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua	2018-09-11 16:57:31 +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=no_stats"
          }
       },
@@ -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	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua	2018-09-11 16:57:31 +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
             "consume=iron planks",
+            "sleep=20000",
             "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	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua	2018-09-11 16:57:31 +0000
@@ -67,13 +67,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start weaving spidercloth because ...
          descname = _"weaving spidercloth",
          actions = {
-            -- total time 47 sec
+            -- time total: 40 + 3.6
             "return=skipped unless economy needs spidercloth",
-            "sleep=10000",
             "consume=spider_silk",
+            "sleep=20000",
             "playsound=sound/mill weaving 120",
             "animate=working 20000",
-            "sleep=17000",
             "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
+            -- time total: 40 + 3.6
             "return=skipped unless economy needs tabard",
-            "sleep=10000",
             "consume=spider_silk",
+            "sleep=20000",
             "playsound=sound/mill weaving 120",
-            "animate=working 26000",
-            "sleep=19000",
+            "animate=working 20000",
             "produce=tabard"
          }
       },
@@ -95,13 +93,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start tailoring a golden tabard because ...
          descname = _"tailoring a golden tabard",
          actions = {
-             -- total time 60 sec
+            -- time total: 40 + 3.6
             "return=skipped unless economy needs tabard_golden",
             "consume=spider_silk gold_thread",
-            "sleep=15000",
+            "sleep=20000",
             "playsound=sound/mill weaving 120",
-            "animate=working 30000",
-            "sleep=15000",
+            "animate=working 20000",
             "produce=tabard_golden"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua	2018-09-11 16:57:31 +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
             "consume=coal iron",
+            "sleep=26000",
             "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	2018-09-09 10:17:40 +0000
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua	2018-09-11 16:57:31 +0000
@@ -71,10 +71,11 @@
          actions = {
             -- time total: 33
             "return=skipped unless economy needs ration",
-            "sleep=23000",
+            "sleep=5000",
             "consume=barbarians_bread,fish,meat",
             "playsound=sound/barbarians/taverns tavern 100",
-            "animate=working 10000",
+            "animate=working 18000",
+            "sleep=10000",
             "produce=ration"
          }
       },
@@ -84,10 +85,10 @@
          actions = {
             -- time total: 37
             "return=skipped unless economy needs snack",
-            "sleep=5000",
             "consume=barbarians_bread fish,meat beer",
             "playsound=sound/barbarians/taverns biginn 100",
-            "animate=working 32000",
+            "animate=working 27000",
+            "sleep=10000",
             "produce=snack"
          }
       },
@@ -97,10 +98,10 @@
          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",
-            "animate=working 35000",
+            "animate=working 30000",
+            "sleep=10000",
             "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-09-11 16:57:31 +0000
@@ -60,12 +60,29 @@
          -- 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",
-            "animate=working 20000",
+            "sleep=40000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining coal",
+         actions = {
+            "animate=working 10000",
             "mine=coal 2 33 5 17",
-            "produce=coal:2"
+            "produce=coal",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=ration",
+            "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-09-11 16:57:31 +0000
@@ -60,15 +60,31 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=42000",
+            "sleep=5000",
             "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"
+            "sleep=35000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining coal",
+         actions = {
+            "animate=working 9500",
+            "mine=coal 2 66 5 17",
+            "produce=coal",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=snack",
+            "produce=coal:4",
          }
       },
    },

=== 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-09-11 16:57:31 +0000
@@ -59,15 +59,32 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=40000",
+            "sleep=5000",
             "return=skipped unless economy needs coal",
             "consume=meal",
-            "animate=working 16000",
-            "mine=coal 2 100 10 2",
-            "produce=coal:2",
-            "animate=working 16000",
-            "mine=coal 2 100 10 2",
-            "produce=coal:3"
+            "sleep=32000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining coal",
+         actions = {
+            "animate=working 7000",
+            "mine=coal 2 100 10 2",
+            "produce=coal",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=meal",
+            "produce=coal:5",
          }
       },
    },

=== 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-09-11 16:57:31 +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	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua	2018-09-11 16:57:31 +0000
@@ -60,15 +60,31 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
          descname = _"mining gold",
          actions = {
-            "sleep=42000",
+            "sleep=5000",
             "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"
+            "sleep=35000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining gold",
+         actions = {
+            "animate=working 9500",
+            "mine=gold 2 66 5 17",
+            "produce=gold_ore",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=snack",
+            "produce=gold_ore:4",
          }
       },
    },

=== 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-09-11 16:57:31 +0000
@@ -59,15 +59,31 @@
          -- 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",
-            "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"
+            "sleep=33000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining gold",
+         actions = {
+            "animate=working 9000",
+            "mine=gold 2 100 10 2",
+            "produce=gold_ore",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=meal",
+            "produce=gold_ore:4",
          }
       },
    },

=== 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-09-11 16:57:31 +0000
@@ -58,12 +58,29 @@
          -- 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",
-            "animate=working 20000",
-            "mine=stones 2 100 5 17",
-            "produce=granite:2"
+            "sleep=15000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining granite",
+         actions = {
+            "animate=working 10000",
+            "mine=stones 2 100 5 2",
+            "produce=granite",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=ration",
+            "produce=granite:2",
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua'
--- data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua	2018-09-11 16:57:31 +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
             "consume=coal iron",
-            "animate=working 40000", -- +5 enlarge
+            "sleep=32000",
+            "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	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua	2018-09-11 16:57:31 +0000
@@ -82,10 +82,9 @@
          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",
+            "animate=working 27000",
             "sleep=10000",
             "produce=snack"
          }

=== 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-09-11 16:57:31 +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	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua	2018-09-11 16:57:31 +0000
@@ -60,15 +60,31 @@
          -- 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=snack",
-            "animate=working 18000",
+            "sleep=35000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining iron",
+         actions = {
+            "animate=working 9500",
             "mine=iron 2 66 5 17",
             "produce=iron_ore",
-            "animate=working 18000",
-            "mine=iron 2 66 5 17",
-            "produce=iron_ore:1"
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=snack",
+            "produce=iron_ore:4",
          }
       },
    },

=== 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-09-11 16:57:31 +0000
@@ -59,18 +59,32 @@
          -- 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=meal",
-            "animate=working 16000",
+            "sleep=33000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining iron",
+         actions = {
+            "animate=working 10000",
             "mine=iron 2 100 10 2",
             "produce=iron_ore",
-            "animate=working 16000",
-            "mine=iron 2 100 10 2",
-            "produce=iron_ore:2",
-            "animate=working 16000",
-            "mine=iron 2 100 10 2",
-            "produce=iron_ore:2"
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=meal",
+            "produce=iron_ore:5",
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua	2018-09-11 16:57:31 +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/tavern/init.lua'
--- data/tribes/buildings/productionsites/barbarians/tavern/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua	2018-09-11 16:57:31 +0000
@@ -60,11 +60,13 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing a ration because ...
          descname = _"preparing a ration",
          actions = {
-            "sleep=14000",
+             -- time total: 33
             "return=skipped unless economy needs ration",
+            "sleep=5000",
             "consume=barbarians_bread,fish,meat",
             "playsound=sound/barbarians/taverns tavern 100",
-            "animate=working 19000",
+            "animate=working 18000",
+            "sleep=10000",
             "produce=ration"
          },
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/warmill/init.lua'
--- data/tribes/buildings/productionsites/barbarians/warmill/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/barbarians/warmill/init.lua	2018-09-11 16:57:31 +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
             "consume=coal iron",
+            "sleep=26000",
             "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	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/empire/armorsmithy/init.lua	2018-09-11 16:57:31 +0000
@@ -71,6 +71,7 @@
             "call=produce_armor",
             "call=produce_armor_chain",
             "call=produce_armor_gilded",
+            "call=produce_armor_helmet",
             "return=no_stats"
          }
       },
@@ -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
             "consume=iron coal",
-            "animate=working 40000",  -- +5 enlarge
+            "sleep=47000",
+            "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-09-11 16:57:31 +0000
@@ -58,15 +58,30 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=45000",
+            "sleep=5000",
             "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"
+            "sleep=38000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining coal",
+         actions = {
+            "animate=working 14000",
+            "mine=coal 2 50 5 17",
+            "produce=coal",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=beer ration",
+            "produce=coal:3",
          }
       },
    },

=== 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-09-11 16:57:31 +0000
@@ -56,15 +56,32 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=42000",
+            "sleep=5000",
             "return=skipped unless economy needs coal",
             "consume=beer meal",
-            "animate=working 18000",
-            "mine=coal 2 100 5 2",
-            "produce=coal:2",
-            "animate=working 18000",
-            "mine=coal 2 100 5 2",
-            "produce=coal:3"
+            "sleep=33000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining coal",
+         actions = {
+            "animate=working 8000",
+            "mine=coal 2 100 5 2",
+            "produce=coal",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=beer meal",
+            "produce=coal:5",
          }
       },
    },

=== 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-09-11 16:57:31 +0000
@@ -58,15 +58,29 @@
          -- 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 wine",
-            "animate=working 20000",
+            "sleep=38000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining gold",
+         actions = {
+            "animate=working 21000",
             "mine=gold 2 50 5 17",
             "produce=gold_ore",
-            "animate=working 20000",
-            "mine=gold 2 50 5 17",
-            "produce=gold_ore"
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=ration wine",
+            "produce=gold_ore:2",
          }
       },
    },

=== 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-09-11 16:57:31 +0000
@@ -56,15 +56,30 @@
          -- 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=meal wine",
-            "animate=working 18000",
+            "sleep=35000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining gold",
+         actions = {
+            "animate=working 13000",
             "mine=gold 2 100 5 2",
             "produce=gold_ore",
-            "animate=working 18000",
-            "mine=gold 2 100 5 2",
-            "produce=gold_ore:2"
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=meal wine",
+            "produce=gold_ore:3",
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/empire/inn/init.lua'
--- data/tribes/buildings/productionsites/empire/inn/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/empire/inn/init.lua	2018-09-11 16:57:31 +0000
@@ -64,11 +64,11 @@
          actions = {
             -- time total: 33
             "return=skipped unless economy needs ration",
-            "sleep=10000",
+            "sleep=5000",
             "consume=empire_bread,fish,meat",
             "playsound=sound/empire/taverns ration 100",
-            "animate=working 19000",
-            "sleep=4000",
+            "animate=working 18000",
+            "sleep=10000",
             "produce=ration"
          }
       },
@@ -78,11 +78,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",
+            "animate=working 30000",
+            "sleep=10000",
             "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-09-11 16:57:31 +0000
@@ -58,15 +58,30 @@
          -- 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 beer",
-            "animate=working 20000",
+            "sleep=38000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining iron",
+         actions = {
+            "animate=working 14000",
             "mine=iron 2 50 5 17",
             "produce=iron_ore",
-            "animate=working 20000",
-            "mine=iron 2 50 5 17",
-            "produce=iron_ore:2"
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=ration beer",
+            "produce=iron_ore:3",
          }
       },
    },

=== 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-09-11 16:57:31 +0000
@@ -56,15 +56,31 @@
          -- 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=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"
+            "sleep=34000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining iron",
+         actions = {
+            "animate=working 10000",
+            "mine=iron 2 100 5 2",
+            "produce=iron_ore",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=meal beer",
+            "produce=iron_ore:4",
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/empire/marblemine/init.lua'
--- data/tribes/buildings/productionsites/empire/marblemine/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/empire/marblemine/init.lua	2018-09-11 16:57:31 +0000
@@ -60,8 +60,22 @@
          -- TRANSLATORS: Completed/Skipped/Did not start working because ...
          descname = _"working",
          actions = {
+            "call=mine_granite",
             "call=mine_marble",
-            "call=mine_granite",
+            "return=no_stats"
+         }
+      },
+      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",
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_marble",
+            "call=a_mine_produce_granite",
             "return=no_stats"
          }
       },
@@ -69,30 +83,46 @@
          -- 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"
+            "call=a_mine_produce_marble",
+            "call=a_mine_produce_marble",
+            "call=a_mine_produce_granite",
+            "call=a_mine_produce_marble",
+            "return=no_stats"
          }
       },
-      mine_granite = {
-         -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
+      a_mine_produce_granite = {
          descname = _"mining granite",
          actions = {
-            "sleep=20000",
-            "return=skipped unless economy needs marble or economy needs granite",
+            "animate=working 10500",
+            "mine=stones 2 50 5 17",
+            "produce=granite",
+         }
+      },
+      a_mine_produce_marble = {
+         descname = _"mining marble",
+         actions = {
+            "animate=working 10500",
+            "mine=stones 2 50 5 17",
+            "produce=marble",
+         }
+      },
+      encyclopedia_granite = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
             "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"
+            "produce=granite:3 marble",
+         }
+      },
+      encyclopedia_marble = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=wine ration",
+            "produce=marble:3 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-09-11 16:57:31 +0000
@@ -57,15 +57,39 @@
          -- 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"
+            "call=mine_produce_marble",
+            "call=mine_produce_granite",
+            "call=mine_produce_marble",
+            "call=mine_produce_granite",
+            "call=mine_produce_marble",
+            "return=no_stats"
+         }
+      },
+      mine_produce_granite = {
+         descname = _"mining marble",
+         actions = {
+            "animate=working 7800",
+            "mine=stones 2 100 5 2",
+            "produce=granite",
+         }
+      },
+      mine_produce_marble = {
+         descname = _"mining marble",
+         actions = {
+            "animate=working 7800",
+            "mine=stones 2 100 5 2",
+            "produce=marble",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=meal wine",
+            "produce=marble:3 granite:2",
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/empire/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/empire/smelting_works/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/empire/smelting_works/init.lua	2018-09-11 16:57:31 +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/tavern/init.lua'
--- data/tribes/buildings/productionsites/empire/tavern/init.lua	2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/empire/tavern/init.lua	2018-09-11 16:57:31 +0000
@@ -56,11 +56,12 @@
          descname = _"preparing a ration",
          actions = {
             -- time total: 33
-            "sleep=14000",
             "return=skipped unless economy needs ration",
+            "sleep=5000",
             "consume=empire_bread,fish,meat",
             "playsound=sound/empire/taverns ration 100",
-            "animate=working 19000",
+            "animate=working 18000",
+            "sleep=10000",
             "produce=ration"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua	2018-09-11 16:57:31 +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
             "consume=planks",
+            "sleep=20000",
             "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/armor_smithy_large/init.lua'
--- data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua	2018-09-11 16:57:31 +0000
@@ -74,12 +74,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a broadsword because ...
          descname = _"forging a broadsword",
          actions = {
-            -- time total: 82
+            -- time total: 57 + 3.6
             "return=skipped unless economy needs sword_broad",
-            "sleep=39000",
             "consume=coal iron:2 gold",
+            "sleep=24000",
             "playsound=sound/smiths smith 192",
-            "animate=working 34000",
+            "animate=working 24000",
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=sword_broad"
@@ -89,12 +89,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a double-edged sword because ...
          descname = _"forging a double-edged sword",
          actions = {
-            -- time total: 87
+            -- time total: 57 + 3.6
             "return=skipped unless economy needs sword_double",
             "consume=coal:2 iron:2 gold",
-            "sleep=41000",
+            "sleep=24000",
             "playsound=sound/smiths smith 192",
-            "animate=working 37000",
+            "animate=working 24000",
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=sword_double"
@@ -104,11 +104,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a golden helmet because ...
          descname = _"forging a golden helmet",
          actions = {
-            -- time total: 115
+            -- time total: 67 + 3.6
             "return=skipped unless economy needs helmet_golden",
             "consume=coal:2 iron:2 gold",
-            "sleep=51000",
-            "animate=working 64000",
+            "sleep=30000",
+            "animate=working 37000",
             "produce=helmet_golden"
          },
       },

=== modified file 'data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua'
--- data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua	2018-09-11 16:57:31 +0000
@@ -73,12 +73,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a short sword because ...
          descname = _"forging a short sword",
          actions = {
-            -- time total: 76
+            -- time total: 57 + 3.6
             "return=skipped unless economy needs sword_short",
-            "sleep=37000",
             "consume=coal iron",
+            "sleep=24000",
             "playsound=sound/smiths smith 192",
-            "animate=working 30000",
+            "animate=working 24000",
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=sword_short"
@@ -88,12 +88,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a long sword because ...
          descname = _"forging a long sword",
          actions = {
-            -- time total: 79
+            -- time total: 57 + 3.6
             "return=skipped unless economy needs sword_long",
             "consume=coal iron:2",
-            "sleep=38000",
+            "sleep=24000",
             "playsound=sound/smiths smith 192",
-            "animate=working 32000",
+            "animate=working 24000",
             "playsound=sound/smiths sharpening 120",
             "sleep=9000",
             "produce=sword_long"
@@ -103,11 +103,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start forging a helmet because ...
          descname = _"forging a helmet",
          actions = {
-            -- time total: 100
+            -- time total: 67 + 3.6
             "return=skipped unless economy needs helmet",
             "consume=coal iron:2",
-            "sleep=50000",
-            "animate=working 50000",
+            "sleep=30000",
+            "playsound=sound/smiths smith 192",
+            "animate=working 37000",
             "produce=helmet"
          },
       },

=== modified file 'data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua'
--- data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua	2018-09-11 16:57:31 +0000
@@ -94,8 +94,8 @@
          descname = _"forging a felling ax",
          actions = {
             "return=skipped unless economy needs felling_ax",
+            "consume=log iron",
             "sleep=32000",
-            "consume=log iron",
             "animate=working 35000",
             "produce=felling_ax"
          },
@@ -105,8 +105,8 @@
          descname = _"forging a pick",
          actions = {
             "return=skipped unless economy needs pick",
+            "consume=log iron",
             "sleep=32000",
-            "consume=log iron",
             "animate=working 35000",
             "produce=pick"
          },
@@ -116,8 +116,8 @@
          descname = _"making a scythe",
          actions = {
             "return=skipped unless economy needs scythe",
+            "consume=log iron",
             "sleep=32000",
-            "consume=log iron",
             "animate=working 35000",
             "produce=scythe"
          },
@@ -127,8 +127,8 @@
          descname = _"making a shovel",
          actions = {
             "return=skipped unless economy needs shovel",
+            "consume=log iron",
             "sleep=32000",
-            "consume=log iron",
             "animate=working 35000",
             "produce=shovel"
          },
@@ -138,8 +138,8 @@
          descname = _"making a basket",
          actions = {
             "return=skipped unless economy needs basket",
-            "sleep=32000",
             "consume=thatch_reed log",
+            "sleep=32000",
             "animate=working 35000",
             "produce=basket"
          },
@@ -149,8 +149,8 @@
          descname = _"making a hunting spear",
          actions = {
             "return=skipped unless economy needs hunting_spear",
+            "consume=log iron",
             "sleep=32000",
-            "consume=log iron",
             "animate=working 35000",
             "produce=hunting_spear"
          },
@@ -160,8 +160,8 @@
          descname = _"making a fishing net",
          actions = {
             "return=skipped unless economy needs fishing_net",
-            "sleep=32000",
             "consume=thatch_reed:2",
+            "sleep=32000",
             "animate=working 35000",
             "produce=fishing_net"
          },
@@ -171,8 +171,8 @@
          descname = _"making a bread paddle",
          actions = {
             "return=skipped unless economy needs bread_paddle",
+            "consume=log iron",
             "sleep=32000",
-            "consume=log iron",
             "animate=working 35000",
             "produce=bread_paddle"
          },
@@ -182,8 +182,8 @@
          descname = _"making kitchen tools",
          actions = {
             "return=skipped unless economy needs kitchen_tools",
+            "consume=log iron",
             "sleep=32000",
-            "consume=log iron",
             "animate=working 35000",
             "produce=kitchen_tools"
          },
@@ -193,8 +193,8 @@
          descname = _"making a hammer",
          actions = {
             "return=skipped unless economy needs hammer",
+            "consume=log iron",
             "sleep=32000",
-            "consume=log iron",
             "animate=working 35000",
             "produce=hammer"
          },
@@ -204,8 +204,8 @@
          descname = _"making fire tongs",
          actions = {
             "return=skipped unless economy needs fire_tongs",
+            "consume=iron",
             "sleep=32000",
-            "consume=iron",
             "animate=working 35000",
             "produce=fire_tongs"
          },
@@ -215,8 +215,8 @@
          descname = _"making needles",
          actions = {
             "return=skipped unless economy needs needles",
+            "consume=iron",
             "sleep=32000",
-            "consume=iron",
             "animate=working 35000",
             "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-09-11 16:57:31 +0000
@@ -64,12 +64,29 @@
          -- 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",
-            "animate=working 40000",
+            "sleep=40000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining coal",
+         actions = {
+            "animate=working 15000",
             "mine=coal 3 50 5 20",
-            "produce=coal:2"
+            "produce=coal",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=ration",
+            "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-09-11 16:57:31 +0000
@@ -63,21 +63,34 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
          descname = _"mining coal",
          actions = {
-            "sleep=40000",
+            "sleep=5000",
             "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"
+            "sleep=34900",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining coal",
+         actions = {
+            "animate=working 8700",
+            "mine=coal 3 100 10 5",
+            "produce=coal",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=meal",
+            "produce=coal:7",
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua'
--- data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua	2018-09-11 16:57:31 +0000
@@ -72,10 +72,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing a ration because ...
          descname = _"preparing a ration",
          actions = {
+            -- time total: 33
             "return=skipped unless economy needs ration",
-            "sleep=14000",
+            "sleep=5000",
             "consume=fruit,smoked_fish,smoked_meat",
-            "animate=working 19000",
+            "animate=working 18000",
+            "sleep=10000",
             "produce=ration"
          }
       },
@@ -83,10 +85,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing a meal because ...
          descname = _"preparing a meal",
          actions = {
+            --time total: 40
             "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-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/furnace/init.lua	2018-09-11 16:57:31 +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/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-09-11 16:57:31 +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-07-19 09:40:06 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua	2018-09-11 16:57:31 +0000
@@ -63,15 +63,32 @@
          -- 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",
-            "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"
+            "sleep=34800",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining gold",
+         actions = {
+            "animate=working 12200",
+            "mine=gold 3 100 10 5",
+            "produce=gold_ore",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=meal",
+            "produce=gold_ore:5",
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua'
--- data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua	2018-09-11 16:57:31 +0000
@@ -72,8 +72,8 @@
          descname = _"baking honey bread",
          actions = {
             "return=skipped unless economy needs honey_bread or workers need experience",
+            "consume=barley water honey",
             "sleep=35000",
-            "consume=barley water honey",
             "animate=working 35000",
             "produce=honey_bread"
          }
@@ -82,9 +82,9 @@
          -- 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",
+            "consume=barley water",
             "sleep=20000",
-            "consume=barley water",
             "animate=working 20000",
             "produce=bread_frisians"
          }

=== 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-09-11 16:57:31 +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-07-19 09:40:06 +0000
+++ data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua	2018-09-11 16:57:31 +0000
@@ -63,15 +63,34 @@
          -- 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=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"
+            "sleep=57100",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining iron",
+         actions = {
+            "animate=working 8700",
+            "mine=iron 3 100 10 5",
+            "produce=iron_ore",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=meal",
+            "produce=iron_ore:7",
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua'
--- data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua	2018-09-11 16:57:31 +0000
@@ -70,8 +70,8 @@
          descname = _"brewing mead",
          actions = {
             "return=skipped unless economy needs mead or workers need experience",
+            "consume=barley water honey",
             "sleep=35000",
-            "consume=barley water honey",
             "animate=working 35000",
             "produce=mead"
          }
@@ -80,9 +80,9 @@
          -- 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",
+            "consume=barley water",
             "sleep=30000",
-            "consume=barley water",
             "animate=working 30000",
             "produce=beer"
          }

=== modified file 'data/tribes/buildings/productionsites/frisians/recycling_center/init.lua'
--- data/tribes/buildings/productionsites/frisians/recycling_center/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/recycling_center/init.lua	2018-09-11 16:57:31 +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-09-11 16:57:31 +0000
@@ -65,15 +65,29 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
          descname = _"mining granite",
          actions = {
-            "sleep=45000",
+            "sleep=5000",
             "return=skipped unless economy needs granite",
             "consume=ration",
-            "animate=working 20000",
+            "sleep=38000",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining granite",
+         actions = {
+            "animate=working 21000",
             "mine=stones 3 50 5 20",
             "produce=granite",
-            "animate=working 20000",
-            "mine=stones 3 50 5 20",
-            "produce=granite"
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=ration",
+            "produce=granite:2",
          }
       },
    },

=== 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-09-11 16:57:31 +0000
@@ -63,18 +63,34 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
          descname = _"mining granite",
          actions = {
-            "sleep=40000",
+            "sleep=5000",
             "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"
+            "sleep=34900",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "call=mine_produce",
+            "return=no_stats"
+         }
+      },
+      mine_produce = {
+         descname = _"mining granite",
+         actions = {
+            "animate=working 8700",
+            "mine=stones 3 100 10 5",
+            "produce=granite",
+         }
+      },
+      encyclopedia = {
+         -- just a dummy program to fix encyclopedia
+         descname = "encyclopedia",
+         actions = {
+            "consume=meal",
+            "produce=granite:7",
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/frisians/sewing_room/init.lua'
--- data/tribes/buildings/productionsites/frisians/sewing_room/init.lua	2018-07-09 09:25:35 +0000
+++ data/tribes/buildings/productionsites/frisians/sewing_room/init.lua	2018-09-11 16:57:31 +0000
@@ -58,10 +58,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start sewing fur garment because ...
          descname = _"sewing fur garment",
          actions = {
+            -- time total: 40 + 3.6
             "sleep=20000",
             "return=skipped unless economy needs fur_garment or workers need experience",
             "consume=fur:2",
-            "animate=working 25000",
+            "animate=working 20000",
             "produce=fur_garment"
          },
       },

=== modified file 'data/tribes/buildings/productionsites/frisians/smokery/init.lua'
--- data/tribes/buildings/productionsites/frisians/smokery/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/smokery/init.lua	2018-09-11 16:57:31 +0000
@@ -73,8 +73,8 @@
          descname = _"smoking fish",
          actions = {
             "return=skipped unless economy needs smoked_fish",
-            "sleep=16000",
             "consume=fish:2 log",
+            "sleep=16000",
             "animate=working 30000",
             "produce=smoked_fish:2"
          },
@@ -85,8 +85,8 @@
          actions = {
             "return=skipped when site has fish:2 and economy needs smoked_fish",
             "return=skipped unless economy needs smoked_meat",
-            "sleep=16000",
             "consume=meat:2 log",
+            "sleep=16000",
             "animate=working 30000",
             "produce=smoked_meat:2"
          },

=== modified file 'data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua'
--- data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua	2018-09-11 16:57:31 +0000
@@ -70,10 +70,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start sewing studded fur garment because ...
          descname = _"sewing studded fur garment",
          actions = {
+            -- time total: 50 + 3.6
             "return=skipped unless economy needs fur_garment_studded",
-            "sleep=45000",
+            "sleep=25000",
             "consume=fur_garment iron",
-            "animate=working 45000",
+            "animate=working 25000",
             "produce=fur_garment_studded"
          },
       },
@@ -81,10 +82,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start sewing golden fur garment because ...
          descname = _"sewing golden fur garment",
          actions = {
+            -- time total: 50 + 3.6
             "return=skipped unless economy needs fur_garment_golden",
-            "sleep=47000",
+            "sleep=25000",
             "consume=fur_garment iron gold",
-            "animate=working 61000",
+            "animate=working 25000",
             "produce=fur_garment_golden"
          },
       },

=== modified file 'data/tribes/buildings/productionsites/frisians/tavern/init.lua'
--- data/tribes/buildings/productionsites/frisians/tavern/init.lua	2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/tavern/init.lua	2018-09-11 16:57:31 +0000
@@ -73,11 +73,13 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing only one ration because ... (can produce more efficient when supply is good)
          descname = _"preparing only one ration",
          actions = {
+            -- time total: 49.5
             "return=skipped unless economy needs ration",
             "return=skipped when site has fruit,bread_frisians and site has smoked_fish,smoked_meat",
-            "sleep=21000",
+            "sleep=5000",
             "consume=fruit,bread_frisians,smoked_fish,smoked_meat",
-            "animate=working 28500",
+            "animate=working 34500",
+            "sleep=10000",
             "produce=ration"
          },
       },
@@ -85,10 +87,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing rations because ...
          descname = _"preparing rations",
          actions = {
+            -- time total: 66
             "return=skipped unless economy needs ration",
+            "sleep=5000",
             "consume=fruit,bread_frisians smoked_fish,smoked_meat",
-            "sleep=28000",
-            "animate=working 38000",
+            "animate=working 51000",
+            "sleep=10000",
             "produce=ration:2"
          },
       },

=== modified file 'data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua'
--- data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua	2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua	2018-09-11 16:57:31 +0000
@@ -112,6 +112,7 @@
    },
 
    aihints = {
+      trainingsites_max_percent = 40,
       prohibited_till = 1500,
       very_weak_ai_limit = 0,
       weak_ai_limit = 1

=== modified file 'data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua'
--- data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua	2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua	2018-09-11 16:57:31 +0000
@@ -46,6 +46,7 @@
    },
 
    aihints = {
+      trainingsites_max_percent = 25,
       prohibited_till = 900,
       very_weak_ai_limit = 1,
       weak_ai_limit = 2

=== modified file 'data/tribes/buildings/trainingsites/empire/arena/init.lua'
--- data/tribes/buildings/trainingsites/empire/arena/init.lua	2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/trainingsites/empire/arena/init.lua	2018-09-11 16:57:31 +0000
@@ -37,7 +37,7 @@
    },
 
    aihints = {
-      trainingsites_max_percent = 20,
+      trainingsites_max_percent = 10,
       prohibited_till = 900,
       very_weak_ai_limit = 1,
       weak_ai_limit = 2

=== modified file 'data/tribes/buildings/trainingsites/empire/colosseum/init.lua'
--- data/tribes/buildings/trainingsites/empire/colosseum/init.lua	2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/trainingsites/empire/colosseum/init.lua	2018-09-11 16:57:31 +0000
@@ -33,6 +33,7 @@
    },
 
    aihints = {
+      trainingsites_max_percent = 25,
       prohibited_till = 1200,
       very_weak_ai_limit = 1,
       weak_ai_limit = 2

=== modified file 'data/tribes/buildings/trainingsites/frisians/training_arena/init.lua'
--- data/tribes/buildings/trainingsites/frisians/training_arena/init.lua	2018-07-18 14:33:41 +0000
+++ data/tribes/buildings/trainingsites/frisians/training_arena/init.lua	2018-09-11 16:57:31 +0000
@@ -42,6 +42,7 @@
    },
 
    aihints = {
+      trainingsites_max_percent = 40,
       prohibited_till = 1500,
       very_weak_ai_limit = 0,
       weak_ai_limit = 1

=== modified file 'data/tribes/scripting/help/ware_help.lua'
--- data/tribes/scripting/help/ware_help.lua	2018-01-10 16:21:50 +0000
+++ data/tribes/scripting/help/ware_help.lua	2018-09-11 16:57:31 +0000
@@ -53,52 +53,63 @@
          -- TRANSLATORS: Ware Encyclopedia: A building producing a ware
          result = result .. h2(_"Producer")
          result = result .. dependencies({building, ware_description}, building.descname)
-
-         -- Find out which programs in the building produce this ware
          local producing_programs = {}
-         for j, program_name in ipairs(building.production_programs) do
-            for ware, amount in pairs(building:produced_wares(program_name)) do
-               if (ware_description.name == ware) then
-                  table.insert(producing_programs, program_name)
-               end
-            end
-         end
-
-         -- Now collect all wares produced by the filtered programs
-         local produced_wares_strings = {}
-         local produced_wares_counters = {}
-         for j, program_name in ipairs(producing_programs) do
-            local produced_wares_amount = {}
-            produced_wares_counters[program_name] = 0
-            for ware, amount in pairs(building:produced_wares(program_name)) do
-               if (produced_wares_amount[ware] == nil) then
-                  produced_wares_amount[ware] = 0
-               end
-               produced_wares_amount[ware] = produced_wares_amount[ware] + amount
-               produced_wares_counters[program_name] = produced_wares_counters[program_name] + amount
-            end
-            local produced_wares_string = ""
-            for ware, amount in pairs(produced_wares_amount) do
-            local ware_descr = wl.Game():get_ware_description(ware)
-               produced_wares_string = produced_wares_string
-                  .. help_ware_amount_line(ware_descr, amount)
-            end
-            produced_wares_strings[program_name] = produced_wares_string
-         end
-
-         -- Now collect the consumed wares for each filtered program and print the program info
-         for j, program_name in ipairs(producing_programs) do
-            result = result .. help_consumed_wares_workers(tribe, building, program_name)
-            if (produced_wares_counters[program_name] > 0) then
-               result = result
-                  -- TRANSLATORS: Ware Encyclopedia: Wares produced by a productionsite
-                  .. h3(ngettext("Ware produced:", "Wares produced:", produced_wares_counters[program_name]))
-                  .. produced_wares_strings[program_name]
-            end
-         end
-
+         if (building.is_mine) then
+            -- Find out which programs in the building produce this ware for the mines we skip the real production and take a dummy "encyclopedia" program
+            -- TODO(GunChleoc): Reimplement production programs as a proper tree, so that we can get rid of this hack and of the special case for mines.
+            for j, program_name in ipairs(building.production_programs) do
+               for ware, amount in pairs(building:produced_wares(program_name)) do
+                  local consumes = building:consumed_wares_workers(program_name)
+                  if (ware_description.name == ware and #consumes > 0) then
+                     table.insert(producing_programs, program_name)
+                  end
+               end
+            end
+         else
+            -- Find out which programs in the building produce this ware
+            for j, program_name in ipairs(building.production_programs) do
+               for ware, amount in pairs(building:produced_wares(program_name)) do
+                  if (ware_description.name == ware) then
+                     table.insert(producing_programs, program_name)
+                  end
+               end
+            end
+         end
+
+            -- Now collect all wares produced by the filtered programs
+            local produced_wares_strings = {}
+            local produced_wares_counters = {}
+            for j, program_name in ipairs(producing_programs) do
+               local produced_wares_amount = {}
+               produced_wares_counters[program_name] = 0
+               for ware, amount in pairs(building:produced_wares(program_name)) do
+                  if (produced_wares_amount[ware] == nil) then
+                     produced_wares_amount[ware] = 0
+                  end
+                  produced_wares_amount[ware] = produced_wares_amount[ware] + amount
+                  produced_wares_counters[program_name] = produced_wares_counters[program_name] + amount
+               end
+               local produced_wares_string = ""
+               for ware, amount in pairs(produced_wares_amount) do
+               local ware_descr = wl.Game():get_ware_description(ware)
+                  produced_wares_string = produced_wares_string
+                     .. help_ware_amount_line(ware_descr, amount)
+               end
+               produced_wares_strings[program_name] = produced_wares_string
+            end
+
+            -- Now collect the consumed wares for each filtered program and print the program info
+            for j, program_name in ipairs(producing_programs) do
+               result = result .. help_consumed_wares_workers(tribe, building, program_name)
+               if (produced_wares_counters[program_name] > 0) then
+                  result = result
+                     -- TRANSLATORS: Ware Encyclopedia: Wares produced by a productionsite
+                     .. h3(ngettext("Ware produced:", "Wares produced:", produced_wares_counters[program_name]))
+                     .. produced_wares_strings[program_name]
+               end
+            end
+         end
       end
-   end
    return result
 end
 

=== modified file 'data/txts/developers.json'
--- data/txts/developers.json	2018-09-03 08:00:41 +0000
+++ data/txts/developers.json	2018-09-11 16:57:31 +0000
@@ -390,6 +390,7 @@
 					"members":[
 						"Matt Howe (mdhowe)",
 						"Samuel Tilly (eldamar)",
+						"WorldSavior",
 						"and many, many more (thank you for everything you've done)"
 					]
 				}

=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc	2018-09-09 10:17:40 +0000
+++ src/logic/map_objects/tribes/production_program.cc	2018-09-11 16:57:31 +0000
@@ -1163,10 +1163,11 @@
 			totalstart += start_amount;
 			totalchance += 8 * amount;
 
-			//  Add penalty for fields that are running out
+			// Add penalty for fields that are running out
+			// Except for totally depleted fields or wrong ressource fields
+			// if we already know there is no ressource (left) we won't mine there
 			if (amount == 0)
-				// we already know it's completely empty, so punish is less
-				totalchance += 1;
+				totalchance += 0;
 			else if (amount <= 2)
 				totalchance += 6;
 			else if (amount <= 4)

=== modified file 'src/logic/map_objects/tribes/worker.cc'
--- src/logic/map_objects/tribes/worker.cc	2018-09-10 05:59:47 +0000
+++ src/logic/map_objects/tribes/worker.cc	2018-09-11 16:57:31 +0000
@@ -137,10 +137,11 @@
 		totalres += amount;
 		totalchance += 8 * amount;
 
-		// Add penalty for fields that are running out
+		//  Add penalty for fields that are running out
+		//  Except for totally depleted fields or wrong ressource fields
+		//  if we already know there is no ressource (left) we won't mine there
 		if (amount == 0)
-			// we already know it's completely empty, so punish is less
-			totalchance += 1;
+			totalchance += 0;
 		else if (amount <= 2)
 			totalchance += 6;
 		else if (amount <= 4)