Cleanup

src/Dodge/Annotation.hs

@@ -45,13 +45,13 @@ anoToRoomTree anos = case anos of
     [AnoApplyInt i f] -> f i
     [SetLabel i randrm] -> do
         rm <- randrm
-        return . connectRoom $ rm & rmLabel ?~ i
+        return . singleUseAll $ rm & rmLabel ?~ i
     [UseLabel i randrm] -> do
         rm <- randrm
-        return $ connectRoom $ rm & rmTakeFrom ?~ i
+        return $ singleUseAll $ rm & rmTakeFrom ?~ i
     [ChainAnos ass] -> do
         rms <- mapM anoToRoomTree ass
-        return $ linkEitherTrees rms
+        return $ chainUses rms
     [OrAno as] -> do
         a <- takeOne as
         anoToRoomTree a
@@ -60,7 +60,7 @@ anoToRoomTree anos = case anos of
     [FirstWeapon] -> do
         branchWP <- branchRectWith weaponRoom
         blockedC <- longBlockedCorridor
-        join $ takeOne $ return (appendEitherTree branchWP [blockedC]) : replicate 5 weaponRoom
+        join $ takeOne $ return (passUntilUseAll branchWP [blockedC]) : replicate 5 weaponRoom
     [EndRoom] -> fmap (pure . UseAll) (telRoomLev 1)
     (SpecificRoom rt:_) -> rt
     (BossAno cr : _) -> do