Cleanup

src/Dodge/Room/LasTurret.hs

@@ -42,7 +42,7 @@ lightSensInsideDoor i rm =
                  , psPt atFstLnkOut (PutForeground $ floorWire (V2 0 (-100)) (V2 20 (-100)))
                  , psPt atFstLnkOut (PutForeground $ verticalWire (V2 20 0) 0 80)
                  ]
-        & rmOutPmnt . at i ?~ (sensAboveDoor LaserSensor 10 (atFstLnkOutShiftInward 100))
+        & rmOutPmnt . at i ?~ sensAboveDoor LaserSensor 10 (atFstLnkOutShiftInward 100)
 
 lightSensByDoor :: Int -> Room -> Room
 lightSensByDoor i rm =
@@ -52,7 +52,7 @@ lightSensByDoor i rm =
                  , heightWallPS (atNthLnkOutShiftInward 1 100) 30 covershape
                  , heightWallPS (atFstLnkOutShiftInward 100) 30 covershape
                  ]
-        & rmOutPmnt . at i ?~ (sensAboveDoor LaserSensor 20 (atFstLnkOutShiftBy sensorshift))
+        & rmOutPmnt . at i ?~ sensAboveDoor LaserSensor 20 (atFstLnkOutShiftBy sensorshift)
   where
     covershape = rectNSWE 10 (-10) (-20) 20
     sensorshift (p, a) = (p +.+ rotateV a (V2 60 (-20)), a)
@@ -82,11 +82,10 @@ analyserByNthLink n proxreq i rm =
             .++~ [ psPt (atNthLinkOut n) $ PutForeground $ verticalWire (V2 20 0) 0 80
                  ]
         & rmOutPmnt . at i ?~ 
-                    ( analyser
+                     analyser
                         proxreq
                         (atNthLnkOutShiftBy n (\(p, a) -> (p +.+ rotateV a (V2 18.5 (-2.5)), a)))
                         (atNthLnkOutShiftBy n sensorshift)
-                    )
   where
     sensorshift (p, a) = (p +.+ rotateV a (V2 (-30) (-10)), a)
 

src/Dodge/Room/SensorDoor.hs

@@ -66,4 +66,4 @@ sensInsideDoor senseType i rm = rm
                 (textTerminal & tmCommands .:~ TCDamageCommand)
                 & plSpot .~ rprBoolShift isUnusedLnk (shiftInBy 10)
              ]
-    & rmOutPmnt . at i ?~ (sensAboveDoor senseType 10 (atFstLnkOutShiftInward 100))
+    & rmOutPmnt . at i ?~ sensAboveDoor senseType 10 (atFstLnkOutShiftInward 100)

src/Dodge/Room/Tutorial.hs

@@ -42,9 +42,9 @@ import TreeHelp
 
 tutAnoTree :: Annotation
 tutAnoTree =
-    OnwardList $
+    OnwardList 
         [ AnTree $ return $ tToBTree "teststart" $ return $ cleatOnward corridor
---        , AnTree $ tutDrop
+        , AnTree $ tutDrop
 ----        , AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
 --        , AnTree corDoor
 --        , AnTree $ tutRooms

src/Dodge/Room/Warning.hs

@@ -52,10 +52,11 @@ addDoorAtNthLinkToggleTerminal j xs i = (rmName .++~ "doorToggle-")
 
 
 addWarningTerminal :: String -> Int -> Room -> Room
-addWarningTerminal str = addDoorToggleTerminal (makeColorTermLine red "WARNING" : makeTermPara str)
+addWarningTerminal str = addDoorToggleTerminal 
+    (makeColorTermLine red "WARNING" : makeTermPara str)
 
 lineOutputTerminal :: [TerminalLine] -> Terminal
-lineOutputTerminal tls = defaultTerminal & tmBootLines .~ connectionBlurbLines tls
+lineOutputTerminal tls = defaultTerminal & tmBootLines .~ textInputBlurb tls
 
 moveToSideNthOutLink :: Int -> RoomPos -> Room -> Maybe (Point2, Float)
 moveToSideNthOutLink i rp rm = do