Various improvements, metal debris

src/Dodge/Room/Airlock.hs

@@ -5,7 +5,7 @@ import Dodge.Placement.Instance
 import Dodge.Room.Foreground
 import Dodge.RoomLink
 import Dodge.Default.Room
-import Dodge.Default.Wall
+import Dodge.Default.Door
 import Dodge.Data
 import Dodge.LevelGen.Data
 import Dodge.LevelGen.Switch
@@ -13,6 +13,7 @@ import RandomHelp
 import Geometry
 import Picture
 
+--import Control.Lens
 import qualified Data.IntMap.Strict as IM
 {- | A passage with a switch that opens forward access while closing backwards access. -}
 airlock :: RandomGen g => State g Room
@@ -26,8 +27,8 @@ airlock0 = defaultRoom
     , _rmPath  = [(V2 20 95,V2 20 45) ,(V2 20 45,V2 20  5) ]
     , _rmPmnts    = 
         [pContID (PS (V2 (-35) 50) (negate $ pi/2)) (PutButton $ makeSwitch col red id id)
-            $ \btid -> Just $ putDoubleDoorThen False col (not . cond' btid) 1 (V2 0 20) (V2 40 20) 2
-                $ \_ _ -> Just $ putDoubleDoor False col (cond' btid) (V2 0 80) (V2 40 80) 2
+            $ \btid -> Just $ putDoubleDoorThen thewall (not . cond' btid) 1 (V2 0 20) (V2 40 20) 2
+                $ \_ _ -> Just $ putDoubleDoor thewall (cond' btid) (V2 0 80) (V2 40 80) 2
         , invisibleWall $ rectNSWE 60 40 (-40) (-30)
         ,spanLightI (V2 (-2) 30) (V2 (-2) 70)
         ,sps0 $ PutShape $ thinHighBar 75 (V2 40 50) (V2 (-1) 50)
@@ -35,6 +36,7 @@ airlock0 = defaultRoom
     , _rmBound = [rectNSWE 75 15 0 40,switchcut]
     }
   where 
+    thewall = switchWallCol col
     switchcut = rectNSWE 65 35 (-40) 20 
     lnks = [(V2 20 95,0)
            ,(V2 20  5,pi)