Make tanks into decorated blocks

src/Dodge/Data.hs

@@ -986,6 +986,8 @@ data Block = Block
     , _blFootprint  :: [Point2]
     , _blPos        :: Point2
     , _blDir        :: Float
+    , _blHeight     :: Float
+    , _blMaterial   :: Material
     , _blDraw       :: Block -> SPic
     , _blDeath      :: Block -> World -> World
     , _blObstructs  :: [(Int,Int,PathEdge)]
@@ -1064,10 +1066,6 @@ data MachineType
         , _tuFireTime   :: Int
         , _tuMCrID      :: Maybe Int
         }
-data BlockShifter = BlockShifter
-    { _bsID :: Int
-    , _bsBlocks :: IS.IntSet
-    }
 data Door = Door
     { _drID :: Int
     , _drWallIDs :: IS.IntSet
@@ -1097,6 +1095,7 @@ data DoorStatus = DoorOpen | DoorClosed | DoorHalfway | DoorInt Int
 data PushSource = PushesItself
     | PushedBy Int
     | NotPushed
+  deriving (Eq,Ord,Show)
 
 data ActionPlan
     = Inanimate