Cleanup

src/Dodge/Terminal.hs

@@ -1,16 +1,8 @@
 --{-# LANGUAGE TupleSections #-}
 module Dodge.Terminal where
 import Dodge.SoundLogic
-import Dodge.WorldEvent.Cloud
-import Dodge.Data
-import Dodge.Inventory.Lock
-import Dodge.Placement.Instance.Terminal
-import Dodge.Data.WorldEffect
-import Dodge.Data.Terminal
 import Dodge.Data
 import Dodge.Default
---import Dodge.Base
-import Dodge.SoundLogic
 import Color
 import Justify
 import LensHelp
@@ -21,12 +13,7 @@ import Data.Char
 import Data.Maybe
 import Data.Foldable
 import qualified Data.Map.Strict as M
-import qualified IntMapHelp as IM
 import qualified Data.Text as T
---import Text.Read
-
-import System.Random
-import Control.Lens
 
 basicTerminal :: Terminal
 basicTerminal = defaultTerminal
@@ -230,3 +217,14 @@ togglesToEffects = fmap f . _tmToggles
                                     -- \_ -> triggers . ix (_ttTriggerID tt) %~ not]
 simpleTermMessage :: [String] -> Terminal
 simpleTermMessage strs = defaultTerminal & tmFutureLines .~ 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 -> Just $ fromMaybe [errline $ "^ INVALID ARGUMENT: EXPECTS "++ argtype]
+            $ safeHead args >>= (m M.!?)
+  where
+    errline = makeColorTermLine red