Rework annotations

src/Dodge/Room/Start.hs

@@ -48,7 +48,7 @@ powerFakeout = do
                 , keyholeCorridor, corridor])
         `treeFromPost` cleatOnward door
 
-startRoom :: RandomGen g => Int -> State g (LabTree Room)
+startRoom :: RandomGen g => Int -> State g (MetaTree Room)
 startRoom i = join (takeOne
     [-- (,) (0.5::Float) ((chainUses <$> sequence [powerFakeout,fmap fst $weaponRoom i]) 
      --       <&> (,TreeSubLabelling "chainUses <$> sequence [powerFakeout,weaponRoom i]" Nothing))
@@ -56,11 +56,11 @@ startRoom i = join (takeOne
 --      rezBoxesWp                >>= rToOnward "rezBoxesWp"
 --    , rezBoxThenWeaponRoom i
 --    , rezBoxesWpCrit            >>= rToOnward "rezBoxesWpCrit"
-     runPastStart i            >>= rToOnward ("runPastStart " ++ show i)
+     runPastStart i             >>= rToOnward ("runPastStart " ++ show i)
 --    , startCrafts >>= roomsContaining' [] >>= rezBoxThenRooms
 --        >>= rToOnward "startCrafts >>= roomsContaining [] >>= rezBoxThenRooms"
     ])
-randomChallenges :: RandomGen g => State g (LabTree Room)
+randomChallenges :: RandomGen g => State g (MetaTree Room)
 randomChallenges = shootingRange
 --        join (takeOne
 --    [fmap (return . useAll) doubleCorridorBarrels <&> (,TreeSubLabelling "doubleCorridorBarrels" Nothing)
@@ -88,13 +88,12 @@ rezBoxesThenWeaponRoom i = do
     wroom  <- snd <$> weaponRoom i
     return (rboxes `passUntiluseAll` [wroom] , "rezBoxesThenWeaponRoom " ++ show i)
 
-rezBoxThenWeaponRoom :: RandomGen g => Int -> State g (LabTree Room)
+rezBoxThenWeaponRoom :: RandomGen g => Int -> State g (MetaTree Room)
 rezBoxThenWeaponRoom i = do
     rcol <- rezColor
     (_,wroom) <- weaponRoom i
-    return (toOnward ("rezBoxThenWeaponRoom "++ show i)
-        , treeFromTrunk [ rezBox rcol, door] wroom
-        )
+    rToOnward ("rezBoxThenWeaponRoom "++ show i)
+        $ treeFromTrunk [ rezBox rcol, door] wroom
 
 rezBoxThenRoom :: RandomGen g => Room -> State g (Tree Room)
 rezBoxThenRoom r = do