Cleanup, hlints

src/Dodge/Creature/Impulse/UseItem.hs

@@ -19,7 +19,7 @@ useItem :: Int -> PressType -> World -> Maybe World
 useItem invid pt w = fmap (worldEventFlags . at InventoryChange ?~ ()) $ do
     cr <- w ^? cWorld . lWorld . creatures . ix 0
     itmloc <- invIndents (_crInv cr) ^? ix invid . _2
-    useItemLoc cr (itmloc) pt w
+    useItemLoc cr itmloc pt w
 
 useItemLoc :: Creature -> LocationDT OItem -> PressType -> World -> Maybe World
 useItemLoc cr loc pt w
@@ -30,13 +30,13 @@ useItemLoc cr loc pt w
     | LaserWeaponSF <- sf
       , fromMaybe False $ loc ^? locDT . dtValue . _1 . itLocation . ilIsAttached
       , Aiming{} <- cr ^. crStance . posture =
-        return $ gadgetEffect pt (loc) cr w
+        return $ gadgetEffect pt loc cr w
     | GadgetPlatformSF <- sf =
-        return $ gadgetEffect pt (loc) cr w
+        return $ gadgetEffect pt loc cr w
     | UnderBarrelPlatformSF <- sf
       , fromMaybe False $ loc ^? locDT . dtValue . _1 . itLocation . ilIsAttached
       , Aiming{} <- cr ^. crStance . posture =
-        return $ gadgetEffect pt (loc) cr w
+        return $ gadgetEffect pt loc cr w
     | RemoteDetonatorSF <- sf
       , pt == InitialPress =
         return $ activateDetonator ldt w

src/Dodge/Creature/State.hs

@@ -153,7 +153,7 @@ invRootItemEffs cr =
 invItemLocUpdate :: Creature -> LocationDT OItem -> World -> World
 invItemLocUpdate cr loc w = doAnyEquipmentEffect loc cr $ case itm ^. itType of
     ATTACH BULLETSYNTH -> trySynthBullet loc w
-    EQUIP WRIST_ECG | haspulse -> tryUseParent (loc) w
+    EQUIP WRIST_ECG | haspulse -> tryUseParent loc w
     COPIER _ -> copierItemUpdate itm cr w
     HELD FLATSHIELD -> rootNotrootEff createShieldWall removeShieldWall itm cr w
     HELD MINIGUNX{} -> coolMinigun itm w
@@ -293,8 +293,7 @@ drawARHUD (LocDT con _) w = fromMaybe w $ do
 shineTargetLaser :: Creature -> LocationDT OItem -> World -> World
 shineTargetLaser cr loc w = fromMaybe (w & pointittarg . itTgPos .~ Nothing) $ do
     guard (crIsAiming cr)
---    (_, mag) <- find (isammolink . fst) (itmtree ^. ldtLeft)
-    ( mag) <- find (isammolink . (^. dtValue . _2)) (itmtree ^. dtLeft)
+    mag <- find (isammolink . (^. dtValue . _2)) (itmtree ^. dtLeft)
     i <- mag ^. dtValue . _1 . itConsumables
     guard $ i >= x
     maginvid <- mag ^? dtValue . _1 . itLocation . ilInvID
@@ -316,7 +315,7 @@ shineTargetLaser cr loc w = fromMaybe (w & pointittarg . itTgPos .~ Nothing) $ d
                     , _lpType = TargetingLaser (_itID itm)
                     }
   where
-    o = locOrient (loc) cr
+    o = locOrient loc cr
     itmtree = loc ^. locDT
     (p, q) = o `Q.comp` (V3 5 0 0, Q.qID)
     x = 1
@@ -332,7 +331,7 @@ shineTargetLaser cr loc w = fromMaybe (w & pointittarg . itTgPos .~ Nothing) $ d
 
 shineTorch :: Creature -> LocationDT OItem -> World -> World
 shineTorch cr loc = fromMaybe id $ do
-    ( mag) <- find (isammolink . (^. dtValue . _2)) (itmtree ^. dtLeft)
+    mag <- find (isammolink . (^. dtValue . _2)) (itmtree ^. dtLeft)
     i <- mag ^. dtValue . _1 . itConsumables
     guard $ crIsAiming cr
     guard $ i >= x
@@ -342,7 +341,7 @@ shineTorch cr loc = fromMaybe id $ do
             . (cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix invid . itConsumables . _Just -~ x)
   where
     itmtree = loc ^. locDT
-    (p, q) = locOrient (loc) cr
+    (p, q) = locOrient loc cr
     x = 10
     isammolink AmmoMagSF{} = True
     isammolink _ = False

src/Dodge/Creature/Test.hs

@@ -97,7 +97,7 @@ crInAimStance as cr = crIsAiming cr && mitstance == Just as
         i <- cr ^? crManipulation . manObject . imRootSelectedItem
         --itm <- invRootTrees' (cr ^. crInv) ^? ix i
         itm <- fmap (fmap (\(a,b,_) -> (a,b))) $ invIMDT (cr ^. crInv) ^? ix i
-        return $ aimStance $ itm
+        return $ aimStance itm
         --cr ^? crInv . ix i . itUse . heldAim . aimStance
 
 oneH :: Creature -> Bool