Work toward adding wiring

src/Dodge/Floor.hs

@@ -6,16 +6,7 @@ module Dodge.Floor
 import Geometry.Data
 import Dodge.Data
 import Dodge.Creature.State.Data
-import Dodge.Room.Procedural
-import Dodge.Room.RoadBlock
-import Dodge.Room.Data
 import Dodge.Room
-import Dodge.Room.Door
-import Dodge.Room.Branch
-import Dodge.Room.Boss
-import Dodge.Room.LongDoor
-import Dodge.Room.NoNeedWeapon
-import Dodge.Room.Link
 import Dodge.Placements.Button
 import Dodge.Layout.Tree.Polymorphic
 import Dodge.Layout.Tree.Either
@@ -38,10 +29,11 @@ import Data.Maybe
 initialAnoTree :: RandomGen g => Tree [Annotation g]
 initialAnoTree = padSucWithCorridors $ treeFromTrunk 
     [[StartRoom]
-    ,[SetLabel 0 $ return $ roomRectAutoLinks 100 100 
-        & rmExtendedPmnt ?~ externalButton red (anyLnkInPS 5)
+    ,[ChainAnos [[SetLabel 0 $ return $ roomRectAutoLinks 100 100 
+                    & rmExtPmnt ?~ externalButton red (anyLnkInPS 5) ]
+        ,[UseLabel 0 $ return switchDoorRoom]
+        ]
      ]
-    ,[UseLabel 0 $ return switchDoorRoom]
     ,[SpecificRoom $ return $ connectRoom lasTunnel ]
     ,[SpecificRoom $ fmap connectRoom slowDoorRoom ]
     ,[Corridor]
@@ -113,12 +105,6 @@ layoutLevelFromSeed i seed = do
             putStr $ "Level generation with seed " ++ show seed ++ " failed: "
             let (seed',_) = random g
             layoutLevelFromSeed i' seed'
- -- where
- --   setLastLinkToUsed rm = case _rmLinks rm of
- --       (_:_) -> rm
- --           & rmLinks %~ init
- --           & rmUsedLinks %~ (last (_rmLinks rm) :)
- --       _ -> rm
 
 compactDrawTree :: Tree String -> String
 compactDrawTree = unlines . compactDraw
@@ -132,5 +118,4 @@ compactDraw (Node x ts0) = lines x ++ drawSubTrees ts0
         "|" : compactDraw t
     drawSubTrees (t:ts) =
         "|" : shift "+- " "|  " (compactDraw t) ++ drawSubTrees ts
-
     shift first other = zipWith (++) (first : repeat other)