widelands

Merge lp:~widelands-dev/widelands/bug-1753248-crystalmine-tuning into lp:widelands

  1. bug-1753248-crystalmine-tuning
  2. Merge into trunk
Proposed by Teppo Mäenpää
Status: Merged
Merged at revision: 8619
Proposed branch: lp:~widelands-dev/widelands/bug-1753248-crystalmine-tuning
Merge into: lp:widelands
Diff against target: 63 lines (+9/-9)
2 files modified
data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua (+6/-6)
data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua (+3/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1753248-crystalmine-tuning
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+341274@code.launchpad.net

Commit message

Depleted Atlantean crystal (and iron) mines work slightly better when depleted.

Description of the change

Depleted atlantean crystal (and iron) mines work slightly better when depleted.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3282. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/351621059.
Appveyor build 3090. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1753248_crystalmine_tuning-3090.

Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM :)

@bunnybot merge

review: Approve

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 2017-06-26 19:48:43 +0000
3+++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2018-03-10 06:40:35 +0000
4@@ -70,7 +70,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",
9+ "return=skipped unless economy needs granite",
10 "sleep=45000",
11 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
12 "animate=working 20000",
13@@ -91,17 +91,17 @@
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",
18+ "return=skipped unless economy needs quartz",
19 "sleep=45000",
20 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
21 "animate=working 20000",
22 "mine=stones 4 100 5 2",
23- "produce=granite:2",
24- "animate=working 20000",
25- "mine=stones 4 100 5 2",
26 "produce=granite quartz",
27 "animate=working 20000",
28 "mine=stones 4 100 5 2",
29+ "produce=granite:2",
30+ "animate=working 20000",
31+ "mine=stones 4 100 5 2",
32 "produce=quartz:2"
33 }
34 },
35@@ -109,7 +109,7 @@
36 -- TRANSLATORS: Completed/Skipped/Did not start mining diamonds because ...
37 descname = _"mining diamonds",
38 actions = {
39- "return=skipped unless economy needs granite or economy needs diamond",
40+ "return=skipped unless economy needs diamond",
41 "sleep=45000",
42 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
43 "animate=working 20000",
44
45=== modified file 'data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua'
46--- data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua 2017-09-03 07:59:51 +0000
47+++ data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua 2018-03-10 06:40:35 +0000
48@@ -62,12 +62,12 @@
49 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
50 "animate=working 20000",
51 "mine=iron 4 100 5 2",
52+ "produce=iron_ore:2",
53+ "animate=working 20000",
54+ "mine=iron 4 100 5 2",
55 "produce=iron_ore",
56 "animate=working 20000",
57 "mine=iron 4 100 5 2",
58- "produce=iron_ore:2",
59- "animate=working 20000",
60- "mine=iron 4 100 5 2",
61 "produce=iron_ore:2"
62 }
63 },

Subscribers

People subscribed via source and target branches

to status/vote changes: