Cleanup

src/Dodge/Room/Start.hs

@@ -80,11 +80,12 @@ rezThenLasTurret = do
     cenroom <- randomiseOutLinks $ centralLasTurret {_rmLabel = Just 0}
     let doorroom = switchDoorRoom {_rmTakeFrom = Just 0}
         contTree = treeFromPost [PassDown cenroom,PassDown doorroom] (UseAll door)
-    return $ rbox `appendEitherTree` [contTree]
+    return $ rbox `passUntilUseAll` [contTree]
 
 startRoom :: RandomGen g => Int -> State g (SubCompTree Room)
 startRoom i = join $ takeOne 
-    [ minigunfakeout
+    [-- roomMiniIntro
+    minigunfakeout
     , rezBoxesWp
     , rezBoxesThenWeaponRoom
     , rezBoxThenWeaponRoom
@@ -96,7 +97,7 @@ runPastStart :: RandomGen g => Int -> State g (SubCompTree Room)
 runPastStart i = do
     s <- rezBoxStart
     rp <- runPastRoom i
-    return $ s `appendEitherTree` [rp]
+    return $ s `passUntilUseAll` [rp]
 
 rezBoxStart :: RandomGen g => State g (SubCompTree Room)
 rezBoxStart = do
@@ -135,7 +136,7 @@ rezBoxesThenWeaponRoom :: RandomGen g => State g (SubCompTree Room)
 rezBoxesThenWeaponRoom = do
     rboxes <- rezBoxes
     wroom  <- weaponRoom
-    return $ rboxes `appendEitherTree` [wroom]
+    return $ rboxes `passUntilUseAll` [wroom]
 
 rezBoxThenWeaponRoom :: RandomGen g => State g (SubCompTree Room)
 rezBoxThenWeaponRoom = do