Merge pull request #130 from spudde123/ladder-build

Updating pathing grid, pathfinding with different sized units, pathing grid fixes
eladyaniv01 · Jan 1, 2021 · b9918da · b9918da
2 parents 072ee6c + 605e2f7
commit b9918da
Show file tree

Hide file tree

Showing 10 changed files with 562 additions and 139 deletions.
diff --git a/MapAnalyzer/Debugger.py b/MapAnalyzer/Debugger.py
@@ -218,6 +218,7 @@ def plot_map(
     def plot_influenced_path(self, start: Union[Tuple[float, float], Point2],
                                goal: Union[Tuple[float, float], Point2],
                                weight_array: ndarray,
+                               large: bool = False,
                                smoothing: bool = False,
                                name: Optional[str] = None,
                                fontdict: dict = None) -> None:
@@ -233,6 +234,7 @@ def plot_influenced_path(self, start: Union[Tuple[float, float], Point2],
         arr = weight_array.copy()
         path = self.map_data.pathfind(start, goal,
                                         grid=arr,
+                                        large=large,
                                         smoothing=smoothing,
                                         sensitivity=1)
         ax: plt.Axes = plt.subplot(1, 1, 1)

diff --git a/MapAnalyzer/MapData.py b/MapAnalyzer/MapData.py
@@ -314,7 +314,7 @@ def pathfind_pyastar(self, start: Union[Tuple[float, float], Point2], goal: Unio
         Example:
             >>> my_grid = self.get_pyastar_grid()
             >>> # start / goal could be any tuple / Point2
-            >>> path = self.pathfind(start=start,goal=goal,grid=my_grid,allow_diagonal=True, sensitivity=3)
+            >>> path = self.pathfind_pyastar(start=start,goal=goal,grid=my_grid,allow_diagonal=True, sensitivity=3)
 
         See Also:
             * :meth:`.MapData.get_pyastar_grid`
@@ -325,7 +325,7 @@ def pathfind_pyastar(self, start: Union[Tuple[float, float], Point2], goal: Unio
                                             sensitivity=sensitivity)
 
     def pathfind(self, start: Union[Tuple[float, float], Point2], goal: Union[Tuple[float, float], Point2],
-                 grid: Optional[ndarray] = None, smoothing: bool = False,
+                 grid: Optional[ndarray] = None, large: bool = False, smoothing: bool = False,
                  sensitivity: int = 1) -> Optional[List[Point2]]:
         """
         :rtype: Union[List[:class:`sc2.position.Point2`], None]
@@ -345,21 +345,25 @@ def pathfind(self, start: Union[Tuple[float, float], Point2], goal: Union[Tuple[
 
         getting every  n-``th`` point works better in practice
 
+        `` large`` is a boolean that determines whether we are doing pathing with large unit sizes
+        like Thor and Ultralisk. When it's false the pathfinding is using unit size 1, so if
+        you want to a guarantee that a unit with size > 1 fits through the path then large should be True.
+
         ``smoothing`` tries to do a similar thing on the c side but to the maximum extent possible.
         it will skip all the waypoints it can if taking the straight line forward is better
         according to the influence grid
 
         Example:
             >>> my_grid = self.get_pyastar_grid()
             >>> # start / goal could be any tuple / Point2
-            >>> path = self.pathfind(start=start,goal=goal,grid=my_grid,allow_diagonal=True, sensitivity=3)
+            >>> path = self.pathfind(start=start,goal=goal,grid=my_grid, large=False, smoothing=False, sensitivity=3)
 
         See Also:
             * :meth:`.MapData.get_pyastar_grid`
             * :meth:`.MapData.find_lowest_cost_points`
 
         """
-        return self.pather.pathfind(start=start, goal=goal, grid=grid, smoothing=smoothing,
+        return self.pather.pathfind(start=start, goal=goal, grid=grid, large=large, smoothing=smoothing,
                                     sensitivity=sensitivity)
 
     def add_cost(self, position: Tuple[float, float], radius: float, grid: ndarray, weight: float = 100, safe: bool = True,
@@ -909,24 +913,26 @@ def plot_influenced_path_pyastar(self,
                                            allow_diagonal=allow_diagonal)
 
     def plot_influenced_path(self,
-                               start: Union[Tuple[float, float], Point2],
-                               goal: Union[Tuple[float, float], Point2],
-                               weight_array: ndarray,
-                               smoothing: bool = False,
-                               name: Optional[str] = None,
-                               fontdict: dict = None) -> None:
+                             start: Union[Tuple[float, float], Point2],
+                             goal: Union[Tuple[float, float], Point2],
+                             weight_array: ndarray,
+                             large: bool = False,
+                             smoothing: bool = False,
+                             name: Optional[str] = None,
+                             fontdict: dict = None) -> None:
         """
 
         A useful debug utility method for experimenting with the :mod:`.Pather` module
 
         """
 
         self.debugger.plot_influenced_path(start=start,
-                                             goal=goal,
-                                             weight_array=weight_array,
-                                             smoothing=smoothing,
-                                             name=name,
-                                             fontdict=fontdict)
+                                           goal=goal,
+                                           weight_array=weight_array,
+                                           large=large,
+                                           smoothing=smoothing,
+                                           name=name,
+                                           fontdict=fontdict)
 
     def _plot_regions(self, fontdict: Dict[str, Union[str, int]]) -> None:
         return self.debugger.plot_regions(fontdict=fontdict)