Merge lp:~widelands-dev/widelands/crystal_mine_economy_needs into lp:widelands

Proposed by GunChleoc on 2017-02-18
Status: Merged
Merged at revision: 8300
Proposed branch: lp:~widelands-dev/widelands/crystal_mine_economy_needs
Merge into: lp:widelands
Diff against target: 30 lines (+3/-3)
1 file modified
data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua (+3/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/crystal_mine_economy_needs
Reviewer Review Type Date Requested Status
Widelands Developers 2017-02-18 Pending
Review via email: mp+317708@code.launchpad.net

Commit message

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

Description of the change

To post a comment you must log in.
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 1967. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/203050448.
Appveyor build 1802. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_crystal_mine_economy_needs-1802.

GunChleoc (gunchleoc) wrote :

I have tested this now and it is working, so I am merging to get this tested in real games.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua'
2--- data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2016-09-03 14:59:10 +0000
3+++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2017-02-18 23:10:28 +0000
4@@ -69,7 +69,7 @@
5 -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
6 descname = _"mining granite",
7 actions = {
8- "return=skipped unless economy needs granite or economy needs quartz or economy needs diamond",
9+ "return=skipped unless economy needs granite or economy needs quartz",
10 "sleep=45000",
11 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
12 "animate=working 20000",
13@@ -90,7 +90,7 @@
14 -- TRANSLATORS: Completed/Skipped/Did not start mining quartz because ...
15 descname = _"mining quartz",
16 actions = {
17- "return=skipped unless economy needs granite or economy needs quartz or economy needs diamond",
18+ "return=skipped unless economy needs granite or economy needs quartz",
19 "sleep=45000",
20 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
21 "animate=working 20000",
22@@ -108,7 +108,7 @@
23 -- TRANSLATORS: Completed/Skipped/Did not start mining diamonds because ...
24 descname = _"mining diamonds",
25 actions = {
26- "return=skipped unless economy needs granite or economy needs quartz or economy needs diamond",
27+ "return=skipped unless economy needs granite or economy needs diamond",
28 "sleep=45000",
29 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
30 "animate=working 20000",

Subscribers

People subscribed via source and target branches

to status/vote changes: