Improve awareness

src/Dodge/Creature/Boid.hs

@@ -3,7 +3,6 @@ module Dodge.Creature.Boid
 import Dodge.Data
 import Dodge.Base
 import Dodge.Creature.State.Data
-import Dodge.Creature.ImpulseRat
 import Geometry
 import Geometry.ConvexPoly
 
@@ -254,3 +253,46 @@ flockPointTargetR f targFunc cr = reader $ \w -> case targFunc cr w of
         is = _swarm $ _crGroup cr
         crs = IM.restrictKeys (_creatures w) is
         p = f crTarg crs cr
+
+meleeHeadingMove
+    :: Float -- ^ max turn speed
+    -> Float -- ^ min turn speed
+    -> Float -- ^ turn speed cutoff angle
+    -> Float -- ^ move speed
+    -> Point2 -- ^ target point
+    -> Creature -- ^ start creature
+    -> Creature -- ^ target creature
+    -> [Impulse]
+meleeHeadingMove maxta minta tacutoff speed tp cr tcr
+    | dist tpos cpos < combinedRad + 5 
+            && abs (_crDir cr - argV (tpos -.- cpos)) < tacutoff
+            && _crMeleeCooldown cr == 0
+        = [Melee (_crID tcr), Turn pi]
+    | dist tpos cpos < combinedRad + 5 
+            && abs (_crDir cr - argV (tpos -.- cpos)) < tacutoff
+        = [ TurnToward tpos minta ]
+    | abs (_crDir cr - argV (tp -.- cpos)) < tacutoff
+                = [MoveForward speed , TurnToward tp maxta , RandomTurn maxta ]
+    | otherwise = [MoveForward speed , TurnToward tp minta, RandomTurn maxta ]
+  where
+    cpos = _crPos cr
+    tpos = _crPos tcr
+    combinedRad = _crRad cr + _crRad tcr
+    
+
+mvPointMeleeTarg :: Point2 -> Creature -> Creature -> [Impulse]
+mvPointMeleeTarg p cr crT
+    | dist tpos cpos < combinedRad + 5 
+            && abs (_crDir cr - argV (tpos -.- cpos)) < pi/4
+            && _crMeleeCooldown cr == 0
+        = [Melee (_crID crT)]
+    | dist tpos cpos < combinedRad + 5 
+            && abs (_crDir cr - argV (tpos -.- cpos)) < pi/4
+        = [ TurnToward tpos 0.05 ]
+    | abs (_crDir cr - argV (p -.- cpos)) < pi/4
+                = [MoveForward 3 , TurnToward p 0.2 , RandomTurn 0.2 ]
+    | otherwise = [MoveForward 3 , TurnToward p 0.05, RandomTurn 0.2 ]
+  where
+    cpos = _crPos cr
+    tpos = _crPos crT
+    combinedRad = _crRad cr + _crRad crT