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

[TiborB]

AI tweak - a productionsite to be considered a fisher must not have any inputs.

AI tweak - a productionsite to be considered a fisher must not have any inputs.

[TiborB (tiborb95)]

I am afraid that in a next tribe the fishers will have an input - worms or something like that and we will be reworking this again :(

[GunChleoc (gunchleoc)]

How about having a weight instead? If building type has no inputs, prefer it if you can find a suitable spot.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3202. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/342848747.
Appveyor build 3011. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_fisher_identification-3011.

[TiborB (tiborb95)]

well, I dont like the idea.
But look at this from other angle: Fisher needs near water with fish. Does aquafarm need this as well?

[GunChleoc (gunchleoc)]

No, aquafarm doesn't. It needs holes in the ground that were dug by a clay burner working at a clay pit

    "findobject attrib:pond_dry radius:8"

[GunChleoc (gunchleoc)]

It can use normal fish too though

[hessenfarmer (stephan-lutz)]

Aqua farm does not need any water. It just needs a claypit nearby. As there is still an issue with the supports production of AI hint if there are 2 productionsites delivering the same ware I will try how the AI performs if the ware produced by an aqua_farm in frisians is breeded fish.

However I think the fix won't harm. In contrary it should help to clearly identify fishermens houses as for the hunters in relation to empire piggeries.

review: Approve

[TiborB (tiborb95)]

You mean that if by chance close to water, a worker will get out to the coast and fish?

It seems that this should not be treated as fisher at all. So this branch should fix it.

[GunChleoc (gunchleoc)]

OK, let's have it then. We can always rethink this if a new tribe will come up with the situation that you were originally worried about.

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

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

Travis build 3202. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/342848747.

[hessenfarmer (stephan-lutz)]

> You mean that if by chance close to water, a worker will get out to the coast
> and fish?
>
No, not at all he just fishes in his Ponds where he has breeded some fish.

> It seems that this should not be treated as fisher at all. So this branch
> should fix it.

Yes. Thank you for the quick fix as soon as we can persuade tarvis to be green and it is merged I'll give it a try.

[GunChleoc (gunchleoc)]

Merging trunk should do it. I also set a commit message

@bunnybot merge

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3217. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/343707990.
Appveyor build 3026. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_fisher_identification-3026.

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2018-02-19 12:13:17 +0000
+++ src/ai/defaultai.cc	2018-02-20 06:32:16 +0000
@@ -723,7 +723,8 @@
 			}
 
 			// and fishers
-			if (bo.outputs.size() == 1 && tribe_->safe_ware_index("fish") == bo.outputs.at(0)) {
+			if (bo.outputs.size() == 1 && tribe_->safe_ware_index("fish") == bo.outputs.at(0) &&
+				bo.inputs.empty()) {
 				bo.set_is(BuildingAttribute::kFisher);
 			}