Fold in new composing room datatype

2021-11-22 12:46:32 +00:00
parent e185caf157
commit 09e774d009
9 changed files with 166 additions and 144 deletions
@@ -3,6 +3,7 @@
 module Dodge.Annotation.Data where
 import Dodge.Data
 import Dodge.Room
+import Dodge.Tree.Compose.Data

 import Data.Tree
 import Control.Monad.State
@@ -15,10 +16,10 @@ data Annotation g
    | FirstWeapon
    | EndRoom
    | OrAno [[Annotation g]]
-    | SpecificRoom (State g (Tree (Either Room Room)))
+    | SpecificRoom (State g (SubCompTree Room))
    | BossAno Creature
    | TreasureAno [Creature] [Item]
-    | AnoApplyInt Int (Int -> State g (Tree (Either Room Room)))
+    | AnoApplyInt Int (Int -> State g (SubCompTree Room))
    | SetLabel Int (State g Room)
    | UseLabel Int (State g Room)
    | ChainAnos [[Annotation g]]