Cleanup

src/Dodge/Room/Procedural.hs

@@ -206,13 +206,6 @@ quarterRoomSquare w = do
         --, _rmBound = [map toV2 [(w,w),(0,2*w),(-w,w)]]
         , _rmBound = [ map toV2 [(0,0),(w,w),(0,2*w),(-w,w)] ]
         }
-{- | Randomise the ordering of placements in a room.
-Useful for randomising the position of generic placements such as 'PutNothing'. -}
-shufflePlacements :: RandomGen g => Room -> State g Room
-shufflePlacements = rmPmnts shuffle
---shufflePlacements r = do
---    newPSs <- shuffle $ _rmPmnts r
---    return $ r & rmPmnts .~ newPSs
 {- | A randomly generate room based on four randomly generated corners. 
 Tight corridors, random placements. -}
 randomFourCornerRoom :: RandomGen g => [Item] -> State g Room
@@ -226,15 +219,12 @@ Tight corridors. -}
 randomFourCornerRoomCrsIts :: RandomGen g => [Creature] -> [Item] -> State g Room
 randomFourCornerRoomCrsIts crits its = do
     corners <- replicateM 4 . join $ takeOne [quarterRoomTri 100, quarterRoomSquare 100]
-    itms <- shuffle its
-    let putitms = map (\it -> sps0 (PutFlIt it) & plSpot .~ anyUnusedSpot) itms
+    let putitms  = map (\it -> sps0 (PutFlIt it) & plSpot .~ anyUnusedSpot) its
         putcrits = map (\cr -> sps0 (PutCrit cr) & plSpot .~ unusedSpotAwayFromLink 50) crits
-    randomiseAllLinks . (rmPmnts .++~ (putitms ++ putcrits)) =<< 
-        ( shufflePlacements
-        . over rmPmnts ( sps0 putLamp :)
+    shuffleLinks 
+        . (rmPmnts .++~ (sps0 putLamp : putitms ++ putcrits)) 
         . foldr1 combineRooms
         $ zipWith (\r a -> moveRoomBy (V2 0 0,a) r) corners [0,pi/2,pi,3*pi/2]
-        )
 {- | Creates room with a central vault with doors around it.  -}
 centerVaultRoom
     :: Float    -- ^ Width