Add Read/Show instance for Creature

2022-07-22 10:44:54 +01:00
parent 4c5218c633
commit 6b69fc1684
35 changed files with 345 additions and 225 deletions
@@ -45,7 +45,7 @@ data Creature = Creature
    , _crEquipment      :: M.Map EquipPosition Int
    , _crLeftInvSel     :: Maybe Int
    , _crState          :: CreatureState
-    , _crCorpse         :: Creature -> Corpse -> SPic
+    , _crCorpse         :: CreatureCorpse --Creature -> Corpse -> SPic
    , _crMaterial       :: Material
    , _crPastDamage     :: Int
    , _crStance         :: Stance
@@ -63,18 +63,14 @@ data Creature = Creature
    , _crStatistics     :: CreatureStatistics
    , _crCamouflage     :: CamouflageStatus
    }
-data Corpse = Corpse
-    { _cpID  :: Int
-    , _cpPos :: Point2
-    , _cpDir :: Float
-    , _cpPict :: Corpse -> SPic
-    , _cpRes :: Maybe Creature
-    }
+  deriving (Eq,Ord,Show,Read)
+data CreatureCorpse = MakeDefaultCorpse
+  deriving (Eq,Ord,Show,Read)
 data Intention = Intention
    { _targetCr     :: Maybe Creature
    , _mvToPoint    :: Maybe Point2
    , _viewPoint    :: Maybe Point2
    }
+  deriving (Eq,Ord,Show,Read)
 makeLenses ''Creature
 makeLenses ''Intention
-makeLenses ''Corpse