Use explicit out and in placements with ids

src/Dodge/Room/Door.hs

@@ -28,12 +28,12 @@ door = defaultRoom
         ,uncurry inLink (V2 20  5,pi)
         ]
 
-switchDoorRoom :: Room
-switchDoorRoom = defaultRoom
+switchDoorRoom :: Int -> Room
+switchDoorRoom inplid = defaultRoom
     { _rmPolys = [rectNSWE 40 0 0 40]
     , _rmLinks = init lnks++ [last lnks]
     , _rmPath  = [(V2 20 35,V2 20 5)]
-    , _rmPartPmnt = Just f
+    , _rmInPmnt = [InPlacement f  inplid]
 -- door extends into side walls (for shadows as rendered 12/03/21)
 -- note no bounds
     }

src/Dodge/Room/LasTurret.hs

@@ -37,14 +37,14 @@ cenLasTur = roomNgon 8 200 & rmPmnts .~
     , mntLightLnkCond unusedLnkToPS
     ]
 
-lightSensInsideDoor :: Room -> Room
-lightSensInsideDoor rm = rm 
+lightSensInsideDoor :: Int -> Room -> Room
+lightSensInsideDoor outplid rm = rm 
     & rmPmnts .:~ psPt atFstLnkOut 
         (PutShape $ colorSH yellow $
         thinHighBar 0 (V2 20 (-1)) (V2 20 (-100))
         <> thinHighBar 0 (V2 0 (-100)) (V2 20 (-100))
         <> barPP 1.5 (V3 20 (-1) 0) (V3 20 (-1) 80))
-    & rmExtPmnt ?~ lasSensLightAboveDoor 10 (atFstLnkOutShiftInward 100)
+    & rmOutPmnt .~ [OutPlacement (lasSensLightAboveDoor 10 (atFstLnkOutShiftInward 100)) outplid]
 
 lasSensLightAboveDoor :: Float -> PlacementSpot -> Placement
 lasSensLightAboveDoor wth ps = extTrigLitPos 
@@ -54,29 +54,29 @@ lasSensLightAboveDoor wth ps = extTrigLitPos
     upf trid mc w | _mcSensor mc > 900 = w & triggers . ix trid .~ const True
         | otherwise = w
 
-lightSensByDoor :: Room -> Room
-lightSensByDoor rm = rm 
+lightSensByDoor :: Int -> Room -> Room
+lightSensByDoor outplid rm = rm 
     & rmPmnts .++~ 
         [ psPt atFstLnkOut $ PutShape $ colorSH yellow 
             $ barPP 1.5 (V3 20 (-1) 0) (V3 20 (-1) 80)
         , heightWallPS (atNthLnkOutShiftInward 1 100) 30 covershape
         , heightWallPS (atFstLnkOutShiftInward 100)   30 covershape
         ]
-    & rmExtPmnt ?~ lasSensLightAboveDoor 20 (atFstLnkOutShiftBy sensorshift)
+    & rmOutPmnt .~ [OutPlacement (lasSensLightAboveDoor 20 (atFstLnkOutShiftBy sensorshift)) outplid]
   where
     covershape = rectNSEW 10 (-10) 20 (-20)
     sensorshift (p,a) = (p +.+ rotateV a (V2 60 (-20)), a)
 
 lasSensorTurretTest :: RandomGen g => Int -> State g (SubCompTree Room)
 lasSensorTurretTest n = do
-    cenroom <- shuffleLinks $ lightSensInsideDoor cenLasTur & rmLabel ?~ n
-    let doorroom = switchDoorRoom & rmTakeFrom ?~ n
+    cenroom <- shuffleLinks $ lightSensInsideDoor n cenLasTur & rmLabel ?~ n
+    let doorroom = switchDoorRoom n & rmTakeFrom ?~ 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 cenLasTur) {_rmLabel = Just n}
-    let doorroom = switchDoorRoom {_rmTakeFrom = Just n}
+    cenroom <- shuffleLinks $ (lightSensByDoor n cenLasTur) {_rmLabel = Just n}
+    let doorroom = (switchDoorRoom n) {_rmTakeFrom = Just n}
     return $ treeFromTrunk [PassDown door] $ Node (PassDown cenroom) 
         [ treeFromPost [PassDown doorroom] (UseAll door)
         , treeFromPost [PassDown door]     (UseLabel 0 corridor)

src/Dodge/Room/RunPast.hs

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