Merge branch 'master' of ssh://git.xkjq.uk:30001/justin/dodge

2021-03-21 17:53:01 +00:00
parent 3cfbf3dacc 279f928375
commit b91f056d63
52 changed files with 350 additions and 394 deletions
@@ -547,15 +547,6 @@ data Wall
        , _blHP :: Int
        , _wlIsSeeThrough :: Bool
        }
-    | AutoDoor 
-        { _wlLine :: [Point2] , _wlID :: Int 
-        , _doorMech :: World -> World
-        , _wlColor :: Color
-        , _wlDraw :: Maybe (Wall -> Drawing)
-        , _wlSeen :: Bool
-        , _wlIsSeeThrough :: Bool
-        , _wlCastShadow :: Bool
-        }
    | Door 
        { _wlLine :: [Point2] , _wlID :: Int 
        , _doorMech :: World -> World
@@ -563,6 +554,7 @@ data Wall
        , _wlDraw :: Maybe (Wall -> Drawing)
        , _wlSeen :: Bool
        , _wlIsSeeThrough :: Bool
+        , _doorPathable :: Bool
        }
    | Block 
        { _wlLine :: [Point2]
@@ -574,17 +566,8 @@ data Wall
        , _blHP :: Int
        , _wlIsSeeThrough :: Bool
        , _blVisible :: Bool
-        , _blShadows :: [Int]
        , _blDegrades :: [Int]
-        , _wlCastShadow :: Bool
-        }
-    | MultiBlock
-        { _wlLine :: [Point2]
-        , _wlID :: Int
-        , _wlColor :: Color
-        , _wlSeen :: Bool
-        , _wlIsSeeThrough :: Bool
-        , _subWalls :: [Wall]
+        , _blShadows :: [Int]
        }

 data ForceField = FF { _ffLine :: [Point2] , _ffID :: Int