Correct walkableNodeNear

src/Dodge/Path.hs

@@ -6,6 +6,7 @@ module Dodge.Path
     , removePathsCrossing
     , pairsToGraph
     , getNodePos
+    , walkableNodeNear
     ) where
 import Dodge.Data
 import Dodge.Base.Collide
@@ -31,16 +32,20 @@ getNodePos i w = _pathGraph w `lab` i
 
 makePathBetween :: Point2 -> Point2 -> World -> Maybe [Int]
 makePathBetween a b w = do -- join $ sp <$> a' <*> b' <*> return (_pathGraph w)
-    na <- walkableNodeNear a
-    nb <- walkableNodeNear b
+    na <- walkableNodeNear w a
+    nb <- walkableNodeNear w b
     sp na nb (second _peDist (_pathGraph w))
   where
     --nodesNear p = concat $ lookLookups (zoneNearPointIP p) (_pathPoints w)
-    nodesNear p = runIdentity . S.toList_ $ nearPoint _pnZoning p w
-    walkableNodeNear p = fmap fst . find (flip (isWalkable p) w . snd) $ nodesNear p
+--    nodesNear p = runIdentity . S.toList_ $ nearPoint _pnZoning p w
+--    walkableNodeNear p = fmap fst . find (flip (isWalkable p) w . snd) $ nodesNear p
 
---walkableNodeNear :: Point2 -> World -> Maybe Point2
---walkableNodeNear p w = insideCirc
+walkableNodeNear :: World -> Point2 -> Maybe Int
+{-# INLINE walkableNodeNear #-}
+walkableNodeNear w p = fmap fst . find (flip (isWalkable p) w . snd) $ nodesNear
+  where
+    --nodesNear = runIdentity . S.toList_ $ nearPoint _pnZoning p w
+    nodesNear = runIdentity . S.toList_ $ aroundPoint _pnZoning p w
 
 makePathBetweenPs :: Point2 -> Point2 -> World -> Maybe [Point2]
 makePathBetweenPs a b w = mapMaybe (lab $ _pathGraph w) <$> makePathBetween a b w

src/Dodge/Render/ShapePicture.hs

@@ -122,8 +122,8 @@ drawCreatureDisplayTexts w = foldMap (creatureDisplayText w) (_creatures w)
 drawPathBetween :: World -> Picture
 drawPathBetween w = setLayer DebugLayer
     $  color yellow (foldMap (arrowPath . mapMaybe nodepos) nodelist)
-    <> foldMap (color green . arrow sp) (nodepos =<< nodelist ^? _Just . ix 0)
-    <> foldMap (color cyan . flip arrow ep) (nodepos =<< lastOf traverse =<< nodelist ^? _Just)
+    <> foldMap (color green . arrow sp) (nodepos =<< walkableNodeNear w sp)
+    <> foldMap (color cyan . flip arrow ep) (nodepos =<< walkableNodeNear w ep)
   where
     nodepos = (`getNodePos` w)
     nodelist = makePathBetween sp ep w