Commit before improving logging of annotations

src/Dodge/Annotation.hs

@@ -13,7 +13,7 @@ import Dodge.Annotation.Data
 import LensHelp
 
 --import Control.Lens
---import Data.Maybe
+import Data.Maybe
 
 {- | Add one corridor between each parent-child link of a tree of annotations.  -}
 --padWithCorridors :: Annotation -> Annotation
@@ -48,11 +48,19 @@ annoToRoomTree' an = case an of
     OnwardList ans -> do
         mts <- mapM annoToRoomTree' ans
         return $ foldr1 attachOnward mts
-    IntAnno' f -> do 
+    IntAnno f -> do 
         (g,i) <- get
         put (g,i+1)
         annoToRoomTree' (f i)
     PadWith r an -> annoToRoomTree' an
+    PassthroughLockKeyLists ls ks i -> zoom _1 $ do
+        (functionlockroom,randomitemidentity) <- takeOne ls
+        lr <- functionlockroom i
+        ii <- randomitemidentity
+        keyroom <- fromJust $ lookup ii ks
+        return $ MTree ("PassthroughLockKeyLists-"++show ii) 
+            (MTree "" lr [MBranch "" (toLabel' i) keyroom])
+            []
 
 --annoToRoomTree :: Annotation -> State StdGen (MetaTree Room)
 --annoToRoomTree an = case an of