Cleanup, fix tank opacity

src/Dodge/Room/GlassLesson.hs

@@ -59,4 +59,4 @@ glassLesson = do
 glassLessonRunPast :: RandomGen g => State g (SubCompTree Room)
 glassLessonRunPast = f <$> glassLesson
   where
-    f (Node r rs) = Node r $ (return $ UseLabel 0 $ door & rmConnectsTo .~ S.singleton (OnEdge West)) : rs
+    f (Node r rs) = Node r $ return (UseLabel 0 $ door & rmConnectsTo .~ S.singleton (OnEdge West)) : rs

src/Dodge/Room/LasTurret.hs

@@ -36,7 +36,8 @@ cenLasTur = roomNgon 8 200 & rmPmnts .~
 
 lightSensInsideDoor :: Room -> Room
 lightSensInsideDoor rm = rm 
-    & rmPmnts .:~ (psPt atFstLnkOut $ PutShape $ colorSH yellow $
+    & rmPmnts .:~ psPt atFstLnkOut 
+        (PutShape $ colorSH yellow $
         thinHighBar 0 (V2 20 (-1)) (V2 20 (-100))
         <> thinHighBar 0 (V2 0 (-100)) (V2 20 (-100))
         <> barPP 1.5 (V3 20 (-1) 0) (V3 20 (-1) 80))
@@ -65,8 +66,8 @@ lightSensByDoor rm = rm
 
 lasSensorTurretTest :: RandomGen g => Int -> State g (SubCompTree Room)
 lasSensorTurretTest n = do
-    cenroom <- shuffleLinks $ lightSensInsideDoor cenLasTur & rmLabel .~ Just n
-    let doorroom = switchDoorRoom & rmTakeFrom .~ Just n
+    cenroom <- shuffleLinks $ lightSensInsideDoor cenLasTur & rmLabel ?~ n
+    let doorroom = switchDoorRoom & rmTakeFrom ?~ n
     return $ treeFromPost [PassDown door,PassDown cenroom,PassDown doorroom] (UseAll door)
 
 lasCenSensEdge :: RandomGen g => Int -> State g (SubCompTree Room)

src/Dodge/Room/LongRoom.hs

@@ -55,6 +55,6 @@ longRoomRunPast = do
             [ singleUseAll door
             --, return (UseLabel 0 $ door & rmConnectsTo .~ S.singleton InLink)
             , treeFromPost [PassDown $ corridor & rmConnectsTo .~ S.singleton InLink, PassDown corridor] 
-                (UseLabel 0 $ door)
+                (UseLabel 0 door)
             ]
         )