Cleanup

2023-05-20 15:06:05 +01:00
parent 6c71e1d5bb
commit f2183e9954
25 changed files with 69 additions and 86 deletions
@@ -76,12 +76,19 @@ 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
        , _brlNum :: Int
        , _brlInaccuracy :: Float
        }
+    | BarrelList [GunBarrel]
    | RotBarrel
        { _brlNum :: Int
        , _brlInaccuracy :: Float
@@ -109,9 +116,11 @@ 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