widelands-dev team mailing list archive

[Toni Förster <toni.foerster@xxxxxxxxx>]

Toni Förster has proposed merging lp:~widelands-dev/widelands/shipyard_statistics into lp:widelands with lp:~widelands-dev/widelands/bug-1786613-10s-return-skipped as a prerequisite.

Commit message:
change order of working and stats for shipyards
  
Shipyards call 2 programs and productivity is doubled for each building step.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/shipyard_statistics/+merge/354208

Currently it takes 16 steps to complete a ship. But 20 to reach 100% productivity. That somehow doesn't feel right; having built an entire ship but only 80% productivity.

Now 2 programs are called. One step in building a ship gains 10% in productivity.

-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/shipyard_statistics into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua	2018-09-03 23:08:52 +0000
+++ data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua	2018-09-03 23:08:53 +0000
@@ -63,8 +63,8 @@
          -- TRANSLATORS: Completed/Skipped/Did not start working because ...
          descname = _"working",
          actions = {
-            "sleep=20000",
-            "call=ship",
+            "call=ship on failure fail",
+            "call=ship_preparation",
             "return=no_stats"
          }
       },
@@ -73,9 +73,14 @@
          descname = _"constructing a ship",
          actions = {
             "checkmap=seafaring",
+            "sleep=20000",
             "construct=atlanteans_shipconstruction buildship 6",
+         }
+      },
+      ship_preparation = {
+         descname = _"working",
+         actions = {
             "animate=working 35000",
-            "return=completed"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/init.lua'
--- data/tribes/buildings/productionsites/barbarians/shipyard/init.lua	2018-09-03 23:08:52 +0000
+++ data/tribes/buildings/productionsites/barbarians/shipyard/init.lua	2018-09-03 23:08:53 +0000
@@ -62,8 +62,8 @@
          -- TRANSLATORS: Completed/Skipped/Did not start working because ...
          descname = _"working",
          actions = {
-            "sleep=20000",
-            "call=ship",
+            "call=ship on failure fail",
+            "call=ship_preparation",
             "return=no_stats"
          }
       },
@@ -72,9 +72,14 @@
          descname = _"constructing a ship",
          actions = {
             "checkmap=seafaring",
+            "sleep=20000",
             "construct=barbarians_shipconstruction buildship 6",
+         }
+      },
+      ship_preparation = {
+         descname = _"working",
+         actions = {
             "animate=working 35000",
-            "return=completed"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/empire/shipyard/init.lua'
--- data/tribes/buildings/productionsites/empire/shipyard/init.lua	2018-09-03 23:08:52 +0000
+++ data/tribes/buildings/productionsites/empire/shipyard/init.lua	2018-09-03 23:08:53 +0000
@@ -62,8 +62,8 @@
          -- TRANSLATORS: Completed/Skipped/Did not start working because ...
          descname = _"working",
          actions = {
-            "sleep=20000",
-            "call=ship",
+            "call=ship on failure fail",
+            "call=ship_preparation",
             "return=no_stats"
          }
       },
@@ -72,9 +72,14 @@
          descname = _"constructing a ship",
          actions = {
             "checkmap=seafaring",
+            "sleep=20000",
             "construct=empire_shipconstruction buildship 6",
+         }
+      },
+      ship_preparation = {
+         descname = _"working",
+         actions = {
             "animate=working 35000",
-            "return=completed"
          }
       },
    },

=== modified file 'data/tribes/buildings/productionsites/frisians/shipyard/init.lua'
--- data/tribes/buildings/productionsites/frisians/shipyard/init.lua	2018-09-03 23:08:52 +0000
+++ data/tribes/buildings/productionsites/frisians/shipyard/init.lua	2018-09-03 23:08:53 +0000
@@ -56,8 +56,8 @@
          -- TRANSLATORS: Completed/Skipped/Did not start working because ...
          descname = _"working",
          actions = {
-            "sleep=20000",
-            "call=ship",
+            "call=ship on failure fail",
+            "call=ship_preparation",
             "return=no_stats"
          }
       },
@@ -66,9 +66,15 @@
          descname = _"constructing a ship",
          actions = {
             "checkmap=seafaring",
+            "sleep=20000",
             "construct=frisians_shipconstruction buildship 6",
-            "sleep=35000",
-            "return=completed"
+         }
+      },
+      ship_preparation = {
+         descname = _"working",
+         actions = {
+            "sleep=20000",
+            -- no working animation yet
          }
       },
    },