Make block damages slightly more logical

src/Dodge/Data.hs

@@ -9,6 +9,7 @@ circular imports are probably not a good idea.
 {-# LANGUAGE DeriveGeneric #-}
 module Dodge.Data 
     ( module Dodge.Data
+    , module Dodge.Data.Wall
     , module Dodge.Combine.Data
     , module Dodge.Distortion.Data
     , module Dodge.Data.DamageType
@@ -27,6 +28,7 @@ module Dodge.Data
     , module Dodge.Data.Room
     ) where
 import Dodge.Data.Room
+import Dodge.Data.Wall
 import Dodge.RoomCluster.Data
 import Dodge.Data.ItemAmount
 import Dodge.ShortShow
@@ -927,8 +929,6 @@ data Block = Block
     , _blDraw       :: Block -> SPic
     , _blDeath      :: Block -> World -> World
     }
-data Material = Wood | Dirt | Stone | Glass | Metal | Crystal
-  deriving (Eq,Ord,Show,Bounded,Enum)
 data TerminalStatus = TerminalOff | TerminalBusy | TerminalReady
   deriving (Eq,Ord,Show)
 data TerminalInput = TerminalInput
@@ -1015,38 +1015,6 @@ data Door = Door
     }
 data DoorStatus = DoorOpen | DoorClosed | DoorHalfway | DoorInt Int
   deriving (Eq, Ord, Show)
-data Wall = Wall 
-    { _wlLine           :: (Point2,Point2) 
-    , _wlID             :: Int
-    , _wlColor          :: Color
-    , _wlSeen           :: Bool
-    , _wlOpacity        :: Opacity
-    , _wlPathable       :: Bool
-    , _wlWalkable       :: Bool
-    , _wlTouchThrough   :: Bool
-    , _wlFireThrough    :: Bool
-    , _wlReflect        :: Bool
-    , _wlDraw           :: Bool
-    , _wlRotateTo       :: Bool
-    , _wlStructure      :: WallStructure
-    , _wlHeight         :: Float
---    , _wlDamageEff      :: Damage -> Wall -> World -> World
-    , _wlMaterial       :: Material
-    }
-data Opacity
-    = SeeThrough
-    | SeeAbove
-    | DrawnWall {_opDraw :: Wall -> SPic}
-    | Opaque
-data WallStructure 
-    = StandaloneWall
-    | DoorPart    { _wsDoor    :: Int }
-    | MachinePart { _wsMachine :: Int }
-    | BlockPart   { _wsBlock   :: Int }
-    | CreaturePart 
-        { _wlStCreature :: Int 
---        , _wlStDamCreature :: Damage -> Wall -> Int -> World -> World
-        }
 
 data ActionPlan
     = Inanimate
@@ -1509,9 +1477,6 @@ makeLenses ''TweakParam
 makeLenses ''Prop
 makeLenses ''Modification
 makeLenses ''Particle
-makeLenses ''Wall
-makeLenses ''WallStructure
-makeLenses ''Opacity
 makeLenses ''PressPlate
 makeLenses ''Button
 makeLenses ''ActionPlan