More strictifiiiying

2021-07-30 01:25:11 +02:00
parent 2d8b27746c
commit 7b7fd302d8
37 changed files with 459 additions and 448 deletions
@@ -26,21 +26,21 @@ triLootRoom w h = pure $ defaultRoom
    { _rmPolys  = [ tri
                  , base
                    ]
-    , _rmLinks  = [((0,-80),pi)]
-    , _rmPath   = doublePair ((0,-80),(0,h/2))
+    , _rmLinks  = [((V2 (0) (-80)),pi)]
+    , _rmPath   = doublePair ((V2 (0) (-80)),(V2 (0) (h/2)))
    , _rmPS     =
-        [sPS (15-w,  15)  0 $ PutID 0
-        ,sPS (w-15,  15) pi $ PutID 0
-        ,sPS (   0,h-35)  0 $ PutID 2
-        ,sPS (  -5,h-10)  0 putLamp
-        ,sPS (   5,h-10)  0 putLamp
-        ,sPS (   0,h-15)  0 putLamp
-        ,sPS (   0, -60)  0 putLamp
+        [sPS (V2 (15-w) (  15))  0 $ PutID 0
+        ,sPS (V2 (w-15) (  15)) pi $ PutID 0
+        ,sPS (V2 (   0) (h-35))  0 $ PutID 2
+        ,sPS (V2 (  -5) (h-10))  0 putLamp
+        ,sPS (V2 (   5) (h-10))  0 putLamp
+        ,sPS (V2 (   0) (h-15))  0 putLamp
+        ,sPS (V2 (   0) ( -60))  0 putLamp
        ]
    , _rmBound  = [tri , base]
    }
  where
-    tri = 
+    tri = map toV2
        [ ( -w,30)
        , ( -w, 0)
        , (  w, 0)