Rework annotations

src/Dodge/Room/Room.hs

@@ -123,11 +123,11 @@ rot90Around cen p = cen +.+ vNormal (p -.- cen)
 -- So, the idea is to attach outer children to the bottommost right nodes
 -- inside an inner tree
 -- no idea what was going on here...
-roomMiniIntro :: RandomGen g => State g (LabTree Room)
+roomMiniIntro :: RandomGen g => State g (MetaTree Room)
 roomMiniIntro = do
     midroom <- join $ takeOne [miniTree2] --,glassLesson]
-    return ( toOnward "roomMiniIntro" 
-        , midroom )
+    rToOnward "roomMiniIntro" 
+        midroom
 
 roomCenterPillar :: RandomGen g => State g Room
 roomCenterPillar = shuffleLinks . restrictInLinks ((\p -> dist p (V2 120 0) < 10) . fst) 
@@ -396,7 +396,7 @@ pistolerRoom = pillarGrid
         ]
             ++)
 
-shootingRange :: RandomGen g => State g (LabTree Room)
+shootingRange :: RandomGen g => State g (MetaTree Room)
 shootingRange = do
     rm1 <- shootersRoom1 >>= shuffleLinks . restrictInLinks (\(V2 _ y,_) -> y < 40)
             . restrictOutLinks  (\(V2 _ y,r) -> y > 200 && r /= 0)