← Back to team overview

widelands-dev team mailing list archive

Re: [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior

 

things look pretty good now for the food production. However the beginning (penalty) sleep time needs to be still harmonized regarding their position to be a (small) penalty this line needs to be in front of the consume command. This is due to the fact that the whole program is terminated if one step doesn't work. So if consume is not possible you have waited 5 secs for penalty.

I have marked the points in the code below

Diff comments:

> 
> === modified file 'data/tribes/buildings/productionsites/barbarians/tavern/init.lua'
> --- data/tribes/buildings/productionsites/barbarians/tavern/init.lua	2017-11-18 17:57:00 +0000
> +++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua	2018-08-11 00:25:20 +0000
> @@ -60,11 +60,13 @@
>           -- TRANSLATORS: Completed/Skipped/Did not start preparing a ration because ...
>           descname = _"preparing a ration",
>           actions = {
> -            "sleep=14000",
> +             -- time total: 33
> +            "sleep=5000",

this line (sleep=5000) should be between the return=skipped line and the consume line in all buildings

>              "return=skipped unless economy needs ration",
>              "consume=barbarians_bread,fish,meat",
>              "playsound=sound/barbarians/taverns tavern 100",
> -            "animate=working 19000",
> +            "animate=working 18000",
> +            "sleep=10000",
>              "produce=ration"
>           },
>        },
> 
> === modified file 'data/tribes/buildings/productionsites/empire/tavern/init.lua'
> --- data/tribes/buildings/productionsites/empire/tavern/init.lua	2017-11-18 17:57:00 +0000
> +++ data/tribes/buildings/productionsites/empire/tavern/init.lua	2018-08-11 00:25:20 +0000
> @@ -56,11 +56,12 @@
>           descname = _"preparing a ration",
>           actions = {
>              -- time total: 33
> -            "sleep=14000",
> +            "sleep=5000",

also here move this line behind the return=skipped

>              "return=skipped unless economy needs ration",
>              "consume=empire_bread,fish,meat",
>              "playsound=sound/empire/taverns ration 100",
> -            "animate=working 19000",
> +            "animate=working 18000",
> +            "sleep=10000",
>              "produce=ration"
>           }
>        },
> 
> === modified file 'data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua'
> --- data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua	2018-07-24 19:53:30 +0000
> +++ data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua	2018-08-11 00:25:20 +0000
> @@ -72,10 +72,12 @@
>           -- TRANSLATORS: Completed/Skipped/Did not start preparing a ration because ...
>           descname = _"preparing a ration",
>           actions = {
> +            -- time total: 33
>              "return=skipped unless economy needs ration",
>              "consume=fruit,smoked_fish,smoked_meat",
> -            "sleep=14000",
> -            "animate=working 19000",
> +            "sleep=5000",

here it needs to move up one line

> +            "animate=working 18000",
> +            "sleep=10000",
>              "produce=ration"
>           }
>        },
> 
> === modified file 'data/tribes/buildings/productionsites/frisians/tavern/init.lua'
> --- data/tribes/buildings/productionsites/frisians/tavern/init.lua	2018-06-04 06:19:58 +0000
> +++ data/tribes/buildings/productionsites/frisians/tavern/init.lua	2018-08-11 00:25:20 +0000
> @@ -85,10 +87,12 @@
>           -- TRANSLATORS: Completed/Skipped/Did not start preparing rations because ...
>           descname = _"preparing rations",
>           actions = {
> +            -- time total: 66
>              "return=skipped unless economy needs ration",
>              "consume=fruit,bread_frisians smoked_fish,smoked_meat",
> -            "sleep=28000",
> -            "animate=working 38000",
> +            "sleep=5000",

the same here it should move up one line

> +            "animate=working 51000",
> +            "sleep=10000",
>              "produce=ration:2"
>           },
>        },


-- 
https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior.


References