Refactor in lens direction

src/Dodge/Zoning/Creature.hs

@@ -5,10 +5,10 @@ import qualified Data.IntSet as IS
 import Data.Maybe
 import Dodge.Data.World
 import Dodge.Zoning.Base
+import Dodge.Zoning.Common
 import FoldableHelp
 import Geometry
 import qualified IntMapHelp as IM
-import Dodge.Zoning.Common
 
 crIXsNearPoint :: Point2 -> World -> IS.IntSet
 --crIXsNearPoint p w = zoneExtract (zoneOfPoint crZoneSize p) (w ^. cWorld . lWorld . crZoning)
@@ -18,13 +18,14 @@ crsNearPoint :: Point2 -> World -> [Creature]
 crsNearPoint p w = mapMaybe (\cid -> w ^? cWorld . lWorld . creatures . ix cid) . IS.toList $ crIXsNearPoint p w
 
 crsNearSeg :: Point2 -> Point2 -> World -> [Creature]
-crsNearSeg sp ep w = 
+crsNearSeg sp ep w =
     mapMaybe (\cid -> w ^? cWorld . lWorld . creatures . ix cid)
-    . IS.toList
-    $ crixsNearSeg sp ep w
+        . IS.toList
+        $ crixsNearSeg sp ep w
 
 crixsNearSeg :: Point2 -> Point2 -> World -> IS.IntSet
 crixsNearSeg = nearSeg crZoneSize _crZoning
+
 --crixsNearSeg sp ep w = zonesExtract (w ^. cWorld . lWorld . crZoning) (zoneOfSeg crZoneSize sp ep)
 
 crIXsNearCirc :: Point2 -> Float -> World -> IS.IntSet
@@ -49,8 +50,11 @@ minCrIXOn f is w = fst <$> IS.foldl' g Nothing is
     getpair cid = fmap h $ w ^? cWorld . lWorld . creatures . ix cid
     h cr = (cr, f cr)
 
-zoneCreature :: Creature -> IM.IntMap (IM.IntMap IS.IntSet) -> IM.IntMap (IM.IntMap IS.IntSet)
+zoneCreature ::
+    IM.IntMap (IM.IntMap IS.IntSet) ->
+    Creature ->
+    IM.IntMap (IM.IntMap IS.IntSet)
 {-# INLINE zoneCreature #-}
-zoneCreature cr im = foldl' f im (zoneOfCr cr)
+zoneCreature im cr = foldl' f im (zoneOfCr cr)
   where
-    f im' i2 = zoneMonoid i2 (IS.singleton $ _crID cr) im'
+    f im' i2 = zoneMonoid i2 (IS.singleton $! _crID cr) im'