Move weapon muzzles up a record

src/Dodge/Data/Item/Use.hs

@@ -32,7 +32,7 @@ import Geometry.Data
 data ItemUse
     = UseHeld
         { _heldDelay :: UseDelay
-        , _heldAim :: AimParams
+        , _heldMuzzles :: [Muzzle]
         , _heldParams :: HeldParams
         , _heldFrame :: Int
         , _heldUseEffect :: HeldUseEffect
@@ -106,8 +106,8 @@ data AmmoParams
     | NoAmmoParams
     deriving (Eq, Show, Read) --Generic, Flat)
 
-data AimParams = AimParams { _aimMuzzles :: [Muzzle] }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--data AimParams = AimParams { _aimMuzzles :: [Muzzle] }
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data FlareType
     = NoFlare
@@ -168,7 +168,7 @@ data Muzzle = Muzzle
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''ItemUse
-makeLenses ''AimParams
+--makeLenses ''AimParams
 makeLenses ''Muzzle
 makeLenses ''HeldParams
 makeLenses ''AttachParams
@@ -188,5 +188,5 @@ deriveJSON defaultOptions ''HeldParams
 deriveJSON defaultOptions ''AmmoPerShot
 deriveJSON defaultOptions ''Muzzle
 deriveJSON defaultOptions ''AttachParams
-deriveJSON defaultOptions ''AimParams
+--deriveJSON defaultOptions ''AimParams
 deriveJSON defaultOptions ''ItemUse