Push item use delay inside datatype, currently broken

2021-11-27 16:37:30 +00:00
parent 224db733f6
commit 8639b2d428
21 changed files with 162 additions and 177 deletions
@@ -38,8 +38,7 @@ wpRecock = ItInvEffect
    moveHammerUp HammerDown     = HammerReleased
    moveHammerUp HammerReleased = HammerUp
    moveHammerUp HammerUp       = HammerUp
-    moveHammerUp NoHammer       = NoHammer
-    fOnIt it = it & itHammer %~ moveHammerUp
+    fOnIt it = it & itUse . itHammer . hammerPosition %~ moveHammerUp
 --{- |
 --Special recock for the bezier gun.
 --Not sure of its purpose at this time...  -}
@@ -66,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 . itHammer %~ moveHammerUp
+            & creatures . ix (_crID cr) . crInv . ix invid . itUse . itHammer . hammerPosition %~ moveHammerUp
        | otherwise = w
      where
        p = _crPos cr