Cleanup

src/Dodge/Room/LasTurret.hs

@@ -10,6 +10,7 @@ import Dodge.Room.Door
 import Dodge.Room.Corridor
 import Dodge.Room.Link
 import Dodge.Room.Ngon
+import Dodge.Room.SensorDoor
 --import Dodge.Room.Foreground
 import Dodge.Wire
 import Dodge.Placement.Instance
@@ -42,13 +43,7 @@ lightSensInsideDoor outplid rm = rm
     & rmOutPmnt .~ [OutPlacement (lasSensLightAboveDoor 10 (atFstLnkOutShiftInward 100)) outplid]
 
 lasSensLightAboveDoor :: Float -> PlacementSpot -> Placement
-lasSensLightAboveDoor wth ps = extTrigLitPos 
-    (atFstLnkOutShiftBy (\(p,a) -> (p +.+ rotateV a (V2 18.5 (-2.5)), a)))
-    ( \tp -> Just $ lightSensor wth (_plMID tp) --(upf $ fromJust $ _plMID tp) 
-        ps )
-  where
-    upf trid mc w | _sensAmount (_mcSensor mc) > 900 = w & triggers . ix trid .~ const True
-        | otherwise = w
+lasSensLightAboveDoor = sensAboveDoor LASERING
 
 lightSensByDoor :: Int -> Room -> Room
 lightSensByDoor outplid rm = rm

src/Dodge/Room/SensorDoor.hs

@@ -21,8 +21,6 @@ import LensHelp
 import RandomHelp
 
 import qualified Data.Set as S
-import Data.Maybe
---import Data.Tree
 
 -- TODO fix case where the sensor created by sensInsideDoor blocks another door
 -- for roomRectAutoLinks-- make the locked door a center door?
@@ -60,11 +58,7 @@ sensorRoomRunPast dt n = do
 sensAboveDoor :: DamageType -> Float -> PlacementSpot -> Placement
 sensAboveDoor sensetype wth ps = extTrigLitPos 
     (atFstLnkOutShiftBy (\(p,a) -> (p +.+ rotateV a (V2 18.5 (-2.5)), a)))
-    ( \tp -> Just $ damageSensor sensetype wth (_plMID tp) --(upf $ fromJust $ _plMID tp) 
-        ps )
-  where
-    upf trid mc w | _sensAmount (_mcSensor mc) > 900 = w & triggers . ix trid .~ const True
-        | otherwise = w
+    ( \tp -> Just $ damageSensor sensetype wth (_plMID tp) ps )
 
 sensInsideDoor :: DamageType -> Int -> Room -> Room
 sensInsideDoor senseType outplid rm = rm