Cleanup

src/Dodge/Data.hs

@@ -95,6 +95,7 @@ data World = World
     , _walls                :: IM.IntMap Wall
     , _doors                :: IM.IntMap Door
     , _machines             :: IM.IntMap Machine
+    , _terminals            :: IM.IntMap Terminal
     , _magnets              :: IM.IntMap Magnet
     , _blocks               :: IM.IntMap Block
     , _coordinates          :: IM.IntMap Point2
@@ -390,7 +391,8 @@ data TerminalParams = NoTerminalParams | TerminalParams
     , _termSel :: Maybe (Int,Int)
 --    , _termOptions :: [(String, World -> World)]
     , _termInput   :: Maybe T.Text
-    , _termCommands :: [TerminalCommand]
+    , _termScrollCommands :: [TerminalCommand]
+    , _termWriteCommands :: [TerminalCommand]
     }
 data TerminalLine
     = TerminalLineDisplay
@@ -403,7 +405,8 @@ data TerminalLine
 --        }
     | TerminalLineInput
         {_tlPause :: Int
-        ,_tlCommands :: [TerminalCommand]
+        ,_tlScrollCommands :: [TerminalCommand]
+        ,_tlWriteCommands :: [TerminalCommand]
         }
     | TerminalLineEffect
         {_tlPause :: Int
@@ -908,6 +911,10 @@ data Block = Block
     , _blMaterial :: BlockMaterial
     }
 data BlockMaterial = WoodBlock | DirtBlock | StoneBlock | GlassBlock | MetalBlock
+data Terminal = Terminal
+    { _tmID     :: Int 
+    , _tmParams :: TerminalParams
+    }
 data Machine = Machine
     { _mcID     :: Int
     , _mcWallIDs    :: IS.IntSet
@@ -1358,6 +1365,7 @@ makeLenses ''CrMvType
 makeLenses ''Intention
 makeLenses ''Door
 makeLenses ''Block
+makeLenses ''Terminal
 makeLenses ''Machine
 makeLenses ''MachineType
 makeLenses ''Zone