Merge lp:~wl-zocker/widelands/bug571796 into lp:widelands

[wl-zocker]

Changed ordering in conf files (now sleep comes before consume) to avoid fast dropping of productivity (see bug 571796). The productivity of quarries drops fast on purpose.

[SirVer (sirver)]

looks good in general. One thing to investigate.

review: Needs Information

[TiborB (tiborb95)]

Hi,

this might interfere with AI and the way how it calculates production
statistics. Of course this does not mean I am against it.

I dont understand the logic of the changes, but a question: when the
production is skipped, will the time of this step change? Very roughly if
production is successful or failed - both operations last like 30 seconds,
but skipping lasts only 2 seconds.
I introduced own statistics (very simple and not much accurate) but the one
that considers this skipped time. Or will official statistics (as shown on
buildings) reflects also this "skipped" time?

Tibor

2014-07-02 21:42 GMT+02:00 wl-zocker <email address hidden>:

> wl-zocker has proposed merging lp:~wl-zocker/widelands/bug571796 into
> lp:widelands.
>
> Requested reviews:
> Widelands Developers (widelands-dev)
> Related bugs:
> Bug #571796 in widelands: "Stop the rounding to full 10ths for
> productivity percentages"
> https://bugs.launchpad.net/widelands/+bug/571796
>
> For more details, see:
> https://code.launchpad.net/~wl-zocker/widelands/bug571796/+merge/225387
>
> Changed ordering in conf files (now sleep comes before consume) to avoid
> fast dropping of productivity (see bug 571796). The productivity of
> quarries drops fast on purpose.
> --
> https://code.launchpad.net/~wl-zocker/widelands/bug571796/+merge/225387
> Your team Widelands Developers is requested to review the proposed merge
> of lp:~wl-zocker/widelands/bug571796 into lp:widelands.
>
> === modified file 'tribes/atlanteans/bakery/conf'
> --- tribes/atlanteans/bakery/conf 2014-03-17 17:23:26 +0000
> +++ tribes/atlanteans/bakery/conf 2014-07-02 19:42:10 +0000
> @@ -26,8 +26,8 @@
>
> [work]
> return=skipped unless economy needs bread
> +sleep=35000
> consume=water:2 blackrootflour cornflour
> -sleep=35000
> animate=working 30000
> produce=bread:2
>
>
> === modified file 'tribes/atlanteans/burners_house/conf'
> --- tribes/atlanteans/burners_house/conf 2014-03-17 17:23:26 +0000
> +++ tribes/atlanteans/burners_house/conf 2014-07-02 19:42:10 +0000
> @@ -24,8 +24,8 @@
>
> [work]
> return=skipped unless economy needs coal or not economy needs log
> +sleep=30000
> consume=log:6
> -sleep=30000
> animate=working 90000 # charcoal fires are burning some days in real life
> produce=coal
>
>
> === modified file 'tribes/atlanteans/coalmine/conf'
> --- tribes/atlanteans/coalmine/conf 2014-04-13 19:23:43 +0000
> +++ tribes/atlanteans/coalmine/conf 2014-07-02 19:42:10 +0000
> @@ -27,8 +27,8 @@
> [work]
> return=skipped unless economy needs coal or not economy needs bread
> return=skipped unless economy needs coal or not economy needs smoked_fish
> +sleep=45000
> consume=smoked_fish,smoked_meat:2 bread:2
> -sleep=45000
> animate=working 20000
> mine=coal 4 100 5 2
> produce=coal:2
>
> === modified file 'tribes/atlanteans/crystalmine/conf'
> --- tribes/atlanteans/crystalmine/conf 2014-06-14 14:20:22 +0000
> +++ tribes/atlanteans/crystalmine/conf 2014-07-02 19:42:10 +0000
> @@ -32,8 +32,8 @@
> [mine_stone]
> return=skipped unless economy needs stone or not economy needs bread
> return=skipped unless economy needs stone or not economy needs smoked_fis...

[wl-zocker (wl-zocker)]

I am not sure if I can answer your questions completely because I am not familiar with the code (I only changed the conf files), but I will try:
Skipping and the check if the wares needed are present needs no time (theoretically, in practice, they need about 0.1 seconds together). This has been the problem when a building had no input: It checked every 0.1 seconds if the wares are present. Of course they could not be delivered that fast, so the productivity dropped from 100% to 0% in 20 (because each checks lowers it by 5% -> 20 checks needed) * 0.1 s = 2 s. Since raising takes some time (the building does not get to 100% immediately, but rather slow to indicate that is has just started working again), this model is no also introduced for dropping productivity by moving the sleep before the consume. The building checks now every e.g. 35 s (time of sleep from the Atlantean bakery) if the wares are present, therefore it takes 20 * 35 s = 11 min 40 s until the productivity reaches 0%. This is mainly to indicate for the player that the problem the building has is not (yet) permanent, but has just started, and to avoid fast changes in the statistic (which make little sense).
The time to produce a ware (productivity raises by 5%) is sleep + animate, the time for failing (productivity drops by 5%) is only the sleep time. When the sum is kept constant, the sleep time can be varied in order to adapt the drop velocity.
As I wrote above, the skipping happens infinitely fast (therefore I do not know what your AI calculates). In his diff comment, SirVer mentioned that this might be a problem, so maybe I have to change it. Skipping would then in fact need a certain time.

[SirVer (sirver)]

I checked now. After return each site sleeps for 50 ms before acting again - only trainingsites set this arbitrarily to 60000 ms. 50ms is a pretty busy loop, though not dramatic for CPU even on big maps. Still, I think this distinction in the code should be removed and the wait should be done in the conf files alone and before checking for the need.

Agreed?

[wl-zocker (wl-zocker)]

So I just add a sleep=50 before anything else without changing any other values? I will do that then.
I think it is better to have it in the conf files than in the code. It is the place where I expect it.

Do you know anything about line 632 in the diff (see my inline comment)? Keep, remove, or add to the indiviual programs?

[SirVer (sirver)]

No, not 50. The sleeptime of the program. Essentially, kill the busy wait.

review: Needs Fixing

[wl-zocker (wl-zocker)]

Fine. What shall I do with buildings with multiple outputs? Nasenbaer wrote: "so skip should be before sleep so e.g. the smiths don't sleep only because no hamer is needed - the damn worker should produce shovels, so no reason to go to sleep ;)."

[SirVer (sirver)]

mmh... good question. I think nasenbaer is right there. They have to skip and then sleep.

[wl-zocker (wl-zocker)]

I hope everything is fine now. Buildings with multiple outputs (including training sites) still have busy waiting, the others not.

[SirVer (sirver)]

Looks good to me. Nasenbaer, you have more experience tweaking these values. Can you have a quick look? I'll go ahead and merge in a couple of days if you do not object.

review: Approve

[Nasenbaer (nasenbaer)]

Looks perfectly fine for me. The changes are cosmetical changes anyway - in the way that the visual part is changed - but the time used for the production of a ware is kept the same.

Therefore I vote for direct merging.

review: Approve

[SirVer (sirver)]

I merged this now, I guess it needs a bunch of test playing to see if it has other problems that we did not anticipate.

wl-zocker, you are not yet in txts/developers [1]. What should I put there for you?

[1] https://wl.widelands.org/developers/

[SirVer (sirver)]

Oh, and I forgot the most important thing: Thanks for looking into this issue!

[wl-zocker (wl-zocker)]

No problem. When I find another thing that annoys me and that can be fixed in the conf files, I will do it (this is currently the only way I can contribute to Widelands, except for writing bug reports).
Regarding the list of developers: I would appreciate to stay anonymous if that is fine (so just "wl-zocker")

[SirVer (sirver)]

Sure.

There is one more thing that would be useful and can fixed with mostly (or maybe even only conf file) changes: terrain affinity for tribe immovables. Maybe you want to work on those?

https://bugs.launchpad.net/widelands/+bug/1338204

I can contribute the c++ changes should any be needed.

On 07.07.2014, at 18:39, wl-zocker <email address hidden> wrote:

> No problem. When I find another thing that annoys me and that can be fixed in the conf files, I will do it (this is currently the only way I can contribute to Widelands, except for writing bug reports).
> Regarding the list of developers: I would appreciate to stay anonymous if that is fine (so just "wl-zocker")
> --
> https://code.launchpad.net/~wl-zocker/widelands/bug571796/+merge/225387
> You are reviewing the proposed merge of lp:~wl-zocker/widelands/bug571796 into lp:widelands.

[wl-zocker (wl-zocker)]

I think I am not going to have the time to do that. It looks like a lot of work (searching values and testing them). And I do not know how to judge if my work is good. Maybe I will look at it (this may take some months so others can take the task), but I am not going to make any promises.

=== modified file 'tribes/atlanteans/bakery/conf'
--- tribes/atlanteans/bakery/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/bakery/conf	2014-07-05 15:25:17 +0000
@@ -25,9 +25,9 @@
 work=_Work
 
 [work]
+sleep=35000
 return=skipped unless economy needs bread
 consume=water:2 blackrootflour cornflour
-sleep=35000
 animate=working 30000
 produce=bread:2
 

=== modified file 'tribes/atlanteans/burners_house/conf'
--- tribes/atlanteans/burners_house/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/burners_house/conf	2014-07-05 15:25:17 +0000
@@ -23,9 +23,9 @@
 work=_Work
 
 [work]
+sleep=30000
 return=skipped unless economy needs coal or not economy needs log
 consume=log:6
-sleep=30000
 animate=working 90000 # charcoal fires are burning some days in real life
 produce=coal
 

=== modified file 'tribes/atlanteans/coalmine/conf'
--- tribes/atlanteans/coalmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/atlanteans/coalmine/conf	2014-07-05 15:25:17 +0000
@@ -25,10 +25,10 @@
 work=_Work
 
 [work]
+sleep=45000
 return=skipped unless economy needs coal or not economy needs bread
 return=skipped unless economy needs coal or not economy needs smoked_fish
 consume=smoked_fish,smoked_meat:2 bread:2
-sleep=45000
 animate=working 20000
 mine=coal 4 100 5 2
 produce=coal:2

=== modified file 'tribes/atlanteans/crystalmine/conf'
--- tribes/atlanteans/crystalmine/conf	2014-06-14 14:20:22 +0000
+++ tribes/atlanteans/crystalmine/conf	2014-07-05 15:25:17 +0000
@@ -32,8 +32,8 @@
 [mine_stone]
 return=skipped unless economy needs stone or not economy needs bread
 return=skipped unless economy needs stone or not economy needs smoked_fish
+sleep=45000
 consume=smoked_fish,smoked_meat:2 bread:2
-sleep=45000
 animate=working 20000
 mine=granite 4 100 5 2
 produce=stone:2
@@ -50,8 +50,8 @@
 [mine_quartz]
 return=skipped unless economy needs quartz or not economy needs bread
 return=skipped unless economy needs quartz or not economy needs smoked_fish
+sleep=45000
 consume=smoked_fish,smoked_meat:2 bread:2
-sleep=45000
 animate=working 20000
 mine=granite 4 100 5 2
 produce=stone:2
@@ -65,8 +65,8 @@
 [mine_diamond]
 return=skipped unless economy needs diamond or not economy needs bread
 return=skipped unless economy needs diamond or not economy needs smoked_fish
+sleep=45000
 consume=smoked_fish,smoked_meat:2 bread:2
-sleep=45000
 animate=working 20000
 mine=granite 4 100 5 2
 produce=diamond

=== modified file 'tribes/atlanteans/goldmine/conf'
--- tribes/atlanteans/goldmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/atlanteans/goldmine/conf	2014-07-05 15:25:17 +0000
@@ -26,10 +26,10 @@
 work=_Work
 
 [work]
+sleep=45000
 return=skipped unless economy needs goldore or not economy needs bread
 return=skipped unless economy needs goldore or not economy needs smoked_fish
 consume=smoked_fish,smoked_meat:2 bread:2
-sleep=45000
 animate=working 20000
 mine=gold 4 100 5 2
 produce=goldore

=== modified file 'tribes/atlanteans/goldweaver/conf'
--- tribes/atlanteans/goldweaver/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/goldweaver/conf	2014-07-05 15:25:17 +0000
@@ -23,9 +23,9 @@
 work=_Work
 
 [work]
+sleep=15000
 return=skipped unless economy needs goldyarn
 consume=gold
-sleep=15000
 animate=working 25000
 produce=goldyarn
 

=== modified file 'tribes/atlanteans/horsefarm/conf'
--- tribes/atlanteans/horsefarm/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/horsefarm/conf	2014-07-05 15:25:17 +0000
@@ -25,11 +25,12 @@
 work=_Work
 
 [work]
+sleep=15000
 return=skipped unless economy needs horse or not economy needs water
 return=skipped unless economy needs horse or not economy needs corn
 consume=corn water
 playFX=../../../sound/farm/horse 192
-animate=working 30000 # feeding cute little foals ;)
+animate=working 15000 # feeding cute little foals ;)
 recruit=horse
 
 [idle]

=== modified file 'tribes/atlanteans/ironmine/conf'
--- tribes/atlanteans/ironmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/atlanteans/ironmine/conf	2014-07-05 15:25:17 +0000
@@ -26,10 +26,10 @@
 work=_Work
 
 [work]
+sleep=45000
 return=skipped unless economy needs ironore or not economy needs bread
 return=skipped unless economy needs ironore or not economy needs smoked_fish
 consume=smoked_fish,smoked_meat:2 bread:2
-sleep=45000
 animate=working 20000
 mine=iron 4 100 5 2
 produce=ironore

=== modified file 'tribes/atlanteans/mill/conf'
--- tribes/atlanteans/mill/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/mill/conf	2014-07-05 15:25:17 +0000
@@ -30,15 +30,15 @@
 [produce_cornflour]
 return=skipped when site has blackroot and economy needs blackrootflour and not economy needs cornflour
 return=skipped unless economy needs cornflour or not economy needs corn
+sleep=3500
 consume=corn
-sleep=3500
 animate=working 15000
 produce=cornflour
 
 [produce_blackrootflour]
 return=skipped when site has corn and economy needs cornflour and not economy needs blackrootflour
+sleep=3500
 consume=blackroot
-sleep=3500
 animate=working 15000
 produce=blackrootflour
 

=== modified file 'tribes/atlanteans/quarry/conf'
--- tribes/atlanteans/quarry/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/quarry/conf	2014-07-05 15:25:17 +0000
@@ -19,8 +19,8 @@
 work=_Work
 
 [work]
-sleep=25000
-worker=cut_stone
+worker=cut_stone  # This order is on purpose so that the productivity 
+sleep=25000       # drops fast once all stones are gone.     
 
 [idle]
 pics=quarry_i_??.png  # ???

=== modified file 'tribes/atlanteans/sawmill/conf'
--- tribes/atlanteans/sawmill/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/sawmill/conf	2014-07-05 15:25:17 +0000
@@ -22,9 +22,9 @@
 work=_Work
 
 [work]
+sleep=16500 # much faster than barbarians hardener
 return=skipped unless economy needs planks
 consume=log:2
-sleep=16500 # much faster than barbarians hardener
 playFX=../../../sound/sawmill/sawmill 192
 animate=working 20000 # much more faster than barbarians hardener
 produce=planks

=== modified file 'tribes/atlanteans/smelting_works/conf'
--- tribes/atlanteans/smelting_works/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/smelting_works/conf	2014-07-05 15:25:17 +0000
@@ -29,15 +29,15 @@
 
 [smelt_iron]
 return=skipped unless economy needs iron
+sleep=25000
 consume=ironore coal
-sleep=25000
 animate=working 35000
 produce=iron
 
 [smelt_gold]
 return=skipped unless economy needs gold
+sleep=25000
 consume=goldore coal
-sleep=25000
 animate=working 35000
 produce=gold
 

=== modified file 'tribes/atlanteans/smokery/conf'
--- tribes/atlanteans/smokery/conf	2014-06-06 20:27:28 +0000
+++ tribes/atlanteans/smokery/conf	2014-07-05 15:25:17 +0000
@@ -32,15 +32,15 @@
 
 [smoke_meat]
 return=skipped unless economy needs smoked_meat or not economy needs log
+sleep=30000
 consume=meat:2 log
-sleep=30000
 animate=working 30000
 produce=smoked_meat:2
 
 [smoke_fish]
 return=skipped unless economy needs smoked_fish or not economy needs log
+sleep=30000
 consume=fish:2 log
-sleep=30000
 animate=working 30000
 produce=smoked_fish:2
 

=== modified file 'tribes/atlanteans/toolsmithy/conf'
--- tribes/atlanteans/toolsmithy/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/toolsmithy/conf	2014-07-05 15:25:17 +0000
@@ -51,85 +51,85 @@
 
 [produce_bread_paddle]
 return=skipped unless economy needs bread_paddle
+sleep=32000
 consume=iron log
-sleep=32000
 animate=working 35000
 produce=bread_paddle
 
 [produce_bucket]
 return=skipped unless economy needs bucket
+sleep=32000
 consume=iron log
-sleep=32000
 animate=working 35000
 produce=bucket
 
 [produce_fire_tongs]
 return=skipped unless economy needs fire_tongs
+sleep=32000
 consume=iron log
-sleep=32000
 animate=working 35000
 produce=fire_tongs
 
 [produce_fishing_net]
 return=skipped unless economy needs fishing_net
+sleep=32000
 consume=spidercloth:2
-sleep=32000
 animate=working 35000
 produce=fishing_net
 
 [produce_hammer]
 return=skipped unless economy needs hammer
+sleep=32000
 consume=iron log
-sleep=32000
 animate=working 35000
 produce=hammer
 
 [produce_hook_pole]
 return=skipped unless economy needs hook_pole
+sleep=32000
 consume=iron log
-sleep=32000
 animate=working 35000
 produce=hook_pole
 
 [produce_hunting_bow]
 return=skipped unless economy needs hunting_bow
+sleep=32000
 consume=log spidercloth
-sleep=32000
 animate=working 35000
 produce=hunting_bow
 
 [produce_milking_tongs]
 return=skipped unless economy needs milking_tongs
+sleep=32000
 consume=iron log
-sleep=32000
 animate=working 35000
 produce=milking_tongs
 
 [produce_pick]
 return=skipped unless economy needs pick
+sleep=32000
 consume=iron log
-sleep=32000
 animate=working 35000
 produce=pick
 
 [produce_saw]
 return=skipped unless economy needs saw
+sleep=32000
 consume=iron log
-sleep=32000
 animate=working 35000
 produce=saw
 
 [produce_scythe]
 return=skipped unless economy needs scythe
+sleep=32000
 consume=iron log
-sleep=32000
 animate=working 35000
 produce=scythe
 
 [produce_shovel]
 return=skipped unless economy needs shovel
+sleep=32000
 consume=iron log
-sleep=32000
 animate=working 35000
 produce=shovel
 

=== modified file 'tribes/atlanteans/weaponsmithy/conf'
--- tribes/atlanteans/weaponsmithy/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/weaponsmithy/conf	2014-07-05 15:25:17 +0000
@@ -39,8 +39,8 @@
 
 [produce_light_trident]
 return=skipped unless economy needs light_trident
+sleep=20000
 consume=iron planks
-sleep=20000
 playFX=../../../sound/smiths/smith 192
 animate=working 30000
 playFX=../../../sound/smiths/sharpening 192
@@ -48,8 +48,8 @@
 
 [produce_long_trident]
 return=skipped unless economy needs long_trident
+sleep=32000
 consume=iron coal planks
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 45000
 playFX=../../../sound/smiths/sharpening 192
@@ -57,8 +57,8 @@
 
 [produce_steel_trident]
 return=skipped unless economy needs steel_trident
+sleep=32000
 consume=iron:2 coal planks
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 45000
 playFX=../../../sound/smiths/sharpening 192
@@ -66,8 +66,8 @@
 
 [produce_double_trident]
 return=skipped unless economy needs double_trident
+sleep=32000
 consume=iron coal:2 planks gold
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 45000
 playFX=../../../sound/smiths/sharpening 192
@@ -75,8 +75,8 @@
 
 [produce_heavy_double_trident]
 return=skipped unless economy needs heavy_double_trident
+sleep=32000
 consume=iron:2 coal:2 planks gold
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 45000
 playFX=../../../sound/smiths/sharpening 192

=== modified file 'tribes/atlanteans/weaving-mill/conf'
--- tribes/atlanteans/weaving-mill/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/weaving-mill/conf	2014-07-05 15:25:17 +0000
@@ -28,20 +28,23 @@
 
 [produce_spidercloth]
 return=skipped unless economy needs spidercloth
+sleep=20000
 consume=spideryarn
-sleep=40000
+animate=working 20000
 produce=spidercloth
 
 [produce_tabard]
 return=skipped unless economy needs tabard
+sleep=20000
 consume=spideryarn
-sleep=40000
+animate=working 20000
 produce=tabard
 
 [produce_golden_tabard]
 return=skipped unless economy needs golden_tabard
+sleep=20000
 consume=spideryarn goldyarn
-sleep=40000
+animate=working 20000
 produce=golden_tabard
 
 [work]
@@ -53,3 +56,7 @@
 [idle]
 pics=weaving_mill_i_??.png  # ???
 hotspot=65 69
+
+[working]
+pics=weaving_mill_i_??.png # ???
+hotspot=65 69

=== modified file 'tribes/barbarians/axfactory/conf'
--- tribes/barbarians/axfactory/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/axfactory/conf	2014-07-05 15:25:17 +0000
@@ -36,8 +36,8 @@
 
 [produce_ax]
 return=skipped unless economy needs ax
+sleep=32000
 consume=coal iron
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
@@ -45,8 +45,8 @@
 
 [produce_sharpax]
 return=skipped unless economy needs sharpax
+sleep=32000
 consume=coal iron:2
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
@@ -54,8 +54,8 @@
 
 [produce_broadax]
 return=skipped unless economy needs broadax
+sleep=32000
 consume=coal:2 iron:2
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192

=== modified file 'tribes/barbarians/battlearena/conf'
--- tribes/barbarians/battlearena/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/battlearena/conf	2014-07-05 15:25:17 +0000
@@ -41,17 +41,17 @@
 [upgrade_soldier_evade_0]
 check_soldier=soldier evade 0 # Fails when aren't any soldier of level 0 evade
 sleep=15000
-animate=working 15000
 check_soldier=soldier evade 0 # Because the soldier can be expulsed by the player
 consume=pittabread fish,meat strongbeer
+animate=working 15000
 train=soldier evade 0 1
 
 [upgrade_soldier_evade_1]
 check_soldier=soldier evade 1 # Fails when aren't any soldier of level 1 evade
 sleep=15000
-animate=working 15000
 check_soldier=soldier evade 1 # Because the soldier can be expulsed by the player
 consume=pittabread:2 fish,meat strongbeer
+animate=working 15000
 train=soldier evade 1 2
 
 [build]

=== modified file 'tribes/barbarians/big_inn/conf'
--- tribes/barbarians/big_inn/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/big_inn/conf	2014-07-05 15:25:17 +0000
@@ -31,20 +31,20 @@
 
 [produce_ration]
 return=skipped unless economy needs ration
+sleep=33000
 consume=fish,pittabread,meat
-sleep=33000
 produce=ration
 
 [produce_snack]
 return=skipped unless economy needs snack
+sleep=35000
 consume=pittabread fish,meat beer
-sleep=35000
 produce=snack
 
 [produce_meal]
 return=skipped unless economy needs meal
+sleep=37000
 consume=pittabread fish,meat strongbeer
-sleep=37000
 produce=meal
 
 [work]

=== modified file 'tribes/barbarians/brewery/conf'
--- tribes/barbarians/brewery/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/brewery/conf	2014-07-05 15:25:17 +0000
@@ -24,10 +24,10 @@
 work=_Work
 
 [work]
+sleep=30000
 return=skipped unless economy needs strongbeer or not economy needs water
 return=skipped unless economy needs strongbeer or not economy needs wheat
 consume=water wheat
-sleep=30000
 animate=working 30000
 produce=strongbeer
 

=== modified file 'tribes/barbarians/burners_house/conf'
--- tribes/barbarians/burners_house/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/burners_house/conf	2014-07-05 15:25:17 +0000
@@ -23,9 +23,9 @@
 work=_Work
 
 [work]
+sleep=30000
 return=skipped unless economy needs coal or not economy needs log
 consume=log:6
-sleep=30000
 animate=working 90000 # charcoal fires are burning some days in real life
 produce=coal
 

=== modified file 'tribes/barbarians/cattlefarm/conf'
--- tribes/barbarians/cattlefarm/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/cattlefarm/conf	2014-07-05 15:25:17 +0000
@@ -25,11 +25,12 @@
 work=_Work
 
 [work]
+sleep=15000
 return=skipped unless economy needs ox or not economy needs wheat
 return=skipped unless economy needs ox or not economy needs water
 consume=wheat water
 playFX=../../../sound/farm/ox 192
-animate=working 30000 # animation of feeding the cattles
+animate=working 15000 # animation of feeding the cattles
 recruit=ox
 
 [idle]

=== modified file 'tribes/barbarians/deeper_oremine/conf'
--- tribes/barbarians/deeper_oremine/conf	2014-04-13 19:23:43 +0000
+++ tribes/barbarians/deeper_oremine/conf	2014-07-05 15:25:17 +0000
@@ -26,8 +26,8 @@
 work=_Work
 
 [work]
+sleep=40000
 consume=meal
-sleep=40000
 animate=working 16000
 mine=iron 2 100 10 2
 produce=ironore

=== modified file 'tribes/barbarians/granitemine/conf'
--- tribes/barbarians/granitemine/conf	2014-06-14 14:20:22 +0000
+++ tribes/barbarians/granitemine/conf	2014-07-05 15:25:17 +0000
@@ -22,8 +22,8 @@
 work=_Work
 
 [work]
+sleep=20000
 consume=ration
-sleep=20000
 animate=working 20000
 mine=granite 2 100 5 17
 produce=raw_stone:2

=== modified file 'tribes/barbarians/hardener/conf'
--- tribes/barbarians/hardener/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/hardener/conf	2014-07-05 15:25:17 +0000
@@ -22,9 +22,9 @@
 work=_Work
 
 [work]
+sleep=43000
 return=skipped unless economy needs blackwood
 consume=log:2
-sleep=43000
 animate=working 24000
 produce=blackwood
 

=== modified file 'tribes/barbarians/helmsmithy/conf'
--- tribes/barbarians/helmsmithy/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/helmsmithy/conf	2014-07-05 15:25:17 +0000
@@ -35,22 +35,22 @@
 
 [produce_helm]
 return=skipped unless economy needs helm
+sleep=32000
 consume=coal iron
-sleep=32000
 animate=working 35000
 produce=helm
 
 [produce_mask]
 return=skipped unless economy needs mask
+sleep=32000
 consume=coal iron:2
-sleep=32000
 animate=working 45000
 produce=mask
 
 [produce_warhelm]
 return=skipped unless economy needs warhelm
+sleep=32000
 consume=coal gold iron:2
-sleep=32000
 animate=working 55000
 produce=warhelm
 
@@ -58,7 +58,6 @@
 call=produce_helm
 call=produce_mask
 call=produce_warhelm
-sleep=20000
 return=skipped
 
 [idle]

=== modified file 'tribes/barbarians/inn/conf'
--- tribes/barbarians/inn/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/inn/conf	2014-07-05 15:25:17 +0000
@@ -30,15 +30,15 @@
 
 [produce_ration]
 return=skipped unless economy needs ration
+sleep=14000
 consume=fish,pittabread,meat
-sleep=14000
 animate=working 19000
 produce=ration
 
 [produce_snack]
 return=skipped unless economy needs snack
+sleep=15000
 consume=pittabread fish,meat beer
-sleep=15000
 animate=working 20000
 produce=snack
 

=== modified file 'tribes/barbarians/lime_kiln/conf'
--- tribes/barbarians/lime_kiln/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/lime_kiln/conf	2014-07-05 15:25:17 +0000
@@ -22,9 +22,9 @@
 work=_Work
 
 [work]
+sleep=50000
 return=skipped unless economy needs grout
 consume=coal raw_stone:2 water:2
-sleep=50000
 animate=working 32000
 produce=grout:2
 

=== modified file 'tribes/barbarians/metalworks/conf'
--- tribes/barbarians/metalworks/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/metalworks/conf	2014-07-05 15:25:17 +0000
@@ -49,80 +49,80 @@
 
 [produce_felling_ax]
 return=skipped unless economy needs felling_ax
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=felling_ax
 
 [produce_bread_paddle]
 return=skipped unless economy needs bread_paddle
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=bread_paddle
 
 [produce_fire_tongs]
 return=skipped unless economy needs fire_tongs
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=fire_tongs
 
 [produce_fishing_rod]
 return=skipped unless economy needs fishing_rod
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=fishing_rod
 
 [produce_hammer]
 return=skipped unless economy needs hammer
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=hammer
 
 [produce_kitchen_tools]
 return=skipped unless economy needs kitchen_tools
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=kitchen_tools
 
 [produce_pick]
 return=skipped unless economy needs pick
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=pick
 
 [produce_scythe]
 return=skipped unless economy needs scythe
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=scythe
 
 [produce_shovel]
 return=skipped unless economy needs shovel
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=shovel
 
 [produce_hunting_spear]
 return=skipped unless economy needs hunting_spear
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=hunting_spear

=== modified file 'tribes/barbarians/micro-brewery/conf'
--- tribes/barbarians/micro-brewery/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/micro-brewery/conf	2014-07-05 15:25:17 +0000
@@ -27,9 +27,9 @@
 work=_Work
 
 [work]
+sleep=30000
 return=skipped unless economy needs beer or workers need experience
 consume=water wheat
-sleep=30000
 animate=working 30000
 produce=beer
 

=== modified file 'tribes/barbarians/quarry/conf'
--- tribes/barbarians/quarry/conf	2014-03-15 11:29:32 +0000
+++ tribes/barbarians/quarry/conf	2014-07-05 15:25:17 +0000
@@ -18,8 +18,8 @@
 work=_Work
 
 [work]
-sleep=25000
-worker=cut
+worker=cut   # This order is on purpose so that the productivity 
+sleep=25000  # drops fast once all stones are gone.
 
 [idle]
 pics=b_quarry_i_??.png  # ???

=== modified file 'tribes/barbarians/smelting_works/conf'
--- tribes/barbarians/smelting_works/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/smelting_works/conf	2014-07-05 15:25:17 +0000
@@ -32,15 +32,15 @@
 
 [smelt_iron]
 return=skipped unless economy needs iron
+sleep=32000
 consume=coal ironore
-sleep=32000
 animate=working 35000
 produce=iron
 
 [smelt_gold]
 return=skipped unless economy needs gold
+sleep=32000
 consume=coal goldore
-sleep=32000
 animate=working 35000
 produce=gold
 

=== modified file 'tribes/barbarians/tavern/conf'
--- tribes/barbarians/tavern/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/tavern/conf	2014-07-05 15:25:17 +0000
@@ -29,9 +29,9 @@
 work=_Work
 
 [produce_ration]
+sleep=14000
 return=skipped unless economy needs ration
 consume=fish,pittabread,meat
-sleep=14000
 animate=working 19000
 produce=ration
 

=== modified file 'tribes/barbarians/warmill/conf'
--- tribes/barbarians/warmill/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/warmill/conf	2014-07-05 15:25:17 +0000
@@ -43,8 +43,8 @@
 
 [produce_ax]
 return=skipped unless economy needs ax
+sleep=32000
 consume=coal iron
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
@@ -52,8 +52,8 @@
 
 [produce_sharpax]
 return=skipped unless economy needs sharpax
+sleep=32000
 consume=coal iron:2
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
@@ -61,8 +61,8 @@
 
 [produce_broadax]
 return=skipped unless economy needs broadax
+sleep=32000
 consume=coal:2 iron:2
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
@@ -70,8 +70,8 @@
 
 [produce_bronzeax]
 return=skipped unless economy needs bronzeax
+sleep=32000
 consume=coal:2 iron:2
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
@@ -79,8 +79,8 @@
 
 [produce_battleax]
 return=skipped unless economy needs battleax
+sleep=32000
 consume=coal gold iron:2
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192
@@ -88,8 +88,8 @@
 
 [produce_warriorsax]
 return=skipped unless economy needs warriorsax
+sleep=32000
 consume=coal:2 gold:2 iron:2
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 25000
 playFX=../../../sound/smiths/sharpening 192

=== modified file 'tribes/barbarians/weaving-mill/conf'
--- tribes/barbarians/weaving-mill/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/weaving-mill/conf	2014-07-05 15:25:17 +0000
@@ -23,9 +23,10 @@
 work=_Work
 
 [work]
+sleep=20000
 return=skipped unless economy needs cloth or not economy needs thatchreed
-animate=working 45000
 consume=thatchreed
+animate=working 25000
 produce=cloth
 
 [idle]

=== modified file 'tribes/empire/armorsmithy/conf'
--- tribes/empire/armorsmithy/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/armorsmithy/conf	2014-07-05 15:25:17 +0000
@@ -36,29 +36,29 @@
 
 [produce_helm]
 return=skipped unless economy needs helm
+sleep=32000
 consume=iron coal
-sleep=32000
 animate=working 35000
 produce=helm
 
 [produce_armor]
 return=skipped unless economy needs armor
+sleep=32000
 consume=iron coal cloth
-sleep=32000
 animate=working 45000
 produce=armor
 
 [produce_chain_armor]
 return=skipped unless economy needs chain_armor
+sleep=32000
 consume=iron:2 coal cloth
-sleep=32000
 animate=working 45000
 produce=chain_armor
 
 [produce_plate_armor]
 return=skipped unless economy needs plate_armor
+sleep=32000
 consume=iron:2 coal:2 cloth gold
-sleep=32000
 animate=working 45000
 produce=plate_armor
 
@@ -67,7 +67,6 @@
 call=produce_armor
 call=produce_chain_armor
 call=produce_plate_armor
-sleep=20000
 return=skipped
 
 [unoccupied]

=== modified file 'tribes/empire/brewery/conf'
--- tribes/empire/brewery/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/brewery/conf	2014-07-05 15:25:17 +0000
@@ -24,10 +24,10 @@
 work=_Work
 
 [work]
+sleep=30000
 return=skipped unless economy needs beer or not economy needs water
 return=skipped unless economy needs beer or not economy needs wheat
 consume=water wheat
-sleep=30000
 animate=working 30000
 produce=beer
 

=== modified file 'tribes/empire/burners_house/conf'
--- tribes/empire/burners_house/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/burners_house/conf	2014-07-05 15:25:17 +0000
@@ -24,9 +24,9 @@
 work=_Work
 
 [work]
+sleep=30000
 return=skipped unless economy needs coal or not economy needs log
 consume=log:6
-sleep=30000
 animate=working 90000 # charcoal fires are burning some days in real life
 produce=coal
 

=== modified file 'tribes/empire/coalmine/conf'
--- tribes/empire/coalmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/empire/coalmine/conf	2014-07-05 15:25:17 +0000
@@ -25,9 +25,9 @@
 work=_Work
 
 [work]
+sleep=45000
 return=skipped unless economy needs coal or not economy needs ration
 return=skipped unless economy needs coal or not economy needs beer
-sleep=45000
 consume=beer ration
 animate=working 20000
 mine=coal 2 50 5 17

=== modified file 'tribes/empire/deep_coalmine/conf'
--- tribes/empire/deep_coalmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/empire/deep_coalmine/conf	2014-07-05 15:25:17 +0000
@@ -26,9 +26,9 @@
 work=_Work
 
 [work]
+sleep=42000
 return=skipped unless economy needs coal or not economy needs meal
 return=skipped unless economy needs coal or not economy needs beer
-sleep=42000
 consume=beer meal
 animate=working 18000
 mine=coal 2 100 5 2

=== modified file 'tribes/empire/deep_goldmine/conf'
--- tribes/empire/deep_goldmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/empire/deep_goldmine/conf	2014-07-05 15:25:17 +0000
@@ -26,9 +26,9 @@
 work=_Work
 
 [work]
+sleep=43000
 return=skipped unless economy needs goldore or not economy needs meal
 return=skipped unless economy needs goldore or not economy needs wine
-sleep=43000
 consume=meal wine
 animate=working 18000
 mine=gold 2 100 5 2

=== modified file 'tribes/empire/deep_oremine/conf'
--- tribes/empire/deep_oremine/conf	2014-04-13 19:23:43 +0000
+++ tribes/empire/deep_oremine/conf	2014-07-05 15:25:17 +0000
@@ -26,9 +26,9 @@
 work=_Work
 
 [work]
+sleep=43000
 return=skipped unless economy needs ironore or not economy needs meal
 return=skipped unless economy needs ironore or not economy needs beer
-sleep=43000
 consume=meal beer
 animate=working 18000
 mine=iron 2 100 5 2

=== modified file 'tribes/empire/donkeyfarm/conf'
--- tribes/empire/donkeyfarm/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/donkeyfarm/conf	2014-07-05 15:25:17 +0000
@@ -25,11 +25,12 @@
 work=_Work
 
 [work]
+sleep=15000
 return=skipped unless economy needs donkey or not economy needs wheat
 return=skipped unless economy needs donkey or not economy needs water
 consume=wheat water
 playFX=../../../sound/farm/donkey 192
-animate=working 30000 # feeding cute little baby donkeys ;)
+animate=working 15000 # feeding cute little baby donkeys ;)
 recruit=donkey
 
 [idle]

=== modified file 'tribes/empire/goldmine/conf'
--- tribes/empire/goldmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/empire/goldmine/conf	2014-07-05 15:25:17 +0000
@@ -26,9 +26,9 @@
 work=_Work
 
 [work]
+sleep=45000
 return=skipped unless economy needs goldore or not economy needs ration
 return=skipped unless economy needs goldore or not economy needs wine
-sleep=45000
 consume=ration wine
 animate=working 20000
 mine=gold 2 50 5 17

=== modified file 'tribes/empire/inn/conf'
--- tribes/empire/inn/conf	2013-07-23 19:04:12 +0000
+++ tribes/empire/inn/conf	2014-07-05 15:25:17 +0000
@@ -28,15 +28,15 @@
 
 [produce_ration]
 return=skipped unless economy needs ration
+sleep=14000
 consume=bread,fish,meat
-sleep=14000
 animate=working 19000
 produce=ration
 
 [produce_meal]
 return=skipped unless economy needs meal
+sleep=15000
 consume=bread fish,meat
-sleep=15000
 animate=working 20000
 produce=meal
 

=== modified file 'tribes/empire/mill/conf'
--- tribes/empire/mill/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/mill/conf	2014-07-05 15:25:17 +0000
@@ -24,9 +24,9 @@
 work=_Work
 
 [work]
+sleep=5000
 return=skipped unless economy needs flour or not economy needs wheat
 consume=wheat
-sleep=5000
 playFX=../../../sound/mill/mill_turning 240
 animate=working 10000
 produce=flour

=== modified file 'tribes/empire/oremine/conf'
--- tribes/empire/oremine/conf	2014-04-13 19:23:43 +0000
+++ tribes/empire/oremine/conf	2014-07-05 15:25:17 +0000
@@ -26,9 +26,9 @@
 work=_Work
 
 [work]
+sleep=45000
 return=skipped unless economy needs ironore or not economy needs ration
 return=skipped unless economy needs ironore or not economy needs beer
-sleep=45000
 consume=ration beer
 animate=working 20000
 mine=iron 2 50 5 17

=== modified file 'tribes/empire/piggery/conf'
--- tribes/empire/piggery/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/piggery/conf	2014-07-05 15:25:17 +0000
@@ -25,9 +25,9 @@
 work=_Work
 
 [work]
+sleep=25000
 return=skipped unless economy needs meat or not economy needs water
 return=skipped unless economy needs meat or not economy needs wheat
-sleep=25000
 consume=water wheat
 playFX=../../../sound/farm/farm_animal 180
 animate=working 30000

=== modified file 'tribes/empire/quarry/conf'
--- tribes/empire/quarry/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/quarry/conf	2014-07-05 15:25:17 +0000
@@ -22,12 +22,12 @@
 work=_Work
 
 [mine_stone]
-sleep=25000
-worker=cut_stone
+worker=cut_stone  # This order is on purpose so that the productivity 
+sleep=25000       # drops fast once all stones are gone.
 
 [mine_marble]
-sleep=25000
-worker=cut_marble
+worker=cut_marble  # This order is on purpose so that the productivity 
+sleep=25000        # drops fast once all stones are gone.
 
 [work]
 call=mine_stone

=== modified file 'tribes/empire/sawmill/conf'
--- tribes/empire/sawmill/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/sawmill/conf	2014-07-05 15:25:17 +0000
@@ -23,9 +23,9 @@
 work=_Work
 
 [work]
+sleep=16500 # much faster than barbarians hardener
 return=skipped unless economy needs wood
 consume=log:2
-sleep=16500 # much faster than barbarians hardener
 playFX=../../../sound/sawmill/sawmill 180
 animate=working 20000 # much more faster than barbarians hardener
 produce=wood

=== modified file 'tribes/empire/smelting_works/conf'
--- tribes/empire/smelting_works/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/smelting_works/conf	2014-07-05 15:25:17 +0000
@@ -29,15 +29,15 @@
 
 [smelt_iron]
 return=skipped unless economy needs iron
+sleep=25000
 consume=ironore coal
-sleep=25000
 animate=working 35000
 produce=iron
 
 [smelt_gold]
 return=skipped unless economy needs gold
+sleep=25000
 consume=goldore coal
-sleep=25000
 animate=working 35000
 produce=gold
 

=== modified file 'tribes/empire/stonemasons_house/conf'
--- tribes/empire/stonemasons_house/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/stonemasons_house/conf	2014-07-05 15:25:17 +0000
@@ -24,9 +24,9 @@
 work=_Work
 
 [work]
+sleep=50000
 return=skipped unless economy needs marblecolumn
 consume=marble:2
-sleep=50000
 playFX=../../../sound/stonecutting/stonemason 192
 animate=working 32000
 produce=marblecolumn

=== modified file 'tribes/empire/tavern/conf'
--- tribes/empire/tavern/conf	2013-07-23 19:04:12 +0000
+++ tribes/empire/tavern/conf	2014-07-05 15:25:17 +0000
@@ -27,9 +27,9 @@
 work=_Work
 
 [work]
+sleep=14000
 return=skipped unless economy needs ration
 consume=bread,fish,meat
-sleep=14000
 animate=working 19000
 produce=ration
 

=== modified file 'tribes/empire/toolsmithy/conf'
--- tribes/empire/toolsmithy/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/toolsmithy/conf	2014-07-05 15:25:17 +0000
@@ -50,96 +50,96 @@
 
 [produce_bread_paddle]
 return=skipped unless economy needs bread_paddle
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=bread_paddle
 
 [produce_fire_tongs]
 return=skipped unless economy needs fire_tongs
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=fire_tongs
 
 [produce_fishing_rod]
 return=skipped unless economy needs fishing_rod
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=fishing_rod
 
 [produce_hammer]
 return=skipped unless economy needs hammer
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=hammer
 
 [produce_kitchen_tools]
 return=skipped unless economy needs kitchen_tools
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=kitchen_tools
 
 [produce_pick]
 return=skipped unless economy needs pick
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=pick
 
 [produce_scythe]
 return=skipped unless economy needs scythe
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=scythe
 
 [produce_shovel]
 return=skipped unless economy needs shovel
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=shovel
 
 [produce_hunting_spear]
 return=skipped unless economy needs hunting_spear
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=hunting_spear
 
 [produce_basket]
 return=skipped unless economy needs basket
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=basket
 
 [produce_saw]
 return=skipped unless economy needs saw
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=saw
 
 [produce_ax]
 return=skipped unless economy needs ax
+sleep=32000
 consume=iron log
-sleep=32000
 playFX=../../../sound/smiths/toolsmith 192
 animate=working 35000
 produce=ax

=== modified file 'tribes/empire/weaponsmithy/conf'
--- tribes/empire/weaponsmithy/conf	2014-03-15 11:29:32 +0000
+++ tribes/empire/weaponsmithy/conf	2014-07-05 15:25:17 +0000
@@ -39,8 +39,8 @@
 
 [produce_wood_lance]
 return=skipped unless economy needs wood_lance
+sleep=20000
 consume=wood
-sleep=20000
 playFX=../../../sound/smiths/smith 192
 animate=working 30000
 playFX=../../../sound/smiths/sharpening 120
@@ -48,8 +48,8 @@
 
 [produce_lance]
 return=skipped unless economy needs lance
+sleep=32000
 consume=coal iron wood
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 45000
 playFX=../../../sound/smiths/sharpening 120
@@ -57,8 +57,8 @@
 
 [produce_advanced_lance]
 return=skipped unless economy needs advanced_lance
+sleep=32000
 consume=coal iron:2 wood
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 45000
 playFX=../../../sound/smiths/sharpening 120
@@ -66,8 +66,8 @@
 
 [produce_heavy_lance]
 return=skipped unless economy needs heavy_lance
+sleep=32000
 consume=coal:2 gold iron wood
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 45000
 playFX=../../../sound/smiths/sharpening 120
@@ -75,8 +75,8 @@
 
 [produce_war_lance]
 return=skipped unless economy needs war_lance
+sleep=32000
 consume=coal:2 gold iron:2 wood
-sleep=32000
 playFX=../../../sound/smiths/smith 192
 animate=working 45000
 playFX=../../../sound/smiths/sharpening 120

=== modified file 'tribes/empire/weaving-mill/conf'
--- tribes/empire/weaving-mill/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/weaving-mill/conf	2014-07-05 15:25:17 +0000
@@ -20,8 +20,8 @@
 work=_Work
 
 [work]
+sleep=25000 # orig 40000
 return=skipped unless economy needs cloth
-sleep=25000 # orig 40000
 consume=wool
 animate=working 15000 # unsure of balancing CW
 produce=cloth