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

[TiborB]

AI tweak - when looking for nearest buildable spot, it accepts also mineable fields. This affects willingness to expand when there are no buildable spots nearby, but some mines can be conquered by new militarysite.

AI tweak - when looking for nearest buildable spot, it accepts also mineable fields. This affects willingness to expand when there are no buildable spots nearby, but some mines can be conquered by new militarysite.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3339. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/361802857.
Appveyor build 3145. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_mineable_buildable-3145.

[hessenfarmer (stephan-lutz)]

Code looks good to me. Will test this evening.

So I think we can consider
https://code.launchpad.net/~widelands-dev/widelands/mineable_fields
 an abandoned branch now.

[TiborB (tiborb95)]

Yes, this one does almost the same though with bit different approach

and I must admit I completely forgot about this branch...

[hessenfarmer (stephan-lutz)]

fix is working.
can go in from my side

review: Approve (playtest)

[GunChleoc (gunchleoc)]

Code looks good too.

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

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

Travis build 3339. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/361802857.

[GunChleoc (gunchleoc)]

Transient failure on Travis

@bunnybot merge force

=== modified file 'src/ai/ai_help_structs.cc'
--- src/ai/ai_help_structs.cc	2018-03-26 18:15:38 +0000
+++ src/ai/ai_help_structs.cc	2018-04-03 19:35:24 +0000
@@ -195,7 +195,8 @@
 }
 
 bool FindNodeUnownedBuildable::accept(const Map&, const FCoords& fc) const {
-	return (fc.field->nodecaps() & BUILDCAPS_SIZEMASK) && (fc.field->get_owned_by() == neutral());
+	return ((fc.field->nodecaps() & BUILDCAPS_SIZEMASK) || (fc.field->nodecaps() & BUILDCAPS_MINE)) &&
+			(fc.field->get_owned_by() == neutral());
 }
 
 // Unowned but walkable fields nearby

=== modified file 'src/ai/ai_help_structs.h'
--- src/ai/ai_help_structs.h	2018-03-26 18:15:38 +0000
+++ src/ai/ai_help_structs.h	2018-04-03 19:35:24 +0000
@@ -208,7 +208,7 @@
 };
 
 // When looking for unowned terrain to acquire, we must
-// consider if any buildings can be built on unowned land.
+// consider if any buildings (incl. mines) can be built on unowned land.
 struct FindNodeUnownedBuildable {
 	FindNodeUnownedBuildable(Player* p, Game& g);