Move towards better annotations when generating layouts

2022-05-20 11:14:11 +01:00
parent 887dd547d9
commit 1739d648fe
6 changed files with 52 additions and 29 deletions
@@ -47,7 +47,7 @@ initialAnoTree = padSucWithDoors $ treeFromTrunk
    , [SpecificRoom $ return . UseAll <$> tanksRoom [] []]
    , [PassthroughLockKeyLists 2 lockRoomKeyItems itemRooms]
    , [SpecificRoom randomChallenges]
-    , [AnoApplyInt 1 lasSensorTurretTest]
+    , [AnoApplyInt' 1 lasSensorTurretTest "lasSensorTurretTest"]
 --    ,[SpecificRoom $ fmap singleUseAll roomCCrits]
 --    ,[AirlockAno]
 --    ,[Corridor]
@@ -92,6 +92,8 @@ initialAnoTree = padSucWithDoors $ treeFromTrunk
    [SpecificRoom $ fmap (pure . UseAll) (telRoomLev 1)]

 {- | A test level tree. -}
-initialRoomTree :: State StdGen (Tree Room)
-initialRoomTree = do
-    expandTree <$> mapM anoToRoomTree initialAnoTree
+initialRoomTree :: State StdGen (Tree (SubCompTree Room,String))
+initialRoomTree = mapM anoToRoomTree initialAnoTree
+--initialRoomTree :: State StdGen (Tree Room)
+--initialRoomTree = do
+--    expandTree <$> mapM anoToRoomTree initialAnoTree