Cleanup

src/Dodge/Placement/Instance/Sensor.hs

@@ -1,7 +1,6 @@
 module Dodge.Placement.Instance.Sensor (
     lightSensor,
     damageSensor,
-    sensorSPic, -- this should be moved
 ) where
 
 import Color
@@ -11,10 +10,7 @@ import Dodge.Data.GenWorld
 import Dodge.Default
 import Dodge.LevelGen.Data
 import Dodge.LightSource
-import Dodge.Placement.TopDecoration
 import Geometry
-import Shape
-import ShapePicture
 
 damageSensor ::
     DamageType ->
@@ -34,8 +30,7 @@ damageSensor dt wdth mtrid ps = pContID ps (PutLS $ lsPosCol (V3 0 0 30) 0.1) $
                                 & mcColor .~ yellow
                                 & mcMounts . at ObTrigger .~ mtrid
                                 & mcMounts . at ObLightSource ?~ lsid
-                                & mcDraw .~ MachineDrawDamageSensor wdth (_sensorCoding (_genParams (_cWorld gw)) M.! dt)
-                                & mcSensor .~ DamageSensor False 0 dt
+                                & mcType . _McSensor .~ DamageSensor False 0 dt (_sensorCoding (_genParams (_cWorld gw)) M.! dt)
                             )
                             defaultSensorWall
 
@@ -46,10 +41,3 @@ lightSensor ::
     Placement
 lightSensor = damageSensor LASERING
 
-sensorSPic :: Float -> (PaletteColor, DecorationShape) -> Machine -> SPic
-sensorSPic wdth (pc, ds) mc =
-    noPic $
-        colorSH (_mcColor mc) (upperPrismPoly 25 (square wdth))
-            <> decorationToShape ds wdth wdth 25 col col
-  where
-    col = paletteToColor pc