Fold aiming parameters into item use datatype

src/Dodge/Item/Weapon/ExtraEffect.hs

@@ -34,11 +34,11 @@ wpRecock = ItInvEffect
     ,_itEffectCounter = 0
     }
   where 
-    f _ cr i = creatures . ix (_crID cr) . crInv %~ IM.adjust fOnIt i
+    f _ cr invid = creatures . ix (_crID cr) . crInv . ix invid 
+        . itUse . useHammer . hammerPosition %~ moveHammerUp
     moveHammerUp HammerDown     = HammerReleased
     moveHammerUp HammerReleased = HammerUp
     moveHammerUp HammerUp       = HammerUp
-    fOnIt it = it & itUse . itHammer . hammerPosition %~ moveHammerUp
 --{- |
 --Special recock for the bezier gun.
 --Not sure of its purpose at this time...  -}
@@ -65,7 +65,7 @@ itemLaserScopeEffect
     f _ cr invid w 
         | invid == _crInvSel cr && crIsAiming' cr = w 
             & particles %~ (:) (makeLaserScope sp ep reloadFrac)
-            & creatures . ix (_crID cr) . crInv . ix invid . itUse . itHammer . hammerPosition %~ moveHammerUp
+            & creatures . ix (_crID cr) . crInv . ix invid . itUse . useHammer . hammerPosition %~ moveHammerUp
         | otherwise = w
       where
         p = _crPos cr