Commit mid block refactor

src/Dodge/Room/Pillar.hs

@@ -1,4 +1,5 @@
 module Dodge.Room.Pillar where
+import Dodge.Default.Block
 import Dodge.Placement.Instance.LightSource
 import Dodge.Data
 import Dodge.Cleat
@@ -29,10 +30,10 @@ blockPillar w' h' = ps0jPushPS (aline tl tr)
     tr = V2 w h
     br = V2 w (-h)
     bl = V2 (-w) (-h)
-    aline = PutLineBlock baseBlockPane StoneBlock 9 9
+    aline = PutLineBlock baseBlockPane 9 9
 
 smallPillar :: PSType
-smallPillar = PutBlock StoneBlock 500 baseBlockPane $ reverse $ square 5
+smallPillar = PutBlock defaultBlock 500 baseBlockPane $ reverse $ square 5
 
 crossPillar :: Float -> Float -> Placement
 crossPillar w' h' = ps0jPushPS (aline (V2 (-w) 0) (V2 w 0))

src/Dodge/Room/RoadBlock.hs

@@ -1,6 +1,7 @@
 {- Connecting rooms designed with a pass-through technique in mind.  -}
 module Dodge.Room.RoadBlock where
 import Dodge.Default.Wall
+import Dodge.Default.Block
 import Dodge.Cleat
 import Dodge.Data
 import Dodge.RoomLink
@@ -67,7 +68,7 @@ blockedCorridor :: RandomGen g => State g (Tree Room)
 blockedCorridor = longBlockedCorridor 0
 
 dirtPoly :: [Point2] -> PSType
-dirtPoly = PutBlock DirtBlock 1 defaultDirtWall . reverse
+dirtPoly = PutBlock defaultDirtBlock defaultDirtWall . reverse
 
 -- | A single corridor with a destructible block blocking it.
 blockedCorridorCloseBlocks :: RandomGen g => State g Room