Cleanup in/outplacements

src/Dodge/Room/LasTurret.hs

@@ -69,14 +69,14 @@ lightSensByDoor outplid rm = rm
 
 lasSensorTurretTest :: RandomGen g => Int -> State g (SubCompTree Room)
 lasSensorTurretTest n = do
-    cenroom <- shuffleLinks $ lightSensInsideDoor n cenLasTur & rmLabel ?~ n
-    let doorroom = switchDoorRoom n & rmTakeFrom ?~ n
+    cenroom <- shuffleLinks $ lightSensInsideDoor n cenLasTur
+    let doorroom = switchDoorRoom n
     return $ treeFromPost [PassDown door,PassDown cenroom,PassDown doorroom] (UseAll door)
 
 lasCenSensEdge :: RandomGen g => Int -> State g (SubCompTree Room)
 lasCenSensEdge n = do
-    cenroom <- shuffleLinks $ (lightSensByDoor n cenLasTur) {_rmLabel = Just n}
-    let doorroom = (switchDoorRoom n) {_rmTakeFrom = Just n}
+    cenroom <- shuffleLinks $ lightSensByDoor n cenLasTur
+    let doorroom = switchDoorRoom n
     return $ treeFromTrunk [PassDown door] $ Node (PassDown cenroom) 
         [ treeFromPost [PassDown doorroom] (UseAll door)
         , treeFromPost [PassDown door]     (UseLabel 0 corridor)

src/Dodge/Room/RunPast.hs

@@ -58,10 +58,9 @@ runPastRoom i = do
         critroom = linkcor & rmPmnts .:~ plRRpt 0 randC1
         aswitchroom = corridorWallN
             {_rmOutPmnt = [OutPlacement (putLitButOnPosExtTrig red useUnusedLnk) i]
-            ,_rmLabel = Just i
             ,_rmPmnts = []
             }
-        switchdoor = switchDoorRoom i & rmTakeFrom ?~ i
+        switchdoor = switchDoorRoom i 
         n = length $ filter theedgetest $ map lnkPosDir $ _rmLinks cenroom
         controom = treeFromPost [PassDown switchdoor,PassDown linkcor] (UseAll door)
         critrooms :: [SubCompTree Room]