widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/crystal_mine_economy_needs into lp:widelands.

Commit message:
Atlantean Crystalmines now don't check for diamond needs when mining quartz and vice versa. This prevents the Crystalmines from overproducing.

Requested reviews:
  Widelands Developers (widelands-dev)

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

As discussed on the forum: https://wl.widelands.org/forum/topic/2786/?page=5#post-19682
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/crystal_mine_economy_needs into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua	2017-02-18 23:10:28 +0000
@@ -69,7 +69,7 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
          descname = _"mining granite",
          actions = {
-            "return=skipped unless economy needs granite or economy needs quartz or economy needs diamond",
+            "return=skipped unless economy needs granite or economy needs quartz",
             "sleep=45000",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
@@ -90,7 +90,7 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining quartz because ...
          descname = _"mining quartz",
          actions = {
-            "return=skipped unless economy needs granite or economy needs quartz or economy needs diamond",
+            "return=skipped unless economy needs granite or economy needs quartz",
             "sleep=45000",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",
@@ -108,7 +108,7 @@
          -- TRANSLATORS: Completed/Skipped/Did not start mining diamonds because ...
          descname = _"mining diamonds",
          actions = {
-            "return=skipped unless economy needs granite or economy needs quartz or economy needs diamond",
+            "return=skipped unless economy needs granite or economy needs diamond",
             "sleep=45000",
             "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
             "animate=working 20000",