Remove Reader monad from multiple creature ais

2021-12-11 19:32:20 +00:00
parent 37b81c2967
commit c847955b7c
7 changed files with 78 additions and 131 deletions
@@ -215,6 +215,18 @@ flockToPointUsing pf mvf cr = reader $ \w -> case _targetCr $ _crIntention cr of
      where
        cenp = _crGroupCenter $ _creatureGroups w IM.! _crGroupID (_crGroup cr)
        ptarg = pf tcr cenp cr
+flockToPointUsing'
+    :: (Creature -> Point2 -> Creature -> Point2)
+    -> (Point2 -> Creature -> Creature -> [Impulse])
+    -> World
+    -> Creature
+    -> Creature
+flockToPointUsing' pf mvf w cr = case _targetCr $ _crIntention cr of
+    Nothing -> cr
+    Just tcr -> cr & crActionPlan . crImpulse .~ mvf ptarg cr tcr
+      where
+        cenp = _crGroupCenter $ _creatureGroups w IM.! _crGroupID (_crGroup cr)
+        ptarg = pf tcr cenp cr

 flockFunc
    :: (Creature -> Point2 -> Creature -> Point2)