Start simplifying/removing Wall records

2025-10-23 18:11:01 +01:00
parent fc7c4d6468
commit 819f0d37ea
18 changed files with 230 additions and 243 deletions
@@ -29,19 +29,23 @@ data PushSource
 data Door = Door
    { _drID :: Int
    , _drTrigger :: WdBl
-    , _drMech :: DrWdWd
+    , _drUpdate :: DoorUpdate
    , _drZeroPos :: (Point2,Float)
    , _drOnePos :: (Point2,Float)
    , _drLerp :: Float
    , _drFootPrint :: IM.IntMap (Point2,Point2)
    , _drHP :: Int
-    , _drSpeed :: Float
    , _drPushedBy :: PushSource
    , _drPushes :: Maybe Int
    , _drMounts :: [MountedObject]
    }

+data DoorUpdate = DoorDoNothing | DoorLerp {_drLerpSpeed :: Float}
+
+
 makeLenses ''Door
+makeLenses ''DoorUpdate
 --deriveJSON defaultOptions ''DoorStatus
+deriveJSON defaultOptions ''DoorUpdate
 deriveJSON defaultOptions ''PushSource
 deriveJSON defaultOptions ''Door