Cleanup

src/Dodge/Room/Start.hs

@@ -11,6 +11,7 @@ import Dodge.LevelGen.Data
 import Dodge.LightSources.Fitting
 import Geometry.Data
 import Color
+import Shape
 
 import Data.Tree
 import Control.Monad.State
@@ -26,15 +27,15 @@ startRoom = do
     w <- state $ randomR (100,400)
     h <- state $ randomR (200,400)
     let fground = sPS (V2 0 0) 0 $ PutForeground $ 
-               girderV 40 20 10 (V2  0    (h/2)) (V2  w    (h/2))
---            <> highPipe 40 (V2  0    (h/2)) (V2  w    (h/2))
---            <> highPipe 60 (V2 (w/3)    0 ) (V2 (w/3)  h   )
+            girderV 40 20 10 (V2  0    (h/2)) (V2  w    (h/2))
     treeFromPost [Left rezBox, Left door] . Right 
         <$> randomiseOutLinks (shiftRoomBy (V2 (-20) (-20),0) 
-                $ roomRectAutoLinks w h & rmPS .~ 
+            $ roomRectAutoLinks w h & rmPS .~ 
             [ fground
             , mountedLightJ (V2 0 (h/3)) (V3 40 (h/3) 70)
             , tankSquareEmboss4 (dim orange) 50 (h-60)
-            , tankSquareEmboss4 (dim orange) 50 50
+            , tankSquare (dim orange) 50 50
+            , tankSquare (dim orange) 50 120
+            , sps0 $ PutForeground $ colorSH orange $ pipePP 2 (V3 50 50 25) (V3 50 120 25)
             ]
             )