Refactor, try to limit dependencies

src/Dodge/Data/Creature/Perception.hs

@@ -1,82 +1,77 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
-module Dodge.Data.Creature.Perception
-    ( Perception (..)
-    , Vigilance (..)
-    , Attention (..)
-    , Awareness (..)
-    , Vision (..)
-    , Audition (..)
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.Creature.Perception (
+    Perception (..),
+    Vigilance (..),
+    Attention (..),
+    Awareness (..),
+    Vision (..),
+    Audition (..),
     -- lenses
-    , getAttentiveTo
-    , getFixated
-    , cpAttention
-    , cpVigilance
-    , cpAwareness
-    , cpVision
-    , cpAudition
-    , viFOV
-    , viDist
-    , auDist
-    )
-    where
-import GHC.Generics
-import Data.Aeson
+    getAttentiveTo,
+    getFixated,
+    cpAttention,
+    cpVigilance,
+    cpAwareness,
+    cpVision,
+    cpAudition,
+    viFOV,
+    viDist,
+    auDist,
+) where
+
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
 import Dodge.Data.FloatFunction
 import qualified IntMapHelp as IM
+
 data Perception = Perception
-    { _cpVigilance     :: Vigilance
-    , _cpAttention     :: Attention
-    , _cpAwareness     :: IM.IntMap Awareness
-    , _cpVision         :: Vision
-    , _cpAudition       :: Audition
+    { _cpVigilance :: Vigilance
+    , _cpAttention :: Attention
+    , _cpAwareness :: IM.IntMap Awareness
+    , _cpVision :: Vision
+    , _cpAudition :: Audition
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Perception  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Perception 
+    deriving (Eq, Ord, Show, Read)
+
 data Vision = Eyes
-    { _viFOV  :: FloatFloat
+    { _viFOV :: FloatFloat
     , _viDist :: FloatFloat
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Vision  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Vision 
+    deriving (Eq, Ord, Show, Read)
+
 newtype Audition = Ears
     { _auDist :: FloatFloat
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Audition  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Audition 
+    deriving (Eq, Ord, Show, Read)
+
 data Vigilance
     = Comatose
     | Asleep
     | Lethargic
     | Vigilant
     | Overstrung
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Vigilance where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Vigilance
+    deriving (Eq, Ord, Show, Read)
+
 data Attention
-    = AttentiveTo {_getAttentiveTo :: IM.IntMap Awareness }
-    | Fixated {_getFixated :: Int }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Attention where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Attention
+    = AttentiveTo {_getAttentiveTo :: IM.IntMap Awareness}
+    | Fixated {_getFixated :: Int}
+    deriving (Eq, Ord, Show, Read)
+
 data Awareness
     = Suspicious Float
     | Cognizant Float
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Awareness where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Awareness
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''Perception
 makeLenses ''Vision
 makeLenses ''Audition
 makeLenses ''Attention
+deriveJSON defaultOptions ''Perception
+deriveJSON defaultOptions ''Vision
+deriveJSON defaultOptions ''Audition
+deriveJSON defaultOptions ''Vigilance
+deriveJSON defaultOptions ''Attention
+deriveJSON defaultOptions ''Awareness