Cleanup

src/Dodge/Floor.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE TupleSections #-}
+--{-# LANGUAGE TupleSections #-}
 --{-# OPTIONS_GHC -Wno-unused-imports #-}
 {- | The tree of rooms that make up a level. -}
 module Dodge.Floor
@@ -40,18 +40,16 @@ initialAnoTree = padSucWithDoors $ treeFromPost
     [[AnoApplyInt 110 startRoom]
     , [PassthroughLockKeyLists 2 keyCardRunPastRand itemRooms]
     , [SpecificRoom $ warningRooms 777777]
-    , [SpecificRoom $ return ( toOnward "chaseCrit+armourChaseCrit rectRoom"
-            , return . useAll $ roomRectAutoLinks 400 400
-                & rmPmnts .++~ [spNoID anyUnusedSpot (PutCrit invisibleChaseCrit)
-                , spNoID anyUnusedSpot (PutCrit armourChaseCrit)
-                ]
-            )
+    , [SpecificRoom $ rToOnward "chaseCrit+armourChaseCrit rectRoom"
+        $ return . cleatOnward $ roomRectAutoLinks 400 400 & rmPmnts .++~ 
+            [ spNoID anyUnusedSpot (PutCrit invisibleChaseCrit)
+            , spNoID anyUnusedSpot (PutCrit armourChaseCrit)
+            ]
     ]
 --    , [AnoApplyInt 100 healthTest]
     , [PassthroughLockKeyLists 23 
         [(sensorRoomRunPast ELECTRICAL, takeOne [STATICMODULE,SPARKGUN] )] itemRooms]
-    , [SpecificRoom ((return . useAll <$> tanksRoom [] []) 
-        <&> (toOnward "empty tanksRoom",))]
+    , [SpecificRoom (tanksRoom [] [] >>= rToOnward "empty tanksRoom" . pure . cleatOnward)]
     , [PassthroughLockKeyLists 222 lockRoomKeyItems itemRooms]
     , [SpecificRoom randomChallenges]
     , [AnoApplyInt 1 lasSensorTurretTest]
@@ -95,11 +93,9 @@ initialAnoTree = padSucWithDoors $ treeFromPost
 --    ,[Corridor]
 --    ,[TreasureAno [addArmour autoCrit,addArmour autoCrit] [launcher]]
 --    ,[Corridor]
-    ,[SpecificRoom $ (pure . useAll <$> randomFourCornerRoom []) 
-        <&>(toOnward "randomFourCornerRoom" , )]
+    ,[SpecificRoom $ randomFourCornerRoom [] >>= rToOnward "randomFourCornerRoom" . pure . cleatOnward ]
     ] 
-    [SpecificRoom $ fmap (pure . useAll) (telRoomLev 1) 
-        <&> (toOnward "telRoomLev" ,)]
+    [SpecificRoom $ telRoomLev 1 >>= rToOnward "telRoomLev" . pure . cleatOnward]
 
 {- | A test level tree. -}
 initialRoomTree :: State StdGen (Tree (Room -> Maybe ([String],Room), Tree Room))