Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands

2018-09-19 Thread hessenfarmer
Hm, perhaps the problem really only arises for the priority buttons.
What about having them displayed bigger and horizontally instaead of vertically 
behind the inputs that would allow for better precision in clicking them.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/geologist-messages into lp:widelands

2018-09-19 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/geologist-messages into 
lp:widelands has been updated.

Commit message changed to:

Geologist messages use the resource's image as icon instead of the resource 
indicator's

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/geologist-messages into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands

2018-09-19 Thread GunChleoc
I think the priority buttons make a really tiny click target anyway, so making 
them bigger is a good idea.

I'm also OK with minimizing by clicking on the window title only.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website

2018-09-19 Thread GunChleoc
Let's go with Ex-Member, that's good enough for me.

I think removing the warning is fine - the warning is shown in Build 19, and 
will become obsolete in Build 20. So, warning people in-game should suffice.
-- 
https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_tuning into lp:widelands

2018-09-19 Thread Tino
Tino has proposed merging lp:~widelands-dev/widelands/appveyor_tuning into 
lp:widelands.

Commit message:
Finetuning of Appveyor CI:
- explicitely request GCE image with 7,5GB RAM (vs. Hyper-V with 4GB)
- Set job pools for ninja via cmake

Requested reviews:
  Widelands Developers (widelands-dev)

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

This should allow parallel compiling, but disable parallel linking which always 
crashed with x64 debug builds due to excessive memory usage while linking.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/appveyor_tuning into lp:widelands.
=== modified file 'appveyor.yml'
--- appveyor.yml	2018-09-08 16:37:11 +
+++ appveyor.yml	2018-09-19 12:09:07 +
@@ -4,6 +4,8 @@
 #   Appveyor build configuration  #
 ###
 
+environment:
+  appveyor_build_worker_cloud: gce
 init:
   - cmd: "IF \"%PLATFORM%\" == \"x86\" (set MINGWPATH=C:\\msys64\\mingw32\\bin& set MINGWSUFFIX=i686) ELSE (set MINGWPATH=C:\\msys64\\mingw64\\bin& set MINGWSUFFIX=x86_64)"
 
@@ -32,10 +34,8 @@
   - cmd: md build
   - cmd: cd build
   - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
-  - cmd: "cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF %APPVEYOR_BUILD_FOLDER%"
-  # Appveyor does not provide enough memory to build/link thex64 debug build in parallel (Oct 2016)
-  # TODO(Tino): Optimize WL build scripts to use less memory/no cyclic dependencies
-  - cmd: "IF \"%PLATFORM%\" == \"x64\" (IF \"%CONFIGURATION%\" == \"Debug\" (ninja -j 1) ELSE (ninja)) ELSE (ninja)"
+  - cmd: "cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%"
+  - cmd: "cmake --build ."
 on_success:
   - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
   - cmd: ISCC /q /o%APPVEYOR_BUILD_FOLDER% /fWidelands-%APPVEYOR_BUILD_VERSION%-%CONFIGURATION%-%PLATFORM% c:\projects\widelands\utils\win32\innosetup\Widelands.iss

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands

2018-09-19 Thread GunChleoc
I actually think that we should not add any strings at this point if we can 
avoid it, because we're in feature freeze.

The information is also available at each building's help, so I don't think 
that the "instead of" addition is urgent enough to have it now. We can think of 
a good phrasing later.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/geologist-messages into lp:widelands

2018-09-19 Thread GunChleoc
Review: Needs Fixing

I am against this change - it replaces a symbol that the player knows with a 
symbol that is never, ever seen on the map except in the editor.

How about trying it the other way around, to see how that looks?
-- 
https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/geologist-messages.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/geologist-messages into lp:widelands

2018-09-19 Thread hessenfarmer
According to how it looks in the message box it might be that the bug is hidden 
in the format rather than the image

I would suspect the hardcoded padding value. 

https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/logic/map_objects/tribes/worker.cc#L972
-- 
https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/geologist-messages.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/geologist-messages into lp:widelands

2018-09-19 Thread Benedikt Straub
@hessenfarmer: I think the bug is caused by that that the old resis were 
squarish while some of the new ones are much taller than wide, so the title is 
not indented as far as for other messages

@GunChleoc: I now put the resi image in the message body, so the two images are 
now swapped compared to trunk
-- 
https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/geologist-messages.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands

2018-09-19 Thread hessenfarmer
Ok I'll just add the possible working places without any further comment then.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/geologist-messages into lp:widelands

2018-09-19 Thread Benedikt Straub
@hessenfarmer: Uploaded improved graphics for the frisian resis to this branch, 
how about these?
-- 
https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/geologist-messages.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/geologist-messages into lp:widelands

2018-09-19 Thread GunChleoc
I still do not like having the editor resource images as message icons. I'd 
prefer to keep it as it is, or have the resource indicator for both.
-- 
https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/geologist-messages.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_tuning into lp:widelands

2018-09-19 Thread GunChleoc
Review: Approve

LGTM :)
-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor_tuning/+merge/355335
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/appveyor_tuning.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands

2018-09-19 Thread GunChleoc
Thanks!

If you'd still like to offer more explanation at that point in the 
encyclopedia, please open a new bug and target it to Build 21.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/geologist-messages into lp:widelands

2018-09-19 Thread Benedikt Straub
The editor icons were already being used in the message body…
-- 
https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/geologist-messages.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/geologist-messages into lp:widelands

2018-09-19 Thread hessenfarmer
@ Nordfriese: to test the message box I need to wait for anppveyor or build 
myself. Will report back later. Although I believe that the swap of the images 
will be very good for visibility and readability og the message box, because 
the non quadratic images will ever be porrly visible in the message title lines.
@ GunChleoc: I think this would fit well although we show the editor image in 
the title. Cause the image there si scaled so small, all that really matters is 
color. and the editor images provide that much better than the ressource 
indicators. In the body the Indicators fit better cause they are tribe specific.

Just quickly excahged the none image and a coal image. None visibility is 
better now but with buildhelp on it is still not ideal. If we won't go for a 
flag with a cross we should at least make the pole a little bit thicker and 
especially the knob of the flagpole bigger. For the ressources I would have 
preferred two equal flags (like the top one is) but that is a matter of taste. 
the same for the height of the poles. for my taste they could be even shorter 
(especially when having two equal flags but that is not that important. So your 
choice.

-- 
https://code.launchpad.net/~widelands-dev/widelands/geologist-messages/+merge/355267
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/geologist-messages.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website

2018-09-19 Thread noreply
The proposal to merge lp:~widelands-dev/widelands-website/delete_user into 
lp:widelands-website has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978
-- 
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website

2018-09-19 Thread kaputtnik
Merged and deployed, sorry for the server errors... had forgotten to run the 
migrate command :-D
-- 
https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_tuning into lp:widelands

2018-09-19 Thread bunnybot
Continuous integration builds have changed state:

Travis build 4005. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/430516868.
Appveyor build 3802. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_tuning-3802.
-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor_tuning/+merge/355335
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/appveyor_tuning.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands

2018-09-19 Thread hessenfarmer
Just added a new version. Could not resist to insert a heading for the 
additional working places delivering the information.
If you don't want to have it now, please just comment the 2 relevant lines out 
so we could probably reactivate them for b21
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/balancing-worldsavior into lp:widelands

2018-09-19 Thread hessenfarmer
The proposal to merge lp:~widelands-dev/widelands/balancing-worldsavior into 
lp:widelands has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/balancing-worldsavior/+merge/355158
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/balancing-worldsavior into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands

2018-09-19 Thread hessenfarmer
The proposal to merge lp:~widelands-dev/widelands/frisian_balancing_2 into 
lp:widelands has been updated.

Commit message changed to:

Some balancing fixes:

- Fixed the bug that barbarian trading outposts, villages and fortified 
villages start with zero master-miners instead of 4 (like the headquarter does)

- Removed superfluous economy settings of imperial wine

- Fixed the bug that Frisian clay pits ignore economy settings. They do so now 
only if the economy needs fish, because Fish-producing aqua farms can stop 
working if the clay pits do so

- Reduced the problem that Frisian scrap metal tends to pile up: Recycling 
centers will not skipping anymore if the economy doesn't need coal. (If they 
would never skip there would be cases in which they use precious coal which is 
currently needed elsewhere - which could be bad even though recycling saves 
coal after a while)

- Reduced the costs for frisian Helmet to 1 coal and 1 iron. Adopted the scrap 
return as well

- Increased frisian farm workspace to radius 3

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/frisian_balancing_2/+merge/355358
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands

2018-09-19 Thread hessenfarmer
hessenfarmer has proposed merging 
lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands.

Commit message:
Some balancing fixes:

- Fixed the bug that barbarian trading outposts, villages and fortified 
villages start with zero master-miners instead of 4 (like the headquarter does)

- Removed superfluous economy settings of imperial wine

- Fixed the bug that Frisian clay pits ignore economy settings. They do so now 
only if the economy needs fish, because Fish-producing aqua farms can stop 
working if the clay pits do so

- Reduced the problem that Frisian scrap metal tends to pile up: Recycling 
centers will not skipping anymore if the economy doesn't need coal. (If they 
would never skip there would be cases in which they use precious coal which is 
currently needed elsewhere - which could be bad even though recycling saves 
coal after a while)

- Reduced the costs for frisian Helmet to 1 coal and 1 iron. Adopted the scrap 
return as well

- Increased frisian farm workspace to radius 3

Requested reviews:
  Widelands Developers (widelands-dev)

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

Some balancing fixes from Worldsavior. Note:

Unfortunately there is a little problem: If the recycling center skips and you 
mouse over it it says something like "skipped because economy doesn't need iron 
and"  instead of "skipped because economy doesn't need iron and economy needs 
coal". I don't know how to solve that, but I guess that the problem is that a 
building normally doesn't skip if a ware is needed instead of being not needed.

When we merge this branch, we need to record that problem in a bug, because it 
needs an engine fix.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua'
--- data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua	2018-09-10 12:32:56 +
+++ data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua	2018-09-19 19:54:15 +
@@ -105,7 +105,7 @@
  actions = {
 -- time total: 67 + 3.6
 "return=skipped unless economy needs helmet",
-"consume=coal iron:2",
+"consume=coal iron",
 "sleep=3",
 "playsound=sound/smiths smith 192",
 "animate=working 37000",

=== modified file 'data/tribes/buildings/productionsites/frisians/clay_pit/init.lua'
--- data/tribes/buildings/productionsites/frisians/clay_pit/init.lua	2018-07-17 10:13:49 +
+++ data/tribes/buildings/productionsites/frisians/clay_pit/init.lua	2018-09-19 19:54:15 +
@@ -59,7 +59,7 @@
  descname = _"making clay",
  actions = {
 "sleep=2",
-"return=skipped unless economy needs clay or site has water",
+"return=skipped unless economy needs clay or economy needs fish", -- Fish-producing aqua farms can stop working if the clay pits do so
 "return=failed unless site has water",
 "callworker=dig",
 "consume=water",

=== modified file 'data/tribes/buildings/productionsites/frisians/hunters_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/hunters_house/init.lua	2018-07-17 10:13:49 +
+++ data/tribes/buildings/productionsites/frisians/hunters_house/init.lua	2018-09-19 19:54:15 +
@@ -56,6 +56,10 @@
 "callworker=hunt",
 "sleep=35000",
 "callworker=hunt",
+"sleep=35000",
+"callworker=hunt",
+"sleep=35000",
+"callworker=hunt",
 "produce=fur"
  }
   },

=== modified file 'data/tribes/buildings/productionsites/frisians/recycling_center/init.lua'
--- data/tribes/buildings/productionsites/frisians/recycling_center/init.lua	2018-09-10 12:32:56 +
+++ data/tribes/buildings/productionsites/frisians/recycling_center/init.lua	2018-09-19 19:54:15 +
@@ -95,10 +95,10 @@
  -- TRANSLATORS: Completed/Skipped/Did not start recycling iron because ...
  descname = pgettext("frisians_building", "recycling iron"),
  actions = {
-"return=skipped unless economy needs iron",
+"return=skipped unless economy needs iron or not economy needs coal", -- if the economy doesn't need coal the situation gets even improved because recycling saves coal
+"sleep=4",
 "consume=scrap_iron:2 coal",
 "animate=working_metal 4",
-"sleep=4",
 "produce=iron:2"
  }
   },
@@ -106,10 +106,10 @@
  -- TRANSLATORS: Completed/Skipped/Did not start recycling iron and gold because ...
  descname = pgettext("frisians_building", "recycling iron and gold"),
  actions = {
-"return=skipped unless economy needs iron o

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands

2018-09-19 Thread hessenfarmer
The proposal to merge lp:~widelands-dev/widelands/frisian_balancing_2 into 
lp:widelands has been updated.

Commit message changed to:

Some balancing fixes:

- Fixed the bug that barbarian trading outposts, villages and fortified 
villages start with zero master-miners instead of 4 (like the headquarter does)

- Removed superfluous economy settings of imperial wine

- Fixed the bug that Frisian clay pits ignore economy settings. They do so now 
only if the economy needs fish, because Fish-producing aqua farms can stop 
working if the clay pits do so

- Reduced the problem that Frisian scrap metal tends to pile up: Recycling 
centers will not skipping anymore if the economy doesn't need coal. (If they 
would never skip there would be cases in which they use precious coal which is 
currently needed elsewhere - which could be bad even though recycling saves 
coal after a while)

- Reduced the costs for frisian Helmet to 1 coal and 1 iron. Adopted the scrap 
return as well

- Increased frisian farm workspace to radius 3

- addes a master seamstress to each starting conditions and reduced needles by 
one in return

- hunter only produces a fur each 5th cycle

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/frisian_balancing_2/+merge/355358
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_tuning into lp:widelands

2018-09-19 Thread hessenfarmer
As everything is green

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/appveyor_tuning/+merge/355335
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/appveyor_tuning.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_tuning into lp:widelands

2018-09-19 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/appveyor_tuning into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_tuning/+merge/355335
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/appveyor_tuning.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands

2018-09-19 Thread bunnybot
Continuous integration builds have changed state:

Travis build 4007. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/430731458.
Appveyor build 3804. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_balancing_2-3804.
-- 
https://code.launchpad.net/~widelands-dev/widelands/frisian_balancing_2/+merge/355358
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp