Cleanup

src/Dodge/Room/Room.hs

@@ -219,12 +219,11 @@ weaponLongCorridor = do
     putWp = set rmPmnts [sPS (V2 20 60) 0 $ RandPS randFirstWeapon ,spanLightI (V2 0 40) (V2 40 40)]
 
 critInDeadEnd :: Room
-critInDeadEnd = set rmPmnts [sPS (V2 0 0) 0 randC1] deadEndRoom
+critInDeadEnd = deadEndRoom & rmPmnts .~ [sPS (V2 0 0) 0 randC1]
 
 deadEndRoom :: Room
 deadEndRoom = defaultRoom
-    { _rmPolys = [rectNSWE 40 (-20) (-20) 20
-                 ]
+    { _rmPolys = [rectNSWE 40 (-20) (-20) 20 ]
     , _rmLinks = muout (init lnks) ++ muin [last lnks]
     , _rmPath  = []
     , _rmPmnts = [sPS (V2 0 (-10)) 0 putLamp]
@@ -282,11 +281,9 @@ shootersRoom' = do
         & rmRandPSs .~ [toPS x1 y1,toPS x2 y2,toPS x3 y3]
 
 shootersRoom1 :: RandomGen g => State g Room
-shootersRoom1 = shootersRoom' <&> rmPmnts %~ 
-    ( (
-    RandomPlacement $ takeOne $ map (\i -> spNoID (PSRoomRand i (uncurry PS)) (PutCrit autoCrit))
-                    [0,1,2]
-    ) :)
+shootersRoom1 = shootersRoom' <&> rmPmnts .:~ RandomPlacement 
+    (takeOne $ map (\i -> spNoID (PSRoomRand i (uncurry PS)) (PutCrit autoCrit))
+                    [0,1,2])
 
 shootersRoom :: RandomGen g => State g Room
 shootersRoom = shootersRoom' <&> rmPmnts .++~
@@ -310,13 +307,13 @@ shootingRange = do
     rm3 <- shootersRoom >>= shuffleLinks
             . restrictInLinks  (\(V2 x y,_) -> y < 10 && x > 20 && x < 180)
             . restrictOutLinks (\(_,r) -> r == 0)
+    let padcutroom = roomPadCut (rectNSWE 40 (-40) (-80) 80) (V2 0 20)
+            & rmPmnts .:~ spanLightI (V2 (-80) 10) (V2 80 10)
     rToOnward "shootingRange" $ treePost 
         [ rm1
-        , roomPadCut (rectNSWE 40 (-40) (-80) 80) (V2 0 20)
-            & rmPmnts %~ (spanLightI (V2 (-80) 10) (V2 80 10) :)
+        , padcutroom
         , rm2
-        , roomPadCut (rectNSWE 40 (-40) (-80) 80) (V2 0 20)
-            & rmPmnts %~ (spanLightI (V2 (-80) 10) (V2 80 10) :)
+        , padcutroom
         , cleatOnward rm3
         ]