Add generic derivations and To/FromJSON instances

src/Dodge/Data/Machine.hs

@@ -1,7 +1,10 @@
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
 module Dodge.Data.Machine
     where
+import GHC.Generics
+import Data.Aeson
 import Dodge.Data.GenParams
 import Dodge.Data.Item
 import Sound.Data
@@ -12,15 +15,16 @@ import Geometry.Data
 import Color
 import Dodge.Data.Material
 import qualified Data.IntSet as IS
-
 import qualified Data.Map.Strict as M
 import Control.Lens
-
 data MachineDraw = MachineDrawMempty
     | MachineDrawTerminal
     | MachineDrawTurret
     | MachineDrawDamageSensor Float (PaletteColor,DecorationShape)
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON MachineDraw  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON MachineDraw 
 data Machine = Machine
     { _mcID     :: Int
     , _mcWallIDs    :: IS.IntSet
@@ -33,11 +37,14 @@ data Machine = Machine
     , _mcSensor :: Sensor
     , _mcDamage :: [Damage]
     , _mcType   :: MachineType
-    , _mcMounts :: M.Map Object Int
+    , _mcMounts :: M.Map ObjectType Int
     , _mcName   :: String
     , _mcCloseSound  :: Maybe SoundID
     }
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON Machine  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON Machine 
 data MachineType 
     = StaticMachine
     | Turret
@@ -46,6 +53,9 @@ data MachineType
         , _tuFireTime   :: Int
         , _tuMCrID      :: Maybe Int
         }
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON MachineType  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON MachineType 
 makeLenses ''Machine
 makeLenses ''MachineType