Rework annotations

2022-06-12 13:38:23 +01:00
parent 8b4b6de0c0
commit 2ccb26b289
16 changed files with 161 additions and 154 deletions
@@ -10,20 +10,16 @@ import Control.Monad.State
 import Control.Lens
 import System.Random
 data Annotation
-    = Lock Int
-    | Key  Int
-    | Corridor
-    | AirlockAno
-    | OrAno [[Annotation]]
-    | SpecificRoom (State StdGen (LabTree Room))
-    | BossAno Creature
-    | TreasureAno [Creature] [Item]
+    = -- Corridor
+--    | AirlockAno
+    PadWith Room Annotation
+    | OnwardList [Annotation]
+    | IntAnno Int (Int -> Annotation)
+--    | OrAno [[Annotation]]
+    | SpecificRoom (State StdGen (MetaTree Room))
    | AnoApplyInt Int (Int -> State StdGen (LabTree Room))
-    | AnoNewInt (Int -> State StdGen (Tree Room))
    | PassthroughLockKeyLists Int 
        [(Int -> State StdGen (LabTree Room), State StdGen ItemBaseType)]
        [(ItemBaseType, State StdGen (LabTree Room))]
--    | SetLabel Int (State g Room)
--    | useLabel Int (State g Room)

 makeLenses ''Annotation