Cleanup, remove records, stop unecessary Aeson compile

src/Dodge/Data/Item/Use.hs

@@ -5,24 +5,27 @@
 
 module Dodge.Data.Item.Use (
     module Dodge.Data.Item.Use,
-    module Dodge.Data.Item.Use.Consumption,
     module Dodge.Data.Item.Targeting,
     module Dodge.Data.GenFloat,
     module Dodge.Data.Item.Scope,
     module Dodge.Data.Item.BulletMod,
-    module Dodge.Data.Payload
+    module Dodge.Data.Payload,
+    module Dodge.Data.Bullet,
+    module Dodge.Data.Item.Use.Consumption.Ammo,
 ) where
 
-import Dodge.Data.Payload
+import Dodge.Data.Item.Use.Consumption.Ammo
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.Set as S
+import Dodge.Data.Bullet
 import Dodge.Data.GenFloat
 import Dodge.Data.Item.BulletMod
 import Dodge.Data.Item.Scope
 import Dodge.Data.Item.Targeting
-import Dodge.Data.Item.Use.Consumption
+import Dodge.Data.Payload
+--import Dodge.Data.Item.Use.Consumption
 import Geometry.Data
 
 data ItemUse

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

@@ -1,50 +0,0 @@
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DerivingStrategies #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
-
-module Dodge.Data.Item.Use.Consumption (
-    module Dodge.Data.Item.Use.Consumption,
-    module Dodge.Data.Item.Use.Consumption.Ammo,
-    module Dodge.Data.Item.Use.Consumption.LoadAction,
-) where
-
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
-import Dodge.Data.Item.Use.Consumption.Ammo
-import Dodge.Data.Item.Use.Consumption.LoadAction
-
-data ReloadStatus = ReloadStatus
-    { _iaLoaded :: Int
-    }
-    deriving (Eq, Show, Read) --Generic, Flat)
-
-data LeftConsumption
-    = AutoRecharging
-        { _arLoaded :: Int
-        , _arMax :: Int
-        , _arTime :: Int
-        , _arProgress :: Int
-        }
-    | ChargeableAmmo
-        { _wpMaxCharge :: Int
-        , _wpCharge :: Int
-        }
-    deriving (Eq, Show, Read) --Generic, Flat)
-
-newtype ItAmount = ItAmount {_getItAmount :: Int}
-    --    deriving (Eq, Ord, Read Show, Num, Real,) --Generic, Flat)
-    deriving newtype (Eq, Ord, Read, Show, Num, Real, Enum, Integral)
-
---    deriving stock (Generic)
---    deriving anyclass (Flat)
-
-makeLenses ''LeftConsumption
-makeLenses ''ItAmount
-makeLenses ''ReloadStatus
-deriveJSON defaultOptions ''ReloadStatus
-deriveJSON defaultOptions ''LeftConsumption
-deriveJSON defaultOptions ''ItAmount