Move towards unifying (your) creature manipulation with selection

src/Dodge/Creature/Impulse.hs

@@ -33,10 +33,10 @@ followImpulse cid w = \case
     Bark sid ->
         soundStart (CrMouth cid) cpos sid Nothing $
             w & clens %~ resetCrVocCoolDown w
-    Move p -> crup $ crMvBy p (w ^. cWorld . lWorld)
-    Walk p -> crup $ crWalk p (w ^. cWorld . lWorld)
-    MoveForward x -> crup $ crMvForward x (w ^. cWorld . lWorld)
-    MoveNoStride p -> crup $ crMvByNoStride p (w ^. cWorld . lWorld)
+    Move p -> crup $ crMvBy p w
+    Walk p -> crup $ crWalk p w
+    MoveForward x -> crup $ crMvForward x w
+    MoveNoStride p -> crup $ crMvByNoStride p w
     Turn a -> crup $ crDir +~ a
     TurnToward p a -> crup $ creatureTurnToward p a
     TurnTo p -> crup $ creatureTurnTo p
@@ -69,7 +69,7 @@ followImpulse cid w = \case
         i <- cr ^? crIntention . targetCr . _Just
         tcr <- w ^? cWorld . lWorld . creatures . ix i
         return $ followImpulse cid w (doCrImp f tcr)
-    MvForward -> crup $ crMvForward' (w ^. cWorld . lWorld)
+    MvForward -> crup $ crMvForward' w
     MvTurnToward p ->
         crup $
             mvTurnToward p (turnRad $ safeAngleVV (p -.- cpos) (unitVectorAtAngle cdir))
@@ -101,10 +101,10 @@ meleeMovement :: World -> Int -> Creature -> Creature
 meleeMovement w tid cr = case cr ^. crType of
     HoverCrit {} -> fromMaybe cr $ do
         txy <- w ^? cWorld . lWorld . creatures . ix tid . crPos . _xy
-        return $ crMvAbsolute (w ^. cWorld . lWorld) (5 *^ normalizeV (cr ^. crPos . _xy - txy)) cr
+        return $ crMvAbsolute w (5 *^ normalizeV (cr ^. crPos . _xy - txy)) cr
     ChaseCrit {} -> fromMaybe cr $ do
         txy <- w ^? cWorld . lWorld . creatures . ix tid . crPos . _xy
-        return $ crMvAbsolute (w ^. cWorld . lWorld) (5 *^ normalizeV (txy - cr ^. crPos . _xy)) cr
+        return $ crMvAbsolute w (5 *^ normalizeV (txy - cr ^. crPos . _xy)) cr
     _ -> cr
 
 setBeeRandomMovement :: Int -> World -> World