Commit mid big tree composing change

src/Dodge/Room/SensorDoor.hs

@@ -1,5 +1,6 @@
 --{-# LANGUAGE TupleSections #-}
 module Dodge.Room.SensorDoor where
+import Dodge.UseAll
 import Dodge.LevelGen.Data
 import Dodge.PlacementSpot
 import Dodge.Placement.Instance.Terminal
@@ -35,12 +36,12 @@ import Data.Maybe
 
 -- TODO fix case where the sensor created by sensInsideDoor blocks another door
 -- for roomRectAutoLinks-- make the locked door a center door?
-sensorRoom :: RandomGen g => DamageType -> Int -> State g (SubCompTree Room)
+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 [PassDown door,PassDown $ cenroom & rmLinkEff .~ f,PassDown doorroom] (UseAll door)
+    return $ treeFromPost [ door, cenroom & rmLinkEff .~ f, doorroom] (useAll door)
   where
     f _ _ 0 rl rm = rm & rmLinks %~ map (g (_rlPos rl) (_rlDir rl))
     f _ _ _ _ rm = rm
@@ -51,18 +52,18 @@ sensorRoom senseType n = do
         p' = p +.+ rotateV d (V2 0 (negate 100))
         isclose = dist (_rlPos rl) p' < 30
 
-sensorRoomRunPast :: RandomGen g => DamageType -> Int -> State g (LabSubCompTree Room)
+sensorRoomRunPast :: RandomGen g => DamageType -> Int -> State g (LabTree Room)
 sensorRoomRunPast dt n = do
     t <- sensorRoom dt n
-    return (applyToSubforest [0] (++
+    return ( toOnward "sensorRoomRunPast"
+        , applyToSubforest [0] (++
         [treeFromPost 
-            [PassDown $ door & rmConnectsTo 
+            [ door & rmConnectsTo 
                 .~ (\s -> S.member InLink s && not (S.member BlockedLink s))
-            ] (UseLabel 0 corridor)
+            ] (useLabel 0 corridor)
         ]
         ) t 
-        ,TreeSubLabelling "sensorRoomRunPast" Nothing)
-        --[return $ UseLabel 0 $ door & rmConnectsTo .~ S.member InLink]
+        )--[return $ useLabel 0 $ door & rmConnectsTo .~ S.member InLink]
 
 sensAboveDoor :: DamageType -> Float -> PlacementSpot -> Placement
 sensAboveDoor sensetype wth ps = extTrigLitPos