Cleanup

src/Dodge/Room/LasTurret.hs

@@ -77,8 +77,8 @@ keyCardRoomRunPast keyid rmid = do
     let doorroom = triggerDoorRoom rmid
     return (toOnward "keyCardRoomRunPast",
         treeFromTrunk [door] $ Node cenroom
-        [ treeFromPost [doorroom] (useAll door)
-        , treeFromPost [door]     (useLabel rmid corridor)
+        [ treeFromPost [doorroom] (cleatOnward door)
+        , treeFromPost [door]     (cleatLabel rmid corridor)
         ])
 
 keyCardAnalyserByDoor :: Int -> Int -> Room -> Room
@@ -106,19 +106,19 @@ analyserByDoor proxreq outplid rm = rm
 healthTest :: RandomGen g => Int -> State g (Tree Room)
 healthTest n = do
     cenroom <- shuffleLinks $ healthAnalyserByDoor n $ roomNgon 8 200
-    let doorroom = triggerDoorRoom n
-    return $ treeFromPost [door
+    return $ treePost 
+        [ door
         , corridor & rmPmnts .:~ spNoID (PS 20 0) (PutFlIt (medkit 100))
-        , cenroom, doorroom] 
-        (useAll door)
+        , cenroom
+        , triggerDoorRoom n
+        , cleatOnward door
+        ]
 
 lasSensorTurretTest :: RandomGen g => Int -> State g (LabTree Room)
 lasSensorTurretTest n = do
     cenroom <- shuffleLinks $ lightSensInsideDoor n cenLasTur
-    let doorroom = triggerDoorRoom n
-    return ( toOnward "lasSensorTurretTest"
-        , treeFromPost [ door, cenroom, doorroom] (useAll door)
-        )
+    rToOnward "lasSensorTurretTest" $ treePost 
+        [ door, cenroom, triggerDoorRoom n, cleatOnward door]
 
 lasCenSensEdge :: RandomGen g => Int -> State g (LabTree Room)
 lasCenSensEdge n = do
@@ -126,9 +126,9 @@ lasCenSensEdge n = do
     let doorroom = triggerDoorRoom n
     rToOnward "lasCenSensEdge"
         $ treeFromTrunk [ door] $ Node cenroom
-        [ treeFromPost [ doorroom] (useAll door)
-        , treeFromPost [ door]     (useLabel 0 corridor)
-        ]
+            [ treePost [ doorroom, cleatOnward door ]
+            , treePost [ door,     cleatLabel 0 corridor]
+            ]
 
 lasTunnel :: RandomGen g => Float -> State g Room
 lasTunnel y = do
@@ -171,6 +171,6 @@ lasTunnelRunPast y = do
     r1 <- takeOne [door,corridor]
     r2 <- takeOne [door,corridor]
     rToOnward "lasTunnelRunPast" $ Node r
-        [ pure $ useAll r1
-        , return (useLabel 0 $ r2 & rmConnectsTo .~ S.member InLink)
+        [ pure $ cleatOnward r1
+        , return (cleatLabel 0 $ r2 & rmConnectsTo .~ S.member InLink)
         ]