Refactor

src/Dodge/Room/Boss.hs

@@ -19,10 +19,10 @@ import Data.Tree
 import Control.Monad.State
 import Control.Lens
 import System.Random
-roomOctogon
+roomGlassOctogon
     :: Float    -- ^ Size
     -> Room
-roomOctogon x = Room
+roomGlassOctogon x = Room
     { _rmPolys = [rectNSWE x (-x) (-x) x
                  ,rectNSWE 0 (-(x + 40)) (-20) 20
                  ]
@@ -63,7 +63,7 @@ armouredChasers = do
 
 randomMediumRoom :: RandomGen g => State g Room
 randomMediumRoom = takeOne 
-    [ roomOctogon 300
+    [ roomGlassOctogon 300
     , roomCross 180 300
     , roomShuriken 200 300
     , roomTwistCross 230 300 0

src/Dodge/Room/Procedural.hs

@@ -1,6 +1,5 @@
-{-
-Procedural creation of rooms and subroom parts.
--}
+{- | 
+ Procedural creation of rooms and subroom parts.  -}
 module Dodge.Room.Procedural
     ( roomRect
     , roomRectAutoLinks
@@ -24,6 +23,7 @@ import Picture
 
 import Data.List (nub,nubBy,sortBy,minimumBy)
 import Data.Function (on)
+import qualified Data.Tuple.Extra as Tup
 import qualified Data.Map as M
 import Control.Lens
 import Control.Monad
@@ -49,10 +49,10 @@ roomRect x y xn yn = Room
   where 
     yd = (y - 40) / fromIntegral yn
     xd = (x - 40) / fromIntegral xn
-    elnks = flip zip (repeat ( pi/2)) $ translateS (0,20) $ gridPoints  0  1      yd (yn+1)
-    wlnks = flip zip (repeat (-pi/2)) $ translateS (x,20) $ gridPoints  0  1      yd (yn+1)
-    nlnks = flip zip (repeat (    0)) $ translateS (20,y) $ gridPoints xd (xn+1)  0  1
-    slnks = flip zip (repeat (   pi)) $ translateS (20,0) $ gridPoints xd (xn+1)  0  1
+    elnks = zip (translateS (0,20) $ gridPoints  0  1      yd (yn+1))  (repeat ( pi/2)) 
+    wlnks = zip (translateS (x,20) $ gridPoints  0  1      yd (yn+1))  (repeat (-pi/2)) 
+    nlnks = zip (translateS (20,y) $ gridPoints xd (xn+1)  0  1     )  (repeat      0 ) 
+    slnks = zip (translateS (20,0) $ gridPoints xd (xn+1)  0  1     )  (repeat     pi ) 
     lnks = nlnks ++ elnks ++ wlnks ++ slnks
     pth  = linksAndPath lnks $ translateS (20,20) (makeGrid xd xn yd yn)
 {-
@@ -65,7 +65,7 @@ makeGrid :: Float -> Int -> Float -> Int -> [(Point2,Point2)]
 makeGrid x nx y ny 
     = nub 
     . concatMap doublePair 
-    . concatMap (\p -> map (\(a,b) -> (p +.+ a,p +.+ b)) $ makeRect x y)
+    . concatMap (\p -> map (Tup.both (p +.+)) $ makeRect x y)
     $ gridPoints x nx y ny
 
 gridPoints :: Float -> Int -> Float -> Int -> [Point2]