Auto create tree structure for held item ammo, add derive instances

src/Dodge/Data/ComposedItem.hs

@@ -8,14 +8,16 @@ module Dodge.Data.ComposedItem
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import Dodge.Data.Item.Use.Consumption.Ammo
 
-data ComposeLinkType = AmmoInLink
+data ComposeLinkType 
+    = AmmoInLink AmmoType
     | AmmoModLink
 
 data ComposedItem = WeaponCI
     | WeaponScopeCI
-    | AmmoModifierCI
-    | BulletAmmoCI
+    | AmmoModifierCI AmmoType
+    | AmmoCI AmmoType
     | UncomposableCI
     deriving (Eq,Ord,Show,Read)
 

src/Dodge/Data/Item/Use.hs

@@ -60,7 +60,7 @@ data ItemUse
         , _amagParams :: AmmoParams 
         , _amagType :: AmmoType
         }
-    --deriving (Eq, Show, Read) --Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data HeldParams
     = DefaultHeldParams
@@ -73,11 +73,13 @@ data HeldParams
         , _torqueAfter :: Float
         , _randomOffset :: Float
         }
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data AttachParams
     = ScrollAttachParams {_scrollAttachParams :: ScrollAttachParams}
     | TargetAttachParams
     | NoAttachParams
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data AmmoParams = BulletParams {_ampBullet :: Bullet}
     | ProjectileParams
@@ -86,6 +88,7 @@ data AmmoParams = BulletParams {_ampBullet :: Bullet}
         , _ampPjCreation :: ProjectileCreate
         }
     | GasParams {_ampCreateGas :: GasCreate}
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data ScrollAttachParams
     = ZoomScrollParams
@@ -98,6 +101,7 @@ data ScrollAttachParams
         }
     | CharScrollParams
         { _scrollChar :: Seq.Seq Char}
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data AimParams = AimParams
     { _aimWeight :: Int
@@ -108,13 +112,14 @@ data AimParams = AimParams
     , _aimHandlePos :: V2 Float
     , _aimMuzzles :: [Muzzle]
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Muzzle = Muzzle
     { _mzPos :: V2 Float
     , _mzRot :: Float
     , _mzInaccuracy :: Float
     }
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 
 data AimStance
@@ -123,7 +128,7 @@ data AimStance
     | TwoHandFlat
     | OneHand
 --    | LeaveHolstered
-    deriving (Eq)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
     --deriving (Eq, Show, Ord, Enum, Read) --Generic, Flat)
 
 data ItZoom = ItZoom
@@ -131,7 +136,7 @@ data ItZoom = ItZoom
     , _izMin :: Float
     , _izFac :: Float
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''ItemUse
 makeLenses ''AimParams

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

@@ -37,6 +37,7 @@ data ProjectileUpdate
 data AmmoType
     = ProjectileAmmo
     | BulletAmmo
+    | BeltBulletAmmo
     | ElectricalAmmo
     | DroneAmmo
     | GasAmmo

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

@@ -23,13 +23,13 @@ data EquipEffect = EquipEffect
     , _eeViewDist :: Maybe Float
     , _eeAttachPos :: Point3
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EquipParams
     = NoEquipParams
     | EquipID {_eparamID :: Int}
     | EquipCounter {_eparamInt :: Int}
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''EquipEffect
 makeLenses ''EquipParams