Merge lp:~widelands-dev/widelands/bug-1728006 into lp:widelands

[TiborB]

Add support for productionsites that are also supporting site to the AI.

This adds support for productionsites that are also supporting site. Needs testing with frisian branch. And AI training a bit, but not as a part of this merge request of course.

[GunChleoc (gunchleoc)]

You should get rid of kPureProducer. Looks good to me otherwise. Not tested yet.

[TiborB (tiborb95)]

Good catch:) Removed...

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2740. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/296462194.
Appveyor build 2552. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1728006-2552.

[GunChleoc (gunchleoc)]

I have done some testing now.

@bunnybot merge

review: Approve

=== modified file 'src/ai/ai_help_structs.h'
--- src/ai/ai_help_structs.h	2017-09-29 16:10:25 +0000
+++ src/ai/ai_help_structs.h	2017-11-02 20:15:48 +0000
@@ -78,6 +78,7 @@
 	kUpgradeExtends,
 	kLogRefiner,
 	kIronMine,
+	kSupportingProducer,
 };
 
 enum class AiType : uint8_t { kVeryWeak, kWeak, kNormal };
 
=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2017-09-29 16:10:25 +0000
+++ src/ai/defaultai.cc	2017-11-02 20:15:48 +0000
@@ -698,6 +698,11 @@
 				bo.positions.push_back(temp_position.first);
 			}
 
+			// If this is a producer, does it act also as supporter?
+			if (!bo.outputs.empty() && !bo.production_hints.empty()) {
+					bo.set_is(BuildingAttribute::kSupportingProducer);
+			}
+
 			iron_ore_id = tribe_->ironore();
 
 			if (bo.type == BuildingObserver::Type::kMine) {
@@ -2649,7 +2654,7 @@
 					prio -= (bf->enemy_nearby) * 100;
 					prio -= (expansion_type.get_expansion_type() != ExpansionMode::kEconomy) * 100;
 				} else {  // finally normal productionsites
-					assert(bo.production_hints.empty());
+					assert(bo.production_hints.empty() || bo.is(BuildingAttribute::kSupportingProducer));
 
 					if (bo.new_building == BuildingNecessity::kForced) {
 						prio += 150;
@@ -2709,6 +2714,21 @@
 						}
 					}
 
+					// This is for a special case this is also supporter, it considers
+					// producers nearby
+					for (auto ph : bo.production_hints) {
+						prio += management_data.neuron_pool[51].get_result_safe(
+						           bf->producers_nearby.at(ph) * 5, kAbsValue) /
+						        2;
+					}
+
+					// This considers supporters nearby
+					for (auto ph : bo.outputs) {
+						prio += management_data.neuron_pool[52].get_result_safe(
+						           bf->supporters_nearby.at(ph) * 5, kAbsValue) /
+						        2;
+					}
+
 					if (prio <= 0) {
 						continue;
 					}
@@ -4762,7 +4782,8 @@
 		           bo.cnt_under_construction + bo.unoccupied_count == 0) {
 			bo.max_needed_preciousness = bo.max_preciousness;  // even when rocks are not needed
 			return BuildingNecessity::kAllowed;
-		} else if (!bo.production_hints.empty()) {
+		} else if (!bo.production_hints.empty() && !bo.is(BuildingAttribute::kSupportingProducer)) {
+			// Pure supporting sites only
 
 			if (bo.cnt_under_construction + bo.unoccupied_count - bo.unconnected_count > 0) {
 				return BuildingNecessity::kForbidden;
@@ -5126,6 +5147,15 @@
 			inputs[99] = (wood_policy_ == WoodPolicy::kAllowRangers) ? -1 : 0;
 			inputs[100] = (bo.total_count() == 0) ? 3 : 0;
 			inputs[101] = (bo.total_count() == 0) ? 6 : 0;
+			if (bo.is(BuildingAttribute::kSupportingProducer)) {
+				if (bo.total_count() == 0) {
+					inputs[102] = 1;
+					inputs[103] = 2;
+					inputs[104] = -2;
+				}
+				inputs[105] = -2;
+				inputs[106] = -2;
+			}
 
 			int16_t tmp_score = 0;
 			for (uint8_t i = 0; i < kFNeuronBitSize; ++i) {