Commit before making out and in placements have ids

src/Dodge/Placement/Instance/Button.hs

@@ -90,9 +90,9 @@ extTrigLitPos ps f = psPtCont ps (PutTrigger (const False))
     thels = lsColPosRad (V3 0.5 0 0) (V3 0 0 78) 75
 
 putLitButOnPosExtTrig :: Color 
-   -> (RoomPos -> Room -> Maybe (PlacementSpot,RoomPos)) 
+   -> PlacementSpot 
    -> Placement
-putLitButOnPosExtTrig col f 
+putLitButOnPosExtTrig col thePS
     = psPtCont thePS (PutTrigger (const False))
     $ \tp -> Just $ plSpot .~ _plSpot tp $ mntLSOn aShape (Just col) ls 0 (V3 0 (-40) 40)
     $ \plmnt -> let lsid = fromJust $ _plMID plmnt
@@ -104,4 +104,3 @@ putLitButOnPosExtTrig col f
     oneff tid = triggers . ix tid .~ const True
     changeLight lsid = lightSources . ix lsid . lsParam . lsCol .~ V3 0 0.5 0
     ls = lsRadCol 75 (V3 0.5 0 0)
-    thePS = PSPos f (const id) Nothing

src/Dodge/Placement/Instance/LightSource.hs

@@ -22,7 +22,7 @@ propLSThen :: (Prop -> World -> World)
     -> Prop
     -> (Placement -> Placement -> Maybe Placement) -- ^ continuation, access to ls and prop placements
     -> Placement
-propLSThen propf lsf ls prop cont = pt0 (PutLS $ ls)
+propLSThen propf lsf ls prop cont = pt0 (PutLS ls)
     $ \lspl -> Just $ pt0 (PutProp $ prop & pjUpdate .~ theupdate (fromJust $ _plMID lspl))
     $ cont lspl
   where