Cleanup

src/Dodge/Data.hs

@@ -382,6 +382,7 @@ data Button = Button
     , _btText :: String
     , _btState :: ButtonState
     , _btTerminalParams :: World -> TerminalParams
+    , _btName :: String
     }
 data TerminalParams = NoTerminalParams | TerminalParams
     { _termDisplayedLines :: [World -> (String,Color)]
@@ -912,8 +913,11 @@ data Block = Block
     }
 data BlockMaterial = WoodBlock | DirtBlock | StoneBlock | GlassBlock | MetalBlock
 data Terminal = Terminal
-    { _tmID     :: Int 
-    , _tmParams :: TerminalParams
+    { _tmID         :: Int 
+    , _tmParams     :: TerminalParams
+    , _tmButtonID   :: Int
+    , _tmMachineID  :: Int
+    , _tmName       :: String
     }
 data Machine = Machine
     { _mcID     :: Int
@@ -927,6 +931,7 @@ data Machine = Machine
     , _mcDamage :: [Damage]
     , _mcLSs    :: [Int]
     , _mcType   :: MachineType
+    , _mcName   :: String
     }
 data Sensor = NoSensor
     | SensorToggleAmount