Refactor creature zoning

src/Dodge/Creature/ReaderUpdate.hs

@@ -14,12 +14,15 @@ module Dodge.Creature.ReaderUpdate
     , setMvPos
     , setViewPos
     ) where
+import Dodge.Zoning.Creature
+import FoldableHelp
 import Dodge.Data
 import Dodge.Creature.Volition
 import Dodge.Base
 import Dodge.Zone
 import Geometry
 
+import qualified Data.IntSet as IS
 import qualified IntMapHelp as IM
 import Control.Lens
 import Control.Applicative
@@ -76,7 +79,9 @@ flockACC w cr = case cr ^? crIntention . targetCr . _Just of
             isFarACC cr' = _crGroup cr' == _crGroup cr 
                 && _crID cr' /= _crID cr
                 && dist (_crPos cr') tpos > dist cpos tpos
-            macr = minStreamOn (dist cpos . _crPos) . S.filter isFarACC $ crsInsideCirc cpos 50 w
+            macr = safeMinimumOn (dist cpos . _crPos) 
+                . filter isFarACC 
+                $ crsNearCirc cpos 50 w
             in case macr of
                 Nothing  -> cr
                 Just acr ->