widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #17472
[Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands with lp:~widelands-dev/widelands/failed_skipped_10s as a prerequisite.
Commit message:
move sleep behind return/consume/callworker
Requested reviews:
hessenfarmer (stephan-lutz)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/unify_sleep_time/+merge/368086
--
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/failed_skipped_10s.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/bakery/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/bakery/init.lua 2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/atlanteans/bakery/init.lua 2019-05-29 18:35:25 +0000
@@ -54,10 +54,10 @@
-- TRANSLATORS: Completed/Skipped/Did not start baking bread because ...
descname = pgettext("atlanteans_building", "baking bread"),
actions = {
- "sleep=35000",
"return=skipped unless economy needs atlanteans_bread",
"consume=water:2 blackroot_flour cornmeal",
- "animate=working 30000",
+ "animate=working 35000",
+ "sleep=30000",
"produce=atlanteans_bread:2"
}
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/barracks/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/barracks/init.lua 2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/atlanteans/barracks/init.lua 2019-05-29 18:35:25 +0000
@@ -57,9 +57,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start recruiting soldier because ...
descname = pgettext("atlanteans_building", "recruiting soldier"),
actions = {
- "sleep=15000",
"return=skipped unless economy needs atlanteans_soldier",
"consume=tabard trident_light atlanteans_recruit",
+ "sleep=15000",
"animate=working 15000",
"recruit=atlanteans_soldier"
}
=== modified file 'data/tribes/buildings/productionsites/atlanteans/blackroot_farm/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/blackroot_farm/init.lua 2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/atlanteans/blackroot_farm/init.lua 2019-05-29 18:35:25 +0000
@@ -56,16 +56,16 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting blackroot because ...
descname = _"planting blackroot",
actions = {
- "sleep=20000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=20000"
}
},
harvest = {
-- TRANSLATORS: Completed/Skipped/Did not start harvesting blackroot because ...
descname = _"harvesting blackroot",
actions = {
- "sleep=5000",
- "callworker=harvest"
+ "callworker=harvest",
+ "sleep=5000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua 2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua 2019-05-29 18:35:25 +0000
@@ -50,9 +50,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start producing coal because ...
descname = _"producing coal",
actions = {
- "sleep=30000",
"return=skipped unless economy needs coal",
"consume=log:6",
+ "sleep=30000",
"animate=working 90000", -- Charcoal fires will burn for some days in real life
"produce=coal"
}
=== modified file 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2018-09-12 03:04:08 +0000
+++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2019-05-29 18:35:25 +0000
@@ -58,10 +58,9 @@
descname = _"mining coal",
actions = {
-- time total: 105 + 7 x 3.6
- "sleep=5000",
"return=skipped unless economy needs coal",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
- "sleep=30000",
+ "sleep=35000",
-- after having the food the miners are working 7 times
-- each cycle lasts 10 seconds for mining and producing coal
-- and 3.6 seconds to deliver the coal to the flag
=== modified file 'data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2019-05-29 18:35:25 +0000
@@ -71,8 +71,8 @@
descname = _"mining granite",
actions = {
"return=skipped unless economy needs granite",
+ "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"sleep=40000",
- "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"call=a_mine_produce_granite",
"call=a_mine_produce_granite",
"call=a_mine_produce_granite",
@@ -87,8 +87,8 @@
descname = _"mining quartz",
actions = {
"return=skipped unless economy needs quartz",
+ "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"sleep=30000",
- "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"call=a_mine_produce_quartz",
"call=a_mine_produce_granite",
"call=a_mine_produce_granite",
@@ -103,8 +103,8 @@
descname = _"mining diamonds",
actions = {
"return=skipped unless economy needs diamond",
+ "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"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",
=== modified file 'data/tribes/buildings/productionsites/atlanteans/farm/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/farm/init.lua 2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/atlanteans/farm/init.lua 2019-05-29 18:35:25 +0000
@@ -60,16 +60,16 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting corn because ...
descname = _"planting corn",
actions = {
- "sleep=14000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=14000"
}
},
harvest = {
-- TRANSLATORS: Completed/Skipped/Did not start harvesting corn because ...
descname = _"harvesting corn",
actions = {
- "sleep=4000",
- "callworker=harvest"
+ "callworker=harvest",
+ "sleep=4000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua 2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua 2019-05-29 18:35:25 +0000
@@ -41,8 +41,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start breeding fish because ...
descname = _"breeding fish",
actions = {
- "sleep=24000",
- "callworker=breed"
+ "callworker=breed",
+ "sleep=24000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/fishers_house/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/fishers_house/init.lua 2018-07-08 16:10:50 +0000
+++ data/tribes/buildings/productionsites/atlanteans/fishers_house/init.lua 2019-05-29 18:35:25 +0000
@@ -46,8 +46,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start fishing because ...
descname = _"fishing",
actions = {
- "sleep=16000",
- "callworker=fish"
+ "callworker=fish",
+ "sleep=16000"
}
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/foresters_house/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/foresters_house/init.lua 2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/productionsites/atlanteans/foresters_house/init.lua 2019-05-29 18:35:25 +0000
@@ -42,8 +42,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting trees because ...
descname = _"planting trees",
actions = {
- "sleep=11000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=11000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/gold_spinning_mill/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/gold_spinning_mill/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/atlanteans/gold_spinning_mill/init.lua 2019-05-29 18:35:25 +0000
@@ -50,9 +50,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start spinning gold because ...
descname = _"spinning gold",
actions = {
- "sleep=15000",
"return=skipped unless economy needs gold_thread",
"consume=gold",
+ "sleep=15000",
"playsound=sound/atlanteans/goldspin 192",
"animate=working 25000",
"produce=gold_thread"
=== modified file 'data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua 2019-05-29 18:35:25 +0000
@@ -57,10 +57,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
descname = _"mining gold",
actions = {
- "sleep=5000",
"return=skipped unless economy needs gold_ore",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
- "sleep=34000",
+ "sleep=39000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/atlanteans/horsefarm/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/horsefarm/init.lua 2019-05-18 13:04:13 +0000
+++ data/tribes/buildings/productionsites/atlanteans/horsefarm/init.lua 2019-05-29 18:35:25 +0000
@@ -51,9 +51,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start breeding horses because ...
descname = pgettext("atlanteans_building", "breeding horses"),
actions = {
- "sleep=15000",
"return=skipped unless economy needs atlanteans_horse",
"consume=corn water",
+ "sleep=15000",
"playsound=sound/farm/horse 192",
"animate=working 15000", -- Feeding cute little foals ;)
"recruit=atlanteans_horse"
=== modified file 'data/tribes/buildings/productionsites/atlanteans/hunters_house/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/hunters_house/init.lua 2018-07-08 16:10:50 +0000
+++ data/tribes/buildings/productionsites/atlanteans/hunters_house/init.lua 2019-05-29 18:35:25 +0000
@@ -43,8 +43,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start hunting because ...
descname = _"hunting",
actions = {
- "sleep=35000",
- "callworker=hunt"
+ "callworker=hunt",
+ "sleep=35000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua 2019-05-29 18:35:25 +0000
@@ -58,10 +58,9 @@
descname = _"mining iron",
actions = {
-- 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",
- "sleep=30000",
+ "sleep=35000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/atlanteans/mill/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/mill/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/atlanteans/mill/init.lua 2019-05-29 18:35:25 +0000
@@ -79,8 +79,8 @@
actions = {
-- No check whether we need blackroot_flour because blackroots cannot be used for anything else.
"return=skipped when site has corn and economy needs cornmeal and not economy needs blackroot_flour",
- "sleep=3500",
"consume=blackroot",
+ "sleep=3500",
"playsound=sound/mill/mill_turning 240",
"animate=working 15000",
"produce=blackroot_flour"
=== modified file 'data/tribes/buildings/productionsites/atlanteans/sawmill/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/sawmill/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/atlanteans/sawmill/init.lua 2019-05-29 18:35:25 +0000
@@ -52,9 +52,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start sawing logs because ...
descname = _"sawing logs",
actions = {
- "sleep=16500", -- Much faster than barbarians' wood hardener
"return=skipped unless economy needs planks",
"consume=log:2",
+ "sleep=16500", -- Much faster than barbarians' wood hardener
"playsound=sound/atlanteans/saw/benchsaw 192",
"animate=working 20000", -- Much faster than barbarians' wood hardener
"produce=planks"
=== modified file 'data/tribes/buildings/productionsites/atlanteans/scouts_house/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/scouts_house/init.lua 2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/productionsites/atlanteans/scouts_house/init.lua 2019-05-29 18:35:25 +0000
@@ -44,11 +44,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start scouting because ...
descname = _"scouting",
actions = {
- "sleep=30000",
"consume=smoked_fish",
+ "sleep=30000",
"callworker=scout",
- "sleep=30000",
"consume=atlanteans_bread",
+ "sleep=30000",
"callworker=scout"
}
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua 2018-09-06 09:21:44 +0000
+++ data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua 2019-05-29 18:35:25 +0000
@@ -73,9 +73,8 @@
descname = _"constructing a ship",
actions = {
"checkmap=seafaring",
- "sleep=10000",
"construct=atlanteans_shipconstruction buildship 6",
- "sleep=10000",
+ "sleep=20000",
}
},
ship_preparation = {
=== modified file 'data/tribes/buildings/productionsites/atlanteans/spiderfarm/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/spiderfarm/init.lua 2017-06-26 19:48:43 +0000
+++ data/tribes/buildings/productionsites/atlanteans/spiderfarm/init.lua 2019-05-29 18:35:25 +0000
@@ -52,9 +52,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start working because ...
descname = _"working",
actions = {
- "sleep=25000",
"return=skipped unless economy needs spider_silk",
"consume=corn water",
+ "sleep=25000",
"animate=working 30000",
"produce=spider_silk"
}
=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2019-05-29 18:35:25 +0000
@@ -132,8 +132,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a heavy double trident because ...
descname = _"forging a heavy double trident",
actions = {
- -- time total: 77 + 3.6
- "return=skipped unless economy needs trident_heavy_double",
+ -- time total: 77 + 3.6
+ "return=skipped unless economy needs trident_heavy_double",
"consume=iron:2 coal:2 planks gold",
"sleep=32000",
"playsound=sound/smiths/smith 192",
=== modified file 'data/tribes/buildings/productionsites/atlanteans/woodcutters_house/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/woodcutters_house/init.lua 2018-07-08 16:10:50 +0000
+++ data/tribes/buildings/productionsites/atlanteans/woodcutters_house/init.lua 2019-05-29 18:35:25 +0000
@@ -42,8 +42,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start felling trees because ...
descname = _"felling trees",
actions = {
+ "callworker=harvest"
"sleep=30000", -- Barbarian lumberjack sleeps 25000
- "callworker=harvest"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/bakery/init.lua'
--- data/tribes/buildings/productionsites/barbarians/bakery/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/bakery/init.lua 2019-05-29 18:35:25 +0000
@@ -57,9 +57,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start baking bread because ...
descname = pgettext("barbarians_building", "baking pitta bread"),
actions = {
- "sleep=20000",
"return=skipped unless economy needs barbarians_bread",
"consume=water:3 wheat:3",
+ "sleep=20000",
"animate=working 20000",
"produce=barbarians_bread",
"animate=working 20000",
=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/init.lua'
--- data/tribes/buildings/productionsites/barbarians/barracks/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/barracks/init.lua 2019-05-29 18:35:25 +0000
@@ -59,9 +59,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start recruiting soldier because ...
descname = pgettext("barbarians_building", "recruiting soldier"),
actions = {
- "sleep=15000",
"return=skipped unless economy needs barbarians_soldier",
"consume=ax barbarians_recruit",
+ "sleep=15000",
"animate=working 15000",
"recruit=barbarians_soldier"
}
=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2019-05-29 18:35:25 +0000
@@ -71,10 +71,9 @@
actions = {
-- time total: 33
"return=skipped unless economy needs ration",
- "sleep=5000",
"consume=barbarians_bread,fish,meat",
"playsound=sound/barbarians/taverns/tavern 100",
- "animate=working 18000",
+ "animate=working 23000",
"sleep=10000",
"produce=ration"
}
=== modified file 'data/tribes/buildings/productionsites/barbarians/brewery/init.lua'
--- data/tribes/buildings/productionsites/barbarians/brewery/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/brewery/init.lua 2019-05-29 18:35:25 +0000
@@ -50,9 +50,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start brewing strong beer because ...
descname = _"brewing strong beer",
actions = {
- "sleep=30000",
"return=skipped unless economy needs beer_strong",
"consume=water wheat",
+ "sleep=30000",
"animate=working 30000",
"produce=beer_strong"
}
=== modified file 'data/tribes/buildings/productionsites/barbarians/cattlefarm/init.lua'
--- data/tribes/buildings/productionsites/barbarians/cattlefarm/init.lua 2019-05-18 13:04:13 +0000
+++ data/tribes/buildings/productionsites/barbarians/cattlefarm/init.lua 2019-05-29 18:35:25 +0000
@@ -51,9 +51,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start rearing cattle because ...
descname = pgettext("barbarians_building", "rearing cattle"),
actions = {
- "sleep=15000",
"return=skipped unless economy needs barbarians_ox",
"consume=wheat water",
+ "sleep=15000",
"playsound=sound/farm/ox 192",
"animate=working 15000", -- Animation of feeding the cattle
"recruit=barbarians_ox"
=== modified file 'data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua'
--- data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua 2019-05-29 18:35:25 +0000
@@ -54,9 +54,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start producing coal because ...
descname = _"producing coal",
actions = {
- "sleep=30000",
"return=skipped unless economy needs coal",
"consume=log:6",
+ "sleep=30000",
"animate=working 90000", -- Charcoal fires will burn for some days in real life
"produce=coal"
}
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine/init.lua 2019-05-29 18:35:25 +0000
@@ -60,10 +60,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
- "sleep=5000",
"return=skipped unless economy needs coal",
"consume=ration",
- "sleep=40000",
+ "sleep=45000",
"call=mine_produce",
"call=mine_produce",
"return=no_stats"
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua 2019-05-29 18:35:25 +0000
@@ -60,10 +60,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
- "sleep=5000",
"return=skipped unless economy needs coal",
"consume=snack",
- "sleep=35000",
+ "sleep=40000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua 2019-05-29 18:35:25 +0000
@@ -59,10 +59,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
- "sleep=5000",
"return=skipped unless economy needs coal",
"consume=meal",
- "sleep=32000",
+ "sleep=37000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/barbarians/farm/init.lua'
--- data/tribes/buildings/productionsites/barbarians/farm/init.lua 2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/barbarians/farm/init.lua 2019-05-29 18:35:25 +0000
@@ -68,17 +68,17 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting wheat because ...
descname = _"planting wheat",
actions = {
- "sleep=14000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=14000"
}
},
harvest = {
-- TRANSLATORS: Completed/Skipped/Did not start harvesting wheat because ...
descname = _"harvesting wheat",
actions = {
- "sleep=4000",
"callworker=harvest",
- "animate=working 30000"
+ "animate=working 30000",
+ "sleep=4000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/fishers_hut/init.lua'
--- data/tribes/buildings/productionsites/barbarians/fishers_hut/init.lua 2018-07-08 16:10:50 +0000
+++ data/tribes/buildings/productionsites/barbarians/fishers_hut/init.lua 2019-05-29 18:35:25 +0000
@@ -52,8 +52,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start fishing because ...
descname = _"fishing",
actions = {
- "sleep=18000",
- "callworker=fish"
+ "callworker=fish",
+ "sleep=18000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/gamekeepers_hut/init.lua'
--- data/tribes/buildings/productionsites/barbarians/gamekeepers_hut/init.lua 2018-02-28 09:38:13 +0000
+++ data/tribes/buildings/productionsites/barbarians/gamekeepers_hut/init.lua 2019-05-29 18:35:25 +0000
@@ -48,8 +48,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start working because ...
descname = _"working",
actions = {
- "sleep=52500",
- "callworker=release"
+ "callworker=release",
+ "sleep=52500"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine/init.lua'
--- data/tribes/buildings/productionsites/barbarians/goldmine/init.lua 2018-08-20 20:24:38 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine/init.lua 2019-05-29 18:35:25 +0000
@@ -60,10 +60,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
descname = _"mining gold",
actions = {
- "sleep=5000",
"return=skipped unless economy needs gold_ore",
"consume=ration",
- "sleep=40000",
+ "sleep=45000",
"animate=working 20000",
"mine=gold 2 33 5 17",
"produce=gold_ore"
=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua 2019-05-29 18:35:25 +0000
@@ -60,10 +60,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
descname = _"mining gold",
actions = {
- "sleep=5000",
"return=skipped unless economy needs gold_ore",
"consume=snack",
- "sleep=35000",
+ "sleep=40000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua 2019-05-29 18:35:25 +0000
@@ -59,10 +59,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
descname = _"mining gold",
actions = {
- "sleep=5000",
"return=skipped unless economy needs gold_ore",
"consume=meal",
- "sleep=33000",
+ "sleep=38000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/barbarians/granitemine/init.lua'
--- data/tribes/buildings/productionsites/barbarians/granitemine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/barbarians/granitemine/init.lua 2019-05-29 18:35:25 +0000
@@ -58,10 +58,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
descname = _"mining granite",
actions = {
- "sleep=5000",
"return=skipped unless economy needs granite",
"consume=ration",
- "sleep=15000",
+ "sleep=20000",
"call=mine_produce",
"call=mine_produce",
"return=no_stats"
=== modified file 'data/tribes/buildings/productionsites/barbarians/hunters_hut/init.lua'
--- data/tribes/buildings/productionsites/barbarians/hunters_hut/init.lua 2018-07-08 16:10:50 +0000
+++ data/tribes/buildings/productionsites/barbarians/hunters_hut/init.lua 2019-05-29 18:35:25 +0000
@@ -54,8 +54,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start hunting because ...
descname = _"hunting",
actions = {
- "sleep=35000",
- "callworker=hunt"
+ "callworker=hunt",
+ "sleep=35000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/inn/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua 2019-05-29 18:35:25 +0000
@@ -68,10 +68,9 @@
actions = {
-- time total: 33
"return=skipped unless economy needs ration",
- "sleep=5000",
"consume=barbarians_bread,fish,meat",
"playsound=sound/barbarians/taverns/inn 100",
- "animate=working 18000",
+ "animate=working 23000",
"sleep=10000",
"produce=ration"
}
=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ironmine/init.lua 2018-08-20 20:24:38 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine/init.lua 2019-05-29 18:35:25 +0000
@@ -60,10 +60,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
descname = _"mining iron",
actions = {
- "sleep=5000",
"return=skipped unless economy needs iron_ore",
"consume=ration",
- "sleep=40000",
+ "sleep=45000",
"animate=working 20000",
"mine=iron 2 33 5 17",
"produce=iron_ore"
=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua 2019-05-29 18:35:25 +0000
@@ -60,10 +60,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
descname = _"mining iron",
actions = {
- "sleep=5000",
"return=skipped unless economy needs iron_ore",
"consume=snack",
- "sleep=35000",
+ "sleep=40000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua 2019-05-29 18:35:25 +0000
@@ -59,10 +59,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
descname = _"mining iron",
actions = {
- "sleep=5000",
"return=skipped unless economy needs iron_ore",
"consume=meal",
- "sleep=33000",
+ "sleep=38000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/barbarians/lime_kiln/init.lua'
--- data/tribes/buildings/productionsites/barbarians/lime_kiln/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/lime_kiln/init.lua 2019-05-29 18:35:25 +0000
@@ -54,9 +54,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mixing grout because ...
descname = _"mixing grout",
actions = {
- "sleep=50000",
"return=skipped unless economy needs grout",
"consume=coal granite:2 water:2",
+ "sleep=50000",
"playsound=sound/barbarians/stonegrind 100",
"animate=working 29000",
"playsound=sound/barbarians/mortar 80",
=== modified file 'data/tribes/buildings/productionsites/barbarians/lumberjacks_hut/init.lua'
--- data/tribes/buildings/productionsites/barbarians/lumberjacks_hut/init.lua 2018-07-08 16:10:50 +0000
+++ data/tribes/buildings/productionsites/barbarians/lumberjacks_hut/init.lua 2019-05-29 18:35:25 +0000
@@ -49,8 +49,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start felling trees because ...
descname = _"felling trees",
actions = {
+ "callworker=harvest"
"sleep=25000", -- Sleeps shorter than any other tribes.
- "callworker=harvest"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua'
--- data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua 2019-05-29 18:35:25 +0000
@@ -55,9 +55,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start brewing beer because ...
descname = _"brewing beer",
actions = {
- "sleep=30000",
"return=skipped unless economy needs beer or workers need experience",
"consume=water wheat",
+ "sleep=30000",
"animate=working 30000",
"produce=beer"
}
=== modified file 'data/tribes/buildings/productionsites/barbarians/rangers_hut/init.lua'
--- data/tribes/buildings/productionsites/barbarians/rangers_hut/init.lua 2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/productionsites/barbarians/rangers_hut/init.lua 2019-05-29 18:35:25 +0000
@@ -48,8 +48,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting trees because ...
descname = _"planting trees",
actions = {
- "sleep=16000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=16000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua'
--- data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua 2019-05-29 18:35:25 +0000
@@ -52,16 +52,16 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting reed because ...
descname = _"planting reed",
actions = {
- "sleep=18000", -- orig sleep=20000 but gardener animation was increased by 2sec
- "callworker=plant"
+ "callworker=plant",
+ "sleep=18000" -- orig sleep=20000 but gardener animation was increased by 2sec
}
},
harvest = {
-- TRANSLATORS: Completed/Skipped/Did not start harvesting reed because ...
descname = _"harvesting reed",
actions = {
- "sleep=5000",
- "callworker=harvest"
+ "callworker=harvest",
+ "sleep=5000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/scouts_hut/init.lua'
--- data/tribes/buildings/productionsites/barbarians/scouts_hut/init.lua 2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/productionsites/barbarians/scouts_hut/init.lua 2019-05-29 18:35:25 +0000
@@ -48,8 +48,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start scouting because ...
descname = _"scouting",
actions = {
+ "consume=ration",
"sleep=30000",
- "consume=ration",
"callworker=scout"
}
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/init.lua'
--- data/tribes/buildings/productionsites/barbarians/shipyard/init.lua 2018-09-29 18:01:31 +0000
+++ data/tribes/buildings/productionsites/barbarians/shipyard/init.lua 2019-05-29 18:35:25 +0000
@@ -61,9 +61,8 @@
descname = _"constructing a ship",
actions = {
"checkmap=seafaring",
- "sleep=10000",
"construct=barbarians_shipconstruction buildship 6",
- "sleep=10000",
+ "sleep=20000",
}
},
ship_preparation = {
=== modified file 'data/tribes/buildings/productionsites/barbarians/tavern/init.lua'
--- data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2019-05-29 18:35:25 +0000
@@ -62,10 +62,9 @@
actions = {
-- time total: 33
"return=skipped unless economy needs ration",
- "sleep=5000",
"consume=barbarians_bread,fish,meat",
"playsound=sound/barbarians/taverns/tavern 100",
- "animate=working 18000",
+ "animate=working 23000",
"sleep=10000",
"produce=ration"
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/wood_hardener/init.lua'
--- data/tribes/buildings/productionsites/barbarians/wood_hardener/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/wood_hardener/init.lua 2019-05-29 18:35:25 +0000
@@ -59,9 +59,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start hardening wood because ...
descname = _"hardening wood",
actions = {
- "sleep=43000",
"return=skipped unless economy needs blackwood",
"consume=log:2",
+ "sleep=43000",
"playsound=sound/barbarians/blackwood 80",
"animate=working 24000",
"produce=blackwood"
=== modified file 'data/tribes/buildings/productionsites/empire/bakery/init.lua'
--- data/tribes/buildings/productionsites/empire/bakery/init.lua 2017-09-20 17:19:59 +0000
+++ data/tribes/buildings/productionsites/empire/bakery/init.lua 2019-05-29 18:35:25 +0000
@@ -59,9 +59,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start baking bread because ...
descname = pgettext("empire_building", "baking bread"),
actions = {
- "sleep=15000",
"return=skipped unless economy needs empire_bread",
"consume=flour water",
+ "sleep=15000",
"animate=working 15000",
"produce=empire_bread"
}
=== modified file 'data/tribes/buildings/productionsites/empire/barracks/init.lua'
--- data/tribes/buildings/productionsites/empire/barracks/init.lua 2019-03-13 21:28:29 +0000
+++ data/tribes/buildings/productionsites/empire/barracks/init.lua 2019-05-29 18:35:25 +0000
@@ -58,9 +58,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start recruiting soldier because ...
descname = pgettext("empire_building", "recruiting soldier"),
actions = {
- "sleep=15000",
"return=skipped unless economy needs empire_soldier",
"consume=armor_helmet spear_wooden empire_recruit",
+ "sleep=15000",
"animate=working 15000",
"recruit=empire_soldier"
}
=== modified file 'data/tribes/buildings/productionsites/empire/brewery/init.lua'
--- data/tribes/buildings/productionsites/empire/brewery/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/brewery/init.lua 2019-05-29 18:35:25 +0000
@@ -53,9 +53,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start brewing beer because ...
descname = _"brewing beer",
actions = {
- "sleep=30000",
"return=skipped unless economy needs beer",
"consume=water wheat",
+ "sleep=30000",
"playsound=sound/empire/beerbubble 180",
"animate=working 30000",
"produce=beer"
=== modified file 'data/tribes/buildings/productionsites/empire/charcoal_kiln/init.lua'
--- data/tribes/buildings/productionsites/empire/charcoal_kiln/init.lua 2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/empire/charcoal_kiln/init.lua 2019-05-29 18:35:25 +0000
@@ -51,9 +51,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start producing coal because ...
descname = _"producing coal",
actions = {
- "sleep=30000",
"return=skipped unless economy needs coal",
"consume=log:6",
+ "sleep=30000",
"animate=working 90000", -- Charcoal fires will burn for some days in real life
"produce=coal"
}
=== modified file 'data/tribes/buildings/productionsites/empire/coalmine/init.lua'
--- data/tribes/buildings/productionsites/empire/coalmine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/empire/coalmine/init.lua 2019-05-29 18:35:25 +0000
@@ -58,10 +58,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
- "sleep=5000",
"return=skipped unless economy needs coal",
"consume=beer ration",
- "sleep=38000",
+ "sleep=43000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua 2019-05-29 18:35:25 +0000
@@ -56,10 +56,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
- "sleep=5000",
"return=skipped unless economy needs coal",
"consume=beer meal",
- "sleep=33000",
+ "sleep=38000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/empire/donkeyfarm/init.lua'
--- data/tribes/buildings/productionsites/empire/donkeyfarm/init.lua 2019-05-18 13:04:13 +0000
+++ data/tribes/buildings/productionsites/empire/donkeyfarm/init.lua 2019-05-29 18:35:25 +0000
@@ -51,9 +51,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start rearing donkeys because ...
descname = pgettext("empire_building", "rearing donkeys"),
actions = {
- "sleep=15000",
"return=skipped unless economy needs empire_donkey",
"consume=wheat water",
+ "sleep=15000",
"playsound=sound/farm/donkey 192",
"animate=working 15000", -- Feeding cute little baby donkeys ;)
"recruit=empire_donkey"
=== modified file 'data/tribes/buildings/productionsites/empire/farm/init.lua'
--- data/tribes/buildings/productionsites/empire/farm/init.lua 2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/empire/farm/init.lua 2019-05-29 18:35:25 +0000
@@ -59,16 +59,16 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting wheat because ...
descname = _"planting wheat",
actions = {
- "sleep=14000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=14000"
}
},
harvest = {
-- TRANSLATORS: Completed/Skipped/Did not start harvesting wheat because ...
descname = _"harvesting wheat",
actions = {
- "sleep=4000",
- "callworker=harvest"
+ "callworker=harvest",
+ "sleep=4000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/empire/fishers_house/init.lua'
--- data/tribes/buildings/productionsites/empire/fishers_house/init.lua 2018-07-08 16:10:50 +0000
+++ data/tribes/buildings/productionsites/empire/fishers_house/init.lua 2019-05-29 18:35:25 +0000
@@ -44,8 +44,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start fishing because ...
descname = _"fishing",
actions = {
- "sleep=17000",
- "callworker=fish"
+ "callworker=fish",
+ "sleep=17000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/empire/foresters_house/init.lua'
--- data/tribes/buildings/productionsites/empire/foresters_house/init.lua 2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/productionsites/empire/foresters_house/init.lua 2019-05-29 18:35:25 +0000
@@ -42,8 +42,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting trees because ...
descname = _"planting trees",
actions = {
- "sleep=11000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=11000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/empire/goldmine/init.lua'
--- data/tribes/buildings/productionsites/empire/goldmine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/empire/goldmine/init.lua 2019-05-29 18:35:25 +0000
@@ -58,10 +58,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
descname = _"mining gold",
actions = {
- "sleep=5000",
"return=skipped unless economy needs gold_ore",
"consume=ration wine",
- "sleep=38000",
+ "sleep=43000",
"call=mine_produce",
"call=mine_produce",
"return=no_stats"
=== modified file 'data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua 2019-05-29 18:35:25 +0000
@@ -56,10 +56,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
descname = _"mining gold",
actions = {
- "sleep=5000",
"return=skipped unless economy needs gold_ore",
"consume=meal wine",
- "sleep=35000",
+ "sleep=40000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/empire/hunters_house/init.lua'
--- data/tribes/buildings/productionsites/empire/hunters_house/init.lua 2018-07-08 16:10:50 +0000
+++ data/tribes/buildings/productionsites/empire/hunters_house/init.lua 2019-05-29 18:35:25 +0000
@@ -43,8 +43,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start hunting because ...
descname = _"hunting",
actions = {
- "sleep=35000",
- "callworker=hunt"
+ "callworker=hunt",
+ "sleep=35000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/empire/inn/init.lua'
--- data/tribes/buildings/productionsites/empire/inn/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/inn/init.lua 2019-05-29 18:35:25 +0000
@@ -64,10 +64,9 @@
actions = {
-- time total: 33
"return=skipped unless economy needs ration",
- "sleep=5000",
"consume=empire_bread,fish,meat",
"playsound=sound/empire/taverns/ration 100",
- "animate=working 18000",
+ "animate=working 23000",
"sleep=10000",
"produce=ration"
}
=== modified file 'data/tribes/buildings/productionsites/empire/ironmine/init.lua'
--- data/tribes/buildings/productionsites/empire/ironmine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/empire/ironmine/init.lua 2019-05-29 18:35:25 +0000
@@ -58,10 +58,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
descname = _"mining iron",
actions = {
- "sleep=5000",
"return=skipped unless economy needs iron_ore",
"consume=ration beer",
- "sleep=38000",
+ "sleep=43000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua 2019-05-29 18:35:25 +0000
@@ -56,10 +56,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
descname = _"mining iron",
actions = {
- "sleep=5000",
"return=skipped unless economy needs iron_ore",
"consume=meal beer",
- "sleep=34000",
+ "sleep=39000",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/empire/lumberjacks_house/init.lua'
--- data/tribes/buildings/productionsites/empire/lumberjacks_house/init.lua 2018-07-08 16:10:50 +0000
+++ data/tribes/buildings/productionsites/empire/lumberjacks_house/init.lua 2019-05-29 18:35:25 +0000
@@ -42,8 +42,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start felling trees because ...
descname = _"felling trees",
actions = {
+ "callworker=harvest",
"sleep=30000", -- Barbarian lumberjack sleeps 25000
- "callworker=harvest"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/empire/marblemine/init.lua'
--- data/tribes/buildings/productionsites/empire/marblemine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/empire/marblemine/init.lua 2019-05-29 18:35:25 +0000
@@ -69,9 +69,9 @@
-- 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",
+ "sleep=18000",
"call=a_mine_produce_granite",
"call=a_mine_produce_granite",
"call=a_mine_produce_marble",
@@ -83,9 +83,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining marble because ...
descname = _"mining marble",
actions = {
- "sleep=18000",
"return=skipped unless economy needs marble or economy needs granite",
"consume=wine ration",
+ "sleep=18000",
"call=a_mine_produce_marble",
"call=a_mine_produce_marble",
"call=a_mine_produce_granite",
=== modified file 'data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua 2019-05-29 18:35:25 +0000
@@ -57,9 +57,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining marble because ...
descname = _"mining marble",
actions = {
+ "return=skipped unless economy needs marble or economy needs granite",
+ "consume=meal wine",
"sleep=40000",
- "return=skipped unless economy needs marble or economy needs granite",
- "consume=meal wine",
"call=mine_produce_marble",
"call=mine_produce_granite",
"call=mine_produce_marble",
=== modified file 'data/tribes/buildings/productionsites/empire/mill/init.lua'
--- data/tribes/buildings/productionsites/empire/mill/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/mill/init.lua 2019-05-29 18:35:25 +0000
@@ -52,9 +52,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start grinding wheat because ...
descname = _"grinding wheat",
actions = {
- "sleep=5000",
"return=skipped unless economy needs flour",
"consume=wheat",
+ "sleep=5000",
"playsound=sound/mill/mill_turning 240",
"animate=working 10000",
"produce=flour"
=== modified file 'data/tribes/buildings/productionsites/empire/piggery/init.lua'
--- data/tribes/buildings/productionsites/empire/piggery/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/piggery/init.lua 2019-05-29 18:35:25 +0000
@@ -53,9 +53,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start raising pigs because ...
descname = _"raising pigs",
actions = {
- "sleep=25000",
"return=skipped unless economy needs meat",
"consume=water wheat",
+ "sleep=25000",
"playsound=sound/farm/farm_animal 180",
"animate=working 30000",
"produce=meat"
=== modified file 'data/tribes/buildings/productionsites/empire/sawmill/init.lua'
--- data/tribes/buildings/productionsites/empire/sawmill/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/sawmill/init.lua 2019-05-29 18:35:25 +0000
@@ -52,9 +52,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start sawing logs because ...
descname = _"sawing logs",
actions = {
- "sleep=16500", -- Much faster than barbarians' wood hardener
"return=skipped unless economy needs planks",
"consume=log:2",
+ "sleep=16500", -- Much faster than barbarians' wood hardener
"playsound=sound/sawmill/sawmill 180",
"animate=working 20000", -- Much faster than barbarians' wood hardener
"produce=planks"
=== modified file 'data/tribes/buildings/productionsites/empire/scouts_house/init.lua'
--- data/tribes/buildings/productionsites/empire/scouts_house/init.lua 2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/productionsites/empire/scouts_house/init.lua 2019-05-29 18:35:25 +0000
@@ -44,8 +44,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start scouting because ...
descname = _"scouting",
actions = {
+ "consume=ration",
"sleep=30000",
- "consume=ration",
"callworker=scout"
}
},
=== modified file 'data/tribes/buildings/productionsites/empire/sheepfarm/init.lua'
--- data/tribes/buildings/productionsites/empire/sheepfarm/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/sheepfarm/init.lua 2019-05-29 18:35:25 +0000
@@ -53,9 +53,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start breeding sheep because ...
descname = _"breeding sheep",
actions = {
- "sleep=25000",
"return=skipped unless economy needs wool",
"consume=water wheat",
+ "sleep=25000",
"playsound=sound/farm/sheep 192",
"animate=working 30000",
"produce=wool"
=== modified file 'data/tribes/buildings/productionsites/empire/shipyard/init.lua'
--- data/tribes/buildings/productionsites/empire/shipyard/init.lua 2018-09-06 09:21:44 +0000
+++ data/tribes/buildings/productionsites/empire/shipyard/init.lua 2019-05-29 18:35:25 +0000
@@ -72,9 +72,8 @@
descname = _"constructing a ship",
actions = {
"checkmap=seafaring",
- "sleep=10000",
"construct=empire_shipconstruction buildship 6",
- "sleep=10000",
+ "sleep=20000",
}
},
ship_preparation = {
=== modified file 'data/tribes/buildings/productionsites/empire/stonemasons_house/init.lua'
--- data/tribes/buildings/productionsites/empire/stonemasons_house/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/stonemasons_house/init.lua 2019-05-29 18:35:25 +0000
@@ -53,9 +53,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start sculpting a marble column because ...
descname = _"sculpting a marble column",
actions = {
- "sleep=50000",
"return=skipped unless economy needs marble_column",
"consume=marble:2",
+ "sleep=50000",
"playsound=sound/stonecutting/stonemason 192",
"animate=working 32000",
"produce=marble_column"
=== modified file 'data/tribes/buildings/productionsites/empire/tavern/init.lua'
--- data/tribes/buildings/productionsites/empire/tavern/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/tavern/init.lua 2019-05-29 18:35:25 +0000
@@ -57,8 +57,8 @@
actions = {
-- time total: 33
"return=skipped unless economy needs ration",
+ "consume=empire_bread,fish,meat",
"sleep=5000",
- "consume=empire_bread,fish,meat",
"playsound=sound/empire/taverns/ration 100",
"animate=working 18000",
"sleep=10000",
=== modified file 'data/tribes/buildings/productionsites/empire/vineyard/init.lua'
--- data/tribes/buildings/productionsites/empire/vineyard/init.lua 2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/empire/vineyard/init.lua 2019-05-29 18:35:25 +0000
@@ -58,16 +58,16 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting grapevines because ...
descname = _"planting grapevines",
actions = {
- "sleep=20000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=20000"
}
},
harvest = {
-- TRANSLATORS: Completed/Skipped/Did not start harvesting grapevines because ...
descname = _"harvesting grapes",
actions = {
- "sleep=5000",
- "callworker=harvest"
+ "callworker=harvest",
+ "sleep=5000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/empire/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/empire/weaving_mill/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/weaving_mill/init.lua 2019-05-29 18:35:25 +0000
@@ -59,10 +59,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start weaving because ...
descname = _"weaving",
actions = {
- "sleep=5000",
"return=skipped unless economy needs cloth",
"consume=wool",
- "sleep=15000",
+ "sleep=20000",
"playsound=sound/mill/weaving 120",
"animate=working 15000", -- Unsure of balancing CW
"sleep=5000",
=== modified file 'data/tribes/buildings/productionsites/empire/winery/init.lua'
--- data/tribes/buildings/productionsites/empire/winery/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/winery/init.lua 2019-05-29 18:35:25 +0000
@@ -56,8 +56,8 @@
descname = _"making wine",
actions = {
-- Grapes are only needed for wine, so no need to check if wine is needed
+ "consume=grape:2",
"sleep=30000",
- "consume=grape:2",
"playsound=sound/empire/winebubble 180",
"animate=working 30000",
"produce=wine"
=== modified file 'data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua 2019-05-29 18:35:25 +0000
@@ -64,11 +64,9 @@
descname = _"breeding fish",
actions = {
"return=skipped unless economy needs fish",
+ "consume=fruit water:2",
"sleep=23000",
- "return=failed unless site has water:2",
- "return=failed unless site has fruit",
"callworker=breed_in_pond",
- "consume=fruit water:2",
},
},
fish_pond = {
=== modified file 'data/tribes/buildings/productionsites/frisians/bakery/init.lua'
--- data/tribes/buildings/productionsites/frisians/bakery/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/bakery/init.lua 2019-05-29 18:35:25 +0000
@@ -61,9 +61,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start baking bread because ...
descname = _"baking bread",
actions = {
- "sleep=20000",
"return=skipped unless economy needs bread_frisians or workers need experience",
"consume=water barley",
+ "sleep=20000",
"animate=working 20000",
"produce=bread_frisians"
},
=== modified file 'data/tribes/buildings/productionsites/frisians/barracks/init.lua'
--- data/tribes/buildings/productionsites/frisians/barracks/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/barracks/init.lua 2019-05-29 18:35:25 +0000
@@ -63,9 +63,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start recruiting soldier because ...
descname = pgettext("frisians_building", "recruiting soldier"),
actions = {
- "sleep=15000",
"return=skipped unless economy needs frisians_soldier",
"consume=sword_short fur_garment frisians_carrier",
+ "sleep=15000",
"animate=working 15000",
"recruit=frisians_soldier"
}
=== modified file 'data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua 2019-05-29 18:35:25 +0000
@@ -50,8 +50,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start working because ...
descname = _"working",
actions = {
- "sleep=45000",
- "callworker=bees"
+ "callworker=bees",
+ "sleep=45000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/frisians/berry_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/berry_farm/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/berry_farm/init.lua 2019-05-29 18:35:25 +0000
@@ -46,8 +46,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting bushes because ...
descname = _"planting bushes",
actions = {
- "sleep=21000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=21000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/frisians/brewery/init.lua'
--- data/tribes/buildings/productionsites/frisians/brewery/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/brewery/init.lua 2019-05-29 18:35:25 +0000
@@ -60,9 +60,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start brewing beer because ...
descname = _"brewing beer",
actions = {
- "sleep=30000",
"return=skipped unless economy needs beer or workers need experience",
"consume=water barley",
+ "sleep=30000",
"animate=working 30000",
"produce=beer"
},
=== modified file 'data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua'
--- data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua 2019-05-29 18:35:25 +0000
@@ -62,9 +62,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start burning bricks because ...
descname = _"burning bricks",
actions = {
- "sleep=30000",
"return=skipped unless economy needs brick",
"consume=granite clay:3 coal",
+ "sleep=30000",
"animate=working 50000",
"produce=brick:3"
},
=== modified file 'data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua'
--- data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua 2019-05-29 18:35:25 +0000
@@ -59,9 +59,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start producing coal because ...
descname = _"producing coal",
actions = {
- "sleep=30000",
"return=skipped unless economy needs coal",
"consume=log:3 clay",
+ "sleep=30000",
"animate=working 30000",
"produce=coal"
},
=== modified file 'data/tribes/buildings/productionsites/frisians/clay_pit/init.lua'
--- data/tribes/buildings/productionsites/frisians/clay_pit/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/clay_pit/init.lua 2019-05-29 18:35:25 +0000
@@ -58,11 +58,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start making clay because ...
descname = _"making clay",
actions = {
+
+ "return=skipped unless economy needs clay or economy needs fish", -- Fish-producing aqua farms can stop working if the clay pits do so
+ "consume=water",
"sleep=20000",
- "return=skipped unless economy needs clay or economy needs fish", -- Fish-producing aqua farms can stop working if the clay pits do so
- "return=failed unless site has water",
"callworker=dig",
- "consume=water",
"sleep=2000",
"animate=working 17000",
"sleep=1000",
=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/coalmine/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine/init.lua 2019-05-29 18:35:25 +0000
@@ -64,10 +64,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
- "sleep=5000",
"return=skipped unless economy needs coal",
"consume=ration",
- "sleep=40000",
+ "sleep=45000",
"call=mine_produce",
"call=mine_produce",
"return=no_stats"
=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua 2019-05-29 18:35:25 +0000
@@ -63,10 +63,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
- "sleep=5000",
"return=skipped unless economy needs coal",
"consume=meal",
- "sleep=34900",
+ "sleep=39900",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua'
--- data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua 2019-05-29 18:35:25 +0000
@@ -74,8 +74,8 @@
actions = {
-- time total: 33
"return=skipped unless economy needs ration",
+ "consume=fruit,smoked_fish,smoked_meat",
"sleep=5000",
- "consume=fruit,smoked_fish,smoked_meat",
"animate=working 18000",
"sleep=10000",
"produce=ration"
=== modified file 'data/tribes/buildings/productionsites/frisians/farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/farm/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/farm/init.lua 2019-05-29 18:35:25 +0000
@@ -71,17 +71,17 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting barley because ...
descname = _"planting barley",
actions = {
- "sleep=18000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=18000"
}
},
harvest_barley = {
-- TRANSLATORS: Completed/Skipped/Did not start harvesting barley because ...
descname = _"harvesting barley",
actions = {
- "sleep=8000",
"callworker=harvest",
"animate=working 40000",
+ "sleep=8000",
"produce=barley" --produces 2 barley per field
}
},
=== modified file 'data/tribes/buildings/productionsites/frisians/fishers_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/fishers_house/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/fishers_house/init.lua 2019-05-29 18:35:25 +0000
@@ -50,8 +50,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start fishing because ...
descname = _"fishing",
actions = {
- "sleep=16000",
- "callworker=fish"
+ "callworker=fish",
+ "sleep=16000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/frisians/foresters_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/foresters_house/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/foresters_house/init.lua 2019-05-29 18:35:25 +0000
@@ -45,8 +45,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting trees because ...
descname = _"planting trees",
actions = {
- "sleep=12000",
- "callworker=plant"
+ "callworker=plant",
+ "sleep=12000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/goldmine/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine/init.lua 2019-05-29 18:35:25 +0000
@@ -65,10 +65,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
descname = _"mining gold",
actions = {
- "sleep=5000",
"return=skipped unless economy needs gold_ore",
"consume=ration",
- "sleep=40000",
+ "sleep=45000",
"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 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua 2019-05-29 18:35:25 +0000
@@ -63,10 +63,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
descname = _"mining gold",
actions = {
- "sleep=5000",
"return=skipped unless economy needs gold_ore",
"consume=meal",
- "sleep=34800",
+ "sleep=39800",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/frisians/hunters_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/hunters_house/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/hunters_house/init.lua 2019-05-29 18:35:25 +0000
@@ -50,16 +50,16 @@
-- TRANSLATORS: Completed/Skipped/Did not start hunting because ...
descname = _"hunting",
actions = {
- "sleep=35000",
- "callworker=hunt",
- "sleep=35000",
- "callworker=hunt",
- "sleep=35000",
- "callworker=hunt",
- "sleep=35000",
- "callworker=hunt",
- "sleep=35000",
- "callworker=hunt",
+ "callworker=hunt",
+ "sleep=35000",
+ "callworker=hunt",
+ "sleep=35000",
+ "callworker=hunt",
+ "sleep=35000",
+ "callworker=hunt",
+ "sleep=35000",
+ "callworker=hunt",
+ "sleep=35000",
"produce=fur"
}
},
=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/ironmine/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/ironmine/init.lua 2019-05-29 18:35:25 +0000
@@ -65,10 +65,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
descname = _"mining iron",
actions = {
- "sleep=5000",
"return=skipped unless economy needs iron_ore",
"consume=ration",
- "sleep=40000",
+ "sleep=45000",
"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 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua 2019-05-29 18:35:25 +0000
@@ -63,10 +63,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
descname = _"mining iron",
actions = {
- "sleep=5000",
"return=skipped unless economy needs iron_ore",
"consume=meal",
- "sleep=57100",
+ "sleep=62100",
"call=mine_produce",
"call=mine_produce",
"call=mine_produce",
=== modified file 'data/tribes/buildings/productionsites/frisians/recycling_center/init.lua'
--- data/tribes/buildings/productionsites/frisians/recycling_center/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/recycling_center/init.lua 2019-05-29 18:35:25 +0000
@@ -85,8 +85,8 @@
descname = pgettext("frisians_building", "recycling fur"),
actions = {
"return=skipped unless site has fur_garment_old",
- "sleep=40000",
"consume=fur_garment_old",
+ "sleep=40000",
"animate=working_fur 15000",
"produce=fur"
}
@@ -96,8 +96,8 @@
descname = pgettext("frisians_building", "recycling iron"),
actions = {
"return=skipped unless economy needs iron or not economy needs coal", -- if the economy doesn't need coal the situation gets even improved because recycling saves coal
- "sleep=40000",
"consume=scrap_iron:2 coal",
+ "sleep=40000",
"animate=working_metal 40000",
"produce=iron:2"
}
@@ -107,8 +107,8 @@
descname = pgettext("frisians_building", "recycling iron and gold"),
actions = {
"return=skipped unless economy needs iron or economy needs gold or not economy needs coal", -- if the economy doesn't need coal the situation gets even improved because recycling saves coal
- "sleep=40000",
"consume=scrap_metal_mixed:2 coal",
+ "sleep=40000",
"animate=working_metal 40000",
"produce=iron gold"
}
=== modified file 'data/tribes/buildings/productionsites/frisians/reed_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/reed_farm/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/reed_farm/init.lua 2019-05-29 18:35:25 +0000
@@ -61,16 +61,16 @@
-- TRANSLATORS: Completed/Skipped/Did not start planting reed because ...
descname = _"planting reed",
actions = {
- "sleep=18000",
- "callworker=plantreed"
+ "callworker=plantreed",
+ "sleep=18000"
}
},
harvest_reed = {
-- TRANSLATORS: Completed/Skipped/Did not start harvesting reed because ...
descname = _"harvesting reed",
actions = {
- "sleep=5000",
- "callworker=harvestreed"
+ "callworker=harvestreed",
+ "sleep=5000"
}
},
},
=== modified file 'data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua 2019-05-29 18:35:25 +0000
@@ -76,8 +76,8 @@
descname = pgettext("frisians_building", "rearing reindeer"),
actions = {
"return=skipped unless economy needs frisians_reindeer",
+ "consume=barley water",
"sleep=15000",
- "consume=barley water",
"animate=working 15000",
"recruit=frisians_reindeer"
}
@@ -87,8 +87,8 @@
descname = pgettext("frisians_building", "producing fur"),
actions = {
"return=skipped unless economy needs fur",
+ "consume=barley water",
"sleep=15000",
- "consume=barley water",
"animate=working 20000",
"produce=fur"
}
@@ -98,8 +98,8 @@
descname = pgettext("frisians_building", "producing fur"),
actions = {
"return=skipped unless economy needs fur",
+ "consume=barley water",
"sleep=15000",
- "consume=barley water",
"animate=working 20000",
"produce=fur meat"
}
=== modified file 'data/tribes/buildings/productionsites/frisians/scouts_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/scouts_house/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/scouts_house/init.lua 2019-05-29 18:35:25 +0000
@@ -46,8 +46,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start scouting because ...
descname = _"scouting",
actions = {
+ "consume=ration",
"sleep=30000",
- "consume=ration",
"callworker=scout"
}
},
=== modified file 'data/tribes/buildings/productionsites/frisians/sewing_room/init.lua'
--- data/tribes/buildings/productionsites/frisians/sewing_room/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/sewing_room/init.lua 2019-05-29 18:35:25 +0000
@@ -59,9 +59,9 @@
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",
+ "sleep=20000",
"animate=working 20000",
"produce=fur_garment"
},
=== modified file 'data/tribes/buildings/productionsites/frisians/shipyard/init.lua'
--- data/tribes/buildings/productionsites/frisians/shipyard/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/shipyard/init.lua 2019-05-29 18:35:25 +0000
@@ -66,9 +66,8 @@
descname = _"constructing a ship",
actions = {
"checkmap=seafaring",
- "sleep=10000",
"construct=frisians_shipconstruction buildship 6",
- "sleep=10000",
+ "sleep=20000",
}
},
ship_preparation = {
=== modified file 'data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua'
--- data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua 2019-05-29 18:35:25 +0000
@@ -72,8 +72,8 @@
actions = {
-- time total: 50 + 3.6
"return=skipped unless economy needs fur_garment_studded",
- "sleep=25000",
"consume=fur_garment iron",
+ "sleep=25000",
"animate=working 25000",
"produce=fur_garment_studded"
},
@@ -84,8 +84,8 @@
actions = {
-- time total: 50 + 3.6
"return=skipped unless economy needs fur_garment_golden",
- "sleep=25000",
"consume=fur_garment iron gold",
+ "sleep=25000",
"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 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/tavern/init.lua 2019-05-29 18:35:25 +0000
@@ -76,8 +76,8 @@
-- 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=5000",
"consume=fruit,bread_frisians,smoked_fish,smoked_meat",
+ "sleep=5000",
"animate=working 34500",
"sleep=10000",
"produce=ration"
=== modified file 'data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua 2019-05-29 18:35:25 +0000
@@ -61,9 +61,9 @@
-- TRANSLATORS: Completed/Skipped/Did not start weaving cloth because ...
descname = _"weaving cloth",
actions = {
- "sleep=25000",
"return=skipped unless economy needs cloth",
"consume=fur reed",
+ "sleep=25000",
"animate=working 20000",
"produce=cloth"
},
=== modified file 'data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua 2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua 2019-05-29 18:35:25 +0000
@@ -48,8 +48,8 @@
-- TRANSLATORS: Completed/Skipped/Did not start felling trees because ...
descname = _"felling trees",
actions = {
- "sleep=30000",
- "callworker=harvest"
+ "callworker=harvest",
+ "sleep=30000"
}
},
},
Follow ups
-
[Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: noreply, 2019-06-04
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: GunChleoc, 2019-06-04
-
[Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: bunnybot, 2019-06-03
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: hessenfarmer, 2019-06-03
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: Toni Förster, 2019-06-03
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: hessenfarmer, 2019-06-03
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: Toni Förster, 2019-06-02
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: hessenfarmer, 2019-06-01
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: hessenfarmer, 2019-05-31
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: Toni Förster, 2019-05-31
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: Toni Förster, 2019-05-31
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: Toni Förster, 2019-05-31
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: hessenfarmer, 2019-05-31
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: Toni Förster, 2019-05-30
-
[Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: bunnybot, 2019-05-30
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: Toni Förster, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: hessenfarmer, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: Toni Förster, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: hessenfarmer, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: Toni Förster, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: hessenfarmer, 2019-05-29
-
[Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
From: Toni Förster, 2019-05-29
