Merge lp:~widelands-dev/widelands/AI-fixes into lp:widelands

[hessenfarmer]

This fixes improves some behavior in AI performance
Ai is now able to adopt to scenarios to certain extend

Following things changed:
1. barbarian barracks no longer part of basic economy
2. AI expands towards low guarded enemy territory
3. AI builds more economy buildings based on neededness and preciousness od wares
4. AI is less agressive in dismantling. It does not dismantle if plenty of input is available for a building
5. added more decisions to genetics either in build and dismantle loops
6. AI now does properly upgrade barbarian smithies without running into a deadlock of having no smith for the tool smithy.
7. Fixed an issue which prevented AI from building second carrier recruiters

[TiborB (tiborb95)]

From AI code point of view - The changes can be OK, it is hard to say just looking at the code. I presume that you made sure the magic numbers does not repeat - dont forget they are used also in other AI files...
I will do some training once it is approved and merged.
I did not review changes to LUA code..
So for my part it is OK

review: Approve

[GunChleoc (gunchleoc)]

Found a typo in a comment.

The Lua code does not need reviewing because it will be removed anyway, but we should do a bit of testing.

[GunChleoc (gunchleoc)]

I gave up on the scenario after connecting 20 farms or so. Multiplayer game ran fine for > 7 hours gametime.

So, this can go in once the branch has been cleaned up :)

[hessenfarmer (stephan-lutz)]

@Tibor: of course I made sure the numbers are not used elsewhere. Shall I add more comments to explain my changes?

@GunChleoc: will fix the typo ofcourse. I never did any thing in the scenario but watching the AI's doing their job. If you do so you would see significant progress. And you can see that my changes work as desirred. But this was meant for Nordfriese in particular to see whether my changes would solve his issues in the scenario which led him to start working (and making good progress for his own scenario specific AI). However I already had the impression he might be a little bit sadistic with the player to connect all these farms. ;-)

@ both: there is still a line commented out (5710ff in defaultai.cc) I wanted to have a value here that depended on stocklevel vs economy target, but the Code didn't work. I got a crash. So I commented this out as my Skills are to bad for realizing the cause if you know why this would crash you could fix it or give me a hint.

[GunChleoc (gunchleoc)]

I'll have a look.

Also, I got this:

../src/ai/defaultai.cc: In member function ‘bool DefaultAI::check_productionsites(uint32_t)’:
../src/ai/defaultai.cc:4474:95: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
       1000 < gametime && site.site->can_start_working() && get_stocklevel(*site.bo, gametime) >
                                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
       (std::abs(management_data.get_military_number_at(168)) / 5)) {
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../src/ai/defaultai.cc:4502:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
      gametime - site.bo->last_dismantle_time >
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
          (std::abs(management_data.get_military_number_at(169)) / 10 + 1) * 60 * 1000 &&
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

[GunChleoc (gunchleoc)]

I think I found the problem:

(bo.outputs.size() == 1) means that there is 1 entry at index 0.

(tribe_->get_ware_descr(bo.outputs.at(1)) would only be available if bo.outputs.size() > 1

Unlike Lua, C++ starts counting from 0. Actually, Lua is quite exceptional here, since starting from 0 is the usual way of doing arrays.

[Benedikt Straub (nordfriese)]

Tested it now with the 3rd frisian scenario.

The AI behaved quite well, just some nits:
– It builds mainly blockhouses and small milsites. IMHO it should build preferably bigger milsites near the enemy´s border, even if it´s unguarded.
– It´s still quite confused by the inability to build woodcutters, quarries and mines. It builds useless buildings like taverns (that can be solved by just forbidding everything) and it neglects important buildings like warehouses (are very important there because that´s where the script creates wares you cannot produce yourself).
– There is much free space as a consequence of not having foresters, but space-consuming buildings (reedyard etc) are cramped closely together; but that´s a more general AI-problem.

– I get some compiler warnings:
/home/benedikt/wl/AI-fixes/src/ai/defaultai.cc:2461: Use "TODO(username): <msg>".
/home/benedikt/wl/AI-fixes/src/ai/defaultai.cc:2463: Trailing whitespace at end of line
[1007/1455] Building CXX object src/ai/CMakeFiles/ai.dir/defaultai.cc.o
../src/ai/defaultai.cc: In member function ‘bool DefaultAI::check_productionsites(uint32_t)’:
../src/ai/defaultai.cc:4502:46: warning: comparison of integer expressions of different signedness: ‘uint32_t’ {aka ‘unsigned int’} and ‘int’ [-Wsign-compare]
      gametime - site.bo->last_dismantle_time >
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
          (std::abs(management_data.get_military_number_at(169)) / 10 + 1) * 60 * 1000 &&
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

> But this was meant for Nordfriese in particular to see whether my changes would solve his issues in the scenario which led him to start working (and making good progress for his own scenario specific AI). However I already had the impression he might be a little bit sadistic with the player to connect all these farms. ;-)

Hey ;) The point of this objective is force the player to be almost idle until the enemy is standing right at his gates. And to force him to create a good road network under this pressure, which can be very important for the battles later.
Btw, my own AI is not scenario-specific – it´s a template for every(!) scenario that wants an AI specific to it

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4946. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/531247546.
Appveyor build 4727. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_AI_fixes-4727.

[TiborB (tiborb95)]

@nordfriese
about warehouses - they are in proportion to productionsites, I dont think AI can have any idea it needs more warehouses in this specific case...

[TiborB (tiborb95)]

@hessenfarmer

"@Tibor: of course I made sure the numbers are not used elsewhere. Shall I add more comments to explain my changes?"
No, I am fine, I also believe that AI training will settle down these changes. I intend to run 100 iterations as soon as the branch is in trunk..

[GunChleoc (gunchleoc)]

 > The point of this objective is force the player to be almost idle until the enemy is standing right at his gates. And to force him to create a good road network under this pressure, which can be very important for the battles later.

I get what you're trying to do, but hooking up all these farms is pretty repetitive. Maybe you can come up with some more varied stuff to do while still having some time pressure?

[hessenfarmer (stephan-lutz)]

@ Nordfriese:
fixed the codecheck warnings.
We should try to forbid useless buildings like the tavern and see what's the effect.
Regarding warehouses the problem was not the number but the distribution. as the script delivers only to one warehouse a time, this is putting the road network under some pressure. therefore I forced at least one second carrrier.
As the gametime evolves I made the experience, that the AI starts to build bigger milsites, however they are normally based on enemy force which is neglectable in this scenario. so the closer you get to an enemy the bigger the chance of big military buildings.

[hessenfarmer (stephan-lutz)]

@ Nordfriese:
If you want to test this further let us know, if you are finished we could merge this.

[hessenfarmer (stephan-lutz)]

I still can't get the Ai to build a second carrier producer.

[TiborB (tiborb95)]

Generally AI can decide:
- it does not need second carrier producer
- it needs it but gives it too low priority

So for further debugging you should know which case it is...

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4962. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/531521221.
Appveyor build 4743. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_AI_fixes-4743.

[hessenfarmer (stephan-lutz)]

Finally I got the AI to properly build second carrier recruiters depending on size of road network. The issue was that we need to fake a preciousness for this building (similar to barracks). Did some other changes as well to prevent the Ai from dismantling too many productionsites too often.

review: Needs Resubmitting

[hessenfarmer (stephan-lutz)]

oops I missed to fix the typo which GunChleoc found will be done in final polish

[TiborB (tiborb95)]

I have one objection, see comment in code

[Benedikt Straub (nordfriese)]

I´m through with the code review, a couple of nits. Will do more testing soon…

[hessenfarmer (stephan-lutz)]

@ Tibor:
oops this was a left over of some trials. I don't think we need this anymore will fix this tonight when I am back at my dev machine.
@ Nordfriese
Thanks for the review. Will fix these issues as well. However I replied to some comments below them.

[GunChleoc (gunchleoc)]

How about we implement preciousness for workers, just like we do for wares? That way, we would not need an ugly hack and could play with how precious they are without having to recompile.

[hessenfarmer (stephan-lutz)]

@GunChleoc:
I had the same thought but went the easy route for the moment being. Currently we only have 2 buildings recruiting "workers": the barracks and the second carrier recruiter. Both of them are limited for AI (barracks to 1, second carrier to 2 hardcoded) For these reasons I doubt if any effort in this way might be worth the pain.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4978. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/532671043.
Appveyor build 4759. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_AI_fixes-4759.

[Benedikt Straub (nordfriese)]

Tested, and it performs well. Code LGTM.
Good job :)

review: Approve

[hessenfarmer (stephan-lutz)]

Ok I will remove the fri03 stuff and merge it then. will be tonight though

[hessenfarmer (stephan-lutz)]

removed the lua stuff should be good to go now

[hessenfarmer (stephan-lutz)]

@bunnybot merge

[GunChleoc (gunchleoc)]

@hessenfarmer Hard-coding stuff in the AI has caused us problems before, e.g. when the Frisians were first introduced. I am fine with merging this now, but can you open a new bug, please?

[hessenfarmer (stephan-lutz)]

@GunChleoc:
I will do so, however the 2 buildings (barracks, second carrier) are so special, we would need a lot of code to come to the same results (1 barracks, 2 carrier). We also have a lot of other hardcoded stuff regarding these two. But basically the AI just needs to ensure it builds a barracks but not to early to not run in a deadlock and not to late. more the less the same with second carrier. The problem with these buildings is that their demand is not steady, but has big spikes. By this we can't use the decision algorithms for normal buildings producing wares. And therefore just having a preciousness for the soldier and the second carrier would not do the trick. What I can think for is e.g. having them assigned a Normal Ai limit in lua instead of hardcoding the values as it is now.

[hessenfarmer (stephan-lutz)]

@ GunChleoc:
I forgot to mention that I am pretty sure no matter what precautions we might take a new tribe would lead us to have some changes in Ai as well, as me and my crystal bowl can't foresee every issue that might arise. ;-)
In fact I was led to the current improvements only by the need of Nordfriese and his very special scenarios.

[GunChleoc (gunchleoc)]

Of course, there will always be things that we haven't thought of. And having too many hard-coded things already does not count as an argument in favor of adding even more of them.

The additional code needed wouldn't be that much, it's just a matter of adding 1 more property to the worker descr objects + AI hints, which I could do easily.

[hessenfarmer (stephan-lutz)]

For my understanding it is not only that but we should discuss this in the bug report.

=== modified file 'data/ai/ai_input_1.wai'
--- data/ai/ai_input_1.wai	2018-11-09 07:50:37 +0000
+++ data/ai/ai_input_1.wai	2019-05-16 17:52:43 +0000
@@ -166,7 +166,7 @@
 161="79"
 162="-56"
 163="-41"
-164="0"
+164="55"
 165="-63"
 166="8"
 167="-72"

=== modified file 'data/ai/ai_input_2.wai'
--- data/ai/ai_input_2.wai	2018-11-09 07:50:37 +0000
+++ data/ai/ai_input_2.wai	2019-05-16 17:52:43 +0000
@@ -166,7 +166,7 @@
 161="79"
 162="-56"
 163="-41"
-164="0"
+164="55"
 165="-63"
 166="8"
 167="-72"

=== modified file 'data/ai/ai_input_3.wai'
--- data/ai/ai_input_3.wai	2018-11-09 07:50:37 +0000
+++ data/ai/ai_input_3.wai	2019-05-16 17:52:43 +0000
@@ -166,7 +166,7 @@
 161="79"
 162="-56"
 163="-41"
-164="0"
+164="55"
 165="-63"
 166="8"
 167="-72"

=== modified file 'data/ai/ai_input_4.wai'
--- data/ai/ai_input_4.wai	2018-11-09 07:50:37 +0000
+++ data/ai/ai_input_4.wai	2019-05-16 17:52:43 +0000
@@ -166,7 +166,7 @@
 161="79"
 162="-56"
 163="-41"
-164="0"
+164="55"
 165="-63"
 166="8"
 167="-72"

=== modified file 'data/tribes/buildings/productionsites/atlanteans/horsefarm/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/horsefarm/init.lua	2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/atlanteans/horsefarm/init.lua	2019-05-16 17:52:43 +0000
@@ -32,7 +32,7 @@
 
    aihints = {
       recruitment = true,
-      prohibited_till = 610
+      prohibited_till = 610,
    },
 
    working_positions = {

=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/init.lua'
--- data/tribes/buildings/productionsites/barbarians/barracks/init.lua	2019-03-13 20:21:20 +0000
+++ data/tribes/buildings/productionsites/barbarians/barracks/init.lua	2019-05-16 17:52:43 +0000
@@ -37,7 +37,6 @@
    },
 
    aihints = {
-      basic_amount = 1,
       very_weak_ai_limit = 1,
       weak_ai_limit = 2,
       prohibited_till = 920

=== modified file 'data/tribes/buildings/productionsites/barbarians/cattlefarm/init.lua'
--- data/tribes/buildings/productionsites/barbarians/cattlefarm/init.lua	2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/cattlefarm/init.lua	2019-05-16 17:52:43 +0000
@@ -32,7 +32,7 @@
 
    aihints = {
       recruitment = true,
-      prohibited_till = 610
+      prohibited_till = 610,
    },
 
    working_positions = {

=== modified file 'data/tribes/buildings/productionsites/empire/donkeyfarm/init.lua'
--- data/tribes/buildings/productionsites/empire/donkeyfarm/init.lua	2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/empire/donkeyfarm/init.lua	2019-05-16 17:52:43 +0000
@@ -32,7 +32,7 @@
 
    aihints = {
       recruitment = true,
-      prohibited_till = 610
+      prohibited_till = 610,
    },
 
    working_positions = {

=== modified file 'data/tribes/wares/coal/init.lua'
--- data/tribes/wares/coal/init.lua	2017-06-30 15:31:17 +0000
+++ data/tribes/wares/coal/init.lua	2019-05-16 17:52:43 +0000
@@ -14,10 +14,10 @@
       empire = 20
    },
    preciousness = {
-      atlanteans = 1,
-      barbarians = 1,
-      frisians = 6,
-      empire = 1
+      atlanteans = 10,
+      barbarians = 20,
+      frisians = 40,
+      empire = 10
    },
 
    animations = {

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2019-04-20 05:44:37 +0000
+++ src/ai/defaultai.cc	2019-05-16 17:52:43 +0000
@@ -1326,13 +1326,17 @@
 	field.nearest_buildable_spot_nearby = std::numeric_limits<uint16_t>::max();
 	field.unowned_buildable_spots_nearby = 0;
 	field.unowned_portspace_vicinity_nearby = 0;
-	if (field.unowned_land_nearby > 0) {
+	if (field.unowned_land_nearby > 0 || (field.enemy_owned_land_nearby > 0 &&
+	       field.enemy_military_presence < std::abs(management_data.get_military_number_at(174)) / 10)) {
 		std::vector<Coords> found_buildable_fields;
 
 		// first looking for unowned buildable spots
 		field.unowned_buildable_spots_nearby =
 		   map.find_fields(Area<FCoords>(field.coords, kBuildableSpotsCheckArea),
 		                   &found_buildable_fields, find_unowned_buildable);
+		field.unowned_buildable_spots_nearby +=
+		   map.find_fields(Area<FCoords>(field.coords, kBuildableSpotsCheckArea),
+		                   &found_buildable_fields, find_enemy_owned_walkable);
 		// Now iterate over fields to collect statistics
 		for (auto& coords : found_buildable_fields) {
 			// We are not interested in blocked fields
@@ -2452,8 +2456,19 @@
 	for (uint32_t j = 0; j < buildings_.size(); ++j) {
 		BuildingObserver& bo = buildings_.at(j);
 
+		// we check if a previously not buildable Building of the basic economy is buildable again
+		// If so and we don't have basic economy achieved we add readd it to basic buildings list
+		// This should only happen in scenarios via scripting
+		if (!basic_economy_established && bo.basic_amount > static_cast<uint32_t>(bo.total_count()) && bo.buildable(*player_)) {
+			persistent_data->remaining_basic_buildings.emplace(std::make_pair(bo.id, bo.basic_amount));
+		}
 		if (!bo.buildable(*player_)) {
 			bo.new_building = BuildingNecessity::kNotNeeded;
+			// This line removes buildings from basic economy if they are not allowed for the player
+			// this should only happen by scripting.
+			if (bo.basic_amount) {
+				persistent_data->remaining_basic_buildings.erase(bo.id);
+			}
 		} else if (bo.type == BuildingObserver::Type::kProductionsite ||
 		           bo.type == BuildingObserver::Type::kMine) {
 
@@ -2947,6 +2962,7 @@
 					}
 
 				} else if (bo.is(BuildingAttribute::kRecruitment)) {
+					bo.max_needed_preciousness = 2;
 					prio += bo.primary_priority;
 					prio -= bf->unowned_land_nearby * 2;
 					prio -= (bf->enemy_nearby) * 100;
@@ -3749,12 +3765,11 @@
 			}
 		}
 
-		// if we are within grace time, it is OK, just go on
-		if (eco->dismantle_grace_time > gametime &&
-		    eco->dismantle_grace_time != std::numeric_limits<uint32_t>::max()) {
-			// if grace time is not set, this is probably first time without a warehouse and we must
-			// set it
-		} else if (eco->dismantle_grace_time == std::numeric_limits<uint32_t>::max()) {
+		// check if we are within grace time, if not or gracetime unset we need to do something
+		// if we are within gracetime we do nothing (this loop is skipped)
+
+		// if grace time is not set, this is probably first time without a warehouse and we must set it
+		if (eco->dismantle_grace_time == std::numeric_limits<uint32_t>::max()) {
 
 			// constructionsites
 			if (upcast(ConstructionSite const, constructionsite, flag.get_building())) {
@@ -3784,7 +3799,7 @@
 			}
 
 			// we have passed grace_time - it is time to dismantle
-		} else {
+		} else if (eco->dismantle_grace_time <= gametime) {
 			last_attempt_ = true;
 			// we increase a check radius in last attempt
 			checkradius += 2;
@@ -4104,7 +4119,8 @@
 
 	// do not dismantle or upgrade the same type of building too soon - to give some time to update
 	// statistics
-	if (site.bo->last_dismantle_time > game().get_gametime() - 30 * 1000) {
+	if (site.bo->last_dismantle_time > game().get_gametime() -
+		    (std::abs(management_data.get_military_number_at(164)) / 25 + 1) * 60 * 1000) {
 		return false;
 	}
 
@@ -4210,11 +4226,11 @@
 		    (en_bo.cnt_under_construction + en_bo.unoccupied_count) == 0) {
 
 			// forcing first upgrade
-			if (en_bo.total_count() == 0) {
+			if (en_bo.total_count() == 0 && (site.bo->cnt_built > 1 || site.bo->is(BuildingAttribute::kUpgradeSubstitutes))) {
 				doing_upgrade = true;
 			}
 
-			if (en_bo.total_count() == 1) {
+			if (en_bo.total_count() == 1 && (site.bo->cnt_built > 1 || site.bo->is(BuildingAttribute::kUpgradeSubstitutes))) {
 				if (en_bo.current_stats > 55) {
 					doing_upgrade = true;
 				}
@@ -4441,7 +4457,8 @@
 
 		// if we have more buildings then target
 		if ((site.bo->cnt_built - site.bo->unconnected_count) > site.bo->cnt_target &&
-		    site.unoccupied_till + 10 * 60 * 1000 < gametime && site.site->can_start_working()) {
+		    site.unoccupied_till + (std::abs(management_data.get_military_number_at(166)) / 5 + 1) * 60 *
+		    1000 < gametime && site.site->can_start_working()) {
 
 			if (site.site->get_statistics_percent() < 30 && get_stocklevel(*site.bo, gametime) > 100) {
 				site.bo->last_dismantle_time = game().get_gametime();
@@ -4456,7 +4473,9 @@
 
 		// a building can be dismanteld if it performs too bad, if it is not the last one
 		if (site.site->get_statistics_percent() <= 10 && site.bo->cnt_built > 1 &&
-		    site.unoccupied_till + 10 * 60 * 1000 < gametime && site.site->can_start_working()) {
+		    site.unoccupied_till + (std::abs(management_data.get_military_number_at(167)) / 5 + 1) * 60 *
+		    1000 < gametime && site.site->can_start_working() && get_stocklevel(*site.bo, gametime) >
+		    (std::abs(management_data.get_military_number_at(168)) / 5)) {
 
 			if (connected_to_wh) {
 				game().send_player_dismantle(*site.site);
@@ -4483,7 +4502,8 @@
 	    site.site->can_start_working() &&
 	    check_building_necessity(*site.bo, PerfEvaluation::kForDismantle, gametime) ==
 	       BuildingNecessity::kNotNeeded &&
-	    gametime - site.bo->last_dismantle_time > 5 * 60 * 1000 &&
+	    gametime - site.bo->last_dismantle_time >
+	        static_cast<uint32_t>((std::abs(management_data.get_military_number_at(169)) / 5 + 1) * 60 * 1000) &&
 
 	    site.bo->current_stats > site.site->get_statistics_percent() &&  // underperformer
 	    (game().get_gametime() - site.unoccupied_till) > 10 * 60 * 1000) {
@@ -4821,7 +4841,6 @@
 BuildingNecessity DefaultAI::check_building_necessity(BuildingObserver& bo,
                                                       const PerfEvaluation purpose,
                                                       const uint32_t gametime) {
-
 	bo.primary_priority = 0;
 
 	static BasicEconomyBuildingStatus site_needed_for_economy = BasicEconomyBuildingStatus::kNone;
@@ -4935,11 +4954,11 @@
 		if (!basic_economy_established) {
 			return BuildingNecessity::kForbidden;
 		}
-		const uint16_t min_roads_count = 50 + std::abs(management_data.get_military_number_at(33));
-		if (roads.size() < min_roads_count) {
+		const uint16_t min_roads_count = 40 + std::abs(management_data.get_military_number_at(33)) / 2;
+		if (roads.size() < static_cast<size_t>(min_roads_count * (1 + bo.total_count()))) {
 			return BuildingNecessity::kForbidden;
 		}
-		bo.primary_priority = (roads.size() - min_roads_count) *
+		bo.primary_priority += (roads.size() - min_roads_count * (1 + bo.total_count())) *
 		                      (2 + std::abs(management_data.get_military_number_at(143)) / 5);
 		return BuildingNecessity::kNeeded;
 	}
@@ -5054,7 +5073,7 @@
 		   get_building_observer(tribe_->get_building_descr(enhancement)->name().c_str());
 		if ((gametime > 30 * 60 * 1000 && en_bo.total_count() == 0) || gametime > 90 * 60 * 1000) {
 			// We fake this
-			bo.max_needed_preciousness = bo.max_preciousness;
+			bo.max_needed_preciousness = bo.max_preciousness * 2;
 			needs_second_for_upgrade = true;
 		}
 	}
@@ -5103,9 +5122,9 @@
 			inputs[8] = (expansion_type.get_expansion_type() == ExpansionMode::kEconomy) ? +3 : 0;
 			inputs[9] = (expansion_type.get_expansion_type() == ExpansionMode::kBoth) ? +1 : 0;
 			inputs[10] = (expansion_type.get_expansion_type() == ExpansionMode::kBoth) ? +1 : 0;
-			inputs[11] = (bo.last_building_built + 5 * 60 * 100 > gametime) ? +1 : 0;
-			inputs[12] = (bo.last_building_built + 10 * 60 * 100 > gametime) ? +1 : 0;
-			inputs[13] = (bo.last_building_built + 20 * 60 * 100 > gametime) ? +1 : 0;
+			inputs[11] = (bo.last_building_built + 5 * 60 * 100 < gametime) ? +1 : 0;
+			inputs[12] = (bo.last_building_built + 10 * 60 * 100 < gametime) ? +1 : 0;
+			inputs[13] = (bo.last_building_built + 20 * 60 * 100 < gametime) ? +1 : 0;
 			inputs[14] = (bo.total_count() >= bo.cnt_target) ? -1 : 0;
 			inputs[15] = (bo.total_count() >= bo.cnt_target) ? -2 : 0;
 			inputs[16] = (bo.total_count() < bo.cnt_target) ? -1 : 0;
@@ -5150,7 +5169,7 @@
 			if (bo.total_count() > 1 && (bo.cnt_under_construction + bo.unoccupied_count > 0)) {
 				return BuildingNecessity::kForbidden;
 			}
-			bo.cnt_target = 3;
+			bo.cnt_target = 2;
 			// adjusting/decreasing based on cnt_limit_by_aimode
 			bo.cnt_target = std::min(bo.cnt_target, bo.cnt_limit_by_aimode);
 
@@ -5173,8 +5192,7 @@
 		} else if (bo.is(BuildingAttribute::kRanger)) {
 
 			// making sure we have one completed lumberjack
-			if (bo.total_count() > 0 &&
-			    get_building_observer(BuildingAttribute::kLumberjack).cnt_built < 1) {
+			if (get_building_observer(BuildingAttribute::kLumberjack).cnt_built < 1) {
 				return BuildingNecessity::kForbidden;
 			}
 
@@ -5455,11 +5473,10 @@
 			inputs[14] = (bo.current_stats - 50) / 10;
 			inputs[15] = management_data.get_military_number_at(123) / 10;
 			inputs[16] = 0;
-			// TODO(GunChleoc): This is overwritten below due to a typo
-			// inputs[17] = (inputs_on_stock) ? 0 : -2;
+			inputs[17] = (inputs_on_stock) ? 0 : -2;
 			inputs[18] = (suppliers_exist) ? 0 : -3;
-			inputs[17] = (inputs_on_stock) ? 0 : -4;
-			// Nothing on inputs[19]
+			;
+			inputs[19] = (inputs_on_stock) ? 0 : -4;
 			inputs[20] =
 			   (mines_per_type[bo.mines].in_construction + mines_per_type[bo.mines].finished == 1) ?
 			      3 :
@@ -5516,7 +5533,7 @@
 			inputs[0] = (bo.total_count() <= 1) ?
 			               std::abs(management_data.get_military_number_at(110)) / 10 :
 			               0;
-			inputs[1] = -2 * bo.total_count();
+			inputs[1] = bo.total_count() * -3 / 2;
 			inputs[2] =
 			   (bo.total_count() == 0) ? std::abs(management_data.get_military_number_at(0)) / 10 : 0;
 			inputs[3] = (gametime >= 25 * 60 * 1000 && bo.inputs.empty()) ?
@@ -5529,11 +5546,11 @@
 			               management_data.get_military_number_at(3) / 10 :
 			               0;
 			inputs[6] = (needs_second_for_upgrade) ?
-			               std::abs(management_data.get_military_number_at(4)) / 10 :
+			               std::abs(management_data.get_military_number_at(4)) / 5 :
 			               0;
 			inputs[7] = (bo.cnt_under_construction + bo.unoccupied_count) * -1 *
 			            std::abs(management_data.get_military_number_at(9)) / 5;
-			inputs[8] = (!bo.outputs.empty() && bo.current_stats > 30 + 70 / bo.outputs.size()) ?
+			inputs[8] = (!bo.outputs.empty() && bo.current_stats > 25 + 70 / bo.outputs.size()) ?
 			               management_data.get_military_number_at(7) / 8 :
 			               0;
 			inputs[9] = (bo.is(BuildingAttribute::kBuildingMatProducer)) ?
@@ -5559,7 +5576,7 @@
 			                management_data.get_military_number_at(97) / 10 :
 			                0;
 			inputs[17] =
-			   (spots_ > kSpotsEnough) ? std::abs(management_data.get_military_number_at(74)) / 10 : 0;
+			   (spots_ > kSpotsEnough) ? std::abs(management_data.get_military_number_at(74)) / 8 : 0;
 			inputs[18] = management_data.get_military_number_at(98) / 10;
 			inputs[19] = (expansion_type.get_expansion_type() != ExpansionMode::kEconomy) ?
 			                -1 * std::abs(management_data.get_military_number_at(40)) / 10 :
@@ -5592,7 +5609,7 @@
 			inputs[32] = bo.max_needed_preciousness / 2;
 			inputs[33] = -(bo.cnt_under_construction + bo.unoccupied_count) * 4;
 			if (bo.cnt_built > 0 && !bo.outputs.empty() && !bo.inputs.empty()) {
-				inputs[34] += bo.current_stats / 10;
+				inputs[34] += bo.current_stats / std::abs(management_data.get_military_number_at(192)) * 10;
 			}
 			inputs[35] = (!bo.outputs.empty() && !bo.inputs.empty() &&
 			              bo.current_stats > 10 + 70 / bo.outputs.size()) ?
@@ -5703,6 +5720,14 @@
 				inputs[105] = -2;
 				inputs[106] = -2;
 			}
+			inputs[107] = std::abs(management_data.get_military_number_at(194)) - get_stocklevel(bo, gametime);
+			inputs[108] = std::abs(management_data.get_military_number_at(191)) - get_stocklevel(bo, gametime);
+			inputs[109] = (!bo.inputs.empty() && gametime > 50 * 60 * 1000 && bo.total_count() <= 1) ?
+			                 std::abs(management_data.get_military_number_at(163)) / 10 : 0;
+			inputs[110] = (bo.outputs.size() == 1) ?
+			                 (tribe_->get_ware_descr(bo.outputs.at(0))->default_target_quantity(tribe_->name()) -
+			                 get_stocklevel(bo, gametime)) * std::abs(management_data.get_military_number_at(165)) / 20 : 0;
+			inputs[111] = bo.current_stats / (bo.outputs.size() + 1);
 
 			int16_t tmp_score = 0;
 			for (uint8_t i = 0; i < kFNeuronBitSize; ++i) {
@@ -5779,7 +5804,9 @@
 			return BuildingNecessity::kNeeded;
 		} else if (bo.max_preciousness >= 10 && bo.total_count() == 2) {
 			return BuildingNecessity::kNeeded;
-		} else if (!bo.outputs.empty() && bo.current_stats > (10 + 70 / bo.outputs.size()) / 2) {
+		} else if (!bo.outputs.empty() && bo.current_stats > (10 + 60 / bo.outputs.size()) / 2) {
+			return BuildingNecessity::kNeeded;
+		} else if (bo.inputs.size() == 1 && calculate_stocklevel(static_cast<size_t>(bo.inputs.at(0))) > std::abs(management_data.get_military_number_at(171))) {
 			return BuildingNecessity::kNeeded;
 		} else {
 			return BuildingNecessity::kNotNeeded;

=== modified file 'src/ai/defaultai.h'
--- src/ai/defaultai.h	2019-02-23 11:00:49 +0000
+++ src/ai/defaultai.h	2019-05-16 17:52:43 +0000
@@ -212,7 +212,6 @@
 
 	uint32_t get_stocklevel_by_hint(size_t);
 	uint32_t get_stocklevel(Widelands::BuildingObserver&, uint32_t, WareWorker = WareWorker::kWare);
-	uint32_t calculate_stocklevel(Widelands::BuildingObserver&, WareWorker = WareWorker::kWare);
 	uint32_t calculate_stocklevel(Widelands::DescriptionIndex,
 	                              WareWorker = WareWorker::kWare);  // count all direct outputs_