Refactor, try to limit dependencies

src/Dodge/Creature/Test.hs

@@ -1,42 +1,39 @@
 {- |
 Module testing for properties of creatures, whether they are reloading, etc.
 Each function takes a creature, and possibly other parameters, and returns a bool.
-Note that if there is a world parameter, 
-the creature NEED NOT be the same as the creature with that id in the world, 
+Note that if there is a world parameter,
+the creature NEED NOT be the same as the creature with that id in the world,
 in fact a creature with that id need not exist.
 -}
-module Dodge.Creature.Test
-    ( crIsAiming
-    , crIsReloading
-    , crIsArmouredFrom
-    , oneH
-    , twists
-    , twoFlat
-    , crWeaponReady
-    , crInAimStance
-    , crNearPoint
-    , isAnimate
-    , crCanShoot
-    , crHasTargetLOS
-    , crAwayFromPost
-    , crHasTarget
-    , crStratConMatches
-    , crSafeDistFromTarg
-    )
-    where
-import Dodge.Data
-import Dodge.Base.Collide
-import Geometry
---import SameConstr
+module Dodge.Creature.Test (
+    crIsAiming,
+    crIsReloading,
+    crIsArmouredFrom,
+    oneH,
+    twists,
+    twoFlat,
+    crWeaponReady,
+    crInAimStance,
+    crNearPoint,
+    isAnimate,
+    crCanShoot,
+    crHasTargetLOS,
+    crAwayFromPost,
+    crHasTarget,
+    crStratConMatches,
+    crSafeDistFromTarg,
+) where
 
+import Control.Lens
 import Data.List (find)
 import Data.Maybe
---import qualified IntMapHelp as IM
-import Control.Lens
+import Dodge.Base.Collide
+import Dodge.Data.World
+import Geometry
 
 crIsReloading :: Creature -> Bool
 crIsReloading cr = case cr ^? crInvSel . iselAction of
-    Just ReloadAction {} -> True
+    Just ReloadAction{} -> True
     _ -> False
 
 crWeaponReady :: Creature -> Bool
@@ -45,7 +42,7 @@ crWeaponReady cr = fromMaybe False $ do
     return (_laLoaded ic > 0 && _laPrimed ic)
 
 crCanSeeCr :: Creature -> (World, Creature) -> Bool
-crCanSeeCr tcr (w,cr) = hasLOS (_crPos cr) (_crPos tcr) w
+crCanSeeCr tcr (w, cr) = hasLOS (_crPos cr) (_crPos tcr) w
 
 crIsAiming :: Creature -> Bool
 crIsAiming cr = _posture (_crStance cr) == Aiming
@@ -55,7 +52,7 @@ crHasTarget cr = isJust $ cr ^? crIntention . targetCr . _Just
 
 crHasTargetLOS :: World -> Creature -> Bool
 crHasTargetLOS w cr = case cr ^? crIntention . targetCr . _Just of
-    Just i -> crCanSeeCr i (w,cr) 
+    Just i -> crCanSeeCr i (w, cr)
     Nothing -> False
 
 crSafeDistFromTarg :: Float -> Creature -> Bool
@@ -65,7 +62,8 @@ crSafeDistFromTarg d cr = case cr ^? crIntention . targetCr . _Just of
 
 crStratConMatches :: Strategy -> Creature -> Bool
 crStratConMatches strat cr = strat == _apStrategy (_crActionPlan cr)
-    -- this equality check might be slow...
+
+-- this equality check might be slow...
 
 crAwayFromPost :: Creature -> Bool
 crAwayFromPost cr = case find sentinelGoal . _apGoal $ _crActionPlan cr of
@@ -79,8 +77,9 @@ crCanShoot :: Creature -> Bool
 crCanShoot cr = crIsAiming cr && crWeaponReady cr
 
 crInAimStance :: AimStance -> Creature -> Bool
-crInAimStance as cr = crIsAiming cr
-    && cr ^? crInv . ix (crSel cr) . itUse . useAim . aimStance == Just as
+crInAimStance as cr =
+    crIsAiming cr
+        && cr ^? crInv . ix (crSel cr) . itUse . heldAim . aimStance == Just as
 
 oneH :: Creature -> Bool
 oneH = crInAimStance OneHand
@@ -101,11 +100,13 @@ hasFrontArmour :: Point2 -> Creature -> Bool
 hasFrontArmour p cr = fromMaybe False $ do
     invid <- cr ^? crEquipment . ix OnChest
     ittype <- cr ^? crInv . ix invid . itType . iyBase
-    return $ EQUIP FRONTARMOUR == ittype
-        && p /= _crOldPos cr 
-        && angleVV (unitVectorAtAngle (_crDir cr + frontarmdirection)) (p -.- _crOldPos cr) < pi/2
--- even though angleVV can generate NaN, the comparison seems to deal with it
+    return $
+        EQUIP FRONTARMOUR == ittype
+            && p /= _crOldPos cr
+            && angleVV (unitVectorAtAngle (_crDir cr + frontarmdirection)) (p -.- _crOldPos cr) < pi / 2
   where
+    -- even though angleVV can generate NaN, the comparison seems to deal with it
+
     frontarmdirection
         | crInAimStance OneHand cr = 0.5
         | crInAimStance TwoHandTwist cr = negate 1
@@ -124,4 +125,4 @@ isAnimate :: Creature -> Bool
 {-# INLINE isAnimate #-}
 isAnimate cr = case _crActionPlan cr of
     Inanimate -> False
-    _   -> True
+    _ -> True