Continue reload refactor

src/Dodge/Creature/YourControl.hs

@@ -4,6 +4,7 @@ module Dodge.Creature.YourControl
 import Dodge.Data
 import Dodge.Base.Coordinate
 import Dodge.Creature.Impulse.Movement
+import Dodge.Creature.Test
 import Dodge.Update.UsingInput
 import Dodge.InputFocus
 --import Dodge.Config.KeyConfig
@@ -33,7 +34,7 @@ wasdWithAiming
     -> Creature
 wasdWithAiming w speed cr
     | isAiming  = addAnyTwist $ set crDir mouseDir $ theMovement cr
-    | isReloading && SDL.ButtonRight `S.member` _mouseButtons w
+    | crIsReloading cr && SDL.ButtonRight `S.member` _mouseButtons w
                 = addAnyTwist $ set crDir (mouseDir + anytwist) $ theMovement cr
     | otherwise = theMovement $ theTurn $ removeTwist cr
   where 
@@ -41,7 +42,7 @@ wasdWithAiming w speed cr
     removeTwist cr' = cr' 
         & crDir   +~ _crTwist cr' 
         & crTwist .~ 0
-    anytwist = case cr ^? crInv . ix (_crInvSel cr) . itUse . useAim . aimStance of
+    anytwist = case cr ^? crInv . ix (crSel cr) . itUse . useAim . aimStance of
         Just TwoHandTwist -> twistamount * pi
         _ -> 0
     addAnyTwist = crTwist .~ anytwist
@@ -53,8 +54,7 @@ wasdWithAiming w speed cr
     dir = _cameraRot w + argV movDir
     movAbs   = rotateV (_cameraRot w) $ normalizeV movDir
     isAiming = _posture (_crStance cr) == Aiming
-    isReloading = _posture (_crStance cr) == Reloading
-    mouseDir = case cr ^? crInv . ix (_crInvSel cr) . itScope . scopePos of
+    mouseDir = case cr ^? crInv . ix (crSel cr) . itScope . scopePos of
         Just _ -> argV $ mouseWorldPos w -.- _crPos cr
         _ -> argV (_mousePos w) + _cameraRot w
 
@@ -72,9 +72,7 @@ wasdDir = foldr ((+.+) . wasdM) (V2 0 0) . _keys
 {- | Set posture according to mouse presses. -}
 mouseActionsCr :: S.Set SDL.MouseButton -> Creature -> Creature
 mouseActionsCr pkeys cr
-    | _posture (_crStance cr) == Reloading = cr
     | rbPressed = cr & crStance . posture .~ Aiming
     | otherwise = cr & crStance . posture .~ AtEase
   where 
---    reloading = isJust $ cr ^? crInv . ix (_crInvSel cr) . itConsumption . laReloadState . _Just'
     rbPressed = SDL.ButtonRight `S.member` pkeys