Improve machines, tweak wall ids

2021-11-01 15:21:21 +00:00
parent 7692421112
commit 7ddbbdda14
11 changed files with 76 additions and 28 deletions
@@ -547,23 +547,24 @@ data Prop
 data Either3 a b c = E3x1 a | E3x2 b | E3x3 c
 data Block = Block
    { _blID      :: Int
-    , _blWallIDs :: [Int]
+    , _blWallIDs :: IS.IntSet
    , _blHPs     :: [Int]
    , _blShadows :: [Int]
    }
 data Machine = Machine
    { _mcID      :: Int
-    , _mcWallIDs :: [Int]
+    , _mcWallIDs :: IS.IntSet
    , _mcUpdate  :: Machine -> World -> World
    , _mcDraw    :: Machine -> SPic
    , _mcPos     :: Point2
    , _mcDir     :: Float
    , _mcHP      :: Int
    , _mcSensor  :: Int
+    , _mcDamage  :: [DamageType]
    }
 data Door = Door
    { _drID :: Int
-    , _drWallIDs :: [Int]
+    , _drWallIDs :: IS.IntSet
    , _drStatus  :: DoorStatus
    , _drTrigger :: World -> Bool
    , _drMech    :: Door -> World -> World