Move towards removing Annotation

src/Dodge/Room/Tutorial.hs

@@ -1,18 +1,13 @@
 module Dodge.Room.Tutorial where
 
+import Dodge.Annotation
 import Dodge.Room.Room
-import Dodge.Annotation.Data
 import Dodge.Cleat
---import Control.Monad
---import qualified Data.Set as S
---import Dodge.Cleat
 import Dodge.Data.GenWorld
 import Dodge.Default.Terminal
 import Dodge.Item.Ammo
 import Dodge.Item.Held.Cane
---import Dodge.Item.Random
 import Dodge.LevelGen.PlacementHelper
---import Dodge.LightSource
 import Dodge.Placement.Instance
 import Dodge.PlacementSpot
 import Dodge.Room.Airlock
@@ -41,11 +36,10 @@ import TreeHelp
 
 --import Data.List (intersperse)
 
-tutAnoTree :: Annotation
+tutAnoTree :: State LayoutVars MTRS
 tutAnoTree =
+    annoToRoomTree $
     OnwardList
-        --        [ AnTree $ return $ tToBTree "teststart" $ return $ cleatOnward corridor
-        --        , AnTree $ tutDrop
         [ AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
         , AnTree corDoor
         , AnTree tutRooms
@@ -58,6 +52,12 @@ tutAnoTree =
         ----        , AnTree $ weaponTut
         ]
 
+foldMTRS :: [State LayoutVars (MetaTree Room String)] 
+    -> State LayoutVars (MetaTree Room String)
+foldMTRS  xs = do
+    ys <- sequence xs
+    return $ foldr1 attachOnward' ys
+
 setRoomInt :: Room -> State LayoutVars (Int,Room)
 setRoomInt x = do
     i <- nextLayoutInt