widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #13982
Re: [Merge] lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands
Review: Needs Fixing review
Reviewed the code, added a lot of small comments for code style. Feel free to ignore.
Also found a typo in the frisian deep gold mine and a possible bug in the design of all mines, please fix.
Is it really intended that the frisian deep gold and iron mines produce gold and iron directly now, rather than ores???
Diff comments:
> === modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2017-09-03 07:59:51 +0000
> +++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2018-07-24 09:41:57 +0000
> @@ -151,11 +151,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a steel shield because ...
> descname = _"forging a steel shield",
> actions = {
> - -- time total: 90
> + -- time total: 67+3,6
Please consistently use decimal points here (3.6).
> "return=skipped unless economy needs shield_steel",
> - "sleep=45000", -- +13 enlarge
> + "sleep=32000",
> "consume=iron:2 coal:2",
> - "animate=working 45000", -- +10 enlarge
> + "animate=working 35000",
> "produce=shield_steel"
> }
> },
> @@ -163,11 +163,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging an advanced shield because ...
> descname = _"forging an advanced shield",
> actions = {
> - -- time total: 110
> + -- time total: 77+3,6
decimal points
> "return=skipped unless economy needs shield_advanced",
> "consume=iron:2 coal:2 gold",
> - "sleep=50000", -- +18 enlarge
> - "animate=working 60000", -- +15 enlarge
> + "sleep=32000",
> + "animate=working 45000",
> "produce=shield_advanced"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2017-09-03 07:59:51 +0000
> +++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2018-07-24 09:41:57 +0000
> @@ -57,17 +57,23 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
> descname = _"mining coal",
> actions = {
> - "sleep=45000",
> + "sleep=40000",
> "return=skipped unless economy needs coal",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 20000",
> - "mine=coal 4 100 5 2",
> - "produce=coal:2",
> - "animate=working 20000",
> - "mine=coal 4 100 5 2",
> - "produce=coal:2",
> - "animate=working 20000",
> - "mine=coal 4 100 5 2",
> + "animate=working 20000",
> + "animate=working 20000",
Please summarize those working commands to "animate=working 60000". This is more logical and makes the code much easier to read.
> + "mine=coal 4 100 35 2",
> + "produce=coal",
> + "sleep=2500",
> + "mine=coal 4 100 1 2",
> + "mine=coal 4 100 1 2",
> + "mine=coal 4 100 1 2",
> + "produce=coal:3",
Bug alert: If the first two "mine" commands succeed but the third one fails because the mine is empty now, two units have been mined but are not produced. For _all_ mines, better change this to something like:
"mine=coal 4 100 1 2",
"produce=coal",
"mine=coal 4 100 1 2",
"produce=coal",
"mine=coal 4 100 1 2",
"produce=coal",
> + "sleep=2500",
> + "mine=coal 4 100 1 2",
> + "mine=coal 4 100 1 2",
> + "mine=coal 4 100 1 2",
We should consider adding a parameter <amount> to the "mine" program to make programs like this cleaner
> "produce=coal:3"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2018-03-04 14:11:19 +0000
> +++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2018-07-24 09:41:57 +0000
> @@ -71,20 +71,23 @@
> descname = _"mining granite",
> actions = {
> "return=skipped unless economy needs granite",
> - "sleep=45000",
> + "sleep=40000",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 20000",
> - "mine=stones 4 100 5 2",
> - "produce=granite:2",
> - "animate=working 20000",
> - "mine=stones 4 100 5 2",
> - "produce=granite:2",
> - "animate=working 20000",
> - "mine=stones 4 100 5 2",
> + "animate=working 20000",
> + "animate=working 20000",
> + "animate=working 20000",
summarize
> + "mine=stones 4 100 25 2",
> "produce=granite",
> - "animate=working 20000",
> - "mine=stones 4 100 5 2",
> - "produce=quartz"
> + "sleep=2500",
> + "mine=stones 4 100 1 2",
> + "mine=stones 4 100 1 2",
> + "mine=stones 4 100 1 2",
> + "produce=granite:2 quartz",
> + "sleep=2500",
> + "mine=stones 4 100 1 2",
> + "mine=stones 4 100 1 2",
> + "produce=granite:2"
> }
> },
> mine_quartz = {
> @@ -92,16 +95,22 @@
> descname = _"mining quartz",
> actions = {
> "return=skipped unless economy needs quartz",
> - "sleep=45000",
> + "sleep=40000",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 20000",
> - "mine=stones 4 100 5 2",
> - "produce=granite quartz",
> - "animate=working 20000",
> - "mine=stones 4 100 5 2",
> - "produce=granite:2",
> - "animate=working 20000",
> - "mine=stones 4 100 5 2",
> + "animate=working 20000",
> + "animate=working 20000",
summarize
> + "mine=stones 4 100 15 2",
> + "produce=quartz",
> +
> + "sleep=2500",
> + "mine=stones 4 100 1 2",
> + "mine=stones 4 100 1 2",
> + "mine=stones 4 100 1 2",
> + "produce=granite:3",
> + "sleep=2500",
> + "mine=stones 4 100 1 2",
> + "mine=stones 4 100 1 2",
> "produce=quartz:2"
> }
> },
> @@ -110,17 +119,17 @@
> descname = _"mining diamonds",
> actions = {
> "return=skipped unless economy needs diamond",
> - "sleep=45000",
> + "sleep=43000",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 20000",
> - "mine=stones 4 100 5 2",
> - "produce=diamond",
> - "animate=working 20000",
> - "mine=stones 4 100 5 2",
> - "produce=diamond",
> - "animate=working 20000",
> - "mine=stones 4 100 5 2",
> - "produce=granite"
> + "animate=working 20000",
> + "animate=working 20000",
summarize
> + "mine=stones 4 100 10 2",
> + "produce=diamond",
> + "sleep=2000",
> + "mine=stones 4 100 1 2",
> + "mine=stones 4 100 1 2",
> + "produce=diamond granite"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua 2018-07-24 09:41:57 +0000
> @@ -57,18 +57,18 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
> descname = _"mining gold",
> actions = {
> - "sleep=45000",
> + "sleep=43000",
> "return=skipped unless economy needs gold_ore",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 20000",
> - "mine=gold 4 100 5 2",
> - "produce=gold_ore",
> - "animate=working 20000",
> - "mine=gold 4 100 5 2",
> - "produce=gold_ore",
> - "animate=working 20000",
> - "mine=gold 4 100 5 2",
> - "produce=gold_ore"
> + "animate=working 20000",
> + "animate=working 20000",
summarize
> + "mine=gold 4 100 15 2",
> + "produce=gold_ore",
> + "sleep=2000",
> + "mine=gold 4 100 1 2",
> + "mine=gold 4 100 1 2",
> + "produce=gold_ore:2"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua 2018-03-04 14:11:19 +0000
> +++ data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua 2018-07-24 09:41:57 +0000
> @@ -57,18 +57,22 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
> descname = _"mining iron",
> actions = {
> - "sleep=45000",
> + "sleep=40000",
> "return=skipped unless economy needs iron_ore",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 20000",
> - "mine=iron 4 100 5 2",
> - "produce=iron_ore:2",
> - "animate=working 20000",
> - "mine=iron 4 100 5 2",
> + "animate=working 20000",
> + "animate=working 20000",
> + "mine=iron 4 100 25 2",
summarize
> "produce=iron_ore",
> - "animate=working 20000",
> - "mine=iron 4 100 5 2",
> - "produce=iron_ore:2"
> + "sleep=2500",
> + "mine=iron 4 100 1 2",
> + "mine=iron 4 100 1 2",
> + "mine=iron 4 100 1 2",
> + "produce=iron_ore:3",
> + "sleep=2500",
> + "mine=iron 4 100 1 2",
> + "produce=iron_ore"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2017-11-18 17:57:00 +0000
> +++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2018-07-24 09:41:57 +0000
> @@ -72,12 +72,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a light trident because ...
> descname = _"forging a light trident",
> actions = {
> - -- time total: 64
> + -- time total: 50+3,6
decimal points
> "return=skipped unless economy needs trident_light",
> - "sleep=27000", -- +7 enlarge
> + "sleep=20000",
> "consume=iron planks",
> "playsound=sound/smiths smith 192",
> - "animate=working 28000", -- +7 enlarge
> + "animate=working 21000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=trident_light"
> @@ -87,12 +87,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a long trident because ...
> descname = _"forging a long trident",
> actions = {
> - -- time total: 102
> + -- time total: 77+3,6
decimal points
> "return=skipped unless economy needs trident_long",
> "consume=iron coal planks",
> - "sleep=47000", -- +15 enlarge
> + "sleep=32000",
> "playsound=sound/smiths smith 192",
> - "animate=working 46000", -- +10 enlarge
> + "animate=working 36000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=trident_long"
> @@ -117,12 +117,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a double trident because ...
> descname = _"forging a double trident",
> actions = {
> - -- time total: 115
> + -- time total: 77+3,6
decimal points
> "return=skipped unless economy needs trident_double",
> "consume=iron coal:2 planks gold",
> - "sleep=55000", -- +23 enlarge
> + "sleep=32000",
> "playsound=sound/smiths smith 192",
> - "animate=working 51000", -- +15 enlarge
> + "animate=working 36000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=trident_double"
> @@ -132,12 +132,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a heavy double trident because ...
> descname = _"forging a heavy double trident",
> actions = {
> - -- time total: 120
> + -- time total: 77+3,6
decimal points
> "return=skipped unless economy needs trident_heavy_double",
> "consume=iron:2 coal:2 planks gold",
> - "sleep=55000", -- +23 enlarge
> + "sleep=32000",
> "playsound=sound/smiths smith 192",
> - "animate=working 56000", -- +20 enlarge
> + "animate=working 36000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=trident_heavy_double"
>
> === modified file 'data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua 2017-11-18 17:57:00 +0000
> +++ data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua 2018-07-24 09:41:57 +0000
> @@ -67,13 +67,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start weaving spidercloth because ...
> descname = _"weaving spidercloth",
> actions = {
> - -- total time 47 sec
> + -- total time 40 + 3,6 sec
Decimal points. And if it´s not too much trouble, it would be nice if you could change the format for these comments to either "time total: 77+3.6" or "total time 40 + 3.6 sec" everywhere (word order, whitespaces, colons, "sec").
> "return=skipped unless economy needs spidercloth",
> - "sleep=10000",
> "consume=spider_silk",
> "playsound=sound/mill weaving 120",
> "animate=working 20000",
> - "sleep=17000",
> + "sleep=20000",
> "produce=spidercloth"
> }
> },
> @@ -81,13 +80,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start tailoring a tabard because ...
> descname = _"tailoring a tabard",
> actions = {
> - -- total time 55 sec
> + -- total time 40 + 3,6 sec
same here
> "return=skipped unless economy needs tabard",
> - "sleep=10000",
> "consume=spider_silk",
> "playsound=sound/mill weaving 120",
> - "animate=working 26000",
> - "sleep=19000",
> + "animate=working 20000",
> + "sleep=20000",
> "produce=tabard"
> }
> },
> @@ -95,13 +93,13 @@
> -- TRANSLATORS: Completed/Skipped/Did not start tailoring a golden tabard because ...
> descname = _"tailoring a golden tabard",
> actions = {
> - -- total time 60 sec
> + -- total time 40 + 3,6 sec
same here
> "return=skipped unless economy needs tabard_golden",
> "consume=spider_silk gold_thread",
> - "sleep=15000",
> + "sleep=10000",
> "playsound=sound/mill weaving 120",
> - "animate=working 30000",
> - "sleep=15000",
> + "animate=working 20000",
> + "sleep=10000",
> "produce=tabard_golden"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua'
> --- data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2017-11-18 17:57:00 +0000
> +++ data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2018-07-24 09:41:57 +0000
> @@ -76,12 +76,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging an ax because ...
> descname = _"forging an ax",
> actions = {
> - -- time total: 73
> + -- time total: 57+3,6
same here
> "return=skipped unless economy needs ax",
> - "sleep=36000", -- +10 enlarge
> + "sleep=26000",
> "consume=coal iron",
> "playsound=sound/smiths smith 192",
> - "animate=working 28000", -- +6 enlarge
> + "animate=working 22000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=ax"
> @@ -91,12 +91,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a sharp ax because ...
> descname = _"forging a sharp ax",
> actions = {
> - -- time total: 76
> + -- time total: 57+3,6
same here
> "return=skipped unless economy needs ax_sharp",
> "consume=coal iron:2",
> - "sleep=37000", -- +11 enlarge
> + "sleep=26000",
> "playsound=sound/smiths smith 192",
> - "animate=working 30000", -- +8 enlarge
> + "animate=working 22000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=ax_sharp"
> @@ -106,12 +106,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a broad ax because ...
> descname = _"forging a broad ax",
> actions = {
> - -- time total: 79
> + -- time total: 57+3,6
same here
> "return=skipped unless economy needs ax_broad",
> "consume=coal:2 iron:2",
> - "sleep=38000", -- +12 enlarge
> + "sleep=26000",
> "playsound=sound/smiths smith 192",
> - "animate=working 32000", -- +10 enlarge
> + "animate=working 22000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=ax_broad"
>
> === modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -60,15 +60,18 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
> descname = _"mining coal",
> actions = {
> - "sleep=42000",
> + "sleep=40000",
> "return=skipped unless economy needs coal",
> "consume=snack",
> "animate=working 18000",
> - "mine=coal 2 66 5 17",
> - "produce=coal:2",
> "animate=working 18000",
summarize
> - "mine=coal 2 66 5 17",
> - "produce=coal:2"
> + "mine=coal 2 66 20 17",
> + "produce=coal",
> + "sleep=2000",
> + "mine=coal 2 66 1 17",
> + "mine=coal 2 66 1 17",
> + "mine=coal 2 66 1 17",
> + "produce=coal:3"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua'
> --- data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua 2018-07-24 09:41:57 +0000
> @@ -59,14 +59,18 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
> descname = _"mining coal",
> actions = {
> - "sleep=40000",
> + "sleep=38000",
> "return=skipped unless economy needs coal",
> "consume=meal",
> "animate=working 16000",
> - "mine=coal 2 100 10 2",
> + "animate=working 16000",
summarize
> + "mine=coal 2 100 25 2",
> + "mine=coal 2 100 100 2",
> "produce=coal:2",
> - "animate=working 16000",
> - "mine=coal 2 100 10 2",
> + "sleep=2000",
> + "mine=coal 2 100 1 2",
> + "mine=coal 2 100 1 2",
> + "mine=coal 2 100 1 2",
> "produce=coal:3"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -60,15 +60,18 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
> descname = _"mining gold",
> actions = {
> - "sleep=42000",
> + "sleep=40000",
> "return=skipped unless economy needs gold_ore",
> "consume=snack",
> "animate=working 18000",
> - "mine=gold 2 66 5 17",
> - "produce=gold_ore:2",
> "animate=working 18000",
summarize
> - "mine=gold 2 66 5 17",
> - "produce=gold_ore:2"
> + "mine=gold 2 66 20 17",
> + "produce=gold_ore",
> + "sleep=2000",
> + "mine=gold 2 66 1 17",
> + "mine=gold 2 66 1 17",
> + "mine=gold 2 66 1 17",
> + "produce=gold_ore:3"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua'
> --- data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua 2018-07-24 09:41:57 +0000
> @@ -59,15 +59,18 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
> descname = _"mining gold",
> actions = {
> - "sleep=40000",
> + "sleep=38000",
> "return=skipped unless economy needs gold_ore",
> "consume=meal",
> "animate=working 16000",
> - "mine=gold 2 100 10 2",
> - "produce=gold_ore:2",
> "animate=working 18000",
summarize
> - "mine=gold 2 100 10 2",
> - "produce=gold_ore:2"
> + "mine=gold 2 100 40 2",
> + "produce=gold_ore",
> + "sleep=2000",
> + "mine=gold 2 100 1 2",
> + "mine=gold 2 100 1 2",
> + "mine=gold 2 100 1 2",
> + "produce=gold_ore:3"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua'
> --- data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua 2017-09-03 07:59:51 +0000
> +++ data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua 2018-07-24 09:41:57 +0000
> @@ -77,11 +77,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a helmet because ...
> descname = _"forging a helmet",
> actions = {
> - -- time total: 80
> + -- time total: 67+3,6
format
> "return=skipped unless economy needs helmet",
> - "sleep=40000", -- +8 enlarge
> + "sleep=32000",
> "consume=coal iron",
> - "animate=working 40000", -- +5 enlarge
> + "animate=working 35000",
> "produce=helmet"
> }
> },
> @@ -89,11 +89,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a mask because ...
> descname = _"forging a mask",
> actions = {
> - -- time total: 90
> + -- time total: 77+3,6
format
> "return=skipped unless economy needs helmet_mask",
> "consume=coal iron:2",
> - "sleep=40000", -- +8 enlarge
> - "animate=working 50000", -- +5 enlarge
> + "sleep=32000",
> + "animate=working 45000",
> "produce=helmet_mask"
> }
> },
> @@ -101,11 +101,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a warhelm because ...
> descname = _"forging a warhelm",
> actions = {
> - -- time total: 100
> + -- time total: 87+3,6
format
> "return=skipped unless economy needs helmet_warhelm",
> "consume=coal gold iron:2",
> - "sleep=40000", -- +8 enlarge
> - "animate=working 60000", -- +5 enlarge
> + "sleep=32000",
> + "animate=working 55000",
> "produce=helmet_warhelm"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -60,15 +60,18 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
> descname = _"mining iron",
> actions = {
> - "sleep=43000",
> + "sleep=40000",
> "return=skipped unless economy needs iron_ore",
> "consume=snack",
> "animate=working 18000",
> - "mine=iron 2 66 5 17",
> + "animate=working 18000",
summarize
> + "mine=iron 2 66 20 17",
> "produce=iron_ore",
> - "animate=working 18000",
> - "mine=iron 2 66 5 17",
> - "produce=iron_ore:1"
> + "sleep=2000",
> + "mine=iron 2 66 1 17",
> + "mine=iron 2 66 1 17",
> + "mine=iron 2 66 1 17",
> + "produce=iron_ore:3"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua'
> --- data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua 2018-07-24 09:41:57 +0000
> @@ -59,17 +59,21 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
> descname = _"mining iron",
> actions = {
> - "sleep=40000",
> + "sleep=36000",
> "return=skipped unless economy needs iron_ore",
> "consume=meal",
> "animate=working 16000",
> - "mine=iron 2 100 10 2",
> + "animate=working 16000",
> + "animate=working 16000",
summarize
> + "mine=iron 2 100 50 2",
> "produce=iron_ore",
> - "animate=working 16000",
> - "mine=iron 2 100 10 2",
> + "sleep=2000",
> + "mine=iron 2 100 1 2",
> + "mine=iron 2 100 1 2",
> "produce=iron_ore:2",
> - "animate=working 16000",
> - "mine=iron 2 100 10 2",
> + "sleep=2000",
> + "mine=iron 2 100 1 2",
> + "mine=iron 2 100 1 2",
> "produce=iron_ore:2"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/barbarians/warmill/init.lua'
> --- data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2017-11-18 17:57:00 +0000
> +++ data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2018-07-24 09:41:57 +0000
> @@ -83,12 +83,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging an ax because ...
> descname = _"forging an ax",
> actions = {
> - -- time total: 73
> + -- time total: 57+3,6
format
> "return=skipped unless economy needs ax",
> - "sleep=36000", -- +10 enlarge
> + "sleep=26000",
> "consume=coal iron",
> "playsound=sound/smiths smith 192",
> - "animate=working 28000", -- +6 enlarge
> + "animate=working 22000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=ax"
> @@ -98,12 +98,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a sharp ax because ...
> descname = _"forging a sharp ax",
> actions = {
> - -- time total: 76
> + -- time total: 57+3,6
format
> "return=skipped unless economy needs ax_sharp",
> "consume=coal iron:2",
> - "sleep=37000", -- +11 enlarge
> + "sleep=26000",
> "playsound=sound/smiths smith 192",
> - "animate=working 30000", -- +8 enlarge
> + "animate=working 22000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=ax_sharp"
> @@ -113,12 +113,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a broad ax because ...
> descname = _"forging a broad ax",
> actions = {
> - -- time total: 79
> + -- time total: 57+3,6
format
> "return=skipped unless economy needs ax_broad",
> "consume=coal:2 iron:2",
> - "sleep=38000", -- +12 enlarge
> + "sleep=26000",
> "playsound=sound/smiths smith 192",
> - "animate=working 32000", -- +10 enlarge
> + "animate=working 22000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=ax_broad"
> @@ -128,12 +128,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a bronze ax because ...
> descname = _"forging a bronze ax",
> actions = {
> - -- time total: 82
> + -- time total: 57+3,6
format
> "return=skipped unless economy needs ax_bronze",
> "consume=coal:2 iron:2",
> - "sleep=39000", -- +13 enlarge
> + "sleep=26000",
> "playsound=sound/smiths smith 192",
> - "animate=working 34000", -- +12 enlarge
> + "animate=working 22000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=ax_bronze"
> @@ -143,12 +143,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a battle ax because ...
> descname = _"forging a battle ax",
> actions = {
> - -- time total: 87
> + -- time total: 57+3,6
format
> "return=skipped unless economy needs ax_battle",
> "consume=coal gold iron:2",
> - "sleep=41000", -- +15 enlarge
> + "sleep=26000",
> "playsound=sound/smiths smith 192",
> - "animate=working 37000", -- +15 enlarge
> + "animate=working 22000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=ax_battle"
> @@ -158,12 +158,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a warrior’s ax because ...
> descname = _"forging a warrior’s ax",
> actions = {
> - -- time total: 92
> + -- time total: 57+3,6
format
> "return=skipped unless economy needs ax_warriors",
> "consume=coal:2 gold:2 iron:2",
> - "sleep=43000", -- +17 enlarge
> + "sleep=26000",
> "playsound=sound/smiths smith 192",
> - "animate=working 40000", -- +18 enlarge
> + "animate=working 22000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=ax_warriors"
>
> === modified file 'data/tribes/buildings/productionsites/empire/armorsmithy/init.lua'
> --- data/tribes/buildings/productionsites/empire/armorsmithy/init.lua 2017-09-03 07:59:51 +0000
> +++ data/tribes/buildings/productionsites/empire/armorsmithy/init.lua 2018-07-24 09:41:57 +0000
> @@ -78,11 +79,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a helmet because ...
> descname = _"forging a helmet",
> actions = {
> - -- time total: 80
> + -- time total: 67+3,6
format
> "return=skipped unless economy needs armor_helmet",
> - "sleep=40000", -- +8 enlarge
> + "sleep=47000",
> "consume=iron coal",
> - "animate=working 40000", -- +5 enlarge
> + "animate=working 20000",
> "produce=armor_helmet"
> }
> },
> @@ -90,11 +91,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a suit of armor because ...
> descname = _"forging a suit of armor",
> actions = {
> - -- time total: 90
> + -- time total: 77+3,6
format
> "return=skipped unless economy needs armor",
> "consume=iron coal cloth",
> - "sleep=40000", -- +8 enlarge
> - "animate=working 50000", -- +5 enlarge
> + "sleep=32000",
> + "animate=working 45000",
> "produce=armor"
> }
> },
> @@ -102,11 +103,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a suit of chain armor because ...
> descname = _"forging a suit of chain armor",
> actions = {
> - -- time total: 108
> + -- time total: 77+3,6
format
> "return=skipped unless economy needs armor_chain",
> "consume=iron:2 coal cloth",
> - "sleep=47000", -- +15 enlarge
> - "animate=working 61000", -- +16 enlarge
> + "sleep=32000",
> + "animate=working 45000",
> "produce=armor_chain"
> }
> },
> @@ -114,11 +115,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a suit of gilded armor because ...
> descname = _"forging a suit of gilded armor",
> actions = {
> - -- time total: 115
> + -- time total: 77+3,6
format
> "return=skipped unless economy needs armor_gilded",
> "consume=iron:2 coal:2 cloth gold",
> - "sleep=51000", -- +19 enlarge
> - "animate=working 64000", -- +19 enlarge
> + "sleep=32000",
> + "animate=working 45000",
> "produce=armor_gilded"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/empire/coalmine/init.lua'
> --- data/tribes/buildings/productionsites/empire/coalmine/init.lua 2017-09-03 07:59:51 +0000
> +++ data/tribes/buildings/productionsites/empire/coalmine/init.lua 2018-07-24 09:41:57 +0000
> @@ -58,15 +58,18 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
> descname = _"mining coal",
> actions = {
> - "sleep=45000",
> + "sleep=43000",
> "return=skipped unless economy needs coal",
> "consume=beer ration",
> "animate=working 20000",
> - "mine=coal 2 50 5 17",
> - "produce=coal:2",
> +
summarize, and no blank lines please
> "animate=working 20000",
> - "mine=coal 2 50 5 17",
> - "produce=coal"
> + "mine=coal 2 50 15 17",
> + "produce=coal",
> + "sleep=2000",
> + "mine=coal 2 50 1 17",
> + "mine=coal 2 50 1 17",
> + "produce=coal:2"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -56,15 +56,21 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
> descname = _"mining coal",
> actions = {
> - "sleep=42000",
> + "sleep=36000",
> "return=skipped unless economy needs coal",
> "consume=beer meal",
> "animate=working 18000",
> - "mine=coal 2 100 5 2",
> + "animate=working 18000",
summarize
> + "mine=coal 2 100 25 2",
> + "produce=coal",
> + "sleep=3000",
> + "mine=coal 2 100 1 2",
> + "mine=coal 2 100 1 2",
> "produce=coal:2",
> - "animate=working 18000",
> - "mine=coal 2 100 5 2",
> - "produce=coal:3"
> + "sleep=3000",
> + "mine=coal 2 100 1 2",
> + "mine=coal 2 100 1 2",
> + "produce=coal:2"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/empire/goldmine/init.lua'
> --- data/tribes/buildings/productionsites/empire/goldmine/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/empire/goldmine/init.lua 2018-07-24 09:41:57 +0000
> @@ -58,14 +58,16 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
> descname = _"mining gold",
> actions = {
> - "sleep=45000",
> + "sleep=43000",
> "return=skipped unless economy needs gold_ore",
> "consume=ration wine",
> "animate=working 20000",
> - "mine=gold 2 50 5 17",
> +
summarize; no blank line
> + "animate=working 20000",
> + "mine=gold 2 50 10 17",
> "produce=gold_ore",
> - "animate=working 20000",
> - "mine=gold 2 50 5 17",
> + "sleep=2000",
> + "mine=gold 2 50 1 17",
> "produce=gold_ore"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -56,14 +56,16 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
> descname = _"mining gold",
> actions = {
> - "sleep=43000",
> + "sleep=40000",
> "return=skipped unless economy needs gold_ore",
> "consume=meal wine",
> "animate=working 18000",
> - "mine=gold 2 100 5 2",
> + "animate=working 18000",
summarize
> + "mine=gold 2 100 15 2",
> "produce=gold_ore",
> - "animate=working 18000",
> - "mine=gold 2 100 5 2",
> + "sleep=3000",
> + "mine=gold 2 100 1 2",
> + "mine=gold 2 100 1 2",
> "produce=gold_ore:2"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/empire/ironmine/init.lua'
> --- data/tribes/buildings/productionsites/empire/ironmine/init.lua 2017-09-03 07:59:51 +0000
> +++ data/tribes/buildings/productionsites/empire/ironmine/init.lua 2018-07-24 09:41:57 +0000
> @@ -58,14 +58,16 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
> descname = _"mining iron",
> actions = {
> - "sleep=45000",
> + "sleep=43000",
> "return=skipped unless economy needs iron_ore",
> "consume=ration beer",
> "animate=working 20000",
> - "mine=iron 2 50 5 17",
> + "animate=working 20000",
summarize
> + "mine=iron 2 50 15 17",
> "produce=iron_ore",
> - "animate=working 20000",
> - "mine=iron 2 50 5 17",
> + "sleep=2000",
> + "mine=iron 2 50 1 17",
> + "mine=iron 2 50 1 17",
> "produce=iron_ore:2"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua 2017-09-03 07:59:51 +0000
> +++ data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -56,15 +56,18 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
> descname = _"mining iron",
> actions = {
> - "sleep=43000",
> + "sleep=40000",
> "return=skipped unless economy needs iron_ore",
> "consume=meal beer",
> "animate=working 18000",
> - "mine=iron 2 100 5 2",
> - "produce=iron_ore:2",
> "animate=working 18000",
summarize
> - "mine=iron 2 100 5 2",
> - "produce=iron_ore:2"
> + "mine=iron 2 100 20 2",
> + "produce=iron_ore",
> + "sleep=3000",
> + "mine=iron 2 100 1 2",
> + "mine=iron 2 100 1 2",
> + "mine=iron 2 100 1 2",
> + "produce=iron_ore:3"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/empire/marblemine/init.lua'
> --- data/tribes/buildings/productionsites/empire/marblemine/init.lua 2017-09-03 07:59:51 +0000
> +++ data/tribes/buildings/productionsites/empire/marblemine/init.lua 2018-07-24 09:41:57 +0000
> @@ -60,39 +60,47 @@
> -- TRANSLATORS: Completed/Skipped/Did not start working because ...
> descname = _"working",
> actions = {
> + "call=mine_granite",
> "call=mine_marble",
> - "call=mine_granite",
> "return=skipped"
> }
> },
> + mine_granite = {
> + -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
> + descname = _"mining granite",
> + actions = {
> + "sleep=18000",
> + "return=skipped unless economy needs marble or economy needs granite",
> + "consume=ration wine",
> + "animate=working 20000",
> +
summarize, no blank line
> + "animate=working 20000",
> + "mine=stones 2 50 20 17",
> + "produce=granite",
> + "sleep=2000",
> + "mine=stones 2 50 1 17",
> + "mine=stones 2 50 1 17",
> + "mine=stones 2 50 1 17",
> + "produce=granite:2 marble"
> + }
> + },
> mine_marble = {
> -- TRANSLATORS: Completed/Skipped/Did not start mining marble because ...
> descname = _"mining marble",
> actions = {
> - "sleep=20000",
> + "sleep=18000",
> "return=skipped unless economy needs marble or economy needs granite",
> "consume=wine ration",
> "animate=working 20000",
> - "mine=stones 2 50 5 17",
> - "produce=marble:2",
> - "animate=working 20000",
> - "mine=stones 2 50 5 17",
> - "produce=marble granite"
> - }
> - },
> - mine_granite = {
> - -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
> - descname = _"mining granite",
> - actions = {
> - "sleep=20000",
> - "return=skipped unless economy needs marble or economy needs granite",
> - "consume=ration wine",
> - "animate=working 20000",
> - "mine=stones 2 50 5 17",
> - "produce=granite marble",
> - "animate=working 20000",
> - "mine=stones 2 50 5 17",
> - "produce=granite:2"
> + "animate=working 20000",
> +
summarize, no blank line
> + "mine=stones 2 50 20 17",
> + "produce=marble",
> + "sleep=2000",
> + "mine=stones 2 50 1 17",
> + "mine=stones 2 50 1 17",
> + "mine=stones 2 50 1 17",
> + "produce=marble:2 granite"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua'
> --- data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua 2016-09-03 14:59:10 +0000
> +++ data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -57,15 +57,19 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining marble because ...
> descname = _"mining marble",
> actions = {
> - "sleep=43000",
> + "sleep=40000",
> "return=skipped unless economy needs marble or economy needs granite",
> "consume=meal wine",
> "animate=working 18000",
> - "mine=stones 2 100 5 2",
> - "produce=marble:2",
> "animate=working 18000",
summarize
> - "mine=stones 2 100 5 2",
> - "produce=marble granite:2"
> + "mine=stones 2 100 15 2",
> + "mine=stones 2 100 100 2",
> + "produce=marble granite",
> + "sleep=3000",
> + "mine=stones 2 100 1 2",
> + "mine=stones 2 100 1 2",
> + "mine=stones 2 100 1 2",
> + "produce=marble:2 granite"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua'
> --- data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua 2017-11-18 17:57:00 +0000
> +++ data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua 2018-07-24 09:41:57 +0000
> @@ -77,12 +77,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a wooden spear because ...
> descname = _"forging a wooden spear",
> actions = {
> - -- time total: 64
> + -- time total: 50+3,6
format
> "return=skipped unless economy needs spear_wooden",
> - "sleep=27000", -- +7 enlarge
> + "sleep=20000",
> "consume=planks",
> "playsound=sound/smiths smith 192",
> - "animate=working 28000", -- +7 enlarge
> + "animate=working 21000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=spear_wooden"
> @@ -92,12 +92,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a spear because ...
> descname = _"forging a spear",
> actions = {
> - -- time total: 102
> + -- time total: 77+3,6
format
> "return=skipped unless economy needs spear",
> "consume=coal iron planks",
> - "sleep=47000", -- +15 enlarge
> + "sleep=32000",
> "playsound=sound/smiths smith 192",
> - "animate=working 46000", -- +10 enlarge
> + "animate=working 36000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=spear"
> @@ -107,12 +107,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging an advanced spear because ...
> descname = _"forging an advanced spear",
> actions = {
> - -- time total: 110
> + -- time total: 77+3,6
format
> "return=skipped unless economy needs spear_advanced",
> "consume=coal iron:2 planks",
> - "sleep=50000", -- +18 enlarge
> + "sleep=32000",
> "playsound=sound/smiths smith 192",
> - "animate=working 51000", -- +15 enlarge
> + "animate=working 36000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=spear_advanced"
> @@ -122,12 +122,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a heavy spear because ...
> descname = _"forging a heavy spear",
> actions = {
> - -- time total: 115
> + -- time total: 77+3,6
format
> "return=skipped unless economy needs spear_heavy",
> "consume=coal:2 gold iron planks",
> - "sleep=55000", -- +23 enlarge
> + "sleep=32000",
> "playsound=sound/smiths smith 192",
> - "animate=working 51000", -- +15 enlarge
> + "animate=working 36000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=spear_heavy"
> @@ -137,12 +137,12 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a war spear because ...
> descname = _"forging a war spear",
> actions = {
> - -- time total: 120
> + -- time total: 77+3,6
format
> "return=skipped unless economy needs spear_war",
> "consume=coal:2 gold iron:2 planks",
> - "sleep=55000", -- +23 enlarge
> + "sleep=32000",
> "playsound=sound/smiths smith 192",
> - "animate=working 56000", -- +20 enlarge
> + "animate=working 36000",
> "playsound=sound/smiths sharpening 120",
> "sleep=9000",
> "produce=spear_war"
>
> === modified file 'data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua 2018-07-19 09:40:06 +0000
> +++ data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -63,21 +63,24 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
> descname = _"mining coal",
> actions = {
> - "sleep=40000",
> + "sleep=39800",
> "return=skipped unless economy needs coal",
> "consume=meal",
> - "animate=working 9000",
> - "mine=coal 3 100 10 5",
> - "produce=coal",
> - "animate=working 9000",
> - "mine=coal 3 100 10 5",
> - "produce=coal",
> - "animate=working 9000",
> - "mine=coal 3 100 10 5",
> - "produce=coal",
> - "animate=working 9000",
> - "mine=coal 3 100 10 5",
> - "produce=coal"
> + "animate=working 19000",
> + "animate=working 19000",
> + "animate=working 19000",
summarize
> + "mine=coal 3 100 70 5",
> + "produce=coal",
> + "sleep=2000",
> + "mine=coal 3 100 1 5",
> + "mine=coal 3 100 1 5",
> + "mine=coal 3 100 1 5",
> + "produce=coal:3",
> + "sleep=2000",
> + "mine=coal 3 100 1 5",
> + "mine=coal 3 100 1 5",
> + "mine=coal 3 100 1 5",
> + "produce=coal:3"
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua 2018-07-19 09:40:06 +0000
> +++ data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -63,15 +63,22 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
> descname = _"mining gold",
> actions = {
> - "sleep=40000",
> - "return=skipped unless economy needs gold_ore",
> + "sleep=39800",
> + "return=skipped unless economy needs coal",
Error!
> "consume=meal",
> - "animate=working 18000",
> - "mine=gold 3 100 10 5",
> - "produce=gold_ore:2",
> - "animate=working 18000",
> - "mine=gold 3 100 10 5",
> - "produce=gold_ore:2"
> + "animate=working 19000",
> + "animate=working 19000",
> + "animate=working 19000",
summarize
> + "mine=gold 3 100 50 5",
> + "produce=gold",
> + "sleep=2000",
> + "mine=gold 3 100 1 5",
> + "mine=gold 3 100 1 5",
> + "produce=gold:2",
> + "sleep=2000",
> + "mine=gold 3 100 1 5",
> + "mine=gold 3 100 1 5",
> + "produce=gold:2"
Is this intentional?
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua 2018-07-19 09:40:06 +0000
> +++ data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -63,15 +63,24 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
> descname = _"mining iron",
> actions = {
> - "sleep=40000",
> - "return=skipped unless economy needs iron_ore",
> + "sleep=62000",
> + "return=skipped unless economy needs iron",
Fix tabbing. Is this intentional?
> "consume=meal",
> - "animate=working 18000",
> - "mine=iron 3 100 10 5",
> - "produce=iron_ore:2",
> - "animate=working 18000",
> - "mine=iron 3 100 10 5",
> - "produce=iron_ore:2"
> + "animate=working 19000",
> + "animate=working 19000",
> + "animate=working 19000",
summarize
> + "mine=iron 3 100 70 5",
> + "produce=iron",
> + "sleep=2000",
> + "mine=iron 3 100 1 5",
> + "mine=iron 3 100 1 5",
> + "mine=iron 3 100 1 5",
> + "produce=iron:3",
> + "sleep=2000",
> + "mine=iron 3 100 1 5",
> + "mine=iron 3 100 1 5",
> + "mine=iron 3 100 1 5",
> + "produce=iron:3"
Is this intentional?
> }
> },
> },
>
> === modified file 'data/tribes/buildings/productionsites/frisians/rockmine/init.lua'
> --- data/tribes/buildings/productionsites/frisians/rockmine/init.lua 2018-07-19 09:40:06 +0000
> +++ data/tribes/buildings/productionsites/frisians/rockmine/init.lua 2018-07-24 09:41:57 +0000
> @@ -65,14 +65,15 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
> descname = _"mining granite",
> actions = {
> - "sleep=45000",
> + "sleep=43000",
> "return=skipped unless economy needs granite",
> "consume=ration",
> "animate=working 20000",
> - "mine=stones 3 50 5 20",
> + "animate=working 20000",
summarize
> + "mine=stones 3 50 10 20",
> "produce=granite",
> - "animate=working 20000",
> - "mine=stones 3 50 5 20",
> + "sleep=2000",
> + "mine=stones 3 50 1 20",
> "produce=granite"
> }
> },
>
> === modified file 'data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua 2018-07-19 09:40:06 +0000
> +++ data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua 2018-07-24 09:41:57 +0000
> @@ -63,18 +63,24 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
> descname = _"mining granite",
> actions = {
> - "sleep=40000",
> + "sleep=39800",
> "return=skipped unless economy needs granite",
> "consume=meal",
> - "animate=working 12000",
> - "mine=stones 3 100 10 5",
> - "produce=granite",
> - "animate=working 12000",
> - "mine=stones 3 100 10 5",
> - "produce=granite",
> - "animate=working 12000",
> - "mine=stones 3 100 10 5",
> - "produce=granite"
> + "animate=working 19000",
> + "animate=working 19000",
> + "animate=working 19000",
summarize
> + "mine=granite 3 100 70 5",
> + "produce=granite",
> + "sleep=2000",
> + "mine=granite 3 100 1 5",
> + "mine=granite 3 100 1 5",
> + "mine=granite 3 100 1 5",
> + "produce=granite:3",
> + "sleep=2000",
> + "mine=granite 3 100 1 5",
> + "mine=granite 3 100 1 5",
> + "mine=granite 3 100 1 5",
> + "produce=granite:3"
> }
> },
> },
--
https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior.
References
