Cleanup, merge modules

src/Dodge/Room/Airlock.hs

@@ -40,7 +40,7 @@ decontamRoom = do
                                 \_ _ -> Just $ putDoubleDoor DoorObstacle thewall (WdBlBtOn btid) (V2 0 80) (V2 40 80) 2
                    , invisibleWall $ rectNSWE 60 40 (-40) (-30)
                    , spanLightI (V2 (-2) 30) (V2 (-2) 70)
-                   , analyser (RequireNoItems $ ps) (PS 50 0) (PS mcpos 0)
+                   , analyser (NoItemZone ps) (PS 50 0) (PS mcpos 0)
                    ]
             & rmBound .~ [rectNSWE 75 15 0 40, switchcut]
   where

src/Dodge/Room/LasTurret.hs

@@ -84,7 +84,7 @@ analyserByNthLink n proxreq i rm =
                  ]
         & rmOutPmnt . at i ?~ 
                      analyser
-                        proxreq
+                        (SensorWithRequirement proxreq)
                         (atNthLnkOutShiftBy n (\(p, a) -> (p +.+ rotateV a (V2 18.5 (-2.5)), a)))
                         (atNthLnkOutShiftBy n sensorshift)
   where

src/Dodge/Room/Pillar.hs

@@ -126,5 +126,5 @@ roomPillars pillarsize w h wn hn = do
   where
     pilw = ((w - 40 * (fromIntegral wn + 1)) / fromIntegral wn) - pillarsize
     pilh = ((h - 40 * (fromIntegral hn + 1)) / fromIntegral hn) - pillarsize
-    testchasm = Placement 0 (PS 0 0) (PutChasm (map (+V2 50 120) (rectWH 50 25))) Nothing
+    testchasm = Placement (PS 0 0) (PutChasm (map (+V2 50 120) (rectWH 50 25))) Nothing
         (\_ _ -> Nothing)