widelands-dev team mailing list archive

[toptopple <7010622@xxxxxx>]

toptopple has proposed merging lp:~7010622-q/widelands/topple-production-logic-3 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-3/+merge/309403

This is the completion of my "production-logic" series regarding avoidance of not intended wait times. This one improves Barbarian Inn + Big-Inn, Empire Inn and Atlantean Smokery. 

In a second step I have added some smaller increments to the higher products for Barbarians and Empire. This is a little compensation for improved efficiency and adds to natural economy rendering. The resulting production times for each product is stated in comments in the lua files.




-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-production-logic-3 into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/atlanteans/smokery/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/smokery/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/atlanteans/smokery/init.lua	2016-10-26 21:34:29 +0000
@@ -67,11 +67,13 @@
          -- TRANSLATORS: Completed/Skipped/Did not start smoking meat because ...
          descname = _"smoking meat",
          actions = {
+            -- time total: 60
             "return=skipped when site has fish and economy needs smoked_fish and not economy needs smoked_meat",
             "return=skipped unless economy needs smoked_meat",
-            "sleep=30000",
+            "sleep=10000",
             "consume=meat:2 log",
             "animate=working 30000",
+            "sleep=20000",
             "produce=smoked_meat:2"
          }
       },
@@ -79,11 +81,13 @@
          -- TRANSLATORS: Completed/Skipped/Did not start smoking fish because ...
          descname = _"smoking fish",
          actions = {
+            -- time total: 60
             "return=skipped when site has meat and economy needs smoked_meat and not economy needs smoked_fish",
             "return=skipped unless economy needs smoked_fish",
-            "sleep=30000",
+            "sleep=10000",
             "consume=fish:2 log",
             "animate=working 30000",
+            "sleep=20000",
             "produce=smoked_fish:2"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua	2016-10-24 10:10:06 +0000
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua	2016-10-26 21:34:29 +0000
@@ -69,11 +69,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=30000",
+            "sleep=23000",
             "consume=barbarians_bread,fish,meat",
             "play_sound=sound/barbarians/taverns tavern 100",
-            "sleep=3000",
+            "sleep=10000",
             "produce=ration"
          }
       },
@@ -81,11 +82,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing a snack because ...
          descname = _"preparing a snack",
          actions = {
+            -- time total: 37
             "return=skipped unless economy needs snack",
-            "sleep=30000",
+            "sleep=5000",  
             "consume=barbarians_bread fish,meat beer",
             "play_sound=sound/barbarians/taverns biginn 100",
-            "sleep=5000",
+            "sleep=32000",
             "produce=snack"
          }
       },
@@ -93,11 +95,12 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing a meal because ...
          descname = _"preparing a meal",
          actions = {
+            -- time total: 40
             "return=skipped unless economy needs meal",
-            "sleep=32000",
+            "sleep=5000", 
             "consume=barbarians_bread fish,meat beer_strong",
             "play_sound=sound/barbarians/taverns biginn 100",
-            "sleep=5000",
+            "sleep=35000",
             "produce=meal"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/inn/init.lua	2016-10-24 10:10:06 +0000
+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua	2016-10-26 21:34:29 +0000
@@ -66,11 +66,13 @@
          -- 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=14000",
+            "sleep=5000",
             "consume=barbarians_bread,fish,meat",
             "play_sound=sound/barbarians/taverns inn 100",
-            "animate=working 19000",
+            "animate=working 18000",
+            "sleep=10000",
             "produce=ration"
          }
       },
@@ -78,11 +80,13 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing a snack because ...
          descname = _"preparing a snack",
          actions = {
+            -- time total: 37
             "return=skipped unless economy needs snack",
-            "sleep=15000",
+            "sleep=5000",
             "consume=barbarians_bread fish,meat beer",
             "play_sound=sound/barbarians/taverns inn 100",
-            "animate=working 20000",
+            "animate=working 22000",
+            "sleep=10000",
             "produce=snack"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/empire/inn/init.lua'
--- data/tribes/buildings/productionsites/empire/inn/init.lua	2016-10-24 10:10:06 +0000
+++ data/tribes/buildings/productionsites/empire/inn/init.lua	2016-10-26 21:34:29 +0000
@@ -63,11 +63,13 @@
          -- 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=14000",
+            "sleep=10000",
             "consume=empire_bread,fish,meat",
             "play_sound=sound/empire/taverns ration 100",
             "animate=working 19000",
+            "sleep=4000",
             "produce=ration"
          }
       },
@@ -75,11 +77,13 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing a meal because ...
          descname = _"preparing a meal",
          actions = {
+            -- time total: 40
             "return=skipped unless economy needs meal",
-            "sleep=15000",
+            "sleep=10000",
             "consume=empire_bread fish,meat",
             "play_sound=sound/empire/taverns meal 100",
-            "animate=working 20000",
+            "animate=working 25000",
+            "sleep=5000",
             "produce=meal"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/empire/tavern/init.lua'
--- data/tribes/buildings/productionsites/empire/tavern/init.lua	2016-10-24 10:10:06 +0000
+++ data/tribes/buildings/productionsites/empire/tavern/init.lua	2016-10-26 21:34:29 +0000
@@ -55,6 +55,7 @@
          -- TRANSLATORS: Completed/Skipped/Did not start preparing a ration because ...
          descname = _"preparing a ration",
          actions = {
+            -- time total: 33
             "sleep=14000",
             "return=skipped unless economy needs ration",
             "consume=empire_bread,fish,meat",