Remove generic and flat instances

This commit is contained in:
2022-08-21 22:38:40 +01:00
parent 36c8befa9f
commit 7181046aa3
94 changed files with 312 additions and 423 deletions
+5 -6
View File
@@ -11,7 +11,6 @@ module Dodge.Data.Item.Use.Consumption (
module Dodge.Data.Item.Use.Consumption.LoadAction,
) where
import Flat
import Control.Lens
import Data.Aeson
import Data.Aeson.TH
@@ -28,7 +27,7 @@ data HeldConsumption
, _laProgress :: Maybe [LoadAction]
}
| NoConsumption
deriving (Eq, Show, Read, Generic, Flat)
deriving (Eq, Show, Read) --Generic, Flat)
data LeftConsumption
= AutoRecharging
@@ -41,13 +40,13 @@ data LeftConsumption
{ _wpMaxCharge :: Int
, _wpCharge :: Int
}
deriving (Eq, Show, Read, Generic, Flat)
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)
-- deriving stock (Generic)
-- deriving anyclass (Flat)
makeLenses ''HeldConsumption
makeLenses ''LeftConsumption