Move towards removing Annotation

2025-09-24 10:17:18 +01:00
parent a83186e6dd
commit 96b95907f2
7 changed files with 384 additions and 77 deletions
@@ -18,13 +18,8 @@ import Dodge.Tree
 import LensHelp
 import RandomHelp

-- | A test level tree.
-initialRoomTree :: State LayoutVars (MetaTree Room String)
-initialRoomTree = annoToRoomTree initialAnoTree
--initialRoomTree = annoToRoomTree startWorldTreeTest
-
 tutRoomTree :: State LayoutVars (MetaTree Room String)
-tutRoomTree = annoToRoomTree tutAnoTree
+tutRoomTree = tutAnoTree

 --startWorldTreeTest :: Annotation
 --startWorldTreeTest  =
@@ -32,8 +27,9 @@ tutRoomTree = annoToRoomTree tutAnoTree
 --            [ IntAnno $ AnTree . startRoom
 --            ]

-initialAnoTree :: Annotation
-initialAnoTree =
+initialRoomTree :: State LayoutVars MTRS
+initialRoomTree =
+    annoToRoomTree $
    OnwardList $
        intersperse
            (AnTree $ zoom lyGen corDoor)