Rethink damage data type, work on damage sensors

src/Dodge/Placement/Instance/LightSource.hs

@@ -124,11 +124,12 @@ mntLSLampCol shp (V4 x y z _) wallp lampp = mntLSOn shp Nothing (defaultLS & lsP
     col = V3 x y z
 
 mntLSCond :: (Point2 -> Point3 -> Shape) 
-    -> (RoomPos -> Room -> Maybe (PlacementSpot,RoomPos)) 
+--    -> (RoomPos -> Room -> Maybe (PlacementSpot,RoomPos)) 
+    -> PlacementSpot
     -> Placement
-mntLSCond shp shift = -- updatePSToLevel 1 (const $ PSLnk shift (const id) Nothing) $ 
+mntLSCond shp ps = -- updatePSToLevel 1 (const $ PSLnk shift (const id) Nothing) $ 
     mntLS shp 0 (V3 0 (-40) 90)
-    & plSpot .~ PSPos shift (const id) Nothing
+    & plSpot .~ ps
     -- note that this perhaps pushes the vshape light out too far
 
 mntLight :: Point2 -> Point2 -> Placement
@@ -136,11 +137,10 @@ mntLight a b = RandomPlacement $ do
     shp <- takeOne [vShape,iShape,lShape,jShape,liShape]
     return $ mntLS shp a (addZ 90 b)
 
-mntLightLnkCond :: (RoomPos -> Room -> Maybe (PlacementSpot,RoomPos)) 
-    -> Placement
-mntLightLnkCond f = RandomPlacement $ do
+mntLightLnkCond :: PlacementSpot -> Placement
+mntLightLnkCond ps = RandomPlacement $ do
     shp <- takeOne [vShape,iShape,lShape,jShape,liShape]
-    return $ mntLSCond shp f
+    return $ mntLSCond shp ps
 
 spanLSLightI :: LightSource -> Float -> Point2 -> Point2 -> Placement
 spanLSLightI ls h a b = ps0j (PutLS $ ls & lsParam . lsPos .~ V3 x y h)