Start moving creature properties out of records
This commit is contained in:
@@ -36,10 +36,8 @@ data Creature = Creature
|
||||
{ _crPos :: Point2
|
||||
, _crOldPos :: Point2
|
||||
, _crDir :: Float
|
||||
, _crOldDir :: Float
|
||||
, _crMvDir :: Float
|
||||
, _crMvAim :: Float
|
||||
-- , _crTwist :: Float
|
||||
, _crType :: CreatureType
|
||||
, _crID :: Int
|
||||
, _crRad :: Float
|
||||
@@ -52,7 +50,6 @@ data Creature = Creature
|
||||
, _crInvLock :: Bool
|
||||
, _crEquipment :: M.Map EquipSite Int
|
||||
, _crState :: CreatureState
|
||||
, _crCorpse :: CreatureCorpse --Creature -> Corpse -> SPic
|
||||
, _crMaterial :: Material
|
||||
, _crPastDamage :: Int
|
||||
, _crStance :: Stance
|
||||
@@ -70,8 +67,6 @@ data Creature = Creature
|
||||
, _crDeathTimer :: Int
|
||||
}
|
||||
|
||||
data CreatureCorpse = MakeDefaultCorpse
|
||||
|
||||
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data Intention = Intention
|
||||
@@ -88,7 +83,6 @@ makeLenses ''Intention
|
||||
concat
|
||||
<$> mapM
|
||||
(deriveJSON defaultOptions)
|
||||
[ ''CreatureCorpse
|
||||
, ''Creature
|
||||
[ ''Creature
|
||||
, ''Intention
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user