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

[Toni Förster]

atlantean fishbreeder split time 50/50 building/worker

Forgot the fishbreeder :-).

[bunnybot (widelandsofficial)]

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.

[kaputtnik (franku)]

Please do not add me as a reviewer.

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

[Toni Förster (stonerl)]

I meant to add Hessenfarmer...

[hessenfarmer (stephan-lutz)]

seems to be ok for me

review: Approve

[hessenfarmer (stephan-lutz)]

@bunnybot merge

[bunnybot (widelandsofficial)]

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.

[hessenfarmer (stephan-lutz)]

@bunnybot merge force

=== modified file 'data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua	2019-05-29 18:29:28 +0000
+++ data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua	2019-06-06 10:03:16 +0000
@@ -42,7 +42,7 @@
          descname = _"breeding fish",
          actions = {
             "callworker=breed",
-            "sleep=24000"
+            "sleep=13500"
          }
       },
    },
 
=== modified file 'data/tribes/workers/atlanteans/fishbreeder/init.lua'
--- data/tribes/workers/atlanteans/fishbreeder/init.lua	2019-04-21 14:57:55 +0000
+++ data/tribes/workers/atlanteans/fishbreeder/init.lua	2019-06-06 10:03:16 +0000
@@ -31,7 +31,7 @@
       breed = {
          "findspace=size:any radius:7 breed resource:fish",
          "walk=coords",
-         "animate=freeing 3000", -- Play a freeing animation
+         "animate=freeing 13500", -- Play a freeing animation
          "breed=fish 1",
          "return"
       }