Remove redundant placement generation

src/Dodge/Data/GenWorld.hs

@@ -57,7 +57,6 @@ data PSType
     | PutForeground ForegroundShape
     | PutWorldUpdate (PlacementSpot -> World -> World)
     | PutNothing
-    | PutUsingGenParams (World -> (World, PSType))
     | PutID {_putID :: Int}
     | PutChasm {_putChasmPoly :: [Point2]}
 

src/Dodge/Placement/Instance/Sensor.hs

@@ -14,10 +14,8 @@ import Geometry
 damageSensor :: SensorType -> Float -> Maybe Int -> PlacementSpot -> Placement
 damageSensor dt wdth mtrid ps = pContID ps (PutLS $ lsPosCol (V3 0 0 30) 0.1) $
     \lsid -> psPtJpl ps
-        . PutUsingGenParams
+        $
-        $ \gw ->
+             PutMachine
-            ( gw
-            , PutMachine
                 (reverse $ square wdth)
                 ( defaultMachine
                     & mcColor .~ yellow
@@ -28,13 +26,11 @@ damageSensor dt wdth mtrid ps = pContID ps (PutLS $ lsPosCol (V3 0 0 30) 0.1) $
                             ( DamSensor
                                 0
                                 dt
---                                (_sensorCoding (_cwgParams $ _cwGen (_cWorld gw)) M.! dt)
                                 (damageTypeThreshold dt)
                             )
                 )
                 defaultSensorWall
                 Nothing
-            )
 
 damageTypeThreshold :: SensorType -> Int
 damageTypeThreshold dt = case dt of

src/Dodge/Placement/PlaceSpot.hs

@@ -126,9 +126,6 @@ placeSpotID' ps pt w = case pt of
     PutNothing -> (0, w)
     PutID i -> (i, w)
     PutWorldUpdate f -> (0, w & f ps)
-    PutUsingGenParams f ->
-        let (w', pt') = f w
-         in placeSpotID' ps pt' w'
     PutChasm ps' -> (0, w & cWorld . chasms .:~ map doShift ps')
   where
     p@(V2 px py) = _psPos ps