Remove old ammo code, add magazines to some test loadouts

2024-06-21 23:24:26 +01:00
parent ecefba21d6
commit 944b40cb56
12 changed files with 182 additions and 165 deletions
@@ -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