widelands-dev team mailing list archive

[Teppo Mäenpää <tm@xxxxxx>]

Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/bug-1753248-crystalmine-tuning into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1753248 in widelands: "Rework Atlantean Crystal Mine"
  https://bugs.launchpad.net/widelands/+bug/1753248

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1753248-crystalmine-tuning/+merge/341274

Depleted atlantean crystal (and iron) mines work slightly better when depleted.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1753248-crystalmine-tuning into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua	2017-06-26 19:48:43 +0000
+++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua	2018-03-10 06:40:35 +0000
@@ -70,7 +70,7 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
          descname = _"mining granite",
          actions = {
-            "return=skipped unless economy needs granite or economy needs quartz",
+            "return=skipped unless economy needs granite",
             "sleep=45000",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
@@ -91,17 +91,17 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining quartz because ...
          descname = _"mining quartz",
          actions = {
-            "return=skipped unless economy needs granite or economy needs quartz",
+            "return=skipped unless economy needs quartz",
             "sleep=45000",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
             "mine=stones 4 100 5 2",
-            "produce=granite:2",
-            "animate=working 20000",
-            "mine=stones 4 100 5 2",
             "produce=granite quartz",
             "animate=working 20000",
             "mine=stones 4 100 5 2",
+            "produce=granite:2",
+            "animate=working 20000",
+            "mine=stones 4 100 5 2",
             "produce=quartz:2"
          }
       },
@@ -109,7 +109,7 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining diamonds because ...
          descname = _"mining diamonds",
          actions = {
-            "return=skipped unless economy needs granite or economy needs diamond",
+            "return=skipped unless economy needs diamond",
             "sleep=45000",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",

=== modified file 'data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua	2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua	2018-03-10 06:40:35 +0000
@@ -62,12 +62,12 @@
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
             "mine=iron 4 100 5 2",
+            "produce=iron_ore:2",
+            "animate=working 20000",
+            "mine=iron 4 100 5 2",
             "produce=iron_ore",
             "animate=working 20000",
             "mine=iron 4 100 5 2",
-            "produce=iron_ore:2",
-            "animate=working 20000",
-            "mine=iron 4 100 5 2",
             "produce=iron_ore:2"
          }
       },