Remove Annotation datatype

src/Dodge/Room/Airlock.hs

@@ -6,7 +6,6 @@ module Dodge.Room.Airlock where
 import Data.Maybe
 import Control.Lens
 import Control.Monad
---import Dodge.Annotation.Data
 import Dodge.Data.GenWorld
 import Dodge.Default.Door
 import Dodge.Default.Room

src/Dodge/Room/GlassLesson.hs

@@ -1,8 +1,8 @@
 --{-# LANGUAGE TupleSections #-}
 module Dodge.Room.GlassLesson where
 
+import Dodge.Data.MTRS
 import qualified Data.Set as S
-import Dodge.Annotation.Data
 import Dodge.Cleat
 import Dodge.Creature
 import Dodge.Data.GenWorld

src/Dodge/Room/LongDoor.hs

@@ -151,7 +151,7 @@ addButtonSlowDoor x h rm = do
                                     Nothing
     col = dim $ light red
 
-slowDoorRoom :: State StdGen Room
+slowDoorRoom :: RandomGen g => State g Room
 slowDoorRoom = do
     x <- state $ randomR (400, 800)
     y <- state $ randomR (400, 800)
@@ -168,7 +168,7 @@ slowDoorRoom = do
     proom <- southPillarsRoom x y h
     addButtonSlowDoor x h (proom & rmPmnts %~ (++ (crits ++ barrels)))
 
-slowDoorRoomRunPast :: State StdGen (MetaTree Room String)
+slowDoorRoomRunPast :: RandomGen g => State g (MetaTree Room String)
 slowDoorRoomRunPast = do
     r <- slowDoorRoom
     rToOnward "slowDoorRoomRunPast" $

src/Dodge/Room/SensorDoor.hs

@@ -1,8 +1,8 @@
 --{-# LANGUAGE TupleSections #-}
 module Dodge.Room.SensorDoor (sensAboveDoor,sensorRoomRunPast) where
 
+import Dodge.Data.MTRS
 import qualified Data.Set as S
-import Dodge.Annotation.Data
 import Dodge.Cleat
 import Dodge.Data.GenWorld
 import Dodge.LevelGen.PlacementHelper

src/Dodge/Room/Tutorial.hs

@@ -1,6 +1,6 @@
 module Dodge.Room.Tutorial where
 
-import Dodge.Annotation
+import Dodge.Data.MTRS
 import Dodge.Room.Room
 import Dodge.Cleat
 import Dodge.Data.GenWorld
@@ -38,16 +38,15 @@ import TreeHelp
 
 tutAnoTree :: State LayoutVars MTRS
 tutAnoTree =
-    annoToRoomTree $
-    OnwardList
-        [ AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
-        , AnTree corDoor
-        , AnTree tutRooms
-        , AnTree corDoor
-        , AnTree $ tToBTree "critroom" <$> weaponBehindPillar
-        , AnTree corDoor
-        , AnTree tutDrop
-        , AnTree $ return $ tToBTree "cor" $ return $ cleatOnward corridor
+    foldMTRS
+        [ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
+        , corDoor
+        , tutRooms
+        , corDoor
+        ,  tToBTree "critroom" <$> weaponBehindPillar
+        , corDoor
+        , tutDrop
+        , return $ tToBTree "cor" $ return $ cleatOnward corridor
         ----        , AnTree $ pickupTut
         ----        , AnTree $ weaponTut
         ]