Clean up isolated fish water test

Author: DevOpsOfChaos

libs/s25main/figures/nofFisher.cpp

@@ -17,27 +17,6 @@
 #include "random/Random.h"
 #include "world/GameWorld.h"
 
-namespace {
-
-bool IsUsableFishResource(const GameWorld& world, const MapPoint pt)
-{
-    if(!world.GetNode(pt).resources.has(ResourceType::Fish))
-        return false;
-
-    if(!world.IsWaterPoint(pt))
-        return false;
-
-    for(const MapPoint nb : world.GetNeighbours(pt))
-    {
-        if(world.IsWaterPoint(nb))
-            return true;
-    }
-
-    return false;
-}
-
-} // namespace
-
 nofFisher::nofFisher(const MapPoint pos, const unsigned char player, nobUsual* workplace)
     : nofFarmhand(Job::Fisher, pos, player, workplace), fishing_dir(Direction::West), successful(false)
 {}
@@ -117,7 +96,7 @@ void nofFisher::WorkStarted()
     for(Direction dir : helpers::enumRange(RANDOM_ENUM(Direction)))
     {
         const Resource neighbourRes = world->GetNode(world->GetNeighbour(pos, dir)).resources;
-        if(IsUsableFishResource(*world, world->GetNeighbour(pos, dir)))
+        if(neighbourRes.has(ResourceType::Fish))
         {
             fishing_dir = dir;
             fishAmount = neighbourRes.getAmount();
@@ -151,7 +130,7 @@ nofFarmhand::PointQuality nofFisher::GetPointQuality(const MapPoint pt, bool /*
     // irgendwo drumherum muss es Fisch geben
     for(const MapPoint nb : world->GetNeighbours(pt))
     {
-        if(IsUsableFishResource(*world, nb))
+        if(world->GetNode(nb).resources.has(ResourceType::Fish))
             return PointQuality::Class1;
     }
 

libs/s25main/figures/nofFisher.h

@@ -26,9 +26,6 @@ class nofFisher : public nofFarmhand
     /// Abgeleitete Klasse informieren, wenn fertig ist mit Arbeiten
     void WorkFinished() override;
 
-    /// Returns the quality of this working point or determines if the worker can work here at all
-    PointQuality GetPointQuality(MapPoint pt, bool isBeforeWork) const override;
-
 public:
     nofFisher(MapPoint pos, unsigned char player, nobUsual* workplace);
     nofFisher(SerializedGameData& sgd, unsigned obj_id);
@@ -38,4 +35,7 @@ class nofFisher : public nofFarmhand
     void Serialize(SerializedGameData& sgd) const override;
 
     GO_Type GetGOT() const final { return GO_Type::NofFisher; }
+
+    /// Returns the quality of this working point or determines if the worker can work here at all
+    PointQuality GetPointQuality(MapPoint pt, bool isBeforeWork) const override;
 };

libs/s25main/world/GameWorld.cpp

@@ -1331,6 +1331,7 @@ void GameWorld::SetupResources()
     }
     ConvertMineResourceTypes(ResourceType::Gold, target);
     PlaceAndFixWater();
+    RemoveUnusableFishResources();
 }
 
 /**
@@ -1375,6 +1376,21 @@ void GameWorld::PlaceAndFixWater()
     }
 }
 
+void GameWorld::RemoveUnusableFishResources()
+{
+    RTTR_FOREACH_PT(MapPoint, GetSize())
+    {
+        if(!GetNode(pt).resources.has(ResourceType::Fish))
+            continue;
+
+        if(!IsWaterPoint(pt)
+           || !helpers::contains_if(GetNeighbours(pt), [this](const MapPoint nb) { return IsWaterPoint(nb); }))
+        {
+            SetResource(pt, Resource(ResourceType::Nothing, 0));
+        }
+    }
+}
+
 /// Gründet vom Schiff aus eine neue Kolonie
 bool GameWorld::FoundColony(const HarborId harbor, const unsigned char player, const SeaId seaId)
 {

libs/s25main/world/GameWorld.h

@@ -153,6 +153,8 @@ class GameWorld : public GameWorldBase
 
     // Fills water depending on terrain and Addon setting
     void PlaceAndFixWater();
+    // Removes fish resources that cannot be reached by fisheries
+    void RemoveUnusableFishResources();
 
     /// Gründet vom Schiff aus eine neue Kolonie, gibt true zurück bei Erfolg
     bool FoundColony(HarborId harbor, unsigned char player, SeaId seaId);

tests/s25Main/integration/testBuilding.cpp

@@ -7,11 +7,10 @@
 #include "RttrForeachPt.h"
 #include "buildings/nobBaseMilitary.h"
 #include "buildings/nobUsual.h"
+#include "desktops/dskGameInterface.h"
 #include "factories/BuildingFactory.h"
 #include "figures/nofFarmhand.h"
 #include "figures/nofFisher.h"
-#include "gameTypes/Resource.h"
-#include "desktops/dskGameInterface.h"
 #include "helpers/containerUtils.h"
 #include "uiHelper/uiHelpers.hpp"
 #include "worldFixtures/CreateEmptyWorld.h"
@@ -21,6 +20,7 @@
 #include "nodeObjs/noEnvObject.h"
 #include "nodeObjs/noStaticObject.h"
 #include "gameTypes/GameTypesOutput.h"
+#include "gameTypes/Resource.h"
 #include <boost/test/unit_test.hpp>
 
 // LCOV_EXCL_START
@@ -482,7 +482,6 @@ BOOST_FIXTURE_TEST_CASE(RoadRemovesObjs, EmptyWorldFixture1P)
     }
 }
 
-
 BOOST_FIXTURE_TEST_CASE(FisherIgnoresIsolatedFishWater, EmptyWorldFixture1PBiggest)
 {
     const DescIdx<TerrainDesc> tWater = GetWaterTerrain(world.GetDescription());
@@ -493,7 +492,6 @@ BOOST_FIXTURE_TEST_CASE(FisherIgnoresIsolatedFishWater, EmptyWorldFixture1PBigge
     BOOST_TEST_REQUIRE(fishery);
 
     nofFisher fisher(fisheryPos, 0, fishery);
-    const nofFarmhand& farmhand = fisher;
 
     const MapPoint workPt = world.MakeMapPoint(fisheryPos + Position(4, 0));
     const MapPoint fishPt = world.GetNeighbour(workPt, Direction::East);
@@ -514,13 +512,16 @@ BOOST_FIXTURE_TEST_CASE(FisherIgnoresIsolatedFishWater, EmptyWorldFixture1PBigge
 
     makeWaterPoint(fishPt);
     world.SetResource(fishPt, Resource(ResourceType::Fish, 4));
+    world.SetupResources();
 
-    BOOST_TEST_REQUIRE(static_cast<unsigned>(farmhand.GetPointQuality(workPt))
-                       == static_cast<unsigned>(nofFarmhand::PointQuality::NotPossible));
+    BOOST_TEST_REQUIRE(!world.GetNode(fishPt).resources.has(ResourceType::Fish));
+    BOOST_TEST_REQUIRE((fisher.GetPointQuality(workPt, false) == nofFarmhand::PointQuality::NotPossible));
 
     makeWaterPoint(world.GetNeighbour(fishPt, Direction::East));
+    world.SetResource(fishPt, Resource(ResourceType::Fish, 4));
+    world.SetupResources();
 
-    BOOST_TEST_REQUIRE(static_cast<unsigned>(farmhand.GetPointQuality(workPt))
-                       == static_cast<unsigned>(nofFarmhand::PointQuality::Class1));
+    BOOST_TEST_REQUIRE(world.GetNode(fishPt).resources.has(ResourceType::Fish));
+    BOOST_TEST_REQUIRE((fisher.GetPointQuality(workPt, false) == nofFarmhand::PointQuality::Class1));
 }
 BOOST_AUTO_TEST_SUITE_END()