Remove explicit external terminal color record

src/Dodge/Placement/Instance/Analyser.hs

@@ -3,7 +3,6 @@ module Dodge.Placement.Instance.Analyser (
     analyserWithPrompt,
 ) where
 
-import Color
 import Dodge.Data.GenWorld
 import Dodge.Default
 import Dodge.Placement.Instance
@@ -18,7 +17,6 @@ analyserWithPrompt l pst pslight psmc = extTrigLitPos pslight $ \tp ->
     Just $
         plSpot .~ psmc $
             putTerminal
-                (dark magenta)
                 (themachine & mcMounts . at OTTrigger .~ _plMID tp)
                 tparams
   where
@@ -26,7 +24,6 @@ analyserWithPrompt l pst pslight psmc = extTrigLitPos pslight $ \tp ->
         defaultTerminal & tmStatus .~ TerminalLineRead
             & tmFutureLines .~ l
     themachine =
-        defaultMachine & mcColor .~ aquamarine
-            & mcType .~ McTerminal
+        defaultMachine -- & mcColor .~ aquamarine
             & mcHP .~ 10000
             & mcType .~ McProxSensor (ProxSensor pst Nothing)

src/Dodge/Placement/Instance/Sensor.hs

@@ -3,7 +3,6 @@ module Dodge.Placement.Instance.Sensor (
     damageSensor,
 ) where
 
-import Color
 import Control.Lens
 import Dodge.Data.GenWorld
 import Dodge.Default
@@ -18,7 +17,7 @@ damageSensor dt wdth mtrid ps = pContID ps (PutLS $ lsPosCol (V3 0 0 30) 0.1) $
              PutMachine
                 (reverse $ square wdth)
                 ( defaultMachine
-                    & mcColor .~ yellow
+--                    & mcColor .~ yellow
                     & mcMounts . at OTTrigger .~ mtrid
                     & mcMounts . at OTLightSource ?~ lsid
                     & mcType

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

src/Dodge/Placement/Instance/Turret.hs

@@ -1,24 +1,24 @@
-module Dodge.Placement.Instance.Turret where
+module Dodge.Placement.Instance.Turret 
+    (putLasTurret) where
 
 import Dodge.Item.Held.BatteryGuns
-import Color
 import Dodge.Data.GenWorld
 import Dodge.Default
 import Dodge.LevelGen.PlacementHelper
 import Geometry
 import LensHelp
 
-putTurret :: Item -> Float -> Placement
-putTurret itm rotSpeed =
-    sps0 $
-        PutMachine
-            (reverse $ square 10)
-            ( defaultMachine
-                & mcColor .~ blue
-                & mcType .~ (turret itm & _McTurret . tuTurnSpeed .~ rotSpeed)
-                & mcHP .~ 50000
-            )
-            (Just itm)
+--putTurret :: Item -> Float -> Placement
+--putTurret itm rotSpeed =
+--    sps0 $
+--        PutMachine
+--            (reverse $ square 10)
+--            ( defaultMachine
+----                & mcColor .~ blue
+--                & mcType .~ (turret itm & _McTurret . tuTurnSpeed .~ rotSpeed)
+--                & mcHP .~ 50000
+--            )
+--            (Just itm)
 
 putLasTurret :: Float -> Placement
 putLasTurret rotSpeed =
@@ -26,15 +26,12 @@ putLasTurret rotSpeed =
         PutMachine
             (reverse $ square 10)
             ( defaultMachine
-                & mcColor .~ blue
+--                & mcColor .~ blue
                 & mcType .~ (lasTurret & _McTurret . tuTurnSpeed .~ rotSpeed)
                 & mcHP .~ 50000
             )
             (Just laser)
 
-turret :: Item -> MachineType
-turret _ = lasTurret
-
 lasTurret :: MachineType
 lasTurret = McTurret $
     Turret