Work on held item usage

src/Dodge/Data/Item/Params.hs

@@ -48,7 +48,6 @@ data ItemParams
         { _muzVel :: Float
         , _rifling :: Float
         , _bore :: Float
-        , _gunBarrels :: [GunBarrel]
         , _recoil :: Float
         , _torqueAfter :: Float
         , _randomOffset :: Float
@@ -76,12 +75,6 @@ data ShrinkGunStatus = FullSize | Shrunk
 data PreviousArcEffect = NoPreviousArcEffect | PerturbTillBreakPreviousArc
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data GunBarrel = GunBarrel
-    { _barlPos :: Point2
-    , _barlRot :: Float
-    , _barlInaccuracy :: Float
-    }
-
 --data GunBarrels
 ----    = MultiBarrel
 ----        { _brlSpread :: BarrelSpread
@@ -103,21 +96,9 @@ data Nozzle = Nozzle
     }
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
---data BarrelSpread
---    = AlignedBarrels
---    | SpreadBarrels {_spreadAngle :: Float}
---    | RotatingBarrels {_rotatingBarrelInaccuracy :: Float}
---    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
---makeLenses ''BarrelSpread
 makeLenses ''ItemParams
 makeLenses ''Nozzle
---makeLenses ''GunBarrels
-makeLenses ''GunBarrel
 deriveJSON defaultOptions ''ShrinkGunStatus
 deriveJSON defaultOptions ''PreviousArcEffect
 deriveJSON defaultOptions ''Nozzle
---deriveJSON defaultOptions ''BarrelSpread
-deriveJSON defaultOptions ''GunBarrel
---deriveJSON defaultOptions ''GunBarrels
 deriveJSON defaultOptions ''ItemParams

src/Dodge/Data/Item/Use.hs

@@ -14,6 +14,7 @@ module Dodge.Data.Item.Use (
     module Dodge.Data.Item.Targeting,
 ) where
 
+import Linear
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -72,10 +73,17 @@ data AimParams = AimParams
     , _aimZoom :: ItZoom
     , _aimStance :: AimStance
     , _aimHandlePos :: Float
-    , _aimMuzPos :: Float
+    , _aimMuzzles :: [Muzzle]
     }
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
+data Muzzle = Muzzle
+    { _mzPos :: V2 Float
+    , _mzRot :: Float
+    , _mzInaccuracy :: Float
+    }
+
+
 data AimStance
     = TwoHandTwist
     | TwoHandFlat
@@ -94,6 +102,8 @@ data ItZoom = ItZoom
 makeLenses ''ItemUse
 makeLenses ''AimParams
 makeLenses ''ItZoom
+makeLenses ''Muzzle
+deriveJSON defaultOptions ''Muzzle
 deriveJSON defaultOptions ''AimStance
 deriveJSON defaultOptions ''ItZoom
 deriveJSON defaultOptions ''AimParams