Add lights to buttons, cleanup

2021-11-02 19:38:22 +00:00
parent 9eda8c81a9
commit 59f43a3602
25 changed files with 356 additions and 349 deletions
@@ -6,9 +6,9 @@ import Dodge.Room.Link
 import Dodge.Room.Procedural
 import Dodge.Room.Foreground
 import Dodge.Room.Furniture
+import Dodge.Placements
 import Dodge.Layout.Tree.Polymorphic
 import Dodge.LevelGen.Data
-import Dodge.LightSources.Fitting
 import Dodge.Machine.Sensor
 import Geometry.Data
 import Color
@@ -33,7 +33,7 @@ startRoom = do
        <$> randomiseOutLinks (shiftRoomBy (V2 (-20) (-20),0) 
            $ roomRectAutoLinks w h & rmPS .~ 
            [ fground
-            , mountedLightJ (V2 0 (h/3)) (V3 40 (h/3) 70)
+            , mountLightJ (V2 0 (h/3)) (V3 40 (h/3) 70)
            , tankSquareEmboss4 (dim orange) 50 (h-60)
            , tankSquare (dim orange) 50 50
            , tankSquare (dim orange) 50 120