Make makePathBetween respect obstacles

2022-07-03 13:12:25 +01:00
parent 757ffad1ad
commit b43ec42a2e
2 changed files with 9 additions and 3 deletions
@@ -35,7 +35,13 @@ makePathBetween :: Point2 -> Point2 -> World -> Maybe [Int]
 makePathBetween a b w = do -- join $ sp <$> a' <*> b' <*> return (_pathGraph w)
    na <- walkableNodeNear w a
    nb <- walkableNodeNear w b
-    sp na nb (second _peDist (_pathGraph w))
+    sp na nb (second _peDist (efilter (not . pathEdgeObstructed . (^. _3)) $ _pathGraph w))
+
+pathEdgeObstructed :: PathEdge -> Bool
+pathEdgeObstructed pe = DoorObstacle `Set.member` obs || BlockObstacle `Set.member` obs
+  where
+    obs = _peObstacles pe
+

 walkableNodeNear :: World -> Point2 -> Maybe Int
 {-# INLINE walkableNodeNear #-}