Cleanup inventory management, tweak dragging start

src/Dodge/Creature/YourControl.hs

@@ -39,8 +39,6 @@ handleHotkeys w
     | ispressed SDL.ScancodeLShift || ispressed SDL.ScancodeRShift
     , (hk : _) <- mapMaybe scancodeToHotkey . M.keys $ pkeys
     , Just (Sel 0 invid) <- w ^. hud .diSelection
---revise2    , Just invid <- w ^? hud . manObject . imSelectedItem
---revise1    , Just invid <- lw ^? creatures . ix 0 . crManipulation . manObject . imSelectedItem
     , Just itid <- lw ^? creatures . ix 0 . crInv . ix (NInt invid) =
         w & cWorld . lWorld %~ assignHotkey (NInt itid) hk
     | ispressed SDL.ScancodeLCtrl || ispressed SDL.ScancodeRCtrl
@@ -118,18 +116,15 @@ wasdWithAiming w cr
 wasdAim :: Input -> World -> Creature -> Creature
 wasdAim inp w cr
     | SDL.ButtonRight `M.member` _mouseButtons inp
-    , AtEase <- cr ^. crStance . posture =
-        setposture Aiming (-twoHandTwistAmount)
+    , AtEase <- cr ^. crStance . posture = setposture Aiming (-twistAmount)
     | SDL.ButtonRight `M.member` _mouseButtons inp = aimTurn w mousedir cr
-    | Aiming{} <- cr ^. crStance . posture = setposture AtEase twoHandTwistAmount
---    | otherwise = creatureTurnTowardDir (_crMvAim cr) 0.2 cr
+    | Aiming{} <- cr ^. crStance . posture = setposture AtEase twistAmount
     | otherwise = creatureTurnTowardDir (_crMvDir cr) 0.2 cr
   where
     setposture x r =
         cr
             & crStance . posture .~ x
             & doAimTwist (w ^? hud . manObject . hiAimStance) r
---revise1            & doAimTwist (cr ^? crManipulation . manObject . imAimStance) r
     mousedir = argV $ w ^. cWorld . lWorld . lAimPos - (cr ^. crPos . _xy)
 
 doAimTwist :: Maybe AimStance -> Float -> Creature -> Creature
@@ -137,8 +132,8 @@ doAimTwist as x
     | as == Just TwoHandTwist = crDir +~ x
     | otherwise = id
 
-twoHandTwistAmount :: Float
-twoHandTwistAmount = 1.6 * pi
+twistAmount :: Float
+twistAmount = 1.6 * pi
 
 wasdMovement :: World -> Input -> Camera -> Float -> Creature -> Creature
 wasdMovement w inp cam speed = theMovement -- . setMvAim
@@ -157,7 +152,6 @@ aimTurn lw a cr = creatureTurnTowardDir a (x * 0.2) cr
   where
     x = fromMaybe 1 $ do
         itRef <- lw ^? hud . manObject . hiRootSelectedItem
---revise1        itRef <- cr ^? crManipulation . manObject . imRootSelectedItem
         fmap itemBulkiness $ cr ^? crInv . ix itRef >>= \k -> lw ^?cWorld.lWorld. items . ix k . itType
 
 itemBulkiness :: ItemType -> Float
@@ -214,7 +208,5 @@ tryClickUse pkeys w = fromMaybe w $ do
     rtime <- pkeys ^? ix SDL.ButtonRight
     guard $ ltime <= rtime
     case w ^.hud.diSelection of
---revise2    case w ^?hud. manObject . imSelectedItem . unNInt of
---revise1    case w ^? cWorld . lWorld . creatures . ix 0 . crManipulation . manObject . imSelectedItem . unNInt of
         Just (Sel 0 invid) -> useItem invid ltime w
         _ -> interactWithCloseObj <$> getSelectedCloseObj w ?? w