Move towards simplifying terminal lines/effects

src/Dodge/Data/Terminal.hs

@@ -1,28 +1,29 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Dodge.Data.Terminal where
+module Dodge.Data.Terminal (
+    module Dodge.Data.Terminal,
+    module Dodge.Data.Terminal.Status,
+) where
 
+import Sound.Data
 import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.Map.Strict as M
-import Dodge.Data.WorldEffect
 import Dodge.Data.BlBl
-
-data TerminalStatus = TerminalOff | TerminalBusy | TerminalTextInput {_tiText :: String}
---    | TerminalArgumentInput TerminalCommand
-    deriving Eq
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+import Dodge.Data.Terminal.Status
+import Dodge.Data.WorldEffect
 
 data TerminalInput = TerminalInput
     { --_tiText :: String
-     _tiSel :: (Int, Int)
+      _tiSel :: (Int, Int)
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Terminal = Terminal
     { _tmID :: Int
@@ -40,22 +41,23 @@ data Terminal = Terminal
     , _tmCommandHistory :: [String]
     , _tmToggles :: M.Map String TerminalToggle
     , _tmPartialCommand :: Maybe TerminalCommand
---    , _tmType :: TerminalType
+    --    , _tmType :: TerminalType
     }
-    --deriving (Eq, Show, Read) --, Generic)
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Show, Read) --, Generic)
+--h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalType = DefaultTerminal
 
 data TerminalLineString = TerminalLineConst String Color
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TmTm
     = TmId
-    | TmTmClearDisplayedLines
-    | TmTmSetStatus TerminalStatus
-    | TmTmSetPartialCommand (Maybe TerminalCommand)
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--    | TmTmSetPartialCommand (Maybe TerminalCommand)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TerminalLine
     = TerminalLineDisplay
@@ -70,15 +72,16 @@ data TerminalLine
         { _tlPause :: Int
         , _tlEffect :: TmWdWd --Terminal -> World -> World
         }
-    --deriving (Eq, Show, Read) --, Generic)
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Show, Read) --, Generic)
+--h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalToggle = TerminalToggle
     { _ttTriggerID :: Int
     , _ttDeathEffect :: BlBl
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EffectArguments
     = NoArguments {_cmdEffect :: [TerminalLine]}
@@ -86,8 +89,9 @@ data EffectArguments
         { _argType :: String
         , _argList :: M.Map String [TerminalLine]
         }
-    --deriving (Eq, Show, Read) --, Generic)
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Show, Read) --, Generic)
+--h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalCommandEffect
     = TerminalCommandArguments EffectArguments
@@ -99,8 +103,9 @@ data TerminalCommandEffect
     | TerminalCommandEffectCommands
     | TerminalCommandEffectSingleCommand WdWd [String]
     | TerminalCommandEffectNone
-    --deriving (Eq, Show, Read) --, Generic)
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Show, Read) --, Generic)
+--h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalCommand = TerminalCommand
     { _tcString :: String
@@ -108,8 +113,18 @@ data TerminalCommand = TerminalCommand
     , _tcHelp :: String
     , _tcEffect :: TerminalCommandEffect -- Terminal -> World -> EffectArguments
     }
-    --deriving (Eq, Show, Read) --, Generic)
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Show, Read) --, Generic)
+--h--deriving (Eq, Show, Read) --Generic, Flat)
+data TmWdWd
+    = TmWdId
+    | TmWdWdDisconnectTerminal
+    | TmWdWdfromWdWd WdWd
+    | TmWdWdTermSound SoundID
+    | TmWdWdDoDeathTriggers
+    | TmTmClearDisplayedLines
+    | TmTmSetStatus TerminalStatus
+    | TmTmSetPartialCommand (Maybe TerminalCommand)
 
 makeLenses ''TerminalInput
 makeLenses ''Terminal
@@ -117,17 +132,18 @@ makeLenses ''TerminalLine
 makeLenses ''TerminalToggle
 makeLenses ''EffectArguments
 makeLenses ''TerminalCommand
-makeLenses ''TerminalStatus
-concat <$> mapM (deriveJSON defaultOptions)
-    [ ''TerminalStatus
-    , ''TerminalInput
-    , ''TerminalLineString
-    , ''TmTm
-    , ''TerminalLine
-    , ''TerminalToggle
-    , ''EffectArguments
-    , ''TerminalCommandEffect
-    , ''TerminalCommand
-    , ''Terminal
-    , ''TerminalType
-    ]
+concat
+    <$> mapM
+        (deriveJSON defaultOptions)
+        [ ''TerminalInput
+        , ''TerminalLineString
+        , ''TmTm
+        , ''TerminalLine
+        , ''TerminalToggle
+        , ''EffectArguments
+        , ''TerminalCommandEffect
+        , ''TerminalCommand
+        , ''TmWdWd
+        , ''Terminal
+        , ''TerminalType
+        ]

src/Dodge/Data/WorldEffect.hs

@@ -69,12 +69,6 @@ data DrWdWd
     | DoorMechanism
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data TmWdWd
-    = TmWdId
-    | TmWdWdDisconnectTerminal
-    | TmWdWdfromWdWd WdWd
-    | TmWdWdTermSound SoundID
-    | TmWdWdDoDeathTriggers
     --deriving (Eq, Show, Read) --, Generic)
     --h--deriving (Eq, Show, Read) --Generic, Flat)
 
@@ -85,4 +79,3 @@ deriveJSON defaultOptions ''MdWdWd
 deriveJSON defaultOptions ''WdBl
 deriveJSON defaultOptions ''WdP2f
 deriveJSON defaultOptions ''DrWdWd
-deriveJSON defaultOptions ''TmWdWd