widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #02162
[Merge] lp:~wl-zocker/widelands/bug571796 into lp:widelands
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_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-02 19:42:10 +0000
@@ -28,8 +28,8 @@
[work]
return=skipped unless economy needs goldore or not economy needs bread
return=skipped unless economy needs goldore or not economy needs smoked_fish
+sleep=45000
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-02 19:42:10 +0000
@@ -24,8 +24,8 @@
[work]
return=skipped unless economy needs goldyarn
+sleep=15000
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-02 19:42:10 +0000
@@ -27,9 +27,10 @@
[work]
return=skipped unless economy needs horse or not economy needs water
return=skipped unless economy needs horse or not economy needs corn
+sleep=15000
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-02 19:42:10 +0000
@@ -28,8 +28,8 @@
[work]
return=skipped unless economy needs ironore or not economy needs bread
return=skipped unless economy needs ironore or not economy needs smoked_fish
+sleep=45000
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-02 19:42:10 +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-02 19:42:10 +0000
@@ -19,8 +19,8 @@
work=_Work
[work]
+worker=cut_stone
sleep=25000
-worker=cut_stone
[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-02 19:42:10 +0000
@@ -23,8 +23,8 @@
[work]
return=skipped unless economy needs planks
+sleep=16500 # much faster than barbarians hardener
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-02 19:42:10 +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-02 19:42:10 +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/spiderfarm/conf'
--- tribes/atlanteans/spiderfarm/conf 2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/spiderfarm/conf 2014-07-02 19:42:10 +0000
@@ -21,9 +21,9 @@
work=_Work
[work]
-sleep=25000
return=skipped unless economy needs spideryarn or not economy needs corn
return=skipped unless economy needs spideryarn or not economy needs water
+sleep=25000
consume=corn water
animate=working 30000
produce=spideryarn
=== modified file 'tribes/atlanteans/toolsmithy/conf'
--- tribes/atlanteans/toolsmithy/conf 2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/toolsmithy/conf 2014-07-02 19:42:10 +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-02 19:42:10 +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-02 19:42:10 +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-02 19:42:10 +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/bakery/conf'
--- tribes/barbarians/bakery/conf 2014-03-17 17:23:26 +0000
+++ tribes/barbarians/bakery/conf 2014-07-02 19:42:10 +0000
@@ -26,9 +26,9 @@
work=_Work
[work]
-sleep=20000
return=skipped unless economy needs pittabread or not economy needs water
return=skipped unless economy needs pittabread or not economy needs wheat
+sleep=20000
consume=water:3 wheat:3
animate=working 20000
produce=pittabread
=== modified file 'tribes/barbarians/battlearena/conf'
--- tribes/barbarians/battlearena/conf 2014-03-17 17:23:26 +0000
+++ tribes/barbarians/battlearena/conf 2014-07-02 19:42:10 +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-02 19:42:10 +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-02 19:42:10 +0000
@@ -26,8 +26,8 @@
[work]
return=skipped unless economy needs strongbeer or not economy needs water
return=skipped unless economy needs strongbeer or not economy needs wheat
+sleep=30000
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-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/barbarians/cattlefarm/conf'
--- tribes/barbarians/cattlefarm/conf 2014-03-17 17:23:26 +0000
+++ tribes/barbarians/cattlefarm/conf 2014-07-02 19:42:10 +0000
@@ -27,9 +27,10 @@
[work]
return=skipped unless economy needs ox or not economy needs wheat
return=skipped unless economy needs ox or not economy needs water
+sleep=15000
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/hardener/conf'
--- tribes/barbarians/hardener/conf 2014-03-17 17:23:26 +0000
+++ tribes/barbarians/hardener/conf 2014-07-02 19:42:10 +0000
@@ -23,8 +23,8 @@
[work]
return=skipped unless economy needs blackwood
+sleep=43000
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-02 19:42:10 +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,7 @@
call=produce_helm
call=produce_mask
call=produce_warhelm
-sleep=20000
+sleep=20000 # other buildings don't have this ...
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-02 19:42:10 +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-02 19:42:10 +0000
@@ -23,8 +23,8 @@
[work]
return=skipped unless economy needs grout
+sleep=50000
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-02 19:42:10 +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-02 19:42:10 +0000
@@ -28,8 +28,8 @@
[work]
return=skipped unless economy needs beer or workers need experience
+sleep=30000
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-02 19:42:10 +0000
@@ -18,8 +18,8 @@
work=_Work
[work]
+worker=cut
sleep=25000
-worker=cut
[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-02 19:42:10 +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-02 19:42:10 +0000
@@ -30,8 +30,8 @@
[produce_ration]
return=skipped unless economy needs ration
+sleep=14000
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-02 19:42:10 +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-02 19:42:10 +0000
@@ -24,8 +24,9 @@
[work]
return=skipped unless economy needs cloth or not economy needs thatchreed
-animate=working 45000
+sleep=20000
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-02 19:42:10 +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
=== modified file 'tribes/empire/bakery/conf'
--- tribes/empire/bakery/conf 2014-03-15 11:29:32 +0000
+++ tribes/empire/bakery/conf 2014-07-02 19:42:10 +0000
@@ -24,8 +24,8 @@
work=_Work
[work]
+return=skipped unless economy needs bread
sleep=15000
-return=skipped unless economy needs bread
consume=flour water
animate=working 15000
produce=bread
=== modified file 'tribes/empire/brewery/conf'
--- tribes/empire/brewery/conf 2014-03-17 17:23:26 +0000
+++ tribes/empire/brewery/conf 2014-07-02 19:42:10 +0000
@@ -26,8 +26,8 @@
[work]
return=skipped unless economy needs beer or not economy needs water
return=skipped unless economy needs beer or not economy needs wheat
+sleep=30000
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-02 19:42:10 +0000
@@ -25,8 +25,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/empire/donkeyfarm/conf'
--- tribes/empire/donkeyfarm/conf 2014-03-17 17:23:26 +0000
+++ tribes/empire/donkeyfarm/conf 2014-07-02 19:42:10 +0000
@@ -27,9 +27,10 @@
[work]
return=skipped unless economy needs donkey or not economy needs wheat
return=skipped unless economy needs donkey or not economy needs water
+sleep=15000
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/inn/conf'
--- tribes/empire/inn/conf 2013-07-23 19:04:12 +0000
+++ tribes/empire/inn/conf 2014-07-02 19:42:10 +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-02 19:42:10 +0000
@@ -25,8 +25,8 @@
[work]
return=skipped unless economy needs flour or not economy needs wheat
+sleep=5000
consume=wheat
-sleep=5000
playFX=../../../sound/mill/mill_turning 240
animate=working 10000
produce=flour
=== modified file 'tribes/empire/quarry/conf'
--- tribes/empire/quarry/conf 2014-03-17 17:23:26 +0000
+++ tribes/empire/quarry/conf 2014-07-02 19:42:10 +0000
@@ -22,12 +22,12 @@
work=_Work
[mine_stone]
-sleep=25000
worker=cut_stone
+sleep=25000
[mine_marble]
-sleep=25000
worker=cut_marble
+sleep=25000
[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-02 19:42:10 +0000
@@ -24,8 +24,8 @@
[work]
return=skipped unless economy needs wood
+sleep=16500 # much faster than barbarians hardener
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/sheepfarm/conf'
--- tribes/empire/sheepfarm/conf 2014-03-17 17:23:26 +0000
+++ tribes/empire/sheepfarm/conf 2014-07-02 19:42:10 +0000
@@ -24,8 +24,8 @@
work=_Work
[work]
+return=skipped unless economy needs wool
sleep=25000
-return=skipped unless economy needs wool
consume=water wheat
playFX=../../../sound/farm/sheep 192
animate=working 30000
=== 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-02 19:42:10 +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-02 19:42:10 +0000
@@ -25,8 +25,8 @@
[work]
return=skipped unless economy needs marblecolumn
+sleep=50000
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-02 19:42:10 +0000
@@ -28,8 +28,8 @@
[work]
return=skipped unless economy needs ration
+sleep=14000
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-02 19:42:10 +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-02 19:42:10 +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
