Remove generic and flat instances

This commit is contained in:
2022-08-21 22:38:40 +01:00
parent 36c8befa9f
commit 7181046aa3
94 changed files with 312 additions and 423 deletions
+6 -7
View File
@@ -8,7 +8,6 @@ module Dodge.Data.Creature.Misc (
module Dodge.Data.CamouflageStatus,
) where
import Flat
import Color
import Control.Lens
import Data.Aeson
@@ -23,7 +22,7 @@ data CreatureStatistics = CreatureStatistics
, _dexterity :: Int
, _intelligence :: Int
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data Vocalization
= Mute
@@ -33,7 +32,7 @@ data Vocalization
, _vcMaxCoolDown :: Int
, _vcCoolDown :: Int
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data CrMvType
= NoMvType
@@ -44,7 +43,7 @@ data CrMvType
, _mvTurnJit :: Float
, _mvAimSpeed :: FloatFloat
}
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data HumanoidAI
= YourAI
@@ -60,7 +59,7 @@ data HumanoidAI
| MiniGunAI
| LongAI
| MultGunAI
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data CreatureType
= Humanoid
@@ -72,10 +71,10 @@ data CreatureType
| Barreloid {_barrelType :: BarrelType}
| Lampoid {_lampHeight :: Float, _lampColor :: Point3, _lampLSID :: Maybe Int}
| NonDrawnCreature
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data BarrelType = PlainBarrel | ExplosiveBarrel
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
makeLenses ''CreatureStatistics
makeLenses ''Vocalization