Refactor material sounds

src/Dodge/Data/Material.hs

@@ -0,0 +1,7 @@
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE StrictData #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE DeriveGeneric #-}
+module Dodge.Data.Material where
+data Material = Wood | Dirt | Stone | Glass | Metal | Crystal
+  deriving (Eq,Ord,Show,Bounded,Enum)

src/Dodge/Data/SoundOrigin.hs

@@ -1,5 +1,6 @@
 module Dodge.Data.SoundOrigin
     where
+import Dodge.Data.Material
 data SoundOrigin = InventorySound 
     | BackgroundSound
     | OnceSound
@@ -20,6 +21,7 @@ data SoundOrigin = InventorySound
     | CrHitSound Int
     | BarrelHiss Int
     | GlassBreakSound Int
+    | MaterialSound Material Int
     | TeleSound Int
     | LeverSound Int
     | Explosion Int

src/Dodge/Data/Wall.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE DeriveGeneric #-}
 module Dodge.Data.Wall where
+import Dodge.Data.Material
 import Geometry
 import Color
 import ShapePicture
@@ -39,8 +40,6 @@ data WallStructure
         { _wlStCreature :: Int 
 --        , _wlStDamCreature :: Damage -> Wall -> Int -> World -> World
         }
-data Material = Wood | Dirt | Stone | Glass | Metal | Crystal
-  deriving (Eq,Ord,Show,Bounded,Enum)
 makeLenses ''Wall
 makeLenses ''WallStructure
 makeLenses ''Opacity