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

[Toni Förster]

[GunChleoc (gunchleoc)]

Thanks for the fix!

I thin the sleep should be before the play_sound too, so that the sound will go with the animation?

You also accidentally committed some changes to the translation files.

[hessenfarmer (stephan-lutz)]

The underlying bug should be fixed. Thanks for spotting it. However as the merge request is not tegeted to trunk but to the Mines-worldsavior branch it should have been branched from this branch. instead it is branche from trunk which leads to difficulties. So I would propose to fix the small big inn issues manually either in mines-worldsavior or in trunk after mines-worldsavior has been merged.

review: Disapprove

[hessenfarmer (stephan-lutz)]

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?

[Toni Förster (stonerl)]

Hope this is what you imagined.

[hessenfarmer (stephan-lutz)]

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.

review: Approve

[Toni Förster (stonerl)]

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 <email address hidden> 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.

[Toni Förster (stonerl)]

> 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.

[hessenfarmer (stephan-lutz)]

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

[Toni Förster (stonerl)]

Changed it according to your description.

[hessenfarmer (stephan-lutz)]

Looks Good now. Thanks a lot. This can be merged.
@bunnybot merge

[Toni Förster (stonerl)]

@bunnybot merge

[hessenfarmer (stephan-lutz)]

Hi Toni,

as PArt of the cleanup before move Task I think we should abandon this branch

[Toni Förster (stonerl)]

+1

[hessenfarmer (stephan-lutz)]

Can't do this as this is your branch and not part of widelands-dev.
BTW there might be other superseded branches as well which only you can change in status.

=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua	2018-07-24 09:10:45 +0000
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua	2018-08-11 14:27:05 +0000
@@ -71,9 +71,10 @@
          actions = {
             -- time total: 33
             "return=skipped unless economy needs ration",
-            "sleep=23000",
+            "sleep=5000",
             "consume=barbarians_bread,fish,meat",
             "playsound=sound/barbarians/taverns tavern 100",
+            "animate=working 18000",
             "sleep=10000",
             "produce=ration"
          }
@@ -86,7 +87,8 @@
             "return=skipped unless economy needs snack",
             "consume=barbarians_bread fish,meat beer",
             "playsound=sound/barbarians/taverns biginn 100",
-            "sleep=37000",
+            "animate=working 27000",
+            "sleep=10000",
             "produce=snack"
          }
       },
@@ -98,7 +100,8 @@
             "return=skipped unless economy needs meal",
             "consume=barbarians_bread fish,meat beer_strong",
             "playsound=sound/barbarians/taverns biginn 100",
-            "sleep=40000",
+            "animate=working 30000",
+            "sleep=10000",
             "produce=meal"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/inn/init.lua	2018-07-24 09:10:45 +0000
+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua	2018-08-11 14:27:05 +0000
@@ -84,8 +84,8 @@
             "return=skipped unless economy needs snack",
             "consume=barbarians_bread fish,meat beer",
             "playsound=sound/barbarians/taverns inn 100",
-            "animate=working 22000",
-            "sleep=15000",
+            "animate=working 27000",
+            "sleep=10000",
             "produce=snack"
          }
       },

=== 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 14:27:05 +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
             "return=skipped unless economy needs ration",
+            "sleep=5000",
             "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/inn/init.lua'
--- data/tribes/buildings/productionsites/empire/inn/init.lua	2018-07-24 09:10:45 +0000
+++ data/tribes/buildings/productionsites/empire/inn/init.lua	2018-08-11 14:27:05 +0000
@@ -64,10 +64,11 @@
          actions = {
             -- time total: 33
             "return=skipped unless economy needs ration",
-            "sleep=23000",
+            "sleep=5000",
             "consume=empire_bread,fish,meat",
             "playsound=sound/empire/taverns ration 100",
-            "animate=working 10000",
+            "animate=working 18000",
+            "sleep=10000",
             "produce=ration"
          }
       },
@@ -79,8 +80,8 @@
             "return=skipped unless economy needs meal",
             "consume=empire_bread fish,meat",
             "playsound=sound/empire/taverns meal 100",
-            "animate=working 25000",
-            "sleep=15000",
+            "animate=working 30000",
+            "sleep=10000",
             "produce=meal"
          }
       },

=== 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 14:27:05 +0000
@@ -56,11 +56,12 @@
          descname = _"preparing a ration",
          actions = {
             -- time total: 33
-            "sleep=14000",
             "return=skipped unless economy needs ration",
+            "sleep=5000",
             "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 14:27:05 +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",
+            "sleep=5000",
             "consume=fruit,smoked_fish,smoked_meat",
-            "sleep=14000",
-            "animate=working 19000",
+            "animate=working 18000",
+            "sleep=10000",
             "produce=ration"
          }
       },
@@ -83,10 +85,11 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing a meal because ...
          descname = _"preparing a meal",
          actions = {
+            --time total: 40
             "return=skipped unless economy needs meal",
             "consume=beer honey_bread smoked_fish,smoked_meat",
-            "sleep=10000",
             "animate=working 30000",
+            "sleep=10000",
             "produce=meal"
          }
       },

=== 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 14:27:05 +0000
@@ -73,11 +73,13 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing only one ration because ... (can produce more efficient when supply is good)
          descname = _"preparing only one ration",
          actions = {
+            -- 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=21000",
+            "sleep=5000",
             "consume=fruit,bread_frisians,smoked_fish,smoked_meat",
-            "animate=working 28500",
+            "animate=working 34500",
+            "sleep=10000",
             "produce=ration"
          },
       },
@@ -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",
+            "sleep=5000",
             "consume=fruit,bread_frisians smoked_fish,smoked_meat",
-            "sleep=28000",
-            "animate=working 38000",
+            "animate=working 51000",
+            "sleep=10000",
             "produce=ration:2"
          },
       },