Commit before moving to external weapon magazines

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

@@ -1,7 +1,7 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -26,18 +26,18 @@ data HeldConsumption
     | NoConsumption
     deriving (Eq, Show, Read) --Generic, Flat)
 
-data AmmoSource 
+data AmmoSource
     = InternalSource InternalAmmo
     | AboveSource
     deriving (Eq, Show, Read) --Generic, Flat)
 
 data InternalAmmo = InternalAmmo
-        { _iaMax :: Int
-        , _iaLoaded :: Int
-        , _iaPrimed :: Bool
-        , _iaCycle :: [LoadAction]
-        , _iaProgress :: Maybe [LoadAction]
-        }
+    { _iaMax :: Int
+    , _iaLoaded :: Int
+    , _iaPrimed :: Bool
+    , _iaCycle :: [LoadAction]
+    , _iaProgress :: Maybe [LoadAction]
+    }
     deriving (Eq, Show, Read) --Generic, Flat)
 
 data LeftConsumption
@@ -54,8 +54,9 @@ data LeftConsumption
     deriving (Eq, Show, Read) --Generic, Flat)
 
 newtype ItAmount = ItAmount {_getItAmount :: Int}
---    deriving (Eq, Ord, Read Show, Num, Real,) --Generic, Flat)
+    --    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)