Add AimStance to creature posture when Aiming

src/Dodge/Creature/YourControl.hs

@@ -136,25 +136,31 @@ wasdAim inp w cr
         setAimPosture (w ^. cWorld . lWorld . items) cr
     | SDL.ButtonRight `M.member` _mouseButtons inp =
         aimTurn (w ^. cWorld . lWorld) mousedir cr
-    | Aiming <- cr ^. crStance . posture = removeAimPosture m cr
+    | Aiming {} <- cr ^. crStance . posture = removeAimPosture cr
     | otherwise = creatureTurnTowardDir (_crMvAim cr) 0.2 cr
   where
-    m = w ^. cWorld . lWorld . items
     mousedir = argV $ w ^. cWorld . lWorld . lAimPos - (cr ^. crPos)
 
 setAimPosture :: IM.IntMap Item -> Creature -> Creature
-setAimPosture m = (crStance . posture .~ Aiming) . doAimTwist m (- twoHandTwistAmount)
+setAimPosture m cr = fromMaybe cr $ do
+    invid <- cr ^? crManipulation . manObject . imRootSelectedItem
+    itid <- cr ^? crInv . ix invid
+    as <- fmap itemBaseStance $ m ^? ix itid
+    return $ cr
+        & crStance . posture .~ Aiming as
+        & doAimTwist as (- twoHandTwistAmount)
 
-doAimTwist :: IM.IntMap Item -> Float -> Creature -> Creature
-doAimTwist m x cr = fromMaybe cr $ do
-    itRef <- cr ^? crManipulation . manObject . imRootSelectedItem
-    itid <- cr ^? crInv . ix itRef
-    astance <- fmap itemBaseStance $ m ^? ix itid
-    guard $ astance == TwoHandOver || astance == TwoHandUnder
-    return $ cr & crDir +~ x
+doAimTwist :: AimStance -> Float -> Creature -> Creature
+doAimTwist as x
+    | as == TwoHandOver || as == TwoHandUnder = crDir +~ x
+    | otherwise = id
 
-removeAimPosture :: IM.IntMap Item -> Creature -> Creature
-removeAimPosture m = (crStance . posture .~ AtEase) . doAimTwist m twoHandTwistAmount
+removeAimPosture :: Creature -> Creature
+removeAimPosture cr = fromMaybe cr $ do
+    as <- cr ^? crStance . posture . aimStance
+    return $ cr
+        & crStance . posture .~ AtEase
+        & doAimTwist as twoHandTwistAmount
 
 twoHandTwistAmount :: Float
 twoHandTwistAmount = 1.6 * pi