Remove creature move type record

src/Dodge/Data/Creature.hs

@@ -54,9 +54,8 @@ data Creature = Creature
     , _crFaction :: Faction
     , _crGroup :: CrGroup
     , _crIntention :: Intention
-    , _crMvType :: CrMvType
+--    , _crMvType :: CrMvType
     , _crName :: String
-    , _crStatistics :: CreatureStatistics
     , _crDeathTimer :: Int
     }
 

src/Dodge/Data/Creature/Misc.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -8,27 +8,25 @@ module Dodge.Data.Creature.Misc (
     module Dodge.Data.CamouflageStatus,
 ) where
 
-import Dodge.Data.Material
 import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.CamouflageStatus
 import Dodge.Data.FloatFunction
+import Dodge.Data.Material
 import Geometry.Data
 
-data CreatureStatistics = CreatureStatistics
-    { _strength :: Int
-    , _dexterity :: Int
-    , _intelligence :: Int
-    }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--data CreatureStatistics = CreatureStatistics
+--    { _strength :: Int
+--    , _dexterity :: Int
+--    , _intelligence :: Int
+--    }
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Vocalization
     = Mute
     | Vocalization
---        { _vcSound :: SoundID
---        , _vcWarnings :: [SoundID]
         { _vcMaxCoolDown :: (Int, Int)
         , _vcCoolDown :: Int
         }
@@ -67,12 +65,19 @@ data Pulse = PulseStatus
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CreatureType
-    = Avatar { _avatarPulse :: Pulse , _avatarMaterial :: Material}
+    = Avatar
+        { _avatarPulse :: Pulse
+        , _avatarMaterial :: Material
+        , _avStrength :: Int
+        , _avDexterity :: Int
+        , _avIntelligence :: Int
+        , _avMoveSpeed :: Float
+        }
     | AvatarDead
     | ChaseCrit {_meleeCooldown :: Int}
     | SwarmCrit
     | AutoCrit
-    | BarrelCrit{_barrelType :: BarrelType}
+    | BarrelCrit {_barrelType :: BarrelType}
     | LampCrit {_lampHeight :: Float, _lampColor :: Point3, _lampLSID :: Maybe Int}
 
 data CreatureShape
@@ -90,14 +95,14 @@ data BarrelType = PlainBarrel | ExplosiveBarrel
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Pulse
-makeLenses ''CreatureStatistics
+--makeLenses ''CreatureStatistics
 makeLenses ''Vocalization
 makeLenses ''CrMvType
 makeLenses ''CreatureType
 deriveJSON defaultOptions ''Pulse
-deriveJSON defaultOptions ''CreatureStatistics
+--deriveJSON defaultOptions ''CreatureStatistics
 deriveJSON defaultOptions ''Vocalization
-deriveJSON defaultOptions ''CrMvType
+--deriveJSON defaultOptions ''CrMvType
 deriveJSON defaultOptions ''HumanoidAI
 deriveJSON defaultOptions ''BarrelType
 deriveJSON defaultOptions ''CreatureType