Add lights to buttons, cleanup

src/Dodge/Room.hs

@@ -10,31 +10,20 @@ import Dodge.Item.Weapon.BulletGuns
 import Dodge.Item.Weapon.Launcher
 import Dodge.Creature
 import Dodge.Room.Foreground
---import Dodge.Creature.Inanimate
---import Dodge.LevelGen
 import Dodge.LevelGen.Data
---import Dodge.Base
 import Dodge.RandomHelp
-import Dodge.LevelGen
 import Dodge.Default.Wall
---import Dodge.Path
---import Dodge.Layout
 import Dodge.Layout.Tree.Polymorphic
 import Dodge.Layout.Tree.Either
-import Dodge.LightSources.Fitting
---import Dodge.LightSources
---import Dodge.SoundLogic
+import Dodge.Placements
 import Dodge.Room.Data
-import Dodge.Room.Placement
 import Dodge.Room.Procedural
 import Dodge.Room.Corridor
 import Dodge.Room.Link
---import Dodge.Room.Branch
 import Dodge.Room.Door
 import Dodge.Room.Airlock
 import Dodge.Room.LongDoor
 import Geometry
---import Geometry.Data
 import Picture
 import Tile
 
@@ -44,8 +33,6 @@ import Control.Monad.Loops
 import System.Random
 import Data.Tree
 import Data.Bifunctor
---import qualified Data.Map as M
---import qualified Data.IntMap.Strict as IM
 
 roomC :: Float -> Float -> Room
 roomC x y = defaultRoom
@@ -66,7 +53,7 @@ roomC x y = defaultRoom
     yn = 4
     yd = (y - 40) / fromIntegral yn
     xd = (x - 40) / fromIntegral xn
-    pth  = linksAndPath lnks $ translateS (V2 20 20) (makeGrid xd xn yd yn)
+    pth  = linksAndPath lnks $ map (bimap (+.+ V2 20 20) (+.+ V2 20 20)) (makeGrid xd xn yd yn)
 
 roomPadCut :: [Point2] -> Point2 -> Room
 roomPadCut ps p = defaultRoom
@@ -79,9 +66,9 @@ roomPadCut ps p = defaultRoom
 roomPillars :: Room
 roomPillars = over rmLinks init $ set rmPS plmnts $ roomRect 240 240 2 2
   where 
-    plmnts = mountedLightI 70 (V2 120 24) (V2 120 216) 
-        : mountedLightV (V2 12 12) (V3 25 25 70)
-        : mountedLightV (V2 228 228) (V3 215 215 70)
+    plmnts = mountLightI 70 (V2 120 24) (V2 120 216) 
+        : mountLightV (V2 12 12) (V3 25 25 70)
+        : mountLightV (V2 228 228) (V3 215 215 70)
         : sps0 (PutForeground $ thinHighBar 75 (V2 26 25) (V2 120 25))
         : sps0 (PutForeground $ thinHighBar 75 (V2 214 215) (V2 120 215))
         : g 180 150 90 60