Move towards moving muzzles out of records

src/Dodge/Data/Item/Params.hs

@@ -15,10 +15,9 @@ data ItemParams
     | FlatShieldParams
         {_flatShieldWlMIX :: Maybe Int}
     | Arcing
-        { _currentArc :: [ArcStep]
---        , _arcSize :: Float
---        , _arcNumber :: Int
-        }
+        { _currentArc :: [ArcStep]}
+    | NozzleAngle {_nzAngle :: Float}
+    | VolleyUnfiredBarrels {_unfiredBarrels :: [Int]}
 
 data ShrinkGunStatus = FullSize | Shrunk
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)

src/Dodge/Data/Item/Use.hs

@@ -34,7 +34,6 @@ data ItemUse
         { _heldDelay :: UseDelay
         , _heldMuzzles :: [Muzzle]
         , _heldFrame :: Int
-        , _heldUseEffect :: HeldUseEffect
         }
     | UseEquip {_uequipEffect :: EquipEffect}
     | UseAttach {_uaParams :: AttachParams}
@@ -50,12 +49,6 @@ data ItemUse
         }
     deriving (Eq, Show, Read)
 
-data HeldUseEffect
-    = NoHeldUseEffect
-    | RandomiseMuzzleFrames Int
-    | SwitchAlteRifle
-    deriving (Eq, Show, Read)
-
 data UseFocus
     = UseFromRoot
     | UseFromLocation
@@ -99,7 +92,6 @@ data MuzzleEffect
     | MuzzleNozzle
         { _nzPressure :: GenFloat
         , _nzMaxWalkAngle :: Float
-        , _nzCurrentWalkAngle :: Float
         , _nzWalkSpeed :: Float
         }
     | MuzzleShatter
@@ -125,15 +117,6 @@ data Muzzle = Muzzle
     , _mzEffect :: MuzzleEffect
     , _mzAmmoPerShot :: AmmoPerShot
     , _mzFrame :: Int
-    --    , _mzChargeRequirement :: Maybe Int
-    --    , _mzRecoil :: Float
-    --    , _mzTorque :: Float
-    --    , _mzSidePush :: Float
-    --    , _mzRandomOffset :: Float
-    --    , _mzVel :: Float
-    --    , _mzRifling :: Float
-    --    , _mzAmmoSlot :: Either Int
-    --    , _mzAmmoPerShot :: Int
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
@@ -145,8 +128,6 @@ makeLenses ''MuzzleEffect
 makeLenses ''AmmoPerShot
 makeLenses ''UseCondition
 makeLenses ''UseFocus
-makeLenses ''HeldUseEffect
-deriveJSON defaultOptions ''HeldUseEffect
 deriveJSON defaultOptions ''UseFocus
 deriveJSON defaultOptions ''UseCondition
 deriveJSON defaultOptions ''MuzzleEffect

src/Dodge/Data/MuzzleEffect.hs

@@ -1,9 +1,12 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.MuzzleEffect where
+
 import Control.Lens
+
 --import Data.Aeson
 --import Data.Aeson.TH
 --import Dodge.Data.Item.Use.Consumption.Ammo
@@ -13,5 +16,6 @@ data CumulativeMuzzleEffect = CME
     , _cmeTorque :: Float
     , _cmeSound :: Bool
     }
-    deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''CumulativeMuzzleEffect

src/Dodge/Data/WorldEffect.hs

@@ -35,7 +35,7 @@ data WdWd
     | WdWdFromItCrixWdWd (LabelDoubleTree ComposeLinkType Item) Int ItCrWdWd
     | MakeTempLight LSParam Int
     | UseInvItem Int PressType
-    | WdWdBurstFireRepeats Int Int
+    | WdWdBurstFireRepetition Int Int
     --deriving (Eq, Show, Read) --, Generic)
     --h--deriving (Eq, Show, Read) --Generic, Flat)