Continue to refactor zoning to be more stream-based

src/Dodge/Room/Airlock.hs

@@ -24,7 +24,7 @@ airlock0 :: Room
 airlock0 = defaultRoom
     { _rmPolys = [ rectNSWE 100 0 0 40 , switchcut]
     , _rmLinks = muout lnks ++ muin [last lnks]
-    , _rmPath  = [(V2 20 95,V2 20 45) ,(V2 20 45,V2 20  5) ]
+    , _rmPath  = foldMap doublePairSet [(V2 20 95,V2 20 45) ,(V2 20 45,V2 20  5) ]
     , _rmPmnts    = 
         [pContID (PS (V2 (-35) 50) (negate $ pi/2)) (PutButton $ makeSwitch col red id id)
             $ \btid -> Just $ putDoubleDoorThen thewall (not . cond' btid) 1 (V2 0 20) (V2 40 20) 2
@@ -49,7 +49,7 @@ airlockSimple = defaultRoom
     { _rmPolys =
         [ rectNSWE 120 0 0 180 ]
     , _rmLinks = map (uncurry outLink) (init lnks) ++ [uncurry inLink $ last lnks]
-    , _rmPath  = concatMap (doublePair. (V2 90 30,) . fst) lnks
+    , _rmPath  = foldMap (doublePairSet . (V2 90 30,) . fst) lnks
     , _rmPmnts = 
         [pContID (PS (V2 90 115) pi) (PutButton $ makeSwitch col red id id)
             $ \btid -> jspsJ (V2 0 0) 0 (PutDoor col (cond btid) outDoorps)
@@ -72,7 +72,7 @@ airlockZ = defaultRoom
     { _rmPolys =
         [ rectNSWE 120 0 0 180 ]
     , _rmLinks = muout[(V2 0 30,pi/2)] ++ muin[(V2 180 30,1.5*pi) ]
-    , _rmPath  = []
+    , _rmPath  = mempty
 --         [(V2 0 40,V2 40 0)
 --         ,(V2 40 0,V2 0 40)
 --         ]
@@ -109,10 +109,7 @@ airlock90 = defaultRoom
             ]
         ]
     , _rmLinks = muout[(V2 0 40,pi/2)] ++ muin[(V2 40 0,pi) ]
-    , _rmPath  = 
-         [(V2 0 40,V2 40 0)
-         ,(V2 40 0,V2 0 40)
-         ]
+    , _rmPath  = doublePairSet (V2 0 40,V2 40 0)
     , _rmPmnts    = 
         [ pContID (PS (V2 120 120) (3 * pi/4)) (PutButton $ makeSwitch col red id id)
             $ \btid -> jsps (V2 5 5) 0 $ PutDoor col (cond btid) pss
@@ -137,7 +134,7 @@ airlockCrystal :: Room
 airlockCrystal = defaultRoom
     { _rmPolys = [ rectNSWE 140 0 0 40 , switchcutout ]
     , _rmLinks = muout[(V2 20 130,0) ] ++ muin[(V2 20  0 ,pi) ]
-    , _rmPath  = [ ]
+    , _rmPath  = mempty
     , _rmPmnts    = 
         [pContID (PS (V2 145 70) (pi/2)) ( PutButton $ makeSwitch col red id id)
             $ \btid -> jsps0 $ PutDoor col (cond btid) pss