Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
@bunnybot merge -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
Looks Good now. Thanks a lot. This can be merged. @bunnybot merge -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
Changed it according to your description. -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [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 +
> +++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua
> 2018-08-11 00:25:20 +
> @@ -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=1",
> "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 +
> +++ data/tribes/buildings/productionsites/empire/tavern/init.lua
> 2018-08-11 00:25:20 +
> @@ -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=1",
> "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 +
> +++ data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua
> 2018-08-11 00:25:20 +
> @@ -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=1",
> "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 +
> +++ data/tribes/buildings/productionsites/frisians/tavern/init.lua
> 2018-08-11 00:25:20 +
> @@ -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=1",
> "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.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
> exactly. Thanks a lot. Just a quick question: > > Ican't do any changes until Monday as I am not at home, could you do the same > for empire and frisians buildings as well? > If yes we should wait with the merge. If no this can go in. Done. -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
Yes, no problem. But I found a severe problem regarding production times: https://wl.widelands.org/forum/post/25597/ This also affects the inns. > On 10. Aug 2018, at 22:36, hessenfarmer wrote: > > Review: Approve > > exactly. Thanks a lot. Just a quick question: > > Ican't do any changes until Monday as I am not at home, could you do the same > for empire and frisians buildings as well? > If yes we should wait with the merge. If no this can go in. > > > -- > https://code.launchpad.net/~stonerl/widelands/big_inn_missing_animation_fixed/+merge/352887 > You are the owner of lp:~stonerl/widelands/big_inn_missing_animation_fixed. -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
Review: Approve exactly. Thanks a lot. Just a quick question: Ican't do any changes until Monday as I am not at home, could you do the same for empire and frisians buildings as well? If yes we should wait with the merge. If no this can go in. -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
Hope this is what you imagined. -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~stonerl/widelands/big_inn_missing_animation_fixed into lp:~widelands-dev/widelands/mines-worldsavior
leading sleep times (penalty for not being supplied with all wares) have been reduced intentionally. However they are still different between the food preparing buildings of the tribes ( taverns, inns, big inns, drinking halls, etc.) Therefore I would propose to have an equal leading sleep time for only the first product (ration) of max 5000 (5s) and no leading sleep time for the other products while keeping the total time. The order should be 1. playsound 2. animate=working (this should ensure the sound is played while the animation runs 3. if necessary a short sleep time (around 5 to 10 seconds) at the end before the ware gets delivered to the flag. this would look nicely in the game to have a short pause between working and delivering (could simulate the time to serve the dish). Could you please check all of the meal producing buildings and adjust their cycles accordingly? -- 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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
