Work on crab

src/Dodge/Creature/ReaderUpdate.hs

@@ -123,8 +123,12 @@ flockACC w cr = fromMaybe cr $ do
 
 crabCritMv :: World -> Creature -> Creature
 crabCritMv w cr = case _apStrategy (_crActionPlan cr) of
+    _ | Just tid <- melee -> cr & crActionPlan . apAction 
+                .~ DoImpulses [Melee tid] `DoActionThen`
+                        DoReplicate 10 NoAction
+        & crType . meleeCooldownL .~ 20
     WarningCry -> cr
-    CloseToMelee tid | Just (p,a) <- aimi tid -> cr & crActionPlan . apAction .~ EvadeAim p a 10
+    CloseToMelee tid | aimi tid -> cr & crActionPlan . apAction .~ EvadeAim
         & crType . dodgeCooldown .~ dc
     CloseToMelee _ | ma <- cr ^? crActionPlan . apAction , notpath ma -> cr
     Wander | Just tid <- cr ^? crIntention . targetCr . _Just
@@ -139,23 +143,32 @@ crabCritMv w cr = case _apStrategy (_crActionPlan cr) of
                     & crIntention . mvToPoint .~ Nothing
         _ -> viewTarget w cr
   where
+    melee = do
+        tid <- cr ^? crIntention . targetCr . _Just
+        tcr <- w ^? cWorld . lWorld . creatures . ix tid
+        let cpos = cr ^. crPos . _xy
+            tpos = tcr ^. crPos . _xy
+        guard $ _meleeCooldownL (_crType cr) == 0
+            && Just (_crID tcr) == cr ^? crActionPlan . apStrategy . meleeTarget
+            && dist tpos cpos < crRad (cr ^. crType) + crRad (tcr ^. crType) + 5
+            && abs (_crDir cr - argV (tpos -.- cpos)) < pi / 4
+        return tid
     dc = fst $ randomR (15,25) (w ^. randGen)
     notpath = \case
         Just NoAction -> False
         Just PathTo {} -> False
         Just AimAt {} -> False
         _ -> True
-    aimi tid = do
+    aimi tid = fromMaybe False $ do
         tcr <- w ^? cWorld . lWorld . creatures . ix tid
         Aiming <- tcr ^? crStance . posture
         let txy = tcr ^. crPos . _xy
             cxy = cr ^. crPos . _xy
         0 <- cr ^? crType . dodgeCooldown
-        guard $ hasLOS cxy txy w
+        return $ hasLOS cxy txy w
             && abs (nearZeroAngle (tcr^.crDir - argV (cxy - txy))) < 0.3
             && isWalkable txy cxy w  
             && diffAngles (cr ^. crDir) (argV (txy - cxy)) < 0.1
-        return (txy, tcr ^. crDir)
 
 chaseCritMv :: World -> Creature -> Creature
 chaseCritMv w cr = case _apStrategy (_crActionPlan cr) of