Cleanup

src/Dodge/Room/Corridor.hs

@@ -17,8 +17,7 @@ import Tile
 corridor :: Room
 corridor = defaultRoom
     { _rmPolys = [poly]
-    , _rmOutLinks = init lnks'
-    , _rmInLinks = [last lnks']
+    , _rmLinks = lnks'
     , _rmPath  = concatMap (doublePair . (,) (V2 20 60) . fst) lnks
     , _rmPmnts    = [ spanLightI (V2 0 40) (V2 40 40) ]
     , _rmBound = [ rectNSWE 50 30 0 40 ]
@@ -55,8 +54,7 @@ corridorN :: Room
 corridorN = defaultRoom
     { _rmPolys = [rectNSWE 80 0 0 40
                  ]
-    , _rmOutLinks = init lnks
-    , _rmInLinks = [last lnks]
+    , _rmLinks = lnks
     , _rmPath  = pth
     , _rmPmnts    = []
     , _rmBound = [ rectNSWE 50 30 0 40 ]
@@ -69,24 +67,23 @@ corridorWallN :: Room
 corridorWallN = defaultRoom
     { _rmPolys = [rectNSWE 70 0 0 40
                  ]
-    , _rmOutLinks = init lnks
-    , _rmInLinks = [last lnks]
+    , _rmLinks = lnks
     , _rmPath  = pth
     , _rmPmnts    = []
     , _rmBound = [ rectNSWE 50 30 0 40 ]
     }
-    where lnks = [uncurry outLink(V2 20 70  ,0)
+  where 
+    lnks = [uncurry outLink(V2 20 70  ,0)
                  ,uncurry inLink(V2 20 10  ,pi)
                  ]
-          pth = doublePair (V2 20 70,V2 20 10)
+    pth = doublePair (V2 20 70,V2 20 10)
 
 tEast :: Room
 tEast = defaultRoom
     { _rmPolys = [rectNSWE 80 0  (-20) 20
                  ,rectNSWE 80 40 (-40) 40
                  ]
-    , _rmOutLinks = init lnks'
-    , _rmInLinks = [last lnks']
+    , _rmLinks = lnks'
     , _rmPath  = concatMap (doublePair . (,) (V2 0 60) . fst) lnks
     , _rmPmnts    = []
     , _rmBound = [ rectNSWE 70 10 0 40 ]
@@ -107,15 +104,14 @@ tWest = defaultRoom
     { _rmPolys = [rectNSWE 80 0  (-20) 20
                  ,rectNSWE 80 40 (-40) 40
                  ]
-    , _rmOutLinks = map (uncurry outLink) $ init lnks
-    , _rmInLinks = [uncurry inLink $ last lnks]
-    , _rmPath  = concatMap (doublePair . (,) (V2 0 60) . fst) lnks
+    , _rmLinks = lnks
+    , _rmPath  = concatMap (doublePair . (,) (V2 0 60) . fst) $ map lnkPosDir lnks
     , _rmPmnts    = []
     , _rmBound = [ rectNSWE 70 10 0 40 ]
     }
   where 
     lnks =
-        [(V2 (-30) (60),pi/2)
-        ,(V2 ( 30) (60),-pi/2)
-        ,(V2 (0) (10),pi)
+        [outLink (V2 (-30) (60)) (pi/2)
+        ,outLink (V2 ( 30) (60)) (-pi/2)
+        ,inLink  (V2 (0) (10)) pi
         ]