Cleanup

src/Dodge/Room/SensorDoor.hs

@@ -40,8 +40,12 @@ sensorRoom :: RandomGen g => DamageType -> Int -> State g (Tree Room)
 sensorRoom senseType n = do
     rm <- takeOne [roomNgon 8 200, roomRectAutoLinks 200 200]
     cenroom <- shuffleLinks $ sensInsideDoor senseType n rm
-    let doorroom = triggerDoorRoom n
-    return $ treeFromPost [ door, cenroom & rmLinkEff .~ f, doorroom] (useAll door)
+    return $ treePost 
+        [ door
+        , cenroom & rmLinkEff .~ f
+        , triggerDoorRoom n
+        , cleatOnward door
+        ]
   where
     f _ _ 0 rl rm = rm & rmLinks %~ map (g (_rlPos rl) (_rlDir rl))
     f _ _ _ _ rm = rm
@@ -55,15 +59,13 @@ sensorRoom senseType n = do
 sensorRoomRunPast :: RandomGen g => DamageType -> Int -> State g (LabTree Room)
 sensorRoomRunPast dt n = do
     t <- sensorRoom dt n
-    return ( toOnward "sensorRoomRunPast"
-        , applyToSubforest [0] (++
-        [treeFromPost 
-            [ door & rmConnectsTo 
-                .~ (\s -> S.member InLink s && not (S.member BlockedLink s))
-            ] (useLabel 0 corridor)
-        ]
-        ) t 
-        )--[return $ useLabel 0 $ door & rmConnectsTo .~ S.member InLink]
+    rToOnward "sensorRoomRunPast" $ t & applyToSubforest [0] 
+        (++
+            [treePost 
+                [ door & rmConnectsTo .~ (\s -> S.member InLink s && not (S.member BlockedLink s))
+                , cleatLabel 0 corridor ]
+            ]
+        ) 
 
 sensAboveDoor :: DamageType -> Float -> PlacementSpot -> Placement
 sensAboveDoor sensetype wth ps = extTrigLitPos