Add generic derivations and To/FromJSON instances

src/Dodge/Data/Bullet.hs

@@ -1,6 +1,9 @@
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
 module Dodge.Data.Bullet where
+import GHC.Generics
+import Data.Aeson
 import Dodge.Data.Damage
 import Geometry.Data
 import Control.Lens
@@ -18,25 +21,46 @@ data Bullet = Bullet
     , _buTimer      :: Int
     , _buDamages    :: [Damage]
     }
-  deriving (Show,Read,Eq,Ord)
+  deriving (Show,Read,Eq,Ord,Generic)
+instance ToJSON Bullet  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON Bullet 
 data EnergyBallType = IncBall | TeslaBall | ConcBall
-  deriving (Show,Read,Eq,Ord,Enum,Bounded)
+  deriving (Show,Read,Eq,Ord,Enum,Bounded,Generic)
+instance ToJSON EnergyBallType  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON EnergyBallType 
 data BulletState = NormalBulletState
     | DelayedBullet Float
-  deriving (Show,Read,Eq,Ord)
+  deriving (Show,Read,Eq,Ord,Generic)
+instance ToJSON BulletState  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON BulletState 
 data BulletUpdateMod = NoBulletUpdateMod
-  deriving (Show,Read,Eq,Ord,Enum,Bounded)
+  deriving (Show,Read,Eq,Ord,Enum,Bounded,Generic)
+instance ToJSON BulletUpdateMod  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON BulletUpdateMod 
 data BulletEffect 
     = DestroyBullet
     | BounceBullet
     | PenetrateBullet
-  deriving (Eq,Ord,Show,Read,Enum,Bounded)
+  deriving (Eq,Ord,Show,Read,Enum,Bounded,Generic)
+instance ToJSON BulletEffect  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON BulletEffect 
 data BulletSpawn = BulBall EnergyBallType | BulSpark
-  deriving (Show,Read,Eq,Ord)
+  deriving (Show,Read,Eq,Ord,Generic)
+instance ToJSON BulletSpawn  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON BulletSpawn 
 data BulletTrajectory
     = BasicBulletTrajectory
     | BezierTrajectory Point2 Point2 Point2
     | FlechetteTrajectory Point2
     | MagnetTrajectory Point2
-  deriving (Show,Read,Eq,Ord)
+  deriving (Show,Read,Eq,Ord,Generic)
+instance ToJSON BulletTrajectory where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON BulletTrajectory
 makeLenses ''Bullet