Work on terminals and machines

src/Dodge/Data.hs

@@ -405,6 +405,7 @@ data Button = Button
     , _btText :: String
     , _btState :: ButtonState
     , _btTerminalParams :: World -> TerminalParams
+    , _btTerminal :: Maybe Int
     , _btName :: String
     }
 data TerminalParams = NoTerminalParams | TerminalParams
@@ -962,6 +963,7 @@ data Machine = Machine
     , _mcDraw   :: Machine -> SPic
     , _mcPos    :: Point2
     , _mcDir    :: Float
+    , _mcColor  :: Color
     , _mcHP     :: Int
     , _mcSensor :: Sensor
     , _mcDamage :: [Damage]
@@ -1378,10 +1380,11 @@ data TerminalCommand = TerminalCommand
 
 ---- ROOM DATATYPES
 data PSType = PutCrit {_unPutCrit :: Creature}
-    | PutMachine { _putMachineColor :: Color, _putMachinePoly :: [Point2], _unPutMachine :: Machine }
+    | PutMachine { _putMachinePoly :: [Point2], _unPutMachine :: Machine }
     | PutLS LightSource
     | PutButton {_putButton :: Button}
     | PutProp Prop
+    | PutTerminal {_unputTerminal :: Terminal}
     | PutFlIt Item
     | PutPPlate PressPlate
     | PutBlock BlockMaterial Int [Int] Wall [Point2]