Cleanup

src/Dodge/Room/LasTurret.hs

@@ -62,7 +62,7 @@ lightSensByDoor i rm =
 
 keyCardRoomRunPast :: RandomGen g => Int -> Int -> State g (MetaTree Room String)
 keyCardRoomRunPast keyid rmid = do
-    cenroom <- shuffleLinks =<< keyCardAnalyserByDoor keyid rmid <$> roomNgon 6 200
+    cenroom <- shuffleLinks . keyCardAnalyserByDoor keyid rmid =<< roomNgon 6 200
     let doorroom = triggerDoorRoom rmid
     rToOnward "keyCardRoomRunPast" $
         treeFromTrunk [door] $
@@ -126,7 +126,7 @@ analyserByDoorWithPrompt = analyserByNthLinkWithPrompt 0
 
 healthTest :: RandomGen g => Int -> State g (Tree Room)
 healthTest n = do
-    cenroom <- shuffleLinks =<< healthAnalyserByDoor n <$> roomNgon 8 200
+    cenroom <- shuffleLinks . healthAnalyserByDoor n =<< roomNgon 8 200
     return $
         treePost
             [ door
@@ -138,14 +138,14 @@ healthTest n = do
 
 lasSensorTurretTest :: RandomGen g => Int -> State g (MetaTree Room String)
 lasSensorTurretTest n = do
-    cenroom <- shuffleLinks =<< lightSensInsideDoor n <$> cenLasTur
+    cenroom <- shuffleLinks . lightSensInsideDoor n =<< cenLasTur
     rToOnward "lasSensorTurretTest" $
         treePost
             [door, cenroom, triggerDoorRoom n, cleatOnward door]
 
 lasCenSensEdge :: RandomGen g => Int -> State g (MetaTree Room String)
 lasCenSensEdge n = do
-    cenroom <- shuffleLinks =<< lightSensByDoor n <$> cenLasTur
+    cenroom <- shuffleLinks . lightSensByDoor n =<< cenLasTur
     let doorroom = triggerDoorRoom n
     rToOnward "lasCenSensEdge" $
         treeFromTrunk [door] $

src/Dodge/Room/LongDoor.hs

@@ -84,7 +84,7 @@ twinSlowDoorChasers = do
     return $ twinSlowDoorRoom 80 200 40 & rmPmnts %~ (plmnts ++)
 
 southPillarsRoom :: RandomGen g => Float -> Float -> Float -> State g Room
-southPillarsRoom x y h = addSouthPillars x h =<< (roomRectAutoLinks x y)
+southPillarsRoom x y h = addSouthPillars x h =<< roomRectAutoLinks x y
 
 addSouthPillars :: RandomGen g => Float -> Float -> Room -> State g Room
 addSouthPillars x h r = do

src/Dodge/Room/Room.hs

@@ -134,7 +134,6 @@ roomCenterPillar = do
                         set rmName "roomCenterPillar" $
                             roomRect 240 240 2 2
             )
-  where
 
 weaponEmptyRoom :: State StdGen (Tree Room)
 weaponEmptyRoom = do
@@ -156,7 +155,7 @@ weaponEmptyRoom = do
 
 weaponUnderCrits :: RandomGen g => State g (MetaTree Room String)
 weaponUnderCrits = do
-    let addwpat p = rmPmnts .:~ (sPS p 0 $ RandPS $ fmap PutFlIt randFirstWeapon)
+    let addwpat p = rmPmnts .:~ sPS p 0 (RandPS $ fmap PutFlIt randFirstWeapon)
         continuationRoom =
             treePost
                 [ addwpat (V2 20 0) corridorN
@@ -305,11 +304,10 @@ shootersRoom' = do
 
 shootersRoom1 :: RandomGen g => State g Room
 shootersRoom1 = do
-    pl <- ( takeOne $
+    pl <- takeOne $
                 map
                     (\i -> psPtPl (PSRoomRand i (uncurry PS)) (PutCrit autoCrit))
                     [0, 1, 2]
-            )
     shootersRoom' <&> rmPmnts
         .:~ pl
 

src/Dodge/Room/RunPast.hs

@@ -52,7 +52,7 @@ lockedStart i = do
                         smallRoom
                             {  --_rmOutPmnt = IM.singleton i (putLitButOnPosExtTrig red useUnusedLnk)
                              _rmPmnts = [plRRpt 0 (PutFlIt theweapon)
-                                ,(putLitButOnPosExtTrig red useUnusedLnk) & plExternalID ?~ i]
+                                ,putLitButOnPosExtTrig red useUnusedLnk & plExternalID ?~ i]
                             , _rmBound = [rectNSWE 70 30 0 40]
                             }
                    ]

src/Dodge/Room/Tutorial.hs

@@ -48,11 +48,11 @@ tutAnoTree =
         --        , AnTree $ tutDrop
         [ AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
         , AnTree corDoor
-        , AnTree $ tutRooms
+        , AnTree tutRooms
         , AnTree corDoor
         , AnTree $ tToBTree "critroom" <$> weaponBehindPillar
         , AnTree corDoor
-        , AnTree $ tutDrop
+        , AnTree tutDrop
         , AnTree $ return $ tToBTree "cor" $ return $ cleatOnward corridor
         ----        , AnTree $ pickupTut
         ----        , AnTree $ weaponTut
@@ -95,12 +95,12 @@ tutRooms = do
     i <- nextLayoutInt
     j <- nextLayoutInt
     x <-
-        shuffleLinks =<< analyserByDoorWithPrompt sensorTut (RequireEquipment (AMMOMAG DRUMMAG)) i
-            <$> addDoorAtNthLinkToggleTerminal 1 ss j
+        shuffleLinks . analyserByDoorWithPrompt sensorTut (RequireEquipment (AMMOMAG DRUMMAG)) i
+            =<< addDoorAtNthLinkToggleTerminal 1 ss j
             <$> roomNgon 6 100
     bcor <- blockedCorridor
-    r1 <- (r burstRifle) <&> rmPmnts .:~ t
-    r2 <- (r (drumMag & itConsumables ?~ 500))
+    r1 <- r burstRifle <&> rmPmnts .:~ t
+    r2 <- r (drumMag & itConsumables ?~ 500)
     return $
         tToBTree "DoorTest" $
             Node