From 3c2f0cb824bd37e273263ffc1aeec0ecc7a5a095 Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 7 Jun 2022 11:40:59 +0100 Subject: [PATCH] Commit before simplifying terminal commands --- src/Dodge/Placement/Instance/Terminal.hs | 3 +++ src/Dodge/Terminal.hs | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Dodge/Placement/Instance/Terminal.hs b/src/Dodge/Placement/Instance/Terminal.hs index 644419121..3cd9a5c86 100644 --- a/src/Dodge/Placement/Instance/Terminal.hs +++ b/src/Dodge/Placement/Instance/Terminal.hs @@ -48,6 +48,9 @@ putTerminal'' mc tm mcf = ps0PushPS (PutTerminal tm) btid = fromJust (_plMID btpl) mcid = fromJust (_plMID mcpl) +mcKillLinked :: Machine -> World -> World +mcKillLinked mc = mcKillTerm mc + mcKillTerm :: Machine -> World -> World mcKillTerm mc w = fromMaybe w $ do tmid <- _mcTermMID mc diff --git a/src/Dodge/Terminal.hs b/src/Dodge/Terminal.hs index 7668afcd0..1db62db71 100644 --- a/src/Dodge/Terminal.hs +++ b/src/Dodge/Terminal.hs @@ -57,9 +57,9 @@ sensorCommand :: TerminalCommand sensorCommand = TerminalCommand { _tcString = "SENSOR" , _tcAlias = ["SEN"] - , _tcHelp = "ACCESS THE CONNECTED SENSOR." + , _tcHelp = "ACCESS INFORMATION CONCERNING THE CONNECTED SENSOR." , _tcArgumentType = Just "A SENSOR PARAMETER" - , _tcArguments = \_ _ -> ["BOOL","VALUE"] + , _tcArguments = \_ _ -> ["REQUIREMENT","DISTANCE","CURRENTSTATUS","PASTSTATUS"] , _tcEffect = effectArgMessage sensf } effectArgMessage :: (String -> Terminal -> World -> Maybe [String]) @@ -71,6 +71,7 @@ effectArgMessage f args tm w = maybe (Left "") Right $ do sensf :: String -> Terminal -> World -> Maybe [String] sensf arg tm w = case arg of +-- "REQUIREMENT","DISTANCE","CURRENTSTATUS","PASTSTATUS"] "BOOL" -> Just [show $ w ^? machines . ix (_tmMachineID tm) . mcSensor . sensToggle] _ -> Nothing