Refactor crPos to be a V3

src/Dodge/Creature/Action.hs

@@ -13,6 +13,7 @@ module Dodge.Creature.Action (
     youDropItem,
 ) where
 
+import Linear
 import NewInt
 import Dodge.Creature.MoveType
 import Dodge.Creature.Radius
@@ -49,13 +50,13 @@ performAimAt :: Creature -> World -> Int -> Point2 -> OutAction
 performAimAt cr w tcid p = ([TurnToward tpos aimSp], Just $ AimAt tcid tpos)
   where
     cdir = _crDir cr
-    cpos = _crPos cr
+    cpos = cr ^. crPos . _xy
     canSee' = canSee (_crID cr) tcid w
     aimSp = case crMvType cr ^? mvAimSpeed of
         Just f -> doFloatFloat f $ safeAngleVV (unitVectorAtAngle cdir) (tpos - cpos)
         Nothing -> error "creature without aiming type"
     tpos
-        | canSee' = w ^?! cWorld . lWorld . creatures . ix tcid . crPos
+        | canSee' = w ^?! cWorld . lWorld . creatures . ix tcid . crPos . _xy
         | otherwise = p
 
 performPathTo :: Creature -> World -> Point2 -> OutAction
@@ -73,7 +74,7 @@ performPathTo cr w p
             )
         _ -> ([], Nothing)
   where
-    cpos = _crPos cr
+    cpos = cr ^. crPos . _xy
     jit = _mvTurnJit $ crMvType cr
 
 performTurnToA :: Creature -> Point2 -> OutAction
@@ -81,7 +82,7 @@ performTurnToA cr p
     | angleVV cdirv dirv < 0.1 = ([], Nothing)
     | otherwise = ([MvTurnToward p, RandomTurn jit], Just (TurnToPoint p))
   where
-    cpos = _crPos cr
+    cpos = cr ^. crPos . _xy
     cdirv = unitVectorAtAngle (_crDir cr)
     dirv = p -.- cpos
     jit = _mvTurnJit $ crMvType cr
@@ -121,15 +122,15 @@ performAction cr w ac = case ac of
     DoActions acs ->
         let (imps, newAcs) = unzip $ map (performAction cr w) acs
          in (concat imps, Just . DoActions $ catMaybes newAcs)
-    StartSentinelPost -> ([AddGoal $ SentinelAt (_crPos cr) (_crDir cr)], Nothing)
+    StartSentinelPost -> ([AddGoal $ SentinelAt (cr ^. crPos . _xy) (_crDir cr)], Nothing)
     PathTo p -> performPathTo cr w p
     TurnToPoint p -> performTurnToA cr p
     LeadTarget p -> case cr ^? crIntention . targetCr . _Just of
-        Just tcr -> ([TurnTo (_crPos tcr +.+ rotateV (_crDir tcr) p)], Nothing)
+        Just tcr -> ([TurnTo (tcr ^. crPos . _xy +.+ rotateV (_crDir tcr) p)], Nothing)
         _ -> ([], Nothing)
     UseTarget f -> performAction cr w $ doMCrAc f $ cr ^? crIntention . targetCr . _Just
     UseSelf f -> performAction cr w $ doCrAc f cr
-    UseAheadPos f -> performAction cr w (doP2Ac f (_crPos cr +.+ 20 *.* unitVectorAtAngle (_crDir cr)))
+    UseAheadPos f -> performAction cr w (doP2Ac f (cr ^. crPos . _xy +.+ 20 *.* unitVectorAtAngle (_crDir cr)))
     UseMvTargetPos f -> performAction cr w $ doMP2Ac f $ _mvToPoint $ _crIntention cr
     ArbitraryAction f -> performAction cr w (doCrWdAc f cr w)
     DoImpulsesAlongside sideImp mainAc -> case performAction cr w mainAc of
@@ -175,10 +176,10 @@ dropItem :: Creature -> Int -> World -> World
 dropItem cr invid w' =
     doanyitemdropeffect
         . maybeshiftseldown
-        . copyItemToFloor (_crPos cr) itm -- . mayberemoveequip
+        . copyItemToFloor (cr ^. crPos . _xy) itm -- . mayberemoveequip
         . rmInvItem (_crID cr) (NInt invid) -- it is important 
             -- to do this before copying the item to the floor!
-        . soundStart (CrSound (_crID cr)) (_crPos cr) whiteNoiseFadeOutS Nothing
+        . soundStart (CrSound (_crID cr)) (cr ^. crPos . _xy) whiteNoiseFadeOutS Nothing
         $ w'
   where
     --doanyitemdropeffect = fromMaybe id $ do