Remove old ammo code, add magazines to some test loadouts

src/Dodge/Data/Item/Use.hs

@@ -58,9 +58,14 @@ data ItemUse
 
 data AttachParams
     = ScrollAttachParams {_scrollAttachParams :: ScrollAttachParams}
-    | AmmoAttachParams {_ammoAttachParams :: InternalAmmo}
+    | AmmoAttachParams 
+        {_ammoLoadStatus :: InternalAmmo
+        ,_ammoParams :: AmmoParams
+        }
     | TargetAttachParams
 
+data AmmoParams = DefaultAmmoParams
+
 data ScrollAttachParams
     = ZoomScrollParams
         { -- | a camera offset
@@ -123,6 +128,8 @@ makeLenses ''ItZoom
 makeLenses ''Muzzle
 makeLenses ''AttachParams
 makeLenses ''ScrollAttachParams
+makeLenses ''AmmoParams
+deriveJSON defaultOptions ''AmmoParams
 deriveJSON defaultOptions ''Muzzle
 deriveJSON defaultOptions ''AimStance
 deriveJSON defaultOptions ''ScrollAttachParams

src/Dodge/Data/Item/Use/Consumption.hs

@@ -32,11 +32,6 @@ data AmmoSource
     | EitherSource
     deriving (Eq, Show, Read) --Generic, Flat)
 
-data ExternalSourceType = BulletClip
-    | BulletBelt
-    | ElectricPower
-    deriving (Eq, Show, Read) --Generic, Flat)
-
 data InternalAmmo = InternalAmmo
     { _iaMax :: Int
     , _iaLoaded :: Int

src/Dodge/Data/Item/Use/Consumption/LoadAction.hs

@@ -42,7 +42,6 @@ data InventoryManipulation
 
 data InvSelAction
     = NoInvSelAction
-    | AttachLoadSourceAction {_actionProgress :: Int}
     | ReloadAction {_actionProgress :: Int, _reloadAction :: LoadAction}
     deriving (Eq, Ord, Show, Read) --Generic, Flat)