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)

src/Dodge/Room/Door.hs

@@ -5,6 +5,7 @@ import Geometry
 import Dodge.RoomLink
 import Dodge.Data
 import Dodge.Default.Room
+import Dodge.Default.Door
 import Dodge.Placement.Instance
 import Color
 
@@ -39,6 +40,6 @@ triggerDoorRoom inplid = defaultRoom
 -- note no bounds
     }
   where 
-    f (pmnt:_) = putDoubleDoor False red (cond pmnt) (V2 0 20) (V2 40 20) 2
+    f (pmnt:_) = putDoubleDoor (switchWallCol red) (cond pmnt) (V2 0 20) (V2 40 20) 2
     f _ = error "tried to put a door using an empty placement list"
     cond pmnt w = w & _triggers w IM.! fromJust (_plMID pmnt)

src/Dodge/Room/LongDoor.hs

@@ -46,8 +46,8 @@ twinSlowDoorRoom w h x = defaultRoom
     , _rmPath   = []
     , _rmPmnts     = 
         [ pContID (PS (V2 0 (h-5)) pi) ( PutButton $ makeButton col id)
-            $ \btid -> jsps0J (PutSlideDr False col (thedoor btid) 1 (V2 x 1) (V2 x h))
-            $ ps0 (PutSlideDr False col (thedoor btid) 1 (V2 (-x) 1) (V2 (-x) h))
+            $ \btid -> jsps0J (PutSlideDr (thedoor btid) thewall 1 (V2 x 1) (V2 x h))
+            $ ps0 (PutSlideDr (thedoor btid) thewall 1 (V2 (-x) 1) (V2 (-x) h))
             $ \did -> jps0' (PutLS (lsColPos (V3 0.75 0 0) (V3 0 (h-1) lampHeight)))
             $ \lspl -> jsps0 $ PutProp $ addColorChange (fromJust $ _plMID lspl) did $ lampCoverWhen (drmoving did) (V2 0 (h-1)) lampHeight
         ]
@@ -56,6 +56,7 @@ twinSlowDoorRoom w h x = defaultRoom
     , _rmViewpoints = [V2 0 h]
     }
   where
+    thewall = switchWallCol red
     wlSpeed = 0.5
     addColorChange lsid drid = over pjUpdate $ dbArgChain $ const f
       where
@@ -114,9 +115,10 @@ addButtonSlowDoor x h rm = do
         [MountedLS (fromJust $ _plMID plls), MountedProp (fromJust $ _plMID plpr)]
     -- TODO make the height of this light source and of other mounted lights
     -- be taken from a single consistent source
+    thewall = switchWallCol red
     butDoor = putLitButOnPos col 
         (rprBool (isUnusedLnkType InLink))
-        $  \btplmnt -> Just $ putDoubleDoorThen False col (cond' $ fromJust $ _plMID btplmnt) 
+        $  \btplmnt -> Just $ putDoubleDoorThen thewall (cond' $ fromJust $ _plMID btplmnt) 
                             30 (V2 0 h) (V2 x h) 2
         $ \dr1 dr2 -> 
             amountedlight dr1 50

src/Dodge/Room/Procedural.hs

@@ -267,9 +267,10 @@ centerVaultRoom w h d = return $ defaultRoom
     col = dim $ dim $ bright red
     theDoor = 
         [ pContID (PS (V2 35 (d+4)) 0) (PutButton $ makeSwitch col red id id)
-            $ \btid -> jspsJ (V2 0 (d-10)) 0 (PutSlideDr False col (thedoor btid) 1 (V2 (-21) 0) (V2 0 0))
-            $          sPS   (V2 0 (d-10)) 0 (PutSlideDr False col (thedoor btid) 1 (V2   21  0) (V2 0 0))
+            $ \btid -> jspsJ (V2 0 (d-10)) 0 (PutSlideDr (thedoor btid) thewall 1 (V2 (-21) 0) (V2 0 0))
+            $          sPS   (V2 0 (d-10)) 0 (PutSlideDr (thedoor btid) thewall 1 (V2   21  0) (V2 0 0))
         ]
+    thewall = switchWallCol col
     thedoor btid = defaultDoor
         & drTrigger .~ (\w' -> _btState (_buttons w' IM.! btid) == BtOn)
         & drSpeed .~ 2