Merge branch 'vcmi/master' into 'vcmi/develop'

AI/Nullkiller/Goals/AbstractGoal.h

@@ -75,7 +75,8 @@ namespace Goals
 		STAY_AT_TOWN_BEHAVIOR,
 		STAY_AT_TOWN,
 		EXPLORATION_BEHAVIOR,
-		EXPLORATION_POINT
+		EXPLORATION_POINT,
+		EXPLORE_NEIGHBOUR_TILE
 	};
 
 	class DLL_EXPORT TSubgoal : public std::shared_ptr<AbstractGoal>

AI/Nullkiller/Goals/CGoal.h

@@ -18,10 +18,11 @@ class AIGateway;
 
 namespace Goals
 {
-	template<typename T> class DLL_EXPORT CGoal : public AbstractGoal
+	template<typename T>
+	class DLL_EXPORT CGoal : public AbstractGoal
 	{
 	public:
-		CGoal<T>(EGoals goal = INVALID) : AbstractGoal(goal)
+		CGoal(EGoals goal = INVALID) : AbstractGoal(goal)
 		{
 			isAbstract = true;
 			value = 0;
@@ -32,7 +33,7 @@ namespace Goals
 			town = nullptr;
 		}
 
-		CGoal<T> * clone() const override
+		CGoal * clone() const override
 		{
 			return new T(static_cast<T const &>(*this)); //casting enforces template instantiation
 		}
@@ -64,15 +65,16 @@ namespace Goals
 		}
 	};
 
-	template<typename T> class DLL_EXPORT ElementarGoal : public CGoal<T>, public ITask
+	template<typename T>
+	class DLL_EXPORT ElementarGoal : public CGoal<T>, public ITask
 	{
 	public:
-		ElementarGoal<T>(EGoals goal = INVALID) : CGoal<T>(goal), ITask()
+		ElementarGoal(EGoals goal = INVALID) : CGoal<T>(goal), ITask()
 		{
 			AbstractGoal::isAbstract = false;
 		}
 
-		ElementarGoal<T>(const ElementarGoal<T> & other) : CGoal<T>(other), ITask(other)
+		ElementarGoal(const ElementarGoal<T> & other) : CGoal<T>(other), ITask(other)
 		{
 		}
 

AI/Nullkiller/Goals/ExploreNeighbourTile.cpp

@@ -0,0 +1,69 @@
+/*
+* ExploreNeighbourTile.cpp, part of VCMI engine
+*
+* Authors: listed in file AUTHORS in main folder
+*
+* License: GNU General Public License v2.0 or later
+* Full text of license available in license.txt file, in main folder
+*
+*/
+#include "StdInc.h"
+#include "ExploreNeighbourTile.h"
+#include "../AIGateway.h"
+#include "../AIUtility.h"
+#include "../Helpers/ExplorationHelper.h"
+
+
+namespace NKAI
+{
+
+using namespace Goals;
+
+bool ExploreNeighbourTile::operator==(const ExploreNeighbourTile & other) const
+{
+	return false;
+}
+
+void ExploreNeighbourTile::accept(AIGateway * ai)
+{
+	ExplorationHelper h(hero, ai->nullkiller.get());
+
+	for(int i = 0; i < tilesToExplore && hero->movementPointsRemaining() > 0; i++)
+	{
+		int3 pos = hero->visitablePos();
+		float value = 0;
+		int3 target = int3(-1);
+		foreach_neighbour(pos, [&](int3 tile)
+			{
+				auto pathInfo = ai->myCb->getPathsInfo(hero)->getPathInfo(tile);
+
+				if(pathInfo->turns > 0)
+					return;
+
+				if(pathInfo->accessible == EPathAccessibility::ACCESSIBLE)
+				{
+					float newValue = h.howManyTilesWillBeDiscovered(tile);
+
+					newValue /= std::min(0.1f, pathInfo->getCost());
+
+					if(newValue > value)
+					{
+						value = newValue;
+						target = tile;
+					}
+				}
+			});
+
+		if(!target.valid() || !ai->moveHeroToTile(target, hero))
+		{
+			return;
+		}
+	}
+}
+
+std::string ExploreNeighbourTile::toString() const
+{
+	return "Explore neighbour tiles by " + hero->getNameTranslated();
+}
+
+}

AI/Nullkiller/Goals/ExploreNeighbourTile.h

@@ -0,0 +1,45 @@
+/*
+* ExploreNeighbourTile.h, part of VCMI engine
+*
+* Authors: listed in file AUTHORS in main folder
+*
+* License: GNU General Public License v2.0 or later
+* Full text of license available in license.txt file, in main folder
+*
+*/
+#pragma once
+
+#include "CGoal.h"
+
+namespace NKAI
+{
+
+class AIGateway;
+class FuzzyHelper;
+
+namespace Goals
+{
+	class DLL_EXPORT ExploreNeighbourTile : public ElementarGoal<ExploreNeighbourTile>
+	{
+	private:
+		int tilesToExplore;
+
+	public:
+		ExploreNeighbourTile(const CGHeroInstance * hero,  int amount)
+			: ElementarGoal(Goals::EXPLORE_NEIGHBOUR_TILE)
+		{
+			tilesToExplore = amount;
+			sethero(hero);
+		}
+
+		bool operator==(const ExploreNeighbourTile & other) const override;
+
+		void accept(AIGateway * ai) override;
+		std::string toString() const override;
+
+	private:
+		//TSubgoal decomposeSingle() const override;
+	};
+}
+
+}