Cleanup

src/Dodge/Room/Room.hs

@@ -49,8 +49,7 @@ roomC w h = do
 roomPadCut :: [Point2] -> Point2 -> Room
 roomPadCut ps p = defaultRoom
     { _rmPolys = [ps]
-    , _rmOutLinks = muout [(p,0)]
-    , _rmInLinks = muin [(V2 0 0,pi)]
+    , _rmLinks = muout [(p,0)] ++ muin [(V2 0 0,pi)]
     , _rmPath  = [(V2 0 0,p)]
     }
 roomPillars :: Room
@@ -202,8 +201,7 @@ roomCenterPillar = changeLinkTo ((\p -> dist p (V2 120 0) < 10) . fst)
 roomOctogon :: Room
 roomOctogon = defaultRoom
     { _rmPolys = [poly ]
-    , _rmOutLinks = muout $ init lnks
-    , _rmInLinks = muin [last lnks]
+    , _rmLinks = muout (init lnks) ++ muin [last lnks]
     , _rmPath  = allPairs $ map fst lnks -- this is too much
     , _rmPmnts = []
     , _rmBound = [map toV2 [(-20,30),(20,30),(60,70),(60,110),(20,150),(-20,150),(-60,110),(-60,70)] ]
@@ -225,8 +223,7 @@ roomOctogon = defaultRoom
 roomNgon :: Int -> Float -> Room
 roomNgon n x = defaultRoom
     { _rmPolys = [poly]
-    , _rmOutLinks = muout $init lnks
-    , _rmInLinks = muin[last lnks]
+    , _rmLinks = muout (init lnks) ++ muin[last lnks]
     , _rmPath  = [] -- TODO
     , _rmPmnts = []
     , _rmBound = [poly]
@@ -306,7 +303,8 @@ weaponBehindPillar  = do
     rcp <- roomCenterPillar
     return $ treeFromTrunk 
       [PassDown corridor
-      ,PassDown $ over rmOutLinks tail $ over rmPmnts (++ plmnts1) rcp
+      --,PassDown $ over rmOutLinks tail $ over rmPmnts (++ plmnts1) rcp
+      ,PassDown $ over rmPmnts (++ plmnts1) rcp
       ]
       (singleUseAll $ set rmPmnts [sPS (V2 20 60) (negate $ pi/2) randC1] corridorN)
 
@@ -348,8 +346,7 @@ deadEndRoom :: Room
 deadEndRoom = defaultRoom
     { _rmPolys = [rectNSWE 40 (-20) (-20) 20
                  ]
-    , _rmOutLinks = muout $init lnks
-    , _rmInLinks = muin $[last lnks]
+    , _rmLinks = muout (init lnks) ++ muin [last lnks]
     , _rmPath  = []
     , _rmPmnts    = [sPS (V2 0 (-10)) 0 putLamp]
     , _rmBound = [rectNSWE 20 (-20) (-30) 30]