widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #17474
Re: [Merge] lp:~widelands-dev/widelands/unify_sleep_time into lp:widelands
some small comments see inline
Diff comments:
>
> === 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"
comma missing
> "sleep=30000", -- Barbarian lumberjack sleeps 25000
> - "callworker=harvest"
> }
> },
> },
>
> === 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"
comm missing
> "sleep=25000", -- Sleeps shorter than any other tribes.
> - "callworker=harvest"
> }
> },
> },
>
> === 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",
this is a corner case and should have stayed with the return=failed lines. Reason if no pond available the site will waste ressources.
> "sleep=23000",
> - "return=failed unless site has water:2",
> - "return=failed unless site has fruit",
> "callworker=breed_in_pond",
move the sleep after this line
> - "consume=fruit water:2",
> },
> },
> fish_pond = {
>
> === 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",
same reason as for aqua farm we should prevent wasting water in case no digging site can be found
> "callworker=dig",
> - "consume=water",
> "sleep=2000",
> "animate=working 17000",
> "sleep=1000",
--
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.
References