Move around ammo source checks

2024-06-22 16:23:34 +01:00
parent 25cecb8ea6
commit c723d1b1e1
25 changed files with 218 additions and 263 deletions
@@ -17,14 +17,6 @@ import Data.Aeson.TH
 import Dodge.Data.Item.Use.Consumption.Ammo
 import Dodge.Data.Item.Use.Consumption.LoadAction

-data HeldConsumption
-    = LoadableAmmo
-        { _laAmmoType :: AmmoType
-        , _laSourceType :: AmmoSourceType
-        }
-    | NoConsumption
-    deriving (Eq, Show, Read) --Generic, Flat)
-
 data ReloadStatus = ReloadStatus
    { _iaMax :: Int
    , _iaLoaded :: Int
@@ -54,11 +46,9 @@ newtype ItAmount = ItAmount {_getItAmount :: Int}
 --    deriving stock (Generic)
 --    deriving anyclass (Flat)

-makeLenses ''HeldConsumption
 makeLenses ''LeftConsumption
 makeLenses ''ItAmount
 makeLenses ''ReloadStatus
 deriveJSON defaultOptions ''ReloadStatus
-deriveJSON defaultOptions ''HeldConsumption
 deriveJSON defaultOptions ''LeftConsumption
 deriveJSON defaultOptions ''ItAmount