[Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler-warnings-201908-2 into lp:widelands

2019-09-06 Thread bunnybot
Continuous integration builds have changed state:

Travis build 5399. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/581705807.
Appveyor build 5169. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_compiler_warnings_201908_2-5169.
-- 
https://code.launchpad.net/~widelands-dev/widelands/compiler-warnings-201908-2/+merge/372111
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/compiler-warnings-201908-2.

___
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/relax-ai-asserts into lp:widelands

2019-09-06 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/relax-ai-asserts into 
lp:widelands has been updated.

Commit message changed to:

Some improvements around AI asserts

- Relax AI requirement for hunters
- Be more informative when building is missing the
  "collects_ware_from_map" AI hint

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

___
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/ferry into lp:widelands

2019-09-06 Thread GunChleoc
Hm, at this point I'm wondering whether it might be easier to allow ferries to 
carry workers and have them waiting for it at the nearest flag. Then we would 
not need the separate economies.
-- 
https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ferry.

___
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/ferry into lp:widelands

2019-09-06 Thread Benedikt Straub
No, the workshop just skips everything because no tools are needed. I´m trying 
to implement that the tools will be transported from one warehouse to another 
one so the missing workers can be created in the correct economy…
-- 
https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ferry.

___
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/relax-ai-asserts into lp:widelands

2019-09-06 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/relax-ai-asserts 
into lp:widelands.

Commit message:
Relax AI requirement for hunters.

Requested reviews:
  TiborB (tiborb95)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/relax-ai-asserts/+merge/372400
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/relax-ai-asserts.
=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2019-09-05 19:57:55 +
+++ src/ai/defaultai.cc	2019-09-06 08:29:52 +
@@ -898,7 +898,8 @@
 	assert(count_buildings_with_attribute(BuildingAttribute::kRanger) == 1);
 	assert(count_buildings_with_attribute(BuildingAttribute::kWell) == 1);
 	assert(count_buildings_with_attribute(BuildingAttribute::kLumberjack) == 1);
-	assert(count_buildings_with_attribute(BuildingAttribute::kHunter) == 1);
+	assert((count_buildings_with_attribute(BuildingAttribute::kHunter) == 1) ||
+		   (count_buildings_with_attribute(BuildingAttribute::kHunter) == 0));
 	assert(count_buildings_with_attribute(BuildingAttribute::kIronMine) >= 1);
 	assert(count_buildings_with_attribute(BuildingAttribute::kFisher) == 1);
 	// If there will be a tribe with more than 3 mines of the same type, just increase the number

___
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/bug-1842396-no-tribe into lp:widelands

2019-09-06 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1842396-no-tribe into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1842396-no-tribe/+merge/372281
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1842396-no-tribe.

___
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-1842396-no-tribe into lp:widelands

2019-09-06 Thread GunChleoc
Review: Approve

Thanks for fixing :)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1842396-no-tribe/+merge/372281
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1842396-no-tribe.

___
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