Cleanup

src/Dodge/Data/Creature/State.hs

@@ -1,19 +1,81 @@
 {-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Creature.State where
-import GHC.Generics
-import Data.Aeson
-import Dodge.Data.Damage
-import Dodge.Creature.State.Data
+
+import Color
 import Control.Lens
-data CreatureState = CrSt 
-    { _csDamage  :: [Damage]
+import Data.Aeson
+import qualified Data.IntSet as IS
+import Dodge.Data.Damage
+import GHC.Generics
+import Geometry.Data
+
+data CreatureState = CrSt
+    { _csDamage :: [Damage]
     , _csSpState :: CrSpState
     , _csDropsOnDeath :: CreatureDropType
     }
- deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CreatureState  where
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON CreatureState where
     toEncoding = genericToEncoding defaultOptions
-instance FromJSON CreatureState 
+
+instance FromJSON CreatureState
+
+data CreatureDropType
+    = DropAll
+    | DropAmount Int
+    | DropSpecific [Int]
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON CreatureDropType where
+    toEncoding = genericToEncoding defaultOptions
+
+instance FromJSON CreatureDropType
+
+data CrSpState
+    = Barrel {_piercedPoints :: [Point2]}
+    | GenCr
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON CrSpState where
+    toEncoding = genericToEncoding defaultOptions
+
+instance FromJSON CrSpState
+
+data Faction
+    = GenericFaction Int
+    | ZombieFaction
+    | EncircleFlock
+    | ChaseCritters
+    | SpawnedBy Int
+    | NoFaction
+    | ColorFaction Color
+    | PlayerFaction
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON Faction where
+    toEncoding = genericToEncoding defaultOptions
+
+instance FromJSON Faction
+
+data CrGroup
+    = LoneWolf
+    | Swarm
+        { _swarm :: IS.IntSet
+        , _crGroupID :: Int
+        }
+    | CrGroupID {_crGroupID :: Int}
+    | ShieldGroup
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON CrGroup where
+    toEncoding = genericToEncoding defaultOptions
+
+instance FromJSON CrGroup
+
 makeLenses ''CreatureState
+makeLenses ''CrSpState
+makeLenses ''CrGroup