Complete stritifying points

src/Dodge/Room.hs

@@ -423,7 +423,7 @@ shootersRoom1 = do
     y3 <- iterateWhile (\y' -> abs (y1 - y2) < 60 && abs (y2 - y') < 60) $ state $ randomR (250,560)
     x4 <- state $ randomR (60,w-60)
     y4 <- state $ randomR (40,180)
-    p <- takeOne [(x1,y1-10),(x2,y2-10),(x3,y3-10)]
+    p <- takeOne [(V2 (x1) (y1-10)),(V2 (x2) (y2-10)),(V2 (x3) (y3-10))]
     let bln x y = putBlockN (x+25) (x-25) (y+10) y
     let blv x y = putBlockV (x+25) (x-25) (y+10) y
     let plmnts = bln x1 y1 ++ bln x2 y2 ++ bln x3 y3 ++ blv x4 y4
@@ -518,7 +518,7 @@ spawnerRoom = do
                  ,wl
                  ,sPS (V2 (x/2) ( y-10)) 0 putLamp
                  ]
-    let f ((lx,_),_) = lx < x/2-5 
+    let f ((V2 lx _),_) = lx < x/2-5 
     roomWithSpawner <- (fmap connectRoom . randomiseOutLinks) =<< filterLinks f (set rmPS plmnts $ roomRect x y 2 2) 
     aRoom <- airlock 0
     return $ treeFromTrunk [Left aRoom] roomWithSpawner