Commit before making terminals there own entities

This commit is contained in:
2022-06-06 11:17:11 +01:00
parent 384a16851b
commit 8e9f33d038
6 changed files with 56 additions and 37 deletions
+13 -3
View File
@@ -405,7 +405,7 @@ data Button = Button
, _btText :: String
, _btState :: ButtonState
-- , _btTerminalParams :: World -> TerminalParams
, _btTerminal :: Maybe Int
, _btTermMID :: Maybe Int
, _btName :: String
}
data TerminalParams = NoTerminalParams | TerminalParams
@@ -418,6 +418,7 @@ data TerminalParams = NoTerminalParams | TerminalParams
, _termInput :: Maybe T.Text
, _termScrollCommands :: [TerminalCommand]
, _termWriteCommands :: [TerminalCommand]
, _termDeathCommand :: Maybe String
}
data TerminalLine
= TerminalLineDisplay
@@ -426,8 +427,8 @@ data TerminalLine
}
| TerminalLineInput
{_tlPause :: Int
,_tlScrollCommands :: [TerminalCommand]
,_tlWriteCommands :: [TerminalCommand]
-- ,_tlScrollCommands :: [TerminalCommand]
-- ,_tlWriteCommands :: [TerminalCommand]
}
| TerminalLineEffect
{_tlPause :: Int
@@ -953,6 +954,14 @@ data Terminal = Terminal
, _tmButtonID :: Int
, _tmMachineID :: Int
, _tmName :: String
, _tmDisplayedLines :: [(String,Color)]
, _tmFutureLines :: [TerminalLine]
, _tmTitle :: String
, _tmSel :: Maybe (Int,Int)
, _tmInput :: Maybe T.Text
, _tmScrollCommands :: [TerminalCommand]
, _tmWriteCommands :: [TerminalCommand]
, _tmDeathEffect :: Terminal -> World -> World
}
data Machine = Machine
{ _mcID :: Int
@@ -970,6 +979,7 @@ data Machine = Machine
, _mcLSs :: [Int]
, _mcType :: MachineType
, _mcName :: String
, _mcTermMID :: Maybe Int
}
data Sensor = NoSensor
| SensorToggleAmount