Slightly rethink display of inventories and terminals

src/Dodge/Room/Tutorial.hs

@@ -43,12 +43,13 @@ import TreeHelp
 tutAnoTree :: Annotation
 tutAnoTree =
     OnwardList 
-        [ AnTree $ return $ tToBTree "teststart" $ return $ cleatOnward corridor
-        , AnTree $ tutDrop
---        [ AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
+--        [ AnTree $ return $ tToBTree "teststart" $ return $ cleatOnward corridor
+--        , AnTree $ tutDrop
+        [ AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
         , AnTree corDoor
         , AnTree $ tutRooms
         , AnTree $ tutDrop
+        , AnTree $ return $ tToBTree "cor" $ return $ cleatOnward corridor
 ----        , AnTree $ pickupTut
 ----        , AnTree $ weaponTut
         ]
@@ -66,7 +67,7 @@ tutRooms = do
     i <- nextLayoutInt
     j <- nextLayoutInt
     x <- shuffleLinks =<< analyserByDoor (RequireEquipment (AMMOMAG DRUMMAG)) i 
-         <$> addDoorAtNthLinkToggleTerminal 1 (makeTermPara s) j
+         <$> addDoorAtNthLinkToggleTerminal 1 ss j
             <$> roomNgon 6 100
     bcor <- blockedCorridor
     r1 <-(r burstRifle)
@@ -77,7 +78,12 @@ tutRooms = do
         ,bcor
         ]
   where
-    s = "INTERACTION TEST: USE KEYBOARD OR SCROLL TO ENTER COMMANDS."
+    ss = [makeTermLine "BE READY TO PERFORM SOME BASIC TASKS"
+        , makeTermLine ""
+        , makeTermLine "INTERACTION TEST"
+        , makeTermLine "<TYPE OR SCROLL TO SELECT COMMANDS>"
+        , makeTermLine "<USE CLICK OR RETURN TO ENTER COMMANDS>"
+        ]
     r x = roomRectAutoLinks 100 100 <&> rmPmnts .:~ sps (PS 50 0) (PutFlIt x)
 
 tutRezBox :: RandomGen g => State g Room
@@ -87,7 +93,10 @@ tutRezBox = do
         roomRect 40 60 1 1
             & rmPmnts
                 .~ [ sPS (V2 20 1) 0 $ PutLS ls
-                   , putImmediateMessageTerminal terminalColor (defaultTerminal & tmBootLines .~ makeTermPara s <> tlSetStatus (TerminalPressTo "QUIT") <> tlDoEffect TmWdWdDeactivateTerminal)
+                   , putImmediateMessageTerminal terminalColor 
+                    (defaultTerminal & tmBootLines .~ s 
+                    <> tlSetStatus (TerminalPressTo "USE [WASD] TO MOVE") <> tlDoEffect 
+                    (TmWdWdLeaveTerminal "USE [WASD] TO MOVE"))
                         & plSpot .~ PS (V2 20 0) 0
                    ]
             & restrictInLinks (\(V2 _ h, _) -> h < 1)
@@ -96,5 +105,14 @@ tutRezBox = do
   where
     s = tutorialMessage1
 
-tutorialMessage1 :: String
-tutorialMessage1 = "SYNTHESIS SUCCESSFUL. MOBILITY TEST INITIATED [WASD]. INTERACTION TEST IN QUEUE [SPACE]."
+tutorialMessage1 :: [TerminalLine]
+tutorialMessage1 = 
+    [makeTermLine "SYNTHESIS SUCCESSFUL..."
+    ,makeTermLine "WELCOME TO THE STATION!"
+    ,makeTermLine ""
+    ,makeTermLine "INTERACTION TEST"
+    ] <> tlSetStatus (TerminalPressTo "USE [SPACE] TO INTERACT")
+    <> [makeTermLine "<USE [SPACE] TO INTERACT>"
+    ,makeTermLine ""
+    ,makeTermLine "MOBILITY TEST"
+    ]