Cancel terminal display if destroyed while displaying

src/Dodge/Button/Draw.hs

@@ -11,8 +11,7 @@ drawButton :: Button -> SPic
 drawButton bt = case bt ^. btEvent of
     ButtonPress {_bpColor = col} -> defaultDrawButton col bt
     ButtonSwitch {_bsColor1 = col1, _bsColor2 = col2} -> drawSwitch col1 col2 bt
-    ButtonAccessTerminal -> mempty
---    ButtonDoNothing -> mempty
+    ButtonAccessTerminal _ -> mempty
 
 drawSwitch :: Color -> Color -> Button -> SPic
 drawSwitch col1 col2 bt

src/Dodge/Button/Event.hs

@@ -5,7 +5,6 @@ import Control.Lens
 import Dodge.Data.World
 import Dodge.SoundLogic
 import Dodge.WorldEffect
-import Sound.Data
 
 doButtonEvent :: ButtonEvent -> Button -> World -> World
 doButtonEvent = \case
@@ -13,10 +12,10 @@ doButtonEvent = \case
     ButtonPress False f _ -> buttonFlip f
     ButtonSwitch _ f _ _ True -> buttonFlip f
     ButtonSwitch f _ _ _ False -> buttonFlip f
-    ButtonAccessTerminal -> accessTerminal . _btTermMID
+    ButtonAccessTerminal tid -> const $ accessTerminal tid
 
 buttonFlip :: WdWd -> Button -> World -> World
 buttonFlip f bt =
     doWdWd f
-        . soundWithStatus ToStart (LeverSound 0) (bt ^. btPos) click1S Nothing
+        . soundStart (ButtonSound (bt ^. btID)) (bt ^. btPos) click1S Nothing
         . over (cWorld . lWorld . buttons . ix (bt ^. btID) . btEvent . btOn) not

src/Dodge/Combine.hs

@@ -21,14 +21,14 @@ combineList :: World -> [SelectionItem CombinableItem]
 combineList = map f . combineItemListYouX
   where
     f (is, itm) =
-        SelectionItem
+        SelItem
             { _siPictures = basicItemDisplay itm
             , _siHeight = itInvHeight itm
             , _siWidth = 15
             , _siIsSelectable = True
             , _siColor = itemInvColor $ baseCI itm
             , _siOffX = 0
-            , _siPayload = CombinableItem is itm
+            , _siPayload = Just $ CombinableItem is itm
             }
 
 combineItemListYouX :: World -> [([Int], Item)]

src/Dodge/Data/Button.hs

@@ -25,14 +25,13 @@ data ButtonEvent
         , _bsColor2 :: Color
         , _btOn :: Bool
         }
-    | ButtonAccessTerminal
+    | ButtonAccessTerminal {_btTermID :: Int}
 
 data Button = Button
     { _btPos :: Point2
     , _btRot :: Float
     , _btEvent :: ButtonEvent
     , _btID :: Int
-    , _btTermMID :: Maybe Int
     }
 
 makeLenses ''Button

src/Dodge/Data/Input.hs

@@ -5,6 +5,7 @@
 
 module Dodge.Data.Input where
 
+import Dodge.Data.Terminal.Status
 import Control.Lens
 import qualified Data.Map.Strict as M
 import Geometry.Data
@@ -28,8 +29,8 @@ data MouseContext
     | OverCombCombine { _mcoCombCombine :: (Int,Int)}
     | OverCombFilter
     | OverCombEscape
-    | OverTerminalReturn {_mcoTermID :: Int}
-    | OverTerminalEscape
+    | OverTerminal {_mcoTermID :: Int, _mcoTermStatus :: TerminalStatus}
+    | OutsideTerminal
     | MouseGameRotate
     deriving (Show)
 

src/Dodge/Data/SelectionList.hs

@@ -41,22 +41,14 @@ data SelectionWidth
     | UseItemWidth
 
 data SelectionItem a
-    = SelectionItem
-        { _siPictures :: [String]
-        , _siHeight :: Int
-        , _siWidth :: Int
-        , _siIsSelectable :: Bool
-        , _siColor :: Color
-        , _siOffX :: Int
-        , _siPayload :: a
-        }
-    | SelectionInfo
+    = SelItem
         { _siPictures :: [String]
         , _siHeight :: Int
         , _siWidth :: Int
         , _siIsSelectable :: Bool
         , _siColor :: Color
         , _siOffX :: Int
+        , _siPayload :: Maybe a
         }
 
 makeLenses ''ListDisplayParams

src/Dodge/Data/SoundOrigin.hs

@@ -34,7 +34,7 @@ data SoundOrigin
     | GlassBreakSound Int
     | MaterialSound Material Int
     | TeleSound Int
-    | LeverSound Int
+    | ButtonSound Int
     | Explosion Int
     | Tap Int
     | EBSound Int

src/Dodge/Data/Terminal.hs

@@ -36,7 +36,6 @@ data Terminal = Terminal
     , _tmStatus :: TerminalStatus
     , _tmCommandHistory :: [String]
     , _tmToggles :: M.Map String TerminalToggle
---    , _tmPartialCommand :: Maybe TerminalCommand
     }
 
 data TerminalLineString = TerminalLineConst String Color
@@ -77,7 +76,7 @@ data TerminalCommandEffect
 --    , _tcEffect :: TerminalCommandEffect -- Terminal -> World -> EffectArguments
 --    }
 
-data TCom = TCInfo String String
+data TCom = TCInfo String String -- this may not be necessary, to revisit
     | TCBase
     | TCDamageCommand
     | TCSensorInfo
@@ -90,7 +89,8 @@ data TCom = TCInfo String String
 
 data TmWdWd
     = TmWdId
-    | TmWdWdDisconnectTerminal
+    | TmWdWdPowerDownTerminal
+    | TmWdWdDeactivateTerminal
     | TmWdWdfromWdWd WdWd
     | TmWdWdTermSound SoundID
     | TmWdWdDoDeathTriggers

src/Dodge/Data/Terminal/Status.hs

@@ -9,10 +9,11 @@ import Data.Aeson.TH
 
 data TerminalStatus
     = TerminalOff
-    | TerminalBusy
+    | TerminalDeactivated
+    | TerminalLineRead
     | TerminalTextInput {_tiText :: String}
     | TerminalPressTo {_tptString :: String}
-    deriving (Eq)
+    deriving (Eq,Show)
 
 makeLenses ''TerminalStatus
 deriveJSON defaultOptions ''TerminalStatus

src/Dodge/Data/WorldEffect.hs

@@ -20,9 +20,9 @@ data ItCrWdWd = ItCrWdItemHeldEffect
 data WdWd
     = NoWorldEffect
     | SetTrigger Bool Int
-    | WorldEffects [WdWd]
+    | WorldEffects [WdWd] -- probably best to avoid recursive types if possible...
     | SetLSCol Point3 Int
-    | AccessTerminal (Maybe Int)
+    | AccessTerminal Int
     | UnlockInv
     | SoundStart SoundOrigin Point2 SoundID (Maybe Int)
     | MakeStartCloudAt Point3

src/Dodge/Debug/Terminal.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE TupleSections #-}
 
-module Dodge.Debug.Console where
+module Dodge.Debug.Terminal where
 
 import Data.Foldable
 import Dodge.Item.Location.Initialize
@@ -19,14 +19,14 @@ import LensHelp
 import MaybeHelp
 import Text.Read (readMaybe)
 
-applyConsoleString :: [String] -> Universe -> Universe
-applyConsoleString ss = case ss of
+applyTerminalString :: [String] -> Universe -> Universe
+applyTerminalString ss = case ss of
     [] -> id
-    [s] -> applyConsoleCommand s
-    (s : ss') -> applyConsoleCommandArguments s ss'
+    [s] -> applyTerminalCommand s
+    (s : ss') -> applyTerminalCommandArguments s ss'
 
-applyConsoleCommand :: String -> Universe -> Universe
-applyConsoleCommand s = case s of
+applyTerminalCommand :: String -> Universe -> Universe
+applyTerminalCommand s = case s of
     "NOCLIP" -> uvConfig . debug_booleans . at Noclip %~ toggleJust
     ['L', x] ->
             (uvWorld . cWorld . lWorld %~ initSpecificCrItemLocations 0)
@@ -39,8 +39,8 @@ applyConsoleCommand s = case s of
         (ibt, n) <- parseItem [x]
         return $ uvWorld %~ flip (foldl' (&)) (replicate n (snd . createItemYou (itemFromBase ibt)))
 
-applyConsoleCommandArguments :: String -> [String] -> Universe -> Universe
-applyConsoleCommandArguments command args u = case command of
+applyTerminalCommandArguments :: String -> [String] -> Universe -> Universe
+applyTerminalCommandArguments command args u = case command of
     "IT" -> fromMaybe u $ do
         (ibt, n) <- parseItem args
         return $ u & uvWorld %~ flip (foldl' (&)) (replicate n (snd . createItemYou (itemFromBase ibt)))
@@ -75,33 +75,33 @@ parseItem [] = Nothing
 parseNum :: [String] -> Int
 parseNum xs = fromMaybe 1 $ xs ^? ix 0 >>= readMaybe
 
-showConsoleError :: String -> String -> Universe -> Universe
-showConsoleError cmd s = uvScreenLayers .:~ InputScreen cmd s
+showTerminalError :: String -> String -> Universe -> Universe
+showTerminalError cmd s = uvScreenLayers .:~ InputScreen cmd s
 
-applySetConsoleString :: String -> Universe -> Universe
-applySetConsoleString [] = id
-applySetConsoleString var = case key' of
-    "" -> showConsoleError ("set " ++ var) ("Unable to read as argument as float: " ++ val)
+applySetTerminalString :: String -> Universe -> Universe
+applySetTerminalString [] = id
+applySetTerminalString var = case key' of
+    "" -> showTerminalError ("set " ++ var) ("Unable to read as argument as float: " ++ val)
     "hp" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crHP .~ round (fromJust val')
 --    "invcap" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crInvCapacity .~ round (fromJust val')
 --    "mass" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crMass .~ fromJust val'
 --    "mvspeed" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crMvType . mvSpeed .~ fromJust val'
     "mvspeed" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crType . avMoveSpeed .~ fromJust val'
-    _ -> showConsoleError ("set " ++ var) ("Invalid set command: " ++ key) -- never reached?
+    _ -> showTerminalError ("set " ++ var) ("Invalid set command: " ++ key) -- never reached?
   where
     (key, val) = getSplitString var
     val' = readMaybe val :: Maybe Float
     key' = if isNothing val' then "" else key
 
---autoCompleteConsole :: String -> String -> Universe -> IO (Maybe Universe)
---autoCompleteConsole s _ =
+--autoCompleteTerminal :: String -> String -> Universe -> IO (Maybe Universe)
+--autoCompleteTerminal s _ =
 --    return
 --        . (popScreen' >=> pushScreen' (InputScreen (T.pack input_str) valid_commands))
 --  where
 --    (key, val) = getSplitString $ tail s
 --    command_options = case val of
---        "" -> filter (isInfixOf key) (validConsoleCommands "")
---        _ -> filter (isInfixOf val) (validConsoleCommands key)
+--        "" -> filter (isInfixOf key) (validTerminalCommands "")
+--        _ -> filter (isInfixOf val) (validTerminalCommands key)
 --    -- basic autocomplete if single option available (or as far as possible)
 --    input_str = case (key, val) of
 --        (_, "") ->
@@ -117,7 +117,7 @@ applySetConsoleString var = case key' of
 --                        else ">" ++ key ++ " " ++ longestCommonPrefix command_options
 --    command_options' =
 --        if not (null command_options) && head command_options == key
---            then validConsoleCommands key
+--            then validTerminalCommands key
 --            else command_options
 --
 --    --val' = Debug.Trace.trace key tail val
@@ -129,12 +129,12 @@ getSplitString str = case break (== ' ') str of
     (a, _) -> (a, "")
 
 isValidCommand :: String -> String -> Bool
-isValidCommand arg1 arg2 = arg2 `elem` validConsoleCommands arg1
-validConsoleCommands :: String -> [String]
-validConsoleCommands "set" = ["hp", "invcap", "invsel", "mass", "mvspeed"]
-validConsoleCommands "god" = ["on", "off"]
-validConsoleCommands _ = ["set", "spawn", "god"]
-validConsoleCommands _ = ["set", "spawn", "god"]
+isValidCommand arg1 arg2 = arg2 `elem` validTerminalCommands arg1
+
+validTerminalCommands :: String -> [String]
+validTerminalCommands "set" = ["hp", "invcap", "invsel", "mass", "mvspeed"]
+validTerminalCommands "god" = ["on", "off"]
+validTerminalCommands _ = ["set", "spawn", "god"]
 
 loadme :: a
 loadme = undefined

src/Dodge/Default.hs

@@ -46,16 +46,11 @@ defaultMachine =
         }
 
 defaultButton :: Button
-defaultButton =
-    Button
-        { _btPos = V2 0 0
+defaultButton = Button
+        { _btPos = 0
         , _btRot = 0
         , _btEvent = ButtonPress False NoWorldEffect (dark red)
         , _btID = 0
---        , _btState = BtOff
-        , _btTermMID = Nothing
---        , _btName = ""
---        , _btColor = red
         }
 
 defaultPP :: PressPlate

src/Dodge/Default/Terminal.hs

@@ -16,7 +16,7 @@ defaultTerminal =
         , _tmMachineID = 0
         , _tmDisplayedLines = []
         , _tmFutureLines = []
-        , _tmCommands = [TCInfo "TESA" "text 2",TCInfo "TEST" "display text",TCBase]
+        , _tmCommands = [TCBase]
         , _tmDeathEffect = TmWdWdDoDeathTriggers
         , _tmStatus = TerminalOff
         , _tmCommandHistory = []

src/Dodge/DisplayInventory.hs

@@ -65,12 +65,12 @@ updateCombineSections w cfig =
     sclose'
         | null sclose =
             IM.singleton 0 $
-                SelectionInfo ["No possible combinations"] 1 25 False white 0
+                SelItem ["No possible combinations"] 1 25 False white 0 Nothing
         | otherwise = sclose
 
 regexCombs :: IM.IntMap Item -> SelectionItem CombinableItem -> String -> Bool
 regexCombs inv ci = \case
-    '#' : str -> any (g str) (_ciInvIDs $ _siPayload ci)
+    '#' : str -> any (g str) (_ciInvIDs $ fromJust $ _siPayload ci)
     str -> (regexList str . _siPictures) ci
   where
     g str i = maybe False (regexList str . basicItemDisplay) (inv ^? ix i)
@@ -129,7 +129,7 @@ updateDisplaySections w cfig =
                 [ invhead
                 , sinv
                 , IM.singleton 0 
-                    $ SelectionItem [displayFreeSlots (crNumFreeSlots cr)] 1 15 True invDimColor 2 ()
+                    $ SelItem [displayFreeSlots (crNumFreeSlots cr)] 1 15 True invDimColor 2 Nothing
                 , nearbyhead
                 , sclose
                 , interfaceshead
@@ -153,7 +153,7 @@ updateDisplaySections w cfig =
     btitems =
         IM.fromDistinctAscList . zip [0 ..] $
             mapMaybe (closeButtonToSelectionItem w) (w ^. hud . closeButtons)
-    makehead str = IM.singleton 0 $ SelectionInfo [str] 1 15 False white 0
+    makehead str = IM.singleton 0 $ SelItem [str] 1 15 False white 0 Nothing
     invhead = if null sfinv then makehead "INVENTORY" else sfinv
     cr = you w
     closeitms =
@@ -179,13 +179,14 @@ filterSectionsPair infocus filtfn itms filtdescription mfilt = (filtsis, itms')
         return $
             IM.singleton
                 0
-                $ SelectionInfo
+                $ SelItem
                     [filtdescription ++ " FILTER/" ++ str ++ [filtcurs], numfiltitems]
                     2
                     (length (filtdescription ++ " FILTER/" ++ str ++ [filtcurs]))
                     True
                     white
                     0
+                    Nothing
     itms' = maybe id (IM.filter . filtfn) mfilt itms
     numfiltitems = "  " ++ show (length itms - length itms') ++ " FILTERED"
 

src/Dodge/Inventory.hs

@@ -116,7 +116,6 @@ rmInvItem cid invid w =
         | x > invid || Just x == maxk = max 0 $ x - 1
         | otherwise = x
 
-
 -- this looks ugly...
 updateCloseObjects :: World -> World
 updateCloseObjects w =
@@ -137,6 +136,9 @@ updateCloseObjects w =
     activeButtons = filter canpress . IM.elems $ w ^. cWorld . lWorld . buttons
     canpress bt = case bt ^. btEvent of
         ButtonPress {_btOn = t} -> not t
+        ButtonAccessTerminal tid -> fromMaybe False $ do
+            x <- w ^? cWorld . lWorld . terminals . ix tid . tmStatus
+            return (x /= TerminalDeactivated)
         _ -> True
 
 changeSwapSel :: Int -> World -> World

src/Dodge/Inventory/SelectionList.hs

@@ -31,14 +31,14 @@ import Picture.Base
 
 invSelectionItem :: World -> Int -> LocationDT OItem -> SelectionItem ()
 invSelectionItem w indent loc =
-    SelectionItem
+    SelItem
         { _siPictures = itemDisplay w cr ci
         , _siHeight = itInvHeight $ ci ^. _1
         , _siWidth = 15
         , _siIsSelectable = True
         , _siColor = itemInvColor ci
         , _siOffX = indent
-        , _siPayload = ()
+        , _siPayload = Nothing
         }
   where
     ci = (a,b)
@@ -207,35 +207,35 @@ closeItemToSelectionItem w (NInt i) = do
     e <- w ^? cWorld . lWorld . floorItems . unNIntMap . ix i
     let (pics, col) = closeItemToTextPictures e
     return
-        SelectionItem
+        SelItem
             { _siPictures = pics
             , _siHeight = length pics
             , _siWidth = 15
             , _siIsSelectable = True
             , _siColor = col
             , _siOffX = 0
-            , _siPayload = ()
+            , _siPayload = Nothing
             }
 
 closeButtonToSelectionItem :: World -> Int -> Maybe (SelectionItem ())
 closeButtonToSelectionItem w i = do
     bt <- w ^? cWorld . lWorld . buttons . ix i
     return
-        SelectionItem
+        SelItem
             { _siPictures = [btText bt]
             , _siHeight = 1
             , _siWidth = 15
             , _siIsSelectable = True
             , _siColor = yellow
             , _siOffX = 0
-            , _siPayload = ()
+            , _siPayload = Nothing
             }
 
 btText :: Button -> String
 btText bt = case _btEvent bt of
     ButtonPress {} -> "BUTTON"
     ButtonSwitch {_btOn = t} -> if t then "SWITCH\\" else "SWITCH/"
-    ButtonAccessTerminal -> "TERMINAL"
+    ButtonAccessTerminal {} -> "TERMINAL"
 
 closeItemToTextPictures :: FloorItem -> ([String], Color)
 closeItemToTextPictures flit = (basicItemDisplay it, itemInvColor $ baseCI it)

src/Dodge/Menu/Option.hs

@@ -96,14 +96,14 @@ menuOptionToSelectionItem ::
     MenuOption ->
     SelectionItem (Universe -> Universe, Universe -> Universe)
 menuOptionToSelectionItem w padAmount mo =
-    SelectionItem
+    SelItem
         { _siPictures = [optionText]
         , _siHeight = 1
         , _siWidth = 50
         , _siIsSelectable = isselectable
         , _siColor = thecol
         , _siOffX = 0
-        , _siPayload = (f, g)
+        , _siPayload = Just (f, g)
         }
   where
     isselectable = case _moString mo w of

src/Dodge/Placement/Instance/Terminal.hs

@@ -17,7 +17,7 @@ putTerminal :: Color -> Machine -> Terminal -> Placement
 putTerminal col mc tm =
     ps0PushPS (PutTerminal (tm & tmExternalColor .~ col)) $
         \tmpl -> Just $
-            ps0PushPS (PutButton termButton) $
+            ps0PushPS (PutButton defaultButton) $
                 \btpl -> Just $
                     pt0
                         ( PutMachine
@@ -34,7 +34,7 @@ putTerminal col mc tm =
             & cWorld . lWorld . terminals . ix tmid . tmButtonID .~ btid
             & cWorld . lWorld . terminals . ix tmid . tmMachineID .~ mcid
             & cWorld . lWorld . machines . ix mcid . mcMounts . at OTTerminal ?~ tmid
-            & cWorld . lWorld . buttons . ix btid . btTermMID ?~ tmid
+            & cWorld . lWorld . buttons . ix btid . btEvent .~ ButtonAccessTerminal tmid
       where
         tmid = fromJust (_plMID tmpl)
         btid = fromJust (_plMID btpl)
@@ -48,15 +48,5 @@ putMessageTerminal col =
             & mcType .~ McTerminal
             & mcHP .~ 100
 
-termButton :: Button
-termButton =
-    Button
-        { _btPos = 0
-        , _btRot = 0
-        , _btEvent = ButtonAccessTerminal
-        , _btID = 0
-        , _btTermMID = Nothing
-        }
-
 terminalColor :: Color
 terminalColor = dark magenta

src/Dodge/Render/HUD.hs

@@ -1,10 +1,7 @@
 {-# LANGUAGE LambdaCase #-}
 
-module Dodge.Render.HUD (
-    drawHUD,
-) where
+module Dodge.Render.HUD (drawHUD) where
 
-import Dodge.Data.Terminal.Status
 import Control.Applicative
 import Control.Lens
 import Control.Monad
@@ -23,6 +20,7 @@ import Dodge.Data.Config
 import Dodge.Data.DoubleTree
 import Dodge.Data.EquipType
 import Dodge.Data.SelectionList
+import Dodge.Data.Terminal.Status
 import Dodge.Data.World
 import Dodge.DoubleTree
 import Dodge.Equipment.Text
@@ -34,7 +32,6 @@ import Dodge.Item.InvSize
 import Dodge.Item.Location
 import Dodge.ListDisplayParams
 import Dodge.Render.Connectors
---import Dodge.Render.HUD.Carte
 import Dodge.Render.List
 import Dodge.ScreenPos
 import Dodge.SelectionSections
@@ -105,9 +102,7 @@ getRootItemBounds i inv = do
 drawMouseOver :: Configuration -> World -> Picture
 drawMouseOver cfig w =
     concat
-        ( invsel <|> combinvsel
-            <|> drawDragSelecting cfig w
-        )
+        (invsel <|> combinvsel <|> drawDragSelecting cfig w)
         <> concat (drawDragSelected cfig w)
   where
     invsel = do
@@ -211,14 +206,14 @@ drawExamineInventory cfig w =
             )
   where
     f str =
-        SelectionItem
+        SelItem
             { _siPictures = [str]
             , _siWidth = 55
             , _siHeight = 1
             , _siIsSelectable = True
             , _siColor = white
             , _siOffX = 0
-            , _siPayload = ()
+            , _siPayload = Nothing
             }
 
 closeObjectInfo :: Int -> Either FloorItem Button -> String
@@ -240,11 +235,10 @@ yourAugmentedItem f x g w = case you w ^? crManipulation . manObject of
         j <- w ^? hud . closeItems . ix i . unNInt
         flit <- w ^? cWorld . lWorld . floorItems . unNIntMap . ix j
         return . g $ Left flit
-    --        g . Left $ w ^?! hud . closeItems . ix i
     Just (SelCloseButton i) -> fromMaybe x $ do
         j <- w ^? hud . closeButtons . ix i
-        flit <- w ^? cWorld . lWorld . buttons . ix j
-        return . g $ Right flit
+        but <- w ^? cWorld . lWorld . buttons . ix j
+        return . g $ Right but
     _ -> x
 
 drawRBOptions :: Configuration -> World -> Picture
@@ -343,13 +337,12 @@ combineInventoryExtra ::
     Configuration ->
     World ->
     Picture
-combineInventoryExtra sss msel cfig w = fromMaybe mempty $ do
+combineInventoryExtra sss msel cfig w = fold $ do
     (i, j) <- msel
     si <- sss ^? ix i . ssItems . ix j
     let col = _siColor si
-    lnks <- si ^? siPayload . ciInvIDs
-    return (lnkMidPosInvSelsCol cfig w j col lnks)
-        <> foldMap invcursor lnks
+    lnks <- si ^? siPayload . _Just . ciInvIDs
+    return (lnkMidPosInvSelsCol cfig w j col lnks) <> foldMap invcursor lnks
   where
     invcursor i = do
         sss' <- w ^? hud . hudElement . diSections
@@ -362,37 +355,32 @@ combineInventoryExtra sss msel cfig w = fromMaybe mempty $ do
                     (Just (0, i))
 
 drawTerminalDisplay :: Int -> Configuration -> LWorld -> Picture
-drawTerminalDisplay tid cfig w = fromMaybe mempty $ do
+drawTerminalDisplay tid cfig w = fold $ do
     tm <- w ^? terminals . ix tid
     let tsize = getMaxLinesTM + 1
     return $
         invHead cfig ("T-" ++ show tid)
-            <> drawSelectionList secondColumnParams cfig (thesellist tm)
+            <> drawSelectionList secondColumnParams cfig (f tm)
             <> color
                 (withAlpha 0.5 green) -- consider integrating termScreenColor somehow
                 (drawSelectionListBackground secondColumnParams cfig tsize)
             <> color (dark $ _tmExternalColor tm) (drawTitleBackground cfig)
   where
-    toselitm (str, col) = SelectionItem [str] 1 55 True col 0 ()
+    toselitm (str, col) = SelItem [str] 1 55 True col 0 Nothing
     -- not sure if the width (55) is correct here
-    thesellist tm = thelist tm
-    thelist tm =
+    f tm =
         map toselitm . displayTermInput tm
             . reverse
             . take getMaxLinesTM
             $ _tmDisplayedLines tm
     displayTermInput tm = case _tmStatus tm of
         TerminalOff -> id
-        TerminalBusy -> (++ [([cFilledRect], white)])
+        TerminalDeactivated -> id
+        TerminalLineRead -> id
         TerminalTextInput s ->
             (++ [(getPromptTM ++ s ++ [cFilledRect], white)])
         TerminalPressTo s ->
-            (++ [("PRESS TO "++s, white)])
---    partcommand tm = maybe "" (++ " ") $ tm ^? tmPartialCommand . _Just . tcString
---    displayInputText tm s
---        | TerminalTextInput <- _tmStatus tm = getPromptTM ++ s 
-----        | _tmStatus tm == TerminalReady = partcommand tm ++ getPromptTM ++ s
---        | otherwise = ""
+            (++ [(getPromptTM ++ "PRESS TO " ++ s, white)])
 
 --        | hasfoc = clockCycle 10 (V.fromList [[cFilledRect] , "."]) w
 
@@ -511,4 +499,4 @@ selNumPosCardinal card cfig ldp sss i j = do
     ygap = _ldpVerticalGap ldp
 
 selSecSelCol :: Int -> Int -> IM.IntMap (SelectionSection a) -> Maybe Color
-selSecSelCol i j sss = sss ^? ix i . ssItems . ix j . siColor
+selSecSelCol i j = (^? ix i . ssItems . ix j . siColor)

src/Dodge/Render/Picture.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE LambdaCase #-}
 module Dodge.Render.Picture (
     fixedCoordPictures,
 ) where
@@ -109,8 +110,8 @@ mouseCursorType u = case u ^. uvWorld . input . mouseContext of
     OverCombFilter{} -> drawJumpDown 5
     OverCombCombine{} -> drawGapPlus 5
     OverCombEscape -> rotate (pi / 4) $ drawPlus 5
-    OverTerminalReturn{} -> drawReturn 5
-    OverTerminalEscape -> rotate (pi / 4) $ drawPlus 5
+    OverTerminal _ ts -> drawCursorByTerminalStatus ts
+    OutsideTerminal -> rotate (pi / 4) $ drawPlus 5
     MouseGameRotate -> rotate a (drawVerticalDoubleArrow 5)
   where
     w = u ^. uvWorld
@@ -121,6 +122,21 @@ mouseCursorType u = case u ^. uvWorld . input . mouseContext of
             argV (w ^. cWorld . lWorld . lAimPos -.- cpos)
                 - w ^. wCam . camRot
 
+drawCursorByTerminalStatus :: TerminalStatus -> Picture
+drawCursorByTerminalStatus = \case
+    TerminalPressTo "QUIT" -> drawQuitTerminal 5
+    TerminalPressTo _ -> drawArrowDown 5
+    TerminalTextInput "QUIT" -> drawQuitTerminal 5
+    TerminalTextInput{} -> drawReturn 5
+    _ -> drawEmptySet 5
+
+drawQuitTerminal :: Float -> Picture
+drawQuitTerminal x = fold 
+        [ line [V2 x x, V2 (- x) (- x)]
+        , line [V2 x (-x), V2 (- x) x]
+        , polygonWire (square x)
+        ]
+
 drawEmptySet :: Float -> Picture
 drawEmptySet x =
     fold
@@ -201,6 +217,14 @@ drawVerticalDoubleArrow x =
     z = 1.5 * x
     w = 0.6 * x
 
+drawArrowDown :: Float -> Picture
+drawArrowDown x =
+    line [V2 0 z, V2 0 (- z)]
+        <> line [V2 (- w) (w - z), V2 0 (- z), V2 w (w - z)]
+  where
+    z = 1 * x
+    w = 0.6 * x
+
 drawDragDrop :: Float -> Picture
 drawDragDrop x =
     line (fmap (+ V2 z (- x)) [V2 (- x) x, V2 0 x, V2 0 (- x)])

src/Dodge/Room/RezBox.hs

@@ -1,5 +1,6 @@
 module Dodge.Room.RezBox where
 
+import Dodge.Default.Terminal
 import Dodge.Terminal
 import Control.Monad
 import qualified Data.Set as S
@@ -25,12 +26,17 @@ rezBox :: LightSource -> Room
 rezBox ls =
     roomRect 40 60 1 1
         & rmPmnts .~ [sPS (V2 20 1) 0 $ PutLS ls
-            , putMessageTerminal terminalColor (simpleTermMessage ["HELLOW","THIS"])
+            , putMessageTerminal terminalColor (defaultTerminal & tmBootLines .~ (makeTermPara s) <> tlSetStatus (TerminalPressTo "QUIT") <> [TLine 1 [] TmWdWdDeactivateTerminal])
                 & plSpot .~ PS (V2 20 0) 0
             ]
         & restrictInLinks (\(V2 _ h, _) -> h < 1)
         & restrictOutLinks (\(V2 _ h, _) -> h > 59)
         & rmName .~ "rezBox"
+  where
+    s = "RESPAWN POINT SET AT THIS LOCATION."
+
+tutorialMessage1 :: String
+tutorialMessage1 = "SYNTHESIS SUCCESSFUL. MOVEMENT TEST 1 INITIATED [WASD]. INTERACTION TEST 1 IN QUEUE [SPACE]."
 
 rezBox' :: RandomGen g => State g (MetaTree Room String)
 rezBox' = do

src/Dodge/SoundLogic.hs

@@ -11,7 +11,7 @@ module Dodge.SoundLogic (
     soundContinueVol,
     soundMultiFrom,
     stopSoundFrom,
-    soundWithStatus,
+--    soundWithStatus,
 
     -- * helper to determine the angle of a sound given a world position
     soundAngle,

src/Dodge/Terminal.hs

@@ -1,14 +1,8 @@
 {-# LANGUAGE LambdaCase #-}
 
 module Dodge.Terminal (
-    --    doTerminalCommandEffect,
     makeTermLine,
-    --    commandFutureLines,
-    --    quitCommand,
-    --    helpCommand,
-    --    commandsCommand,
     connectionBlurbLines,
-    disconnectTerminal,
     textTerminal,
     simpleTermMessage,
     damageCodeCommand,
@@ -18,18 +12,15 @@ module Dodge.Terminal (
     toggleCommand,
     terminalReturnEffect,
     getCommands,
-    makeColorTermPara,
-    commandColor,
     tabComplete,
+    tlSetStatus,
 ) where
 
---import Dodge.Data.WorldEffect
-
-import qualified Data.Map.Strict as M
+import Color
 import Data.Char
 import qualified Data.List as List
-import Color
 import qualified Data.ListTrie.Patricia.Map.Enum as PTE
+import qualified Data.Map.Strict as M
 --import Control.Monad
 --import Data.Char
 --import qualified Data.Map.Strict as M
@@ -45,10 +36,7 @@ import LensHelp
 import Sound.Data
 
 textTerminal :: Terminal
-textTerminal =
-    defaultTerminal
-        { _tmBootLines = connectionBlurb
-        }
+textTerminal = defaultTerminal{_tmBootLines = connectionBlurb}
 
 connectionBlurbLines :: [TerminalLine] -> [TerminalLine]
 connectionBlurbLines tls =
@@ -58,53 +46,6 @@ connectionBlurbLines tls =
         ++ tls
         ++ [TLine 10 [TerminalLineConst "READY FOR INPUT" termTextColor] (TmTmSetStatus (TerminalTextInput ""))]
 
---        ++ [TerminalLineEffect 0 (TmTmSetStatus (TerminalTextInput "" 0))]
-
---quitCommand :: TerminalCommand
---quitCommand =
---    TerminalCommand
---        { _tcString = "QUIT"
---        , _tcAlias = ["Q", "EXIT", "X", "SHUTDOWN", ""]
---        , _tcHelp = "Disconnects the terminal."
---        , _tcEffect = TerminalCommandArguments $ NoArguments [TLine 0 [] TmWdWdDisconnectTerminal]
---        }
-
---helpCommand :: TerminalCommand
---helpCommand =
---    TerminalCommand
---        { _tcString = "HELP"
---        , _tcAlias = ["H", "MAN"]
---        , _tcHelp = "Displays help for a specific command."
---        , _tcEffect = TerminalCommandEffectHelp -- \tm -> OneArgument "AN AVAILABLE COMMAND" . getCommandsHelp tm
---        }
-
---getCommandsHelp :: Terminal -> World -> M.Map String [TerminalLine]
---getCommandsHelp tm w = foldr f mempty $ getCommands tm
---  where
---    f tc =
---        M.insert
---            (_tcString tc)
---            ( [ makeTermLine "Command:"
---              , makeColorTermLine commandColor (_tcString tc)
---              , makeTermLine "Aliases:"
---              , makeColorTermLine commandColor (unwords (_tcAlias tc))
---              ]
---                ++ case argumentHelp tc tm w of
---                    (arghelp, Nothing) -> makeTermPara $ _tcHelp tc ++ " " ++ arghelp
---                    (arghelp, Just args) ->
---                        makeTermPara (_tcHelp tc ++ " " ++ arghelp)
---                            ++ [makeColorTermLine commandColor $ unwords args]
---            )
-
---commandsCommand :: TerminalCommand
---commandsCommand =
---    TerminalCommand
---        { _tcString = "COMMANDS"
---        , _tcAlias = ["COMMAND", "COM"]
---        , _tcHelp = "Displays available commands."
---        , _tcEffect = TerminalCommandEffectCommands
---        }
-
 connectionBlurb :: [TerminalLine]
 connectionBlurb = connectionBlurbLines []
 
@@ -126,30 +67,38 @@ getCommand tm = \case
     TCSensorInfo -> sensorCommand
 
 damageCodeCommand :: PTE.TrieMap Char (PTE.TrieMap Char [TerminalLine])
-damageCodeCommand = PTE.singleton "DAMAGECODE" $ PTE.fromList $ mapMaybe f [minBound..]
+damageCodeCommand = PTE.singleton "DAMAGECODE" $ PTE.fromList $ mapMaybe f [minBound ..]
   where
     f :: SensorType -> Maybe (String, [TerminalLine])
     f st = do
         s <- g st
         return (s, [TLine 0 [] $ TmGetDamageCoding st])
-    g = fmap (map toUpper) . fmap reverse . List.stripPrefix (reverse "Sensor") 
-        . reverse . show
+    g =
+        fmap (map toUpper) . fmap reverse . List.stripPrefix (reverse "Sensor")
+            . reverse
+            . show
 
 -- ugly, when changing check getSensorInfo
 sensorCommand :: PTE.TrieMap Char (PTE.TrieMap Char [TerminalLine])
-sensorCommand = PTE.singleton "SENSOR" $ PTE.fromList 
-    [("REQUIREMENT", [])
-    ,("DISTANCE",[])
-    ,("STATUS",[])
-    ]
+sensorCommand =
+    PTE.singleton "SENSOR" $
+        PTE.fromList
+            [ ("REQUIREMENT", [])
+            , ("DISTANCE", [])
+            , ("STATUS", [])
+            ]
 
 toggleCommand :: Terminal -> PTE.TrieMap Char (PTE.TrieMap Char [TerminalLine])
-toggleCommand tm = PTE.singleton "TOGGLE" $ PTE.fromList $
-    M.toList $ fmap f $ tm ^. tmToggles
+toggleCommand tm =
+    PTE.singleton "TOGGLE" $
+        PTE.fromList $
+            M.toList $ fmap f $ tm ^. tmToggles
   where
-    f x = [TLine 1 
-        [TerminalLineConst "TOGGLE DONE!" termTextColor] 
-        (TmWdWdfromWdWd (WdWdNegateTrig $ x ^. ttTriggerID))
+    f x =
+        [ TLine
+            1
+            [TerminalLineConst "TOGGLE DONE!" termTextColor]
+            (TmWdWdfromWdWd (WdWdNegateTrig $ x ^. ttTriggerID))
         ]
 
 helpCommand :: PTE.TrieMap Char (PTE.TrieMap Char [TerminalLine])
@@ -158,17 +107,18 @@ helpCommand = PTE.singleton "HELP" (fmap makeTermPara helpStrings)
 helpStrings :: PTE.TrieMap Char String
 helpStrings =
     PTE.fromList
-        [ ("", "THIS TERMINAL PROCESSES TEXT INPUT. USE [TAB] FOR AVAILABLE COMMANDS AND AUTOCOMPLETE.")
-        , ("HELP", "BASIC HELP. ACCEPTS A COMMAND AS AN ARGUMENT.")
-        , ("QUIT", "SHUTDOWN TERMINAL.")
+        [ ("", "THIS TERMINAL PROCESSES KEYBOARD INPUT. USE [RETURN] OR [LMB] TO REGISTER YOUR INPUT. AVAILABLE COMMANDS CAN BE SCROLLED THROUGH, HOLD [RMB] TO SCROLL THROUGH ARGUMENTS. USE [TAB] FOR AUTOCOMPLETE.")
         ]
 
 quitCommand :: PTE.TrieMap Char (PTE.TrieMap Char [TerminalLine])
-quitCommand = PTE.singleton "QUIT" (PTE.singleton "" [TLine 0 [] TmWdWdDisconnectTerminal])
+quitCommand = PTE.singleton "QUIT" (PTE.singleton "" [TLine 0 [] TmWdWdPowerDownTerminal])
 
 makeTermLine :: String -> TerminalLine
 makeTermLine = makeColorTermLine termTextColor
 
+tlSetStatus :: TerminalStatus -> [TerminalLine]
+tlSetStatus x = [TLine 1 [] $ TmTmSetStatus x]
+
 makeTermPara :: String -> [TerminalLine]
 makeTermPara = makeColorTermPara termTextColor
 
@@ -192,98 +142,15 @@ tabComplete s' tm = case PTE.lookup s $ getCommands tm of
     a = fromMaybe "" $ ss ^? ix 1
     f y m' = case fmap fst m' of
         [] -> tm
-        [x] -> tm & tmStatus .~ TerminalTextInput (y ++ x)
+        [x] -> tm & tmStatus . tiText .~ (y ++ x)
         xs ->
-            tm & tmFutureLines
-                .~ makeColorTermPara
-                    commandColor
-                    (unwords xs)
-
---doTerminalCommandEffect :: TerminalCommandEffect -> Terminal -> World -> EffectArguments
---doTerminalCommandEffect tce = case tce of
---    TerminalCommandArguments eas -> \_ _ -> eas
---    TerminalCommandEffectDamageCoding -> \_ -> OneArgument "a damage type" . getDamageCoding
---    TerminalCommandEffectSensorParameter -> \tm -> OneArgument "a sensor parameter" . sensorInfoMap tm
---    TerminalCommandEffectLinkedObject -> \tm _ -> OneArgument "a linked object" (togglesToEffects tm)
---    TerminalCommandEffectHelp -> \tm -> OneArgument "an available command" . getCommandsHelp tm
---    TerminalCommandEffectNoArgumentsStr str -> \_ _ -> NoArguments (makeTermPara str)
---    TerminalCommandEffectCommands -> \tm _ ->
---        NoArguments
---            ( makeTermLine "Available commands:" :
---              makeColorTermPara commandColor (unwords (map _tcString $ getCommands tm))
---            )
---    TerminalCommandEffectSingleCommand eff followingLines -> \_ _ -> NoArguments $ TLine 0 [] (TmWdWdfromWdWd eff) : map makeTermLine followingLines
---    TerminalCommandEffectNone -> \_ _ -> NoArguments []
-
---argumentHelp :: TerminalCommand -> Terminal -> World -> (String, Maybe [String])
---argumentHelp tc tm w = case doTerminalCommandEffect (_tcEffect tc) tm w of
---    NoArguments{} -> ("Any arguments provided to this command are ignored.", Nothing)
---    OneArgument argtype argm ->
---        ( "Expects " ++ argtype ++ " as argument. Available arguments: "
---        , Just (M.keys argm)
---        )
-
---infoCommand :: String -> TerminalCommand
---infoCommand str =
---    TerminalCommand
---        { _tcString = "INFORMATION"
---        , _tcAlias = ["INFO", "I"]
---        , _tcHelp = "DISPLAYS INFORMATION CONCERNING THE TERMINAL."
---        , _tcEffect = TerminalCommandEffectNoArgumentsStr str -- \_ _ -> NoArguments (makeTermPara str)
---        }
-
---singleCommand :: [String] -> String -> [String] -> String -> WdWd -> TerminalCommand
---singleCommand followingLines command aliases htext eff =
---    TerminalCommand
---        { _tcString = command
---        , _tcAlias = aliases
---        , _tcHelp = htext
---        , _tcEffect = TerminalCommandEffectSingleCommand eff followingLines
---        }
-
---getDamageCoding :: World -> M.Map String [TerminalLine]
---getDamageCoding = decodedtmap . _sensorCoding . _cwgParams . _cwGen . _cWorld
-
---sensorInfoMap :: Terminal -> World -> M.Map String [TerminalLine]
---sensorInfoMap tm w =
---    M.fromList
---        [ ("Requirement", getSensor _proxRequirement tm w)
---        , ("Distance", getSensor _proxDist tm w)
---        , ("Currentstatus", getSensor _proxStatus tm w)
---        , ("Paststatus", getSensor _sensToggle tm w)
---        ]
-
---getSensor :: Show a => (Sensor -> a) -> Terminal -> World -> [TerminalLine]
---getSensor f tm w =
---    maybe
---        []
---        (makeTermPara . map toLower . show . f)
---        (w ^? cWorld . lWorld . machines . ix (_tmMachineID tm) . mcType . _McSensor)
-
-
---sensorCommand :: TerminalCommand
---sensorCommand =
---    TerminalCommand
---        { _tcString = "SENSOR"
---        , _tcAlias = ["SEN"]
---        , _tcHelp = "Access information concerning the connected sensor."
---        , _tcEffect = TerminalCommandEffectSensorParameter -- \tm -> OneArgument "A SENSOR PARAMETER" . sensorInfoMap tm
---        }
-
-disconnectTerminal :: Terminal -> World -> World
-disconnectTerminal tm =
-    (cWorld . lWorld . terminals . ix (_tmID tm) . tmStatus .~ TerminalOff)
-        . exitTerminalSubInv
-        . ( cWorld . lWorld . terminals . ix (_tmID tm) . tmFutureLines
-                .~ [TLine 0 [] TmTmClearDisplayedLines]
-          )
-
-exitTerminalSubInv :: World -> World
-exitTerminalSubInv w = case w ^? hud . hudElement . subInventory . termID of
-    Just _ ->
-        w & hud . hudElement . subInventory
-            .~ NoSubInventory --MouseInvNothing
-    _ -> w
+            tm & tmStatus .~ TerminalLineRead
+                & tmFutureLines
+                .~ ( makeColorTermPara
+                        commandColor
+                        (unwords xs)
+                        <> [TLine 1 [] . TmTmSetStatus $ TerminalTextInput s]
+                   )
 
 --damageCodeCommand :: TerminalCommand
 --damageCodeCommand =
@@ -309,49 +176,20 @@ exitTerminalSubInv w = case w ^? hud . hudElement . subInventory . termID of
 simpleTermMessage :: [String] -> Terminal
 simpleTermMessage strs = defaultTerminal & tmBootLines .~ map makeTermLine strs
 
---commandFutureLines :: String -> Terminal -> World -> [TerminalLine]
---commandFutureLines s tm w = fromMaybe [errline "^ Invalid command"] $ do
---    (str, args) <- safeUncons $ words s
---    command <- find (\tc -> _tcString tc == str || str `elem` _tcAlias tc) (getCommands tm)
---    case doTerminalCommandEffect (_tcEffect command) tm w of
---        NoArguments tls -> Just tls
---        OneArgument argtype m ->
---            let setpartial
---                    | null (_tmPartialCommand tm) =
---                        TLine 0 [] (TmTmSetPartialCommand (Just command)) :
---                        makeTermPara ("Expects " ++ argtype ++ " as an argument")
---                    | otherwise =
---                        TLine 0 [] (TmTmSetPartialCommand Nothing) :
---                        makeTermPara "No argument input, cancelling"
---             in Just $
---                    fromMaybe setpartial $
---                        safeHead args >>= (m M.!?)
---  where
---    errline = makeColorTermLine red
-
 terminalReturnEffect :: Int -> World -> World
 terminalReturnEffect tmid w = fromMaybe w $ do
     tm <- w ^? cWorld . lWorld . terminals . ix tmid
     s <- tm ^? tmStatus . tiText
-    return $
-        runTerminalInput s tm $
-            w
-                & cWorld . lWorld . terminals . ix tmid . tmDisplayedLines
-                    .:~ (getPromptTM ++ s, termTextColor)
-
-runTerminalInput :: String -> Terminal -> World -> World
-runTerminalInput s tm w =
-    w & cWorld . lWorld . terminals . ix (_tmID tm)
-        %~ ( --(tmInput .~ TerminalInput{ _tiSel = (0, 0)})
-
-             (tmFutureLines ++.~ ss)
-                . (tmCommandHistory %~ take 10 . (s :))
-                . (tmStatus .~ TerminalTextInput "")
-           )
+    let ss = fromMaybe [makeTermLine "ERROR: INPUT NOT RECOGNISED"] $ do
+            let args = words s
+            x <- args ^? ix 0
+            teff <- PTE.lookup x (getCommands tm)
+            let y = fromMaybe "" (args ^? ix 1)
+            PTE.lookup y teff
+    return $ w 
+        & totm . tmDisplayedLines .:~ (getPromptTM ++ s, termTextColor)
+        & totm . tmFutureLines .~ ss <> tlSetStatus (TerminalTextInput "")
+        & totm . tmCommandHistory %~ take 10 . (s :)
+        & totm . tmStatus .~ TerminalLineRead
   where
-    ss = fromMaybe [makeTermLine "ERROR: INPUT NOT RECOGNISED"] $ do
-        let args = words s
-        x <- args ^? ix 0
-        teff <- PTE.lookup x (getCommands tm)
-        let y = fromMaybe "" (args ^? ix 1)
-        PTE.lookup y teff
+    totm = cWorld . lWorld . terminals . ix tmid

src/Dodge/Terminal/Color.hs

@@ -10,6 +10,7 @@ import Control.Lens
 termScreenColor :: Terminal -> Maybe Color
 termScreenColor tm = case tm ^. tmStatus of
     TerminalOff -> Nothing
+    TerminalDeactivated -> Nothing
     TerminalTextInput _ -> Just green
     TerminalPressTo{} -> Just green
-    TerminalBusy -> Just white
+    TerminalLineRead -> Just white

src/Dodge/TestString.hs

@@ -28,8 +28,7 @@ import qualified IntMapHelp as IM
 import qualified Data.Map.Strict as M
 
 testStringInit :: Universe -> [String]
-testStringInit u = [show $ u ^? uvWorld . cWorld . lWorld . creatures . ix 0 . crHP
-    , show $ u ^? uvWorld . timeFlow . respawnDelay]
+testStringInit u = map show $ u ^.. uvWorld . cWorld . lWorld . terminals . each . tmStatus
 -- map shortShow (u ^.. uvWorld . cWorld . lWorld . debris . each . to g)
 --  where
 --    g db = (pz,z,norm v)

src/Dodge/Update.hs

@@ -7,10 +7,6 @@ Description : Simulation update
 -}
 module Dodge.Update (updateUniverse) where
 
-import Dodge.SpawnAt
-import Dodge.Prop.Moving
-import Dodge.WorldEvent.Explosion
-import Dodge.Data.Object
 import Color
 import Control.Applicative
 import Control.Monad
@@ -27,6 +23,7 @@ import Dodge.Creature.Radius
 import Dodge.Creature.Update
 import Dodge.Damage
 import Dodge.Data.CrWlID
+import Dodge.Data.Object
 import Dodge.Data.Universe
 import Dodge.Debug
 import Dodge.DisplayInventory
@@ -44,6 +41,7 @@ import Dodge.Machine.Update
 import Dodge.ModificationEffect
 import Dodge.PressPlate
 import Dodge.Projectile.Update
+import Dodge.Prop.Moving
 import Dodge.Prop.Update
 import Dodge.RadarBlip
 import Dodge.RadarSweep
@@ -54,6 +52,7 @@ import Dodge.Shockwave.Update
 import Dodge.SmoothScroll
 import Dodge.SoundLogic
 import Dodge.Spark
+import Dodge.SpawnAt
 import Dodge.Terminal.Type
 import Dodge.TractorBeam.Update
 import Dodge.Update.Camera
@@ -64,6 +63,7 @@ import Dodge.Update.Scroll
 import Dodge.Update.WallDamage
 import Dodge.WallCreatureCollisions
 import Dodge.WorldEffect
+import Dodge.WorldEvent.Explosion
 import Dodge.WorldEvent.ThingsHit
 import Dodge.Zoning.Cloud
 import Dodge.Zoning.Creature
@@ -397,11 +397,8 @@ updateMouseContextGame cfig u = case u ^. uvWorld . input . mouseContext of
         tm <- w ^? cWorld . lWorld . terminals . ix tmid
         return $
             if isOverTerminalScreen cfig mpos
-                then fromMaybe NoMouseContext $ do
-                    let s = tm ^. tmStatus . tiText
-                    guard $ not (null s) -- && _tmStatus tm == TerminalTextInput
-                    return $ OverTerminalReturn tmid
-                else OverTerminalEscape
+                then OverTerminal tmid (tm ^. tmStatus)
+                else OutsideTerminal
 
 getMenuMouseContext :: ScreenLayer -> Universe -> MouseContext
 getMenuMouseContext screen u = case screen ^. scOptions of
@@ -467,27 +464,27 @@ updatePulseLasers w = f w & cWorld . lWorld . pulseLasers .~ pzs
 updatePulseBall :: PulseBall -> World -> World
 updatePulseBall pb w
     | Just (_, ecrwl) <- thit =
-        w   & cWorld . lWorld . pulseBalls . at (pb ^. pbID) .~ Nothing
+        w & cWorld . lWorld . pulseBalls . at (pb ^. pbID) .~ Nothing
             & cWorld . lWorld %~ dodam ecrwl
     | pb ^. pbTimer <= 0 =
-        w   & cWorld . lWorld . pulseBalls . at (pb ^. pbID) .~ Nothing
+        w & cWorld . lWorld . pulseBalls . at (pb ^. pbID) .~ Nothing
     | otherwise =
-        w   & cWorld . lWorld . pulseBalls . ix (pb ^. pbID) . pbTimer -~ 1
+        w & cWorld . lWorld . pulseBalls . ix (pb ^. pbID) . pbTimer -~ 1
             & cWorld . lWorld . pulseBalls . ix (pb ^. pbID) . pbPos .~ ep
             & pbFlicker pb
   where
     dodam = \case
         Left cr -> creatures . ix (_crID cr) . crDamage .:~ thedam
         Right wl -> wallDamages . at (_wlID wl) . non mempty .:~ thedam
-    thedam =  Lasering 100 ep (pb ^. pbVel) 
+    thedam = Lasering 100 ep (pb ^. pbVel)
     sp = pb ^. pbPos
     ep = sp + pb ^. pbVel
     thit = thingHit sp ep w
 
 pbFlicker :: PulseBall -> World -> World
 pbFlicker pt =
-        cWorld . lWorld . lights
-            .:~ LSParam (addZ 5 $ _pbPos pt) d (0.5 * xyzV4 chartreuse)
+    cWorld . lWorld . lights
+        .:~ LSParam (addZ 5 $ _pbPos pt) d (0.5 * xyzV4 chartreuse)
   where
     d = 4 * fromIntegral (10 + abs ((_pbTimer pt `mod` 20) - 10))
 
@@ -501,20 +498,23 @@ displayTerminalLineString :: TerminalLineString -> (String, Color)
 displayTerminalLineString (TerminalLineConst str col) = (str, col)
 
 tmUpdate :: Terminal -> World -> World
-tmUpdate tm w = case w ^? cWorld . lWorld . terminals . ix (_tmID tm) . tmFutureLines . ix 0 of
-    Nothing -> w
-    Just tl | _tlPause tl > 0 -> w & pointTermParams . tmFutureLines . ix 0 . tlPause -~ 1
-    Just (TLine _ tls g) ->
-        w & pointTermParams
-            %~ ( (tmFutureLines %~ tail)
-                    . (tmDisplayedLines %~ (map displayTerminalLineString tls ++))
-               )
-            & doTmWdWd g tm
---    Just (TerminalLineEffect _ eff) ->
---        w
---            & pointTermParams . tmFutureLines %~ tail
---            & doTmWdWd eff tm
+tmUpdate tm w = fromMaybe w $ do
+    guard $ tm ^. tmStatus == TerminalLineRead
+    tl <- w ^? cWorld . lWorld . terminals . ix (_tmID tm) . tmFutureLines . ix 0
+    return $ case tl of
+        _ | _tlPause tl > 0 -> w & pointTermParams . tmFutureLines . ix 0 . tlPause -~ 1
+        (TLine _ tls g) ->
+            w & pointTermParams
+                %~ ( (tmFutureLines %~ tail)
+                        . (tmDisplayedLines %~ (map displayTerminalLineString tls ++))
+                   )
+                & doTmWdWd g tm
   where
+    --    Just (TerminalLineEffect _ eff) ->
+    --        w
+    --            & pointTermParams . tmFutureLines %~ tail
+    --            & doTmWdWd eff tm
+
     pointTermParams = cWorld . lWorld . terminals . ix (_tmID tm)
 
 setOldPos :: Creature -> Creature
@@ -641,22 +641,24 @@ updatePulseLaser pz = case pz ^. pzTimer of
     5 -> (Endo f, [pz & pzTimer -~ 1])
     _ -> (Endo g, [pz & pzTimer -~ 1])
   where
-    f w = dodam thHit
+    f w =
+        dodam
+            thHit
             w
             & cWorld . lWorld . flares <>~ drawLaser cyan (sp : ps)
       where
         (thHit, ps) = reflectPulseLaserAlong phasev sp xp w
     dodam thit = case thit of
-        ((p, OCreature cr):_) ->
-            cWorld . lWorld . creatures . ix (_crID cr) . crDamage 
+        ((p, OCreature cr) : _) ->
+            cWorld . lWorld . creatures . ix (_crID cr) . crDamage
                 .:~ Lasering (pz ^. pzDamage) p (xp - sp)
-        ((p, OWall wl):_) ->
+        ((p, OWall wl) : _) ->
             cWorld . lWorld . wallDamages . at (_wlID wl) . non mempty
                 .:~ Lasering (pz ^. pzDamage) p (xp - sp)
-        ((_, OPulseBall pb):xs) -> dodam xs
-            .
-            (cWorld . lWorld . pulseBalls . ix (_pbID pb) . pbTimer .~ 0)
-            . makeExplosionAt (_pbPos pb `v2z` 20) 0
+        ((_, OPulseBall pb) : xs) ->
+            dodam xs
+                . (cWorld . lWorld . pulseBalls . ix (_pbID pb) . pbTimer .~ 0)
+                . makeExplosionAt (_pbPos pb `v2z` 20) 0
         _ -> id
     phasev = _pzPhaseV pz
     sp = _pzPos pz
@@ -796,9 +798,11 @@ ppEvents w = IM.foldl' (flip $ \pp -> doPressPlateEvent (_ppEvent pp) pp) w $ w
 
 checkEndGame :: Universe -> Universe
 checkEndGame uv = case w ^? timeFlow . respawnDelay of
-    Just x | x < 0 -> uv -- & uvScreenLayers .~ [gameOverMenu uv]
-        & uvWorld . timeFlow .~ NormalTimeFlow
-        & uvWorld %~ respawn
+    Just x
+        | x < 0 ->
+            uv -- & uvScreenLayers .~ [gameOverMenu uv]
+                & uvWorld . timeFlow .~ NormalTimeFlow
+                & uvWorld %~ respawn
     Just _ -> uv & uvWorld . timeFlow . respawnDelay -~ 1
     _ | _crHP (you w) < 1 -> uv & uvWorld . timeFlow .~ RespawnDelay 50
     _ -> uv

src/Dodge/Update/Input/InGame.hs

@@ -218,8 +218,9 @@ updateMouseClickInGame cfig w = case w ^. input . mouseContext of
             && isGroupSelectableSection (fst x) ->
             w & input . mouseContext .~ OverInvDragSelect x (Just $ snd x)
     OverInvSelect x -> startDrag x cfig w
-    OverTerminalReturn tmid -> terminalReturnEffect tmid w
-    OverTerminalEscape -> w & hud . hudElement . subInventory .~ NoSubInventory
+    OverTerminal tmid (TerminalTextInput {}) -> terminalReturnEffect tmid w
+    OverTerminal tmid (TerminalPressTo{}) -> continueTerminal tmid w
+    OutsideTerminal -> w & hud . hudElement . subInventory .~ NoSubInventory
     OverCombSelect x ->
         w & hud . hudElement . subInventory . ciSelection ?~ f x
             & worldEventFlags . at CombineInventoryChange ?~ ()
@@ -381,7 +382,25 @@ updateFunctionKey uv ScancodeF4 _ = doDebugTest2 uv
 updateFunctionKey uv _ _ = uv
 
 updateKeysInTerminal :: Int -> Universe -> Universe
-updateKeysInTerminal tmid u =
+updateKeysInTerminal tmid u = fromMaybe u $ do
+    tm <- u ^? uvWorld . cWorld . lWorld . terminals . ix tmid
+    return $ case tm ^. tmStatus of
+        TerminalDeactivated -> u & uvWorld . hud . hudElement . subInventory .~ NoSubInventory
+        TerminalTextInput{} -> updateKeysTextInputTerminal tmid u
+        TerminalPressTo{} -> updateKeyContinueTerminal tmid u
+        _ -> u
+
+updateKeyContinueTerminal :: Int -> Universe -> Universe
+updateKeyContinueTerminal tmid u
+    | any (==0) $ u ^. uvWorld . input . pressedKeys =
+        u & uvWorld %~ continueTerminal tmid
+    | otherwise = u
+
+continueTerminal :: Int -> World -> World
+continueTerminal tmid = cWorld . lWorld . terminals . ix tmid . tmStatus .~ TerminalLineRead
+
+updateKeysTextInputTerminal :: Int -> Universe -> Universe
+updateKeysTextInputTerminal tmid u =
     u
         & doTextInputOverUniverse
             (uvWorld . cWorld . lWorld . terminals . ix tmid . tmStatus . tiText)
@@ -533,7 +552,7 @@ getCloseObj w = getSelectedCloseObj w <|> firstcitem <|> firstcbut
 tryCombine :: (Int, Int) -> World -> World
 tryCombine (i, j) w = fromMaybe w $ do
     sss <- w ^? hud . hudElement . subInventory . ciSections
-    CombinableItem is it <- sss ^? ix i . ssItems . ix j . siPayload
+    CombinableItem is it <- sss ^? ix i . ssItems . ix j . siPayload . _Just
     p <- w ^? cWorld . lWorld . creatures . ix 0 . crPos
     return $
         snd (createItemYou it (foldr (destroyInvItem 0) w (sort is)))

src/Dodge/Update/Input/ScreenLayer.hs

@@ -11,7 +11,7 @@ import qualified Data.Map.Strict as M
 import Data.Maybe
 import Dodge.Data.ScreenPos
 import Dodge.Data.Universe
-import Dodge.Debug.Console
+import Dodge.Debug.Terminal
 import Dodge.Menu.Option
 import Dodge.SelectionList
 import Dodge.Update.Input.Text
@@ -34,7 +34,7 @@ doInputScreenInput s u =
     checkEndStatus
         | ispressed ScancodeReturn =
             (uvScreenLayers %~ tail)
-                . applyConsoleString (words $ map toUpper s)
+                . applyTerminalString (words $ map toUpper s)
                 . (uvWorld . worldEventFlags . at InventoryChange ?~ ())
         | ispressed ScancodeEscape = uvScreenLayers %~ tail
         | otherwise = id
@@ -63,11 +63,11 @@ mouseClickOptionsList u = fromMaybe u $ do
     case u ^. uvWorld . input . mouseButtons of
         mbs | mbs ^. at ButtonLeft == Just 0 -> do
             i <- u ^? uvWorld . input . mouseContext . mcoMenuClick
-            f <- sl ^? ix i . siPayload . _1
+            f <- sl ^? ix i . siPayload . _Just . _1
             return $ f u & uvSoundQueue .:~ click1S
         mbs | mbs ^. at ButtonRight == Just 0 -> do
             i <- u ^? uvWorld . input . mouseContext . mcoMenuClick
-            f <- sl ^? ix i . siPayload . _2
+            f <- sl ^? ix i . siPayload . _Just . _2
             return $ f u & uvSoundQueue .:~ click1S
         _ -> Nothing
 

src/Dodge/WorldEffect.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE LambdaCase #-}
+
 module Dodge.WorldEffect (
     doWdWd,
     accessTerminal,
@@ -6,6 +7,7 @@ module Dodge.WorldEffect (
     lineOutputTerminal,
 ) where
 
+import Control.Monad
 import Data.Foldable
 import qualified Data.Map.Strict as M
 import Data.Maybe
@@ -51,21 +53,23 @@ doWdWd we = case we of
         loc <- invIndents (cr ^. crInv) ^? ix invid . _2
         return $ heldEffectMuzzles loc cr w
 
-accessTerminal :: Maybe Int -> World -> World
-accessTerminal mtmid w = fromMaybe w $ do
-    tmid <- mtmid
+accessTerminal :: Int -> World -> World
+accessTerminal tid w = fromMaybe w $ do
+    tm <- w ^? cWorld . lWorld . terminals . ix tid
+    guard (tm ^. tmStatus /= TerminalDeactivated)
     return $
-        w & hud . hudElement . subInventory .~ DisplayTerminal tmid
-            & cWorld . lWorld . terminals . ix tmid %~ tryToBoot
+        w & hud . hudElement . subInventory .~ DisplayTerminal tid
+            & cWorld . lWorld . terminals . ix tid %~ tryToBoot
   where
     tryToBoot tm = case _tmStatus tm of
         TerminalTextInput{} -> tm
-        TerminalBusy -> tm
+        TerminalLineRead -> tm
         TerminalPressTo{} -> tm
         TerminalOff ->
             tm
                 & tmFutureLines .~ _tmBootLines tm
-                & tmStatus .~ TerminalBusy
+                & tmStatus .~ TerminalLineRead
+        TerminalDeactivated -> error "managed to boot a deactivated terminal"
 
 torqueCr :: Float -> Int -> World -> World
 torqueCr x cid w
@@ -84,7 +88,8 @@ lineOutputTerminal tls =
         }
 
 doDeathTriggers :: Terminal -> World -> World
-doDeathTriggers tm = cWorld . lWorld . triggers %~ flip (foldl' $ flip doDeathToggle) xs
+doDeathTriggers tm = (cWorld . lWorld . triggers %~ flip (foldl' $ flip doDeathToggle) xs)
+    . (cWorld . lWorld . terminals . ix (tm ^. tmID) . tmStatus .~ TerminalDeactivated)
   where
     xs = M.elems $ _tmToggles tm
 
@@ -98,17 +103,18 @@ doTmWdWd tmwdwd = case tmwdwd of
         return $ cWorld . lWorld . terminals . ix tid . tmDisplayedLines .~ []
     TmGetDamageCoding st -> \tm w -> fromMaybe w $ do
         tid <- tm ^? tmID
-        return $ w & cWorld . lWorld . terminals . ix tid . tmFutureLines 
-            .~ decodeSensorType st w
+        return $
+            w & cWorld . lWorld . terminals . ix tid . tmFutureLines
+                .~ decodeSensorType st w
     TmGetSensor s -> \tm w -> fromMaybe w $ do
         tid <- tm ^? tmID
         return $ w & cWorld . lWorld . terminals . ix tid . tmFutureLines .~ getSensorInfo w tm s
     TmTmSetStatus x -> \tm -> fromMaybe id $ do
         tid <- tm ^? tmID
         return $ cWorld . lWorld . terminals . ix tid . tmStatus .~ x
---    TmDisplayCommands -> \tm -> fromMaybe id $ do
---        tid <- tm ^? tmID
---        return $ cWorld . lWorld . terminals . ix tid %~ tabComplete ""
+    --    TmDisplayCommands -> \tm -> fromMaybe id $ do
+    --        tid <- tm ^? tmID
+    --        return $ cWorld . lWorld . terminals . ix tid %~ tabComplete ""
     --return $ cWorld . lWorld . terminals . ix tid . tmFutureLines .~
     --    makeColorTermPara commandColor
     --        (unwords (map fst (PTE.toList $ getCommands tm)))
@@ -116,18 +122,38 @@ doTmWdWd tmwdwd = case tmwdwd of
     --        tid <- tm ^? tmID
     --        return $ cWorld . lWorld . terminals . ix tid . tmPartialCommand .~ x
     TmWdId -> const id
-    TmWdWdDisconnectTerminal -> disconnectTerminal
+    TmWdWdPowerDownTerminal -> powerDownTerminal
+    TmWdWdDeactivateTerminal -> deactivateTerminal
     TmWdWdTermSound sid -> \tm w ->
         let tpos = fromMaybe 0 $ w ^? cWorld . lWorld . buttons . ix (_tmButtonID tm) . btPos
          in soundStart TerminalSound tpos sid Nothing w
     TmWdWdDoDeathTriggers -> doDeathTriggers
     TmWdWdfromWdWd f -> \_ -> doWdWd f
 
+powerDownTerminal :: Terminal -> World -> World
+powerDownTerminal tm =
+    (cWorld . lWorld . terminals . ix (_tmID tm) . tmStatus .~ TerminalOff)
+        . (cWorld . lWorld . terminals . ix (_tmID tm) . tmDisplayedLines .~ [])
+        . exitTerminalSubInv
+
+deactivateTerminal :: Terminal -> World -> World
+deactivateTerminal tm =
+    (cWorld . lWorld . terminals . ix (_tmID tm) . tmStatus .~ TerminalDeactivated)
+        . (cWorld . lWorld . terminals . ix (_tmID tm) . tmDisplayedLines .~ [])
+        . exitTerminalSubInv
+
+exitTerminalSubInv :: World -> World
+exitTerminalSubInv w = case w ^? hud . hudElement . subInventory . termID of
+    Just _ ->
+        w & hud . hudElement . subInventory
+            .~ NoSubInventory --MouseInvNothing
+    _ -> w
+
 decodeSensorType :: SensorType -> World -> [TerminalLine]
 decodeSensorType st w = fromMaybe [] $ do
     x <- w ^? cWorld . cwGen . cwgParams . sensorCoding . ix st
     return [makeTermLine $ show x]
-    
+
 -- ugly, when changing check sensorCommand
 getSensorInfo :: World -> Terminal -> String -> [TerminalLine]
 getSensorInfo w tm = \case