Start moving creature properties out of records

2025-06-06 08:46:27 +01:00
parent bae75a1e60
commit 4ae7c6ebd6
32 changed files with 609 additions and 672 deletions
@@ -68,19 +68,26 @@ data Pulse = PulseStatus

 data CreatureType
    = Avatar
-        { _skinHead :: Color
-        , _skinUpper :: Color
-        , _skinLower :: Color
-        , _avatarPulse :: Pulse
+--        { _skinHead :: Color
+--        , _skinUpper :: Color
+--        , _skinLower :: Color
+        { _avatarPulse :: Pulse
        }
-    | Humanoid
+    | AvatarDead
+    | ChaseCrit
+    | SwarmCrit
+    | AutoCrit
+    | BarrelCrit{_barrelType :: BarrelType}
+    | LampCrit {_lampHeight :: Float, _lampColor :: Point3, _lampLSID :: Maybe Int}
+
+data CreatureShape
+    = Humanoid
        { _skinHead :: Color
        , _skinUpper :: Color
        , _skinLower :: Color
        , _humanoidAI :: HumanoidAI
        }
-    | Barreloid {_barrelType :: BarrelType}
-    | Lampoid {_lampHeight :: Float, _lampColor :: Point3, _lampLSID :: Maybe Int}
+    | Barreloid
    | NonDrawnCreature
    deriving (Eq, Ord, Show, Read) --Generic, Flat)