Add lights to buttons, cleanup

src/Dodge/Room/Airlock.hs

@@ -2,12 +2,10 @@
 {- Rooms that contain two doors and a switch alternating both.  -}
 module Dodge.Room.Airlock where
 import Dodge.Room.Data
-import Dodge.LightSources.Fitting
-import Dodge.Room.Placement
+import Dodge.Placements
 import Dodge.Room.Foreground
 import Dodge.Default.Room
 import Dodge.Data
-import Dodge.Placements
 import Dodge.LevelGen.Data
 import Dodge.LevelGen.Switch
 import Dodge.RandomHelp
@@ -30,7 +28,7 @@ airlock0 = defaultRoom
         [Placement (PS (V2 (-35) 50) (negate $ pi/2) $ PutButton $ makeSwitch col red id id)
             $ \btid -> Just $ putDoubleDoorThen False col (not . cond' btid) (V2 (-1) 20) (V2 41 20) 2
                 $ Just $ putDoubleDoorThen False col (cond' btid) (V2 (-1) 80) (V2 41 80) 2 Nothing
-        ,mountedLightI 70 (V2 (-2) 30) (V2 (-2) 70)
+        ,mountLightI 70 (V2 (-2) 30) (V2 (-2) 70)
         ,sps0 $ PutForeground $ thinHighBar 75 (V2 40 50) (V2 (-1) 50)
         ]
     , _rmBound = [rectNSWE 75 15 0 40]
@@ -65,7 +63,7 @@ airlock90 = defaultRoom
     , _rmPS    = 
         [ Placement (PS (V2 120 120) (3 * pi/4) (PutButton $ makeSwitch col red id id))
             $ \btid -> jsps (V2 5 5) 0 $ PutDoor col (cond btid) pss
-        ,mountedLightV (V2 20 20) (V3 70 70 50)
+        ,mountLightV (V2 20 20) (V3 70 70 50)
         ]
     , _rmBound = 
         [map toV2 [ (10,10)
@@ -94,7 +92,7 @@ airlockCrystal = defaultRoom
         [ Placement (PS (V2 145 70) (pi/2) (PutButton $ makeSwitch col red id id))
             $ \btid -> jsps0 $ PutDoor col (cond btid) pss
         , crystalLine (V2 0 70) (V2 40 70)
-        , mountedLightV (V2 150 70) (V3 110 70 70)
+        , mountLightV (V2 150 70) (V3 110 70 70)
         ]
     , _rmBound = 
         [         ]