Remove explicit external terminal color record

src/Dodge/Placement/Instance/Terminal.hs

@@ -2,10 +2,8 @@ module Dodge.Placement.Instance.Terminal (
     putMessageTerminal,
     putImmediateMessageTerminal,
     putTerminal,
-    terminalColor,
 ) where
 
-import Color
 import Data.Maybe
 import Dodge.Data.GenWorld
 import Dodge.Default
@@ -14,19 +12,19 @@ import Dodge.WorldEffect
 import Geometry
 import LensHelp
 
-putTerminalImediateAccess :: Color -> Machine -> Terminal -> Placement
+putTerminalImediateAccess :: Machine -> Terminal -> Placement
 putTerminalImediateAccess = putTerminalFull f
   where
     f tmpl _ _ = Just $ sps0 $ PutWorldUpdate $ const $ const $ over gwWorld $ accessTerminal (tmpl ^?! plMID . _Just)
 
 putTerminalFull ::
     (Placement -> Placement -> Placement -> Maybe Placement) ->
-    Color ->
     Machine ->
     Terminal ->
     Placement
-putTerminalFull f col mc tm =
-    ps0PushPS (PutTerminal (tm & tmExternalColor .~ col)) $
+putTerminalFull f mc tm =
+    --ps0PushPS (PutTerminal (tm & tmExternalColor .~ col)) $
+    ps0PushPS (PutTerminal tm) $
         \tmpl -> Just $
             ps0PushPS (PutButton defaultButton) $
                 \btpl -> Just $
@@ -51,24 +49,19 @@ putTerminalFull f col mc tm =
         btid = fromJust (_plMID btpl)
         mcid = fromJust (_plMID mcpl)
 
-putTerminal :: Color -> Machine -> Terminal -> Placement
+putTerminal :: Machine -> Terminal -> Placement
 putTerminal = putTerminalFull (\_ _ _ -> Nothing)
 
-putMessageTerminal :: Color -> Terminal -> Placement
-putMessageTerminal col =
-    putTerminal col $
+putMessageTerminal :: Terminal -> Placement
+putMessageTerminal =
+    putTerminal $
         defaultMachine
-            & mcColor .~ col
             & mcType .~ McTerminal
             & mcHP .~ 100
 
-putImmediateMessageTerminal :: Color -> Terminal -> Placement
-putImmediateMessageTerminal col =
-    putTerminalImediateAccess col $
+putImmediateMessageTerminal :: Terminal -> Placement
+putImmediateMessageTerminal =
+    putTerminalImediateAccess $
         defaultMachine
-            & mcColor .~ col
             & mcType .~ McTerminal
             & mcHP .~ 100
-
-terminalColor :: Color
-terminalColor = dark magenta