Work on cleaning up item effects/attachments etc

src/Dodge/Data/Magnet.hs

@@ -1,30 +1,30 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Magnet where
-import GHC.Generics
-import Data.Aeson
-import Geometry.Data
+
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Geometry.Data
+
 newtype MagnetUpdate = MagnetUpdateTimer Int
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON MagnetUpdate  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON MagnetUpdate 
-data MagnetBuBu = MagnetBuId
+    deriving (Eq, Ord, Show, Read)
+
+data MagnetBuBu
+    = MagnetBuId
     | MagnetBuBuCurveAroundField Float Float
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON MagnetBuBu  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON MagnetBuBu 
+    deriving (Eq, Ord, Show, Read)
+
 data Magnet = Magnet
     { _mgID :: Int
     , _mgUpdate :: MagnetUpdate
     , _mgPos :: Point2
-    , _mgField  :: MagnetBuBu
+    , _mgField :: MagnetBuBu
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Magnet  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Magnet 
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''Magnet
+deriveJSON defaultOptions ''MagnetUpdate
+deriveJSON defaultOptions ''MagnetBuBu
+deriveJSON defaultOptions ''Magnet