Minor cleanup

src/Dodge/Layout.hs

@@ -16,6 +16,7 @@ import Dodge.Room.Link
 import Geometry
 import qualified IntMapHelp as IM
 import Tile
+import Dodge.RandomHelp
 
 import Data.List (nubBy)
 import Data.Traversable
@@ -25,6 +26,7 @@ import Data.Foldable
 import qualified Control.Foldl as L
 import Data.Maybe
 import Data.Function
+import Control.Monad.State
 
 generateLevelFromRoomList :: [Room] -> World -> World
 generateLevelFromRoomList gr' w 
@@ -45,7 +47,12 @@ generateLevelFromRoomList gr' w
     pairPath = concatMap _rmPath rs
     zs = map fromIntegral $ randomRs (0,63::Int) $ _randGen w
     rs = map doRoomShift rs'
-    rs' = zipWith addTile zs gr'
+    rs' = mapM shuffleRoomPos (zipWith addTile zs gr') & evalState $ _randGen w
+
+shuffleRoomPos :: RandomGen g => Room -> State g Room
+shuffleRoomPos rm = do
+    newPos <- shuffle $ _rmPos rm
+    return $ rm & rmPos .~ newPos
 
 placeWires :: (World,[Room])-> World
 placeWires (w,rms) = foldr placeRoomWires w rms