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

[TiborB]

AI tweak - fisher now strictly requires fishes in vicinity.

AI tweak - fisher now strictly requires fishes in vicinity.

NOT TESTED! But what can go wrong here :)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3323. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/360061692.
Appveyor build 3130. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_fisher_fix-3130.

[GunChleoc (gunchleoc)]

Famous last words *lol* - I have done some minimal testing.

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

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

Travis build 3323. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/360061692.

[hessenfarmer (stephan-lutz)]

fix is not working. Reason is that the algorithm counts all fish in the working radius, but fishermen only are able to extract the fish from the coast so even if there is no catchable fish at all. AI will (and is doing so in my tests) continue to build fishermen huts. Only thing is they now will be build in a region of 6 around the coast instead of 7 around the coast, cause the first water field had been emptied. So as the current game adds default fish to the maps where no fish is defined, we can't solve it in the editors. best thing would be to check whether there is a walkable and reachable field near the ressource befor considering it to be nearby

review: Needs Fixing

[TiborB (tiborb95)]

Indeed, this fix does not cover situation when fish are there but not reachable from coast.

But eliminates possibility of building a fishers hut in vicinity of water without fish at all.

I will modify the code once more...

[TiborB (tiborb95)]

OK, so I did it hard way, please test now

(some cleanup needed before merging)

[hessenfarmer (stephan-lutz)]

still not working properly
see replay

[hessenfarmer (stephan-lutz)]

didn't know how to add somethign to the branh so I created a bug reprot and added my replay there it shows both the fisher problem not being fixed and the problem with the non conquered mountain area

[hessenfarmer (stephan-lutz)]

Did a playtest of the algorithm.
Code cleanup looks good.
Thanks to Tibor for his patience and support

review: Approve (test and review)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3351. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/363043830.
Appveyor build 3157. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_fisher_fix-3157.

[GunChleoc (gunchleoc)]

LGTM - just 1 nit for a comment. Please merge once it's fixed :)

review: Approve

[TiborB (tiborb95)]

OK, fixed, merging now
@bunnybot merge

=== modified file 'src/ai/ai_help_structs.h'
--- src/ai/ai_help_structs.h	2018-04-03 19:27:20 +0000
+++ src/ai/ai_help_structs.h	2018-04-07 19:33:55 +0000
@@ -346,7 +346,7 @@
 	int16_t water_nearby;
 	int16_t open_water_nearby;
 	int16_t distant_water;
-	int8_t fish_nearby;
+	int16_t fish_nearby;
 	int8_t critters_nearby;
 	ResourceAmount ground_water;  // used by wells
 	uint8_t space_consumers_nearby;

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2018-04-02 08:44:26 +0000
+++ src/ai/defaultai.cc	2018-04-07 19:33:55 +0000
@@ -1471,10 +1471,23 @@
 		}
 	}
 
-	// counting fields with fish
-	if (field.water_nearby > 0 && (field.fish_nearby == kUncalculated || resource_count_now)) {
-		field.fish_nearby = map.find_fields(Area<FCoords>(field.coords, kProductionArea), nullptr,
-		                                    FindNodeResource(world.get_resource("fish")));
+	// counting fields with fish, doing it roughly every 10-th minute is enough
+	if (field.water_nearby > 0 && (field.fish_nearby == kUncalculated || (resource_count_now && gametime % 10 == 0))) {
+		CheckStepWalkOn fisher_cstep(MOVECAPS_WALK, true);
+		static std::vector<Coords> fish_fields_list; // pity this contains duplicates
+		fish_fields_list.clear();
+		map.find_reachable_fields(Area<FCoords>(field.coords, kProductionArea),
+			&fish_fields_list, fisher_cstep, FindNodeResource(world.get_resource("fish")));
+
+		// This is "list" of unique fields in fish_fields_list we got above
+		static std::set<Coords> counted_fields;
+		counted_fields.clear();
+		field.fish_nearby = 0;
+		for (auto fish_coords : fish_fields_list) {
+			if (counted_fields.insert(fish_coords).second) {
+				field.fish_nearby += map.get_fcoords(fish_coords).field->get_resources_amount();
+			}
+		}
 	}
 
 	// Counting resources that do not change fast
@@ -2724,7 +2737,7 @@
 
 				} else if (bo.is(BuildingAttribute::kFisher)) {  // fisher
 
-					if (bf->water_nearby < 2 || bf->fish_nearby < 2) {
+					if (bf->fish_nearby <= 15) {
 						continue;
 					}
 
@@ -4359,7 +4372,7 @@
 	// hunters)
 	if (site.bo->inputs.empty() && site.bo->production_hints.empty() &&
 	    site.site->can_start_working() && !site.bo->is(BuildingAttribute::kSpaceConsumer) &&
-	    site.site->get_statistics_percent() < 10 &&
+	    site.site->get_statistics_percent() < 5 &&
 	    ((game().get_gametime() - site.built_time) > 10 * 60 * 1000)) {
 
 		site.bo->last_dismantle_time = game().get_gametime();