Fix bugs in zoning

src/Dodge/WorldEvent/ThingsHit.hs

@@ -10,6 +10,7 @@ module Dodge.WorldEvent.ThingsHit (
     thingsHitExceptCr,
     crsHitRadial,
     wlsHitRadial,
+    crHit,
 ) where
 
 import Control.Lens
@@ -38,16 +39,6 @@ thingsHit sp ep w =
         (map (second Left) (crsHit sp ep w))
         (map (second Right) (wlsHit sp ep w))
 
---{- List those objects that appear on a line.  -}
---thingsHit
---    :: Point2    -- ^ Line start point
---    -> Point2    -- ^ Line end point
---    -> World
---    -> StreamOf (Point2, Either Creature Wall)
---thingsHit sp ep w = void $ S.mergeOn (dist sp . fst)
---    (S.map (second Left)  (S.each $ crsHit sp ep w))
---    (S.map (second Right) (wlsHit sp ep w))
-
 crsHit :: Point2 -> Point2 -> World -> [(Point2, Creature)]
 crsHit sp ep w
     | sp == ep = mempty
@@ -56,7 +47,7 @@ crsHit sp ep w
             . overlap1SegCrs sp ep
             . mapMaybe (\cid -> w ^? cWorld . creatures . ix cid)
             . IS.toList
-            . crsNearSeg sp ep
+            . crixsNearSeg sp ep
             $ w
 
 thingHitFilt ::
@@ -71,16 +62,12 @@ thingHitFilt fcr fwl sp ep = List.find (f . snd) . thingsHit sp ep
     f (Left cr) = fcr cr
     f (Right wl) = fwl wl
 
---thingHitFilt :: (Creature -> Bool) -> (Wall -> Bool)
---    -> Point2 -> Point2 -> World -> Maybe (Point2, Either Creature Wall)
---thingHitFilt fcr fwl sp ep = runIdentity . S.head_ . S.filter (f . snd) . thingsHit sp ep
---  where
---    f (Left cr) = fcr cr
---    f (Right wl) = fwl wl
-
 thingHit :: Point2 -> Point2 -> World -> Maybe (Point2, Either Creature Wall)
 thingHit sp ep = listToMaybe . thingsHit sp ep
 
+crHit :: Point2 -> Point2 -> World -> Maybe (Point2,Creature)
+crHit sp ep = listToMaybe . sortOn (dist sp . fst) . crsHit sp ep
+
 {- List objects that appear on a line.
 Can filter out a creature.  -}
 thingsHitExceptCr ::
@@ -98,20 +85,6 @@ thingsHitExceptCr (Just cid) sp ep = filter crNotCid . thingsHit sp ep
     crNotCid (_, Left cr) = _crID cr /= cid
     crNotCid _ = True
 
---{- List objects that appear on a line.
---Can filter out a creature.  -}
---thingsHitExceptCr
---    :: Maybe Int -- ^ A possible creature ID
---    -> Point2    -- ^ Line start point
---    -> Point2    -- ^ Line end point
---    -> World
---    -> StreamOf (Point2, Either Creature Wall)
---thingsHitExceptCr Nothing    sp ep = thingsHit sp ep
---thingsHitExceptCr (Just cid) sp ep = S.filter crNotCid . thingsHit sp ep
---  where
---    crNotCid (_,Left cr) = _crID cr /= cid
---    crNotCid _ = True
-
 wlsHit :: Point2 -> Point2 -> World -> [(Point2, Wall)]
 wlsHit sp ep
     | sp == ep = const mempty
@@ -120,13 +93,6 @@ wlsHit sp ep
             . overlapSegWalls sp ep
             . wlsNearSeg sp ep
 
---wlsHit :: Point2 -> Point2 -> World -> StreamOf (Point2, Wall)
---wlsHit sp ep
---    | sp == ep  = const mempty
---    | otherwise = sortStreamOn (dist sp . fst)
---        . overlapSegWalls sp ep
---        . wlsNearSeg sp ep
-
 wlsHitRadial :: Point2 -> Float -> World -> [(Point2, Wall)]
 wlsHitRadial p r = mapMaybe f . wlsNearCirc p r
   where
@@ -134,13 +100,6 @@ wlsHitRadial p r = mapMaybe f . wlsNearCirc p r
       where
         v = normalizeV $ vNormal $ uncurry (-.-) $ _wlLine wl
 
---wlsHitRadial :: Point2 -> Float -> World -> StreamOf (Point2, Wall)
---wlsHitRadial p r = S.mapMaybe f . wlsInsideCirc p r
---  where
---    f wl = uncurry (intersectSegSeg p (p -.- r *.* v)) (_wlLine wl) <&> (,wl)
---      where
---        v = normalizeV $ vNormal $ uncurry (-.-) $ _wlLine wl
-
 crsHitRadial :: Point2 -> Float -> World -> [(Point2, Creature)]
 crsHitRadial p r = mapMaybe f . crsNearCirc p r
   where