Successfully push proximity sensor parameters into data

src/Dodge/Room/LasTurret.hs

@@ -84,23 +84,20 @@ keyCardRoomRunPast keyid rmid = do
         ,TreeSubLabelling "keyCardRoomRunPast" Nothing)
 
 keyCardAnalyserByDoor :: Int -> Int -> Room -> Room
-keyCardAnalyserByDoor keyid = analyserByDoor 
-    (machineAddSound fridgeHumS $ testYouHave (KEYCARD keyid))
+keyCardAnalyserByDoor keyid = analyserByDoor (RequireEquipment (KEYCARD keyid))
 
 healthAnalyserByDoor :: Int -> Room -> Room
-healthAnalyserByDoor = analyserByDoor 
-    (machineAddSound fridgeHumS $ testYourHealth 1100)
+healthAnalyserByDoor = analyserByDoor (RequireHealth 1100)
 
-analyserByDoor :: (Machine -> World -> World) -> Int -> Room -> Room
-analyserByDoor mcf outplid rm = rm 
+analyserByDoor :: ProximityRequirement -> Int -> Room -> Room
+analyserByDoor proxreq outplid rm = rm 
     & rmPmnts .++~ 
         [ psPt atFstLnkOut $ PutShape $ colorSH yellow 
             $ barPP 1.5 (V3 20 (-1) 0) (V3 20 (-1) 80)
         ]
     & rmOutPmnt .~ 
         [OutPlacement 
-            (analyser
-                mcf
+            (analyser proxreq
                 (atFstLnkOutShiftBy (\(p,a) -> (p +.+ rotateV a (V2 18.5 (-2.5)), a)))
                 (atFstLnkOutShiftBy sensorshift)
             )