Start cleanup of room in-links

src/Dodge/Room/RezBox.hs

@@ -70,45 +70,28 @@ rezBoxesWpCrit = do
     h <- state $ randomR (40,40)
     thecol <- rezColor
     theweapon <- randBlockBreakWeapon
-    --horedge <- takeOne [OnEdge North,OnEdge South]
-    let centralRoom = (roomRectAutoLinks w h) {_rmPmnts = []}
-    onwardpassage <- 
-        applyToCompRoot (rmConnectsTo .~ S.singleton (OnEdge West)) <$> maybeBlockedPassage
     let bottomEdgeTest (V2 _ y,_) = y < 1
         aroom = rezInvBox thecol
+    let centralRoom = (roomRectAutoLinks w h) {_rmPmnts = []}
+    onwardpassage <-
+        applyToCompRoot (rmConnectsTo .~ S.singleton (OnEdge West)) <$> maybeBlockedPassage
     let n = length $ filter bottomEdgeTest $ map lnkPosDir $ _rmLinks centralRoom
     i <- state $ randomR (0,n-3)
     j <- state $ randomR (i,n-2)
-    let rezrooms = map adddoor 
+    let rezrooms = map adddoor
             $ insertAt i (wpAdd theweapon aroom) 
             $ insertAt j (crAdd aroom)
             $ replicate (n-3) aroom
     return $ treeFromTrunk [PassDown $ rezBox thecol
         , PassDown door
-        ] 
+        ]
         (Node (PassDown centralRoom) (rezrooms ++ [onwardpassage]))
   where
-    adddoor rm = treeFromPost [PassDown door] (PassDown rm)
+    adddoor rm = treeFromPost [PassDown $ door & rmConnectsTo .~ S.singleton (OnEdge North)] (PassDown rm)
 
 crAdd :: Room -> Room
 crAdd = rmPmnts %~ (sPS (V2 20 10) (0.5*pi) randC1 :)
 
-corridorLRbranches :: RandomGen g => State g (SubCompTree Room)
-corridorLRbranches = do
-    w <- state $ randomR (100,400)
-    h <- state $ randomR (40,40)
-    thecol <- rezColor
-    let bottomEdgeTest (V2 _ y,_) = y < 1
-        dbox = treeFromPost [PassDown door] (PassDown $ rezInvBox thecol)
-    centralRoom <- randomiseOutLinks =<< changeLinkTo bottomEdgeTest 
-        ((roomRectAutoLinks w h) {_rmPmnts = []})
-    let n = length $ filter bottomEdgeTest $ map lnkPosDir $_rmLinks centralRoom
-    centralRoom' <- changeLinkFrom bottomEdgeTest centralRoom
-    return $ treeFromTrunk [PassDown $ rezBox thecol
-        , PassDown door
-        ] 
-        (Node (PassDown centralRoom') (replicate (n-1) dbox ++ [Node (UseAll door) []]))
-
 rezBoxes :: RandomGen g => State g (SubCompTree Room)
 rezBoxes = do
     w <- state $ randomR (100,400)