Refactoring, add screen when generating level

src/Dodge/Room/Procedural.hs

@@ -6,6 +6,7 @@ module Dodge.Room.Procedural
     , roomRectAutoLinks
     , randomFourCornerRoom
     , centerVaultRoom
+    , combineRooms
     ) where
 import Dodge.Data
 import Dodge.Room.Data
@@ -230,7 +231,6 @@ centerVaultRoom n w h d = do
         weDoors = rectNSWE 20 (-20) (d + 20) (negate (d +20)) 
         centerPoly = rectWdthHght (d - 20) (d - 20)
         polys = centerPoly : nsDoors : weDoors : (take 4 $ iterate (map vNormal) northPoly)
-    cr <- takeOne [miniGunCrit, autoCrit]
     return $ Room
         { _rmPolys  = polys
         , _rmLinks  = 
@@ -246,11 +246,6 @@ centerVaultRoom n w h d = do
             ,PS (w-5,5-h) 0 putLamp
             ,PS (5-w,h-5) 0 putLamp
             ,PS (5-w,5-h) 0 putLamp
-            ,PS (0,h-5) 0 $ PutCrit explosiveBarrel
-            ,PS (5,h-5) 0 $ PutCrit explosiveBarrel
-            ,PS (0,h) 0 $ PutCrit explosiveBarrel
-            ,PS (-4,h-5) 0 $ PutCrit explosiveBarrel
-            ,PS (0,0) 0 $ PutCrit (cr & crState . crDropsOnDeath .~ DropAll)
             ]
             ++ concat (zipWith (\i r -> map (shiftPSBy ((0,0),r)) $ theDoor i) 
                         [n, n+1, n+2, n+3] [0,pi/2,pi,3*pi/2])
@@ -265,3 +260,4 @@ centerVaultRoom n w h d = do
                            (over worldState (M.insert (DoorNumOpen i) False))
         ]
     cond i w = or $ M.lookup (DoorNumOpen i) (_worldState w)
+