Make crytal walls destructible by shatterGun

src/Dodge/Placement/Instance/Wall.hs

@@ -3,6 +3,7 @@ module Dodge.Placement.Instance.Wall
 import Dodge.Data
 import Dodge.LevelGen.Data
 import Dodge.Default.Wall
+--import Dodge.Wall.DamageEffect
 import Geometry
 import Shape
 import Color
@@ -71,22 +72,23 @@ Places an breakable window between two points.
 Width 8, also extends out from each point by 8.
  -}
 windowLine :: Point2 -> Point2 -> Placement
-windowLine a b = sps0 $ PutLineBlock baseWindowPane GlassBlock 8 8 a b
+windowLine a b = sps0 $ PutLineBlock defaultWindow GlassBlock 8 8 a b
 {-
 Places an unbreakable window between two points.
 Width 7, also extends out from each point by 7.
  -}
 crystalLine :: Point2 -> Point2 -> Placement
-crystalLine a b = sps0 $ PutWall ps defaultCrystalWall
-  where
-    ps = 
-        [ a +.+ left +.+ up
-        , (a +.+ left) -.- up
-        , (b -.- left) -.- up
-        , (b -.- left) +.+ up
-        ]
-    left = 7 *.* normalizeV (a-.-b)
-    up   = vNormal left
+crystalLine a b = sps0 $ PutLineBlock defaultCrystalWall CrystalBlock 7 7 a b
+--crystalLine a b = sps0 $ PutWall ps defaultCrystalWall
+--  where
+--    ps = 
+--        [ a +.+ left +.+ up
+--        , (a +.+ left) -.- up
+--        , (b -.- left) -.- up
+--        , (b -.- left) +.+ up
+--        ]
+--    left = 7 *.* normalizeV (a-.-b)
+--    up   = vNormal left
 {- Places an unbreakable wall between two points.
 Depth 15, does not extend wider than points.
  -}
@@ -102,7 +104,7 @@ wallLine a b = sps0 $ PutWall ps defaultWall
     up   = vNormal left
 
 windowLineType :: Point2 -> Point2 -> PSType
-windowLineType = PutLineBlock baseWindowPane GlassBlock 8 8
+windowLineType = PutLineBlock defaultWindow GlassBlock 8 8
 
 baseBlockPane :: Wall
 baseBlockPane = defaultWall
@@ -114,27 +116,6 @@ baseBlockPane = defaultWall
     , _wlDraw = True
     , _wlFireThrough = True
     }
-dirtWall :: Wall
-dirtWall = defaultWall
-    { _wlLine = (V2 0 0,V2 50 0)
-    , _wlID = 0
-    , _wlColor = V4 (150/256) ( 75/256)  0 ( 250/256)
-    , _wlSeen = False
-    , _wlOpacity = Opaque
-    , _wlRotateTo = False
-    , _wlDraw = True
-    , _wlFireThrough = True
-    }
-baseWindowPane :: Wall
-baseWindowPane = defaultWall
-    { _wlLine = (V2 0 0,V2 50 0)
-    , _wlID = 0
-    , _wlColor = cyan
-    , _wlSeen = False
-    , _wlOpacity = SeeThrough
-    , _wlDraw = True
-    , _wlFireThrough = True
-    }
 -- TODO find home for this
 {- Replaces instances of a given 'PutID' with 'PSType's drawn from a list.  -}
 replacePutID