Improve rooms

src/Dodge/Room/Tanks.hs

@@ -4,21 +4,22 @@ import Dodge.LevelGen.Data
 import Dodge.RandomHelp
 import Dodge.Room.Procedural
 import Dodge.Room.Foreground
+import Dodge.Room.Modify.Girder
 --import Dodge.Room.RoadBlock
 import Dodge.Placement.Instance
 import Dodge.Placement.TopDecoration
 import Dodge.PlacementSpot
 --import Padding
 import Color
-import Shape
+--import Shape
 import LensHelp
-import Geometry
+--import Geometry
 
 --import Data.Maybe
 --import Data.Tree
 import Control.Monad.State
 import System.Random
-import qualified Data.Set as S
+--import qualified Data.Set as S
 
 randomTank :: RandomGen g => State g Placement
 randomTank = takeOne $ map (\f -> f (dim orange) orange)
@@ -29,29 +30,6 @@ randomTank = takeOne $ map (\f -> f (dim orange) orange)
     , roundTankCross
     , tankSquareDec plusDecoration
     ]
-addGirderNS :: RandomGen g => (Point2 -> Point2 -> Shape) -> Color -> Room -> State g Room
-addGirderNS shapef col room = do
-    let nwestlnks = length $ filter ((OnEdge North `S.member`) . _rlType) $ _rmLinks room
-    girderPosOrder <- shuffle [1 .. nwestlnks - 2]
-    return $ room & rmPmnts .:~ foldr1 setFallback 
-        (sps0 PutNothing : [ twoRoomPoss 
-            (isUnusedLnkType (FromWest i)) 
-            (isUnusedLnkType (FromWest i)) 
-            $ \ps1 ps2 -> sps0 $ PutShape $ colorSH col $ shapef (_psPos ps1) (_psPos ps2) 
-       | i <- girderPosOrder]
-        )
-addGirderEW :: RandomGen g => (Point2 -> Point2 -> Shape) -> Color -> Room -> State g Room
-addGirderEW shapef col room = do
-    let nwestlnks = length $ filter ((OnEdge West `S.member`) . _rlType) $ _rmLinks room
-    girderPosOrder <- shuffle [1 .. nwestlnks - 2]
-    return $ room & rmPmnts .:~ foldr1 setFallback 
-        (sps0 PutNothing :
-        [ twoRoomPoss
-            (isUnusedLnkType (FromSouth i)) 
-            (isUnusedLnkType (FromSouth i)) 
-            $ \ps1 ps2 -> sps0 $ PutShape $ colorSH col $ shapef (_psPos ps1) (_psPos ps2) 
-       | i <- girderPosOrder]
-        )
 
 tanksRoom :: RandomGen g => [Creature] -> [Item] -> State g Room
 tanksRoom crs its = do