Merge pull request #131 from NosCoreIO/FixException

Fix #130

Author: erwan-joly

src/NosCore.PathFinder/NosCore.PathFinder.csproj

@@ -12,7 +12,7 @@
 		<RepositoryUrl>https://github.com/NosCoreIO/NosCore.PathFinder.git</RepositoryUrl>
 		<PackageIconUrl></PackageIconUrl>
 		<PackageTags>nostale, noscore, nostale private server source, nostale emulator</PackageTags>
-		<Version>0.0.12</Version>
+		<Version>0.0.13</Version>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 		<Description>NosCore's PathFinder</Description>
 		<PackageLicenseExpression></PackageLicenseExpression>

src/NosCore.PathFinder/Pathfinder/GoalBasedPathfinder.cs

@@ -25,16 +25,27 @@ public GoalBasedPathfinder(IMapGrid mapGrid, IHeuristic heuristic)
             _heuristic = heuristic;
         }
 
+        public GoalBasedPathfinder(IMapGrid mapGrid, IHeuristic heuristic, BrushFire brushfire) : this(mapGrid, heuristic)
+        {
+            CacheBrushFire(brushfire, brushfire.Origin);
+        }
+
+
         private BrushFire CacheBrushFire(BrushFire brushFire, (short X, short Y) start)
         {
             Node? GetParent((short X, short Y) currentnode)
             {
-                var neighbor = _mapGrid.GetNeighbors(currentnode).Select(s => new Node((s.X, s.Y), brushFire.Grid[(s.X, s.Y)]?.Value ?? 0)).OrderBy(s => s.Value).FirstOrDefault();
+                var neighbor = _mapGrid.GetNeighbors(currentnode).Select(s => new Node((s.X, s.Y), brushFire.Grid.ContainsKey((s.X, s.Y)) ? brushFire.Grid[(s.X, s.Y)]?.Value ?? 0 : 0)).OrderBy(s => s.Value).FirstOrDefault();
                 if (!(neighbor is { } neighborCell))
                 {
                     return null;
                 }
 
+                if (!brushFire.Grid.ContainsKey((neighborCell.Position.X, neighborCell.Position.Y)))
+                {
+                    brushFire.Grid.Add((neighborCell.Position.X, neighborCell.Position.Y), new Node(neighborCell.Position, null));
+                }
+
                 brushFire.Grid[(neighborCell.Position.X, neighborCell.Position.Y)] ??= new Node(neighborCell.Position, null);
 
                 if (neighborCell.Value > 0 && brushFire.Grid[(neighborCell.Position.X, neighborCell.Position.Y)]!.Closed == false)
@@ -59,10 +70,10 @@ private BrushFire CacheBrushFire(BrushFire brushFire, (short X, short Y) start)
 
         public IEnumerable<(short X, short Y)> FindPath((short X, short Y) start, (short X, short Y) end)
         {
-            List<(short X, short Y)> list = new List<(short X, short Y)>();
+            List<(short X, short Y)> list = new();
             BrushFirecache.TryGetValue(end, out BrushFire? brushFireOut);
 
-            if (!_mapGrid.IsWalkable(start.X, start.Y) || !_mapGrid.IsWalkable(end.X, end.Y))
+            if (!_mapGrid.IsWalkable(start.X, start.Y) || !_mapGrid.IsWalkable(end.X, end.Y) || (brushFireOut != null && !brushFireOut.Value.Grid.ContainsKey((start.X, start.Y))))
             {
                 return list;
             }

test/NosCore.PathFinder.Tests/GoalBasedPathfinderTests.cs

@@ -83,5 +83,16 @@ public void Test_GoalBasedPathfinder()
 
             TestHelper.VerifyFile("goal-based-pathfinder.png", bitmap, listPixel, "Goal Based Pathfinder");
         }
+
+
+        [TestMethod]
+        public void Test_GoalBasedPathfinder_OutOfDistance_ShouldNotReturnPath()
+        {
+            (short X, short Y) characterPosition = (6, 10);
+            var brushFire = _map.LoadBrushFire(characterPosition, new OctileDistanceHeuristic(), 2);
+            var goalPathfinder = new GoalBasedPathfinder(_map, new OctileDistanceHeuristic(), brushFire);
+            var path = goalPathfinder.FindPath((2, 2), characterPosition);
+            Assert.AreEqual(0, path.Count());
+        }
     }
 }