Commit before partial cleanup, continue weapon effect refactor

src/Dodge/Data/Item/Use.hs

@@ -39,6 +39,7 @@ data ItemUse
         , _heldAmmoTypes :: IM.IntMap AmmoType
         , _heldParams :: HeldParams
         , _heldTriggerType :: TriggerType
+        , _heldUsageTime :: Int -- this is not yet implemented
 --        , _useTargeting :: Maybe TargetType
         }
     | LeftUse
@@ -163,6 +164,9 @@ data MuzzleEffect
         , _nzCurrentWalkAngle :: Float
         , _nzWalkSpeed :: Float
         }
+        | MuzzleShatter
+        | MuzzleForceField
+        | MuzzleDetector
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Muzzle = Muzzle
@@ -172,6 +176,7 @@ data Muzzle = Muzzle
     , _mzAmmoSlot :: Int
     , _mzFlareType :: FlareType
     , _mzEffect :: MuzzleEffect
+    , _mzChargeRequirement :: Maybe Int
 --    , _mzRecoil :: Float
 --    , _mzTorque :: Float
 --    , _mzSidePush :: Float
@@ -208,6 +213,7 @@ makeLenses ''HeldParams
 makeLenses ''AttachParams
 makeLenses ''ScrollAttachParams
 makeLenses ''AmmoParams
+makeLenses ''MuzzleEffect
 deriveJSON defaultOptions ''MuzzleEffect
 deriveJSON defaultOptions ''FlareType
 deriveJSON defaultOptions ''TriggerType