Keep foresters off potential farm fields

Author: DevOpsOfChaos

libs/s25main/figures/nofForester.cpp

@@ -8,13 +8,53 @@
 #include "GamePlayer.h"
 #include "Loader.h"
 #include "SoundManager.h"
+#include "buildings/noBaseBuilding.h"
 #include "network/GameClient.h"
 #include "ogl/glArchivItem_Bitmap_Player.h"
 #include "random/Random.h"
 #include "world/GameWorld.h"
 #include "nodeObjs/noTree.h"
 #include <boost/container/static_vector.hpp>
 
+namespace {
+bool IsPotentialNewFieldForOwnFarm(GameWorld& world, const MapPoint pt, const unsigned char player)
+{
+    constexpr unsigned FARM_FIELD_RADIUS = 2;
+
+    for(const auto dir : helpers::EnumRange<Direction>{})
+    {
+        if(world.GetPointRoad(pt, dir) != PointRoad::None)
+            return false;
+    }
+
+    if(!world.IsOfTerrain(pt, [](const auto& desc) { return desc.IsVital(); }))
+        return false;
+
+    const NodalObjectType noType = world.GetNO(pt)->GetType();
+    if(noType != NodalObjectType::Environment && noType != NodalObjectType::Nothing)
+        return false;
+
+    for(const MapPoint nb : world.GetNeighbours(pt))
+    {
+        const NodalObjectType nbType = world.GetNO(nb)->GetType();
+        if(nbType == NodalObjectType::Grainfield || nbType == NodalObjectType::Grapefield
+           || nbType == NodalObjectType::Building || nbType == NodalObjectType::Buildingsite)
+            return false;
+    }
+
+    return world.CheckPointsInRadius(
+      pt, FARM_FIELD_RADIUS,
+      [&world, player](const MapPoint farmPt, unsigned) {
+          if(world.GetNO(farmPt)->GetType() != NodalObjectType::Building)
+              return false;
+
+          const auto* building = world.GetSpecObj<noBaseBuilding>(farmPt);
+          return building && building->GetPlayer() == player && building->GetBuildingType() == BuildingType::Farm;
+      },
+      false);
+}
+} // namespace
+
 nofForester::nofForester(const MapPoint pos, const unsigned char player, nobUsual* workplace)
     : nofFarmhand(Job::Forester, pos, player, workplace)
 {}
@@ -110,6 +150,10 @@ nofFarmhand::PointQuality nofForester::GetPointQuality(const MapPoint pt, bool /
             return PointQuality::NotPossible;
     }
 
+    // Avoid occupying spots that an own farm could use for a new grain field.
+    if(IsPotentialNewFieldForOwnFarm(*world, pt, player))
+        return PointQuality::NotPossible;
+
     // Terrain untersuchen
     if(world->IsOfTerrain(pt, [](const auto& desc) { return desc.IsVital(); }))
         return PointQuality::Class1;

tests/s25Main/integration/testFarmer.cpp

@@ -6,6 +6,7 @@
 #include "buildings/nobUsual.h"
 #include "factories/BuildingFactory.h"
 #include "figures/nofFarmhand.h"
+#include "figures/nofForester.h"
 #include "worldFixtures/CreateEmptyWorld.h"
 #include "worldFixtures/WorldFixture.h"
 #include "worldFixtures/initGameRNG.hpp"
@@ -33,6 +34,28 @@ struct FarmerFixture : public WorldFixture<CreateEmptyWorld, 1>
     }
 };
 
+BOOST_FIXTURE_TEST_CASE(ForesterAvoidsPotentialFarmFieldSpots, FarmerFixture)
+{
+    initGameRNG();
+
+    const auto isPointAvailable = [](const nofFarmhand* worker, const MapPoint pt) {
+        return worker->GetPointQuality(pt) != nofFarmhand::PointQuality::NotPossible;
+    };
+
+    const MapPoint fieldPt = world.GetNeighbour2(farmPt, 0);
+    BOOST_TEST_REQUIRE(isPointAvailable(farmer, fieldPt));
+
+    const MapPoint foresterPt = world.MakeMapPoint(world.GetPlayer(0).GetHQPos() - Position(5, 0));
+    auto* foresterBuilding = dynamic_cast<nobUsual*>(
+      BuildingFactory::CreateBuilding(world, BuildingType::Forester, foresterPt, 0, Nation::Romans));
+    BOOST_TEST_REQUIRE(foresterBuilding);
+
+    nofForester foresterWorker(world.GetNeighbour(foresterPt, Direction::SouthEast), 0, foresterBuilding);
+    const nofFarmhand* forester = &foresterWorker;
+
+    BOOST_TEST_REQUIRE(!isPointAvailable(forester, fieldPt));
+}
+
 BOOST_FIXTURE_TEST_CASE(FarmFieldPlanting, FarmerFixture)
 {
     initGameRNG();