Fold in new composing room datatype

src/Dodge/Annotation.hs

@@ -35,12 +35,12 @@ randomPadCorridors  (Node x xs) = do
     xs' <- mapM randomPadCorridors xs
     return $ treeFromTrunk (replicate n [Corridor]) (Node x xs')
 {- | Add a corridor to a random out-link of a room.  -}
-roomThenCorridor :: RandomGen g => Room -> State g (Tree (Either Room Room))
-roomThenCorridor theRoom = fmap (\r -> Node (Left theRoom) [(pure . Right) r]) 
+roomThenCorridor :: RandomGen g => Room -> State g (SubCompTree Room)
+roomThenCorridor theRoom = fmap (\r -> Node (PassDown theRoom) [(pure . UseAll) r]) 
                                 (randomiseOutLinks corridor)
 
 {- | Create a random room tree structure from a list of annotations.  -}
-anoToRoomTree :: RandomGen g => [Annotation g] -> State g (Tree (Either Room Room))
+anoToRoomTree :: RandomGen g => [Annotation g] -> State g (SubCompTree Room)
 anoToRoomTree anos = case anos of
     [AnoApplyInt i f] -> f i
     [SetLabel i randrm] -> do
@@ -55,19 +55,19 @@ anoToRoomTree anos = case anos of
     [OrAno as] -> do
         a <- takeOne as
         anoToRoomTree a
-    [Corridor] -> pure . Right <$> randomiseOutLinks corridor
+    [Corridor] -> pure . UseAll <$> randomiseOutLinks corridor
     [AirlockAno] -> airlock >>=  roomThenCorridor
     [FirstWeapon] -> do
         branchWP <- branchRectWith weaponRoom
         blockedC <- longBlockedCorridor
         join $ takeOne $ return (appendEitherTree branchWP [blockedC]) : replicate 5 weaponRoom
-    [EndRoom] -> fmap (pure . Right) (telRoomLev 1)
+    [EndRoom] -> fmap (pure . UseAll) (telRoomLev 1)
     (SpecificRoom rt:_) -> rt
     (BossAno cr : _) -> do
         br <- bossRoom cr
-        branchRectWith . pure . fmap Left $ treeFromPost [corridor,corridor] br
-    (TreasureAno crs loot : _) -> branchRectWith . fmap (pure . Left) $ lootRoom crs loot
+        branchRectWith . pure . fmap PassDown $ treeFromPost [corridor,corridor] br
+    (TreasureAno crs loot : _) -> branchRectWith . fmap (pure . PassDown) $ lootRoom crs loot
     _ -> do
         w <- state $ randomR (100,400)
         h <- state $ randomR (200,400)
-        fmap (pure . Right) . randomiseOutLinks $ roomRectAutoLinks w h
+        fmap (pure . UseAll) . randomiseOutLinks $ roomRectAutoLinks w h