Continue work on generation annotations

2022-06-12 14:37:56 +01:00
parent 2ccb26b289
commit eeec9248bb
4 changed files with 25 additions and 12 deletions
@@ -37,9 +37,9 @@ import RandomHelp

 initialAnoTree :: Annotation
 initialAnoTree = PadWith door $ OnwardList 
-    [ IntAnno 0 $ SpecificRoom . startRoom
+    [ IntAnno' $ SpecificRoom . startRoom
 --    , PassthroughLockKeyLists 2 keyCardRunPastRand itemRooms
-    , SpecificRoom $ warningRooms 1
+    , IntAnno' $ SpecificRoom . warningRooms
    , SpecificRoom $ rToOnward "chaseCrit+armourChaseCrit rectRoom"
        $ return . cleatOnward $ roomRectAutoLinks 400 400 & rmPmnts .++~ 
            [ spNoID anyUnusedSpot (PutCrit invisibleChaseCrit)
@@ -97,5 +97,5 @@ initialAnoTree = PadWith door $ OnwardList
    ]

 {- | A test level tree. -}
-initialRoomTree :: State StdGen (MetaTree Room)
-initialRoomTree = annoToRoomTree initialAnoTree
+initialRoomTree :: State (StdGen,Int) (MetaTree Room)
+initialRoomTree = annoToRoomTree' initialAnoTree