Remove explicit external terminal color record

This commit is contained in:
2025-12-07 14:24:11 +00:00
parent 1d53ff4277
commit 6e5d2f147a
16 changed files with 117 additions and 132 deletions
+3 -2
View File
@@ -11,7 +11,6 @@ module Dodge.Data.Machine (
module Dodge.Data.GenParams,
) where
import Color
import Control.Lens
import Data.Aeson
import Data.Aeson.TH
@@ -31,7 +30,7 @@ data Machine = Machine
, _mcMaterial :: Material
, _mcPos :: Point2
, _mcDir :: Float
, _mcColor :: Color
-- , _mcColor :: Color
, _mcHP :: Int
, _mcDamage :: [Damage]
, _mcType :: MachineType
@@ -45,6 +44,8 @@ data MachineType
| McDamSensor DamageSensor
| McProxSensor ProximitySensor
| McTurret {_mctTurret :: Turret}
-- | McStorage
-- | McDistributer
data Turret = Turret
{ _tuWeapon :: Int
-1
View File
@@ -21,7 +21,6 @@ data Terminal = Terminal
, _tmBootLines :: [TerminalLine]
, _tmButtonID :: Int
, _tmMachineID :: Int
, _tmExternalColor :: Color
, _tmDisplayedLines :: [(String, Color)]
, _tmFutureLines :: [TerminalLine]
, _tmCommands :: [TCom]