Simplify layout Annotations

src/Dodge/Room/LongDoor.hs

@@ -151,7 +151,7 @@ addButtonSlowDoor x h rm = do
                                     Nothing
     col = dim $ light red
 
-slowDoorRoom :: RandomGen g => State g Room
+slowDoorRoom :: State StdGen Room
 slowDoorRoom = do
     x <- state $ randomR (400, 800)
     y <- state $ randomR (400, 800)
@@ -168,7 +168,7 @@ slowDoorRoom = do
     proom <- southPillarsRoom x y h
     addButtonSlowDoor x h (proom & rmPmnts %~ (++ (crits ++ barrels)))
 
-slowDoorRoomRunPast :: RandomGen g => State g (MetaTree Room String)
+slowDoorRoomRunPast :: State StdGen (MetaTree Room String)
 slowDoorRoomRunPast = do
     r <- slowDoorRoom
     rToOnward "slowDoorRoomRunPast" $

src/Dodge/Room/Tutorial.hs

@@ -1,5 +1,6 @@
 module Dodge.Room.Tutorial (tutAnoTree) where
 
+import Dodge.Cleat
 import Dodge.Room.Room
 import Dodge.Annotation.Data
 import Dodge.Room.Link
@@ -34,14 +35,15 @@ import Data.List (intersperse)
 tutAnoTree :: Annotation
 tutAnoTree = OnwardList $
         intersperse
-            (AnTree corDoor)
-            [AnTree tutRooms]
+            (AnTree $ zoom lyGen corDoor)
+            [AnTree . zoom lyGen $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
+            ,AnTree $ zoom lyGen tutRooms
+            ]
 
 tutRooms :: State StdGen (MetaTree Room String)
 tutRooms = do
-    x <- tutRezBox
     ys <- toggleDoorTest
-    return $ tToBTree "TutStartRez" $ treePost $ [x,door] <> ys
+    return $ tToBTree "DoorTest" $ treePost $ [] <> ys
 
 tutRezBox :: State StdGen Room
 tutRezBox = do

src/Dodge/Room/Warning.hs

@@ -21,7 +21,7 @@ import Geometry
 import LensHelp
 import RandomHelp
 
-warningRooms :: RandomGen g => String -> Int -> State g (MetaTree Room String)
+warningRooms :: String -> Int -> State StdGen (MetaTree Room String)
 warningRooms str n = do
     rm <- do
         tr <- tanksRoom [] []