Work on time scrolling

src/Dodge/Item/Weapon/Utility.hs

@@ -1,11 +1,11 @@
 module Dodge.Item.Weapon.Utility where
 
-import Dodge.Default.Item.Use
 import Control.Lens
 import Data.Maybe
 import Dodge.Base.Coordinate
 import Dodge.Data.World
 import Dodge.Default
+--import Dodge.Default.Item.Use
 import Dodge.Wall.ForceField
 import Dodge.Wall.Move
 import Geometry
@@ -16,23 +16,35 @@ import ShapePicture
 
 timeScrollGun :: Item
 timeScrollGun =
-    defaultHeldItem
-        & itEffect . ieWhileAiming .~ TimeScrollEffect
+    defaultLeftItem
+        & itUse
+            .~ ( defaultLeftUse
+                    & leftUse .~ LTimeScroll
+                    & equipEffect . eeSite .~ GoesOnWrist
+               )
+        & itInvColor .~ cyan
+        & itEffect . ieInv .~ ChargeIfInInventory
+        & itType . iyBase .~ LEFT TIMESCROLLER
+        & itUse . leftConsumption
+            .~ ChargeableAmmo
+                { _wpMaxCharge = 100
+                , _wpCharge = 0
+                }
 
 rewindGun :: Item
 rewindGun =
     defaultLeftItem
-        & itUse .~
-            (defaultLeftUse
-                & leftUse .~ LRewind --useRewindGun
-                & equipEffect . eeSite .~ GoesOnWrist
-            )
+        & itUse
+            .~ ( defaultLeftUse
+                    & leftUse .~ LRewind --useRewindGun
+                    & equipEffect . eeSite .~ GoesOnWrist
+               )
         & itInvColor .~ cyan
-        & itEffect . ieInv .~ RewindEffect
+        & itEffect . ieInv .~ ChargeIfEquipped
         & itType . iyBase .~ LEFT REWINDER
         & itUse . leftConsumption
             .~ ChargeableAmmo
-                { _wpMaxCharge = 250
+                { _wpMaxCharge = 100
                 , _wpCharge = 0
                 }
 
@@ -66,7 +78,6 @@ unsafeBlinkGun =
         & itUse . leftUse .~ LUnsafeBlink --hammerCheckL (shootL $ const unsafeBlinkAction)
         & itUse . equipEffect . eeViewDist ?~ 400
 
-
 -- I believe because the targeting returns to nothing straight after you release
 -- the rmb, it is possible for this to do nothing
 -- TODO investigate more and fix