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

Proposed by Toni Förster
Status: Merged
Merged at revision: 9145
Proposed branch: lp:~widelands-dev/widelands/atlantean_fishbreeder
Merge into: lp:widelands
Diff against target: 25 lines (+2/-2)
2 files modified
data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua (+1/-1)
data/tribes/workers/atlanteans/fishbreeder/init.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/atlantean_fishbreeder
Reviewer Review Type Date Requested Status
hessenfarmer Approve
Review via email: mp+368442@code.launchpad.net

Commit message

atlantean fishbreeder split time 50/50 building/worker

Description of the change

Forgot the fishbreeder :-).

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

Continuous integration builds have changed state:

Travis build 5168. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/542199104.
Appveyor build 4950. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_atlantean_fishbreeder-4950.

Revision history for this message
kaputtnik (franku) wrote :

Please do not add me as a reviewer.

Just leave the entry as it is when proposing a merge request. Thanks :-)

Revision history for this message
Toni Förster (stonerl) wrote :

I meant to add Hessenfarmer...

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

seems to be ok for me

review: Approve
Revision history for this message
hessenfarmer (stephan-lutz) wrote :

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 5171. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/544757572.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

@bunnybot merge force

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/fishbreeders_house/init.lua'
2--- data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua 2019-05-29 18:29:28 +0000
3+++ data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua 2019-06-06 10:03:16 +0000
4@@ -42,7 +42,7 @@
5 descname = _"breeding fish",
6 actions = {
7 "callworker=breed",
8- "sleep=24000"
9+ "sleep=13500"
10 }
11 },
12 },
13
14=== modified file 'data/tribes/workers/atlanteans/fishbreeder/init.lua'
15--- data/tribes/workers/atlanteans/fishbreeder/init.lua 2019-04-21 14:57:55 +0000
16+++ data/tribes/workers/atlanteans/fishbreeder/init.lua 2019-06-06 10:03:16 +0000
17@@ -31,7 +31,7 @@
18 breed = {
19 "findspace=size:any radius:7 breed resource:fish",
20 "walk=coords",
21- "animate=freeing 3000", -- Play a freeing animation
22+ "animate=freeing 13500", -- Play a freeing animation
23 "breed=fish 1",
24 "return"
25 }

Subscribers

People subscribed via source and target branches

to status/vote changes: